diff --git a/.hgtags b/.hgtags
index 26a83d0a666..3f4c88299c5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -41,3 +41,8 @@ dfd8506f74c3731bb169ce93c72612d78ee0413b jdk7-b63
 d22867c5f1b295a0a2b3b4bc8999a2676f6e20c3 jdk7-b64
 7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65
 62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66
+eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67
+bca2225b66d78c4bf4d9801f54cac7715a598650 jdk7-b68
+1b662b1ed14eb4ae31d5138a36c433b13d941dc5 jdk7-b69
+207f694795c448c17753eff1a2f50363106960c2 jdk7-b70
+c5d39b6be65cba0effb5f466ea48fe43764d0e0c jdk7-b71
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 6681557af03..940c34fa250 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -41,3 +41,8 @@ c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
 269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
+c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
+e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
+82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
+175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
+4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
diff --git a/README-builds.html b/README-builds.html
index 46d5bd72778..cffe092dc03 100644
--- a/README-builds.html
+++ b/README-builds.html
@@ -68,7 +68,6 @@
                             </li>
                             <li><a href="#zip">Zip and Unzip</a> </li>
                             <li><a href="#freetype">FreeType2 Fonts</a> </li>
-                            <li><a href="#jibx">JIBX Libraries</a> </li>
                             <li>Linux and Solaris:
                                 <ul>
                                     <li><a href="#cups">CUPS Include files</a> </li>
@@ -596,11 +595,6 @@
                     Install or upgrade the <a href="#freetype">FreeType development
                     package</a>.
                 </li>
-                <li>
-                    Install the
-                    <a href="#jibx">JIBX Libraries</a>, set
-                    <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
-                </li>
                 <li>
                     Install
                     <a href="#ant">Ant</a>, 
@@ -669,11 +663,6 @@
                 <li>
                     Install the <a href="#xrender">XRender Include files</a>.
                 </li>
-                <li>
-                    Install the
-                    <a href="#jibx">JIBX Libraries</a>, set
-                    <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
-                </li>
                 <li>
                     Install
                     <a href="#ant">Ant</a>, 
@@ -769,11 +758,6 @@
                     Install 
                     <a href="#dxsdk">Microsoft DirectX SDK</a>.
                 </li>
-                <li>
-                    Install the
-                    <a href="#jibx">JIBX Libraries</a>, set
-                    <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
-                </li>
                 <li>
                     Install
                     <a href="#ant">Ant</a>, 
@@ -903,27 +887,6 @@
                 fine for most JDK developers.
             </blockquote>
             <!-- ------------------------------------------------------ -->
-            <h4><a name="jibx">JIBX</a></h4>
-            <blockquote>
-                JIBX libraries version 1.1.5 is required for building the OpenJDK.
-                Namely, the following JAR files from the JIBX distribution package
-                are required:
-                <ul>
-                    <li>bcel.jar
-                    <li>jibx-bind.jar
-                    <li>jibx-run.jar
-                    <li>xpp3.jar
-                </ul>
-                <p>
-                You can download the package from the
-                <a href="http://jibx.sourceforge.net" target="_blank">JIBX site</a>.
-                <p>
-                You will need to set the
-                <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>
-                environment variable to refer to place where the JAR files,
-                above, are located.
-            </blockquote>
-            <!-- ------------------------------------------------------ -->
             <h4><a name="compilers">Compilers</a></h4>
             <blockquote>
                 <strong><a name="gcc">Linux gcc/binutils</a></strong>
@@ -1496,12 +1459,6 @@
                     The default will refer to 
                     <tt>jdk/src/share/lib/security/cacerts</tt>.
                 </dd>
-                <dt><tt><a name="ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt></dt>
-                <dd>
-                    The location of the <a href="#jibx">JIBX libraries</a> file.
-                    The default value is
-                    <tt>$(ALT_SLASH_JAVA)/devtools/share/jibx/lib</tt>.
-                </dd>
                 <dt><a name="ALT_CUPS_HEADERS_PATH"><tt>ALT_CUPS_HEADERS_PATH</tt></a> </dt>
                 <dd>
                     The location of the CUPS header files.
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index 9f4d7e5087a..4d3163cbce7 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -32,7 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/corba/.hgtags b/corba/.hgtags
index 55f6338adba..f9f88d9a708 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -41,3 +41,8 @@ d20e45cd539f20405ff843652069cfd7550c5ab3 jdk7-b63
 047dd27fddb607f8135296b3754131f6e13cb8c7 jdk7-b64
 97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65
 a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66
+a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67
+5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68
+8120d308ec4e805c5588b8d9372844d781c4112d jdk7-b69
+175bd68779546078dbdb6dacd7f0aced79ed22b1 jdk7-b70
+3f1ef7f899ea2aec189c4fb67e5c8fa374437c50 jdk7-b71
diff --git a/corba/THIRD_PARTY_README b/corba/THIRD_PARTY_README
index 9f4d7e5087a..4d3163cbce7 100644
--- a/corba/THIRD_PARTY_README
+++ b/corba/THIRD_PARTY_README
@@ -32,7 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/corba/make/Makefile b/corba/make/Makefile
index 0ca13f6c3ab..d986cc3251f 100644
--- a/corba/make/Makefile
+++ b/corba/make/Makefile
@@ -110,7 +110,7 @@ BOOTSTRAP_TARGET_LEVEL = 5
 ifdef TARGET_CLASS_VERSION
     TARGET_LEVEL = $(TARGET_CLASS_VERSION)
 else
-    TARGET_LEVEL = 6
+    TARGET_LEVEL = 7
 endif
 
 ifndef TARGET_JAVA
diff --git a/corba/make/common/shared/Defs-java.gmk b/corba/make/common/shared/Defs-java.gmk
index 44764bdc8b6..a4c1f50bea7 100644
--- a/corba/make/common/shared/Defs-java.gmk
+++ b/corba/make/common/shared/Defs-java.gmk
@@ -55,10 +55,21 @@ else
     ADD_CLIENT_VM_OPTION = true
   endif
 endif
-JAVA_JVM_FLAGS =
+
+# Options for hotspot to turn off printing of options with fastdebug version
+#   and creating the hotspot.log file.
+JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
+   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
+
+# JVM options
+JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
+
 ifeq ($(ADD_CLIENT_VM_OPTION), true)
   JAVA_JVM_FLAGS += -client
 endif
+ifdef USE_HOTSPOT_INTERPRETER_MODE
+  JAVA_JVM_FLAGS += -Xint
+endif
 
 # Various VM flags
 JAVA_TOOLS_FLAGS  = $(JAVA_JVM_FLAGS) $(JAVA_MEM_FLAGS)
@@ -100,19 +111,23 @@ JAVACFLAGS =
 ifeq ($(DEBUG_CLASSFILES),true)
   JAVACFLAGS += -g
 endif
-ifeq ($(COMPILER_WARNINGS_FATAL), true)
+ifeq ($(JAVAC_MAX_WARNINGS), true)
+  JAVACFLAGS  += -Xlint:all
+endif
+ifeq ($(JAVAC_WARNINGS_FATAL), true)
   JAVACFLAGS  += -Werror
 endif
 
 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
 JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
 
-# Add the source level (currently all source is 1.5, should this be 1.6?)
-LANGUAGE_VERSION = -source 1.5
+# Add the source level
+SOURCE_LANGUAGE_VERSION = 7
+LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION)
 JAVACFLAGS  += $(LANGUAGE_VERSION)
 
-# Add the class version we want (currently this is 5, should it be 6 or even 7?)
-TARGET_CLASS_VERSION = 5
+# Add the class version we want
+TARGET_CLASS_VERSION = 7
 CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
 JAVACFLAGS  += $(CLASS_VERSION)
 JAVACFLAGS  += -encoding ascii
@@ -176,10 +191,17 @@ endif
 # The javac options supplied to the boot javac is limited. This compiler
 #   should only be used to build the 'make/tools' sources, which are not
 #   class files that end up in the classes directory.
-ifeq ($(COMPILER_WARNINGS_FATAL), true)
+ifeq ($(JAVAC_MAX_WARNINGS), true)
+  BOOT_JAVACFLAGS  += -Xlint:all
+endif
+ifeq ($(JAVAC_WARNINGS_FATAL), true)
   BOOT_JAVACFLAGS  += -Werror
 endif
-BOOT_JAVACFLAGS  += -encoding ascii
+
+BOOT_SOURCE_LANGUAGE_VERSION = 6
+BOOT_TARGET_CLASS_VERSION = 6
+BOOT_JAVACFLAGS  += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
 
 BOOT_JAVA_CMD      = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
 BOOT_JAVAC_CMD     = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index e805fe0c0aa..ea30f311bdb 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -41,3 +41,8 @@ a88386380bdaaa5ab4ffbedf22c57bac5dbec034 jdk7-b62
 ba36394eb84b949b31212bdb32a518a8f92bab5b jdk7-b64
 ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66
+18f526145aea355a9320b724373386fc2170f183 jdk7-b67
+d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68
+54fd4d9232969ea6cd3d236e5ad276183bb0d423 jdk7-b69
+0632c3e615a315ff11e2ab1d64f4d82ff9853461 jdk7-b70
+50a95aa4a247f0cbbf66df285a8b1d78ffb153d9 jdk7-b71
diff --git a/hotspot/THIRD_PARTY_README b/hotspot/THIRD_PARTY_README
index 9f4d7e5087a..4d3163cbce7 100644
--- a/hotspot/THIRD_PARTY_README
+++ b/hotspot/THIRD_PARTY_README
@@ -32,7 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/hotspot/agent/make/saenv.sh b/hotspot/agent/make/saenv.sh
index 38e0f78dbfc..1487716b380 100644
--- a/hotspot/agent/make/saenv.sh
+++ b/hotspot/agent/make/saenv.sh
@@ -48,6 +48,8 @@ if [ "$OS" = "Linux" ]; then
      CPU=i386
    fi
 else
+   LD_AUDIT_32=$STARTDIR/../src/os/solaris/proc/`uname -p`/libsaproc_audit.so
+   export LD_AUDIT_32
    SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p`
    OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"
    CPU=sparc
diff --git a/hotspot/agent/make/saenv64.sh b/hotspot/agent/make/saenv64.sh
index a443cb127b6..e28df4ee6ec 100644
--- a/hotspot/agent/make/saenv64.sh
+++ b/hotspot/agent/make/saenv64.sh
@@ -43,6 +43,8 @@ else
   fi
 fi
 
+LD_AUDIT_64=$STARTDIR/../src/os/solaris/proc/$CPU/libsaproc_audit.so
+export LD_AUDIT_64
 SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/$CPU:$STARTDIR/solaris/$CPU
 
 OPTIONS="-Dsa.library.path=$SA_LIBPATH -Dsun.jvm.hotspot.debugger.useProcDebugger"
diff --git a/hotspot/agent/src/os/solaris/proc/Makefile b/hotspot/agent/src/os/solaris/proc/Makefile
index e7f80fba988..4696662aa6d 100644
--- a/hotspot/agent/src/os/solaris/proc/Makefile
+++ b/hotspot/agent/src/os/solaris/proc/Makefile
@@ -56,24 +56,28 @@ i386:: javahomecheck
 	@javah -classpath $(CLASSES_DIR) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
 	CC -G -KPIC -I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris saproc.cpp \
            -M mapfile -o $@/libsaproc.so -ldemangle
+	CC -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
 
 amd64:: javahomecheck
 	$(MKDIRS) $@
 	@javah -classpath $(CLASSES_DIR) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
 	CC -G -KPIC -xarch=amd64 -I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris saproc.cpp \
            -M mapfile -o $@/libsaproc.so -ldemangle
+	CC -xarch=amd64 -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
 
 sparc:: javahomecheck
 	$(MKDIRS) $@
 	@javah -classpath $(CLASSES_DIR) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
 	CC -G -KPIC -xarch=v8  -I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris saproc.cpp \
            -M mapfile -o $@/libsaproc.so -ldemangle
+	CC -xarch=v8 -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
 
 sparcv9:: javahomecheck
 	$(MKDIRS) $@
 	@javah -classpath $(CLASSES_DIR) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
 	CC -G -KPIC -xarch=v9 -I${JAVA_HOME}/include -I${JAVA_HOME}/include/solaris saproc.cpp \
            -M mapfile -o $@/libsaproc.so -ldemangle
+	CC -xarch=v9 -o $@/libsaproc_audit.so -G -Kpic -z defs saproc_audit.cpp -lmapmalloc -ldl -lc 
 
 clean::
 	$(RM) -rf sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal.h
diff --git a/hotspot/agent/src/os/solaris/proc/mapfile b/hotspot/agent/src/os/solaris/proc/mapfile
index 74701ed11d8..eaa63b0adf0 100644
--- a/hotspot/agent/src/os/solaris/proc/mapfile
+++ b/hotspot/agent/src/os/solaris/proc/mapfile
@@ -45,6 +45,8 @@ SUNWprivate_1.1 {
 		Java_sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal_resume0;
 		Java_sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal_suspend0;
 		Java_sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal_writeBytesToProcess0;
+                # this is needed by saproc_audit.c to redirect opens in libproc.so
+                libsaproc_open;
 local:
 	*;
 };
diff --git a/hotspot/agent/src/os/solaris/proc/saproc.cpp b/hotspot/agent/src/os/solaris/proc/saproc.cpp
index dc1018e2602..d76f3556675 100644
--- a/hotspot/agent/src/os/solaris/proc/saproc.cpp
+++ b/hotspot/agent/src/os/solaris/proc/saproc.cpp
@@ -214,49 +214,58 @@ static void init_alt_root() {
   }
 }
 
-static int find_file_hook(const char * name, int elf_checksum) {
-  init_alt_root();
+// This function is a complete substitute for the open system call
+// since it's also used to override open calls from libproc to
+// implement as a pathmap style facility for the SA.  If libproc
+// starts using other interfaces then this might have to extended to
+// cover other calls.
+extern "C" int libsaproc_open(const char * name, int oflag, ...) {
+  if (oflag == O_RDONLY) {
+    init_alt_root();
 
-  if (_libsaproc_debug) {
-    printf("libsaproc DEBUG: find_file_hook %s 0x%x\n", name, elf_checksum);
-  }
-
-  if (alt_root_len > 0) {
-    int fd = -1;
-    char alt_path[PATH_MAX+1];
-
-    strcpy(alt_path, alt_root);
-    strcat(alt_path, name);
-    fd = open(alt_path, O_RDONLY);
-    if (fd >= 0) {
-      if (_libsaproc_debug) {
-        printf("libsaproc DEBUG: find_file_hook substituted %s\n", alt_path);
-      }
-      return fd;
+    if (_libsaproc_debug) {
+      printf("libsaproc DEBUG: libsaproc_open %s\n", name);
     }
 
-    if (strrchr(name, '/')) {
+    if (alt_root_len > 0) {
+      int fd = -1;
+      char alt_path[PATH_MAX+1];
+
       strcpy(alt_path, alt_root);
-      strcat(alt_path, strrchr(name, '/'));
+      strcat(alt_path, name);
       fd = open(alt_path, O_RDONLY);
       if (fd >= 0) {
         if (_libsaproc_debug) {
-          printf("libsaproc DEBUG: find_file_hook substituted %s\n", alt_path);
+          printf("libsaproc DEBUG: libsaproc_open substituted %s\n", alt_path);
         }
         return fd;
       }
+
+      if (strrchr(name, '/')) {
+        strcpy(alt_path, alt_root);
+        strcat(alt_path, strrchr(name, '/'));
+        fd = open(alt_path, O_RDONLY);
+        if (fd >= 0) {
+          if (_libsaproc_debug) {
+            printf("libsaproc DEBUG: libsaproc_open substituted %s\n", alt_path);
+          }
+          return fd;
+        }
+      }
     }
   }
-  return -1;
+
+  {
+    mode_t mode;
+    va_list ap;
+    va_start(ap, oflag);
+    mode = va_arg(ap, mode_t);
+    va_end(ap);
+
+    return open(name, oflag, mode);
+  }
 }
 
-static int pathmap_open(const char* name) {
-  int fd = open(name, O_RDONLY);
-  if (fd < 0) {
-    fd = find_file_hook(name, 0);
-  }
-  return fd;
-}
 
 static void * pathmap_dlopen(const char * name, int mode) {
   init_alt_root();
@@ -608,7 +617,7 @@ init_classsharing_workaround(void *cd, const prmap_t* pmap, const char* obj_name
   print_debug("looking for %s\n", classes_jsa);
 
   // open the classes[_g].jsa
-  int fd = pathmap_open(classes_jsa);
+  int fd = libsaproc_open(classes_jsa, O_RDONLY);
   if (fd < 0) {
     char errMsg[ERR_MSG_SIZE];
     sprintf(errMsg, "can't open shared archive file %s", classes_jsa);
@@ -1209,8 +1218,6 @@ JNIEXPORT jstring JNICALL Java_sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal_d
   return res;
 }
 
-typedef int (*find_file_hook_t)(const char *, int elf_checksum);
-
 /*
  * Class:       sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal
  * Method:      initIDs
@@ -1230,16 +1237,6 @@ JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_proc_ProcDebuggerLocal_init
   if (libproc_handle == 0)
      THROW_NEW_DEBUGGER_EXCEPTION("can't load libproc.so, if you are using Solaris 5.7 or below, copy libproc.so from 5.8!");
 
-  // If possible, set shared object find file hook.
-  void (*set_hook)(find_file_hook_t) = (void(*)(find_file_hook_t))dlsym(libproc_handle, "Pset_find_file_hook");
-  if (set_hook) {
-    // we found find file hook symbol, set up our hook function.
-    set_hook(find_file_hook);
-  } else if (getenv(SA_ALTROOT)) {
-    printf("libsaproc WARNING: %s set, but can't set file hook. " \
-           "Did you use right version of libproc.so?\n", SA_ALTROOT);
-  }
-
   p_ps_prochandle_ID = env->GetFieldID(clazz, "p_ps_prochandle", "J");
   CHECK_EXCEPTION;
 
diff --git a/hotspot/agent/src/os/solaris/proc/saproc_audit.cpp b/hotspot/agent/src/os/solaris/proc/saproc_audit.cpp
new file mode 100644
index 00000000000..605b845dd09
--- /dev/null
+++ b/hotspot/agent/src/os/solaris/proc/saproc_audit.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+#include <link.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <varargs.h>
+
+// This class sets up an interposer on open calls from libproc.so to
+// support a pathmap facility in the SA.
+
+static uintptr_t* libproc_cookie;
+static uintptr_t* libc_cookie;
+static uintptr_t* libsaproc_cookie;
+
+
+uint_t
+la_version(uint_t version)
+{
+  return (LAV_CURRENT);
+}
+
+
+uint_t
+la_objopen(Link_map * lmp, Lmid_t lmid, uintptr_t * cookie)
+{
+  if (strstr(lmp->l_name, "/libproc.so") != NULL) {
+    libproc_cookie = cookie;
+    return LA_FLG_BINDFROM;
+  }
+  if (strstr(lmp->l_name, "/libc.so") != NULL) {
+    libc_cookie = cookie;
+    return LA_FLG_BINDTO;
+  }
+  if (strstr(lmp->l_name, "/libsaproc.so") != NULL) {
+    libsaproc_cookie = cookie;
+    return LA_FLG_BINDTO | LA_FLG_BINDFROM;
+  }
+  return 0;
+}
+
+
+#if     defined(_LP64)
+uintptr_t
+la_symbind64(Elf64_Sym *symp, uint_t symndx, uintptr_t *refcook,
+             uintptr_t *defcook, uint_t *sb_flags, const char *sym_name)
+#else
+uintptr_t
+la_symbind32(Elf32_Sym *symp, uint_t symndx, uintptr_t *refcook,
+             uintptr_t *defcook, uint_t *sb_flags)
+#endif
+{
+#if     !defined(_LP64)
+  const char      *sym_name = (const char *)symp->st_name;
+#endif
+  if (strcmp(sym_name, "open") == 0 && refcook == libproc_cookie) {
+    // redirect all open calls from libproc.so through libsaproc_open which will
+    // try the alternate library locations first.
+    void* handle = dlmopen(LM_ID_BASE, "libsaproc.so", RTLD_NOLOAD);
+    if (handle == NULL) {
+      fprintf(stderr, "libsaproc_audit.so: didn't find libsaproc.so during linking\n");
+    } else {
+      uintptr_t libsaproc_open = (uintptr_t)dlsym(handle, "libsaproc_open");
+      if (libsaproc_open == 0) {
+        fprintf(stderr, "libsaproc_audit.so: didn't find libsaproc_open during linking\n");
+      } else {
+        return libsaproc_open;
+      }
+    }
+  }
+  return symp->st_value;
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java
index 284c6813b93..36bcd026096 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -259,7 +259,7 @@ public class NMethod extends CodeBlob {
     if (Assert.ASSERTS_ENABLED) {
       Assert.that(pd != null, "scope must be present");
     }
-    return new ScopeDesc(this, pd.getScopeDecodeOffset());
+    return new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getReexecute());
   }
 
   /** This is only for use by the debugging system, and is only
@@ -291,7 +291,7 @@ public class NMethod extends CodeBlob {
   public ScopeDesc getScopeDescNearDbg(Address pc) {
     PCDesc pd = getPCDescNearDbg(pc);
     if (pd == null) return null;
-    return new ScopeDesc(this, pd.getScopeDecodeOffset());
+    return new ScopeDesc(this, pd.getScopeDecodeOffset(), pd.getReexecute());
   }
 
   public Map/*<Address, PcDesc>*/ getSafepoints() {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java
index fe0388bb6fa..e28afc51db3 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -36,6 +36,7 @@ import sun.jvm.hotspot.types.*;
 public class PCDesc extends VMObject {
   private static CIntegerField pcOffsetField;
   private static CIntegerField scopeDecodeOffsetField;
+  private static CIntegerField pcFlagsField;
 
   static {
     VM.registerVMInitializedObserver(new Observer() {
@@ -50,6 +51,7 @@ public class PCDesc extends VMObject {
 
     pcOffsetField          = type.getCIntegerField("_pc_offset");
     scopeDecodeOffsetField = type.getCIntegerField("_scope_decode_offset");
+    pcFlagsField           = type.getCIntegerField("_flags");
   }
 
   public PCDesc(Address addr) {
@@ -70,6 +72,12 @@ public class PCDesc extends VMObject {
     return code.instructionsBegin().addOffsetTo(getPCOffset());
   }
 
+
+  public boolean getReexecute() {
+    int flags = (int)pcFlagsField.getValue(addr);
+    return ((flags & 0x1)== 1); //first is the reexecute bit
+  }
+
   public void print(NMethod code) {
     printOn(System.out, code);
   }
@@ -82,6 +90,7 @@ public class PCDesc extends VMObject {
       tty.print(" ");
       sd.getMethod().printValueOn(tty);
       tty.print("  @" + sd.getBCI());
+      tty.print("  reexecute=" + sd.getReexecute());
       tty.println();
     }
   }
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java
index 93b498efbd4..ebac4a2358e 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java
@@ -41,6 +41,7 @@ public class ScopeDesc {
   private NMethod code;
   private Method  method;
   private int     bci;
+  private boolean reexecute;
   /** Decoding offsets */
   private int     decodeOffset;
   private int     senderDecodeOffset;
@@ -51,10 +52,11 @@ public class ScopeDesc {
   private List    objects; // ArrayList<ScopeValue>
 
 
-  public ScopeDesc(NMethod code, int decodeOffset) {
+  public ScopeDesc(NMethod code, int decodeOffset, boolean reexecute) {
     this.code = code;
     this.decodeOffset = decodeOffset;
     this.objects      = decodeObjectValues(DebugInformationRecorder.SERIALIZED_NULL);
+    this.reexecute    = reexecute;
 
     // Decode header
     DebugInfoReadStream stream  = streamAt(decodeOffset);
@@ -68,10 +70,11 @@ public class ScopeDesc {
     monitorsDecodeOffset    = stream.readInt();
   }
 
-  public ScopeDesc(NMethod code, int decodeOffset, int objectDecodeOffset) {
+  public ScopeDesc(NMethod code, int decodeOffset, int objectDecodeOffset, boolean reexecute) {
     this.code = code;
     this.decodeOffset = decodeOffset;
     this.objects      = decodeObjectValues(objectDecodeOffset);
+    this.reexecute    = reexecute;
 
     // Decode header
     DebugInfoReadStream stream  = streamAt(decodeOffset);
@@ -85,9 +88,10 @@ public class ScopeDesc {
     monitorsDecodeOffset    = stream.readInt();
   }
 
-  public NMethod getNMethod() { return code; }
-  public Method getMethod() { return method; }
-  public int    getBCI()    { return bci;    }
+  public NMethod getNMethod()   { return code; }
+  public Method getMethod()     { return method; }
+  public int    getBCI()        { return bci;    }
+  public boolean getReexecute() { return reexecute;}
 
   /** Returns a List&lt;ScopeValue&gt; */
   public List getLocals() {
@@ -115,7 +119,7 @@ public class ScopeDesc {
       return null;
     }
 
-    return new ScopeDesc(code, senderDecodeOffset);
+    return new ScopeDesc(code, senderDecodeOffset, false);
   }
 
   /** Returns where the scope was decoded */
@@ -149,7 +153,8 @@ public class ScopeDesc {
   public void printValueOn(PrintStream tty) {
     tty.print("ScopeDesc for ");
     method.printValueOn(tty);
-    tty.println(" @bci " + bci);
+    tty.print(" @bci " + bci);
+    tty.println(" reexecute=" + reexecute);
   }
 
   // FIXME: add more accessors
@@ -157,7 +162,6 @@ public class ScopeDesc {
   //--------------------------------------------------------------------------------
   // Internals only below this point
   //
-
   private DebugInfoReadStream streamAt(int decodeOffset) {
     return new DebugInfoReadStream(code, decodeOffset, objects);
   }
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java
index 97ec593e187..e8ffd9bbf18 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java
@@ -176,19 +176,6 @@ public class CompactibleFreeListSpace extends CompactibleSpace {
 
       for (; cur.lessThan(limit);) {
          Address klassOop = cur.getAddressAt(addressSize);
-         // FIXME: need to do a better job here.
-         // can I use bitMap here?
-         if (klassOop == null) {
-            //Find the object size using Printezis bits and skip over
-            System.err.println("Finding object size using Printezis bits and skipping over...");
-            long size = collector().blockSizeUsingPrintezisBits(cur);
-            if (size == -1) {
-              System.err.println("Printezis bits not set...");
-              break;
-            }
-            cur = cur.addOffsetTo(adjustObjectSizeInBytes(size));
-         }
-
          if (FreeChunk.indicatesFreeChunk(cur)) {
             if (! cur.equals(regionStart)) {
                res.add(new MemRegion(regionStart, cur));
@@ -200,12 +187,21 @@ public class CompactibleFreeListSpace extends CompactibleSpace {
             }
             // note that fc.size() gives chunk size in heap words
             cur = cur.addOffsetTo(chunkSize * addressSize);
-            System.err.println("Free chunk in CMS heap, size="+chunkSize * addressSize);
             regionStart = cur;
          } else if (klassOop != null) {
             Oop obj = heap.newOop(cur.addOffsetToAsOopHandle(0));
             long objectSize = obj.getObjectSize();
             cur = cur.addOffsetTo(adjustObjectSizeInBytes(objectSize));
+         } else {
+            // FIXME: need to do a better job here.
+            // can I use bitMap here?
+            //Find the object size using Printezis bits and skip over
+            long size = collector().blockSizeUsingPrintezisBits(cur);
+            if (size == -1) {
+              System.err.println("Printezis bits not set...");
+              break;
+            }
+            cur = cur.addOffsetTo(adjustObjectSizeInBytes(size));
          }
       }
       return res;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java
index 42db3e3a856..db7628e196b 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java
@@ -63,7 +63,7 @@ public class FreeChunk extends VMObject {
 
    public long size() {
       if (VM.getVM().isCompressedOopsEnabled()) {
-        Mark mark = new Mark(sizeField.getValue(addr));
+        Mark mark = new Mark(addr.addOffsetTo(sizeField.getOffset()));
         return mark.getSize();
       } else {
         Address size = sizeField.getValue(addr);
@@ -83,7 +83,7 @@ public class FreeChunk extends VMObject {
 
    public boolean isFree() {
       if (VM.getVM().isCompressedOopsEnabled()) {
-        Mark mark = new Mark(sizeField.getValue(addr));
+        Mark mark = new Mark(addr.addOffsetTo(sizeField.getOffset()));
         return mark.isCmsFreeChunk();
       } else {
         Address prev = prevField.getValue(addr);
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index bbcda0a80e3..1e60768f056 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -33,9 +33,9 @@
 # Don't put quotes (fail windows build).
 HOTSPOT_VM_COPYRIGHT=Copyright 2009
 
-HS_MAJOR_VER=16
+HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=07
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties
index c0cb616c530..66243d17550 100644
--- a/hotspot/make/jprt.properties
+++ b/hotspot/make/jprt.properties
@@ -40,6 +40,10 @@ jprt.need.sibling.build=false
 
 jprt.tools.default.release=${jprt.submit.release}
 
+# Disable syncing the source after builds and tests are done.
+
+jprt.sync.push=false
+
 # Define the Solaris platforms we want for the various releases
 
 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
@@ -306,7 +310,6 @@ jprt.my.windows.x64.test.targets = \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
-    ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_G1, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_default, \
     ${jprt.my.windows.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
diff --git a/hotspot/src/cpu/sparc/vm/c1_Defs_sparc.hpp b/hotspot/src/cpu/sparc/vm/c1_Defs_sparc.hpp
index 5d529c59507..d35fee49122 100644
--- a/hotspot/src/cpu/sparc/vm/c1_Defs_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/c1_Defs_sparc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -38,7 +38,7 @@ enum {
 // registers
 enum {
   pd_nof_cpu_regs_frame_map = 32,  // number of registers used during code emission
-  pd_nof_caller_save_cpu_regs_frame_map = 6,  // number of cpu registers killed by calls
+  pd_nof_caller_save_cpu_regs_frame_map = 10,  // number of cpu registers killed by calls
   pd_nof_cpu_regs_reg_alloc = 20,  // number of registers that are visible to register allocator
   pd_nof_cpu_regs_linearscan = 32,// number of registers visible linear scan
   pd_first_cpu_reg = 0,
diff --git a/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp
index fbdf455a082..8f1bc9b42a9 100644
--- a/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp
@@ -320,6 +320,10 @@ void FrameMap::init () {
   _caller_save_cpu_regs[3] = FrameMap::O3_opr;
   _caller_save_cpu_regs[4] = FrameMap::O4_opr;
   _caller_save_cpu_regs[5] = FrameMap::O5_opr;
+  _caller_save_cpu_regs[6] = FrameMap::G1_opr;
+  _caller_save_cpu_regs[7] = FrameMap::G3_opr;
+  _caller_save_cpu_regs[8] = FrameMap::G4_opr;
+  _caller_save_cpu_regs[9] = FrameMap::G5_opr;
   for (int i = 0; i < nof_caller_save_fpu_regs; i++) {
     _caller_save_fpu_regs[i] = LIR_OprFact::single_fpu(i);
   }
diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
index 379ae282de3..f9e123bbb2e 100644
--- a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
@@ -749,6 +749,10 @@ void LIRGenerator::do_MathIntrinsic(Intrinsic* x) {
 
 void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   assert(x->number_of_arguments() == 5, "wrong type");
+
+  // Make all state_for calls early since they can emit code
+  CodeEmitInfo* info = state_for(x, x->state());
+
   // Note: spill caller save before setting the item
   LIRItem src     (x->argument_at(0), this);
   LIRItem src_pos (x->argument_at(1), this);
@@ -767,7 +771,6 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
   ciArrayKlass* expected_type;
   arraycopy_helper(x, &flags, &expected_type);
 
-  CodeEmitInfo* info = state_for(x, x->state());
   __ arraycopy(src.result(), src_pos.result(), dst.result(), dst_pos.result(),
                length.result(), rlock_callee_saved(T_INT),
                expected_type, flags, info);
@@ -878,6 +881,9 @@ void LIRGenerator::do_NewInstance(NewInstance* x) {
 
 
 void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
+  // Evaluate state_for early since it may emit code
+  CodeEmitInfo* info = state_for(x, x->state());
+
   LIRItem length(x->length(), this);
   length.load_item();
 
@@ -892,7 +898,6 @@ void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
 
   __ oop2reg(ciTypeArrayKlass::make(elem_type)->encoding(), klass_reg);
 
-  CodeEmitInfo* info = state_for(x, x->state());
   CodeStub* slow_path = new NewTypeArrayStub(klass_reg, len, reg, info);
   __ allocate_array(reg, len, tmp1, tmp2, tmp3, tmp4, elem_type, klass_reg, slow_path);
 
@@ -902,7 +907,8 @@ void LIRGenerator::do_NewTypeArray(NewTypeArray* x) {
 
 
 void LIRGenerator::do_NewObjectArray(NewObjectArray* x) {
-  LIRItem length(x->length(), this);
+  // Evaluate state_for early since it may emit code.
+  CodeEmitInfo* info = state_for(x, x->state());
   // in case of patching (i.e., object class is not yet loaded), we need to reexecute the instruction
   // and therefore provide the state before the parameters have been consumed
   CodeEmitInfo* patching_info = NULL;
@@ -910,6 +916,7 @@ void LIRGenerator::do_NewObjectArray(NewObjectArray* x) {
     patching_info = state_for(x, x->state_before());
   }
 
+  LIRItem length(x->length(), this);
   length.load_item();
 
   const LIR_Opr reg = result_register_for(x->type());
@@ -919,7 +926,6 @@ void LIRGenerator::do_NewObjectArray(NewObjectArray* x) {
   LIR_Opr tmp4 = FrameMap::O1_oop_opr;
   LIR_Opr klass_reg = FrameMap::G5_oop_opr;
   LIR_Opr len = length.result();
-  CodeEmitInfo* info = state_for(x, x->state());
 
   CodeStub* slow_path = new NewObjectArrayStub(klass_reg, len, reg, info);
   ciObject* obj = (ciObject*) ciObjArrayKlass::make(x->klass());
@@ -943,25 +949,22 @@ void LIRGenerator::do_NewMultiArray(NewMultiArray* x) {
     items->at_put(i, size);
   }
 
-  // need to get the info before, as the items may become invalid through item_free
+  // Evaluate state_for early since it may emit code.
   CodeEmitInfo* patching_info = NULL;
   if (!x->klass()->is_loaded() || PatchALot) {
     patching_info = state_for(x, x->state_before());
 
     // cannot re-use same xhandlers for multiple CodeEmitInfos, so
-    // clone all handlers
+    // clone all handlers.  This is handled transparently in other
+    // places by the CodeEmitInfo cloning logic but is handled
+    // specially here because a stub isn't being used.
     x->set_exception_handlers(new XHandlers(x->exception_handlers()));
   }
+  CodeEmitInfo* info = state_for(x, x->state());
 
   i = dims->length();
   while (i-- > 0) {
     LIRItem* size = items->at(i);
-    // if a patching_info was generated above then debug information for the state before
-    // the call is going to be emitted.  The LIRGenerator calls above may have left some values
-    // in registers and that's been recorded in the CodeEmitInfo.  In that case the items
-    // for those values can't simply be freed if they are registers because the values
-    // might be destroyed by store_stack_parameter.  So in the case of patching, delay the
-    // freeing of the items that already were in registers
     size->load_item();
     store_stack_parameter (size->result(),
                            in_ByteSize(STACK_BIAS +
@@ -972,8 +975,6 @@ void LIRGenerator::do_NewMultiArray(NewMultiArray* x) {
   // This instruction can be deoptimized in the slow path : use
   // O0 as result register.
   const LIR_Opr reg = result_register_for(x->type());
-  CodeEmitInfo* info = state_for(x, x->state());
-
   jobject2reg_with_patching(reg, x->klass(), patching_info);
   LIR_Opr rank = FrameMap::O1_opr;
   __ move(LIR_OprFact::intConst(x->rank()), rank);
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
index 4a67b42b2d1..20e6d08c48f 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
@@ -8335,15 +8335,13 @@ void  MacroAssembler::decode_heap_oop_not_null(Register r) {
   // Cannot assert, unverified entry point counts instructions (see .ad file)
   // vtableStubs also counts instructions in pd_code_size_limit.
   // Also do not verify_oop as this is called by verify_oop.
-  if (Universe::narrow_oop_base() == NULL) {
-    if (Universe::narrow_oop_shift() != 0) {
-      assert (LogMinObjAlignmentInBytes == Universe::narrow_oop_shift(), "decode alg wrong");
-      shlq(r, LogMinObjAlignmentInBytes);
-    }
-  } else {
-      assert (Address::times_8 == LogMinObjAlignmentInBytes &&
-              Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong");
+  if (Universe::narrow_oop_shift() != 0) {
+    assert (Address::times_8 == LogMinObjAlignmentInBytes &&
+            Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong");
+    // Don't use Shift since it modifies flags.
     leaq(r, Address(r12_heapbase, r, Address::times_8, 0));
+  } else {
+    assert (Universe::narrow_oop_base() == NULL, "sanity");
   }
 }
 
@@ -8358,6 +8356,7 @@ void  MacroAssembler::decode_heap_oop_not_null(Register dst, Register src) {
             Address::times_8 == Universe::narrow_oop_shift(), "decode alg wrong");
     leaq(dst, Address(r12_heapbase, src, Address::times_8, 0));
   } else if (dst != src) {
+    assert (Universe::narrow_oop_base() == NULL, "sanity");
     movq(dst, src);
   }
 }
diff --git a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
index 5b46c4a88ce..997babc7afe 100644
--- a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
@@ -1047,16 +1047,17 @@ void LIRGenerator::do_NewMultiArray(NewMultiArray* x) {
     items->at_put(i, size);
   }
 
-  // need to get the info before, as the items may become invalid through item_free
+  // Evaluate state_for early since it may emit code.
   CodeEmitInfo* patching_info = NULL;
   if (!x->klass()->is_loaded() || PatchALot) {
     patching_info = state_for(x, x->state_before());
 
     // cannot re-use same xhandlers for multiple CodeEmitInfos, so
-    // clone all handlers.
+    // clone all handlers.  This is handled transparently in other
+    // places by the CodeEmitInfo cloning logic but is handled
+    // specially here because a stub isn't being used.
     x->set_exception_handlers(new XHandlers(x->exception_handlers()));
   }
-
   CodeEmitInfo* info = state_for(x, x->state());
 
   i = dims->length();
diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
index de240202957..da845f9bd1c 100644
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
@@ -2381,7 +2381,7 @@ void SharedRuntime::generate_deopt_blob() {
 
   // Save everything in sight.
 
-  map = RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
+  map = RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
   // Normal deoptimization
   __ push(Deoptimization::Unpack_deopt);
   __ jmp(cont);
@@ -2392,7 +2392,7 @@ void SharedRuntime::generate_deopt_blob() {
   // return address is the pc describes what bci to do re-execute at
 
   // No need to update map as each call to save_live_registers will produce identical oopmap
-  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
+  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
 
   __ push(Deoptimization::Unpack_reexecute);
   __ jmp(cont);
@@ -2428,7 +2428,7 @@ void SharedRuntime::generate_deopt_blob() {
   // Save everything in sight.
 
   // No need to update map as each call to save_live_registers will produce identical oopmap
-  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words);
+  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
 
   // Now it is safe to overwrite any register
 
@@ -2515,6 +2515,11 @@ void SharedRuntime::generate_deopt_blob() {
 
   RegisterSaver::restore_result_registers(masm);
 
+  // Non standard control word may be leaked out through a safepoint blob, and we can
+  // deopt at a poll point with the non standard control word. However, we should make
+  // sure the control word is correct after restore_result_registers.
+  __ fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_std()));
+
   // All of the register save area has been popped of the stack. Only the
   // return address remains.
 
diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index ce201c3faca..13abbf9d4b9 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -1643,7 +1643,8 @@ inline hrtime_t oldgetTimeNanos() {
 inline hrtime_t getTimeNanos() {
   if (VM_Version::supports_cx8()) {
     const hrtime_t now = gethrtime();
-    const hrtime_t prev = max_hrtime;
+    // Use atomic long load since 32-bit x86 uses 2 registers to keep long.
+    const hrtime_t prev = Atomic::load((volatile jlong*)&max_hrtime);
     if (now <= prev)  return prev;   // same or retrograde time;
     const hrtime_t obsv = Atomic::cmpxchg(now, (volatile jlong*)&max_hrtime, prev);
     assert(obsv >= prev, "invariant");   // Monotonicity
diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index 1cf0cee81b1..9f90cf2b428 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -616,12 +616,13 @@ julong os::available_memory() {
 }
 
 julong os::win32::available_memory() {
-  // FIXME: GlobalMemoryStatus() may return incorrect value if total memory
-  // is larger than 4GB
-  MEMORYSTATUS ms;
-  GlobalMemoryStatus(&ms);
+  // Use GlobalMemoryStatusEx() because GlobalMemoryStatus() may return incorrect
+  // value if total memory is larger than 4GB
+  MEMORYSTATUSEX ms;
+  ms.dwLength = sizeof(ms);
+  GlobalMemoryStatusEx(&ms);
 
-  return (julong)ms.dwAvailPhys;
+  return (julong)ms.ullAvailPhys;
 }
 
 julong os::physical_memory() {
@@ -1579,16 +1580,17 @@ void os::print_memory_info(outputStream* st) {
   st->print("Memory:");
   st->print(" %dk page", os::vm_page_size()>>10);
 
-  // FIXME: GlobalMemoryStatus() may return incorrect value if total memory
-  // is larger than 4GB
-  MEMORYSTATUS ms;
-  GlobalMemoryStatus(&ms);
+  // Use GlobalMemoryStatusEx() because GlobalMemoryStatus() may return incorrect
+  // value if total memory is larger than 4GB
+  MEMORYSTATUSEX ms;
+  ms.dwLength = sizeof(ms);
+  GlobalMemoryStatusEx(&ms);
 
   st->print(", physical %uk", os::physical_memory() >> 10);
   st->print("(%uk free)", os::available_memory() >> 10);
 
-  st->print(", swap %uk", ms.dwTotalPageFile >> 10);
-  st->print("(%uk free)", ms.dwAvailPageFile >> 10);
+  st->print(", swap %uk", ms.ullTotalPageFile >> 10);
+  st->print("(%uk free)", ms.ullAvailPageFile >> 10);
   st->cr();
 }
 
@@ -3135,11 +3137,13 @@ void os::win32::initialize_system_info() {
   _processor_level = si.wProcessorLevel;
   _processor_count = si.dwNumberOfProcessors;
 
-  MEMORYSTATUS ms;
+  MEMORYSTATUSEX ms;
+  ms.dwLength = sizeof(ms);
+
   // also returns dwAvailPhys (free physical memory bytes), dwTotalVirtual, dwAvailVirtual,
   // dwMemoryLoad (% of memory in use)
-  GlobalMemoryStatus(&ms);
-  _physical_memory = ms.dwTotalPhys;
+  GlobalMemoryStatusEx(&ms);
+  _physical_memory = ms.ullTotalPhys;
 
   OSVERSIONINFO oi;
   oi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp b/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
index e3ee2bc23ba..d4ff200619f 100644
--- a/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
@@ -46,6 +46,8 @@ inline void Atomic::dec    (volatile jint*     dest) { (void)add    (-1, dest);
 inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); }
 inline void Atomic::dec_ptr(volatile void*     dest) { (void)add_ptr(-1, dest); }
 
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
 #ifdef _GNU_SOURCE
 
 inline jint     Atomic::add    (jint     add_value, volatile jint*     dest) {
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp b/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
index 469e0180062..d127d6ea902 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
+++ b/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
@@ -99,6 +99,8 @@ inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*
   return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP());
 }
 
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
 #else // !AMD64
 
 inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
@@ -131,6 +133,15 @@ inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t*
 inline void*    Atomic::cmpxchg_ptr(void*    exchange_value, volatile void*     dest, void*    compare_value) {
   return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
 }
+
+extern "C" void _Atomic_load_long(volatile jlong* src, volatile jlong* dst);
+
+inline jlong Atomic::load(volatile jlong* src) {
+  volatile jlong dest;
+  _Atomic_load_long(src, &dest);
+  return dest;
+}
+
 #endif // AMD64
 
 #ifdef _GNU_SOURCE
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il
index 5ac1d25a766..0ffd87d85c3 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il
@@ -97,6 +97,15 @@
       popl     %ebx
       .end
 
+  // Support for void Atomic::load(volatile jlong* src, volatile jlong* dest).
+      .inline _Atomic_load_long,2
+      movl     0(%esp), %eax   // src
+      fildll    (%eax)
+      movl     4(%esp), %eax   // dest
+      fistpll   (%eax)
+      .end
+
+
   // Support for OrderAccess::acquire()
       .inline _OrderAccess_acquire,0
       movl     0(%esp), %eax
diff --git a/hotspot/src/share/vm/c1/c1_IR.cpp b/hotspot/src/share/vm/c1/c1_IR.cpp
index f1a268de40e..47e1c0d4151 100644
--- a/hotspot/src/share/vm/c1/c1_IR.cpp
+++ b/hotspot/src/share/vm/c1/c1_IR.cpp
@@ -208,6 +208,15 @@ int IRScope::top_scope_bci() const {
   return scope->caller_bci();
 }
 
+bool IRScopeDebugInfo::should_reexecute() {
+  ciMethod* cur_method = scope()->method();
+  int       cur_bci    = bci();
+  if (cur_method != NULL && cur_bci != SynchronizationEntryBCI) {
+    Bytecodes::Code code = cur_method->java_code_at_bci(cur_bci);
+    return Interpreter::bytecode_should_reexecute(code);
+  } else
+    return false;
+}
 
 
 // Implementation of CodeEmitInfo
@@ -253,7 +262,7 @@ CodeEmitInfo::CodeEmitInfo(CodeEmitInfo* info, bool lock_stack_only)
 void CodeEmitInfo::record_debug_info(DebugInformationRecorder* recorder, int pc_offset) {
   // record the safepoint before recording the debug info for enclosing scopes
   recorder->add_safepoint(pc_offset, _oop_map->deep_copy());
-  _scope_debug_info->record_debug_info(recorder, pc_offset);
+  _scope_debug_info->record_debug_info(recorder, pc_offset, true/*topmost*/);
   recorder->end_safepoint(pc_offset);
 }
 
diff --git a/hotspot/src/share/vm/c1/c1_IR.hpp b/hotspot/src/share/vm/c1/c1_IR.hpp
index ecd5b4ba522..a3bcc2a477f 100644
--- a/hotspot/src/share/vm/c1/c1_IR.hpp
+++ b/hotspot/src/share/vm/c1/c1_IR.hpp
@@ -239,15 +239,20 @@ class IRScopeDebugInfo: public CompilationResourceObj {
   GrowableArray<MonitorValue*>* monitors()    { return _monitors;    }
   IRScopeDebugInfo*             caller()      { return _caller;      }
 
-  void record_debug_info(DebugInformationRecorder* recorder, int pc_offset) {
+  //Whether we should reexecute this bytecode for deopt
+  bool should_reexecute();
+
+  void record_debug_info(DebugInformationRecorder* recorder, int pc_offset, bool topmost) {
     if (caller() != NULL) {
       // Order is significant:  Must record caller first.
-      caller()->record_debug_info(recorder, pc_offset);
+      caller()->record_debug_info(recorder, pc_offset, false/*topmost*/);
     }
     DebugToken* locvals = recorder->create_scope_values(locals());
     DebugToken* expvals = recorder->create_scope_values(expressions());
     DebugToken* monvals = recorder->create_monitor_values(monitors());
-    recorder->describe_scope(pc_offset, scope()->method(), bci(), locvals, expvals, monvals);
+    // reexecute allowed only for the topmost frame
+    bool      reexecute = topmost ? should_reexecute() : false;
+    recorder->describe_scope(pc_offset, scope()->method(), bci(), reexecute, locvals, expvals, monvals);
   }
 };
 
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
index 5a46b03e5d8..d12a23ca21e 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
@@ -379,7 +379,8 @@ void LIR_Assembler::record_non_safepoint_debug_info() {
     ValueStack* s = nth_oldest(vstack, n, s_bci);
     if (s == NULL)  break;
     IRScope* scope = s->scope();
-    debug_info->describe_scope(pc_offset, scope->method(), s_bci);
+    //Always pass false for reexecute since these ScopeDescs are never used for deopt
+    debug_info->describe_scope(pc_offset, scope->method(), s_bci, false/*reexecute*/);
   }
 
   debug_info->end_non_safepoint(pc_offset);
diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.cpp b/hotspot/src/share/vm/ci/ciObjectFactory.cpp
index 1f862f85e12..f0cfd32a93c 100644
--- a/hotspot/src/share/vm/ci/ciObjectFactory.cpp
+++ b/hotspot/src/share/vm/ci/ciObjectFactory.cpp
@@ -219,24 +219,27 @@ ciObject* ciObjectFactory::get(oop key) {
   ASSERT_IN_VM;
 
 #ifdef ASSERT
-  oop last = NULL;
-  for (int j = 0; j< _ci_objects->length(); j++) {
-    oop o = _ci_objects->at(j)->get_oop();
-    assert(last < o, "out of order");
-    last = o;
+  if (CIObjectFactoryVerify) {
+    oop last = NULL;
+    for (int j = 0; j< _ci_objects->length(); j++) {
+      oop o = _ci_objects->at(j)->get_oop();
+      assert(last < o, "out of order");
+      last = o;
+    }
   }
 #endif // ASSERT
   int len = _ci_objects->length();
   int index = find(key, _ci_objects);
 #ifdef ASSERT
-  for (int i=0; i<_ci_objects->length(); i++) {
-    if (_ci_objects->at(i)->get_oop() == key) {
-      assert(index == i, " bad lookup");
+  if (CIObjectFactoryVerify) {
+    for (int i=0; i<_ci_objects->length(); i++) {
+      if (_ci_objects->at(i)->get_oop() == key) {
+        assert(index == i, " bad lookup");
+      }
     }
   }
 #endif
   if (!is_found_at(index, key, _ci_objects)) {
-
     // Check in the non-perm area before putting it in the list.
     NonPermObject* &bucket = find_non_perm(key);
     if (bucket != NULL) {
@@ -539,11 +542,13 @@ void ciObjectFactory::insert(int index, ciObject* obj, GrowableArray<ciObject*>*
     objects->at_put(index, obj);
   }
 #ifdef ASSERT
-  oop last = NULL;
-  for (int j = 0; j< objects->length(); j++) {
-    oop o = objects->at(j)->get_oop();
-    assert(last < o, "out of order");
-    last = o;
+  if (CIObjectFactoryVerify) {
+    oop last = NULL;
+    for (int j = 0; j< objects->length(); j++) {
+      oop o = objects->at(j)->get_oop();
+      assert(last < o, "out of order");
+      last = o;
+    }
   }
 #endif // ASSERT
 }
diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 4e7db3b303a..17684ff19c6 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -547,7 +547,6 @@ objArrayHandle ClassFileParser::parse_interfaces(constantPoolHandle cp,
                                                  int length,
                                                  Handle class_loader,
                                                  Handle protection_domain,
-                                                 PerfTraceTime* vmtimer,
                                                  symbolHandle class_name,
                                                  TRAPS) {
   ClassFileStream* cfs = stream();
@@ -575,13 +574,11 @@ objArrayHandle ClassFileParser::parse_interfaces(constantPoolHandle cp,
       guarantee_property(unresolved_klass->byte_at(0) != JVM_SIGNATURE_ARRAY,
                          "Bad interface name in class file %s", CHECK_(nullHandle));
 
-      vmtimer->suspend();  // do not count recursive loading twice
       // Call resolve_super so classcircularity is checked
       klassOop k = SystemDictionary::resolve_super_or_fail(class_name,
                     unresolved_klass, class_loader, protection_domain,
                     false, CHECK_(nullHandle));
       interf = KlassHandle(THREAD, k);
-      vmtimer->resume();
 
       if (LinkWellKnownClasses)  // my super type is well known to me
         cp->klass_at_put(interface_index, interf()); // eagerly resolve
@@ -769,16 +766,16 @@ enum FieldAllocationType {
 
 
 struct FieldAllocationCount {
-  int static_oop_count;
-  int static_byte_count;
-  int static_short_count;
-  int static_word_count;
-  int static_double_count;
-  int nonstatic_oop_count;
-  int nonstatic_byte_count;
-  int nonstatic_short_count;
-  int nonstatic_word_count;
-  int nonstatic_double_count;
+  unsigned int static_oop_count;
+  unsigned int static_byte_count;
+  unsigned int static_short_count;
+  unsigned int static_word_count;
+  unsigned int static_double_count;
+  unsigned int nonstatic_oop_count;
+  unsigned int nonstatic_byte_count;
+  unsigned int nonstatic_short_count;
+  unsigned int nonstatic_word_count;
+  unsigned int nonstatic_double_count;
 };
 
 typeArrayHandle ClassFileParser::parse_fields(constantPoolHandle cp, bool is_interface,
@@ -2558,7 +2555,15 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
 
   ClassFileStream* cfs = stream();
   // Timing
-  PerfTraceTime vmtimer(ClassLoader::perf_accumulated_time());
+  assert(THREAD->is_Java_thread(), "must be a JavaThread");
+  JavaThread* jt = (JavaThread*) THREAD;
+
+  PerfClassTraceTime ctimer(ClassLoader::perf_class_parse_time(),
+                            ClassLoader::perf_class_parse_selftime(),
+                            NULL,
+                            jt->get_thread_stat()->perf_recursion_counts_addr(),
+                            jt->get_thread_stat()->perf_timers_addr(),
+                            PerfClassTraceTime::PARSE_CLASS);
 
   _has_finalizer = _has_empty_finalizer = _has_vanilla_constructor = false;
 
@@ -2738,7 +2743,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
     if (itfs_len == 0) {
       local_interfaces = objArrayHandle(THREAD, Universe::the_empty_system_obj_array());
     } else {
-      local_interfaces = parse_interfaces(cp, itfs_len, class_loader, protection_domain, &vmtimer, _class_name, CHECK_(nullHandle));
+      local_interfaces = parse_interfaces(cp, itfs_len, class_loader, protection_domain, _class_name, CHECK_(nullHandle));
     }
 
     // Fields (offsets are filled in later)
@@ -2782,6 +2787,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
                                                            protection_domain,
                                                            true,
                                                            CHECK_(nullHandle));
+
       KlassHandle kh (THREAD, k);
       super_klass = instanceKlassHandle(THREAD, kh());
       if (LinkWellKnownClasses)  // my super class is well known to me
@@ -2902,11 +2908,11 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
     }
     // end of "discovered" field compactibility fix
 
-    int nonstatic_double_count = fac.nonstatic_double_count;
-    int nonstatic_word_count   = fac.nonstatic_word_count;
-    int nonstatic_short_count  = fac.nonstatic_short_count;
-    int nonstatic_byte_count   = fac.nonstatic_byte_count;
-    int nonstatic_oop_count    = fac.nonstatic_oop_count;
+    unsigned int nonstatic_double_count = fac.nonstatic_double_count;
+    unsigned int nonstatic_word_count   = fac.nonstatic_word_count;
+    unsigned int nonstatic_short_count  = fac.nonstatic_short_count;
+    unsigned int nonstatic_byte_count   = fac.nonstatic_byte_count;
+    unsigned int nonstatic_oop_count    = fac.nonstatic_oop_count;
 
     bool super_has_nonstatic_fields =
             (super_klass() != NULL && super_klass->has_nonstatic_fields());
@@ -2916,26 +2922,26 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
               nonstatic_oop_count) != 0);
 
 
-    // Prepare list of oops for oop maps generation.
-    u2* nonstatic_oop_offsets;
-    u2* nonstatic_oop_length;
-    int nonstatic_oop_map_count = 0;
+    // Prepare list of oops for oop map generation.
+    int* nonstatic_oop_offsets;
+    unsigned int* nonstatic_oop_counts;
+    unsigned int nonstatic_oop_map_count = 0;
 
     nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD(
-              THREAD, u2,  nonstatic_oop_count+1);
-    nonstatic_oop_length  = NEW_RESOURCE_ARRAY_IN_THREAD(
-              THREAD, u2,  nonstatic_oop_count+1);
+              THREAD, int, nonstatic_oop_count + 1);
+    nonstatic_oop_counts  = NEW_RESOURCE_ARRAY_IN_THREAD(
+              THREAD, unsigned int, nonstatic_oop_count + 1);
 
     // Add fake fields for java.lang.Class instances (also see above).
     // FieldsAllocationStyle and CompactFields values will be reset to default.
     if(class_name() == vmSymbols::java_lang_Class() && class_loader.is_null()) {
       java_lang_Class_fix_post(&next_nonstatic_field_offset);
-      nonstatic_oop_offsets[0] = (u2)first_nonstatic_field_offset;
-      int fake_oop_count       = (( next_nonstatic_field_offset -
-                                    first_nonstatic_field_offset ) / heapOopSize);
-      nonstatic_oop_length [0] = (u2)fake_oop_count;
-      nonstatic_oop_map_count  = 1;
-      nonstatic_oop_count     -= fake_oop_count;
+      nonstatic_oop_offsets[0] = first_nonstatic_field_offset;
+      const uint fake_oop_count = (next_nonstatic_field_offset -
+                                   first_nonstatic_field_offset) / heapOopSize;
+      nonstatic_oop_counts[0] = fake_oop_count;
+      nonstatic_oop_map_count = 1;
+      nonstatic_oop_count -= fake_oop_count;
       first_nonstatic_oop_offset = first_nonstatic_field_offset;
     } else {
       first_nonstatic_oop_offset = 0; // will be set for first oop field
@@ -3113,13 +3119,15 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
           // Update oop maps
           if( nonstatic_oop_map_count > 0 &&
               nonstatic_oop_offsets[nonstatic_oop_map_count - 1] ==
-              (u2)(real_offset - nonstatic_oop_length[nonstatic_oop_map_count - 1] * heapOopSize) ) {
+              real_offset -
+              int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) *
+              heapOopSize ) {
             // Extend current oop map
-            nonstatic_oop_length[nonstatic_oop_map_count - 1] += 1;
+            nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1;
           } else {
             // Create new oop map
-            nonstatic_oop_offsets[nonstatic_oop_map_count] = (u2)real_offset;
-            nonstatic_oop_length [nonstatic_oop_map_count] = 1;
+            nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
+            nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
             nonstatic_oop_map_count += 1;
             if( first_nonstatic_oop_offset == 0 ) { // Undefined
               first_nonstatic_oop_offset = real_offset;
@@ -3176,8 +3184,10 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
 
     assert(instance_size == align_object_size(align_size_up((instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize), wordSize) / wordSize), "consistent layout helper value");
 
-    // Size of non-static oop map blocks (in words) allocated at end of klass
-    int nonstatic_oop_map_size = compute_oop_map_size(super_klass, nonstatic_oop_map_count, first_nonstatic_oop_offset);
+    // Number of non-static oop map blocks allocated at end of klass.
+    const unsigned int total_oop_map_count =
+      compute_oop_map_count(super_klass, nonstatic_oop_map_count,
+                            first_nonstatic_oop_offset);
 
     // Compute reference type
     ReferenceType rt;
@@ -3188,14 +3198,15 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
     }
 
     // We can now create the basic klassOop for this klass
-    klassOop ik = oopFactory::new_instanceKlass(
-                                    vtable_size, itable_size,
-                                    static_field_size, nonstatic_oop_map_size,
-                                    rt, CHECK_(nullHandle));
+    klassOop ik = oopFactory::new_instanceKlass(vtable_size, itable_size,
+                                                static_field_size,
+                                                total_oop_map_count,
+                                                rt, CHECK_(nullHandle));
     instanceKlassHandle this_klass (THREAD, ik);
 
-    assert(this_klass->static_field_size() == static_field_size &&
-           this_klass->nonstatic_oop_map_size() == nonstatic_oop_map_size, "sanity check");
+    assert(this_klass->static_field_size() == static_field_size, "sanity");
+    assert(this_klass->nonstatic_oop_map_count() == total_oop_map_count,
+           "sanity");
 
     // Fill in information already parsed
     this_klass->set_access_flags(access_flags);
@@ -3276,7 +3287,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
     klassItable::setup_itable_offset_table(this_klass);
 
     // Do final class setup
-    fill_oop_maps(this_klass, nonstatic_oop_map_count, nonstatic_oop_offsets, nonstatic_oop_length);
+    fill_oop_maps(this_klass, nonstatic_oop_map_count, nonstatic_oop_offsets, nonstatic_oop_counts);
 
     set_precomputed_flags(this_klass);
 
@@ -3369,66 +3380,73 @@ instanceKlassHandle ClassFileParser::parseClassFile(symbolHandle name,
 }
 
 
-int ClassFileParser::compute_oop_map_size(instanceKlassHandle super, int nonstatic_oop_map_count, int first_nonstatic_oop_offset) {
-  int map_size = super.is_null() ? 0 : super->nonstatic_oop_map_size();
+unsigned int
+ClassFileParser::compute_oop_map_count(instanceKlassHandle super,
+                                       unsigned int nonstatic_oop_map_count,
+                                       int first_nonstatic_oop_offset) {
+  unsigned int map_count =
+    super.is_null() ? 0 : super->nonstatic_oop_map_count();
   if (nonstatic_oop_map_count > 0) {
     // We have oops to add to map
-    if (map_size == 0) {
-      map_size = nonstatic_oop_map_count;
+    if (map_count == 0) {
+      map_count = nonstatic_oop_map_count;
     } else {
-      // Check whether we should add a new map block or whether the last one can be extended
-      OopMapBlock* first_map = super->start_of_nonstatic_oop_maps();
-      OopMapBlock* last_map = first_map + map_size - 1;
+      // Check whether we should add a new map block or whether the last one can
+      // be extended
+      OopMapBlock* const first_map = super->start_of_nonstatic_oop_maps();
+      OopMapBlock* const last_map = first_map + map_count - 1;
 
-      int next_offset = last_map->offset() + (last_map->length() * heapOopSize);
+      int next_offset = last_map->offset() + last_map->count() * heapOopSize;
       if (next_offset == first_nonstatic_oop_offset) {
         // There is no gap bettwen superklass's last oop field and first
         // local oop field, merge maps.
         nonstatic_oop_map_count -= 1;
       } else {
         // Superklass didn't end with a oop field, add extra maps
-        assert(next_offset<first_nonstatic_oop_offset, "just checking");
+        assert(next_offset < first_nonstatic_oop_offset, "just checking");
       }
-      map_size += nonstatic_oop_map_count;
+      map_count += nonstatic_oop_map_count;
     }
   }
-  return map_size;
+  return map_count;
 }
 
 
 void ClassFileParser::fill_oop_maps(instanceKlassHandle k,
-                        int nonstatic_oop_map_count,
-                        u2* nonstatic_oop_offsets, u2* nonstatic_oop_length) {
+                                    unsigned int nonstatic_oop_map_count,
+                                    int* nonstatic_oop_offsets,
+                                    unsigned int* nonstatic_oop_counts) {
   OopMapBlock* this_oop_map = k->start_of_nonstatic_oop_maps();
-  OopMapBlock* last_oop_map = this_oop_map + k->nonstatic_oop_map_size();
-  instanceKlass* super = k->superklass();
-  if (super != NULL) {
-    int super_oop_map_size     = super->nonstatic_oop_map_size();
-    OopMapBlock* super_oop_map = super->start_of_nonstatic_oop_maps();
+  const instanceKlass* const super = k->superklass();
+  const unsigned int super_count = super ? super->nonstatic_oop_map_count() : 0;
+  if (super_count > 0) {
     // Copy maps from superklass
-    while (super_oop_map_size-- > 0) {
+    OopMapBlock* super_oop_map = super->start_of_nonstatic_oop_maps();
+    for (unsigned int i = 0; i < super_count; ++i) {
       *this_oop_map++ = *super_oop_map++;
     }
   }
+
   if (nonstatic_oop_map_count > 0) {
-    if (this_oop_map + nonstatic_oop_map_count > last_oop_map) {
-      // Calculated in compute_oop_map_size() number of oop maps is less then
-      // collected oop maps since there is no gap between superklass's last oop
-      // field and first local oop field. Extend the last oop map copied
+    if (super_count + nonstatic_oop_map_count > k->nonstatic_oop_map_count()) {
+      // The counts differ because there is no gap between superklass's last oop
+      // field and the first local oop field.  Extend the last oop map copied
       // from the superklass instead of creating new one.
       nonstatic_oop_map_count--;
       nonstatic_oop_offsets++;
       this_oop_map--;
-      this_oop_map->set_length(this_oop_map->length() + *nonstatic_oop_length++);
+      this_oop_map->set_count(this_oop_map->count() + *nonstatic_oop_counts++);
       this_oop_map++;
     }
-    assert((this_oop_map + nonstatic_oop_map_count) == last_oop_map, "just checking");
+
     // Add new map blocks, fill them
     while (nonstatic_oop_map_count-- > 0) {
       this_oop_map->set_offset(*nonstatic_oop_offsets++);
-      this_oop_map->set_length(*nonstatic_oop_length++);
+      this_oop_map->set_count(*nonstatic_oop_counts++);
       this_oop_map++;
     }
+    assert(k->start_of_nonstatic_oop_maps() + k->nonstatic_oop_map_count() ==
+           this_oop_map, "sanity");
   }
 }
 
diff --git a/hotspot/src/share/vm/classfile/classFileParser.hpp b/hotspot/src/share/vm/classfile/classFileParser.hpp
index fd8a36950c0..40faac07328 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.hpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.hpp
@@ -61,7 +61,6 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
                                   int length,
                                   Handle class_loader,
                                   Handle protection_domain,
-                                  PerfTraceTime* vmtimer,
                                   symbolHandle class_name,
                                   TRAPS);
 
@@ -126,10 +125,13 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
                                        int runtime_invisible_annotations_length, TRAPS);
 
   // Final setup
-  int  compute_oop_map_size(instanceKlassHandle super, int nonstatic_oop_count,
-                            int first_nonstatic_oop_offset);
-  void fill_oop_maps(instanceKlassHandle k, int nonstatic_oop_map_count,
-                     u2* nonstatic_oop_offsets, u2* nonstatic_oop_length);
+  unsigned int compute_oop_map_count(instanceKlassHandle super,
+                                     unsigned int nonstatic_oop_count,
+                                     int first_nonstatic_oop_offset);
+  void fill_oop_maps(instanceKlassHandle k,
+                     unsigned int nonstatic_oop_map_count,
+                     int* nonstatic_oop_offsets,
+                     unsigned int* nonstatic_oop_counts);
   void set_precomputed_flags(instanceKlassHandle k);
   objArrayHandle compute_transitive_interfaces(instanceKlassHandle super,
                                                objArrayHandle local_ifs, TRAPS);
diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/hotspot/src/share/vm/classfile/classLoader.cpp
index 9871561b420..5b517add1f8 100644
--- a/hotspot/src/share/vm/classfile/classLoader.cpp
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp
@@ -48,9 +48,26 @@ static canonicalize_fn_t CanonicalizeEntry  = NULL;
 PerfCounter*    ClassLoader::_perf_accumulated_time = NULL;
 PerfCounter*    ClassLoader::_perf_classes_inited = NULL;
 PerfCounter*    ClassLoader::_perf_class_init_time = NULL;
+PerfCounter*    ClassLoader::_perf_class_init_selftime = NULL;
+PerfCounter*    ClassLoader::_perf_classes_verified = NULL;
 PerfCounter*    ClassLoader::_perf_class_verify_time = NULL;
+PerfCounter*    ClassLoader::_perf_class_verify_selftime = NULL;
 PerfCounter*    ClassLoader::_perf_classes_linked = NULL;
 PerfCounter*    ClassLoader::_perf_class_link_time = NULL;
+PerfCounter*    ClassLoader::_perf_class_link_selftime = NULL;
+PerfCounter*    ClassLoader::_perf_class_parse_time = NULL;
+PerfCounter*    ClassLoader::_perf_class_parse_selftime = NULL;
+PerfCounter*    ClassLoader::_perf_sys_class_lookup_time = NULL;
+PerfCounter*    ClassLoader::_perf_shared_classload_time = NULL;
+PerfCounter*    ClassLoader::_perf_sys_classload_time = NULL;
+PerfCounter*    ClassLoader::_perf_app_classload_time = NULL;
+PerfCounter*    ClassLoader::_perf_app_classload_selftime = NULL;
+PerfCounter*    ClassLoader::_perf_app_classload_count = NULL;
+PerfCounter*    ClassLoader::_perf_define_appclasses = NULL;
+PerfCounter*    ClassLoader::_perf_define_appclass_time = NULL;
+PerfCounter*    ClassLoader::_perf_define_appclass_selftime = NULL;
+PerfCounter*    ClassLoader::_perf_app_classfile_bytes_read = NULL;
+PerfCounter*    ClassLoader::_perf_sys_classfile_bytes_read = NULL;
 PerfCounter*    ClassLoader::_sync_systemLoaderLockContentionRate = NULL;
 PerfCounter*    ClassLoader::_sync_nonSystemLoaderLockContentionRate = NULL;
 PerfCounter*    ClassLoader::_sync_JVMFindLoadedClassLockFreeCounter = NULL;
@@ -152,6 +169,9 @@ ClassFileStream* ClassPathDirEntry::open_stream(const char* name) {
       hpi::close(file_handle);
       // construct ClassFileStream
       if (num_read == (size_t)st.st_size) {
+        if (UsePerfData) {
+          ClassLoader::perf_sys_classfile_bytes_read()->inc(num_read);
+        }
         return new ClassFileStream(buffer, st.st_size, _dir);    // Resource allocated
       }
     }
@@ -198,6 +218,9 @@ ClassFileStream* ClassPathZipEntry::open_stream(const char* name) {
       buffer     = NEW_RESOURCE_ARRAY(u1, filesize);
       if (!(*ReadEntry)(_zip, entry, buffer, filename)) return NULL;
   }
+  if (UsePerfData) {
+    ClassLoader::perf_sys_classfile_bytes_read()->inc(filesize);
+  }
   // return result
   return new ClassFileStream(buffer, filesize, _zip_name);    // Resource allocated
 }
@@ -825,7 +848,9 @@ instanceKlassHandle ClassLoader::load_classfile(symbolHandle h_name, TRAPS) {
   ClassFileStream* stream = NULL;
   int classpath_index = 0;
   {
-    PerfTraceTime vmtimer(perf_accumulated_time());
+    PerfClassTraceTime vmtimer(perf_sys_class_lookup_time(),
+                               ((JavaThread*) THREAD)->get_thread_stat()->perf_timers_addr(),
+                               PerfClassTraceTime::CLASS_LOAD);
     ClassPathEntry* e = _first_entry;
     while (e != NULL) {
       stream = e->open_stream(name);
@@ -890,11 +915,29 @@ void ClassLoader::initialize() {
     // jvmstat performance counters
     NEWPERFTICKCOUNTER(_perf_accumulated_time, SUN_CLS, "time");
     NEWPERFTICKCOUNTER(_perf_class_init_time, SUN_CLS, "classInitTime");
+    NEWPERFTICKCOUNTER(_perf_class_init_selftime, SUN_CLS, "classInitTime.self");
     NEWPERFTICKCOUNTER(_perf_class_verify_time, SUN_CLS, "classVerifyTime");
+    NEWPERFTICKCOUNTER(_perf_class_verify_selftime, SUN_CLS, "classVerifyTime.self");
     NEWPERFTICKCOUNTER(_perf_class_link_time, SUN_CLS, "classLinkedTime");
-
+    NEWPERFTICKCOUNTER(_perf_class_link_selftime, SUN_CLS, "classLinkedTime.self");
     NEWPERFEVENTCOUNTER(_perf_classes_inited, SUN_CLS, "initializedClasses");
     NEWPERFEVENTCOUNTER(_perf_classes_linked, SUN_CLS, "linkedClasses");
+    NEWPERFEVENTCOUNTER(_perf_classes_verified, SUN_CLS, "verifiedClasses");
+
+    NEWPERFTICKCOUNTER(_perf_class_parse_time, SUN_CLS, "parseClassTime");
+    NEWPERFTICKCOUNTER(_perf_class_parse_selftime, SUN_CLS, "parseClassTime.self");
+    NEWPERFTICKCOUNTER(_perf_sys_class_lookup_time, SUN_CLS, "lookupSysClassTime");
+    NEWPERFTICKCOUNTER(_perf_shared_classload_time, SUN_CLS, "sharedClassLoadTime");
+    NEWPERFTICKCOUNTER(_perf_sys_classload_time, SUN_CLS, "sysClassLoadTime");
+    NEWPERFTICKCOUNTER(_perf_app_classload_time, SUN_CLS, "appClassLoadTime");
+    NEWPERFTICKCOUNTER(_perf_app_classload_selftime, SUN_CLS, "appClassLoadTime.self");
+    NEWPERFEVENTCOUNTER(_perf_app_classload_count, SUN_CLS, "appClassLoadCount");
+    NEWPERFTICKCOUNTER(_perf_define_appclasses, SUN_CLS, "defineAppClasses");
+    NEWPERFTICKCOUNTER(_perf_define_appclass_time, SUN_CLS, "defineAppClassTime");
+    NEWPERFTICKCOUNTER(_perf_define_appclass_selftime, SUN_CLS, "defineAppClassTime.self");
+    NEWPERFBYTECOUNTER(_perf_app_classfile_bytes_read, SUN_CLS, "appClassBytes");
+    NEWPERFBYTECOUNTER(_perf_sys_classfile_bytes_read, SUN_CLS, "sysClassBytes");
+
 
     // The following performance counters are added for measuring the impact
     // of the bug fix of 6365597. They are mainly focused on finding out
diff --git a/hotspot/src/share/vm/classfile/classLoader.hpp b/hotspot/src/share/vm/classfile/classLoader.hpp
index 9a04c2e43fc..3c6187c5af4 100644
--- a/hotspot/src/share/vm/classfile/classLoader.hpp
+++ b/hotspot/src/share/vm/classfile/classLoader.hpp
@@ -149,9 +149,26 @@ class ClassLoader: AllStatic {
   static PerfCounter* _perf_accumulated_time;
   static PerfCounter* _perf_classes_inited;
   static PerfCounter* _perf_class_init_time;
+  static PerfCounter* _perf_class_init_selftime;
+  static PerfCounter* _perf_classes_verified;
   static PerfCounter* _perf_class_verify_time;
+  static PerfCounter* _perf_class_verify_selftime;
   static PerfCounter* _perf_classes_linked;
   static PerfCounter* _perf_class_link_time;
+  static PerfCounter* _perf_class_link_selftime;
+  static PerfCounter* _perf_class_parse_time;
+  static PerfCounter* _perf_class_parse_selftime;
+  static PerfCounter* _perf_sys_class_lookup_time;
+  static PerfCounter* _perf_shared_classload_time;
+  static PerfCounter* _perf_sys_classload_time;
+  static PerfCounter* _perf_app_classload_time;
+  static PerfCounter* _perf_app_classload_selftime;
+  static PerfCounter* _perf_app_classload_count;
+  static PerfCounter* _perf_define_appclasses;
+  static PerfCounter* _perf_define_appclass_time;
+  static PerfCounter* _perf_define_appclass_selftime;
+  static PerfCounter* _perf_app_classfile_bytes_read;
+  static PerfCounter* _perf_sys_classfile_bytes_read;
 
   static PerfCounter* _sync_systemLoaderLockContentionRate;
   static PerfCounter* _sync_nonSystemLoaderLockContentionRate;
@@ -196,12 +213,29 @@ class ClassLoader: AllStatic {
   static void print_bootclasspath();
 
   // Timing
-  static PerfCounter* perf_accumulated_time()  { return _perf_accumulated_time; }
-  static PerfCounter* perf_classes_inited()    { return _perf_classes_inited; }
-  static PerfCounter* perf_class_init_time()   { return _perf_class_init_time; }
-  static PerfCounter* perf_class_verify_time() { return _perf_class_verify_time; }
-  static PerfCounter* perf_classes_linked()    { return _perf_classes_linked; }
-  static PerfCounter* perf_class_link_time() { return _perf_class_link_time; }
+  static PerfCounter* perf_accumulated_time()         { return _perf_accumulated_time; }
+  static PerfCounter* perf_classes_inited()           { return _perf_classes_inited; }
+  static PerfCounter* perf_class_init_time()          { return _perf_class_init_time; }
+  static PerfCounter* perf_class_init_selftime()      { return _perf_class_init_selftime; }
+  static PerfCounter* perf_classes_verified()         { return _perf_classes_verified; }
+  static PerfCounter* perf_class_verify_time()        { return _perf_class_verify_time; }
+  static PerfCounter* perf_class_verify_selftime()    { return _perf_class_verify_selftime; }
+  static PerfCounter* perf_classes_linked()           { return _perf_classes_linked; }
+  static PerfCounter* perf_class_link_time()          { return _perf_class_link_time; }
+  static PerfCounter* perf_class_link_selftime()      { return _perf_class_link_selftime; }
+  static PerfCounter* perf_class_parse_time()         { return _perf_class_parse_time; }
+  static PerfCounter* perf_class_parse_selftime()     { return _perf_class_parse_selftime; }
+  static PerfCounter* perf_sys_class_lookup_time()    { return _perf_sys_class_lookup_time; }
+  static PerfCounter* perf_shared_classload_time()    { return _perf_shared_classload_time; }
+  static PerfCounter* perf_sys_classload_time()       { return _perf_sys_classload_time; }
+  static PerfCounter* perf_app_classload_time()       { return _perf_app_classload_time; }
+  static PerfCounter* perf_app_classload_selftime()   { return _perf_app_classload_selftime; }
+  static PerfCounter* perf_app_classload_count()      { return _perf_app_classload_count; }
+  static PerfCounter* perf_define_appclasses()        { return _perf_define_appclasses; }
+  static PerfCounter* perf_define_appclass_time()     { return _perf_define_appclass_time; }
+  static PerfCounter* perf_define_appclass_selftime() { return _perf_define_appclass_selftime; }
+  static PerfCounter* perf_app_classfile_bytes_read() { return _perf_app_classfile_bytes_read; }
+  static PerfCounter* perf_sys_classfile_bytes_read() { return _perf_sys_classfile_bytes_read; }
 
   // Record how often system loader lock object is contended
   static PerfCounter* sync_systemLoaderLockContentionRate() {
@@ -307,3 +341,118 @@ class ClassLoader: AllStatic {
   static int  compile_the_world_counter() { return _compile_the_world_counter; }
 #endif //PRODUCT
 };
+
+// PerfClassTraceTime is used to measure time for class loading related events.
+// This class tracks cumulative time and exclusive time for specific event types.
+// During the execution of one event, other event types (e.g. class loading and
+// resolution) as well as recursive calls of the same event type could happen.
+// Only one elapsed timer (cumulative) and one thread-local self timer (exclusive)
+// (i.e. only one event type) are active at a time even multiple PerfClassTraceTime
+// instances have been created as multiple events are happening.
+class PerfClassTraceTime {
+  public:
+    enum {
+       CLASS_LOAD   = 0,
+       PARSE_CLASS  = 1,
+       CLASS_LINK   = 2,
+       CLASS_VERIFY = 3,
+       CLASS_CLINIT = 4,
+       DEFINE_CLASS = 5,
+       EVENT_TYPE_COUNT = 6
+    };
+  protected:
+    // _t tracks time from initialization to destruction of this timer instance
+    // including time for all other event types, and recursive calls of this type.
+    // When a timer is called recursively, the elapsedTimer _t would not be used.
+    elapsedTimer     _t;
+    PerfLongCounter* _timep;
+    PerfLongCounter* _selftimep;
+    PerfLongCounter* _eventp;
+    // pointer to thread-local recursion counter and timer array
+    // The thread_local timers track cumulative time for specific event types
+    // exclusive of time for other event types, but including recursive calls
+    // of the same type.
+    int*             _recursion_counters;
+    elapsedTimer*    _timers;
+    int              _event_type;
+    int              _prev_active_event;
+
+  public:
+
+    inline PerfClassTraceTime(PerfLongCounter* timep,     /* counter incremented with inclusive time */
+                              PerfLongCounter* selftimep, /* counter incremented with exclusive time */
+                              PerfLongCounter* eventp,    /* event counter */
+                              int* recursion_counters,    /* thread-local recursion counter array */
+                              elapsedTimer* timers,       /* thread-local timer array */
+                              int type                    /* event type */ ) :
+        _timep(timep), _selftimep(selftimep), _eventp(eventp), _recursion_counters(recursion_counters), _timers(timers), _event_type(type) {
+      initialize();
+    }
+
+    inline PerfClassTraceTime(PerfLongCounter* timep,     /* counter incremented with inclusive time */
+                              elapsedTimer* timers,       /* thread-local timer array */
+                              int type                    /* event type */ ) :
+        _timep(timep), _selftimep(NULL), _eventp(NULL), _recursion_counters(NULL), _timers(timers), _event_type(type) {
+      initialize();
+    }
+
+    void initialize() {
+      if (!UsePerfData) return;
+
+      if (_eventp != NULL) {
+        // increment the event counter
+        _eventp->inc();
+      }
+
+      // stop the current active thread-local timer to measure inclusive time
+      _prev_active_event = -1;
+      for (int i=0; i < EVENT_TYPE_COUNT; i++) {
+         if (_timers[i].is_active()) {
+           assert(_prev_active_event == -1, "should have only one active timer");
+           _prev_active_event = i;
+           _timers[i].stop();
+         }
+      }
+
+      if (_recursion_counters == NULL || (_recursion_counters[_event_type])++ == 0) {
+        // start the inclusive timer if not recursively called
+        _t.start();
+      }
+
+      // start thread-local timer of the given event type
+      if (!_timers[_event_type].is_active()) {
+        _timers[_event_type].start();
+      }
+    }
+
+    inline void suspend() { _t.stop(); _timers[_event_type].stop(); }
+    inline void resume()  { _t.start(); _timers[_event_type].start(); }
+
+    ~PerfClassTraceTime() {
+      if (!UsePerfData) return;
+
+      // stop the thread-local timer as the event completes
+      // and resume the thread-local timer of the event next on the stack
+      _timers[_event_type].stop();
+      jlong selftime = _timers[_event_type].ticks();
+
+      if (_prev_active_event >= 0) {
+        _timers[_prev_active_event].start();
+      }
+
+      if (_recursion_counters != NULL && --(_recursion_counters[_event_type]) > 0) return;
+
+      // increment the counters only on the leaf call
+      _t.stop();
+      _timep->inc(_t.ticks());
+      if (_selftimep != NULL) {
+        _selftimep->inc(selftime);
+      }
+      // add all class loading related event selftime to the accumulated time counter
+      ClassLoader::perf_accumulated_time()->inc(selftime);
+
+      // reset the timer
+      _timers[_event_type].reset();
+    }
+};
+
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
index baec74fc2d9..a1efcc595f8 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
@@ -1306,13 +1306,18 @@ static instanceKlassHandle download_and_retry_class_load(
 instanceKlassHandle SystemDictionary::load_instance_class(symbolHandle class_name, Handle class_loader, TRAPS) {
   instanceKlassHandle nh = instanceKlassHandle(); // null Handle
   if (class_loader.is_null()) {
+
     // Search the shared system dictionary for classes preloaded into the
     // shared spaces.
     instanceKlassHandle k;
-    k = load_shared_class(class_name, class_loader, THREAD);
+    {
+      PerfTraceTime vmtimer(ClassLoader::perf_shared_classload_time());
+      k = load_shared_class(class_name, class_loader, THREAD);
+    }
 
     if (k.is_null()) {
       // Use VM class loader
+      PerfTraceTime vmtimer(ClassLoader::perf_sys_classload_time());
       k = ClassLoader::load_classfile(class_name, CHECK_(nh));
     }
 
@@ -1334,6 +1339,16 @@ instanceKlassHandle SystemDictionary::load_instance_class(symbolHandle class_nam
     // Use user specified class loader to load class. Call loadClass operation on class_loader.
     ResourceMark rm(THREAD);
 
+    assert(THREAD->is_Java_thread(), "must be a JavaThread");
+    JavaThread* jt = (JavaThread*) THREAD;
+
+    PerfClassTraceTime vmtimer(ClassLoader::perf_app_classload_time(),
+                               ClassLoader::perf_app_classload_selftime(),
+                               ClassLoader::perf_app_classload_count(),
+                               jt->get_thread_stat()->perf_recursion_counts_addr(),
+                               jt->get_thread_stat()->perf_timers_addr(),
+                               PerfClassTraceTime::CLASS_LOAD);
+
     Handle s = java_lang_String::create_from_symbol(class_name, CHECK_(nh));
     // Translate to external class name format, i.e., convert '/' chars to '.'
     Handle string = java_lang_String::externalize_classname(s, CHECK_(nh));
diff --git a/hotspot/src/share/vm/code/debugInfo.hpp b/hotspot/src/share/vm/code/debugInfo.hpp
index 13b3775b762..c10d31b1e69 100644
--- a/hotspot/src/share/vm/code/debugInfo.hpp
+++ b/hotspot/src/share/vm/code/debugInfo.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
diff --git a/hotspot/src/share/vm/code/debugInfoRec.cpp b/hotspot/src/share/vm/code/debugInfoRec.cpp
index 04b58f4c70a..53b9dde47f7 100644
--- a/hotspot/src/share/vm/code/debugInfoRec.cpp
+++ b/hotspot/src/share/vm/code/debugInfoRec.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -280,6 +280,7 @@ int DebugInformationRecorder::find_sharable_decode_offset(int stream_offset) {
 void DebugInformationRecorder::describe_scope(int         pc_offset,
                                               ciMethod*   method,
                                               int         bci,
+                                              bool        reexecute,
                                               DebugToken* locals,
                                               DebugToken* expressions,
                                               DebugToken* monitors) {
@@ -291,6 +292,9 @@ void DebugInformationRecorder::describe_scope(int         pc_offset,
   int stream_offset = stream()->position();
   last_pd->set_scope_decode_offset(stream_offset);
 
+  // Record reexecute bit into pcDesc
+  last_pd->set_should_reexecute(reexecute);
+
   // serialize sender stream offest
   stream()->write_int(sender_stream_offset);
 
diff --git a/hotspot/src/share/vm/code/debugInfoRec.hpp b/hotspot/src/share/vm/code/debugInfoRec.hpp
index 9e775c964da..4ce5f1e45c3 100644
--- a/hotspot/src/share/vm/code/debugInfoRec.hpp
+++ b/hotspot/src/share/vm/code/debugInfoRec.hpp
@@ -87,6 +87,7 @@ class DebugInformationRecorder: public ResourceObj {
   void describe_scope(int         pc_offset,
                       ciMethod*   method,
                       int         bci,
+                      bool        reexecute,
                       DebugToken* locals      = NULL,
                       DebugToken* expressions = NULL,
                       DebugToken* monitors    = NULL);
diff --git a/hotspot/src/share/vm/code/nmethod.cpp b/hotspot/src/share/vm/code/nmethod.cpp
index ff5985f1e2a..ca7441db55d 100644
--- a/hotspot/src/share/vm/code/nmethod.cpp
+++ b/hotspot/src/share/vm/code/nmethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -966,7 +966,7 @@ ScopeDesc* nmethod::scope_desc_at(address pc) {
   PcDesc* pd = pc_desc_at(pc);
   guarantee(pd != NULL, "scope must be present");
   return new ScopeDesc(this, pd->scope_decode_offset(),
-                       pd->obj_decode_offset());
+                       pd->obj_decode_offset(), pd->should_reexecute());
 }
 
 
@@ -1079,6 +1079,10 @@ void nmethod::make_unloaded(BoolObjectClosure* is_alive, oop cause) {
                   this, (address)_method, (address)cause);
     cause->klass()->print();
   }
+  // Unlink the osr method, so we do not look this up again
+  if (is_osr_method()) {
+    invalidate_osr_method();
+  }
   // If _method is already NULL the methodOop is about to be unloaded,
   // so we don't have to break the cycle. Note that it is possible to
   // have the methodOop live here, in case we unload the nmethod because
@@ -1148,7 +1152,7 @@ void nmethod::make_not_entrant_or_zombie(int state) {
   // will never be used anymore. That the nmethods only gets removed when class unloading
   // happens, make life much simpler, since the nmethods are not just going to disappear
   // out of the blue.
-  if (is_osr_only_method()) {
+  if (is_osr_method()) {
     if (osr_entry_bci() != InvalidOSREntryBci) {
       // only log this once
       log_state_change(state);
@@ -1520,6 +1524,17 @@ void nmethod::do_unloading(BoolObjectClosure* is_alive,
 #endif // !PRODUCT
 }
 
+// This method is called twice during GC -- once while
+// tracing the "active" nmethods on thread stacks during
+// the (strong) marking phase, and then again when walking
+// the code cache contents during the weak roots processing
+// phase. The two uses are distinguished by means of the
+// do_nmethods() method in the closure "f" below -- which
+// answers "yes" in the first case, and "no" in the second
+// case. We want to walk the weak roots in the nmethod
+// only in the second case. The weak roots in the nmethod
+// are the oops in the ExceptionCache and the InlineCache
+// oops.
 void nmethod::oops_do(OopClosure* f) {
   // make sure the oops ready to receive visitors
   assert(!is_zombie() && !is_unloaded(),
@@ -1538,19 +1553,25 @@ void nmethod::oops_do(OopClosure* f) {
 
   // Compiled code
   f->do_oop((oop*) &_method);
-  ExceptionCache* ec = exception_cache();
-  while(ec != NULL) {
-    f->do_oop((oop*)ec->exception_type_addr());
-    ec = ec->next();
-  }
+  if (!f->do_nmethods()) {
+    // weak roots processing phase -- update ExceptionCache oops
+    ExceptionCache* ec = exception_cache();
+    while(ec != NULL) {
+      f->do_oop((oop*)ec->exception_type_addr());
+      ec = ec->next();
+    }
+  } // Else strong roots phase -- skip oops in ExceptionCache
 
   RelocIterator iter(this, low_boundary);
+
   while (iter.next()) {
     if (iter.type() == relocInfo::oop_type ) {
       oop_Relocation* r = iter.oop_reloc();
       // In this loop, we must only follow those oops directly embedded in
       // the code.  Other oops (oop_index>0) are seen as part of scopes_oops.
-      assert(1 == (r->oop_is_immediate()) + (r->oop_addr() >= oops_begin() && r->oop_addr() < oops_end()), "oop must be found in exactly one place");
+      assert(1 == (r->oop_is_immediate()) +
+                   (r->oop_addr() >= oops_begin() && r->oop_addr() < oops_end()),
+             "oop must be found in exactly one place");
       if (r->oop_is_immediate() && r->oop_value() != NULL) {
         f->do_oop(r->oop_addr());
       }
@@ -1932,7 +1953,7 @@ void nmethod::verify_interrupt_point(address call_site) {
   PcDesc* pd = pc_desc_at(ic->end_of_call());
   assert(pd != NULL, "PcDesc must exist");
   for (ScopeDesc* sd = new ScopeDesc(this, pd->scope_decode_offset(),
-                                     pd->obj_decode_offset());
+                                     pd->obj_decode_offset(), pd->should_reexecute());
        !sd->is_top(); sd = sd->sender()) {
     sd->verify();
   }
@@ -2181,7 +2202,7 @@ ScopeDesc* nmethod::scope_desc_in(address begin, address end) {
   PcDesc* p = pc_desc_near(begin+1);
   if (p != NULL && p->real_pc(this) <= end) {
     return new ScopeDesc(this, p->scope_decode_offset(),
-                         p->obj_decode_offset());
+                         p->obj_decode_offset(), p->should_reexecute());
   }
   return NULL;
 }
diff --git a/hotspot/src/share/vm/code/nmethod.hpp b/hotspot/src/share/vm/code/nmethod.hpp
index 8305f7949d0..2902fc04b39 100644
--- a/hotspot/src/share/vm/code/nmethod.hpp
+++ b/hotspot/src/share/vm/code/nmethod.hpp
@@ -314,7 +314,6 @@ class nmethod : public CodeBlob {
   bool is_java_method() const                     { return !method()->is_native(); }
   bool is_native_method() const                   { return method()->is_native(); }
   bool is_osr_method() const                      { return _entry_bci != InvocationEntryBci; }
-  bool is_osr_only_method() const                 { return is_osr_method(); }
 
   bool is_compiled_by_c1() const;
   bool is_compiled_by_c2() const;
diff --git a/hotspot/src/share/vm/code/pcDesc.cpp b/hotspot/src/share/vm/code/pcDesc.cpp
index da513017773..5b981645a1b 100644
--- a/hotspot/src/share/vm/code/pcDesc.cpp
+++ b/hotspot/src/share/vm/code/pcDesc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -26,9 +26,11 @@
 # include "incls/_pcDesc.cpp.incl"
 
 PcDesc::PcDesc(int pc_offset, int scope_decode_offset, int obj_decode_offset) {
+  assert(sizeof(PcDescFlags) <= 4, "occupies more than a word");
   _pc_offset           = pc_offset;
   _scope_decode_offset = scope_decode_offset;
   _obj_decode_offset   = obj_decode_offset;
+  _flags.word          = 0;
 }
 
 address PcDesc::real_pc(const nmethod* code) const {
@@ -50,6 +52,7 @@ void PcDesc::print(nmethod* code) {
     tty->print("  ");
     sd->method()->print_short_name(tty);
     tty->print("  @%d", sd->bci());
+    tty->print("  reexecute=%s", sd->should_reexecute()?"true":"false");
     tty->cr();
   }
 #endif
diff --git a/hotspot/src/share/vm/code/pcDesc.hpp b/hotspot/src/share/vm/code/pcDesc.hpp
index 64cb3bb08a0..36f60d787f3 100644
--- a/hotspot/src/share/vm/code/pcDesc.hpp
+++ b/hotspot/src/share/vm/code/pcDesc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -34,6 +34,13 @@ class PcDesc VALUE_OBJ_CLASS_SPEC {
   int _scope_decode_offset; // offset for scope in nmethod
   int _obj_decode_offset;
 
+  union PcDescFlags {
+    int word;
+    struct {
+      unsigned int reexecute: 1;
+    } bits;
+  } _flags;
+
  public:
   int pc_offset() const           { return _pc_offset;   }
   int scope_decode_offset() const { return _scope_decode_offset; }
@@ -53,6 +60,10 @@ class PcDesc VALUE_OBJ_CLASS_SPEC {
     upper_offset_limit = (unsigned int)-1 >> 1
   };
 
+  // Flags
+  bool     should_reexecute()              const { return _flags.bits.reexecute; }
+  void set_should_reexecute(bool z)              { _flags.bits.reexecute = z;    }
+
   // Returns the real pc
   address real_pc(const nmethod* code) const;
 
diff --git a/hotspot/src/share/vm/code/scopeDesc.cpp b/hotspot/src/share/vm/code/scopeDesc.cpp
index 7aed17f76a3..a034530e6bf 100644
--- a/hotspot/src/share/vm/code/scopeDesc.cpp
+++ b/hotspot/src/share/vm/code/scopeDesc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -26,17 +26,19 @@
 # include "incls/_scopeDesc.cpp.incl"
 
 
-ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset) {
+ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute) {
   _code          = code;
   _decode_offset = decode_offset;
   _objects       = decode_object_values(obj_decode_offset);
+  _reexecute     = reexecute;
   decode_body();
 }
 
-ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset) {
+ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, bool reexecute) {
   _code          = code;
   _decode_offset = decode_offset;
   _objects       = decode_object_values(DebugInformationRecorder::serialized_null);
+  _reexecute     = reexecute;
   decode_body();
 }
 
@@ -45,6 +47,7 @@ ScopeDesc::ScopeDesc(const ScopeDesc* parent) {
   _code          = parent->_code;
   _decode_offset = parent->_sender_decode_offset;
   _objects       = parent->_objects;
+  _reexecute     = false; //reexecute only applies to the first scope
   decode_body();
 }
 
@@ -66,6 +69,7 @@ void ScopeDesc::decode_body() {
     _sender_decode_offset = stream->read_int();
     _method = methodHandle((methodOop) stream->read_oop());
     _bci    = stream->read_bci();
+
     // decode offsets for body and sender
     _locals_decode_offset      = stream->read_int();
     _expressions_decode_offset = stream->read_int();
@@ -170,6 +174,7 @@ void ScopeDesc::print_on(outputStream* st, PcDesc* pd) const {
     st->print("ScopeDesc[%d]@" PTR_FORMAT " ", _decode_offset, _code->instructions_begin());
     st->print_cr(" offset:     %d",    _decode_offset);
     st->print_cr(" bci:        %d",    bci());
+    st->print_cr(" reexecute:  %s",    should_reexecute() ? "true" : "false");
     st->print_cr(" locals:     %d",    _locals_decode_offset);
     st->print_cr(" stack:      %d",    _expressions_decode_offset);
     st->print_cr(" monitor:    %d",    _monitors_decode_offset);
diff --git a/hotspot/src/share/vm/code/scopeDesc.hpp b/hotspot/src/share/vm/code/scopeDesc.hpp
index 35c99176c81..d030eaea849 100644
--- a/hotspot/src/share/vm/code/scopeDesc.hpp
+++ b/hotspot/src/share/vm/code/scopeDesc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -52,16 +52,17 @@ class SimpleScopeDesc : public StackObj {
 class ScopeDesc : public ResourceObj {
  public:
   // Constructor
-  ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset);
+  ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute);
 
   // Calls above, giving default value of "serialized_null" to the
   // "obj_decode_offset" argument.  (We don't use a default argument to
   // avoid a .hpp-.hpp dependency.)
-  ScopeDesc(const nmethod* code, int decode_offset);
+  ScopeDesc(const nmethod* code, int decode_offset, bool reexecute);
 
   // JVM state
-  methodHandle method() const { return _method; }
-  int          bci()    const { return _bci;    }
+  methodHandle method()   const { return _method; }
+  int          bci()      const { return _bci;    }
+  bool should_reexecute() const { return _reexecute; }
 
   GrowableArray<ScopeValue*>*   locals();
   GrowableArray<ScopeValue*>*   expressions();
@@ -86,6 +87,7 @@ class ScopeDesc : public ResourceObj {
   // JVM state
   methodHandle  _method;
   int           _bci;
+  bool          _reexecute;
 
   // Decoding offsets
   int _decode_offset;
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
index de5955d503e..3f84a85b37f 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp
@@ -92,17 +92,50 @@ class MarkRefsIntoVerifyClosure: public OopsInGenClosure {
   }
 };
 
-// The non-parallel version (the parallel version appears further below).
-class PushAndMarkClosure: public OopClosure {
- private:
+// KlassRememberingOopClosure is used when marking of the permanent generation
+// is being done.  It adds fields to support revisiting of klasses
+// for class unloading.  _should_remember_klasses should be set to
+// indicate if klasses should be remembered.  Currently that is whenever
+// CMS class unloading is turned on.  The _revisit_stack is used
+// to save the klasses for later processing.
+class KlassRememberingOopClosure : public OopClosure {
+ protected:
   CMSCollector* _collector;
+  CMSMarkStack* _revisit_stack;
+  bool const    _should_remember_klasses;
+ public:
+  void check_remember_klasses() const PRODUCT_RETURN;
+  virtual const bool should_remember_klasses() const {
+    check_remember_klasses();
+    return _should_remember_klasses;
+  }
+  virtual void remember_klass(Klass* k);
+
+  KlassRememberingOopClosure(CMSCollector* collector,
+                             ReferenceProcessor* rp,
+                             CMSMarkStack* revisit_stack);
+};
+
+// Similar to KlassRememberingOopClosure for use when multiple
+// GC threads will execute the closure.
+
+class Par_KlassRememberingOopClosure : public KlassRememberingOopClosure {
+ public:
+  Par_KlassRememberingOopClosure(CMSCollector* collector,
+                                 ReferenceProcessor* rp,
+                                 CMSMarkStack* revisit_stack):
+    KlassRememberingOopClosure(collector, rp, revisit_stack) {}
+  virtual void remember_klass(Klass* k);
+};
+
+// The non-parallel version (the parallel version appears further below).
+class PushAndMarkClosure: public KlassRememberingOopClosure {
+ private:
   MemRegion     _span;
   CMSBitMap*    _bit_map;
   CMSBitMap*    _mod_union_table;
   CMSMarkStack* _mark_stack;
-  CMSMarkStack* _revisit_stack;
   bool          _concurrent_precleaning;
-  bool const    _should_remember_klasses;
  protected:
   DO_OOP_WORK_DEFN
  public:
@@ -122,10 +155,12 @@ class PushAndMarkClosure: public OopClosure {
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
-  virtual const bool should_remember_klasses() const {
-    return _should_remember_klasses;
+  // In support of class unloading
+  virtual const bool should_remember_mdo() const {
+    return false;
+    // return _should_remember_klasses;
   }
-  virtual void remember_klass(Klass* k);
+  virtual void remember_mdo(DataLayout* v);
 };
 
 // In the parallel case, the revisit stack, the bit map and the
@@ -134,14 +169,11 @@ class PushAndMarkClosure: public OopClosure {
 // synchronization (for instance, via CAS). The marking stack
 // used in the non-parallel case above is here replaced with
 // an OopTaskQueue structure to allow efficient work stealing.
-class Par_PushAndMarkClosure: public OopClosure {
+class Par_PushAndMarkClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   CMSBitMap*    _bit_map;
   OopTaskQueue* _work_queue;
-  CMSMarkStack* _revisit_stack;
-  bool const    _should_remember_klasses;
  protected:
   DO_OOP_WORK_DEFN
  public:
@@ -159,10 +191,12 @@ class Par_PushAndMarkClosure: public OopClosure {
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
-  virtual const bool should_remember_klasses() const {
-    return _should_remember_klasses;
+  // In support of class unloading
+  virtual const bool should_remember_mdo() const {
+    return false;
+    // return _should_remember_klasses;
   }
-  virtual void remember_klass(Klass* k);
+  virtual void remember_mdo(DataLayout* v);
 };
 
 // The non-parallel version (the parallel version appears further below).
@@ -201,6 +235,12 @@ class MarkRefsIntoAndScanClosure: public OopsInGenClosure {
   void set_freelistLock(Mutex* m) {
     _freelistLock = m;
   }
+  virtual const bool should_remember_klasses() const {
+    return _pushAndMarkClosure.should_remember_klasses();
+  }
+  virtual void remember_klass(Klass* k) {
+    _pushAndMarkClosure.remember_klass(k);
+  }
 
  private:
   inline void do_yield_check();
@@ -234,6 +274,16 @@ class Par_MarkRefsIntoAndScanClosure: public OopsInGenClosure {
   inline void do_oop_nv(narrowOop* p) { Par_MarkRefsIntoAndScanClosure::do_oop_work(p); }
   bool do_header() { return true; }
   virtual const bool do_nmethods() const { return true; }
+  // When ScanMarkedObjectsAgainClosure is used,
+  // it passes [Par_]MarkRefsIntoAndScanClosure to oop_oop_iterate(),
+  // and this delegation is used.
+  virtual const bool should_remember_klasses() const {
+    return _par_pushAndMarkClosure.should_remember_klasses();
+  }
+  // See comment on should_remember_klasses() above.
+  virtual void remember_klass(Klass* k) {
+    _par_pushAndMarkClosure.remember_klass(k);
+  }
   Prefetch::style prefetch_style() {
     return Prefetch::do_read;
   }
@@ -243,17 +293,14 @@ class Par_MarkRefsIntoAndScanClosure: public OopsInGenClosure {
 // This closure is used during the concurrent marking phase
 // following the first checkpoint. Its use is buried in
 // the closure MarkFromRootsClosure.
-class PushOrMarkClosure: public OopClosure {
+class PushOrMarkClosure: public KlassRememberingOopClosure {
  private:
-  CMSCollector*   _collector;
   MemRegion       _span;
   CMSBitMap*      _bitMap;
   CMSMarkStack*   _markStack;
-  CMSMarkStack*   _revisitStack;
   HeapWord* const _finger;
   MarkFromRootsClosure* const
                   _parent;
-  bool const      _should_remember_klasses;
  protected:
   DO_OOP_WORK_DEFN
  public:
@@ -268,10 +315,13 @@ class PushOrMarkClosure: public OopClosure {
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { PushOrMarkClosure::do_oop_work(p); }
   inline void do_oop_nv(narrowOop* p) { PushOrMarkClosure::do_oop_work(p); }
-  virtual const bool should_remember_klasses() const {
-    return _should_remember_klasses;
+  // In support of class unloading
+  virtual const bool should_remember_mdo() const {
+    return false;
+    // return _should_remember_klasses;
   }
-  virtual void remember_klass(Klass* k);
+  virtual void remember_mdo(DataLayout* v);
+
   // Deal with a stack overflow condition
   void handle_stack_overflow(HeapWord* lost);
  private:
@@ -282,20 +332,17 @@ class PushOrMarkClosure: public OopClosure {
 // This closure is used during the concurrent marking phase
 // following the first checkpoint. Its use is buried in
 // the closure Par_MarkFromRootsClosure.
-class Par_PushOrMarkClosure: public OopClosure {
+class Par_PushOrMarkClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector*    _collector;
   MemRegion        _whole_span;
   MemRegion        _span;        // local chunk
   CMSBitMap*       _bit_map;
   OopTaskQueue*    _work_queue;
   CMSMarkStack*    _overflow_stack;
-  CMSMarkStack*    _revisit_stack;
   HeapWord*  const _finger;
   HeapWord** const _global_finger_addr;
   Par_MarkFromRootsClosure* const
                    _parent;
-  bool const       _should_remember_klasses;
  protected:
   DO_OOP_WORK_DEFN
  public:
@@ -312,10 +359,13 @@ class Par_PushOrMarkClosure: public OopClosure {
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { Par_PushOrMarkClosure::do_oop_work(p); }
   inline void do_oop_nv(narrowOop* p) { Par_PushOrMarkClosure::do_oop_work(p); }
-  virtual const bool should_remember_klasses() const {
-    return _should_remember_klasses;
+  // In support of class unloading
+  virtual const bool should_remember_mdo() const {
+    return false;
+    // return _should_remember_klasses;
   }
-  virtual void remember_klass(Klass* k);
+  virtual void remember_mdo(DataLayout* v);
+
   // Deal with a stack overflow condition
   void handle_stack_overflow(HeapWord* lost);
  private:
@@ -328,9 +378,8 @@ class Par_PushOrMarkClosure: public OopClosure {
 // processing phase of the CMS final checkpoint step, as
 // well as during the concurrent precleaning of the discovered
 // reference lists.
-class CMSKeepAliveClosure: public OopClosure {
+class CMSKeepAliveClosure: public KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   const MemRegion _span;
   CMSMarkStack* _mark_stack;
   CMSBitMap*    _bit_map;
@@ -340,14 +389,7 @@ class CMSKeepAliveClosure: public OopClosure {
  public:
   CMSKeepAliveClosure(CMSCollector* collector, MemRegion span,
                       CMSBitMap* bit_map, CMSMarkStack* mark_stack,
-                      bool cpc):
-    _collector(collector),
-    _span(span),
-    _bit_map(bit_map),
-    _mark_stack(mark_stack),
-    _concurrent_precleaning(cpc) {
-    assert(!_span.is_empty(), "Empty span could spell trouble");
-  }
+                      CMSMarkStack* revisit_stack, bool cpc);
   bool    concurrent_precleaning() const { return _concurrent_precleaning; }
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
@@ -355,9 +397,8 @@ class CMSKeepAliveClosure: public OopClosure {
   inline void do_oop_nv(narrowOop* p) { CMSKeepAliveClosure::do_oop_work(p); }
 };
 
-class CMSInnerParMarkAndPushClosure: public OopClosure {
+class CMSInnerParMarkAndPushClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   OopTaskQueue* _work_queue;
   CMSBitMap*    _bit_map;
@@ -366,11 +407,8 @@ class CMSInnerParMarkAndPushClosure: public OopClosure {
  public:
   CMSInnerParMarkAndPushClosure(CMSCollector* collector,
                                 MemRegion span, CMSBitMap* bit_map,
-                                OopTaskQueue* work_queue):
-    _collector(collector),
-    _span(span),
-    _bit_map(bit_map),
-    _work_queue(work_queue) { }
+                                CMSMarkStack* revisit_stack,
+                                OopTaskQueue* work_queue);
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { CMSInnerParMarkAndPushClosure::do_oop_work(p); }
@@ -380,9 +418,8 @@ class CMSInnerParMarkAndPushClosure: public OopClosure {
 // A parallel (MT) version of the above, used when
 // reference processing is parallel; the only difference
 // is in the do_oop method.
-class CMSParKeepAliveClosure: public OopClosure {
+class CMSParKeepAliveClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   OopTaskQueue* _work_queue;
   CMSBitMap*    _bit_map;
@@ -394,7 +431,8 @@ class CMSParKeepAliveClosure: public OopClosure {
   DO_OOP_WORK_DEFN
  public:
   CMSParKeepAliveClosure(CMSCollector* collector, MemRegion span,
-                         CMSBitMap* bit_map, OopTaskQueue* work_queue);
+                         CMSBitMap* bit_map, CMSMarkStack* revisit_stack,
+                         OopTaskQueue* work_queue);
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
   inline void do_oop_nv(oop* p)       { CMSParKeepAliveClosure::do_oop_work(p); }
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp
index fcf0691577e..9e4369c72aa 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp
@@ -37,16 +37,34 @@ inline void Par_MarkRefsIntoAndScanClosure::trim_queue(uint max) {
   }
 }
 
-inline void PushOrMarkClosure::remember_klass(Klass* k) {
-  if (!_revisitStack->push(oop(k))) {
+#ifndef PRODUCT
+void KlassRememberingOopClosure::check_remember_klasses() const {
+  assert(_should_remember_klasses == must_remember_klasses(),
+    "Should remember klasses in this context.");
+}
+#endif
+
+void KlassRememberingOopClosure::remember_klass(Klass* k) {
+  if (!_revisit_stack->push(oop(k))) {
     fatal("Revisit stack overflow in PushOrMarkClosure");
   }
+  check_remember_klasses();
 }
 
-inline void Par_PushOrMarkClosure::remember_klass(Klass* k) {
+inline void PushOrMarkClosure::remember_mdo(DataLayout* v) {
+  // TBD
+}
+
+
+void Par_KlassRememberingOopClosure::remember_klass(Klass* k) {
   if (!_revisit_stack->par_push(oop(k))) {
-    fatal("Revisit stack overflow in PushOrMarkClosure");
+    fatal("Revisit stack overflow in Par_KlassRememberingOopClosure");
   }
+  check_remember_klasses();
+}
+
+inline void Par_PushOrMarkClosure::remember_mdo(DataLayout* v) {
+  // TBD
 }
 
 inline void PushOrMarkClosure::do_yield_check() {
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index 6c13acba2af..af628eb3307 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -2276,7 +2276,7 @@ void CMSCollector::collect_in_background(bool clear_all_soft_refs) {
 
           VM_CMS_Final_Remark final_remark_op(this);
           VMThread::execute(&final_remark_op);
-          }
+        }
         assert(_foregroundGCShouldWait, "block post-condition");
         break;
       case Sweeping:
@@ -3499,6 +3499,7 @@ void CMSCollector::checkpointRootsInitialWork(bool asynch) {
   ref_processor()->set_enqueuing_is_done(false);
 
   {
+    // This is not needed. DEBUG_ONLY(RememberKlassesChecker imx(true);)
     COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;)
     gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
     gch->gen_process_strong_roots(_cmsGen->level(),
@@ -3623,6 +3624,8 @@ bool CMSCollector::markFromRootsWork(bool asynch) {
   verify_overflow_empty();
   assert(_revisitStack.isEmpty(), "tabula rasa");
 
+  DEBUG_ONLY(RememberKlassesChecker cmx(CMSClassUnloadingEnabled);)
+
   bool result = false;
   if (CMSConcurrentMTEnabled && ParallelCMSThreads > 0) {
     result = do_marking_mt(asynch);
@@ -3958,24 +3961,24 @@ void CMSConcMarkingTask::do_scan_and_mark(int i, CompactibleFreeListSpace* sp) {
   pst->all_tasks_completed();
 }
 
-class Par_ConcMarkingClosure: public OopClosure {
+class Par_ConcMarkingClosure: public Par_KlassRememberingOopClosure {
  private:
-  CMSCollector* _collector;
   MemRegion     _span;
   CMSBitMap*    _bit_map;
   CMSMarkStack* _overflow_stack;
-  CMSMarkStack* _revisit_stack;     // XXXXXX Check proper use
   OopTaskQueue* _work_queue;
  protected:
   DO_OOP_WORK_DEFN
  public:
   Par_ConcMarkingClosure(CMSCollector* collector, OopTaskQueue* work_queue,
-                         CMSBitMap* bit_map, CMSMarkStack* overflow_stack):
-    _collector(collector),
+                         CMSBitMap* bit_map, CMSMarkStack* overflow_stack,
+                         CMSMarkStack* revisit_stack):
+    Par_KlassRememberingOopClosure(collector, NULL, revisit_stack),
     _span(_collector->_span),
     _work_queue(work_queue),
     _bit_map(bit_map),
-    _overflow_stack(overflow_stack) { }   // need to initialize revisit stack etc.
+    _overflow_stack(overflow_stack)
+  { }
   virtual void do_oop(oop* p);
   virtual void do_oop(narrowOop* p);
   void trim_queue(size_t max);
@@ -4063,8 +4066,9 @@ void CMSConcMarkingTask::do_work_steal(int i) {
   oop obj_to_scan;
   CMSBitMap* bm = &(_collector->_markBitMap);
   CMSMarkStack* ovflw = &(_collector->_markStack);
+  CMSMarkStack* revisit = &(_collector->_revisitStack);
   int* seed = _collector->hash_seed(i);
-  Par_ConcMarkingClosure cl(_collector, work_q, bm, ovflw);
+  Par_ConcMarkingClosure cl(_collector, work_q, bm, ovflw, revisit);
   while (true) {
     cl.trim_queue(0);
     assert(work_q->size() == 0, "Should have been emptied above");
@@ -4089,6 +4093,7 @@ void CMSConcMarkingTask::coordinator_yield() {
   assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
          "CMS thread should hold CMS token");
 
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   // First give up the locks, then yield, then re-lock
   // We should probably use a constructor/destructor idiom to
   // do this unlock/lock or modify the MutexUnlocker class to
@@ -4165,6 +4170,8 @@ bool CMSCollector::do_marking_mt(bool asynch) {
   // multi-threaded marking phase.
   ReferenceProcessorMTMutator mt(ref_processor(), num_workers > 1);
 
+  DEBUG_ONLY(RememberKlassesChecker cmx(CMSClassUnloadingEnabled);)
+
   conc_workers()->start_task(&tsk);
   while (tsk.yielded()) {
     tsk.coordinator_yield();
@@ -4404,7 +4411,8 @@ size_t CMSCollector::preclean_work(bool clean_refs, bool clean_survivor) {
     CMSPrecleanRefsYieldClosure yield_cl(this);
     assert(rp->span().equals(_span), "Spans should be equal");
     CMSKeepAliveClosure keep_alive(this, _span, &_markBitMap,
-                                   &_markStack, true /* preclean */);
+                                   &_markStack, &_revisitStack,
+                                   true /* preclean */);
     CMSDrainMarkingStackClosure complete_trace(this,
                                    _span, &_markBitMap, &_markStack,
                                    &keep_alive, true /* preclean */);
@@ -4424,6 +4432,7 @@ size_t CMSCollector::preclean_work(bool clean_refs, bool clean_survivor) {
                             bitMapLock());
     startTimer();
     sample_eden();
+
     // The following will yield to allow foreground
     // collection to proceed promptly. XXX YSR:
     // The code in this method may need further
@@ -4453,6 +4462,7 @@ size_t CMSCollector::preclean_work(bool clean_refs, bool clean_survivor) {
     SurvivorSpacePrecleanClosure
       sss_cl(this, _span, &_markBitMap, &_markStack,
              &pam_cl, before_count, CMSYield);
+    DEBUG_ONLY(RememberKlassesChecker mx(CMSClassUnloadingEnabled);)
     dng->from()->object_iterate_careful(&sss_cl);
     dng->to()->object_iterate_careful(&sss_cl);
   }
@@ -4554,6 +4564,13 @@ size_t CMSCollector::preclean_mod_union_table(
   verify_work_stacks_empty();
   verify_overflow_empty();
 
+  // Turn off checking for this method but turn it back on
+  // selectively.  There are yield points in this method
+  // but it is difficult to turn the checking off just around
+  // the yield points.  It is simpler to selectively turn
+  // it on.
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
+
   // strategy: starting with the first card, accumulate contiguous
   // ranges of dirty cards; clear these cards, then scan the region
   // covered by these cards.
@@ -4582,6 +4599,7 @@ size_t CMSCollector::preclean_mod_union_table(
     MemRegion dirtyRegion;
     {
       stopTimer();
+      // Potential yield point
       CMSTokenSync ts(true);
       startTimer();
       sample_eden();
@@ -4607,6 +4625,7 @@ size_t CMSCollector::preclean_mod_union_table(
       assert(numDirtyCards > 0, "consistency check");
       HeapWord* stop_point = NULL;
       stopTimer();
+      // Potential yield point
       CMSTokenSyncWithLocks ts(true, gen->freelistLock(),
                                bitMapLock());
       startTimer();
@@ -4614,6 +4633,7 @@ size_t CMSCollector::preclean_mod_union_table(
         verify_work_stacks_empty();
         verify_overflow_empty();
         sample_eden();
+        DEBUG_ONLY(RememberKlassesChecker mx(CMSClassUnloadingEnabled);)
         stop_point =
           gen->cmsSpace()->object_iterate_careful_m(dirtyRegion, cl);
       }
@@ -4701,6 +4721,7 @@ size_t CMSCollector::preclean_card_table(ConcurrentMarkSweepGeneration* gen,
       sample_eden();
       verify_work_stacks_empty();
       verify_overflow_empty();
+      DEBUG_ONLY(RememberKlassesChecker mx(CMSClassUnloadingEnabled);)
       HeapWord* stop_point =
         gen->cmsSpace()->object_iterate_careful_m(dirtyRegion, cl);
       if (stop_point != NULL) {
@@ -4800,6 +4821,7 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch,
   assert(haveFreelistLocks(), "must have free list locks");
   assert_lock_strong(bitMapLock());
 
+  DEBUG_ONLY(RememberKlassesChecker fmx(CMSClassUnloadingEnabled);)
   if (!init_mark_was_synchronous) {
     // We might assume that we need not fill TLAB's when
     // CMSScavengeBeforeRemark is set, because we may have just done
@@ -4903,6 +4925,9 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch,
   _markStack._hit_limit = 0;
   _markStack._failed_double = 0;
 
+  // Check that all the klasses have been checked
+  assert(_revisitStack.isEmpty(), "Not all klasses revisited");
+
   if ((VerifyAfterGC || VerifyDuringGC) &&
       GenCollectedHeap::heap()->total_collections() >= VerifyGCStartAt) {
     verify_after_remark();
@@ -5574,9 +5599,13 @@ public:
 void CMSRefProcTaskProxy::work(int i) {
   assert(_collector->_span.equals(_span), "Inconsistency in _span");
   CMSParKeepAliveClosure par_keep_alive(_collector, _span,
-                                        _mark_bit_map, work_queue(i));
+                                        _mark_bit_map,
+                                        &_collector->_revisitStack,
+                                        work_queue(i));
   CMSParDrainMarkingStackClosure par_drain_stack(_collector, _span,
-                                                 _mark_bit_map, work_queue(i));
+                                                 _mark_bit_map,
+                                                 &_collector->_revisitStack,
+                                                 work_queue(i));
   CMSIsAliveClosure is_alive_closure(_span, _mark_bit_map);
   _task.work(i, is_alive_closure, par_keep_alive, par_drain_stack);
   if (_task.marks_oops_alive()) {
@@ -5604,12 +5633,13 @@ public:
 };
 
 CMSParKeepAliveClosure::CMSParKeepAliveClosure(CMSCollector* collector,
-  MemRegion span, CMSBitMap* bit_map, OopTaskQueue* work_queue):
-   _collector(collector),
+  MemRegion span, CMSBitMap* bit_map, CMSMarkStack* revisit_stack,
+  OopTaskQueue* work_queue):
+   Par_KlassRememberingOopClosure(collector, NULL, revisit_stack),
    _span(span),
    _bit_map(bit_map),
    _work_queue(work_queue),
-   _mark_and_push(collector, span, bit_map, work_queue),
+   _mark_and_push(collector, span, bit_map, revisit_stack, work_queue),
    _low_water_mark(MIN2((uint)(work_queue->max_elems()/4),
                         (uint)(CMSWorkQueueDrainThreshold * ParallelGCThreads)))
 { }
@@ -5696,7 +5726,8 @@ void CMSCollector::refProcessingWork(bool asynch, bool clear_all_soft_refs) {
   verify_work_stacks_empty();
 
   CMSKeepAliveClosure cmsKeepAliveClosure(this, _span, &_markBitMap,
-                                          &_markStack, false /* !preclean */);
+                                          &_markStack, &_revisitStack,
+                                          false /* !preclean */);
   CMSDrainMarkingStackClosure cmsDrainMarkingStackClosure(this,
                                 _span, &_markBitMap, &_markStack,
                                 &cmsKeepAliveClosure, false /* !preclean */);
@@ -6531,6 +6562,7 @@ void MarkRefsIntoAndScanClosure::do_yield_work() {
   assert_lock_strong(_freelistLock);
   assert_lock_strong(_bit_map->lock());
   // relinquish the free_list_lock and bitMaplock()
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   _bit_map->lock()->unlock();
   _freelistLock->unlock();
   ConcurrentMarkSweepThread::desynchronize(true);
@@ -6703,6 +6735,7 @@ void ScanMarkedObjectsAgainCarefullyClosure::do_yield_work() {
          "CMS thread should hold CMS token");
   assert_lock_strong(_freelistLock);
   assert_lock_strong(_bitMap->lock());
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   // relinquish the free_list_lock and bitMaplock()
   _bitMap->lock()->unlock();
   _freelistLock->unlock();
@@ -6779,6 +6812,7 @@ void SurvivorSpacePrecleanClosure::do_yield_work() {
   assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
          "CMS thread should hold CMS token");
   assert_lock_strong(_bit_map->lock());
+  DEBUG_ONLY(RememberKlassesChecker smx(false);)
   // Relinquish the bit map lock
   _bit_map->lock()->unlock();
   ConcurrentMarkSweepThread::desynchronize(true);
@@ -6941,6 +6975,7 @@ void MarkFromRootsClosure::do_yield_work() {
   assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
          "CMS thread should hold CMS token");
   assert_lock_strong(_bitMap->lock());
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   _bitMap->lock()->unlock();
   ConcurrentMarkSweepThread::desynchronize(true);
   ConcurrentMarkSweepThread::acknowledge_yield_request();
@@ -7295,15 +7330,12 @@ PushOrMarkClosure::PushOrMarkClosure(CMSCollector* collector,
                      CMSBitMap* bitMap, CMSMarkStack*  markStack,
                      CMSMarkStack*  revisitStack,
                      HeapWord* finger, MarkFromRootsClosure* parent) :
-  OopClosure(collector->ref_processor()),
-  _collector(collector),
+  KlassRememberingOopClosure(collector, collector->ref_processor(), revisitStack),
   _span(span),
   _bitMap(bitMap),
   _markStack(markStack),
-  _revisitStack(revisitStack),
   _finger(finger),
-  _parent(parent),
-  _should_remember_klasses(collector->should_unload_classes())
+  _parent(parent)
 { }
 
 Par_PushOrMarkClosure::Par_PushOrMarkClosure(CMSCollector* collector,
@@ -7315,18 +7347,17 @@ Par_PushOrMarkClosure::Par_PushOrMarkClosure(CMSCollector* collector,
                      HeapWord* finger,
                      HeapWord** global_finger_addr,
                      Par_MarkFromRootsClosure* parent) :
-  OopClosure(collector->ref_processor()),
-  _collector(collector),
+  Par_KlassRememberingOopClosure(collector,
+                            collector->ref_processor(),
+                            revisit_stack),
   _whole_span(collector->_span),
   _span(span),
   _bit_map(bit_map),
   _work_queue(work_queue),
   _overflow_stack(overflow_stack),
-  _revisit_stack(revisit_stack),
   _finger(finger),
   _global_finger_addr(global_finger_addr),
-  _parent(parent),
-  _should_remember_klasses(collector->should_unload_classes())
+  _parent(parent)
 { }
 
 // Assumes thread-safe access by callers, who are
@@ -7456,6 +7487,14 @@ void Par_PushOrMarkClosure::do_oop(oop obj) {
 void Par_PushOrMarkClosure::do_oop(oop* p)       { Par_PushOrMarkClosure::do_oop_work(p); }
 void Par_PushOrMarkClosure::do_oop(narrowOop* p) { Par_PushOrMarkClosure::do_oop_work(p); }
 
+KlassRememberingOopClosure::KlassRememberingOopClosure(CMSCollector* collector,
+                                             ReferenceProcessor* rp,
+                                             CMSMarkStack* revisit_stack) :
+  OopClosure(rp),
+  _collector(collector),
+  _revisit_stack(revisit_stack),
+  _should_remember_klasses(collector->should_unload_classes()) {}
+
 PushAndMarkClosure::PushAndMarkClosure(CMSCollector* collector,
                                        MemRegion span,
                                        ReferenceProcessor* rp,
@@ -7464,15 +7503,12 @@ PushAndMarkClosure::PushAndMarkClosure(CMSCollector* collector,
                                        CMSMarkStack*  mark_stack,
                                        CMSMarkStack*  revisit_stack,
                                        bool           concurrent_precleaning):
-  OopClosure(rp),
-  _collector(collector),
+  KlassRememberingOopClosure(collector, rp, revisit_stack),
   _span(span),
   _bit_map(bit_map),
   _mod_union_table(mod_union_table),
   _mark_stack(mark_stack),
-  _revisit_stack(revisit_stack),
-  _concurrent_precleaning(concurrent_precleaning),
-  _should_remember_klasses(collector->should_unload_classes())
+  _concurrent_precleaning(concurrent_precleaning)
 {
   assert(_ref_processor != NULL, "_ref_processor shouldn't be NULL");
 }
@@ -7540,13 +7576,10 @@ Par_PushAndMarkClosure::Par_PushAndMarkClosure(CMSCollector* collector,
                                                CMSBitMap* bit_map,
                                                OopTaskQueue* work_queue,
                                                CMSMarkStack* revisit_stack):
-  OopClosure(rp),
-  _collector(collector),
+  Par_KlassRememberingOopClosure(collector, rp, revisit_stack),
   _span(span),
   _bit_map(bit_map),
-  _work_queue(work_queue),
-  _revisit_stack(revisit_stack),
-  _should_remember_klasses(collector->should_unload_classes())
+  _work_queue(work_queue)
 {
   assert(_ref_processor != NULL, "_ref_processor shouldn't be NULL");
 }
@@ -7599,19 +7632,16 @@ void Par_PushAndMarkClosure::do_oop(oop obj) {
 void Par_PushAndMarkClosure::do_oop(oop* p)       { Par_PushAndMarkClosure::do_oop_work(p); }
 void Par_PushAndMarkClosure::do_oop(narrowOop* p) { Par_PushAndMarkClosure::do_oop_work(p); }
 
-void PushAndMarkClosure::remember_klass(Klass* k) {
-  if (!_revisit_stack->push(oop(k))) {
-    fatal("Revisit stack overflowed in PushAndMarkClosure");
-  }
+void PushAndMarkClosure::remember_mdo(DataLayout* v) {
+  // TBD
 }
 
-void Par_PushAndMarkClosure::remember_klass(Klass* k) {
-  if (!_revisit_stack->par_push(oop(k))) {
-    fatal("Revist stack overflowed in Par_PushAndMarkClosure");
-  }
+void Par_PushAndMarkClosure::remember_mdo(DataLayout* v) {
+  // TBD
 }
 
 void CMSPrecleanRefsYieldClosure::do_yield_work() {
+  DEBUG_ONLY(RememberKlassesChecker mux(false);)
   Mutex* bml = _collector->bitMapLock();
   assert_lock_strong(bml);
   assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
@@ -8302,6 +8332,19 @@ bool CMSIsAliveClosure::do_object_b(oop obj) {
          (!_span.contains(addr) || _bit_map->isMarked(addr));
 }
 
+CMSKeepAliveClosure::CMSKeepAliveClosure( CMSCollector* collector,
+                      MemRegion span,
+                      CMSBitMap* bit_map, CMSMarkStack* mark_stack,
+                      CMSMarkStack* revisit_stack, bool cpc):
+  KlassRememberingOopClosure(collector, NULL, revisit_stack),
+  _span(span),
+  _bit_map(bit_map),
+  _mark_stack(mark_stack),
+  _concurrent_precleaning(cpc) {
+  assert(!_span.is_empty(), "Empty span could spell trouble");
+}
+
+
 // CMSKeepAliveClosure: the serial version
 void CMSKeepAliveClosure::do_oop(oop obj) {
   HeapWord* addr = (HeapWord*)obj;
@@ -8385,6 +8428,16 @@ void CMSParKeepAliveClosure::trim_queue(uint max) {
   }
 }
 
+CMSInnerParMarkAndPushClosure::CMSInnerParMarkAndPushClosure(
+                                CMSCollector* collector,
+                                MemRegion span, CMSBitMap* bit_map,
+                                CMSMarkStack* revisit_stack,
+                                OopTaskQueue* work_queue):
+  Par_KlassRememberingOopClosure(collector, NULL, revisit_stack),
+  _span(span),
+  _bit_map(bit_map),
+  _work_queue(work_queue) { }
+
 void CMSInnerParMarkAndPushClosure::do_oop(oop obj) {
   HeapWord* addr = (HeapWord*)obj;
   if (_span.contains(addr) &&
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
index d81b061c047..a58217faf93 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
@@ -1790,12 +1790,13 @@ class CMSParDrainMarkingStackClosure: public VoidClosure {
  public:
   CMSParDrainMarkingStackClosure(CMSCollector* collector,
                                  MemRegion span, CMSBitMap* bit_map,
+                                 CMSMarkStack* revisit_stack,
                                  OopTaskQueue* work_queue):
     _collector(collector),
     _span(span),
     _bit_map(bit_map),
     _work_queue(work_queue),
-    _mark_and_push(collector, span, bit_map, work_queue) { }
+    _mark_and_push(collector, span, bit_map, revisit_stack, work_queue) { }
 
  public:
   void trim_queue(uint max);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp
index 3473fac0186..8ec60012c04 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp
@@ -25,11 +25,21 @@
 #include "incls/_precompiled.incl"
 #include "incls/_concurrentG1Refine.cpp.incl"
 
+// Possible sizes for the card counts cache: odd primes that roughly double in size.
+// (See jvmtiTagMap.cpp).
+int ConcurrentG1Refine::_cc_cache_sizes[] = {
+        16381,    32771,    76831,    150001,   307261,
+       614563,  1228891,  2457733,   4915219,  9830479,
+     19660831, 39321619, 78643219, 157286461,       -1
+  };
+
 ConcurrentG1Refine::ConcurrentG1Refine() :
-  _card_counts(NULL), _cur_card_count_histo(NULL), _cum_card_count_histo(NULL),
+  _card_counts(NULL), _card_epochs(NULL),
+  _n_card_counts(0), _max_n_card_counts(0),
+  _cache_size_index(0), _expand_card_counts(false),
   _hot_cache(NULL),
   _def_use_cache(false), _use_cache(false),
-  _n_periods(0), _total_cards(0), _total_travs(0),
+  _n_periods(0),
   _threads(NULL), _n_threads(0)
 {
   if (G1ConcRefine) {
@@ -57,32 +67,51 @@ size_t ConcurrentG1Refine::thread_num() {
 }
 
 void ConcurrentG1Refine::init() {
-  if (G1ConcRSLogCacheSize > 0 || G1ConcRSCountTraversals) {
-    G1CollectedHeap* g1h = G1CollectedHeap::heap();
-    _n_card_counts =
-      (unsigned) (g1h->g1_reserved_obj_bytes() >> CardTableModRefBS::card_shift);
-    _card_counts = NEW_C_HEAP_ARRAY(unsigned char, _n_card_counts);
-    for (size_t i = 0; i < _n_card_counts; i++) _card_counts[i] = 0;
-    ModRefBarrierSet* bs = g1h->mr_bs();
-    guarantee(bs->is_a(BarrierSet::CardTableModRef), "Precondition");
-    CardTableModRefBS* ctbs = (CardTableModRefBS*)bs;
-    _ct_bot = ctbs->byte_for_const(g1h->reserved_region().start());
-    if (G1ConcRSCountTraversals) {
-      _cur_card_count_histo = NEW_C_HEAP_ARRAY(unsigned, 256);
-      _cum_card_count_histo = NEW_C_HEAP_ARRAY(unsigned, 256);
-      for (int i = 0; i < 256; i++) {
-        _cur_card_count_histo[i] = 0;
-        _cum_card_count_histo[i] = 0;
-      }
-    }
-  }
   if (G1ConcRSLogCacheSize > 0) {
+    _g1h = G1CollectedHeap::heap();
+    _max_n_card_counts =
+      (unsigned) (_g1h->g1_reserved_obj_bytes() >> CardTableModRefBS::card_shift);
+
+    size_t max_card_num = ((size_t)1 << (sizeof(unsigned)*BitsPerByte-1)) - 1;
+    guarantee(_max_n_card_counts < max_card_num, "card_num representation");
+
+    int desired = _max_n_card_counts / InitialCacheFraction;
+    for (_cache_size_index = 0;
+              _cc_cache_sizes[_cache_size_index] >= 0; _cache_size_index++) {
+      if (_cc_cache_sizes[_cache_size_index] >= desired) break;
+    }
+    _cache_size_index = MAX2(0, (_cache_size_index - 1));
+
+    int initial_size = _cc_cache_sizes[_cache_size_index];
+    if (initial_size < 0) initial_size = _max_n_card_counts;
+
+    // Make sure we don't go bigger than we will ever need
+    _n_card_counts = MIN2((unsigned) initial_size, _max_n_card_counts);
+
+    _card_counts = NEW_C_HEAP_ARRAY(CardCountCacheEntry, _n_card_counts);
+    _card_epochs = NEW_C_HEAP_ARRAY(CardEpochCacheEntry, _n_card_counts);
+
+    Copy::fill_to_bytes(&_card_counts[0],
+                        _n_card_counts * sizeof(CardCountCacheEntry));
+    Copy::fill_to_bytes(&_card_epochs[0], _n_card_counts * sizeof(CardEpochCacheEntry));
+
+    ModRefBarrierSet* bs = _g1h->mr_bs();
+    guarantee(bs->is_a(BarrierSet::CardTableModRef), "Precondition");
+    _ct_bs = (CardTableModRefBS*)bs;
+    _ct_bot = _ct_bs->byte_for_const(_g1h->reserved_region().start());
+
     _def_use_cache = true;
     _use_cache = true;
     _hot_cache_size = (1 << G1ConcRSLogCacheSize);
     _hot_cache = NEW_C_HEAP_ARRAY(jbyte*, _hot_cache_size);
     _n_hot = 0;
     _hot_cache_idx = 0;
+
+    // For refining the cards in the hot cache in parallel
+    int n_workers = (ParallelGCThreads > 0 ?
+                        _g1h->workers()->total_workers() : 1);
+    _hot_cache_par_chunk_size = MAX2(1, _hot_cache_size / n_workers);
+    _hot_cache_par_claimed_idx = 0;
   }
 }
 
@@ -95,15 +124,11 @@ void ConcurrentG1Refine::stop() {
 }
 
 ConcurrentG1Refine::~ConcurrentG1Refine() {
-  if (G1ConcRSLogCacheSize > 0 || G1ConcRSCountTraversals) {
-    assert(_card_counts != NULL, "Logic");
-    FREE_C_HEAP_ARRAY(unsigned char, _card_counts);
-    assert(_cur_card_count_histo != NULL, "Logic");
-    FREE_C_HEAP_ARRAY(unsigned, _cur_card_count_histo);
-    assert(_cum_card_count_histo != NULL, "Logic");
-    FREE_C_HEAP_ARRAY(unsigned, _cum_card_count_histo);
-  }
   if (G1ConcRSLogCacheSize > 0) {
+    assert(_card_counts != NULL, "Logic");
+    FREE_C_HEAP_ARRAY(CardCountCacheEntry, _card_counts);
+    assert(_card_epochs != NULL, "Logic");
+    FREE_C_HEAP_ARRAY(CardEpochCacheEntry, _card_epochs);
     assert(_hot_cache != NULL, "Logic");
     FREE_C_HEAP_ARRAY(jbyte*, _hot_cache);
   }
@@ -123,165 +148,232 @@ void ConcurrentG1Refine::threads_do(ThreadClosure *tc) {
   }
 }
 
-
-int ConcurrentG1Refine::add_card_count(jbyte* card_ptr) {
-  size_t card_num = (card_ptr - _ct_bot);
-  guarantee(0 <= card_num && card_num < _n_card_counts, "Bounds");
-  unsigned char cnt = _card_counts[card_num];
-  if (cnt < 255) _card_counts[card_num]++;
-  return cnt;
-  _total_travs++;
+bool ConcurrentG1Refine::is_young_card(jbyte* card_ptr) {
+  HeapWord* start = _ct_bs->addr_for(card_ptr);
+  HeapRegion* r = _g1h->heap_region_containing(start);
+  if (r != NULL && r->is_young()) {
+    return true;
+  }
+  // This card is not associated with a heap region
+  // so can't be young.
+  return false;
 }
 
-jbyte* ConcurrentG1Refine::cache_insert(jbyte* card_ptr) {
-  int count = add_card_count(card_ptr);
-  // Count previously unvisited cards.
-  if (count == 0) _total_cards++;
-  // We'll assume a traversal unless we store it in the cache.
-  if (count < G1ConcRSHotCardLimit) {
-    _total_travs++;
-    return card_ptr;
+jbyte* ConcurrentG1Refine::add_card_count(jbyte* card_ptr, int* count, bool* defer) {
+  unsigned new_card_num = ptr_2_card_num(card_ptr);
+  unsigned bucket = hash(new_card_num);
+  assert(0 <= bucket && bucket < _n_card_counts, "Bounds");
+
+  CardCountCacheEntry* count_ptr = &_card_counts[bucket];
+  CardEpochCacheEntry* epoch_ptr = &_card_epochs[bucket];
+
+  // We have to construct a new entry if we haven't updated the counts
+  // during the current period, or if the count was updated for a
+  // different card number.
+  unsigned int new_epoch = (unsigned int) _n_periods;
+  julong new_epoch_entry = make_epoch_entry(new_card_num, new_epoch);
+
+  while (true) {
+    // Fetch the previous epoch value
+    julong prev_epoch_entry = epoch_ptr->_value;
+    julong cas_res;
+
+    if (extract_epoch(prev_epoch_entry) != new_epoch) {
+      // This entry has not yet been updated during this period.
+      // Note: we update the epoch value atomically to ensure
+      // that there is only one winner that updates the cached
+      // card_ptr value even though all the refine threads share
+      // the same epoch value.
+
+      cas_res = (julong) Atomic::cmpxchg((jlong) new_epoch_entry,
+                                         (volatile jlong*)&epoch_ptr->_value,
+                                         (jlong) prev_epoch_entry);
+
+      if (cas_res == prev_epoch_entry) {
+        // We have successfully won the race to update the
+        // epoch and card_num value. Make it look like the
+        // count and eviction count were previously cleared.
+        count_ptr->_count = 1;
+        count_ptr->_evict_count = 0;
+        *count = 0;
+        // We can defer the processing of card_ptr
+        *defer = true;
+        return card_ptr;
+      }
+      // We did not win the race to update the epoch field, so some other
+      // thread must have done it. The value that gets returned by CAS
+      // should be the new epoch value.
+      assert(extract_epoch(cas_res) == new_epoch, "unexpected epoch");
+      // We could 'continue' here or just re-read the previous epoch value
+      prev_epoch_entry = epoch_ptr->_value;
+    }
+
+    // The epoch entry for card_ptr has been updated during this period.
+    unsigned old_card_num = extract_card_num(prev_epoch_entry);
+
+    // The card count that will be returned to caller
+    *count = count_ptr->_count;
+
+    // Are we updating the count for the same card?
+    if (new_card_num == old_card_num) {
+      // Same card - just update the count. We could have more than one
+      // thread racing to update count for the current card. It should be
+      // OK not to use a CAS as the only penalty should be some missed
+      // increments of the count which delays identifying the card as "hot".
+
+      if (*count < max_jubyte) count_ptr->_count++;
+      // We can defer the processing of card_ptr
+      *defer = true;
+      return card_ptr;
+    }
+
+    // Different card - evict old card info
+    if (count_ptr->_evict_count < max_jubyte) count_ptr->_evict_count++;
+    if (count_ptr->_evict_count > G1CardCountCacheExpandThreshold) {
+      // Trigger a resize the next time we clear
+      _expand_card_counts = true;
+    }
+
+    cas_res = (julong) Atomic::cmpxchg((jlong) new_epoch_entry,
+                                       (volatile jlong*)&epoch_ptr->_value,
+                                       (jlong) prev_epoch_entry);
+
+    if (cas_res == prev_epoch_entry) {
+      // We successfully updated the card num value in the epoch entry
+      count_ptr->_count = 0; // initialize counter for new card num
+
+      // Even though the region containg the card at old_card_num was not
+      // in the young list when old_card_num was recorded in the epoch
+      // cache it could have been added to the free list and subsequently
+      // added to the young list in the intervening time. If the evicted
+      // card is in a young region just return the card_ptr and the evicted
+      // card will not be cleaned. See CR 6817995.
+
+      jbyte* old_card_ptr = card_num_2_ptr(old_card_num);
+      if (is_young_card(old_card_ptr)) {
+        *count = 0;
+        // We can defer the processing of card_ptr
+        *defer = true;
+        return card_ptr;
+      }
+
+      // We do not want to defer processing of card_ptr in this case
+      // (we need to refine old_card_ptr and card_ptr)
+      *defer = false;
+      return old_card_ptr;
+    }
+    // Someone else beat us - try again.
   }
-  // Otherwise, it's hot.
+}
+
+jbyte* ConcurrentG1Refine::cache_insert(jbyte* card_ptr, bool* defer) {
+  int count;
+  jbyte* cached_ptr = add_card_count(card_ptr, &count, defer);
+  assert(cached_ptr != NULL, "bad cached card ptr");
+  assert(!is_young_card(cached_ptr), "shouldn't get a card in young region");
+
+  // The card pointer we obtained from card count cache is not hot
+  // so do not store it in the cache; return it for immediate
+  // refining.
+  if (count < G1ConcRSHotCardLimit) {
+    return cached_ptr;
+  }
+
+  // Otherwise, the pointer we got from the _card_counts is hot.
   jbyte* res = NULL;
   MutexLockerEx x(HotCardCache_lock, Mutex::_no_safepoint_check_flag);
   if (_n_hot == _hot_cache_size) {
-    _total_travs++;
     res = _hot_cache[_hot_cache_idx];
     _n_hot--;
   }
   // Now _n_hot < _hot_cache_size, and we can insert at _hot_cache_idx.
-  _hot_cache[_hot_cache_idx] = card_ptr;
+  _hot_cache[_hot_cache_idx] = cached_ptr;
   _hot_cache_idx++;
   if (_hot_cache_idx == _hot_cache_size) _hot_cache_idx = 0;
   _n_hot++;
+
+  if (res != NULL) {
+    // Even though the region containg res was not in the young list
+    // when it was recorded in the hot cache it could have been added
+    // to the free list and subsequently added to the young list in
+    // the intervening time. If res is in a young region, return NULL
+    // so that res is not cleaned. See CR 6817995.
+
+    if (is_young_card(res)) {
+      res = NULL;
+    }
+  }
+
   return res;
 }
 
-
 void ConcurrentG1Refine::clean_up_cache(int worker_i, G1RemSet* g1rs) {
   assert(!use_cache(), "cache should be disabled");
-  int start_ind = _hot_cache_idx-1;
-  for (int i = 0; i < _n_hot; i++) {
-    int ind = start_ind - i;
-    if (ind < 0) ind = ind + _hot_cache_size;
-    jbyte* entry = _hot_cache[ind];
-    if (entry != NULL) {
-      g1rs->concurrentRefineOneCard(entry, worker_i);
+  int start_idx;
+
+  while ((start_idx = _hot_cache_par_claimed_idx) < _n_hot) { // read once
+    int end_idx = start_idx + _hot_cache_par_chunk_size;
+
+    if (start_idx ==
+        Atomic::cmpxchg(end_idx, &_hot_cache_par_claimed_idx, start_idx)) {
+      // The current worker has successfully claimed the chunk [start_idx..end_idx)
+      end_idx = MIN2(end_idx, _n_hot);
+      for (int i = start_idx; i < end_idx; i++) {
+        jbyte* entry = _hot_cache[i];
+        if (entry != NULL) {
+          g1rs->concurrentRefineOneCard(entry, worker_i);
+        }
+      }
+    }
+  }
+}
+
+void ConcurrentG1Refine::expand_card_count_cache() {
+  if (_n_card_counts < _max_n_card_counts) {
+    int new_idx = _cache_size_index+1;
+    int new_size = _cc_cache_sizes[new_idx];
+    if (new_size < 0) new_size = _max_n_card_counts;
+
+    // Make sure we don't go bigger than we will ever need
+    new_size = MIN2((unsigned) new_size, _max_n_card_counts);
+
+    // Expand the card count and card epoch tables
+    if (new_size > (int)_n_card_counts) {
+      // We can just free and allocate a new array as we're
+      // not interested in preserving the contents
+      assert(_card_counts != NULL, "Logic!");
+      assert(_card_epochs != NULL, "Logic!");
+      FREE_C_HEAP_ARRAY(CardCountCacheEntry, _card_counts);
+      FREE_C_HEAP_ARRAY(CardEpochCacheEntry, _card_epochs);
+      _n_card_counts = new_size;
+      _card_counts = NEW_C_HEAP_ARRAY(CardCountCacheEntry, _n_card_counts);
+      _card_epochs = NEW_C_HEAP_ARRAY(CardEpochCacheEntry, _n_card_counts);
+      _cache_size_index = new_idx;
     }
   }
-  _n_hot = 0;
-  _hot_cache_idx = 0;
 }
 
 void ConcurrentG1Refine::clear_and_record_card_counts() {
-  if (G1ConcRSLogCacheSize == 0 && !G1ConcRSCountTraversals) return;
+  if (G1ConcRSLogCacheSize == 0) return;
+
+#ifndef PRODUCT
+  double start = os::elapsedTime();
+#endif
+
+  if (_expand_card_counts) {
+    expand_card_count_cache();
+    _expand_card_counts = false;
+    // Only need to clear the epochs.
+    Copy::fill_to_bytes(&_card_epochs[0], _n_card_counts * sizeof(CardEpochCacheEntry));
+  }
+
+  int this_epoch = (int) _n_periods;
+  assert((this_epoch+1) <= max_jint, "to many periods");
+  // Update epoch
   _n_periods++;
-  if (G1ConcRSCountTraversals) {
-    for (size_t i = 0; i < _n_card_counts; i++) {
-      unsigned char bucket = _card_counts[i];
-      _cur_card_count_histo[bucket]++;
-      _card_counts[i] = 0;
-    }
-    gclog_or_tty->print_cr("Card counts:");
-    for (int i = 0; i < 256; i++) {
-      if (_cur_card_count_histo[i] > 0) {
-        gclog_or_tty->print_cr("  %3d: %9d", i, _cur_card_count_histo[i]);
-        _cum_card_count_histo[i] += _cur_card_count_histo[i];
-        _cur_card_count_histo[i] = 0;
-      }
-    }
-  } else {
-    assert(G1ConcRSLogCacheSize > 0, "Logic");
-    Copy::fill_to_words((HeapWord*)(&_card_counts[0]),
-                        _n_card_counts / HeapWordSize);
-  }
-}
-
-void
-ConcurrentG1Refine::
-print_card_count_histo_range(unsigned* histo, int from, int to,
-                             float& cum_card_pct,
-                             float& cum_travs_pct) {
-  unsigned cards = 0;
-  unsigned travs = 0;
-  guarantee(to <= 256, "Precondition");
-  for (int i = from; i < to-1; i++) {
-    cards += histo[i];
-    travs += histo[i] * i;
-  }
-  if (to == 256) {
-    unsigned histo_card_sum = 0;
-    unsigned histo_trav_sum = 0;
-    for (int i = 1; i < 255; i++) {
-      histo_trav_sum += histo[i] * i;
-    }
-    cards += histo[255];
-    // correct traversals for the last one.
-    unsigned travs_255 = (unsigned) (_total_travs - histo_trav_sum);
-    travs += travs_255;
-
-  } else {
-    cards += histo[to-1];
-    travs += histo[to-1] * (to-1);
-  }
-  float fperiods = (float)_n_periods;
-  float f_tot_cards = (float)_total_cards/fperiods;
-  float f_tot_travs = (float)_total_travs/fperiods;
-  if (cards > 0) {
-    float fcards = (float)cards/fperiods;
-    float ftravs = (float)travs/fperiods;
-    if (to == 256) {
-      gclog_or_tty->print(" %4d-       %10.2f%10.2f", from, fcards, ftravs);
-    } else {
-      gclog_or_tty->print(" %4d-%4d   %10.2f%10.2f", from, to-1, fcards, ftravs);
-    }
-    float pct_cards = fcards*100.0/f_tot_cards;
-    cum_card_pct += pct_cards;
-    float pct_travs = ftravs*100.0/f_tot_travs;
-    cum_travs_pct += pct_travs;
-    gclog_or_tty->print_cr("%10.2f%10.2f%10.2f%10.2f",
-                  pct_cards, cum_card_pct,
-                  pct_travs, cum_travs_pct);
-  }
-}
-
-void ConcurrentG1Refine::print_final_card_counts() {
-  if (!G1ConcRSCountTraversals) return;
-
-  gclog_or_tty->print_cr("Did %d total traversals of %d distinct cards.",
-                _total_travs, _total_cards);
-  float fperiods = (float)_n_periods;
-  gclog_or_tty->print_cr("  This is an average of %8.2f traversals, %8.2f cards, "
-                "per collection.", (float)_total_travs/fperiods,
-                (float)_total_cards/fperiods);
-  gclog_or_tty->print_cr("  This is an average of %8.2f traversals/distinct "
-                "dirty card.\n",
-                _total_cards > 0 ?
-                (float)_total_travs/(float)_total_cards : 0.0);
-
-
-  gclog_or_tty->print_cr("Histogram:\n\n%10s   %10s%10s%10s%10s%10s%10s",
-                "range", "# cards", "# travs", "% cards", "(cum)",
-                "% travs", "(cum)");
-  gclog_or_tty->print_cr("------------------------------------------------------------"
-                "-------------");
-  float cum_cards_pct = 0.0;
-  float cum_travs_pct = 0.0;
-  for (int i = 1; i < 10; i++) {
-    print_card_count_histo_range(_cum_card_count_histo, i, i+1,
-                                 cum_cards_pct, cum_travs_pct);
-  }
-  for (int i = 10; i < 100; i += 10) {
-    print_card_count_histo_range(_cum_card_count_histo, i, i+10,
-                                 cum_cards_pct, cum_travs_pct);
-  }
-  print_card_count_histo_range(_cum_card_count_histo, 100, 150,
-                               cum_cards_pct, cum_travs_pct);
-  print_card_count_histo_range(_cum_card_count_histo, 150, 200,
-                               cum_cards_pct, cum_travs_pct);
-  print_card_count_histo_range(_cum_card_count_histo, 150, 255,
-                               cum_cards_pct, cum_travs_pct);
-  print_card_count_histo_range(_cum_card_count_histo, 255, 256,
-                               cum_cards_pct, cum_travs_pct);
+
+#ifndef PRODUCT
+  double elapsed = os::elapsedTime() - start;
+  _g1h->g1_policy()->record_cc_clear_time(elapsed * 1000.0);
+#endif
 }
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp
index 830e19ee633..a6ee5484a37 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp
@@ -29,29 +29,117 @@ class G1RemSet;
 class ConcurrentG1Refine: public CHeapObj {
   ConcurrentG1RefineThread** _threads;
   int _n_threads;
-  // The cache for card refinement.
-  bool     _use_cache;
-  bool     _def_use_cache;
-  size_t _n_periods;
-  size_t _total_cards;
-  size_t _total_travs;
 
-  unsigned char*  _card_counts;
+  // The cache for card refinement.
+  bool   _use_cache;
+  bool   _def_use_cache;
+
+  size_t _n_periods;    // Used as clearing epoch
+
+  // An evicting cache of the number of times each card
+  // is accessed. Reduces, but does not eliminate, the amount
+  // of duplicated processing of dirty cards.
+
+  enum SomePrivateConstants {
+    epoch_bits           = 32,
+    card_num_shift       = epoch_bits,
+    epoch_mask           = AllBits,
+    card_num_mask        = AllBits,
+
+    // The initial cache size is approximately this fraction
+    // of a maximal cache (i.e. the size needed for all cards
+    // in the heap)
+    InitialCacheFraction = 512
+  };
+
+  const static julong card_num_mask_in_place =
+                        (julong) card_num_mask << card_num_shift;
+
+  typedef struct {
+    julong _value;      // |  card_num   |  epoch   |
+  } CardEpochCacheEntry;
+
+  julong make_epoch_entry(unsigned int card_num, unsigned int epoch) {
+    assert(0 <= card_num && card_num < _max_n_card_counts, "Bounds");
+    assert(0 <= epoch && epoch <= _n_periods, "must be");
+
+    return ((julong) card_num << card_num_shift) | epoch;
+  }
+
+  unsigned int extract_epoch(julong v) {
+    return (v & epoch_mask);
+  }
+
+  unsigned int extract_card_num(julong v) {
+    return (v & card_num_mask_in_place) >> card_num_shift;
+  }
+
+  typedef struct {
+    unsigned char _count;
+    unsigned char _evict_count;
+  } CardCountCacheEntry;
+
+  CardCountCacheEntry* _card_counts;
+  CardEpochCacheEntry* _card_epochs;
+
+  // The current number of buckets in the card count cache
   unsigned _n_card_counts;
+
+  // The max number of buckets required for the number of
+  // cards for the entire reserved heap
+  unsigned _max_n_card_counts;
+
+  // Possible sizes of the cache: odd primes that roughly double in size.
+  // (See jvmtiTagMap.cpp).
+  static int _cc_cache_sizes[];
+
+  // The index in _cc_cache_sizes corresponding to the size of
+  // _card_counts.
+  int _cache_size_index;
+
+  bool _expand_card_counts;
+
   const jbyte* _ct_bot;
-  unsigned* _cur_card_count_histo;
-  unsigned* _cum_card_count_histo;
-  jbyte**  _hot_cache;
-  int      _hot_cache_size;
-  int      _n_hot;
-  int      _hot_cache_idx;
+
+  jbyte**      _hot_cache;
+  int          _hot_cache_size;
+  int          _n_hot;
+  int          _hot_cache_idx;
+
+  int          _hot_cache_par_chunk_size;
+  volatile int _hot_cache_par_claimed_idx;
+
+  // Needed to workaround 6817995
+  CardTableModRefBS* _ct_bs;
+  G1CollectedHeap*   _g1h;
+
+  // Expands the array that holds the card counts to the next size up
+  void expand_card_count_cache();
+
+  // hash a given key (index of card_ptr) with the specified size
+  static unsigned int hash(size_t key, int size) {
+    return (unsigned int) key % size;
+  }
+
+  // hash a given key (index of card_ptr)
+  unsigned int hash(size_t key) {
+    return hash(key, _n_card_counts);
+  }
+
+  unsigned ptr_2_card_num(jbyte* card_ptr) {
+    return (unsigned) (card_ptr - _ct_bot);
+  }
+
+  jbyte* card_num_2_ptr(unsigned card_num) {
+    return (jbyte*) (_ct_bot + card_num);
+  }
 
   // Returns the count of this card after incrementing it.
-  int add_card_count(jbyte* card_ptr);
+  jbyte* add_card_count(jbyte* card_ptr, int* count, bool* defer);
+
+  // Returns true if this card is in a young region
+  bool is_young_card(jbyte* card_ptr);
 
-  void print_card_count_histo_range(unsigned* histo, int from, int to,
-                                    float& cum_card_pct,
-                                    float& cum_travs_pct);
  public:
   ConcurrentG1Refine();
   ~ConcurrentG1Refine();
@@ -65,11 +153,16 @@ class ConcurrentG1Refine: public CHeapObj {
   // If this is the first entry for the slot, writes into the cache and
   // returns NULL.  If it causes an eviction, returns the evicted pointer.
   // Otherwise, its a cache hit, and returns NULL.
-  jbyte* cache_insert(jbyte* card_ptr);
+  jbyte* cache_insert(jbyte* card_ptr, bool* defer);
 
   // Process the cached entries.
   void clean_up_cache(int worker_i, G1RemSet* g1rs);
 
+  // Set up for parallel processing of the cards in the hot cache
+  void clear_hot_cache_claimed_index() {
+    _hot_cache_par_claimed_idx = 0;
+  }
+
   // Discard entries in the hot cache.
   void clear_hot_cache() {
     _hot_cache_idx = 0; _n_hot = 0;
@@ -84,7 +177,6 @@ class ConcurrentG1Refine: public CHeapObj {
   }
 
   void clear_and_record_card_counts();
-  void print_final_card_counts();
 
   static size_t thread_num();
 };
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
index cd5729cfd58..1954c949f61 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
@@ -39,7 +39,6 @@ ConcurrentG1RefineThread(ConcurrentG1Refine* cg1r, ConcurrentG1RefineThread *nex
   _next(next),
   _cg1r(cg1r),
   _vtime_accum(0.0),
-  _co_tracker(G1CRGroup),
   _interval_ms(5.0)
 {
   create_and_start();
@@ -76,9 +75,6 @@ void ConcurrentG1RefineThread::run() {
   _vtime_start = os::elapsedVTime();
   wait_for_universe_init();
 
-  _co_tracker.enable();
-  _co_tracker.start();
-
   while (!_should_terminate) {
     DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
     // Wait for completed log buffers to exist.
@@ -104,17 +100,17 @@ void ConcurrentG1RefineThread::run() {
     double start_vtime_sec; // only used when G1SmoothConcRefine is on
     int prev_buffer_num; // only used when G1SmoothConcRefine is on
     // This thread activation threshold
-    int threshold = DCQBarrierProcessCompletedThreshold * _worker_id;
+    int threshold = G1UpdateBufferQueueProcessingThreshold * _worker_id;
     // Next thread activation threshold
-    int next_threshold = threshold + DCQBarrierProcessCompletedThreshold;
-    int deactivation_threshold = MAX2<int>(threshold - DCQBarrierProcessCompletedThreshold / 2, 0);
+    int next_threshold = threshold + G1UpdateBufferQueueProcessingThreshold;
+    int deactivation_threshold = MAX2<int>(threshold - G1UpdateBufferQueueProcessingThreshold / 2, 0);
 
     if (G1SmoothConcRefine) {
       lower_limit = 0;
       start_vtime_sec = os::elapsedVTime();
       prev_buffer_num = (int) dcqs.completed_buffers_num();
     } else {
-      lower_limit = DCQBarrierProcessCompletedThreshold / 4; // For now.
+      lower_limit = G1UpdateBufferQueueProcessingThreshold / 4; // For now.
     }
     while (dcqs.apply_closure_to_completed_buffer(_worker_id + _worker_id_offset, lower_limit)) {
       double end_vtime_sec;
@@ -147,7 +143,6 @@ void ConcurrentG1RefineThread::run() {
         }
         break;
       }
-      _co_tracker.update(false);
 
       // Check if we need to activate the next thread.
       if (curr_buffer_num > next_threshold && _next != NULL && !_next->is_active()) {
@@ -168,7 +163,6 @@ void ConcurrentG1RefineThread::run() {
       }
       n_logs++;
     }
-    _co_tracker.update(false);
     _sts.leave();
 
     if (os::supports_vtime()) {
@@ -177,9 +171,6 @@ void ConcurrentG1RefineThread::run() {
       _vtime_accum = 0.0;
     }
   }
-  _sts.join();
-  _co_tracker.update(true);
-  _sts.leave();
   assert(_should_terminate, "just checking");
 
   terminate();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp
index 0a89e96ba05..05a3243a115 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp
@@ -51,7 +51,6 @@ class ConcurrentG1RefineThread: public ConcurrentGCThread {
  private:
   ConcurrentG1Refine*              _cg1r;
 
-  COTracker                        _co_tracker;
   double                           _interval_ms;
 
   void decreaseInterval(int processing_time_ms) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index 327bf3edebf..a204352a950 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -433,8 +433,7 @@ ConcurrentMark::ConcurrentMark(ReservedSpace rs,
   _total_counting_time(0.0),
   _total_rs_scrub_time(0.0),
 
-  _parallel_workers(NULL),
-  _cleanup_co_tracker(G1CLGroup)
+  _parallel_workers(NULL)
 {
   CMVerboseLevel verbose_level =
     (CMVerboseLevel) G1MarkingVerboseLevel;
@@ -823,18 +822,6 @@ void ConcurrentMark::checkpointRootsInitialPost() {
   // when marking is on. So, it's also called at the end of the
   // initial-mark pause to update the heap end, if the heap expands
   // during it. No need to call it here.
-
-  guarantee( !_cleanup_co_tracker.enabled(), "invariant" );
-
-  size_t max_marking_threads =
-    MAX2((size_t) 1, parallel_marking_threads());
-  for (int i = 0; i < (int)_max_task_num; ++i) {
-    _tasks[i]->enable_co_tracker();
-    if (i < (int) max_marking_threads)
-      _tasks[i]->reset_co_tracker(marking_task_overhead());
-    else
-      _tasks[i]->reset_co_tracker(0.0);
-  }
 }
 
 // Checkpoint the roots into this generation from outside
@@ -845,7 +832,6 @@ void ConcurrentMark::checkpointRootsInitial() {
   G1CollectedHeap* g1h = G1CollectedHeap::heap();
 
   double start = os::elapsedTime();
-  GCOverheadReporter::recordSTWStart(start);
 
   G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
   g1p->record_concurrent_mark_init_start();
@@ -876,7 +862,6 @@ void ConcurrentMark::checkpointRootsInitial() {
   // Statistics.
   double end = os::elapsedTime();
   _init_times.add((end - start) * 1000.0);
-  GCOverheadReporter::recordSTWEnd(end);
 
   g1p->record_concurrent_mark_init_end();
 }
@@ -1035,7 +1020,6 @@ public:
 
     guarantee( (size_t)worker_i < _cm->active_tasks(), "invariant" );
     CMTask* the_task = _cm->task(worker_i);
-    the_task->start_co_tracker();
     the_task->record_start_time();
     if (!_cm->has_aborted()) {
       do {
@@ -1061,8 +1045,6 @@ public:
         double end_time2_sec = os::elapsedTime();
         double elapsed_time2_sec = end_time2_sec - start_time_sec;
 
-        the_task->update_co_tracker();
-
 #if 0
           gclog_or_tty->print_cr("CM: elapsed %1.4lf ms, sleep %1.4lf ms, "
                                  "overhead %1.4lf",
@@ -1079,7 +1061,6 @@ public:
     ConcurrentGCThread::stsLeave();
 
     double end_vtime = os::elapsedVTime();
-    the_task->update_co_tracker(true);
     _cm->update_accum_task_vtime(worker_i, end_vtime - start_vtime);
   }
 
@@ -1133,7 +1114,6 @@ void ConcurrentMark::checkpointRootsFinal(bool clear_all_soft_refs) {
   g1p->record_concurrent_mark_remark_start();
 
   double start = os::elapsedTime();
-  GCOverheadReporter::recordSTWStart(start);
 
   checkpointRootsFinalWork();
 
@@ -1173,11 +1153,6 @@ void ConcurrentMark::checkpointRootsFinal(bool clear_all_soft_refs) {
   _remark_weak_ref_times.add((now - mark_work_end) * 1000.0);
   _remark_times.add((now - start) * 1000.0);
 
-  GCOverheadReporter::recordSTWEnd(now);
-  for (int i = 0; i < (int)_max_task_num; ++i)
-    _tasks[i]->disable_co_tracker();
-  _cleanup_co_tracker.enable();
-  _cleanup_co_tracker.reset(cleanup_task_overhead());
   g1p->record_concurrent_mark_remark_end();
 }
 
@@ -1188,7 +1163,6 @@ class CalcLiveObjectsClosure: public HeapRegionClosure {
 
   CMBitMapRO* _bm;
   ConcurrentMark* _cm;
-  COTracker* _co_tracker;
   bool _changed;
   bool _yield;
   size_t _words_done;
@@ -1216,12 +1190,10 @@ class CalcLiveObjectsClosure: public HeapRegionClosure {
 public:
   CalcLiveObjectsClosure(bool final,
                          CMBitMapRO *bm, ConcurrentMark *cm,
-                         BitMap* region_bm, BitMap* card_bm,
-                         COTracker* co_tracker) :
+                         BitMap* region_bm, BitMap* card_bm) :
     _bm(bm), _cm(cm), _changed(false), _yield(true),
     _words_done(0), _tot_live(0), _tot_used(0),
-    _region_bm(region_bm), _card_bm(card_bm),
-    _final(final), _co_tracker(co_tracker),
+    _region_bm(region_bm), _card_bm(card_bm),_final(final),
     _regions_done(0), _start_vtime_sec(0.0)
   {
     _bottom_card_num =
@@ -1265,9 +1237,6 @@ public:
   }
 
   bool doHeapRegion(HeapRegion* hr) {
-    if (_co_tracker != NULL)
-      _co_tracker->update();
-
     if (!_final && _regions_done == 0)
       _start_vtime_sec = os::elapsedVTime();
 
@@ -1396,12 +1365,6 @@ public:
         if (elapsed_vtime_sec > (10.0 / 1000.0)) {
           jlong sleep_time_ms =
             (jlong) (elapsed_vtime_sec * _cm->cleanup_sleep_factor() * 1000.0);
-#if 0
-          gclog_or_tty->print_cr("CL: elapsed %1.4lf ms, sleep %1.4lf ms, "
-                                 "overhead %1.4lf",
-                                 elapsed_vtime_sec * 1000.0, (double) sleep_time_ms,
-                                 _co_tracker->concOverhead(os::elapsedTime()));
-#endif
           os::sleep(Thread::current(), sleep_time_ms, false);
           _start_vtime_sec = end_vtime_sec;
         }
@@ -1421,15 +1384,11 @@ public:
 
 
 void ConcurrentMark::calcDesiredRegions() {
-  guarantee( _cleanup_co_tracker.enabled(), "invariant" );
-  _cleanup_co_tracker.start();
-
   _region_bm.clear();
   _card_bm.clear();
   CalcLiveObjectsClosure calccl(false /*final*/,
                                 nextMarkBitMap(), this,
-                                &_region_bm, &_card_bm,
-                                &_cleanup_co_tracker);
+                                &_region_bm, &_card_bm);
   G1CollectedHeap *g1h = G1CollectedHeap::heap();
   g1h->heap_region_iterate(&calccl);
 
@@ -1437,8 +1396,6 @@ void ConcurrentMark::calcDesiredRegions() {
     calccl.reset();
     g1h->heap_region_iterate(&calccl);
   } while (calccl.changed());
-
-  _cleanup_co_tracker.update(true);
 }
 
 class G1ParFinalCountTask: public AbstractGangTask {
@@ -1472,8 +1429,7 @@ public:
   void work(int i) {
     CalcLiveObjectsClosure calccl(true /*final*/,
                                   _bm, _g1h->concurrent_mark(),
-                                  _region_bm, _card_bm,
-                                  NULL /* CO tracker */);
+                                  _region_bm, _card_bm);
     calccl.no_yield();
     if (ParallelGCThreads > 0) {
       _g1h->heap_region_par_iterate_chunked(&calccl, i,
@@ -1663,13 +1619,10 @@ void ConcurrentMark::cleanup() {
                      /* prev marking */ true);
   }
 
-  _cleanup_co_tracker.disable();
-
   G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
   g1p->record_concurrent_mark_cleanup_start();
 
   double start = os::elapsedTime();
-  GCOverheadReporter::recordSTWStart(start);
 
   // Do counting once more with the world stopped for good measure.
   G1ParFinalCountTask g1_par_count_task(g1h, nextMarkBitMap(),
@@ -1774,7 +1727,6 @@ void ConcurrentMark::cleanup() {
   // Statistics.
   double end = os::elapsedTime();
   _cleanup_times.add((end - start) * 1000.0);
-  GCOverheadReporter::recordSTWEnd(end);
 
   // G1CollectedHeap::heap()->print();
   // gclog_or_tty->print_cr("HEAP GC TIME STAMP : %d",
@@ -2401,7 +2353,7 @@ class CSMarkOopClosure: public OopClosure {
         // Now process this portion of this one.
         int lim = MIN2(next_arr_ind, len);
         for (int j = arr_ind; j < lim; j++) {
-          do_oop(aobj->obj_at_addr<T>(j));
+          do_oop(aobj->objArrayOopDesc::obj_at_addr<T>(j));
         }
 
       } else {
@@ -2625,24 +2577,6 @@ void ConcurrentMark::registerCSetRegion(HeapRegion* hr) {
     _should_gray_objects = true;
 }
 
-void ConcurrentMark::disable_co_trackers() {
-  if (has_aborted()) {
-    if (_cleanup_co_tracker.enabled())
-      _cleanup_co_tracker.disable();
-    for (int i = 0; i < (int)_max_task_num; ++i) {
-      CMTask* task = _tasks[i];
-      if (task->co_tracker_enabled())
-        task->disable_co_tracker();
-    }
-  } else {
-    guarantee( !_cleanup_co_tracker.enabled(), "invariant" );
-    for (int i = 0; i < (int)_max_task_num; ++i) {
-      CMTask* task = _tasks[i];
-      guarantee( !task->co_tracker_enabled(), "invariant" );
-    }
-  }
-}
-
 // abandon current marking iteration due to a Full GC
 void ConcurrentMark::abort() {
   // Clear all marks to force marking thread to do nothing
@@ -4018,7 +3952,6 @@ CMTask::CMTask(int task_id,
                CMTaskQueue* task_queue,
                CMTaskQueueSet* task_queues)
   : _g1h(G1CollectedHeap::heap()),
-    _co_tracker(G1CMGroup),
     _task_id(task_id), _cm(cm),
     _claimed(false),
     _nextMarkBitMap(NULL), _hash_seed(17),
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
index 85477175ff7..010108f9300 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
@@ -407,8 +407,6 @@ protected:
   // verbose level
   CMVerboseLevel          _verbose_level;
 
-  COTracker               _cleanup_co_tracker;
-
   // These two fields are used to implement the optimisation that
   // avoids pushing objects on the global/region stack if there are
   // no collection set regions above the lowest finger.
@@ -720,8 +718,6 @@ public:
   // Called to abort the marking cycle after a Full GC takes palce.
   void abort();
 
-  void disable_co_trackers();
-
   // This prints the global/local fingers. It is used for debugging.
   NOT_PRODUCT(void print_finger();)
 
@@ -773,9 +769,6 @@ private:
   // number of calls to this task
   int                         _calls;
 
-  // concurrent overhead over a single CPU for this task
-  COTracker                   _co_tracker;
-
   // when the virtual timer reaches this time, the marking step should
   // exit
   double                      _time_target_ms;
@@ -928,27 +921,6 @@ public:
 
   void set_concurrent(bool concurrent) { _concurrent = concurrent; }
 
-  void enable_co_tracker() {
-    guarantee( !_co_tracker.enabled(), "invariant" );
-    _co_tracker.enable();
-  }
-  void disable_co_tracker() {
-    guarantee( _co_tracker.enabled(), "invariant" );
-    _co_tracker.disable();
-  }
-  bool co_tracker_enabled() {
-    return _co_tracker.enabled();
-  }
-  void reset_co_tracker(double starting_conc_overhead = 0.0) {
-    _co_tracker.reset(starting_conc_overhead);
-  }
-  void start_co_tracker() {
-    _co_tracker.start();
-  }
-  void update_co_tracker(bool force_end = false) {
-    _co_tracker.update(force_end);
-  }
-
   // The main method of this class which performs a marking step
   // trying not to exceed the given duration. However, it might exit
   // prematurely, according to some conditions (i.e. SATB buffers are
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
index 20e38dcd916..445a342c862 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
@@ -260,10 +260,6 @@ void ConcurrentMarkThread::run() {
         }
       }
 
-      _sts.join();
-      _cm->disable_co_trackers();
-      _sts.leave();
-
       // we now want to allow clearing of the marking bitmap to be
       // suspended by a collection pause.
       _sts.join();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
index 642c59cb9bf..436b01613f9 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
@@ -35,8 +35,7 @@ int ConcurrentZFThread::_zf_waits = 0;
 int ConcurrentZFThread::_regions_filled = 0;
 
 ConcurrentZFThread::ConcurrentZFThread() :
-  ConcurrentGCThread(),
-  _co_tracker(G1ZFGroup)
+  ConcurrentGCThread()
 {
   create_and_start();
 }
@@ -71,8 +70,6 @@ void ConcurrentZFThread::run() {
   Thread* thr_self = Thread::current();
   _vtime_start = os::elapsedVTime();
   wait_for_universe_init();
-  _co_tracker.enable();
-  _co_tracker.start();
 
   G1CollectedHeap* g1 = G1CollectedHeap::heap();
   _sts.join();
@@ -135,10 +132,7 @@ void ConcurrentZFThread::run() {
     }
     _vtime_accum = (os::elapsedVTime() - _vtime_start);
     _sts.join();
-
-    _co_tracker.update();
   }
-  _co_tracker.update(false);
   _sts.leave();
 
   assert(_should_terminate, "just checking");
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp
index 659d4e78892..d7f4cfa0c5f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp
@@ -42,8 +42,6 @@ class ConcurrentZFThread: public ConcurrentGCThread {
   // Number of regions CFZ thread fills.
   static int _regions_filled;
 
-  COTracker _co_tracker;
-
   double _vtime_start;  // Initial virtual time.
 
   // These are static because the "print_summary_info" method is, and
diff --git a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp b/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
index 19405a0eccb..7372a4a787c 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
@@ -80,8 +80,8 @@ void DirtyCardQueueSet::initialize(Monitor* cbl_mon, Mutex* fl_lock,
                                    int max_completed_queue,
                                    Mutex* lock, PtrQueueSet* fl_owner) {
   PtrQueueSet::initialize(cbl_mon, fl_lock, max_completed_queue, fl_owner);
-  set_buffer_size(DCQBarrierQueueBufferSize);
-  set_process_completed_threshold(DCQBarrierProcessCompletedThreshold);
+  set_buffer_size(G1UpdateBufferSize);
+  set_process_completed_threshold(G1UpdateBufferQueueProcessingThreshold);
 
   _shared_dirty_card_queue.set_lock(lock);
   _free_ids = new FreeIdSet((int) num_par_ids(), _cbl_mon);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index ac236fb2191..360bd9e0ce6 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -25,6 +25,8 @@
 #include "incls/_precompiled.incl"
 #include "incls/_g1CollectedHeap.cpp.incl"
 
+size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
+
 // turn it on so that the contents of the young list (scan-only /
 // to-be-collected) are printed at "strategic" points before / during
 // / after the collection --- this is useful for debugging
@@ -927,7 +929,6 @@ void G1CollectedHeap::do_collection(bool full, bool clear_all_soft_refs,
     TraceTime t(full ? "Full GC (System.gc())" : "Full GC", PrintGC, true, gclog_or_tty);
 
     double start = os::elapsedTime();
-    GCOverheadReporter::recordSTWStart(start);
     g1_policy()->record_full_collection_start();
 
     gc_prologue(true);
@@ -1049,7 +1050,6 @@ void G1CollectedHeap::do_collection(bool full, bool clear_all_soft_refs,
     }
 
     double end = os::elapsedTime();
-    GCOverheadReporter::recordSTWEnd(end);
     g1_policy()->record_full_collection_end();
 
 #ifdef TRACESPINNING
@@ -1396,6 +1396,9 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
   if (_process_strong_tasks == NULL || !_process_strong_tasks->valid()) {
     vm_exit_during_initialization("Failed necessary allocation.");
   }
+
+  _humongous_object_threshold_in_words = HeapRegion::GrainWords / 2;
+
   int n_queues = MAX2((int)ParallelGCThreads, 1);
   _task_queues = new RefToScanQueueSet(n_queues);
 
@@ -1548,9 +1551,10 @@ jint G1CollectedHeap::initialize() {
   const size_t max_region_idx = ((size_t)1 << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1;
   guarantee((max_regions() - 1) <= max_region_idx, "too many regions");
 
-  const size_t cards_per_region = HeapRegion::GrainBytes >> CardTableModRefBS::card_shift;
   size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1;
-  guarantee(cards_per_region < max_cards_per_region, "too many cards per region");
+  guarantee(HeapRegion::CardsPerRegion > 0, "make sure it's initialized");
+  guarantee((size_t) HeapRegion::CardsPerRegion < max_cards_per_region,
+            "too many cards per region");
 
   _bot_shared = new G1BlockOffsetSharedArray(_reserved,
                                              heap_word_size(init_byte_size));
@@ -1591,7 +1595,7 @@ jint G1CollectedHeap::initialize() {
 
   JavaThread::dirty_card_queue_set().initialize(DirtyCardQ_CBL_mon,
                                                 DirtyCardQ_FL_lock,
-                                                G1DirtyCardQueueMax,
+                                                G1UpdateBufferQueueMaxLength,
                                                 Shared_DirtyCardQ_lock);
 
   if (G1DeferredRSUpdate) {
@@ -1610,9 +1614,6 @@ jint G1CollectedHeap::initialize() {
   // Do later initialization work for concurrent refinement.
   _cg1r->init();
 
-  const char* group_names[] = { "CR", "ZF", "CM", "CL" };
-  GCOverheadReporter::initGCOverheadReporter(4, group_names);
-
   return JNI_OK;
 }
 
@@ -1637,6 +1638,9 @@ size_t G1CollectedHeap::capacity() const {
 
 void G1CollectedHeap::iterate_dirty_card_closure(bool concurrent,
                                                  int worker_i) {
+  // Clean cards in the hot card cache
+  concurrent_g1_refine()->clean_up_cache(worker_i, g1_rem_set());
+
   DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
   int n_completed_buffers = 0;
   while (dcqs.apply_closure_to_completed_buffer(worker_i, 0, true)) {
@@ -1645,9 +1649,6 @@ void G1CollectedHeap::iterate_dirty_card_closure(bool concurrent,
   g1_policy()->record_update_rs_processed_buffers(worker_i,
                                                   (double) n_completed_buffers);
   dcqs.clear_n_completed_buffers();
-  // Finish up the queue...
-  if (worker_i == 0) concurrent_g1_refine()->clean_up_cache(worker_i,
-                                                            g1_rem_set());
   assert(!dcqs.completed_buffers_exist_dirty(), "Completed buffers exist!");
 }
 
@@ -2414,8 +2415,6 @@ void G1CollectedHeap::gc_threads_do(ThreadClosure* tc) const {
 }
 
 void G1CollectedHeap::print_tracing_info() const {
-  concurrent_g1_refine()->print_final_card_counts();
-
   // We'll overload this to mean "trace GC pause statistics."
   if (TraceGen0Time || TraceGen1Time) {
     // The "G1CollectorPolicy" is keeping track of these stats, so delegate
@@ -2433,8 +2432,6 @@ void G1CollectedHeap::print_tracing_info() const {
   }
   g1_policy()->print_yg_surv_rate_info();
 
-  GCOverheadReporter::printGCOverhead();
-
   SpecializationStats::print();
 }
 
@@ -2671,7 +2668,6 @@ G1CollectedHeap::do_collection_pause_at_safepoint() {
       // The elapsed time induced by the start time below deliberately elides
       // the possible verification above.
       double start_time_sec = os::elapsedTime();
-      GCOverheadReporter::recordSTWStart(start_time_sec);
       size_t start_used_bytes = used();
 
       g1_policy()->record_collection_pause_start(start_time_sec,
@@ -2749,8 +2745,6 @@ G1CollectedHeap::do_collection_pause_at_safepoint() {
         _in_cset_fast_test = NULL;
         _in_cset_fast_test_base = NULL;
 
-        release_gc_alloc_regions(false /* totally */);
-
         cleanup_surviving_young_words();
 
         if (g1_policy()->in_young_gc_mode()) {
@@ -2800,7 +2794,6 @@ G1CollectedHeap::do_collection_pause_at_safepoint() {
       double end_time_sec = os::elapsedTime();
       double pause_time_ms = (end_time_sec - start_time_sec) * MILLIUNITS;
       g1_policy()->record_pause_time_ms(pause_time_ms);
-      GCOverheadReporter::recordSTWEnd(end_time_sec);
       g1_policy()->record_collection_pause_end(abandoned);
 
       assert(regions_accounted_for(), "Region leakage.");
@@ -2845,6 +2838,11 @@ G1CollectedHeap::do_collection_pause_at_safepoint() {
   if (PrintHeapAtGC) {
     Universe::print_heap_after_gc();
   }
+  if (G1SummarizeRSetStats &&
+      (G1SummarizeRSetStatsPeriod > 0) &&
+      (total_collections() % G1SummarizeRSetStatsPeriod == 0)) {
+    g1_rem_set()->print_summary_info();
+  }
 }
 
 void G1CollectedHeap::set_gc_alloc_region(int purpose, HeapRegion* r) {
@@ -4106,6 +4104,8 @@ void G1CollectedHeap::evacuate_collection_set() {
 
   g1_rem_set()->prepare_for_oops_into_collection_set_do();
   concurrent_g1_refine()->set_use_cache(false);
+  concurrent_g1_refine()->clear_hot_cache_claimed_index();
+
   int n_workers = (ParallelGCThreads > 0 ? workers()->total_workers() : 1);
   set_par_threads(n_workers);
   G1ParTask g1_par_task(this, n_workers, _task_queues);
@@ -4136,8 +4136,10 @@ void G1CollectedHeap::evacuate_collection_set() {
     G1KeepAliveClosure keep_alive(this);
     JNIHandles::weak_oops_do(&is_alive, &keep_alive);
   }
+  release_gc_alloc_regions(false /* totally */);
   g1_rem_set()->cleanup_after_oops_into_collection_set_do();
 
+  concurrent_g1_refine()->clear_hot_cache();
   concurrent_g1_refine()->set_use_cache(true);
 
   finalize_for_evac_failure();
@@ -4268,12 +4270,18 @@ void G1CollectedHeap::dirtyCardsForYoungRegions(CardTableModRefBS* ct_bs, HeapRe
 class G1ParCleanupCTTask : public AbstractGangTask {
   CardTableModRefBS* _ct_bs;
   G1CollectedHeap* _g1h;
+  HeapRegion* volatile _so_head;
+  HeapRegion* volatile _su_head;
 public:
   G1ParCleanupCTTask(CardTableModRefBS* ct_bs,
-                     G1CollectedHeap* g1h) :
+                     G1CollectedHeap* g1h,
+                     HeapRegion* scan_only_list,
+                     HeapRegion* survivor_list) :
     AbstractGangTask("G1 Par Cleanup CT Task"),
     _ct_bs(ct_bs),
-    _g1h(g1h)
+    _g1h(g1h),
+    _so_head(scan_only_list),
+    _su_head(survivor_list)
   { }
 
   void work(int i) {
@@ -4281,22 +4289,64 @@ public:
     while (r = _g1h->pop_dirty_cards_region()) {
       clear_cards(r);
     }
+    // Redirty the cards of the scan-only and survivor regions.
+    dirty_list(&this->_so_head);
+    dirty_list(&this->_su_head);
   }
+
   void clear_cards(HeapRegion* r) {
     // Cards for Survivor and Scan-Only regions will be dirtied later.
     if (!r->is_scan_only() && !r->is_survivor()) {
       _ct_bs->clear(MemRegion(r->bottom(), r->end()));
     }
   }
+
+  void dirty_list(HeapRegion* volatile * head_ptr) {
+    HeapRegion* head;
+    do {
+      // Pop region off the list.
+      head = *head_ptr;
+      if (head != NULL) {
+        HeapRegion* r = (HeapRegion*)
+          Atomic::cmpxchg_ptr(head->get_next_young_region(), head_ptr, head);
+        if (r == head) {
+          assert(!r->isHumongous(), "Humongous regions shouldn't be on survivor list");
+          _ct_bs->dirty(MemRegion(r->bottom(), r->end()));
+        }
+      }
+    } while (*head_ptr != NULL);
+  }
 };
 
 
+#ifndef PRODUCT
+class G1VerifyCardTableCleanup: public HeapRegionClosure {
+  CardTableModRefBS* _ct_bs;
+public:
+  G1VerifyCardTableCleanup(CardTableModRefBS* ct_bs)
+    : _ct_bs(ct_bs)
+  { }
+  virtual bool doHeapRegion(HeapRegion* r)
+  {
+    MemRegion mr(r->bottom(), r->end());
+    if (r->is_scan_only() || r->is_survivor()) {
+      _ct_bs->verify_dirty_region(mr);
+    } else {
+      _ct_bs->verify_clean_region(mr);
+    }
+    return false;
+  }
+};
+#endif
+
 void G1CollectedHeap::cleanUpCardTable() {
   CardTableModRefBS* ct_bs = (CardTableModRefBS*) (barrier_set());
   double start = os::elapsedTime();
 
   // Iterate over the dirty cards region list.
-  G1ParCleanupCTTask cleanup_task(ct_bs, this);
+  G1ParCleanupCTTask cleanup_task(ct_bs, this,
+                                  _young_list->first_scan_only_region(),
+                                  _young_list->first_survivor_region());
   if (ParallelGCThreads > 0) {
     set_par_threads(workers()->total_workers());
     workers()->run_task(&cleanup_task);
@@ -4312,18 +4362,22 @@ void G1CollectedHeap::cleanUpCardTable() {
       }
       r->set_next_dirty_cards_region(NULL);
     }
+    // now, redirty the cards of the scan-only and survivor regions
+    // (it seemed faster to do it this way, instead of iterating over
+    // all regions and then clearing / dirtying as appropriate)
+    dirtyCardsForYoungRegions(ct_bs, _young_list->first_scan_only_region());
+    dirtyCardsForYoungRegions(ct_bs, _young_list->first_survivor_region());
   }
-  // now, redirty the cards of the scan-only and survivor regions
-  // (it seemed faster to do it this way, instead of iterating over
-  // all regions and then clearing / dirtying as appropriate)
-  dirtyCardsForYoungRegions(ct_bs, _young_list->first_scan_only_region());
-  dirtyCardsForYoungRegions(ct_bs, _young_list->first_survivor_region());
-
   double elapsed = os::elapsedTime() - start;
   g1_policy()->record_clear_ct_time( elapsed * 1000.0);
+#ifndef PRODUCT
+  if (G1VerifyCTCleanup || VerifyAfterGC) {
+    G1VerifyCardTableCleanup cleanup_verifier(ct_bs);
+    heap_region_iterate(&cleanup_verifier);
+  }
+#endif
 }
 
-
 void G1CollectedHeap::do_collection_pause_if_appropriate(size_t word_size) {
   if (g1_policy()->should_do_collection_pause(word_size)) {
     do_collection_pause();
@@ -5016,7 +5070,7 @@ bool G1CollectedHeap::is_in_closed_subset(const void* p) const {
     return hr->is_in(p);
   }
 }
-#endif // PRODUCT
+#endif // !PRODUCT
 
 void G1CollectedHeap::g1_unimplemented() {
   // Unimplemented();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
index 2bf8b51299c..4ce7bdcfee8 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
@@ -167,16 +167,11 @@ class G1CollectedHeap : public SharedHeap {
   friend class G1MarkSweep;
 
 private:
-  enum SomePrivateConstants {
-    VeryLargeInBytes = HeapRegion::GrainBytes/2,
-    VeryLargeInWords = VeryLargeInBytes/HeapWordSize,
-    MinHeapDeltaBytes = 10 * HeapRegion::GrainBytes,      // FIXME
-    NumAPIs = HeapRegion::MaxAge
-  };
-
   // The one and only G1CollectedHeap, so static functions can find it.
   static G1CollectedHeap* _g1h;
 
+  static size_t _humongous_object_threshold_in_words;
+
   // Storage for the G1 heap (excludes the permanent generation).
   VirtualSpace _g1_storage;
   MemRegion    _g1_reserved;
@@ -859,7 +854,7 @@ public:
     return _g1_committed;
   }
 
-  NOT_PRODUCT( bool is_in_closed_subset(const void* p) const; )
+  NOT_PRODUCT(bool is_in_closed_subset(const void* p) const;)
 
   // Dirty card table entries covering a list of young regions.
   void dirtyCardsForYoungRegions(CardTableModRefBS* ct_bs, HeapRegion* list);
@@ -1021,7 +1016,7 @@ public:
 
   // Returns "true" iff the given word_size is "very large".
   static bool isHumongous(size_t word_size) {
-    return word_size >= VeryLargeInWords;
+    return word_size >= _humongous_object_threshold_in_words;
   }
 
   // Update mod union table with the set of dirty cards.
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
index bb219c59c28..ecbddba4404 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
@@ -94,7 +94,14 @@ G1CollectorPolicy::G1CollectorPolicy() :
   _summary(new Summary()),
   _abandoned_summary(new AbandonedSummary()),
 
+#ifndef PRODUCT
   _cur_clear_ct_time_ms(0.0),
+  _min_clear_cc_time_ms(-1.0),
+  _max_clear_cc_time_ms(-1.0),
+  _cur_clear_cc_time_ms(0.0),
+  _cum_clear_cc_time_ms(0.0),
+  _num_cc_clears(0L),
+#endif
 
   _region_num_young(0),
   _region_num_tenured(0),
@@ -194,6 +201,11 @@ G1CollectorPolicy::G1CollectorPolicy() :
   _survivors_age_table(true)
 
 {
+  // Set up the region size and associated fields. Given that the
+  // policy is created before the heap, we have to set this up here,
+  // so it's done as soon as possible.
+  HeapRegion::setup_heap_region_size(Arguments::min_heap_size());
+
   _recent_prev_end_times_for_all_gcs_sec->add(os::elapsedTime());
   _prev_collection_pause_end_ms = os::elapsedTime() * 1000.0;
 
@@ -986,8 +998,6 @@ void G1CollectorPolicy::record_full_collection_end() {
   double full_gc_time_sec = end_sec - _cur_collection_start_sec;
   double full_gc_time_ms = full_gc_time_sec * 1000.0;
 
-  checkpoint_conc_overhead();
-
   _all_full_gc_times_ms->add(full_gc_time_ms);
 
   update_recent_gc_times(end_sec, full_gc_time_ms);
@@ -1157,7 +1167,6 @@ void G1CollectorPolicy::record_concurrent_mark_init_end() {
   double end_time_sec = os::elapsedTime();
   double elapsed_time_ms = (end_time_sec - _mark_init_start_sec) * 1000.0;
   _concurrent_mark_init_times_ms->add(elapsed_time_ms);
-  checkpoint_conc_overhead();
   record_concurrent_mark_init_end_pre(elapsed_time_ms);
 
   _mmu_tracker->add_pause(_mark_init_start_sec, end_time_sec, true);
@@ -1171,7 +1180,6 @@ void G1CollectorPolicy::record_concurrent_mark_remark_start() {
 void G1CollectorPolicy::record_concurrent_mark_remark_end() {
   double end_time_sec = os::elapsedTime();
   double elapsed_time_ms = (end_time_sec - _mark_remark_start_sec)*1000.0;
-  checkpoint_conc_overhead();
   _concurrent_mark_remark_times_ms->add(elapsed_time_ms);
   _cur_mark_stop_world_time_ms += elapsed_time_ms;
   _prev_collection_pause_end_ms += elapsed_time_ms;
@@ -1203,7 +1211,6 @@ record_concurrent_mark_cleanup_end_work1(size_t freed_bytes,
 
 // The important thing about this is that it includes "os::elapsedTime".
 void G1CollectorPolicy::record_concurrent_mark_cleanup_end_work2() {
-  checkpoint_conc_overhead();
   double end_time_sec = os::elapsedTime();
   double elapsed_time_ms = (end_time_sec - _mark_cleanup_start_sec)*1000.0;
   _concurrent_mark_cleanup_times_ms->add(elapsed_time_ms);
@@ -1418,8 +1425,6 @@ void G1CollectorPolicy::record_collection_pause_end(bool abandoned) {
   }
 #endif // PRODUCT
 
-  checkpoint_conc_overhead();
-
   if (in_young_gc_mode()) {
     last_pause_included_initial_mark = _should_initiate_conc_mark;
     if (last_pause_included_initial_mark)
@@ -1648,6 +1653,15 @@ void G1CollectorPolicy::record_collection_pause_end(bool abandoned) {
         print_stats(1, "Object Copying", obj_copy_time);
       }
     }
+#ifndef PRODUCT
+    print_stats(1, "Cur Clear CC", _cur_clear_cc_time_ms);
+    print_stats(1, "Cum Clear CC", _cum_clear_cc_time_ms);
+    print_stats(1, "Min Clear CC", _min_clear_cc_time_ms);
+    print_stats(1, "Max Clear CC", _max_clear_cc_time_ms);
+    if (_num_cc_clears > 0) {
+      print_stats(1, "Avg Clear CC", _cum_clear_cc_time_ms / ((double)_num_cc_clears));
+    }
+#endif
     print_stats(1, "Other", other_time_ms);
     for (int i = 0; i < _aux_num; ++i) {
       if (_cur_aux_times_set[i]) {
@@ -2509,19 +2523,6 @@ region_num_to_mbs(int length) {
 }
 #endif // PRODUCT
 
-void
-G1CollectorPolicy::checkpoint_conc_overhead() {
-  double conc_overhead = 0.0;
-  if (G1AccountConcurrentOverhead)
-    conc_overhead = COTracker::totalPredConcOverhead();
-  _mmu_tracker->update_conc_overhead(conc_overhead);
-#if 0
-  gclog_or_tty->print(" CO %1.4lf TARGET %1.4lf",
-             conc_overhead, _mmu_tracker->max_gc_time());
-#endif
-}
-
-
 size_t G1CollectorPolicy::max_regions(int purpose) {
   switch (purpose) {
     case GCAllocForSurvived:
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
index 8fa4ef4a8a1..0dff91a0b50 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
@@ -92,9 +92,7 @@ protected:
   int _parallel_gc_threads;
 
   enum SomePrivateConstants {
-    NumPrevPausesForHeuristics = 10,
-    NumPrevGCsForHeuristics = 10,
-    NumAPIs = HeapRegion::MaxAge
+    NumPrevPausesForHeuristics = 10
   };
 
   G1MMUTracker* _mmu_tracker;
@@ -112,7 +110,6 @@ protected:
     return 8*M;
   }
 
-
   double _cur_collection_start_sec;
   size_t _cur_collection_pause_used_at_start_bytes;
   size_t _cur_collection_pause_used_regions_at_start;
@@ -122,6 +119,15 @@ protected:
   double _cur_clear_ct_time_ms;
   bool   _satb_drain_time_set;
 
+#ifndef PRODUCT
+  // Card Table Count Cache stats
+  double _min_clear_cc_time_ms;         // min
+  double _max_clear_cc_time_ms;         // max
+  double _cur_clear_cc_time_ms;         // clearing time during current pause
+  double _cum_clear_cc_time_ms;         // cummulative clearing time
+  jlong  _num_cc_clears;                // number of times the card count cache has been cleared
+#endif
+
   double _cur_CH_strong_roots_end_sec;
   double _cur_CH_strong_roots_dur_ms;
   double _cur_G1_strong_roots_end_sec;
@@ -931,6 +937,18 @@ public:
     _cur_aux_times_ms[i] += ms;
   }
 
+#ifndef PRODUCT
+  void record_cc_clear_time(double ms) {
+    if (_min_clear_cc_time_ms < 0.0 || ms <= _min_clear_cc_time_ms)
+      _min_clear_cc_time_ms = ms;
+    if (_max_clear_cc_time_ms < 0.0 || ms >= _max_clear_cc_time_ms)
+      _max_clear_cc_time_ms = ms;
+    _cur_clear_cc_time_ms = ms;
+    _cum_clear_cc_time_ms += ms;
+    _num_cc_clears++;
+  }
+#endif
+
   // Record the fact that "bytes" bytes allocated in a region.
   void record_before_bytes(size_t bytes);
   void record_after_bytes(size_t bytes);
@@ -961,8 +979,6 @@ public:
   void set_should_initiate_conc_mark()  { _should_initiate_conc_mark = true; }
   void unset_should_initiate_conc_mark(){ _should_initiate_conc_mark = false; }
 
-  void checkpoint_conc_overhead();
-
   // If an expansion would be appropriate, because recent GC overhead had
   // exceeded the desired limit, return an amount to expand by.
   virtual size_t expansion_amount();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
index 74209dc3b79..445d32f4f91 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
@@ -37,21 +37,7 @@
 
 G1MMUTracker::G1MMUTracker(double time_slice, double max_gc_time) :
   _time_slice(time_slice),
-  _max_gc_time(max_gc_time),
-  _conc_overhead_time_sec(0.0) { }
-
-void
-G1MMUTracker::update_conc_overhead(double conc_overhead) {
-  double conc_overhead_time_sec = _time_slice * conc_overhead;
-  if (conc_overhead_time_sec > 0.9 * _max_gc_time) {
-    // We are screwed, as we only seem to have <10% of the soft
-    // real-time goal available for pauses. Let's admit defeat and
-    // allow something more generous as a pause target.
-    conc_overhead_time_sec = 0.75 * _max_gc_time;
-  }
-
-  _conc_overhead_time_sec = conc_overhead_time_sec;
-}
+  _max_gc_time(max_gc_time) { }
 
 G1MMUTrackerQueue::G1MMUTrackerQueue(double time_slice, double max_gc_time) :
   G1MMUTracker(time_slice, max_gc_time),
@@ -128,7 +114,7 @@ double G1MMUTrackerQueue::longest_pause_internal(double current_time) {
 
   while( 1 ) {
     double gc_time =
-      calculate_gc_time(current_time + target_time) + _conc_overhead_time_sec;
+      calculate_gc_time(current_time + target_time);
     double diff = target_time + gc_time - _max_gc_time;
     if (!is_double_leq_0(diff)) {
       target_time -= diff;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp
index 05a258f7c65..0eff2c3867a 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp
@@ -33,19 +33,15 @@ protected:
   double          _time_slice;
   double          _max_gc_time; // this is per time slice
 
-  double          _conc_overhead_time_sec;
-
 public:
   G1MMUTracker(double time_slice, double max_gc_time);
 
-  void update_conc_overhead(double conc_overhead);
-
   virtual void add_pause(double start, double end, bool gc_thread) = 0;
   virtual double longest_pause(double current_time) = 0;
   virtual double when_sec(double current_time, double pause_time) = 0;
 
   double max_gc_time() {
-    return _max_gc_time - _conc_overhead_time_sec;
+    return _max_gc_time;
   }
 
   inline bool now_max_gc(double current_time) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
index 492d9f54acb..65ea89eafed 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
@@ -102,9 +102,14 @@ void G1MarkSweep::allocate_stacks() {
   GenMarkSweep::_marking_stack =
     new (ResourceObj::C_HEAP) GrowableArray<oop>(4000, true);
 
-  size_t size = SystemDictionary::number_of_classes() * 2;
+  int size = SystemDictionary::number_of_classes() * 2;
   GenMarkSweep::_revisit_klass_stack =
-    new (ResourceObj::C_HEAP) GrowableArray<Klass*>((int)size, true);
+    new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
+  // (#klass/k)^2 for k ~ 10 appears a better fit, but this will have to do
+  // for now until we have a chance to work out a more optimal setting.
+  GenMarkSweep::_revisit_mdo_stack =
+    new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(size*2, true);
+
 }
 
 void G1MarkSweep::mark_sweep_phase1(bool& marked_for_unloading,
@@ -139,13 +144,18 @@ void G1MarkSweep::mark_sweep_phase1(bool& marked_for_unloading,
   CodeCache::do_unloading(&GenMarkSweep::is_alive,
                                    &GenMarkSweep::keep_alive,
                                    purged_class);
-           GenMarkSweep::follow_stack();
+  GenMarkSweep::follow_stack();
 
   // Update subklass/sibling/implementor links of live klasses
   GenMarkSweep::follow_weak_klass_links();
   assert(GenMarkSweep::_marking_stack->is_empty(),
          "stack should be empty by now");
 
+  // Visit memoized MDO's and clear any unmarked weak refs
+  GenMarkSweep::follow_mdo_weak_refs();
+  assert(GenMarkSweep::_marking_stack->is_empty(), "just drained");
+
+
   // Visit symbol and interned string tables and delete unmarked oops
   SymbolTable::unlink(&GenMarkSweep::is_alive);
   StringTable::unlink(&GenMarkSweep::is_alive);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
index 9c36026174e..224263e54ea 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
@@ -676,61 +676,12 @@ void HRInto_G1RemSet::scrub_par(BitMap* region_bm, BitMap* card_bm,
 
 static IntHistogram out_of_histo(50, 50);
 
-void HRInto_G1RemSet::concurrentRefineOneCard(jbyte* card_ptr, int worker_i) {
-  // If the card is no longer dirty, nothing to do.
-  if (*card_ptr != CardTableModRefBS::dirty_card_val()) return;
-
+void HRInto_G1RemSet::concurrentRefineOneCard_impl(jbyte* card_ptr, int worker_i) {
   // Construct the region representing the card.
   HeapWord* start = _ct_bs->addr_for(card_ptr);
   // And find the region containing it.
   HeapRegion* r = _g1->heap_region_containing(start);
-  if (r == NULL) {
-    guarantee(_g1->is_in_permanent(start), "Or else where?");
-    return;  // Not in the G1 heap (might be in perm, for example.)
-  }
-  // Why do we have to check here whether a card is on a young region,
-  // given that we dirty young regions and, as a result, the
-  // post-barrier is supposed to filter them out and never to enqueue
-  // them? When we allocate a new region as the "allocation region" we
-  // actually dirty its cards after we release the lock, since card
-  // dirtying while holding the lock was a performance bottleneck. So,
-  // as a result, it is possible for other threads to actually
-  // allocate objects in the region (after the acquire the lock)
-  // before all the cards on the region are dirtied. This is unlikely,
-  // and it doesn't happen often, but it can happen. So, the extra
-  // check below filters out those cards.
-  if (r->is_young()) {
-    return;
-  }
-  // While we are processing RSet buffers during the collection, we
-  // actually don't want to scan any cards on the collection set,
-  // since we don't want to update remebered sets with entries that
-  // point into the collection set, given that live objects from the
-  // collection set are about to move and such entries will be stale
-  // very soon. This change also deals with a reliability issue which
-  // involves scanning a card in the collection set and coming across
-  // an array that was being chunked and looking malformed. Note,
-  // however, that if evacuation fails, we have to scan any objects
-  // that were not moved and create any missing entries.
-  if (r->in_collection_set()) {
-    return;
-  }
-
-  // Should we defer it?
-  if (_cg1r->use_cache()) {
-    card_ptr = _cg1r->cache_insert(card_ptr);
-    // If it was not an eviction, nothing to do.
-    if (card_ptr == NULL) return;
-
-    // OK, we have to reset the card start, region, etc.
-    start = _ct_bs->addr_for(card_ptr);
-    r = _g1->heap_region_containing(start);
-    if (r == NULL) {
-      guarantee(_g1->is_in_permanent(start), "Or else where?");
-      return;  // Not in the G1 heap (might be in perm, for example.)
-    }
-    guarantee(!r->is_young(), "It was evicted in the current minor cycle.");
-  }
+  assert(r != NULL, "unexpected null");
 
   HeapWord* end   = _ct_bs->addr_for(card_ptr + 1);
   MemRegion dirtyRegion(start, end);
@@ -774,6 +725,106 @@ void HRInto_G1RemSet::concurrentRefineOneCard(jbyte* card_ptr, int worker_i) {
   }
 }
 
+void HRInto_G1RemSet::concurrentRefineOneCard(jbyte* card_ptr, int worker_i) {
+  // If the card is no longer dirty, nothing to do.
+  if (*card_ptr != CardTableModRefBS::dirty_card_val()) return;
+
+  // Construct the region representing the card.
+  HeapWord* start = _ct_bs->addr_for(card_ptr);
+  // And find the region containing it.
+  HeapRegion* r = _g1->heap_region_containing(start);
+  if (r == NULL) {
+    guarantee(_g1->is_in_permanent(start), "Or else where?");
+    return;  // Not in the G1 heap (might be in perm, for example.)
+  }
+  // Why do we have to check here whether a card is on a young region,
+  // given that we dirty young regions and, as a result, the
+  // post-barrier is supposed to filter them out and never to enqueue
+  // them? When we allocate a new region as the "allocation region" we
+  // actually dirty its cards after we release the lock, since card
+  // dirtying while holding the lock was a performance bottleneck. So,
+  // as a result, it is possible for other threads to actually
+  // allocate objects in the region (after the acquire the lock)
+  // before all the cards on the region are dirtied. This is unlikely,
+  // and it doesn't happen often, but it can happen. So, the extra
+  // check below filters out those cards.
+  if (r->is_young()) {
+    return;
+  }
+  // While we are processing RSet buffers during the collection, we
+  // actually don't want to scan any cards on the collection set,
+  // since we don't want to update remebered sets with entries that
+  // point into the collection set, given that live objects from the
+  // collection set are about to move and such entries will be stale
+  // very soon. This change also deals with a reliability issue which
+  // involves scanning a card in the collection set and coming across
+  // an array that was being chunked and looking malformed. Note,
+  // however, that if evacuation fails, we have to scan any objects
+  // that were not moved and create any missing entries.
+  if (r->in_collection_set()) {
+    return;
+  }
+
+  // Should we defer processing the card?
+  //
+  // Previously the result from the insert_cache call would be
+  // either card_ptr (implying that card_ptr was currently "cold"),
+  // null (meaning we had inserted the card ptr into the "hot"
+  // cache, which had some headroom), or a "hot" card ptr
+  // extracted from the "hot" cache.
+  //
+  // Now that the _card_counts cache in the ConcurrentG1Refine
+  // instance is an evicting hash table, the result we get back
+  // could be from evicting the card ptr in an already occupied
+  // bucket (in which case we have replaced the card ptr in the
+  // bucket with card_ptr and "defer" is set to false). To avoid
+  // having a data structure (updates to which would need a lock)
+  // to hold these unprocessed dirty cards, we need to immediately
+  // process card_ptr. The actions needed to be taken on return
+  // from cache_insert are summarized in the following table:
+  //
+  // res      defer   action
+  // --------------------------------------------------------------
+  // null     false   card evicted from _card_counts & replaced with
+  //                  card_ptr; evicted ptr added to hot cache.
+  //                  No need to process res; immediately process card_ptr
+  //
+  // null     true    card not evicted from _card_counts; card_ptr added
+  //                  to hot cache.
+  //                  Nothing to do.
+  //
+  // non-null false   card evicted from _card_counts & replaced with
+  //                  card_ptr; evicted ptr is currently "cold" or
+  //                  caused an eviction from the hot cache.
+  //                  Immediately process res; process card_ptr.
+  //
+  // non-null true    card not evicted from _card_counts; card_ptr is
+  //                  currently cold, or caused an eviction from hot
+  //                  cache.
+  //                  Immediately process res; no need to process card_ptr.
+
+  jbyte* res = card_ptr;
+  bool defer = false;
+  if (_cg1r->use_cache()) {
+    jbyte* res = _cg1r->cache_insert(card_ptr, &defer);
+    if (res != NULL && (res != card_ptr || defer)) {
+      start = _ct_bs->addr_for(res);
+      r = _g1->heap_region_containing(start);
+      if (r == NULL) {
+        assert(_g1->is_in_permanent(start), "Or else where?");
+      } else {
+        guarantee(!r->is_young(), "It was evicted in the current minor cycle.");
+        // Process card pointer we get back from the hot card cache
+        concurrentRefineOneCard_impl(res, worker_i);
+      }
+    }
+  }
+
+  if (!defer) {
+    concurrentRefineOneCard_impl(card_ptr, worker_i);
+  }
+}
+
 class HRRSStatsIter: public HeapRegionClosure {
   size_t _occupied;
   size_t _total_mem_sz;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp
index 60ba420d8be..c193157fc83 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp
@@ -157,6 +157,10 @@ protected:
     }
   }
 
+  // The routine that performs the actual work of refining a dirty
+  // card.
+  void concurrentRefineOneCard_impl(jbyte* card_ptr, int worker_i);
+
 protected:
   template <class T> void write_ref_nv(HeapRegion* from, T* p);
   template <class T> void par_write_ref_nv(HeapRegion* from, T* p, int tid);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
index 8e134bb3fbf..b56a0281313 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
@@ -34,20 +34,16 @@
   product(intx, G1ConfidencePercent, 50,                                    \
           "Confidence level for MMU/pause predictions")                     \
                                                                             \
-  develop(intx, G1MarkingOverheadPercent, 0,                                   \
+  develop(intx, G1MarkingOverheadPercent, 0,                                \
           "Overhead of concurrent marking")                                 \
                                                                             \
-  develop(bool, G1AccountConcurrentOverhead, false,                         \
-          "Whether soft real-time compliance in G1 will take into account"  \
-          "concurrent overhead")                                            \
-                                                                            \
-  product(intx, G1YoungGenSize, 0,                                          \
+  product(uintx, G1YoungGenSize, 0,                                         \
           "Size of the G1 young generation, 0 is the adaptive policy")      \
                                                                             \
   develop(bool, G1Gen, true,                                                \
           "If true, it will enable the generational G1")                    \
                                                                             \
-  develop(intx, G1GCPercent, 10,                                                \
+  develop(intx, G1GCPercent, 10,                                            \
           "The desired percent time spent on GC")                           \
                                                                             \
   develop(intx, G1PolicyVerbose, 0,                                         \
@@ -74,6 +70,12 @@
   diagnostic(bool, G1SummarizeRSetStats, false,                             \
           "Summarize remembered set processing info")                       \
                                                                             \
+  diagnostic(intx, G1SummarizeRSetStatsPeriod, 0,                           \
+          "The period (in number of GCs) at which we will generate "        \
+          "update buffer processing info "                                  \
+          "(0 means do not periodically generate this info); "              \
+          "it also requires -XX:+G1SummarizeRSetStats")                     \
+                                                                            \
   diagnostic(bool, G1SummarizeZFStats, false,                               \
           "Summarize zero-filling info")                                    \
                                                                             \
@@ -167,17 +169,20 @@
   develop(bool, G1DisablePostBarrier, false,                                \
           "Disable generation of post-barrier (i.e., RS barrier)   ")       \
                                                                             \
-  product(intx, G1DirtyCardQueueMax, 30,                                    \
-          "Maximum number of completed RS buffers before mutator threads "  \
-          "start processing them.")                                         \
+  product(intx, G1UpdateBufferSize, 256,                                    \
+          "Size of an update buffer")                                       \
+                                                                            \
+  product(intx, G1UpdateBufferQueueProcessingThreshold, 5,                  \
+          "Number of enqueued update buffers that will "                    \
+          "trigger concurrent processing")                                  \
+                                                                            \
+  product(intx, G1UpdateBufferQueueMaxLength, 30,                           \
+          "Maximum number of enqueued update buffers before mutator "       \
+          "threads start processing new ones instead of enqueueing them")   \
                                                                             \
   develop(intx, G1ConcRSLogCacheSize, 10,                                   \
           "Log base 2 of the length of conc RS hot-card cache.")            \
                                                                             \
-  develop(bool, G1ConcRSCountTraversals, false,                             \
-          "If true, gather data about the number of times CR traverses "    \
-          "cards ")                                                         \
-                                                                            \
   develop(intx, G1ConcRSHotCardLimit, 4,                                    \
           "The threshold that defines (>=) a hot card.")                    \
                                                                             \
@@ -241,6 +246,9 @@
           "If non-0 is the size of the G1 survivor space, "                 \
           "otherwise SurvivorRatio is used to determine the size")          \
                                                                             \
+  product(uintx, G1HeapRegionSize, 0,                                       \
+          "Size of the G1 regions.")                                        \
+                                                                            \
   experimental(bool, G1ParallelRSetUpdatingEnabled, false,                  \
           "Enables the parallelization of remembered set updating "         \
           "during evacuation pauses")                                       \
@@ -251,6 +259,13 @@
                                                                             \
   product(uintx, G1ParallelRSetThreads, 0,                                  \
           "If non-0 is the number of parallel rem set update threads, "     \
-          "otherwise the value is determined ergonomically.")
+          "otherwise the value is determined ergonomically.")               \
+                                                                            \
+  develop(intx, G1CardCountCacheExpandThreshold, 16,                        \
+          "Expand the card count cache if the number of collisions for "    \
+          "a particular entry exceeds this value.")                         \
+                                                                            \
+  develop(bool, G1VerifyCTCleanup, false,                                   \
+          "Verify card table cleanup.")
 
 G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
index 55a0d023c34..6cbdf87583b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
@@ -25,6 +25,12 @@
 #include "incls/_precompiled.incl"
 #include "incls/_heapRegion.cpp.incl"
 
+int HeapRegion::LogOfHRGrainBytes = 0;
+int HeapRegion::LogOfHRGrainWords = 0;
+int HeapRegion::GrainBytes        = 0;
+int HeapRegion::GrainWords        = 0;
+int HeapRegion::CardsPerRegion    = 0;
+
 HeapRegionDCTOC::HeapRegionDCTOC(G1CollectedHeap* g1,
                                  HeapRegion* hr, OopClosure* cl,
                                  CardTableModRefBS::PrecisionStyle precision,
@@ -231,6 +237,73 @@ void HeapRegionDCTOC::walk_mem_region_with_cl(MemRegion mr,
   }
 }
 
+// Minimum region size; we won't go lower than that.
+// We might want to decrease this in the future, to deal with small
+// heaps a bit more efficiently.
+#define MIN_REGION_SIZE  (      1024 * 1024 )
+
+// Maximum region size; we don't go higher than that. There's a good
+// reason for having an upper bound. We don't want regions to get too
+// large, otherwise cleanup's effectiveness would decrease as there
+// will be fewer opportunities to find totally empty regions after
+// marking.
+#define MAX_REGION_SIZE  ( 32 * 1024 * 1024 )
+
+// The automatic region size calculation will try to have around this
+// many regions in the heap (based on the min heap size).
+#define TARGET_REGION_NUMBER          2048
+
+void HeapRegion::setup_heap_region_size(uintx min_heap_size) {
+  // region_size in bytes
+  uintx region_size = G1HeapRegionSize;
+  if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
+    // We base the automatic calculation on the min heap size. This
+    // can be problematic if the spread between min and max is quite
+    // wide, imagine -Xms128m -Xmx32g. But, if we decided it based on
+    // the max size, the region size might be way too large for the
+    // min size. Either way, some users might have to set the region
+    // size manually for some -Xms / -Xmx combos.
+
+    region_size = MAX2(min_heap_size / TARGET_REGION_NUMBER,
+                       (uintx) MIN_REGION_SIZE);
+  }
+
+  int region_size_log = log2_long((jlong) region_size);
+  // Recalculate the region size to make sure it's a power of
+  // 2. This means that region_size is the largest power of 2 that's
+  // <= what we've calculated so far.
+  region_size = 1 << region_size_log;
+
+  // Now make sure that we don't go over or under our limits.
+  if (region_size < MIN_REGION_SIZE) {
+    region_size = MIN_REGION_SIZE;
+  } else if (region_size > MAX_REGION_SIZE) {
+    region_size = MAX_REGION_SIZE;
+  }
+
+  // And recalculate the log.
+  region_size_log = log2_long((jlong) region_size);
+
+  // Now, set up the globals.
+  guarantee(LogOfHRGrainBytes == 0, "we should only set it once");
+  LogOfHRGrainBytes = region_size_log;
+
+  guarantee(LogOfHRGrainWords == 0, "we should only set it once");
+  LogOfHRGrainWords = LogOfHRGrainBytes - LogHeapWordSize;
+
+  guarantee(GrainBytes == 0, "we should only set it once");
+  // The cast to int is safe, given that we've bounded region_size by
+  // MIN_REGION_SIZE and MAX_REGION_SIZE.
+  GrainBytes = (int) region_size;
+
+  guarantee(GrainWords == 0, "we should only set it once");
+  GrainWords = GrainBytes >> LogHeapWordSize;
+  guarantee(1 << LogOfHRGrainWords == GrainWords, "sanity");
+
+  guarantee(CardsPerRegion == 0, "we should only set it once");
+  CardsPerRegion = GrainBytes >> CardTableModRefBS::card_shift;
+}
+
 void HeapRegion::reset_after_compaction() {
   G1OffsetTableContigSpace::reset_after_compaction();
   // After a compaction the mark bitmap is invalid, so we must
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
index 663ed5c44bf..9a96a84da55 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
@@ -297,15 +297,24 @@ class HeapRegion: public G1OffsetTableContigSpace {
   HeapRegion(G1BlockOffsetSharedArray* sharedOffsetArray,
              MemRegion mr, bool is_zeroed);
 
-  enum SomePublicConstants {
-    // HeapRegions are GrainBytes-aligned
-    // and have sizes that are multiples of GrainBytes.
-    LogOfHRGrainBytes = 20,
-    LogOfHRGrainWords = LogOfHRGrainBytes - LogHeapWordSize,
-    GrainBytes = 1 << LogOfHRGrainBytes,
-    GrainWords = 1 <<LogOfHRGrainWords,
-    MaxAge = 2, NoOfAges = MaxAge+1
-  };
+  static int LogOfHRGrainBytes;
+  static int LogOfHRGrainWords;
+  // The normal type of these should be size_t. However, they used to
+  // be members of an enum before and they are assumed by the
+  // compilers to be ints. To avoid going and fixing all their uses,
+  // I'm declaring them as ints. I'm not anticipating heap region
+  // sizes to reach anywhere near 2g, so using an int here is safe.
+  static int GrainBytes;
+  static int GrainWords;
+  static int CardsPerRegion;
+
+  // It sets up the heap region size (GrainBytes / GrainWords), as
+  // well as other related fields that are based on the heap region
+  // size (LogOfHRGrainBytes / LogOfHRGrainWords /
+  // CardsPerRegion). All those fields are considered constant
+  // throughout the JVM's execution, therefore they should only be set
+  // up once during initialization time.
+  static void setup_heap_region_size(uintx min_heap_size);
 
   enum ClaimValues {
     InitialClaimValue     = 0,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
index f52a1ff2a42..dd04bc8dcb8 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
@@ -57,10 +57,6 @@ class PerRegionTable: public CHeapObj {
 
 #endif // _MSC_VER
 
-  enum SomePrivateConstants {
-    CardsPerRegion = HeapRegion::GrainBytes >> CardTableModRefBS::card_shift
-  };
-
 protected:
   // We need access in order to union things into the base table.
   BitMap* bm() { return &_bm; }
@@ -76,7 +72,7 @@ protected:
 #if PRT_COUNT_OCCUPIED
     _occupied(0),
 #endif
-    _bm(CardsPerRegion, false /* in-resource-area */)
+    _bm(HeapRegion::CardsPerRegion, false /* in-resource-area */)
   {}
 
   static void free(PerRegionTable* prt) {
@@ -144,7 +140,8 @@ protected:
       CardIdx_t from_card = (CardIdx_t)
           hw_offset >> (CardTableModRefBS::card_shift - LogHeapWordSize);
 
-      assert(0 <= from_card && from_card < CardsPerRegion, "Must be in range.");
+      assert(0 <= from_card && from_card < HeapRegion::CardsPerRegion,
+             "Must be in range.");
       add_card_work(from_card, par);
     }
   }
@@ -631,7 +628,7 @@ void OtherRegionsTable::add_reference(OopOrNarrowOopStar from, int tid) {
         uintptr_t(from_hr->bottom())
           >> CardTableModRefBS::card_shift;
       CardIdx_t card_index = from_card - from_hr_bot_card_index;
-      assert(0 <= card_index && card_index < PosParPRT::CardsPerRegion,
+      assert(0 <= card_index && card_index < HeapRegion::CardsPerRegion,
              "Must be in range.");
       if (G1HRRSUseSparseTable &&
           _sparse_table.add_card(from_hrs_ind, card_index)) {
@@ -922,7 +919,7 @@ size_t OtherRegionsTable::occ_fine() const {
 }
 
 size_t OtherRegionsTable::occ_coarse() const {
-  return (_n_coarse_entries * PosParPRT::CardsPerRegion);
+  return (_n_coarse_entries * HeapRegion::CardsPerRegion);
 }
 
 size_t OtherRegionsTable::occ_sparse() const {
@@ -1049,7 +1046,8 @@ bool OtherRegionsTable::contains_reference_locked(OopOrNarrowOopStar from) const
       uintptr_t(hr->bottom()) >> CardTableModRefBS::card_shift;
     assert(from_card >= hr_bot_card_index, "Inv");
     CardIdx_t card_index = from_card - hr_bot_card_index;
-    assert(0 <= card_index && card_index < PosParPRT::CardsPerRegion, "Must be in range.");
+    assert(0 <= card_index && card_index < HeapRegion::CardsPerRegion,
+           "Must be in range.");
     return _sparse_table.contains_card(hr_ind, card_index);
   }
 
@@ -1176,7 +1174,7 @@ void HeapRegionRemSetIterator::initialize(const HeapRegionRemSet* hrrs) {
   _is = Sparse;
   // Set these values so that we increment to the first region.
   _coarse_cur_region_index = -1;
-  _coarse_cur_region_cur_card = (PosParPRT::CardsPerRegion-1);;
+  _coarse_cur_region_cur_card = (HeapRegion::CardsPerRegion-1);;
 
   _cur_region_cur_card = 0;
 
@@ -1195,7 +1193,7 @@ bool HeapRegionRemSetIterator::coarse_has_next(size_t& card_index) {
   // Go to the next card.
   _coarse_cur_region_cur_card++;
   // Was the last the last card in the current region?
-  if (_coarse_cur_region_cur_card == PosParPRT::CardsPerRegion) {
+  if (_coarse_cur_region_cur_card == HeapRegion::CardsPerRegion) {
     // Yes: find the next region.  This may leave _coarse_cur_region_index
     // Set to the last index, in which case there are no more coarse
     // regions.
@@ -1232,7 +1230,7 @@ bool HeapRegionRemSetIterator::fine_has_next(size_t& card_index) {
       _fine_cur_prt->_bm.get_next_one_offset(_cur_region_cur_card + 1);
   }
   while (!fine_has_next()) {
-    if (_cur_region_cur_card == PosParPRT::CardsPerRegion) {
+    if (_cur_region_cur_card == (size_t) HeapRegion::CardsPerRegion) {
       _cur_region_cur_card = 0;
       _fine_cur_prt = _fine_cur_prt->next();
     }
@@ -1255,7 +1253,7 @@ bool HeapRegionRemSetIterator::fine_has_next(size_t& card_index) {
 bool HeapRegionRemSetIterator::fine_has_next() {
   return
     _fine_cur_prt != NULL &&
-    _cur_region_cur_card < PosParPRT::CardsPerRegion;
+    _cur_region_cur_card < (size_t) HeapRegion::CardsPerRegion;
 }
 
 bool HeapRegionRemSetIterator::has_next(size_t& card_index) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp b/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp
index 5baa5505662..e57953b03e0 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.cpp
@@ -347,7 +347,7 @@ CardIdx_t /* RSHashTable:: */ RSHashTableIter::find_first_card_in_list() {
 size_t /* RSHashTable:: */ RSHashTableIter::compute_card_ind(CardIdx_t ci) {
   return
     _heap_bot_card_ind
-    + (_rsht->entry(_bl_ind)->r_ind() * CardsPerRegion)
+    + (_rsht->entry(_bl_ind)->r_ind() * HeapRegion::CardsPerRegion)
     + ci;
 }
 
diff --git a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.hpp b/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.hpp
index d5ab0d5181e..b67126ae80f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/sparsePRT.hpp
@@ -172,10 +172,6 @@ class RSHashTableIter VALUE_OBJ_CLASS_SPEC {
   RSHashTable* _rsht;
   size_t _heap_bot_card_ind;
 
-  enum SomePrivateConstants {
-    CardsPerRegion = HeapRegion::GrainBytes >> CardTableModRefBS::card_shift
-  };
-
   // If the bucket list pointed to by _bl_ind contains a card, sets
   // _bl_ind to the index of that entry, and returns the card.
   // Otherwise, returns SparseEntry::NullEntry.
diff --git a/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep b/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
index a58a72c39a9..7ae314990c8 100644
--- a/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
+++ b/hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
@@ -145,6 +145,7 @@ concurrentMarkSweepGeneration.cpp       genOopClosures.inline.hpp
 concurrentMarkSweepGeneration.cpp       globals_extension.hpp
 concurrentMarkSweepGeneration.cpp       handles.inline.hpp
 concurrentMarkSweepGeneration.cpp       isGCActiveMark.hpp
+concurrentMarkSweepGeneration.cpp       iterator.hpp
 concurrentMarkSweepGeneration.cpp       java.hpp
 concurrentMarkSweepGeneration.cpp       jvmtiExport.hpp
 concurrentMarkSweepGeneration.cpp       oop.inline.hpp
diff --git a/hotspot/src/share/vm/gc_implementation/includeDB_gc_g1 b/hotspot/src/share/vm/gc_implementation/includeDB_gc_g1
index 7e2df3fc8af..63bfbce76f9 100644
--- a/hotspot/src/share/vm/gc_implementation/includeDB_gc_g1
+++ b/hotspot/src/share/vm/gc_implementation/includeDB_gc_g1
@@ -45,11 +45,14 @@ concurrentG1Refine.cpp			concurrentG1Refine.hpp
 concurrentG1Refine.cpp			concurrentG1RefineThread.hpp
 concurrentG1Refine.cpp			copy.hpp
 concurrentG1Refine.cpp			g1CollectedHeap.inline.hpp
+concurrentG1Refine.cpp                  g1CollectorPolicy.hpp
 concurrentG1Refine.cpp			g1RemSet.hpp
 concurrentG1Refine.cpp			space.inline.hpp
+concurrentG1Refine.cpp                  heapRegionSeq.inline.hpp
 
 concurrentG1Refine.hpp			globalDefinitions.hpp
 concurrentG1Refine.hpp			allocation.hpp
+concurrentG1Refine.hpp                  cardTableModRefBS.hpp
 concurrentG1Refine.hpp			thread.hpp
 
 concurrentG1RefineThread.cpp		concurrentG1Refine.hpp
@@ -61,14 +64,12 @@ concurrentG1RefineThread.cpp		mutexLocker.hpp
 concurrentG1RefineThread.cpp		resourceArea.hpp
 
 concurrentG1RefineThread.hpp		concurrentGCThread.hpp
-concurrentG1RefineThread.hpp		coTracker.hpp
 
 concurrentMark.cpp			concurrentMark.hpp
 concurrentMark.cpp			concurrentMarkThread.inline.hpp
 concurrentMark.cpp			g1CollectedHeap.inline.hpp
 concurrentMark.cpp                      g1CollectorPolicy.hpp
 concurrentMark.cpp                      g1RemSet.hpp
-concurrentMark.cpp		        gcOverheadReporter.hpp
 concurrentMark.cpp		        genOopClosures.inline.hpp
 concurrentMark.cpp                      heapRegionRemSet.hpp
 concurrentMark.cpp                      heapRegionSeq.inline.hpp
@@ -79,7 +80,6 @@ concurrentMark.cpp                      referencePolicy.hpp
 concurrentMark.cpp			resourceArea.hpp
 concurrentMark.cpp			symbolTable.hpp
 
-concurrentMark.hpp			coTracker.hpp
 concurrentMark.hpp			heapRegion.hpp
 concurrentMark.hpp			taskqueue.hpp
 
@@ -104,7 +104,6 @@ concurrentZFThread.cpp			mutexLocker.hpp
 concurrentZFThread.cpp			space.inline.hpp
 
 concurrentZFThread.hpp			concurrentGCThread.hpp
-concurrentZFThread.hpp			coTracker.hpp
 
 dirtyCardQueue.cpp                      atomic.hpp
 dirtyCardQueue.cpp                      dirtyCardQueue.hpp
@@ -144,7 +143,6 @@ g1CollectedHeap.cpp                     g1RemSet.inline.hpp
 g1CollectedHeap.cpp                     g1OopClosures.inline.hpp
 g1CollectedHeap.cpp                     genOopClosures.inline.hpp
 g1CollectedHeap.cpp                     gcLocker.inline.hpp
-g1CollectedHeap.cpp                     gcOverheadReporter.hpp
 g1CollectedHeap.cpp                     generationSpec.hpp
 g1CollectedHeap.cpp                     heapRegionRemSet.hpp
 g1CollectedHeap.cpp                     heapRegionSeq.inline.hpp
@@ -167,6 +165,7 @@ g1CollectedHeap.inline.hpp              g1CollectedHeap.hpp
 g1CollectedHeap.inline.hpp              heapRegionSeq.hpp
 g1CollectedHeap.inline.hpp		taskqueue.hpp
 
+g1CollectorPolicy.cpp			arguments.hpp
 g1CollectorPolicy.cpp			concurrentG1Refine.hpp
 g1CollectorPolicy.cpp			concurrentMark.hpp
 g1CollectorPolicy.cpp			concurrentMarkThread.inline.hpp
diff --git a/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge b/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
index 90161a4c7d7..f8e6f0fd3b8 100644
--- a/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
+++ b/hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
@@ -253,10 +253,11 @@ psParallelCompact.cpp			gcCause.hpp
 psParallelCompact.cpp			gcLocker.inline.hpp
 psParallelCompact.cpp                   gcTaskManager.hpp
 psParallelCompact.cpp			isGCActiveMark.hpp
+psParallelCompact.cpp			management.hpp
+psParallelCompact.cpp			memoryService.hpp
+psParallelCompact.cpp			methodDataOop.hpp
 psParallelCompact.cpp			oop.inline.hpp
 psParallelCompact.cpp			oop.pcgc.inline.hpp
-psParallelCompact.cpp			memoryService.hpp
-psParallelCompact.cpp			management.hpp
 psParallelCompact.cpp			parallelScavengeHeap.inline.hpp
 psParallelCompact.cpp			pcTasks.hpp
 psParallelCompact.cpp			psMarkSweep.hpp
diff --git a/hotspot/src/share/vm/gc_implementation/includeDB_gc_shared b/hotspot/src/share/vm/gc_implementation/includeDB_gc_shared
index fca8d2f2ed3..b70d090b801 100644
--- a/hotspot/src/share/vm/gc_implementation/includeDB_gc_shared
+++ b/hotspot/src/share/vm/gc_implementation/includeDB_gc_shared
@@ -35,12 +35,6 @@ concurrentGCThread.cpp                  systemDictionary.hpp
 
 concurrentGCThread.hpp                  thread.hpp
 
-coTracker.hpp                           globalDefinitions.hpp
-coTracker.hpp                           numberSeq.hpp
-
-coTracker.cpp                           coTracker.hpp
-coTracker.cpp                           os.hpp
-
 allocationStats.cpp                     allocationStats.hpp
 allocationStats.cpp                     ostream.hpp
 
@@ -54,13 +48,6 @@ gcAdaptivePolicyCounters.hpp            gcPolicyCounters.hpp
 gcAdaptivePolicyCounters.cpp            resourceArea.hpp
 gcAdaptivePolicyCounters.cpp            gcAdaptivePolicyCounters.hpp
 
-gcOverheadReporter.cpp                  allocation.inline.hpp
-gcOverheadReporter.cpp                  concurrentGCThread.hpp
-gcOverheadReporter.cpp                  coTracker.hpp
-gcOverheadReporter.cpp                  gcOverheadReporter.hpp
-gcOverheadReporter.cpp                  ostream.hpp
-gcOverheadReporter.cpp                  thread_<os_family>.inline.hpp
-
 gSpaceCounters.cpp                      generation.hpp
 gSpaceCounters.cpp                      resourceArea.hpp
 gSpaceCounters.cpp                      gSpaceCounters.hpp
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
index 7a3ebaf9fd3..d6721572668 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
@@ -58,9 +58,8 @@ void MarkFromRootsTask::do_it(GCTaskManager* manager, uint which) {
     PrintGCDetails && TraceParallelOldGCTasks, true, gclog_or_tty));
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
-  // cm->allocate_stacks();
   assert(cm->stacks_have_been_allocated(),
-    "Stack space has not been allocated");
+         "Stack space has not been allocated");
   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
 
   switch (_root_type) {
@@ -129,9 +128,8 @@ void RefProcTaskProxy::do_it(GCTaskManager* manager, uint which)
     PrintGCDetails && TraceParallelOldGCTasks, true, gclog_or_tty));
   ParCompactionManager* cm =
     ParCompactionManager::gc_thread_compaction_manager(which);
-  // cm->allocate_stacks();
   assert(cm->stacks_have_been_allocated(),
-    "Stack space has not been allocated");
+         "Stack space has not been allocated");
   PSParallelCompact::MarkAndPushClosure mark_and_push_closure(cm);
   PSParallelCompact::FollowStackClosure follow_stack_closure(cm);
   _rp_task.work(_work_id, *PSParallelCompact::is_alive_closure(),
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
index 67b8690c3d7..cc00dcd813f 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp
@@ -61,12 +61,16 @@ ParCompactionManager::ParCompactionManager() :
   int size =
     (SystemDictionary::number_of_classes() * 2) * 2 / ParallelGCThreads;
   _revisit_klass_stack = new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
+  // From some experiments (#klass/k)^2 for k = 10 seems a better fit, but this will
+  // have to do for now until we are able to investigate a more optimal setting.
+  _revisit_mdo_stack = new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(size*2, true);
 
 }
 
 ParCompactionManager::~ParCompactionManager() {
   delete _overflow_stack;
   delete _revisit_klass_stack;
+  delete _revisit_mdo_stack;
   // _manager_array and _stack_array are statics
   // shared with all instances of ParCompactionManager
   // should not be deallocated.
@@ -195,6 +199,7 @@ ParCompactionManager::gc_thread_compaction_manager(int index) {
 void ParCompactionManager::reset() {
   for(uint i=0; i<ParallelGCThreads+1; i++) {
     manager_array(i)->revisit_klass_stack()->clear();
+    manager_array(i)->revisit_mdo_stack()->clear();
   }
 }
 
@@ -296,6 +301,7 @@ void ParCompactionManager::drain_region_stacks() {
 
 #ifdef ASSERT
 bool ParCompactionManager::stacks_have_been_allocated() {
-  return (revisit_klass_stack()->data_addr() != NULL);
+  return (revisit_klass_stack()->data_addr() != NULL &&
+          revisit_mdo_stack()->data_addr() != NULL);
 }
 #endif
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
index 6bd5e11fd37..2a16387183e 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp
@@ -93,6 +93,7 @@ class ParCompactionManager : public CHeapObj {
 
 #if 1  // does this happen enough to need a per thread stack?
   GrowableArray<Klass*>*        _revisit_klass_stack;
+  GrowableArray<DataLayout*>*   _revisit_mdo_stack;
 #endif
   static ParMarkBitMap* _mark_bitmap;
 
@@ -154,6 +155,7 @@ class ParCompactionManager : public CHeapObj {
 #if 1
   // Probably stays as a growable array
   GrowableArray<Klass*>* revisit_klass_stack() { return _revisit_klass_stack; }
+  GrowableArray<DataLayout*>* revisit_mdo_stack() { return _revisit_mdo_stack; }
 #endif
 
   // Save oop for later processing.  Must not fail.
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
index 568b5cf8350..4b53b81ed2c 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
@@ -482,6 +482,9 @@ void PSMarkSweep::allocate_stacks() {
 
   int size = SystemDictionary::number_of_classes() * 2;
   _revisit_klass_stack = new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
+  // (#klass/k)^2, for k ~ 10 appears a better setting, but this will have to do for
+  // now until we investigate a more optimal setting.
+  _revisit_mdo_stack   = new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(size*2, true);
 }
 
 
@@ -495,6 +498,7 @@ void PSMarkSweep::deallocate_stacks() {
 
   delete _marking_stack;
   delete _revisit_klass_stack;
+  delete _revisit_mdo_stack;
 }
 
 void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
@@ -540,6 +544,10 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
   follow_weak_klass_links();
   assert(_marking_stack->is_empty(), "just drained");
 
+  // Visit memoized mdo's and clear unmarked weak refs
+  follow_mdo_weak_refs();
+  assert(_marking_stack->is_empty(), "just drained");
+
   // Visit symbol and interned string tables and delete unmarked oops
   SymbolTable::unlink(is_alive_closure());
   StringTable::unlink(is_alive_closure());
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
index 76577c3c569..e2480c9c8f2 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
@@ -2378,7 +2378,10 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm,
 
   // Update subklass/sibling/implementor links of live klasses
   // revisit_klass_stack is used in follow_weak_klass_links().
-  follow_weak_klass_links(cm);
+  follow_weak_klass_links();
+
+  // Revisit memoized MDO's and clear any unmarked weak refs
+  follow_mdo_weak_refs();
 
   // Visit symbol and interned string tables and delete unmarked oops
   SymbolTable::unlink(is_alive_closure());
@@ -2721,17 +2724,25 @@ void PSParallelCompact::follow_stack(ParCompactionManager* cm) {
 }
 
 void
-PSParallelCompact::follow_weak_klass_links(ParCompactionManager* serial_cm) {
+PSParallelCompact::follow_weak_klass_links() {
   // All klasses on the revisit stack are marked at this point.
   // Update and follow all subklass, sibling and implementor links.
-  for (uint i = 0; i < ParallelGCThreads+1; i++) {
+  if (PrintRevisitStats) {
+    gclog_or_tty->print_cr("#classes in system dictionary = %d", SystemDictionary::number_of_classes());
+  }
+  for (uint i = 0; i < ParallelGCThreads + 1; i++) {
     ParCompactionManager* cm = ParCompactionManager::manager_array(i);
     KeepAliveClosure keep_alive_closure(cm);
-    for (int i = 0; i < cm->revisit_klass_stack()->length(); i++) {
-      cm->revisit_klass_stack()->at(i)->follow_weak_klass_links(
+    int length = cm->revisit_klass_stack()->length();
+    if (PrintRevisitStats) {
+      gclog_or_tty->print_cr("Revisit klass stack[%d] length = %d", i, length);
+    }
+    for (int j = 0; j < length; j++) {
+      cm->revisit_klass_stack()->at(j)->follow_weak_klass_links(
         is_alive_closure(),
         &keep_alive_closure);
     }
+    // revisit_klass_stack is cleared in reset()
     follow_stack(cm);
   }
 }
@@ -2741,6 +2752,35 @@ PSParallelCompact::revisit_weak_klass_link(ParCompactionManager* cm, Klass* k) {
   cm->revisit_klass_stack()->push(k);
 }
 
+#if ( defined(COMPILER1) || defined(COMPILER2) )
+void PSParallelCompact::revisit_mdo(ParCompactionManager* cm, DataLayout* p) {
+  cm->revisit_mdo_stack()->push(p);
+}
+
+void PSParallelCompact::follow_mdo_weak_refs() {
+  // All strongly reachable oops have been marked at this point;
+  // we can visit and clear any weak references from MDO's which
+  // we memoized during the strong marking phase.
+  if (PrintRevisitStats) {
+    gclog_or_tty->print_cr("#classes in system dictionary = %d", SystemDictionary::number_of_classes());
+  }
+  for (uint i = 0; i < ParallelGCThreads + 1; i++) {
+    ParCompactionManager* cm = ParCompactionManager::manager_array(i);
+    GrowableArray<DataLayout*>* rms = cm->revisit_mdo_stack();
+    int length = rms->length();
+    if (PrintRevisitStats) {
+      gclog_or_tty->print_cr("Revisit MDO stack[%d] length = %d", i, length);
+    }
+    for (int j = 0; j < length; j++) {
+      rms->at(j)->follow_weak_refs(is_alive_closure());
+    }
+    // revisit_mdo_stack is cleared in reset()
+    follow_stack(cm);
+  }
+}
+#endif //  ( COMPILER1 || COMPILER2 )
+
+
 #ifdef VALIDATE_MARK_SWEEP
 
 void PSParallelCompact::track_adjusted_pointer(void* p, bool isroot) {
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
index 0a4ba77581d..04d520af380 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
@@ -901,7 +901,8 @@ class PSParallelCompact : AllStatic {
   static void marking_phase(ParCompactionManager* cm,
                             bool maximum_heap_compaction);
   static void follow_stack(ParCompactionManager* cm);
-  static void follow_weak_klass_links(ParCompactionManager* cm);
+  static void follow_weak_klass_links();
+  static void follow_mdo_weak_refs();
 
   template <class T> static inline void adjust_pointer(T* p, bool is_root);
   static void adjust_root_pointer(oop* p) { adjust_pointer(p, true); }
@@ -1221,6 +1222,9 @@ class PSParallelCompact : AllStatic {
   // Update subklass/sibling/implementor links at end of marking.
   static void revisit_weak_klass_link(ParCompactionManager* cm, Klass* k);
 
+  // Clear unmarked oops in MDOs at the end of marking.
+  static void revisit_mdo(ParCompactionManager* cm, DataLayout* p);
+
 #ifndef PRODUCT
   // Debugging support.
   static const char* space_names[last_space_id];
diff --git a/hotspot/src/share/vm/gc_implementation/shared/coTracker.cpp b/hotspot/src/share/vm/gc_implementation/shared/coTracker.cpp
deleted file mode 100644
index c15fcc010e2..00000000000
--- a/hotspot/src/share/vm/gc_implementation/shared/coTracker.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2001-2007 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-
-# include "incls/_precompiled.incl"
-# include "incls/_coTracker.cpp.incl"
-
-COTracker* COTracker::_head = NULL;
-double COTracker::_cpu_number = -1.0;
-
-void
-COTracker::resetPeriod(double now_sec, double vnow_sec) {
-  guarantee( _enabled, "invariant" );
-  _period_start_time_sec  = now_sec;
-  _period_start_vtime_sec = vnow_sec;
-}
-
-void
-COTracker::setConcOverhead(double time_stamp_sec,
-                           double conc_overhead) {
-  guarantee( _enabled, "invariant" );
-  _conc_overhead  = conc_overhead;
-  _time_stamp_sec = time_stamp_sec;
-  if (conc_overhead > 0.001)
-    _conc_overhead_seq.add(conc_overhead);
-}
-
-void
-COTracker::reset(double starting_conc_overhead) {
-  guarantee( _enabled, "invariant" );
-  double now_sec = os::elapsedTime();
-  setConcOverhead(now_sec, starting_conc_overhead);
-}
-
-void
-COTracker::start() {
-  guarantee( _enabled, "invariant" );
-  resetPeriod(os::elapsedTime(), os::elapsedVTime());
-}
-
-void
-COTracker::update(bool force_end) {
-  assert( _enabled, "invariant" );
-  double end_time_sec = os::elapsedTime();
-  double elapsed_time_sec = end_time_sec - _period_start_time_sec;
-  if (force_end || elapsed_time_sec > _update_period_sec) {
-    // reached the end of the period
-    double end_vtime_sec = os::elapsedVTime();
-    double elapsed_vtime_sec = end_vtime_sec - _period_start_vtime_sec;
-
-    double conc_overhead = elapsed_vtime_sec / elapsed_time_sec;
-
-    setConcOverhead(end_time_sec, conc_overhead);
-    resetPeriod(end_time_sec, end_vtime_sec);
-  }
-}
-
-void
-COTracker::updateForSTW(double start_sec, double end_sec) {
-  if (!_enabled)
-    return;
-
-  // During a STW pause, no concurrent GC thread has done any
-  // work. So, we can safely adjust the start of the current period by
-  // adding the duration of the STW pause to it, so that the STW pause
-  // doesn't affect the reading of the concurrent overhead (it's
-  // basically like excluding the time of the STW pause from the
-  // concurrent overhead calculation).
-
-  double stw_duration_sec = end_sec - start_sec;
-  guarantee( stw_duration_sec > 0.0, "invariant" );
-
-  if (outOfDate(start_sec))
-    _conc_overhead = 0.0;
-  else
-    _time_stamp_sec = end_sec;
-  _period_start_time_sec += stw_duration_sec;
-  _conc_overhead_seq = NumberSeq();
-
-  guarantee( os::elapsedTime() > _period_start_time_sec, "invariant" );
-}
-
-double
-COTracker::predConcOverhead() {
-  if (_enabled) {
-    // tty->print(" %1.2lf", _conc_overhead_seq.maximum());
-    return _conc_overhead_seq.maximum();
-  } else {
-    // tty->print(" DD");
-    return 0.0;
-  }
-}
-
-void
-COTracker::resetPred() {
-  _conc_overhead_seq = NumberSeq();
-}
-
-COTracker::COTracker(int group)
-    : _enabled(false),
-      _group(group),
-      _period_start_time_sec(-1.0),
-      _period_start_vtime_sec(-1.0),
-      _conc_overhead(-1.0),
-      _time_stamp_sec(-1.0),
-      _next(NULL) {
-  // GCOverheadReportingPeriodMS indicates how frequently the
-  // concurrent overhead will be recorded by the GC Overhead
-  // Reporter. We want to take readings less often than that. If we
-  // took readings more often than some of them might be lost.
-  _update_period_sec = ((double) GCOverheadReportingPeriodMS) / 1000.0 * 1.25;
-  _next = _head;
-  _head = this;
-
-  if (_cpu_number < 0.0)
-    _cpu_number = (double) os::processor_count();
-}
-
-// statics
-
-void
-COTracker::updateAllForSTW(double start_sec, double end_sec) {
-  for (COTracker* curr = _head; curr != NULL; curr = curr->_next) {
-    curr->updateForSTW(start_sec, end_sec);
-  }
-}
-
-double
-COTracker::totalConcOverhead(double now_sec) {
-  double total_conc_overhead = 0.0;
-
-  for (COTracker* curr = _head; curr != NULL; curr = curr->_next) {
-    double conc_overhead = curr->concOverhead(now_sec);
-    total_conc_overhead += conc_overhead;
-  }
-
-  return total_conc_overhead;
-}
-
-double
-COTracker::totalConcOverhead(double now_sec,
-                             size_t group_num,
-                             double* co_per_group) {
-  double total_conc_overhead = 0.0;
-
-  for (size_t i = 0; i < group_num; ++i)
-    co_per_group[i] = 0.0;
-
-  for (COTracker* curr = _head; curr != NULL; curr = curr->_next) {
-    size_t group = curr->_group;
-    assert( 0 <= group && group < group_num, "invariant" );
-    double conc_overhead = curr->concOverhead(now_sec);
-
-    co_per_group[group] += conc_overhead;
-    total_conc_overhead += conc_overhead;
-  }
-
-  return total_conc_overhead;
-}
-
-double
-COTracker::totalPredConcOverhead() {
-  double total_pred_conc_overhead = 0.0;
-  for (COTracker* curr = _head; curr != NULL; curr = curr->_next) {
-    total_pred_conc_overhead += curr->predConcOverhead();
-    curr->resetPred();
-  }
-  return total_pred_conc_overhead / _cpu_number;
-}
diff --git a/hotspot/src/share/vm/gc_implementation/shared/coTracker.hpp b/hotspot/src/share/vm/gc_implementation/shared/coTracker.hpp
deleted file mode 100644
index 3c9fa012e57..00000000000
--- a/hotspot/src/share/vm/gc_implementation/shared/coTracker.hpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright 2001-2007 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-
-// COTracker keeps track of the concurrent overhead of a GC thread.
-
-// A thread that needs to be tracked must, itself, start up its
-// tracker with the start() method and then call the update() method
-// at regular intervals. What the tracker does is to calculate the
-// concurrent overhead of a process at a given update period. The
-// tracker starts and when is detects that it has exceeded the given
-// period, it calculates the duration of the period in wall-clock time
-// and the duration of the period in vtime (i.e. how much time the
-// concurrent processes really took up during this period). The ratio
-// of the latter over the former is the concurrent overhead of that
-// process for that period over a single CPU. This overhead is stored
-// on the tracker, "timestamped" with the wall-clock time of the end
-// of the period. When the concurrent overhead of this process needs
-// to be queried, this last "reading" provides a good approximation
-// (we assume that the concurrent overhead of a particular thread
-// stays largely constant over time). The timestamp is necessary to
-// detect when the process has stopped working and the recorded
-// reading hasn't been updated for some time.
-
-// Each concurrent GC thread is considered to be part of a "group"
-// (i.e. any available concurrent marking threads are part of the
-// "concurrent marking thread group"). A COTracker is associated with
-// a single group at construction-time. It's up to each collector to
-// decide how groups will be mapped to such an id (ids should start
-// from 0 and be consecutive; there's a hardcoded max group num
-// defined on the GCOverheadTracker class). The notion of a group has
-// been introduced to be able to identify how much overhead was
-// imposed by each group, instead of getting a single value that
-// covers all concurrent overhead.
-
-class COTracker {
-private:
-  // It indicates whether this tracker is enabled or not. When the
-  // tracker is disabled, then it returns 0.0 as the latest concurrent
-  // overhead and several methods (reset, start, and update) are not
-  // supposed to be called on it. This enabling / disabling facility
-  // is really provided to make a bit more explicit in the code when a
-  // particulary tracker of a processes that doesn't run all the time
-  // (e.g. concurrent marking) is supposed to be used and not it's not.
-  bool               _enabled;
-
-  // The ID of the group associated with this tracker.
-  int                _group;
-
-  // The update period of the tracker. A new value for the concurrent
-  // overhead of the associated process will be made at intervals no
-  // smaller than this.
-  double             _update_period_sec;
-
-  // The start times (both wall-block time and vtime) of the current
-  // interval.
-  double             _period_start_time_sec;
-  double             _period_start_vtime_sec;
-
-  // Number seq of the concurrent overhead readings within a period
-  NumberSeq          _conc_overhead_seq;
-
-  // The latest reading of the concurrent overhead (over a single CPU)
-  // imposed by the associated concurrent thread, made available at
-  // the indicated wall-clock time.
-  double             _conc_overhead;
-  double             _time_stamp_sec;
-
-  // The number of CPUs that the host machine has (for convenience
-  // really, as we'd have to keep translating it into a double)
-  static double      _cpu_number;
-
-  // Fields that keep a list of all trackers created. This is useful,
-  // since it allows us to sum up the concurrent overhead without
-  // having to write code for a specific collector to broadcast a
-  // request to all its concurrent processes.
-  COTracker*         _next;
-  static COTracker*  _head;
-
-  // It indicates that a new period is starting by updating the
-  // _period_start_time_sec and _period_start_vtime_sec fields.
-  void resetPeriod(double now_sec, double vnow_sec);
-  // It updates the latest concurrent overhead reading, taken at a
-  // given wall-clock time.
-  void setConcOverhead(double time_stamp_sec, double conc_overhead);
-
-  // It determines whether the time stamp of the latest concurrent
-  // overhead reading is out of date or not.
-  bool outOfDate(double now_sec) {
-    // The latest reading is considered out of date, if it was taken
-    // 1.2x the update period.
-    return (now_sec - _time_stamp_sec) > 1.2 * _update_period_sec;
-  }
-
-public:
-  // The constructor which associates the tracker with a group ID.
-  COTracker(int group);
-
-  // Methods to enable / disable the tracker and query whether it is enabled.
-  void enable()  { _enabled = true;  }
-  void disable() { _enabled = false; }
-  bool enabled() { return _enabled;  }
-
-  // It resets the tracker and sets concurrent overhead reading to be
-  // the given parameter and the associated time stamp to be now.
-  void reset(double starting_conc_overhead = 0.0);
-  // The tracker starts tracking. IT should only be called from the
-  // concurrent thread that is tracked by this tracker.
-  void start();
-  // It updates the tracker and, if the current period is longer than
-  // the update period, the concurrent overhead reading will be
-  // updated. force_end being true indicates that it's the last call
-  // to update() by this process before the tracker is disabled (the
-  // tracker can be re-enabled later if necessary).  It should only be
-  // called from the concurrent thread that is tracked by this tracker
-  // and while the thread has joined the STS.
-  void update(bool force_end = false);
-  // It adjusts the contents of the tracker to take into account a STW
-  // pause.
-  void updateForSTW(double start_sec, double end_sec);
-
-  // It returns the last concurrent overhead reading over a single
-  // CPU. If the reading is out of date, or the tracker is disabled,
-  // it returns 0.0.
-  double concCPUOverhead(double now_sec) {
-    if (!_enabled || outOfDate(now_sec))
-      return 0.0;
-    else
-      return _conc_overhead;
-  }
-
-  // It returns the last concurrent overhead reading over all CPUs
-  // that the host machine has. If the reading is out of date, or the
-  // tracker is disabled, it returns 0.0.
-  double concOverhead(double now_sec) {
-    return concCPUOverhead(now_sec) / _cpu_number;
-  }
-
-  double predConcOverhead();
-
-  void resetPred();
-
-  // statics
-
-  // It notifies all trackers about a STW pause.
-  static void updateAllForSTW(double start_sec, double end_sec);
-
-  // It returns the sum of the concurrent overhead readings of all
-  // available (and enabled) trackers for the given time stamp. The
-  // overhead is over all the CPUs of the host machine.
-
-  static double totalConcOverhead(double now_sec);
-  // Like the previous method, but it also sums up the overheads per
-  // group number. The length of the co_per_group array must be at
-  // least as large group_num
-  static double totalConcOverhead(double now_sec,
-                                  size_t group_num,
-                                  double* co_per_group);
-
-  static double totalPredConcOverhead();
-};
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp b/hotspot/src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp
deleted file mode 100644
index 02a2edb755a..00000000000
--- a/hotspot/src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2001-2007 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-
-# include "incls/_precompiled.incl"
-# include "incls/_gcOverheadReporter.cpp.incl"
-
-class COReportingThread : public ConcurrentGCThread {
-private:
-  GCOverheadReporter* _reporter;
-
-public:
-  COReportingThread(GCOverheadReporter* reporter) : _reporter(reporter) {
-    guarantee( _reporter != NULL, "precondition" );
-    create_and_start();
-  }
-
-  virtual void run() {
-    initialize_in_thread();
-    wait_for_universe_init();
-
-    int period_ms = GCOverheadReportingPeriodMS;
-
-    while ( true ) {
-      os::sleep(Thread::current(), period_ms, false);
-
-      _sts.join();
-      double now_sec = os::elapsedTime();
-      _reporter->collect_and_record_conc_overhead(now_sec);
-      _sts.leave();
-    }
-
-    terminate();
-  }
-};
-
-GCOverheadReporter* GCOverheadReporter::_reporter = NULL;
-
-GCOverheadReporter::GCOverheadReporter(size_t group_num,
-                                       const char* group_names[],
-                                       size_t length)
-    : _group_num(group_num), _prev_end_sec(0.0) {
-  guarantee( 0 <= group_num && group_num <= MaxGCOverheadGroupNum,
-             "precondition" );
-
-  _base = NEW_C_HEAP_ARRAY(GCOverheadReporterEntry, length);
-  _top  = _base + length;
-  _curr = _base;
-
-  for (size_t i = 0; i < group_num; ++i) {
-    guarantee( group_names[i] != NULL, "precondition" );
-    _group_names[i] = group_names[i];
-  }
-}
-
-void
-GCOverheadReporter::add(double start_sec, double end_sec,
-                        double* conc_overhead,
-                        double stw_overhead) {
-  assert( _curr <= _top, "invariant" );
-
-  if (_curr == _top) {
-    guarantee( false, "trace full" );
-    return;
-  }
-
-  _curr->_start_sec       = start_sec;
-  _curr->_end_sec         = end_sec;
-  for (size_t i = 0; i < _group_num; ++i) {
-    _curr->_conc_overhead[i] =
-      (conc_overhead != NULL) ? conc_overhead[i] : 0.0;
-  }
-  _curr->_stw_overhead    = stw_overhead;
-
-  ++_curr;
-}
-
-void
-GCOverheadReporter::collect_and_record_conc_overhead(double end_sec) {
-  double start_sec = _prev_end_sec;
-  guarantee( end_sec > start_sec, "invariant" );
-
-  double conc_overhead[MaxGCOverheadGroupNum];
-  COTracker::totalConcOverhead(end_sec, _group_num, conc_overhead);
-  add_conc_overhead(start_sec, end_sec, conc_overhead);
-  _prev_end_sec = end_sec;
-}
-
-void
-GCOverheadReporter::record_stw_start(double start_sec) {
-  guarantee( start_sec > _prev_end_sec, "invariant" );
-  collect_and_record_conc_overhead(start_sec);
-}
-
-void
-GCOverheadReporter::record_stw_end(double end_sec) {
-  double start_sec = _prev_end_sec;
-  COTracker::updateAllForSTW(start_sec, end_sec);
-  add_stw_overhead(start_sec, end_sec, 1.0);
-
-  _prev_end_sec = end_sec;
-}
-
-void
-GCOverheadReporter::print() const {
-  tty->print_cr("");
-  tty->print_cr("GC Overhead (%d entries)", _curr - _base);
-  tty->print_cr("");
-  GCOverheadReporterEntry* curr = _base;
-  while (curr < _curr) {
-    double total = curr->_stw_overhead;
-    for (size_t i = 0; i < _group_num; ++i)
-      total += curr->_conc_overhead[i];
-
-    tty->print("OVERHEAD %12.8lf %12.8lf ",
-               curr->_start_sec, curr->_end_sec);
-
-    for (size_t i = 0; i < _group_num; ++i)
-      tty->print("%s %12.8lf ", _group_names[i], curr->_conc_overhead[i]);
-
-    tty->print_cr("STW %12.8lf TOT %12.8lf", curr->_stw_overhead, total);
-    ++curr;
-  }
-  tty->print_cr("");
-}
-
-// statics
-
-void
-GCOverheadReporter::initGCOverheadReporter(size_t group_num,
-                                           const char* group_names[]) {
-  guarantee( _reporter == NULL, "should only be called once" );
-  guarantee( 0 <= group_num && group_num <= MaxGCOverheadGroupNum,
-             "precondition" );
-  guarantee( group_names != NULL, "pre-condition" );
-
-  if (GCOverheadReporting) {
-    _reporter = new GCOverheadReporter(group_num, group_names);
-    new COReportingThread(_reporter);
-  }
-}
-
-void
-GCOverheadReporter::recordSTWStart(double start_sec) {
-  if (_reporter != NULL)
-    _reporter->record_stw_start(start_sec);
-}
-
-void
-GCOverheadReporter::recordSTWEnd(double end_sec) {
-  if (_reporter != NULL)
-    _reporter->record_stw_end(end_sec);
-}
-
-void
-GCOverheadReporter::printGCOverhead() {
-  if (_reporter != NULL)
-    _reporter->print();
-}
diff --git a/hotspot/src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp b/hotspot/src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp
deleted file mode 100644
index c3483a68b00..00000000000
--- a/hotspot/src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2001-2007 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- */
-
-// Keeps track of the GC overhead (both concurrent and STW). It stores
-// it in a large array and then prints it to tty at the end of the
-// execution.
-
-// See coTracker.hpp for the explanation on what groups are.
-
-// Let's set a maximum number of concurrent overhead groups, to
-// statically allocate any arrays we need and not to have to
-// malloc/free them. This is just a bit more convenient.
-enum {
-  MaxGCOverheadGroupNum = 4
-};
-
-typedef struct {
-  double _start_sec;
-  double _end_sec;
-
-  double _conc_overhead[MaxGCOverheadGroupNum];
-  double _stw_overhead;
-} GCOverheadReporterEntry;
-
-class GCOverheadReporter {
-  friend class COReportingThread;
-
-private:
-  enum PrivateConstants {
-    DefaultReporterLength = 128 * 1024
-  };
-
-  // Reference to the single instance of this class.
-  static GCOverheadReporter* _reporter;
-
-  // These three references point to the array that contains the GC
-  // overhead entries (_base is the base of the array, _top is the
-  // address passed the last entry of the array, _curr is the next
-  // entry to be used).
-  GCOverheadReporterEntry* _base;
-  GCOverheadReporterEntry* _top;
-  GCOverheadReporterEntry* _curr;
-
-  // The number of concurrent overhead groups.
-  size_t _group_num;
-
-  // The wall-clock time of the end of the last recorded period of GC
-  // overhead.
-  double _prev_end_sec;
-
-  // Names for the concurrent overhead groups.
-  const char* _group_names[MaxGCOverheadGroupNum];
-
-  // Add a new entry to the large array. conc_overhead being NULL is
-  // equivalent to an array full of 0.0s. conc_overhead should have a
-  // length of at least _group_num.
-  void add(double start_sec, double end_sec,
-           double* conc_overhead,
-           double stw_overhead);
-
-  // Add an entry that represents concurrent GC overhead.
-  // conc_overhead must be at least of length _group_num.
-  // conc_overhead being NULL is equivalent to an array full of 0.0s.
-  void add_conc_overhead(double start_sec, double end_sec,
-                         double* conc_overhead) {
-    add(start_sec, end_sec, conc_overhead, 0.0);
-  }
-
-  // Add an entry that represents STW GC overhead.
-  void add_stw_overhead(double start_sec, double end_sec,
-                        double stw_overhead) {
-    add(start_sec, end_sec, NULL, stw_overhead);
-  }
-
-  // It records the start of a STW pause (i.e. it records the
-  // concurrent overhead up to that point)
-  void record_stw_start(double start_sec);
-
-  // It records the end of a STW pause (i.e. it records the overhead
-  // associated with the pause and adjusts all the trackers to reflect
-  // the pause)
-  void record_stw_end(double end_sec);
-
-  // It queries all the trackers of their concurrent overhead and
-  // records it.
-  void collect_and_record_conc_overhead(double end_sec);
-
-  // It prints the contents of the GC overhead array
-  void print() const;
-
-
-  // Constructor. The same preconditions for group_num and group_names
-  // from initGCOverheadReporter apply here too.
-  GCOverheadReporter(size_t group_num,
-                     const char* group_names[],
-                     size_t length = DefaultReporterLength);
-
-public:
-
-  // statics
-
-  // It initialises the GCOverheadReporter and launches the concurrent
-  // overhead reporting thread. Both actions happen only if the
-  // GCOverheadReporting parameter is set. The length of the
-  // group_names array should be >= group_num and group_num should be
-  // <= MaxGCOverheadGroupNum. Entries group_namnes[0..group_num-1]
-  // should not be NULL.
-  static void initGCOverheadReporter(size_t group_num,
-                                     const char* group_names[]);
-
-  // The following three are provided for convenience and they are
-  // wrappers around record_stw_start(start_sec), record_stw_end(end_sec),
-  // and print(). Each of these checks whether GC overhead reporting
-  // is on (i.e. _reporter != NULL) and, if it is, calls the
-  // corresponding method. Saves from repeating this pattern again and
-  // again from the places where they need to be called.
-  static void recordSTWStart(double start_sec);
-  static void recordSTWEnd(double end_sec);
-  static void printGCOverhead();
-};
diff --git a/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp b/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp
index c18d6e877bd..a03b6a02a3e 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp
@@ -27,6 +27,7 @@
 
 GrowableArray<oop>*     MarkSweep::_marking_stack       = NULL;
 GrowableArray<Klass*>*  MarkSweep::_revisit_klass_stack = NULL;
+GrowableArray<DataLayout*>*  MarkSweep::_revisit_mdo_stack = NULL;
 
 GrowableArray<oop>*     MarkSweep::_preserved_oop_stack = NULL;
 GrowableArray<markOop>* MarkSweep::_preserved_mark_stack= NULL;
@@ -62,12 +63,37 @@ void MarkSweep::revisit_weak_klass_link(Klass* k) {
 void MarkSweep::follow_weak_klass_links() {
   // All klasses on the revisit stack are marked at this point.
   // Update and follow all subklass, sibling and implementor links.
+  if (PrintRevisitStats) {
+    gclog_or_tty->print_cr("#classes in system dictionary = %d", SystemDictionary::number_of_classes());
+    gclog_or_tty->print_cr("Revisit klass stack length = %d", _revisit_klass_stack->length());
+  }
   for (int i = 0; i < _revisit_klass_stack->length(); i++) {
     _revisit_klass_stack->at(i)->follow_weak_klass_links(&is_alive,&keep_alive);
   }
   follow_stack();
 }
 
+#if ( defined(COMPILER1) || defined(COMPILER2) )
+void MarkSweep::revisit_mdo(DataLayout* p) {
+  _revisit_mdo_stack->push(p);
+}
+
+void MarkSweep::follow_mdo_weak_refs() {
+  // All strongly reachable oops have been marked at this point;
+  // we can visit and clear any weak references from MDO's which
+  // we memoized during the strong marking phase.
+  assert(_marking_stack->is_empty(), "Marking stack should be empty");
+  if (PrintRevisitStats) {
+    gclog_or_tty->print_cr("#classes in system dictionary = %d", SystemDictionary::number_of_classes());
+    gclog_or_tty->print_cr("Revisit MDO stack length = %d", _revisit_mdo_stack->length());
+  }
+  for (int i = 0; i < _revisit_mdo_stack->length(); i++) {
+    _revisit_mdo_stack->at(i)->follow_weak_refs(&is_alive);
+  }
+  follow_stack();
+}
+#endif //  ( COMPILER1 || COMPILER2 )
+
 MarkSweep::FollowRootClosure  MarkSweep::follow_root_closure;
 
 void MarkSweep::FollowRootClosure::do_oop(oop* p)       { follow_root(p); }
diff --git a/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp b/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp
index b2e8d22d153..5e7a542d530 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp
@@ -23,6 +23,7 @@
  */
 
 class ReferenceProcessor;
+class DataLayout;
 
 // MarkSweep takes care of global mark-compact garbage collection for a
 // GenCollectedHeap using a four-phase pointer forwarding algorithm.  All
@@ -65,6 +66,8 @@ class MarkSweep : AllStatic {
     virtual void do_oop(oop* p);
     virtual void do_oop(narrowOop* p);
     virtual const bool do_nmethods() const { return true; }
+    virtual const bool should_remember_mdo() const { return true; }
+    virtual void remember_mdo(DataLayout* p) { MarkSweep::revisit_mdo(p); }
   };
 
   class FollowStackClosure: public VoidClosure {
@@ -103,6 +106,7 @@ class MarkSweep : AllStatic {
   friend class KeepAliveClosure;
   friend class VM_MarkSweep;
   friend void marksweep_init();
+  friend class DataLayout;
 
   //
   // Vars
@@ -112,6 +116,8 @@ class MarkSweep : AllStatic {
   static GrowableArray<oop>*             _marking_stack;
   // Stack for live klasses to revisit at end of marking phase
   static GrowableArray<Klass*>*          _revisit_klass_stack;
+  // Set (stack) of MDO's to revisit at end of marking phase
+  static GrowableArray<DataLayout*>*    _revisit_mdo_stack;
 
   // Space for storing/restoring mark word
   static GrowableArray<markOop>*         _preserved_mark_stack;
@@ -157,6 +163,10 @@ class MarkSweep : AllStatic {
   // Class unloading. Update subklass/sibling/implementor links at end of marking phase.
   static void follow_weak_klass_links();
 
+  // Class unloading. Clear weak refs in MDO's (ProfileData)
+  // at the end of the marking phase.
+  static void follow_mdo_weak_refs();
+
   // Debugging
   static void trace(const char* msg) PRODUCT_RETURN;
 
@@ -213,7 +223,10 @@ class MarkSweep : AllStatic {
 #endif
 
   // Call backs for class unloading
-  static void revisit_weak_klass_link(Klass* k);  // Update subklass/sibling/implementor links at end of marking.
+  // Update subklass/sibling/implementor links at end of marking.
+  static void revisit_weak_klass_link(Klass* k);
+  // For weak refs clearing in MDO's
+  static void revisit_mdo(DataLayout* p);
 };
 
 class PreservedMark VALUE_OBJ_CLASS_SPEC {
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
index 11da8de2ec8..9256cc51dec 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
@@ -239,6 +239,9 @@ class CollectedHeap : public CHeapObj {
     return p == NULL || is_in_closed_subset(p);
   }
 
+  // XXX is_permanent() and is_in_permanent() should be better named
+  // to distinguish one from the other.
+
   // Returns "TRUE" if "p" is allocated as "permanent" data.
   // If the heap does not use "permanent" data, returns the same
   // value is_in_reserved() would return.
@@ -247,13 +250,17 @@ class CollectedHeap : public CHeapObj {
   // space). If you need the more conservative answer use is_permanent().
   virtual bool is_in_permanent(const void *p) const = 0;
 
+  bool is_in_permanent_or_null(const void *p) const {
+    return p == NULL || is_in_permanent(p);
+  }
+
   // Returns "TRUE" if "p" is in the committed area of  "permanent" data.
   // If the heap does not use "permanent" data, returns the same
   // value is_in() would return.
   virtual bool is_permanent(const void *p) const = 0;
 
-  bool is_in_permanent_or_null(const void *p) const {
-    return p == NULL || is_in_permanent(p);
+  bool is_permanent_or_null(const void *p) const {
+    return p == NULL || is_permanent(p);
   }
 
   // Returns "TRUE" if "p" is a method oop in the
diff --git a/hotspot/src/share/vm/includeDB_compiler1 b/hotspot/src/share/vm/includeDB_compiler1
index 21b26cdc90e..72cedfe5a89 100644
--- a/hotspot/src/share/vm/includeDB_compiler1
+++ b/hotspot/src/share/vm/includeDB_compiler1
@@ -409,8 +409,6 @@ codeBlob.cpp                            c1_Runtime1.hpp
 
 compileBroker.cpp                       c1_Compiler.hpp
 
-frame.hpp                               c1_Defs.hpp
-
 frame_<arch>.cpp                        c1_Runtime1.hpp
 
 globals.cpp                             c1_globals.hpp
@@ -433,8 +431,6 @@ os_<os_family>.cpp                      c1_Runtime1.hpp
 
 os_<os_arch>.cpp                        c1_Runtime1.hpp
 
-registerMap.hpp                         c1_Defs.hpp
-
 safepoint.cpp                           c1_globals.hpp
 
 sharedRuntime.cpp                       c1_Runtime1.hpp
diff --git a/hotspot/src/share/vm/includeDB_core b/hotspot/src/share/vm/includeDB_core
index bd6109967fd..e96a5e9be1a 100644
--- a/hotspot/src/share/vm/includeDB_core
+++ b/hotspot/src/share/vm/includeDB_core
@@ -872,6 +872,7 @@ classFileParser.cpp                     signature.hpp
 classFileParser.cpp                     symbolOop.hpp
 classFileParser.cpp                     symbolTable.hpp
 classFileParser.cpp                     systemDictionary.hpp
+classFileParser.cpp                     threadService.hpp
 classFileParser.cpp                     timer.hpp
 classFileParser.cpp                     universe.inline.hpp
 classFileParser.cpp                     verificationType.hpp
@@ -924,6 +925,7 @@ classLoader.cpp                         os_<os_family>.inline.hpp
 classLoader.cpp                         symbolOop.hpp
 classLoader.cpp                         systemDictionary.hpp
 classLoader.cpp                         threadCritical.hpp
+classLoader.cpp                         threadService.hpp
 classLoader.cpp                         timer.hpp
 classLoader.cpp                         universe.inline.hpp
 classLoader.cpp                         vmSymbols.hpp
@@ -2682,6 +2684,7 @@ markOop.inline.hpp                      klassOop.hpp
 markOop.inline.hpp                      markOop.hpp
 
 markSweep.cpp                           compileBroker.hpp
+markSweep.cpp                           methodDataOop.hpp
 
 markSweep.hpp                           collectedHeap.hpp
 
@@ -4019,6 +4022,7 @@ systemDictionary.cpp                    placeholders.hpp
 systemDictionary.cpp                    resolutionErrors.hpp
 systemDictionary.cpp                    signature.hpp
 systemDictionary.cpp                    systemDictionary.hpp
+systemDictionary.cpp                    threadService.hpp
 systemDictionary.cpp                    typeArrayKlass.hpp
 systemDictionary.cpp                    vmSymbols.hpp
 
diff --git a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
index 260288b0992..78323ee2aee 100644
--- a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
+++ b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
@@ -122,11 +122,15 @@ class AbstractInterpreter: AllStatic {
   static int        size_top_interpreter_activation(methodOop method);
 
   // Deoptimization support
-  static address    continuation_for(methodOop method,
-                                     address bcp,
-                                     int callee_parameters,
-                                     bool is_top_frame,
-                                     bool& use_next_mdp);
+  // Compute the entry address for continuation after
+  static address deopt_continue_after_entry(methodOop method,
+                                            address bcp,
+                                            int callee_parameters,
+                                            bool is_top_frame);
+  // Compute the entry address for reexecution
+  static address deopt_reexecute_entry(methodOop method, address bcp);
+  // Deoptimization should reexecute this bytecode
+  static bool    bytecode_should_reexecute(Bytecodes::Code code);
 
   // share implementation of size_activation and layout_activation:
   static int        size_activation(methodOop method,
diff --git a/hotspot/src/share/vm/interpreter/interpreter.cpp b/hotspot/src/share/vm/interpreter/interpreter.cpp
index 16715cbc38b..b4f1007bc6c 100644
--- a/hotspot/src/share/vm/interpreter/interpreter.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreter.cpp
@@ -284,76 +284,19 @@ static BasicType constant_pool_type(methodOop method, int index) {
 //------------------------------------------------------------------------------------------------------------------------
 // Deoptimization support
 
-// If deoptimization happens, this method returns the point where to continue in
-// interpreter. For calls (invokexxxx, newxxxx) the continuation is at next
-// bci and the top of stack is in eax/edx/FPU tos.
-// For putfield/getfield, put/getstatic, the continuation is at the same
-// bci and the TOS is on stack.
-
-// Note: deopt_entry(type, 0) means reexecute bytecode
-//       deopt_entry(type, length) means continue at next bytecode
-
-address AbstractInterpreter::continuation_for(methodOop method, address bcp, int callee_parameters, bool is_top_frame, bool& use_next_mdp) {
+// If deoptimization happens, this function returns the point of next bytecode to continue execution
+address AbstractInterpreter::deopt_continue_after_entry(methodOop method, address bcp, int callee_parameters, bool is_top_frame) {
   assert(method->contains(bcp), "just checkin'");
   Bytecodes::Code code   = Bytecodes::java_code_at(bcp);
+  assert(!Interpreter::bytecode_should_reexecute(code), "should not reexecute");
   int             bci    = method->bci_from(bcp);
   int             length = -1; // initial value for debugging
   // compute continuation length
   length = Bytecodes::length_at(bcp);
   // compute result type
   BasicType type = T_ILLEGAL;
-  // when continuing after a compiler safepoint, re-execute the bytecode
-  // (an invoke is continued after the safepoint)
-  use_next_mdp = true;
+
   switch (code) {
-    case Bytecodes::_lookupswitch:
-    case Bytecodes::_tableswitch:
-    case Bytecodes::_fast_binaryswitch:
-    case Bytecodes::_fast_linearswitch:
-    // recompute condtional expression folded into _if<cond>
-    case Bytecodes::_lcmp      :
-    case Bytecodes::_fcmpl     :
-    case Bytecodes::_fcmpg     :
-    case Bytecodes::_dcmpl     :
-    case Bytecodes::_dcmpg     :
-    case Bytecodes::_ifnull    :
-    case Bytecodes::_ifnonnull :
-    case Bytecodes::_goto      :
-    case Bytecodes::_goto_w    :
-    case Bytecodes::_ifeq      :
-    case Bytecodes::_ifne      :
-    case Bytecodes::_iflt      :
-    case Bytecodes::_ifge      :
-    case Bytecodes::_ifgt      :
-    case Bytecodes::_ifle      :
-    case Bytecodes::_if_icmpeq :
-    case Bytecodes::_if_icmpne :
-    case Bytecodes::_if_icmplt :
-    case Bytecodes::_if_icmpge :
-    case Bytecodes::_if_icmpgt :
-    case Bytecodes::_if_icmple :
-    case Bytecodes::_if_acmpeq :
-    case Bytecodes::_if_acmpne :
-    // special cases
-    case Bytecodes::_getfield  :
-    case Bytecodes::_putfield  :
-    case Bytecodes::_getstatic :
-    case Bytecodes::_putstatic :
-    case Bytecodes::_aastore   :
-      // reexecute the operation and TOS value is on stack
-      assert(is_top_frame, "must be top frame");
-      use_next_mdp = false;
-      return Interpreter::deopt_entry(vtos, 0);
-      break;
-
-#ifdef COMPILER1
-    case Bytecodes::_athrow    :
-      assert(is_top_frame, "must be top frame");
-      use_next_mdp = false;
-      return Interpreter::rethrow_exception_entry();
-      break;
-#endif /* COMPILER1 */
-
     case Bytecodes::_invokevirtual  :
     case Bytecodes::_invokespecial  :
     case Bytecodes::_invokestatic   :
@@ -392,6 +335,70 @@ address AbstractInterpreter::continuation_for(methodOop method, address bcp, int
     : Interpreter::return_entry(as_TosState(type), length);
 }
 
+// If deoptimization happens, this function returns the point where the interpreter reexecutes
+// the bytecode.
+// Note: Bytecodes::_athrow is a special case in that it does not return
+//       Interpreter::deopt_entry(vtos, 0) like others
+address AbstractInterpreter::deopt_reexecute_entry(methodOop method, address bcp) {
+  assert(method->contains(bcp), "just checkin'");
+  Bytecodes::Code code   = Bytecodes::java_code_at(bcp);
+#ifdef COMPILER1
+  if(code == Bytecodes::_athrow ) {
+    return Interpreter::rethrow_exception_entry();
+  }
+#endif /* COMPILER1 */
+  return Interpreter::deopt_entry(vtos, 0);
+}
+
+// If deoptimization happens, the interpreter should reexecute these bytecodes.
+// This function mainly helps the compilers to set up the reexecute bit.
+bool AbstractInterpreter::bytecode_should_reexecute(Bytecodes::Code code) {
+  switch (code) {
+    case Bytecodes::_lookupswitch:
+    case Bytecodes::_tableswitch:
+    case Bytecodes::_fast_binaryswitch:
+    case Bytecodes::_fast_linearswitch:
+    // recompute condtional expression folded into _if<cond>
+    case Bytecodes::_lcmp      :
+    case Bytecodes::_fcmpl     :
+    case Bytecodes::_fcmpg     :
+    case Bytecodes::_dcmpl     :
+    case Bytecodes::_dcmpg     :
+    case Bytecodes::_ifnull    :
+    case Bytecodes::_ifnonnull :
+    case Bytecodes::_goto      :
+    case Bytecodes::_goto_w    :
+    case Bytecodes::_ifeq      :
+    case Bytecodes::_ifne      :
+    case Bytecodes::_iflt      :
+    case Bytecodes::_ifge      :
+    case Bytecodes::_ifgt      :
+    case Bytecodes::_ifle      :
+    case Bytecodes::_if_icmpeq :
+    case Bytecodes::_if_icmpne :
+    case Bytecodes::_if_icmplt :
+    case Bytecodes::_if_icmpge :
+    case Bytecodes::_if_icmpgt :
+    case Bytecodes::_if_icmple :
+    case Bytecodes::_if_acmpeq :
+    case Bytecodes::_if_acmpne :
+    // special cases
+    case Bytecodes::_getfield  :
+    case Bytecodes::_putfield  :
+    case Bytecodes::_getstatic :
+    case Bytecodes::_putstatic :
+    case Bytecodes::_aastore   :
+#ifdef COMPILER1
+    //special case of reexecution
+    case Bytecodes::_athrow    :
+#endif
+      return true;
+
+    default:
+      return false;
+  }
+}
+
 void AbstractInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   // Quick & dirty stack overflow checking: bang the stack & handle trap.
   // Note that we do the banging after the frame is setup, since the exception
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
index f50fd2bfcec..c8e19944de7 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -849,8 +849,25 @@ static void trace_osr_request(methodHandle method, nmethod* osr, int bci) {
 }
 #endif // !PRODUCT
 
+nmethod* InterpreterRuntime::frequency_counter_overflow(JavaThread* thread, address branch_bcp) {
+  nmethod* nm = frequency_counter_overflow_inner(thread, branch_bcp);
+  assert(branch_bcp != NULL || nm == NULL, "always returns null for non OSR requests");
+  if (branch_bcp != NULL && nm != NULL) {
+    // This was a successful request for an OSR nmethod.  Because
+    // frequency_counter_overflow_inner ends with a safepoint check,
+    // nm could have been unloaded so look it up again.  It's unsafe
+    // to examine nm directly since it might have been freed and used
+    // for something else.
+    frame fr = thread->last_frame();
+    methodOop method =  fr.interpreter_frame_method();
+    int bci = method->bci_from(fr.interpreter_frame_bcp());
+    nm = method->lookup_osr_nmethod_for(bci);
+  }
+  return nm;
+}
+
 IRT_ENTRY(nmethod*,
-          InterpreterRuntime::frequency_counter_overflow(JavaThread* thread, address branch_bcp))
+          InterpreterRuntime::frequency_counter_overflow_inner(JavaThread* thread, address branch_bcp))
   // use UnlockFlagSaver to clear and restore the _do_not_unlock_if_synchronized
   // flag, in case this method triggers classloading which will call into Java.
   UnlockFlagSaver fs(thread);
@@ -923,7 +940,6 @@ IRT_ENTRY(nmethod*,
         }
         BiasedLocking::revoke(objects_to_revoke);
       }
-
       return osr_nm;
     }
   }
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
index bfc75699c0a..76b9e9c2191 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
@@ -49,6 +49,9 @@ class InterpreterRuntime: AllStatic {
   static ConstantPoolCacheEntry* cache_entry(JavaThread *thread)            { return cache_entry_at(thread, Bytes::get_native_u2(bcp(thread) + 1)); }
   static void      note_trap(JavaThread *thread, int reason, TRAPS);
 
+  // Inner work method for Interpreter's frequency counter overflow
+  static nmethod* frequency_counter_overflow_inner(JavaThread* thread, address branch_bcp);
+
  public:
   // Constants
   static void    ldc           (JavaThread* thread, bool wide);
diff --git a/hotspot/src/share/vm/interpreter/templateInterpreter.cpp b/hotspot/src/share/vm/interpreter/templateInterpreter.cpp
index 4375617328d..9f12f44e3a5 100644
--- a/hotspot/src/share/vm/interpreter/templateInterpreter.cpp
+++ b/hotspot/src/share/vm/interpreter/templateInterpreter.cpp
@@ -605,28 +605,41 @@ void TemplateInterpreter::ignore_safepoints() {
   }
 }
 
-// If deoptimization happens, this method returns the point where to continue in
-// interpreter. For calls (invokexxxx, newxxxx) the continuation is at next
-// bci and the top of stack is in eax/edx/FPU tos.
-// For putfield/getfield, put/getstatic, the continuation is at the same
-// bci and the TOS is on stack.
+//------------------------------------------------------------------------------------------------------------------------
+// Deoptimization support
 
-// Note: deopt_entry(type, 0) means reexecute bytecode
-//       deopt_entry(type, length) means continue at next bytecode
+// If deoptimization happens, this function returns the point of next bytecode to continue execution
+address TemplateInterpreter::deopt_continue_after_entry(methodOop method, address bcp, int callee_parameters, bool is_top_frame) {
+  return AbstractInterpreter::deopt_continue_after_entry(method, bcp, callee_parameters, is_top_frame);
+}
 
-address TemplateInterpreter::continuation_for(methodOop method, address bcp, int callee_parameters, bool is_top_frame, bool& use_next_mdp) {
+// If deoptimization happens, this function returns the point where the interpreter reexecutes
+// the bytecode.
+// Note: Bytecodes::_athrow (C1 only) and Bytecodes::_return are the special cases
+//       that do not return "Interpreter::deopt_entry(vtos, 0)"
+address TemplateInterpreter::deopt_reexecute_entry(methodOop method, address bcp) {
   assert(method->contains(bcp), "just checkin'");
   Bytecodes::Code code   = Bytecodes::java_code_at(bcp);
   if (code == Bytecodes::_return) {
-      // This is used for deopt during registration of finalizers
-      // during Object.<init>.  We simply need to resume execution at
-      // the standard return vtos bytecode to pop the frame normally.
-      // reexecuting the real bytecode would cause double registration
-      // of the finalizable object.
-      assert(is_top_frame, "must be on top");
-      return _normal_table.entry(Bytecodes::_return).entry(vtos);
+    // This is used for deopt during registration of finalizers
+    // during Object.<init>.  We simply need to resume execution at
+    // the standard return vtos bytecode to pop the frame normally.
+    // reexecuting the real bytecode would cause double registration
+    // of the finalizable object.
+    return _normal_table.entry(Bytecodes::_return).entry(vtos);
   } else {
-    return AbstractInterpreter::continuation_for(method, bcp, callee_parameters, is_top_frame, use_next_mdp);
+    return AbstractInterpreter::deopt_reexecute_entry(method, bcp);
+  }
+}
+
+// If deoptimization happens, the interpreter should reexecute this bytecode.
+// This function mainly helps the compilers to set up the reexecute bit.
+bool TemplateInterpreter::bytecode_should_reexecute(Bytecodes::Code code) {
+  if (code == Bytecodes::_return) {
+    //Yes, we consider Bytecodes::_return as a special case of reexecution
+    return true;
+  } else {
+    return AbstractInterpreter::bytecode_should_reexecute(code);
   }
 }
 
diff --git a/hotspot/src/share/vm/interpreter/templateInterpreter.hpp b/hotspot/src/share/vm/interpreter/templateInterpreter.hpp
index 2c78e31fc72..7de665b882f 100644
--- a/hotspot/src/share/vm/interpreter/templateInterpreter.hpp
+++ b/hotspot/src/share/vm/interpreter/templateInterpreter.hpp
@@ -171,11 +171,15 @@ class TemplateInterpreter: public AbstractInterpreter {
   static void       ignore_safepoints();                        // ignores safepoints
 
   // Deoptimization support
-  static address    continuation_for(methodOop method,
-                                     address bcp,
-                                     int callee_parameters,
-                                     bool is_top_frame,
-                                     bool& use_next_mdp);
+  // Compute the entry address for continuation after
+  static address deopt_continue_after_entry(methodOop method,
+                                            address bcp,
+                                            int callee_parameters,
+                                            bool is_top_frame);
+  // Deoptimization should reexecute this bytecode
+  static bool    bytecode_should_reexecute(Bytecodes::Code code);
+  // Compute the address for reexecution
+  static address deopt_reexecute_entry(methodOop method, address bcp);
 
 #include "incls/_templateInterpreter_pd.hpp.incl"
 
diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp
index 59d69e0c581..c036a355514 100644
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.cpp
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.cpp
@@ -253,8 +253,16 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
     }
 #endif
     // The guard page is always committed and should not be committed over.
-    HeapWord* const new_end_for_commit = MIN2(new_end_aligned,
-                                              _guard_region.start());
+    // "guarded" is used for assertion checking below and recalls the fact
+    // that the would-be end of the new committed region would have
+    // penetrated the guard page.
+    HeapWord* new_end_for_commit = new_end_aligned;
+
+    DEBUG_ONLY(bool guarded = false;)
+    if (new_end_for_commit > _guard_region.start()) {
+      new_end_for_commit = _guard_region.start();
+      DEBUG_ONLY(guarded = true;)
+    }
 
     if (new_end_for_commit > cur_committed.end()) {
       // Must commit new pages.
@@ -302,7 +310,7 @@ void CardTableModRefBS::resize_covered_region(MemRegion new_region) {
     // not the aligned up expanded region.
     // jbyte* const end = byte_after(new_region.last());
     jbyte* const end = (jbyte*) new_end_for_commit;
-    assert((end >= byte_after(new_region.last())) || collided,
+    assert((end >= byte_after(new_region.last())) || collided || guarded,
       "Expect to be beyond new region unless impacting another region");
     // do nothing if we resized downward.
 #ifdef ASSERT
@@ -652,6 +660,29 @@ void CardTableModRefBS::verify_clean_region(MemRegion mr) {
   GuaranteeNotModClosure blk(this);
   non_clean_card_iterate_work(mr, &blk, false);
 }
+
+// To verify a MemRegion is entirely dirty this closure is passed to
+// dirty_card_iterate. If the region is dirty do_MemRegion will be
+// invoked only once with a MemRegion equal to the one being
+// verified.
+class GuaranteeDirtyClosure: public MemRegionClosure {
+  CardTableModRefBS* _ct;
+  MemRegion _mr;
+  bool _result;
+public:
+  GuaranteeDirtyClosure(CardTableModRefBS* ct, MemRegion mr)
+    : _ct(ct), _mr(mr), _result(false) {}
+  void do_MemRegion(MemRegion mr) {
+    _result = _mr.equals(mr);
+  }
+  bool result() const { return _result; }
+};
+
+void CardTableModRefBS::verify_dirty_region(MemRegion mr) {
+  GuaranteeDirtyClosure blk(this, mr);
+  dirty_card_iterate(mr, &blk);
+  guarantee(blk.result(), "Non-dirty cards in region that should be dirty");
+}
 #endif
 
 bool CardTableModRefBSForCTRS::card_will_be_scanned(jbyte cv) {
diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
index d31dc6eb8a4..bffdd50926b 100644
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
@@ -456,6 +456,7 @@ public:
   void verify_guard();
 
   void verify_clean_region(MemRegion mr) PRODUCT_RETURN;
+  void verify_dirty_region(MemRegion mr) PRODUCT_RETURN;
 
   static size_t par_chunk_heapword_alignment() {
     return CardsPerStrideChunk * card_size_in_words;
diff --git a/hotspot/src/share/vm/memory/genCollectedHeap.cpp b/hotspot/src/share/vm/memory/genCollectedHeap.cpp
index e25cc513158..47a0602ec4f 100644
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp
@@ -482,6 +482,10 @@ void GenCollectedHeap::do_collection(bool  full,
     for (int i = starting_level; i <= max_level; i++) {
       if (_gens[i]->should_collect(full, size, is_tlab)) {
         if (i == n_gens() - 1) {  // a major collection is to happen
+          if (!complete) {
+            // The full_collections increment was missed above.
+            increment_total_full_collections();
+          }
           pre_full_gc_dump();    // do any pre full gc dumps
         }
         // Timer for individual generations. Last argument is false: no CR
diff --git a/hotspot/src/share/vm/memory/genMarkSweep.cpp b/hotspot/src/share/vm/memory/genMarkSweep.cpp
index ba42d5d2143..bfc41fb8881 100644
--- a/hotspot/src/share/vm/memory/genMarkSweep.cpp
+++ b/hotspot/src/share/vm/memory/genMarkSweep.cpp
@@ -162,6 +162,9 @@ void GenMarkSweep::allocate_stacks() {
 
   int size = SystemDictionary::number_of_classes() * 2;
   _revisit_klass_stack = new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
+  // (#klass/k)^2 for k ~ 10 appears to be a better fit, but this will have to do for
+  // now until we have had a chance to investigate a more optimal setting.
+  _revisit_mdo_stack   = new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(2*size, true);
 
 #ifdef VALIDATE_MARK_SWEEP
   if (ValidateMarkSweep) {
@@ -206,6 +209,7 @@ void GenMarkSweep::deallocate_stacks() {
 
   delete _marking_stack;
   delete _revisit_klass_stack;
+  delete _revisit_mdo_stack;
 
 #ifdef VALIDATE_MARK_SWEEP
   if (ValidateMarkSweep) {
@@ -262,6 +266,10 @@ void GenMarkSweep::mark_sweep_phase1(int level,
   follow_weak_klass_links();
   assert(_marking_stack->is_empty(), "just drained");
 
+  // Visit memoized MDO's and clear any unmarked weak refs
+  follow_mdo_weak_refs();
+  assert(_marking_stack->is_empty(), "just drained");
+
   // Visit symbol and interned string tables and delete unmarked oops
   SymbolTable::unlink(&is_alive);
   StringTable::unlink(&is_alive);
diff --git a/hotspot/src/share/vm/memory/iterator.cpp b/hotspot/src/share/vm/memory/iterator.cpp
index d52eeb90481..8045703b03d 100644
--- a/hotspot/src/share/vm/memory/iterator.cpp
+++ b/hotspot/src/share/vm/memory/iterator.cpp
@@ -25,6 +25,10 @@
 # include "incls/_precompiled.incl"
 # include "incls/_iterator.cpp.incl"
 
+#ifdef ASSERT
+bool OopClosure::_must_remember_klasses = false;
+#endif
+
 void ObjectToOopClosure::do_object(oop obj) {
   obj->oop_iterate(_cl);
 }
@@ -32,3 +36,13 @@ void ObjectToOopClosure::do_object(oop obj) {
 void VoidClosure::do_void() {
   ShouldNotCallThis();
 }
+
+#ifdef ASSERT
+bool OopClosure::must_remember_klasses() {
+  return _must_remember_klasses;
+}
+void OopClosure::set_must_remember_klasses(bool v) {
+  _must_remember_klasses = v;
+}
+#endif
+
diff --git a/hotspot/src/share/vm/memory/iterator.hpp b/hotspot/src/share/vm/memory/iterator.hpp
index 07915f11ffd..f028174e5d3 100644
--- a/hotspot/src/share/vm/memory/iterator.hpp
+++ b/hotspot/src/share/vm/memory/iterator.hpp
@@ -25,6 +25,7 @@
 // The following classes are C++ `closures` for iterating over objects, roots and spaces
 
 class ReferenceProcessor;
+class DataLayout;
 
 // Closure provides abortability.
 
@@ -54,9 +55,20 @@ class OopClosure : public Closure {
 
   // In support of post-processing of weak links of KlassKlass objects;
   // see KlassKlass::oop_oop_iterate().
-  virtual const bool should_remember_klasses() const { return false;    }
+
+  virtual const bool should_remember_klasses() const {
+    assert(!must_remember_klasses(), "Should have overriden this method.");
+    return false;
+  }
+
   virtual void remember_klass(Klass* k) { /* do nothing */ }
 
+  // In support of post-processing of weak references in
+  // ProfileData (MethodDataOop) objects; see, for example,
+  // VirtualCallData::oop_iterate().
+  virtual const bool should_remember_mdo() const { return false; }
+  virtual void remember_mdo(DataLayout* v) { /* do nothing */ }
+
   // If "true", invoke on nmethods (when scanning compiled frames).
   virtual const bool do_nmethods() const { return false; }
 
@@ -74,6 +86,12 @@ class OopClosure : public Closure {
   // location without an intervening "major reset" (like the end of a GC).
   virtual bool idempotent() { return false; }
   virtual bool apply_to_weak_ref_discovered_field() { return false; }
+
+#ifdef ASSERT
+  static bool _must_remember_klasses;
+  static bool must_remember_klasses();
+  static void set_must_remember_klasses(bool v);
+#endif
 };
 
 // ObjectClosure is used for iterating through an object space
@@ -219,3 +237,38 @@ public:
   // correct length.
   virtual void do_tag(int tag) = 0;
 };
+
+#ifdef ASSERT
+// This class is used to flag phases of a collection that
+// can unload classes and which should override the
+// should_remember_klasses() and remember_klass() of OopClosure.
+// The _must_remember_klasses is set in the contructor and restored
+// in the destructor.  _must_remember_klasses is checked in assertions
+// in the OopClosure implementations of should_remember_klasses() and
+// remember_klass() and the expectation is that the OopClosure
+// implementation should not be in use if _must_remember_klasses is set.
+// Instances of RememberKlassesChecker can be place in
+// marking phases of collections which can do class unloading.
+// RememberKlassesChecker can be passed "false" to turn off checking.
+// It is used by CMS when CMS yields to a different collector.
+class RememberKlassesChecker: StackObj {
+ bool _state;
+ bool _skip;
+ public:
+  RememberKlassesChecker(bool checking_on) : _state(false), _skip(false) {
+    _skip = !(ClassUnloading && !UseConcMarkSweepGC ||
+              CMSClassUnloadingEnabled && UseConcMarkSweepGC);
+    if (_skip) {
+      return;
+    }
+    _state = OopClosure::must_remember_klasses();
+    OopClosure::set_must_remember_klasses(checking_on);
+  }
+  ~RememberKlassesChecker() {
+    if (_skip) {
+      return;
+    }
+    OopClosure::set_must_remember_klasses(_state);
+  }
+};
+#endif  // ASSERT
diff --git a/hotspot/src/share/vm/memory/oopFactory.cpp b/hotspot/src/share/vm/memory/oopFactory.cpp
index 99763784255..b10342341b3 100644
--- a/hotspot/src/share/vm/memory/oopFactory.cpp
+++ b/hotspot/src/share/vm/memory/oopFactory.cpp
@@ -98,10 +98,12 @@ constantPoolCacheOop oopFactory::new_constantPoolCache(int length,
 }
 
 
-klassOop oopFactory::new_instanceKlass(int vtable_len, int itable_len, int static_field_size,
-                                       int nonstatic_oop_map_size, ReferenceType rt, TRAPS) {
+klassOop oopFactory::new_instanceKlass(int vtable_len, int itable_len,
+                                       int static_field_size,
+                                       unsigned int nonstatic_oop_map_count,
+                                       ReferenceType rt, TRAPS) {
   instanceKlassKlass* ikk = instanceKlassKlass::cast(Universe::instanceKlassKlassObj());
-  return ikk->allocate_instance_klass(vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, CHECK_NULL);
+  return ikk->allocate_instance_klass(vtable_len, itable_len, static_field_size, nonstatic_oop_map_count, rt, CHECK_NULL);
 }
 
 
diff --git a/hotspot/src/share/vm/memory/oopFactory.hpp b/hotspot/src/share/vm/memory/oopFactory.hpp
index add1aed4df0..4be6d898fdd 100644
--- a/hotspot/src/share/vm/memory/oopFactory.hpp
+++ b/hotspot/src/share/vm/memory/oopFactory.hpp
@@ -89,8 +89,10 @@ class oopFactory: AllStatic {
                                                     TRAPS);
 
   // Instance classes
-  static klassOop        new_instanceKlass(int vtable_len, int itable_len, int static_field_size,
-                                           int nonstatic_oop_map_size, ReferenceType rt, TRAPS);
+  static klassOop        new_instanceKlass(int vtable_len, int itable_len,
+                                           int static_field_size,
+                                           unsigned int nonstatic_oop_map_count,
+                                           ReferenceType rt, TRAPS);
 
   // Methods
 private:
diff --git a/hotspot/src/share/vm/memory/referenceProcessor.cpp b/hotspot/src/share/vm/memory/referenceProcessor.cpp
index 616ca5d690a..134181c45db 100644
--- a/hotspot/src/share/vm/memory/referenceProcessor.cpp
+++ b/hotspot/src/share/vm/memory/referenceProcessor.cpp
@@ -1231,6 +1231,11 @@ void ReferenceProcessor::preclean_discovered_references(
 
   NOT_PRODUCT(verify_ok_to_handle_reflists());
 
+#ifdef ASSERT
+  bool must_remember_klasses = ClassUnloading && !UseConcMarkSweepGC ||
+                               CMSClassUnloadingEnabled && UseConcMarkSweepGC;
+  RememberKlassesChecker mx(must_remember_klasses);
+#endif
   // Soft references
   {
     TraceTime tt("Preclean SoftReferences", PrintGCDetails && PrintReferenceGC,
diff --git a/hotspot/src/share/vm/memory/serialize.cpp b/hotspot/src/share/vm/memory/serialize.cpp
index d09055c2507..08d76497978 100644
--- a/hotspot/src/share/vm/memory/serialize.cpp
+++ b/hotspot/src/share/vm/memory/serialize.cpp
@@ -51,7 +51,7 @@ void CompactingPermGenGen::serialize_oops(SerializeOopClosure* soc) {
   soc->do_tag(arrayOopDesc::base_offset_in_bytes(T_BYTE));
   soc->do_tag(sizeof(constantPoolOopDesc));
   soc->do_tag(sizeof(constantPoolCacheOopDesc));
-  soc->do_tag(objArrayOopDesc::base_offset_in_bytes(T_BYTE));
+  soc->do_tag(objArrayOopDesc::base_offset_in_bytes());
   soc->do_tag(typeArrayOopDesc::base_offset_in_bytes(T_BYTE));
   soc->do_tag(sizeof(symbolOopDesc));
   soc->do_tag(sizeof(klassOopDesc));
diff --git a/hotspot/src/share/vm/memory/universe.cpp b/hotspot/src/share/vm/memory/universe.cpp
index adcc3eca787..5043f9e2599 100644
--- a/hotspot/src/share/vm/memory/universe.cpp
+++ b/hotspot/src/share/vm/memory/universe.cpp
@@ -749,7 +749,10 @@ char* Universe::preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode) {
     assert(mode == UnscaledNarrowOop  ||
            mode == ZeroBasedNarrowOop ||
            mode == HeapBasedNarrowOop, "mode is invalid");
-
+    // Return specified base for the first request.
+    if (!FLAG_IS_DEFAULT(HeapBaseMinAddress) && (mode == UnscaledNarrowOop)) {
+      return (char*)HeapBaseMinAddress;
+    }
     const size_t total_size = heap_size + HeapBaseMinAddress;
     if (total_size <= OopEncodingHeapMax && (mode != HeapBasedNarrowOop)) {
       if (total_size <= NarrowOopHeapMax && (mode == UnscaledNarrowOop) &&
@@ -857,7 +860,7 @@ jint Universe::initialize_heap() {
         // Can't reserve heap below 4Gb.
         Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
       } else {
-        assert(Universe::narrow_oop_shift() == 0, "use unscaled narrow oop");
+        Universe::set_narrow_oop_shift(0);
         if (PrintCompressedOopsMode) {
           tty->print(", 32-bits Oops");
         }
diff --git a/hotspot/src/share/vm/oops/arrayKlass.cpp b/hotspot/src/share/vm/oops/arrayKlass.cpp
index 8dde4799a89..0584e8e7ec5 100644
--- a/hotspot/src/share/vm/oops/arrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/arrayKlass.cpp
@@ -140,6 +140,7 @@ objArrayOop arrayKlass::allocate_arrayArray(int n, int length, TRAPS) {
     THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
   }
   if (length > arrayOopDesc::max_array_length(T_ARRAY)) {
+    report_java_out_of_memory("Requested array size exceeds VM limit");
     THROW_OOP_0(Universe::out_of_memory_error_array_size());
   }
   int size = objArrayOopDesc::object_size(length);
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index b15926b810c..79c09cbe3cd 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -158,9 +158,6 @@ bool instanceKlass::link_class_impl(
   // timer handles recursion
   assert(THREAD->is_Java_thread(), "non-JavaThread in link_class_impl");
   JavaThread* jt = (JavaThread*)THREAD;
-  PerfTraceTimedEvent vmtimer(ClassLoader::perf_class_link_time(),
-                        ClassLoader::perf_classes_linked(),
-                        jt->get_thread_stat()->class_link_recursion_count_addr());
 
   // link super class before linking this class
   instanceKlassHandle super(THREAD, this_oop->super());
@@ -194,6 +191,15 @@ bool instanceKlass::link_class_impl(
     return true;
   }
 
+  // trace only the link time for this klass that includes
+  // the verification time
+  PerfClassTraceTime vmtimer(ClassLoader::perf_class_link_time(),
+                             ClassLoader::perf_class_link_selftime(),
+                             ClassLoader::perf_classes_linked(),
+                             jt->get_thread_stat()->perf_recursion_counts_addr(),
+                             jt->get_thread_stat()->perf_timers_addr(),
+                             PerfClassTraceTime::CLASS_LINK);
+
   // verification & rewriting
   {
     ObjectLocker ol(this_oop, THREAD);
@@ -203,12 +209,14 @@ bool instanceKlass::link_class_impl(
     if (!this_oop->is_linked()) {
       if (!this_oop->is_rewritten()) {
         {
-          assert(THREAD->is_Java_thread(), "non-JavaThread in link_class_impl");
-          JavaThread* jt = (JavaThread*)THREAD;
           // Timer includes any side effects of class verification (resolution,
           // etc), but not recursive entry into verify_code().
-          PerfTraceTime timer(ClassLoader::perf_class_verify_time(),
-                            jt->get_thread_stat()->class_verify_recursion_count_addr());
+          PerfClassTraceTime timer(ClassLoader::perf_class_verify_time(),
+                                   ClassLoader::perf_class_verify_selftime(),
+                                   ClassLoader::perf_classes_verified(),
+                                   jt->get_thread_stat()->perf_recursion_counts_addr(),
+                                   jt->get_thread_stat()->perf_timers_addr(),
+                                   PerfClassTraceTime::CLASS_VERIFY);
           bool verify_ok = verify_code(this_oop, throw_verifyerror, THREAD);
           if (!verify_ok) {
             return false;
@@ -350,9 +358,12 @@ void instanceKlass::initialize_impl(instanceKlassHandle this_oop, TRAPS) {
     JavaThread* jt = (JavaThread*)THREAD;
     // Timer includes any side effects of class initialization (resolution,
     // etc), but not recursive entry into call_class_initializer().
-    PerfTraceTimedEvent timer(ClassLoader::perf_class_init_time(),
-                              ClassLoader::perf_classes_inited(),
-                              jt->get_thread_stat()->class_init_recursion_count_addr());
+    PerfClassTraceTime timer(ClassLoader::perf_class_init_time(),
+                             ClassLoader::perf_class_init_selftime(),
+                             ClassLoader::perf_classes_inited(),
+                             jt->get_thread_stat()->perf_recursion_counts_addr(),
+                             jt->get_thread_stat()->perf_timers_addr(),
+                             PerfClassTraceTime::CLASS_CLINIT);
     this_oop->call_class_initializer(THREAD);
   }
 
@@ -497,6 +508,7 @@ bool instanceKlass::implements_interface(klassOop k) const {
 objArrayOop instanceKlass::allocate_objArray(int n, int length, TRAPS) {
   if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
   if (length > arrayOopDesc::max_array_length(T_OBJECT)) {
+    report_java_out_of_memory("Requested array size exceeds VM limit");
     THROW_OOP_0(Universe::out_of_memory_error_array_size());
   }
   int size = objArrayOopDesc::object_size(length);
@@ -1384,18 +1396,18 @@ template <class T> void assert_nothing(T *p) {}
   /* Compute oopmap block range. The common case                         \
      is nonstatic_oop_map_size == 1. */                                  \
   OopMapBlock* map           = start_of_nonstatic_oop_maps();            \
-  OopMapBlock* const end_map = map + nonstatic_oop_map_size();           \
+  OopMapBlock* const end_map = map + nonstatic_oop_map_count();          \
   if (UseCompressedOops) {                                               \
     while (map < end_map) {                                              \
       InstanceKlass_SPECIALIZED_OOP_ITERATE(narrowOop,                   \
-        obj->obj_field_addr<narrowOop>(map->offset()), map->length(),    \
+        obj->obj_field_addr<narrowOop>(map->offset()), map->count(),     \
         do_oop, assert_fn)                                               \
       ++map;                                                             \
     }                                                                    \
   } else {                                                               \
     while (map < end_map) {                                              \
       InstanceKlass_SPECIALIZED_OOP_ITERATE(oop,                         \
-        obj->obj_field_addr<oop>(map->offset()), map->length(),          \
+        obj->obj_field_addr<oop>(map->offset()), map->count(),           \
         do_oop, assert_fn)                                               \
       ++map;                                                             \
     }                                                                    \
@@ -1405,19 +1417,19 @@ template <class T> void assert_nothing(T *p) {}
 #define InstanceKlass_OOP_MAP_REVERSE_ITERATE(obj, do_oop, assert_fn)    \
 {                                                                        \
   OopMapBlock* const start_map = start_of_nonstatic_oop_maps();          \
-  OopMapBlock* map             = start_map + nonstatic_oop_map_size();   \
+  OopMapBlock* map             = start_map + nonstatic_oop_map_count();  \
   if (UseCompressedOops) {                                               \
     while (start_map < map) {                                            \
       --map;                                                             \
       InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE(narrowOop,           \
-        obj->obj_field_addr<narrowOop>(map->offset()), map->length(),    \
+        obj->obj_field_addr<narrowOop>(map->offset()), map->count(),     \
         do_oop, assert_fn)                                               \
     }                                                                    \
   } else {                                                               \
     while (start_map < map) {                                            \
       --map;                                                             \
       InstanceKlass_SPECIALIZED_OOP_REVERSE_ITERATE(oop,                 \
-        obj->obj_field_addr<oop>(map->offset()), map->length(),          \
+        obj->obj_field_addr<oop>(map->offset()), map->count(),           \
         do_oop, assert_fn)                                               \
     }                                                                    \
   }                                                                      \
@@ -1431,11 +1443,11 @@ template <class T> void assert_nothing(T *p) {}
      usually non-existent extra overhead of examining                    \
      all the maps. */                                                    \
   OopMapBlock* map           = start_of_nonstatic_oop_maps();            \
-  OopMapBlock* const end_map = map + nonstatic_oop_map_size();           \
+  OopMapBlock* const end_map = map + nonstatic_oop_map_count();          \
   if (UseCompressedOops) {                                               \
     while (map < end_map) {                                              \
       InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(narrowOop,           \
-        obj->obj_field_addr<narrowOop>(map->offset()), map->length(),    \
+        obj->obj_field_addr<narrowOop>(map->offset()), map->count(),     \
         low, high,                                                       \
         do_oop, assert_fn)                                               \
       ++map;                                                             \
@@ -1443,7 +1455,7 @@ template <class T> void assert_nothing(T *p) {}
   } else {                                                               \
     while (map < end_map) {                                              \
       InstanceKlass_SPECIALIZED_BOUNDED_OOP_ITERATE(oop,                 \
-        obj->obj_field_addr<oop>(map->offset()), map->length(),          \
+        obj->obj_field_addr<oop>(map->offset()), map->count(),           \
         low, high,                                                       \
         do_oop, assert_fn)                                               \
       ++map;                                                             \
@@ -2204,14 +2216,15 @@ void instanceKlass::verify_class_klass_nonstatic_oop_maps(klassOop k) {
     first_time = false;
     const int extra = java_lang_Class::number_of_fake_oop_fields;
     guarantee(ik->nonstatic_field_size() == extra, "just checking");
-    guarantee(ik->nonstatic_oop_map_size() == 1, "just checking");
+    guarantee(ik->nonstatic_oop_map_count() == 1, "just checking");
     guarantee(ik->size_helper() == align_object_size(instanceOopDesc::header_size() + extra), "just checking");
 
     // Check that the map is (2,extra)
     int offset = java_lang_Class::klass_offset;
 
     OopMapBlock* map = ik->start_of_nonstatic_oop_maps();
-    guarantee(map->offset() == offset && map->length() == extra, "just checking");
+    guarantee(map->offset() == offset && map->count() == (unsigned int) extra,
+              "sanity");
   }
 }
 
diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/hotspot/src/share/vm/oops/instanceKlass.hpp
index c2139873116..ffa42d7b2f1 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp
@@ -71,7 +71,6 @@
 
 // forward declaration for class -- see below for definition
 class SuperTypeClosure;
-class OopMapBlock;
 class JNIid;
 class jniIdMapBase;
 class BreakpointInfo;
@@ -99,6 +98,29 @@ class FieldPrinter: public FieldClosure {
 };
 #endif  // !PRODUCT
 
+// ValueObjs embedded in klass. Describes where oops are located in instances of
+// this klass.
+class OopMapBlock VALUE_OBJ_CLASS_SPEC {
+ public:
+  // Byte offset of the first oop mapped by this block.
+  int offset() const          { return _offset; }
+  void set_offset(int offset) { _offset = offset; }
+
+  // Number of oops in this block.
+  uint count() const         { return _count; }
+  void set_count(uint count) { _count = count; }
+
+  // sizeof(OopMapBlock) in HeapWords.
+  static const int size_in_words() {
+    return align_size_up(int(sizeof(OopMapBlock)), HeapWordSize) >>
+      LogHeapWordSize;
+  }
+
+ private:
+  int  _offset;
+  uint _count;
+};
+
 class instanceKlass: public Klass {
   friend class VMStructs;
  public:
@@ -191,7 +213,7 @@ class instanceKlass: public Klass {
   int             _nonstatic_field_size;
   int             _static_field_size;    // number words used by static fields (oop and non-oop) in this klass
   int             _static_oop_field_size;// number of static oop fields in this klass
-  int             _nonstatic_oop_map_size;// number of nonstatic oop-map blocks allocated at end of this klass
+  int             _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks
   bool            _is_marked_dependent;  // used for marking during flushing and deoptimization
   bool            _rewritten;            // methods rewritten.
   bool            _has_nonstatic_fields; // for sizing with UseCompressedOops
@@ -424,8 +446,16 @@ class instanceKlass: public Klass {
   void set_source_debug_extension(symbolOop n){ oop_store_without_check((oop*) &_source_debug_extension, (oop) n); }
 
   // nonstatic oop-map blocks
-  int nonstatic_oop_map_size() const        { return _nonstatic_oop_map_size; }
-  void set_nonstatic_oop_map_size(int size) { _nonstatic_oop_map_size = size; }
+  static int nonstatic_oop_map_size(unsigned int oop_map_count) {
+    return oop_map_count * OopMapBlock::size_in_words();
+  }
+  unsigned int nonstatic_oop_map_count() const {
+    return _nonstatic_oop_map_size / OopMapBlock::size_in_words();
+  }
+  int nonstatic_oop_map_size() const { return _nonstatic_oop_map_size; }
+  void set_nonstatic_oop_map_size(int words) {
+    _nonstatic_oop_map_size = words;
+  }
 
   // RedefineClasses() support for previous versions:
   void add_previous_version(instanceKlassHandle ikh, BitMap *emcp_methods,
@@ -839,21 +869,6 @@ inline u2 instanceKlass::next_method_idnum() {
 }
 
 
-// ValueObjs embedded in klass. Describes where oops are located in instances of this klass.
-
-class OopMapBlock VALUE_OBJ_CLASS_SPEC {
- private:
-  jushort _offset;    // Offset of first oop in oop-map block
-  jushort _length;    // Length of oop-map block
- public:
-  // Accessors
-  jushort offset() const          { return _offset; }
-  void set_offset(jushort offset) { _offset = offset; }
-
-  jushort length() const          { return _length; }
-  void set_length(jushort length) { _length = length; }
-};
-
 /* JNIid class for jfieldIDs only */
 class JNIid: public CHeapObj {
   friend class VMStructs;
diff --git a/hotspot/src/share/vm/oops/instanceKlassKlass.cpp b/hotspot/src/share/vm/oops/instanceKlassKlass.cpp
index aae1b1bf127..18a6d7addf8 100644
--- a/hotspot/src/share/vm/oops/instanceKlassKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlassKlass.cpp
@@ -402,9 +402,14 @@ int instanceKlassKlass::oop_update_pointers(ParCompactionManager* cm, oop obj,
 }
 #endif // SERIALGC
 
-klassOop instanceKlassKlass::allocate_instance_klass(int vtable_len, int itable_len, int static_field_size,
-                                                     int nonstatic_oop_map_size, ReferenceType rt, TRAPS) {
+klassOop
+instanceKlassKlass::allocate_instance_klass(int vtable_len, int itable_len,
+                                            int static_field_size,
+                                            unsigned nonstatic_oop_map_count,
+                                            ReferenceType rt, TRAPS) {
 
+  const int nonstatic_oop_map_size =
+    instanceKlass::nonstatic_oop_map_size(nonstatic_oop_map_count);
   int size = instanceKlass::object_size(align_object_offset(vtable_len) + align_object_offset(itable_len) + static_field_size + nonstatic_oop_map_size);
 
   // Allocation
@@ -615,9 +620,9 @@ void instanceKlassKlass::oop_print_on(oop obj, outputStream* st) {
 
   st->print(BULLET"non-static oop maps: ");
   OopMapBlock* map     = ik->start_of_nonstatic_oop_maps();
-  OopMapBlock* end_map = map + ik->nonstatic_oop_map_size();
+  OopMapBlock* end_map = map + ik->nonstatic_oop_map_count();
   while (map < end_map) {
-    st->print("%d-%d ", map->offset(), map->offset() + heapOopSize*(map->length() - 1));
+    st->print("%d-%d ", map->offset(), map->offset() + heapOopSize*(map->count() - 1));
     map++;
   }
   st->cr();
diff --git a/hotspot/src/share/vm/oops/instanceKlassKlass.hpp b/hotspot/src/share/vm/oops/instanceKlassKlass.hpp
index 8504a59da19..2dbaa2a584b 100644
--- a/hotspot/src/share/vm/oops/instanceKlassKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceKlassKlass.hpp
@@ -39,7 +39,7 @@ class instanceKlassKlass : public klassKlass {
   klassOop allocate_instance_klass(int vtable_len,
                                    int itable_len,
                                    int static_field_size,
-                                   int nonstatic_oop_map_size,
+                                   unsigned int nonstatic_oop_map_count,
                                    ReferenceType rt,
                                    TRAPS);
 
diff --git a/hotspot/src/share/vm/oops/instanceRefKlass.cpp b/hotspot/src/share/vm/oops/instanceRefKlass.cpp
index 5e6d40f9dc5..76f1e574ae1 100644
--- a/hotspot/src/share/vm/oops/instanceRefKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.cpp
@@ -400,26 +400,26 @@ void instanceRefKlass::update_nonstatic_oop_maps(klassOop k) {
   assert(k == SystemDictionary::reference_klass() && first_time,
          "Invalid update of maps");
   debug_only(first_time = false);
-  assert(ik->nonstatic_oop_map_size() == 1, "just checking");
+  assert(ik->nonstatic_oop_map_count() == 1, "just checking");
 
   OopMapBlock* map = ik->start_of_nonstatic_oop_maps();
 
   // Check that the current map is (2,4) - currently points at field with
   // offset 2 (words) and has 4 map entries.
   debug_only(int offset = java_lang_ref_Reference::referent_offset);
-  debug_only(int length = ((java_lang_ref_Reference::discovered_offset -
+  debug_only(unsigned int count = ((java_lang_ref_Reference::discovered_offset -
     java_lang_ref_Reference::referent_offset)/heapOopSize) + 1);
 
   if (UseSharedSpaces) {
     assert(map->offset() == java_lang_ref_Reference::queue_offset &&
-           map->length() == 1, "just checking");
+           map->count() == 1, "just checking");
   } else {
-    assert(map->offset() == offset && map->length() == length,
+    assert(map->offset() == offset && map->count() == count,
            "just checking");
 
     // Update map to (3,1) - point to offset of 3 (words) with 1 map entry.
     map->set_offset(java_lang_ref_Reference::queue_offset);
-    map->set_length(1);
+    map->set_count(1);
   }
 }
 
diff --git a/hotspot/src/share/vm/oops/methodDataOop.cpp b/hotspot/src/share/vm/oops/methodDataOop.cpp
index a77db3c455b..ee55cfa0af1 100644
--- a/hotspot/src/share/vm/oops/methodDataOop.cpp
+++ b/hotspot/src/share/vm/oops/methodDataOop.cpp
@@ -49,6 +49,12 @@ void DataLayout::initialize(u1 tag, u2 bci, int cell_count) {
   }
 }
 
+void DataLayout::follow_weak_refs(BoolObjectClosure* cl) {
+  ResourceMark m;
+  data_in()->follow_weak_refs(cl);
+}
+
+
 // ==================================================================
 // ProfileData
 //
@@ -145,42 +151,92 @@ void JumpData::print_data_on(outputStream* st) {
 // which are used to store a type profile for the receiver of the check.
 
 void ReceiverTypeData::follow_contents() {
-  for (uint row = 0; row < row_limit(); row++) {
-    if (receiver(row) != NULL) {
-      MarkSweep::mark_and_push(adr_receiver(row));
-    }
-  }
+  // This is a set of weak references that need
+  // to be followed at the end of the strong marking
+  // phase. Memoize this object so it can be visited
+  // in the weak roots processing phase.
+  MarkSweep::revisit_mdo(data());
 }
 
 #ifndef SERIALGC
 void ReceiverTypeData::follow_contents(ParCompactionManager* cm) {
-  for (uint row = 0; row < row_limit(); row++) {
-    if (receiver(row) != NULL) {
-      PSParallelCompact::mark_and_push(cm, adr_receiver(row));
-    }
-  }
+  // This is a set of weak references that need
+  // to be followed at the end of the strong marking
+  // phase. Memoize this object so it can be visited
+  // in the weak roots processing phase.
+  PSParallelCompact::revisit_mdo(cm, data());
 }
 #endif // SERIALGC
 
 void ReceiverTypeData::oop_iterate(OopClosure* blk) {
-  for (uint row = 0; row < row_limit(); row++) {
-    if (receiver(row) != NULL) {
-      blk->do_oop(adr_receiver(row));
-    }
-  }
-}
-
-void ReceiverTypeData::oop_iterate_m(OopClosure* blk, MemRegion mr) {
-  for (uint row = 0; row < row_limit(); row++) {
-    if (receiver(row) != NULL) {
-      oop* adr = adr_receiver(row);
-      if (mr.contains(adr)) {
+  if (blk->should_remember_mdo()) {
+    // This is a set of weak references that need
+    // to be followed at the end of the strong marking
+    // phase. Memoize this object so it can be visited
+    // in the weak roots processing phase.
+    blk->remember_mdo(data());
+  } else { // normal scan
+    for (uint row = 0; row < row_limit(); row++) {
+      if (receiver(row) != NULL) {
+        oop* adr = adr_receiver(row);
         blk->do_oop(adr);
       }
     }
   }
 }
 
+void ReceiverTypeData::oop_iterate_m(OopClosure* blk, MemRegion mr) {
+  // Currently, this interface is called only during card-scanning for
+  // a young gen gc, in which case this object cannot contribute anything,
+  // since it does not contain any references that cross out of
+  // the perm gen. However, for future more general use we allow
+  // the possibility of calling for instance from more general
+  // iterators (for example, a future regionalized perm gen for G1,
+  // or the possibility of moving some references out of perm in
+  // the case of other collectors). In that case, you will need
+  // to relax or remove some of the assertions below.
+#ifdef ASSERT
+  // Verify that none of the embedded oop references cross out of
+  // this generation.
+  for (uint row = 0; row < row_limit(); row++) {
+    if (receiver(row) != NULL) {
+      oop* adr = adr_receiver(row);
+      CollectedHeap* h = Universe::heap();
+      assert(h->is_permanent(adr) && h->is_permanent_or_null(*adr), "Not intra-perm");
+    }
+  }
+#endif // ASSERT
+  assert(!blk->should_remember_mdo(), "Not expected to remember MDO");
+  return;   // Nothing to do, see comment above
+#if 0
+  if (blk->should_remember_mdo()) {
+    // This is a set of weak references that need
+    // to be followed at the end of the strong marking
+    // phase. Memoize this object so it can be visited
+    // in the weak roots processing phase.
+    blk->remember_mdo(data());
+  } else { // normal scan
+    for (uint row = 0; row < row_limit(); row++) {
+      if (receiver(row) != NULL) {
+        oop* adr = adr_receiver(row);
+        if (mr.contains(adr)) {
+          blk->do_oop(adr);
+        } else if ((HeapWord*)adr >= mr.end()) {
+          // Test that the current cursor and the two ends of the range
+          // that we may have skipped iterating over are monotonically ordered;
+          // this is just a paranoid assertion, just in case represetations
+          // should change in the future rendering the short-circuit return
+          // here invalid.
+          assert((row+1 >= row_limit() || adr_receiver(row+1) > adr) &&
+                 (row+2 >= row_limit() || adr_receiver(row_limit()-1) > adr_receiver(row+1)), "Reducing?");
+          break; // remaining should be outside this mr too
+        }
+      }
+    }
+  }
+#endif
+}
+
 void ReceiverTypeData::adjust_pointers() {
   for (uint row = 0; row < row_limit(); row++) {
     if (receiver(row) != NULL) {
@@ -189,6 +245,15 @@ void ReceiverTypeData::adjust_pointers() {
   }
 }
 
+void ReceiverTypeData::follow_weak_refs(BoolObjectClosure* is_alive_cl) {
+  for (uint row = 0; row < row_limit(); row++) {
+    klassOop p = receiver(row);
+    if (p != NULL && !is_alive_cl->do_object_b(p)) {
+      clear_row(row);
+    }
+  }
+}
+
 #ifndef SERIALGC
 void ReceiverTypeData::update_pointers() {
   for (uint row = 0; row < row_limit(); row++) {
@@ -625,30 +690,33 @@ ProfileData* methodDataOopDesc::data_at(int data_index) {
     return NULL;
   }
   DataLayout* data_layout = data_layout_at(data_index);
+  return data_layout->data_in();
+}
 
-  switch (data_layout->tag()) {
+ProfileData* DataLayout::data_in() {
+  switch (tag()) {
   case DataLayout::no_tag:
   default:
     ShouldNotReachHere();
     return NULL;
   case DataLayout::bit_data_tag:
-    return new BitData(data_layout);
+    return new BitData(this);
   case DataLayout::counter_data_tag:
-    return new CounterData(data_layout);
+    return new CounterData(this);
   case DataLayout::jump_data_tag:
-    return new JumpData(data_layout);
+    return new JumpData(this);
   case DataLayout::receiver_type_data_tag:
-    return new ReceiverTypeData(data_layout);
+    return new ReceiverTypeData(this);
   case DataLayout::virtual_call_data_tag:
-    return new VirtualCallData(data_layout);
+    return new VirtualCallData(this);
   case DataLayout::ret_data_tag:
-    return new RetData(data_layout);
+    return new RetData(this);
   case DataLayout::branch_data_tag:
-    return new BranchData(data_layout);
+    return new BranchData(this);
   case DataLayout::multi_branch_data_tag:
-    return new MultiBranchData(data_layout);
+    return new MultiBranchData(this);
   case DataLayout::arg_info_data_tag:
-    return new ArgInfoData(data_layout);
+    return new ArgInfoData(this);
   };
 }
 
diff --git a/hotspot/src/share/vm/oops/methodDataOop.hpp b/hotspot/src/share/vm/oops/methodDataOop.hpp
index 760d4eb7a42..8fc4245d4ef 100644
--- a/hotspot/src/share/vm/oops/methodDataOop.hpp
+++ b/hotspot/src/share/vm/oops/methodDataOop.hpp
@@ -55,6 +55,9 @@ class BytecodeStream;
 // with invocation counter incrementation.  None of these races harm correct
 // execution of the compiled code.
 
+// forward decl
+class ProfileData;
+
 // DataLayout
 //
 // Overlay for generic profiling data.
@@ -231,6 +234,10 @@ public:
     temp._header._struct._flags = byte_constant;
     return temp._header._bits;
   }
+
+  // GC support
+  ProfileData* data_in();
+  void follow_weak_refs(BoolObjectClosure* cl);
 };
 
 
@@ -430,6 +437,7 @@ public:
   virtual void oop_iterate(OopClosure* blk) {}
   virtual void oop_iterate_m(OopClosure* blk, MemRegion mr) {}
   virtual void adjust_pointers() {}
+  virtual void follow_weak_refs(BoolObjectClosure* is_alive_closure) {}
 
 #ifndef SERIALGC
   // Parallel old support
@@ -667,11 +675,27 @@ public:
     return recv;
   }
 
+  void set_receiver(uint row, oop p) {
+    assert((uint)row < row_limit(), "oob");
+    set_oop_at(receiver_cell_index(row), p);
+  }
+
   uint receiver_count(uint row) {
     assert(row < row_limit(), "oob");
     return uint_at(receiver_count_cell_index(row));
   }
 
+  void set_receiver_count(uint row, uint count) {
+    assert(row < row_limit(), "oob");
+    set_uint_at(receiver_count_cell_index(row), count);
+  }
+
+  void clear_row(uint row) {
+    assert(row < row_limit(), "oob");
+    set_receiver(row, NULL);
+    set_receiver_count(row, 0);
+  }
+
   // Code generation support
   static ByteSize receiver_offset(uint row) {
     return cell_offset(receiver_cell_index(row));
@@ -688,6 +712,7 @@ public:
   virtual void oop_iterate(OopClosure* blk);
   virtual void oop_iterate_m(OopClosure* blk, MemRegion mr);
   virtual void adjust_pointers();
+  virtual void follow_weak_refs(BoolObjectClosure* is_alive_closure);
 
 #ifndef SERIALGC
   // Parallel old support
diff --git a/hotspot/src/share/vm/oops/objArrayKlass.cpp b/hotspot/src/share/vm/oops/objArrayKlass.cpp
index a97cb0aadd6..212126490cd 100644
--- a/hotspot/src/share/vm/oops/objArrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/objArrayKlass.cpp
@@ -39,6 +39,7 @@ objArrayOop objArrayKlass::allocate(int length, TRAPS) {
       assert(a->is_parsable(), "Can't publish unless parsable");
       return a;
     } else {
+      report_java_out_of_memory("Requested array size exceeds VM limit");
       THROW_OOP_0(Universe::out_of_memory_error_array_size());
     }
   } else {
diff --git a/hotspot/src/share/vm/oops/objArrayOop.hpp b/hotspot/src/share/vm/oops/objArrayOop.hpp
index dd2c7c30aaf..d9d5088f534 100644
--- a/hotspot/src/share/vm/oops/objArrayOop.hpp
+++ b/hotspot/src/share/vm/oops/objArrayOop.hpp
@@ -38,6 +38,11 @@ class objArrayOopDesc : public arrayOopDesc {
   }
 
  public:
+  // Returns the offset of the first element.
+  static int base_offset_in_bytes() {
+    return arrayOopDesc::base_offset_in_bytes(T_OBJECT);
+  }
+
   // base is the address following the header.
   HeapWord* base() const      { return (HeapWord*) arrayOopDesc::base(T_OBJECT); }
 
diff --git a/hotspot/src/share/vm/oops/typeArrayKlass.cpp b/hotspot/src/share/vm/oops/typeArrayKlass.cpp
index f5d53faa853..68d67f1ccf6 100644
--- a/hotspot/src/share/vm/oops/typeArrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/typeArrayKlass.cpp
@@ -80,6 +80,7 @@ typeArrayOop typeArrayKlass::allocate(int length, TRAPS) {
       assert(t->is_parsable(), "Don't publish unless parsable");
       return t;
     } else {
+      report_java_out_of_memory("Requested array size exceeds VM limit");
       THROW_OOP_0(Universe::out_of_memory_error_array_size());
     }
   } else {
diff --git a/hotspot/src/share/vm/opto/block.cpp b/hotspot/src/share/vm/opto/block.cpp
index 7af5c4f57f6..d29f8223ef7 100644
--- a/hotspot/src/share/vm/opto/block.cpp
+++ b/hotspot/src/share/vm/opto/block.cpp
@@ -910,7 +910,16 @@ void PhaseCFG::verify( ) const {
               !(b->head()->is_Loop() && n->is_Phi()) &&
               // See (+++) comment in reg_split.cpp
               !(n->jvms() != NULL && n->jvms()->is_monitor_use(k)) ) {
-            assert( b->find_node(def) < j, "uses must follow definitions" );
+            bool is_loop = false;
+            if (n->is_Phi()) {
+              for( uint l = 1; l < def->req(); l++ ) {
+                if (n == def->in(l)) {
+                  is_loop = true;
+                  break; // Some kind of loop
+                }
+              }
+            }
+            assert( is_loop || b->find_node(def) < j, "uses must follow definitions" );
           }
           if( def->is_SafePointScalarObject() ) {
             assert(_bbs[def->_idx] == b, "SafePointScalarObject Node should be at the same block as its SafePoint node");
diff --git a/hotspot/src/share/vm/opto/bytecodeInfo.cpp b/hotspot/src/share/vm/opto/bytecodeInfo.cpp
index 9f93ab83773..eeb1658913a 100644
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp
@@ -37,6 +37,7 @@ InlineTree::InlineTree( Compile* c, const InlineTree *caller_tree, ciMethod* cal
     // Keep a private copy of the caller_jvms:
     _caller_jvms = new (C) JVMState(caller_jvms->method(), caller_tree->caller_jvms());
     _caller_jvms->set_bci(caller_jvms->bci());
+    assert(!caller_jvms->should_reexecute(), "there should be no reexecute bytecode with inlining");
   }
   assert(_caller_jvms->same_calls_as(caller_jvms), "consistent JVMS");
   assert((caller_tree == NULL ? 0 : caller_tree->inline_depth() + 1) == inline_depth(), "correct (redundant) depth parameter");
diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp
index 425a66a42c2..091ad4a9bb4 100644
--- a/hotspot/src/share/vm/opto/c2_globals.hpp
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp
@@ -376,7 +376,7 @@
   product(intx, AutoBoxCacheMax, 128,                                       \
           "Sets max value cached by the java.lang.Integer autobox cache")   \
                                                                             \
-  product(bool, DoEscapeAnalysis, false,                                    \
+  product(bool, DoEscapeAnalysis, true,                                     \
           "Perform escape analysis")                                        \
                                                                             \
   notproduct(bool, PrintEscapeAnalysis, false,                              \
diff --git a/hotspot/src/share/vm/opto/callnode.cpp b/hotspot/src/share/vm/opto/callnode.cpp
index 44baf2a878c..ff4cdbbbb6e 100644
--- a/hotspot/src/share/vm/opto/callnode.cpp
+++ b/hotspot/src/share/vm/opto/callnode.cpp
@@ -223,6 +223,7 @@ uint TailJumpNode::match_edge(uint idx) const {
 JVMState::JVMState(ciMethod* method, JVMState* caller) {
   assert(method != NULL, "must be valid call site");
   _method = method;
+  _reexecute = Reexecute_Undefined;
   debug_only(_bci = -99);  // random garbage value
   debug_only(_map = (SafePointNode*)-1);
   _caller = caller;
@@ -237,6 +238,7 @@ JVMState::JVMState(ciMethod* method, JVMState* caller) {
 JVMState::JVMState(int stack_size) {
   _method = NULL;
   _bci = InvocationEntryBci;
+  _reexecute = Reexecute_Undefined;
   debug_only(_map = (SafePointNode*)-1);
   _caller = NULL;
   _depth  = 1;
@@ -269,6 +271,7 @@ bool JVMState::same_calls_as(const JVMState* that) const {
     if (p->_method != q->_method)    return false;
     if (p->_method == NULL)          return true;   // bci is irrelevant
     if (p->_bci    != q->_bci)       return false;
+    if (p->_reexecute != q->_reexecute)  return false;
     p = p->caller();
     q = q->caller();
     if (p == q)                      return true;
@@ -490,6 +493,8 @@ void JVMState::dump_spec(outputStream *st) const {
     if (!printed)
       _method->print_short_name(st);
     st->print(" @ bci:%d",_bci);
+    if(_reexecute == Reexecute_True)
+      st->print(" reexecute");
   } else {
     st->print(" runtime stub");
   }
@@ -509,8 +514,8 @@ void JVMState::dump_on(outputStream* st) const {
     }
     _map->dump(2);
   }
-  st->print("JVMS depth=%d loc=%d stk=%d mon=%d scalar=%d end=%d mondepth=%d sp=%d bci=%d method=",
-             depth(), locoff(), stkoff(), monoff(), scloff(), endoff(), monitor_depth(), sp(), bci());
+  st->print("JVMS depth=%d loc=%d stk=%d mon=%d scalar=%d end=%d mondepth=%d sp=%d bci=%d reexecute=%s method=",
+             depth(), locoff(), stkoff(), monoff(), scloff(), endoff(), monitor_depth(), sp(), bci(), should_reexecute()?"true":"false");
   if (_method == NULL) {
     st->print_cr("(none)");
   } else {
@@ -537,6 +542,7 @@ void dump_jvms(JVMState* jvms) {
 JVMState* JVMState::clone_shallow(Compile* C) const {
   JVMState* n = has_method() ? new (C) JVMState(_method, _caller) : new (C) JVMState(0);
   n->set_bci(_bci);
+  n->_reexecute = _reexecute;
   n->set_locoff(_locoff);
   n->set_stkoff(_stkoff);
   n->set_monoff(_monoff);
diff --git a/hotspot/src/share/vm/opto/callnode.hpp b/hotspot/src/share/vm/opto/callnode.hpp
index fa775de846c..ac886f3ba99 100644
--- a/hotspot/src/share/vm/opto/callnode.hpp
+++ b/hotspot/src/share/vm/opto/callnode.hpp
@@ -178,6 +178,13 @@ public:
 // This provides a way to map the optimized program back into the interpreter,
 // or to let the GC mark the stack.
 class JVMState : public ResourceObj {
+public:
+  typedef enum {
+    Reexecute_Undefined = -1, // not defined -- will be translated into false later
+    Reexecute_False     =  0, // false       -- do not reexecute
+    Reexecute_True      =  1  // true        -- reexecute the bytecode
+  } ReexecuteState; //Reexecute State
+
 private:
   JVMState*         _caller;    // List pointer for forming scope chains
   uint              _depth;     // One mroe than caller depth, or one.
@@ -188,10 +195,12 @@ private:
   uint              _endoff;    // Offset to end of input edge mapping
   uint              _sp;        // Jave Expression Stack Pointer for this state
   int               _bci;       // Byte Code Index of this JVM point
+  ReexecuteState    _reexecute; // Whether this bytecode need to be re-executed
   ciMethod*         _method;    // Method Pointer
   SafePointNode*    _map;       // Map node associated with this scope
 public:
   friend class Compile;
+  friend class PreserveReexecuteState;
 
   // Because JVMState objects live over the entire lifetime of the
   // Compile object, they are allocated into the comp_arena, which
@@ -222,16 +231,18 @@ public:
   bool        is_mon(uint i) const { return i >= _monoff && i < _scloff; }
   bool        is_scl(uint i) const { return i >= _scloff && i < _endoff; }
 
-  uint              sp()     const { return _sp; }
-  int               bci()    const { return _bci; }
-  bool          has_method() const { return _method != NULL; }
-  ciMethod*         method() const { assert(has_method(), ""); return _method; }
-  JVMState*         caller() const { return _caller; }
-  SafePointNode*    map()    const { return _map; }
-  uint              depth()  const { return _depth; }
-  uint        debug_start()  const; // returns locoff of root caller
-  uint        debug_end()    const; // returns endoff of self
-  uint        debug_size()   const {
+  uint                      sp() const { return _sp; }
+  int                      bci() const { return _bci; }
+  bool        should_reexecute() const { return _reexecute==Reexecute_True; }
+  bool  is_reexecute_undefined() const { return _reexecute==Reexecute_Undefined; }
+  bool              has_method() const { return _method != NULL; }
+  ciMethod*             method() const { assert(has_method(), ""); return _method; }
+  JVMState*             caller() const { return _caller; }
+  SafePointNode*           map() const { return _map; }
+  uint                   depth() const { return _depth; }
+  uint             debug_start() const; // returns locoff of root caller
+  uint               debug_end() const; // returns endoff of self
+  uint              debug_size() const {
     return loc_size() + sp() + mon_size() + scl_size();
   }
   uint        debug_depth()  const; // returns sum of debug_size values at all depths
@@ -267,7 +278,9 @@ public:
   }
   void              set_map(SafePointNode *map) { _map = map; }
   void              set_sp(uint sp) { _sp = sp; }
-  void              set_bci(int bci) { _bci = bci; }
+                    // _reexecute is initialized to "undefined" for a new bci
+  void              set_bci(int bci) {if(_bci != bci)_reexecute=Reexecute_Undefined; _bci = bci; }
+  void              set_should_reexecute(bool reexec) {_reexecute = reexec ? Reexecute_True : Reexecute_False;}
 
   // Miscellaneous utility functions
   JVMState* clone_deep(Compile* C) const;    // recursively clones caller chain
diff --git a/hotspot/src/share/vm/opto/cfgnode.cpp b/hotspot/src/share/vm/opto/cfgnode.cpp
index 85f5e107d8e..02c2ae01a21 100644
--- a/hotspot/src/share/vm/opto/cfgnode.cpp
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp
@@ -1792,15 +1792,12 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   if (UseCompressedOops && can_reshape && progress == NULL) {
     bool may_push = true;
     bool has_decodeN = false;
-    Node* in_decodeN = NULL;
     for (uint i=1; i<req(); ++i) {// For all paths in
       Node *ii = in(i);
       if (ii->is_DecodeN() && ii->bottom_type() == bottom_type()) {
-        // Note: in_decodeN is used only to define the type of new phi.
-        // Find a non dead path otherwise phi type will be wrong.
+        // Do optimization if a non dead path exist.
         if (ii->in(1)->bottom_type() != Type::TOP) {
           has_decodeN = true;
-          in_decodeN = ii->in(1);
         }
       } else if (!ii->is_Phi()) {
         may_push = false;
@@ -1809,7 +1806,9 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
 
     if (has_decodeN && may_push) {
       PhaseIterGVN *igvn = phase->is_IterGVN();
-      PhiNode *new_phi = PhiNode::make_blank(in(0), in_decodeN);
+      // Make narrow type for new phi.
+      const Type* narrow_t = TypeNarrowOop::make(this->bottom_type()->is_ptr());
+      PhiNode* new_phi = new (phase->C, r->req()) PhiNode(r, narrow_t);
       uint orig_cnt = req();
       for (uint i=1; i<req(); ++i) {// For all paths in
         Node *ii = in(i);
@@ -1822,7 +1821,7 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
           if (ii->as_Phi() == this) {
             new_ii = new_phi;
           } else {
-            new_ii = new (phase->C, 2) EncodePNode(ii, in_decodeN->bottom_type());
+            new_ii = new (phase->C, 2) EncodePNode(ii, narrow_t);
             igvn->register_new_node_with_optimizer(new_ii);
           }
         }
diff --git a/hotspot/src/share/vm/opto/chaitin.hpp b/hotspot/src/share/vm/opto/chaitin.hpp
index 1cea37e34d1..798aba65ee0 100644
--- a/hotspot/src/share/vm/opto/chaitin.hpp
+++ b/hotspot/src/share/vm/opto/chaitin.hpp
@@ -458,6 +458,16 @@ private:
   // Post-Allocation peephole copy removal
   void post_allocate_copy_removal();
   Node *skip_copies( Node *c );
+  // Replace the old node with the current live version of that value
+  // and yank the old value if it's dead.
+  int replace_and_yank_if_dead( Node *old, OptoReg::Name nreg,
+                                Block *current_block, Node_List& value, Node_List& regnd ) {
+    Node* v = regnd[nreg];
+    assert(v->outcnt() != 0, "no dead values");
+    old->replace_by(v);
+    return yank_if_dead(old, current_block, &value, &regnd);
+  }
+
   int yank_if_dead( Node *old, Block *current_block, Node_List *value, Node_List *regnd );
   int elide_copy( Node *n, int k, Block *current_block, Node_List &value, Node_List &regnd, bool can_change_regs );
   int use_prior_register( Node *copy, uint idx, Node *def, Block *current_block, Node_List &value, Node_List &regnd );
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 0db21631f2c..ecffd2f4e6a 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -1545,7 +1545,7 @@ void Compile::Optimize() {
   if((loop_opts_cnt > 0) && (has_loops() || has_split_ifs())) {
     {
       TracePhase t2("idealLoop", &_t_idealLoop, true);
-      PhaseIdealLoop ideal_loop( igvn, NULL, true );
+      PhaseIdealLoop ideal_loop( igvn, true );
       loop_opts_cnt--;
       if (major_progress()) print_method("PhaseIdealLoop 1", 2);
       if (failing())  return;
@@ -1553,7 +1553,7 @@ void Compile::Optimize() {
     // Loop opts pass if partial peeling occurred in previous pass
     if(PartialPeelLoop && major_progress() && (loop_opts_cnt > 0)) {
       TracePhase t3("idealLoop", &_t_idealLoop, true);
-      PhaseIdealLoop ideal_loop( igvn, NULL, false );
+      PhaseIdealLoop ideal_loop( igvn, false );
       loop_opts_cnt--;
       if (major_progress()) print_method("PhaseIdealLoop 2", 2);
       if (failing())  return;
@@ -1561,10 +1561,15 @@ void Compile::Optimize() {
     // Loop opts pass for loop-unrolling before CCP
     if(major_progress() && (loop_opts_cnt > 0)) {
       TracePhase t4("idealLoop", &_t_idealLoop, true);
-      PhaseIdealLoop ideal_loop( igvn, NULL, false );
+      PhaseIdealLoop ideal_loop( igvn, false );
       loop_opts_cnt--;
       if (major_progress()) print_method("PhaseIdealLoop 3", 2);
     }
+    if (!failing()) {
+      // Verify that last round of loop opts produced a valid graph
+      NOT_PRODUCT( TracePhase t2("idealLoopVerify", &_t_idealLoopVerify, TimeCompiler); )
+      PhaseIdealLoop::verify(igvn);
+    }
   }
   if (failing())  return;
 
@@ -1597,12 +1602,20 @@ void Compile::Optimize() {
     while(major_progress() && (loop_opts_cnt > 0)) {
       TracePhase t2("idealLoop", &_t_idealLoop, true);
       assert( cnt++ < 40, "infinite cycle in loop optimization" );
-      PhaseIdealLoop ideal_loop( igvn, NULL, true );
+      PhaseIdealLoop ideal_loop( igvn, true );
       loop_opts_cnt--;
       if (major_progress()) print_method("PhaseIdealLoop iterations", 2);
       if (failing())  return;
     }
   }
+
+  {
+    // Verify that all previous optimizations produced a valid graph
+    // at least to this point, even if no loop optimizations were done.
+    NOT_PRODUCT( TracePhase t2("idealLoopVerify", &_t_idealLoopVerify, TimeCompiler); )
+    PhaseIdealLoop::verify(igvn);
+  }
+
   {
     NOT_PRODUCT( TracePhase t2("macroExpand", &_t_macroExpand, TimeCompiler); )
     PhaseMacroExpand  mex(igvn);
@@ -2520,7 +2533,7 @@ bool Compile::final_graph_reshaping() {
 
   // If original bytecodes contained a mixture of floats and doubles
   // check if the optimizer has made it homogenous, item (3).
-  if( Use24BitFPMode && Use24BitFP &&
+  if( Use24BitFPMode && Use24BitFP && UseSSE == 0 &&
       frc.get_float_count() > 32 &&
       frc.get_double_count() == 0 &&
       (10 * frc.get_call_count() < frc.get_float_count()) ) {
diff --git a/hotspot/src/share/vm/opto/domgraph.cpp b/hotspot/src/share/vm/opto/domgraph.cpp
index af198e3c71f..e76fee00c0a 100644
--- a/hotspot/src/share/vm/opto/domgraph.cpp
+++ b/hotspot/src/share/vm/opto/domgraph.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -396,7 +396,7 @@ struct NTarjan {
 // nodes (using the is_CFG() call) and places them in a dominator tree.  Thus,
 // it needs a count of the CFG nodes for the mapping table. This is the
 // Lengauer & Tarjan O(E-alpha(E,V)) algorithm.
-void PhaseIdealLoop::Dominators( ) {
+void PhaseIdealLoop::Dominators() {
   ResourceMark rm;
   // Setup mappings from my Graph to Tarjan's stuff and back
   // Note: Tarjan uses 1-based arrays
@@ -454,7 +454,7 @@ void PhaseIdealLoop::Dominators( ) {
     // flow into the main graph (and hence into ROOT) but are not reachable
     // from above.  Such code is dead, but requires a global pass to detect
     // it; this global pass was the 'build_loop_tree' pass run just prior.
-    if( whead->is_Region() ) {
+    if( !_verify_only && whead->is_Region() ) {
       for( uint i = 1; i < whead->req(); i++ ) {
         if (!has_node(whead->in(i))) {
           // Kill dead input path
diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp
index 90ffdfca8cb..955b736eed1 100644
--- a/hotspot/src/share/vm/opto/graphKit.cpp
+++ b/hotspot/src/share/vm/opto/graphKit.cpp
@@ -620,6 +620,16 @@ BuildCutout::~BuildCutout() {
   assert(kit->stopped(), "cutout code must stop, throw, return, etc.");
 }
 
+//---------------------------PreserveReexecuteState----------------------------
+PreserveReexecuteState::PreserveReexecuteState(GraphKit* kit) {
+  _kit    =    kit;
+  _sp     =    kit->sp();
+  _reexecute = kit->jvms()->_reexecute;
+}
+PreserveReexecuteState::~PreserveReexecuteState() {
+  _kit->jvms()->_reexecute = _reexecute;
+  _kit->set_sp(_sp);
+}
 
 //------------------------------clone_map--------------------------------------
 // Implementation of PreserveJVMState
@@ -738,6 +748,18 @@ bool GraphKit::dead_locals_are_killed() {
 
 #endif //ASSERT
 
+// Helper function for enforcing certain bytecodes to reexecute if
+// deoptimization happens
+static bool should_reexecute_implied_by_bytecode(JVMState *jvms) {
+  ciMethod* cur_method = jvms->method();
+  int       cur_bci   = jvms->bci();
+  if (cur_method != NULL && cur_bci != InvocationEntryBci) {
+    Bytecodes::Code code = cur_method->java_code_at_bci(cur_bci);
+    return Interpreter::bytecode_should_reexecute(code);
+  } else
+    return false;
+}
+
 // Helper function for adding JVMState and debug information to node
 void GraphKit::add_safepoint_edges(SafePointNode* call, bool must_throw) {
   // Add the safepoint edges to the call (or other safepoint).
@@ -781,6 +803,13 @@ void GraphKit::add_safepoint_edges(SafePointNode* call, bool must_throw) {
   JVMState* out_jvms = youngest_jvms->clone_deep(C);
   call->set_jvms(out_jvms); // Start jvms list for call node
 
+  // For a known set of bytecodes, the interpreter should reexecute them if
+  // deoptimization happens. We set the reexecute state for them here
+  if (out_jvms->is_reexecute_undefined() && //don't change if already specified
+      should_reexecute_implied_by_bytecode(out_jvms)) {
+    out_jvms->set_should_reexecute(true); //NOTE: youngest_jvms not changed
+  }
+
   // Presize the call:
   debug_only(uint non_debug_edges = call->req());
   call->add_req_batch(top(), youngest_jvms->debug_depth());
diff --git a/hotspot/src/share/vm/opto/graphKit.hpp b/hotspot/src/share/vm/opto/graphKit.hpp
index cd4fceff9d9..ae1b5b062c7 100644
--- a/hotspot/src/share/vm/opto/graphKit.hpp
+++ b/hotspot/src/share/vm/opto/graphKit.hpp
@@ -763,3 +763,16 @@ class BuildCutout: public PreserveJVMState {
   BuildCutout(GraphKit* kit, Node* p, float prob, float cnt = COUNT_UNKNOWN);
   ~BuildCutout();
 };
+
+// Helper class to preserve the original _reexecute bit and _sp and restore
+// them back
+class PreserveReexecuteState: public StackObj {
+ protected:
+  GraphKit*                 _kit;
+  uint                      _sp;
+  JVMState::ReexecuteState  _reexecute;
+
+ public:
+  PreserveReexecuteState(GraphKit* kit);
+  ~PreserveReexecuteState();
+};
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index ecc8abbf287..f609eedd931 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -2064,7 +2064,7 @@ bool LibraryCallKit::inline_unsafe_access(bool is_native_ptr, bool is_store, Bas
 
     // See if it is a narrow oop array.
     if (adr_type->isa_aryptr()) {
-      if (adr_type->offset() >= objArrayOopDesc::base_offset_in_bytes(type)) {
+      if (adr_type->offset() >= objArrayOopDesc::base_offset_in_bytes()) {
         const TypeOopPtr *elem_type = adr_type->is_aryptr()->elem()->isa_oopptr();
         if (elem_type != NULL) {
           sharpened_klass = elem_type->klass();
@@ -3169,78 +3169,85 @@ bool LibraryCallKit::inline_array_copyOf(bool is_copyOfRange) {
   Node* end               = is_copyOfRange? argument(2): argument(1);
   Node* array_type_mirror = is_copyOfRange? argument(3): argument(2);
 
-  _sp += nargs;  // set original stack for use by uncommon_trap
-  array_type_mirror = do_null_check(array_type_mirror, T_OBJECT);
-  original          = do_null_check(original, T_OBJECT);
-  _sp -= nargs;
+  Node* newcopy;
 
-  // Check if a null path was taken unconditionally.
-  if (stopped())  return true;
+  //set the original stack and the reexecute bit for the interpreter to reexecute
+  //the bytecode that invokes Arrays.copyOf if deoptimization happens
+  { PreserveReexecuteState preexecs(this);
+    _sp += nargs;
+    jvms()->set_should_reexecute(true);
 
-  Node* orig_length = load_array_length(original);
+    array_type_mirror = do_null_check(array_type_mirror, T_OBJECT);
+    original          = do_null_check(original, T_OBJECT);
 
-  Node* klass_node = load_klass_from_mirror(array_type_mirror, false, nargs,
-                                            NULL, 0);
-  _sp += nargs;  // set original stack for use by uncommon_trap
-  klass_node = do_null_check(klass_node, T_OBJECT);
-  _sp -= nargs;
+    // Check if a null path was taken unconditionally.
+    if (stopped())  return true;
 
-  RegionNode* bailout = new (C, 1) RegionNode(1);
-  record_for_igvn(bailout);
+    Node* orig_length = load_array_length(original);
 
-  // Despite the generic type of Arrays.copyOf, the mirror might be int, int[], etc.
-  // Bail out if that is so.
-  Node* not_objArray = generate_non_objArray_guard(klass_node, bailout);
-  if (not_objArray != NULL) {
-    // Improve the klass node's type from the new optimistic assumption:
-    ciKlass* ak = ciArrayKlass::make(env()->Object_klass());
-    const Type* akls = TypeKlassPtr::make(TypePtr::NotNull, ak, 0/*offset*/);
-    Node* cast = new (C, 2) CastPPNode(klass_node, akls);
-    cast->init_req(0, control());
-    klass_node = _gvn.transform(cast);
-  }
+    Node* klass_node = load_klass_from_mirror(array_type_mirror, false, 0,
+                                              NULL, 0);
+    klass_node = do_null_check(klass_node, T_OBJECT);
 
-  // Bail out if either start or end is negative.
-  generate_negative_guard(start, bailout, &start);
-  generate_negative_guard(end,   bailout, &end);
+    RegionNode* bailout = new (C, 1) RegionNode(1);
+    record_for_igvn(bailout);
 
-  Node* length = end;
-  if (_gvn.type(start) != TypeInt::ZERO) {
-    length = _gvn.transform( new (C, 3) SubINode(end, start) );
-  }
+    // Despite the generic type of Arrays.copyOf, the mirror might be int, int[], etc.
+    // Bail out if that is so.
+    Node* not_objArray = generate_non_objArray_guard(klass_node, bailout);
+    if (not_objArray != NULL) {
+      // Improve the klass node's type from the new optimistic assumption:
+      ciKlass* ak = ciArrayKlass::make(env()->Object_klass());
+      const Type* akls = TypeKlassPtr::make(TypePtr::NotNull, ak, 0/*offset*/);
+      Node* cast = new (C, 2) CastPPNode(klass_node, akls);
+      cast->init_req(0, control());
+      klass_node = _gvn.transform(cast);
+    }
 
-  // Bail out if length is negative.
-  // ...Not needed, since the new_array will throw the right exception.
-  //generate_negative_guard(length, bailout, &length);
+    // Bail out if either start or end is negative.
+    generate_negative_guard(start, bailout, &start);
+    generate_negative_guard(end,   bailout, &end);
 
-  if (bailout->req() > 1) {
-    PreserveJVMState pjvms(this);
-    set_control( _gvn.transform(bailout) );
-    _sp += nargs;  // push the arguments back on the stack
-    uncommon_trap(Deoptimization::Reason_intrinsic,
-                  Deoptimization::Action_maybe_recompile);
-  }
+    Node* length = end;
+    if (_gvn.type(start) != TypeInt::ZERO) {
+      length = _gvn.transform( new (C, 3) SubINode(end, start) );
+    }
 
-  if (!stopped()) {
-    // How many elements will we copy from the original?
-    // The answer is MinI(orig_length - start, length).
-    Node* orig_tail = _gvn.transform( new(C, 3) SubINode(orig_length, start) );
-    Node* moved = generate_min_max(vmIntrinsics::_min, orig_tail, length);
+    // Bail out if length is negative.
+    // ...Not needed, since the new_array will throw the right exception.
+    //generate_negative_guard(length, bailout, &length);
 
-    const bool raw_mem_only = true;
-    Node* newcopy = new_array(klass_node, length, nargs, raw_mem_only);
+    if (bailout->req() > 1) {
+      PreserveJVMState pjvms(this);
+      set_control( _gvn.transform(bailout) );
+      uncommon_trap(Deoptimization::Reason_intrinsic,
+                    Deoptimization::Action_maybe_recompile);
+    }
 
-    // Generate a direct call to the right arraycopy function(s).
-    // We know the copy is disjoint but we might not know if the
-    // oop stores need checking.
-    // Extreme case:  Arrays.copyOf((Integer[])x, 10, String[].class).
-    // This will fail a store-check if x contains any non-nulls.
-    bool disjoint_bases = true;
-    bool length_never_negative = true;
-    generate_arraycopy(TypeAryPtr::OOPS, T_OBJECT,
-                       original, start, newcopy, intcon(0), moved,
-                       disjoint_bases, length_never_negative);
+    if (!stopped()) {
 
+      // How many elements will we copy from the original?
+      // The answer is MinI(orig_length - start, length).
+      Node* orig_tail = _gvn.transform( new(C, 3) SubINode(orig_length, start) );
+      Node* moved = generate_min_max(vmIntrinsics::_min, orig_tail, length);
+
+      const bool raw_mem_only = true;
+      newcopy = new_array(klass_node, length, 0, raw_mem_only);
+
+      // Generate a direct call to the right arraycopy function(s).
+      // We know the copy is disjoint but we might not know if the
+      // oop stores need checking.
+      // Extreme case:  Arrays.copyOf((Integer[])x, 10, String[].class).
+      // This will fail a store-check if x contains any non-nulls.
+      bool disjoint_bases = true;
+      bool length_never_negative = true;
+      generate_arraycopy(TypeAryPtr::OOPS, T_OBJECT,
+                         original, start, newcopy, intcon(0), moved,
+                         disjoint_bases, length_never_negative);
+    }
+  } //original reexecute and sp are set back here
+
+  if(!stopped()) {
     push(newcopy);
   }
 
@@ -3992,146 +3999,159 @@ void LibraryCallKit::copy_to_clone(Node* obj, Node* alloc_obj, Node* obj_size, b
 //
 bool LibraryCallKit::inline_native_clone(bool is_virtual) {
   int nargs = 1;
-  Node* obj = null_check_receiver(callee());
-  if (stopped())  return true;
-  Node* obj_klass = load_object_klass(obj);
-  const TypeKlassPtr* tklass = _gvn.type(obj_klass)->isa_klassptr();
-  const TypeOopPtr*   toop   = ((tklass != NULL)
+  PhiNode* result_val;
+
+  //set the original stack and the reexecute bit for the interpreter to reexecute
+  //the bytecode that invokes Object.clone if deoptimization happens
+  { PreserveReexecuteState preexecs(this);
+    jvms()->set_should_reexecute(true);
+
+    //null_check_receiver will adjust _sp (push and pop)
+    Node* obj = null_check_receiver(callee());
+    if (stopped())  return true;
+
+    _sp += nargs;
+
+    Node* obj_klass = load_object_klass(obj);
+    const TypeKlassPtr* tklass = _gvn.type(obj_klass)->isa_klassptr();
+    const TypeOopPtr*   toop   = ((tklass != NULL)
                                 ? tklass->as_instance_type()
                                 : TypeInstPtr::NOTNULL);
 
-  // Conservatively insert a memory barrier on all memory slices.
-  // Do not let writes into the original float below the clone.
-  insert_mem_bar(Op_MemBarCPUOrder);
+    // Conservatively insert a memory barrier on all memory slices.
+    // Do not let writes into the original float below the clone.
+    insert_mem_bar(Op_MemBarCPUOrder);
 
-  // paths into result_reg:
-  enum {
-    _slow_path = 1,     // out-of-line call to clone method (virtual or not)
-    _objArray_path,     // plain array allocation, plus arrayof_oop_arraycopy
-    _array_path,        // plain array allocation, plus arrayof_long_arraycopy
-    _instance_path,     // plain instance allocation, plus arrayof_long_arraycopy
-    PATH_LIMIT
-  };
-  RegionNode* result_reg = new(C, PATH_LIMIT) RegionNode(PATH_LIMIT);
-  PhiNode*    result_val = new(C, PATH_LIMIT) PhiNode(result_reg,
-                                                      TypeInstPtr::NOTNULL);
-  PhiNode*    result_i_o = new(C, PATH_LIMIT) PhiNode(result_reg, Type::ABIO);
-  PhiNode*    result_mem = new(C, PATH_LIMIT) PhiNode(result_reg, Type::MEMORY,
-                                                      TypePtr::BOTTOM);
-  record_for_igvn(result_reg);
+    // paths into result_reg:
+    enum {
+      _slow_path = 1,     // out-of-line call to clone method (virtual or not)
+      _objArray_path,     // plain array allocation, plus arrayof_oop_arraycopy
+      _array_path,        // plain array allocation, plus arrayof_long_arraycopy
+      _instance_path,     // plain instance allocation, plus arrayof_long_arraycopy
+      PATH_LIMIT
+    };
+    RegionNode* result_reg = new(C, PATH_LIMIT) RegionNode(PATH_LIMIT);
+    result_val             = new(C, PATH_LIMIT) PhiNode(result_reg,
+                                                        TypeInstPtr::NOTNULL);
+    PhiNode*    result_i_o = new(C, PATH_LIMIT) PhiNode(result_reg, Type::ABIO);
+    PhiNode*    result_mem = new(C, PATH_LIMIT) PhiNode(result_reg, Type::MEMORY,
+                                                        TypePtr::BOTTOM);
+    record_for_igvn(result_reg);
 
-  const TypePtr* raw_adr_type = TypeRawPtr::BOTTOM;
-  int raw_adr_idx = Compile::AliasIdxRaw;
-  const bool raw_mem_only = true;
+    const TypePtr* raw_adr_type = TypeRawPtr::BOTTOM;
+    int raw_adr_idx = Compile::AliasIdxRaw;
+    const bool raw_mem_only = true;
 
-  Node* array_ctl = generate_array_guard(obj_klass, (RegionNode*)NULL);
-  if (array_ctl != NULL) {
-    // It's an array.
-    PreserveJVMState pjvms(this);
-    set_control(array_ctl);
-    Node* obj_length = load_array_length(obj);
-    Node* obj_size = NULL;
-    Node* alloc_obj = new_array(obj_klass, obj_length, nargs,
-                                raw_mem_only, &obj_size);
 
-    if (!use_ReduceInitialCardMarks()) {
-      // If it is an oop array, it requires very special treatment,
-      // because card marking is required on each card of the array.
-      Node* is_obja = generate_objArray_guard(obj_klass, (RegionNode*)NULL);
-      if (is_obja != NULL) {
-        PreserveJVMState pjvms2(this);
-        set_control(is_obja);
-        // Generate a direct call to the right arraycopy function(s).
-        bool disjoint_bases = true;
-        bool length_never_negative = true;
-        generate_arraycopy(TypeAryPtr::OOPS, T_OBJECT,
-                           obj, intcon(0), alloc_obj, intcon(0),
-                           obj_length,
-                           disjoint_bases, length_never_negative);
-        result_reg->init_req(_objArray_path, control());
-        result_val->init_req(_objArray_path, alloc_obj);
-        result_i_o ->set_req(_objArray_path, i_o());
-        result_mem ->set_req(_objArray_path, reset_memory());
+    Node* array_ctl = generate_array_guard(obj_klass, (RegionNode*)NULL);
+    if (array_ctl != NULL) {
+      // It's an array.
+      PreserveJVMState pjvms(this);
+      set_control(array_ctl);
+      Node* obj_length = load_array_length(obj);
+      Node* obj_size  = NULL;
+      Node* alloc_obj = new_array(obj_klass, obj_length, 0,
+                                  raw_mem_only, &obj_size);
+
+      if (!use_ReduceInitialCardMarks()) {
+        // If it is an oop array, it requires very special treatment,
+        // because card marking is required on each card of the array.
+        Node* is_obja = generate_objArray_guard(obj_klass, (RegionNode*)NULL);
+        if (is_obja != NULL) {
+          PreserveJVMState pjvms2(this);
+          set_control(is_obja);
+          // Generate a direct call to the right arraycopy function(s).
+          bool disjoint_bases = true;
+          bool length_never_negative = true;
+          generate_arraycopy(TypeAryPtr::OOPS, T_OBJECT,
+                             obj, intcon(0), alloc_obj, intcon(0),
+                             obj_length,
+                             disjoint_bases, length_never_negative);
+          result_reg->init_req(_objArray_path, control());
+          result_val->init_req(_objArray_path, alloc_obj);
+          result_i_o ->set_req(_objArray_path, i_o());
+          result_mem ->set_req(_objArray_path, reset_memory());
+        }
+      }
+      // We can dispense with card marks if we know the allocation
+      // comes out of eden (TLAB)...  In fact, ReduceInitialCardMarks
+      // causes the non-eden paths to simulate a fresh allocation,
+      // insofar that no further card marks are required to initialize
+      // the object.
+
+      // Otherwise, there are no card marks to worry about.
+
+      if (!stopped()) {
+        copy_to_clone(obj, alloc_obj, obj_size, true, false);
+
+        // Present the results of the copy.
+        result_reg->init_req(_array_path, control());
+        result_val->init_req(_array_path, alloc_obj);
+        result_i_o ->set_req(_array_path, i_o());
+        result_mem ->set_req(_array_path, reset_memory());
       }
     }
-    // We can dispense with card marks if we know the allocation
-    // comes out of eden (TLAB)...  In fact, ReduceInitialCardMarks
-    // causes the non-eden paths to simulate a fresh allocation,
-    // insofar that no further card marks are required to initialize
-    // the object.
 
-    // Otherwise, there are no card marks to worry about.
+    // We only go to the instance fast case code if we pass a number of guards.
+    // The paths which do not pass are accumulated in the slow_region.
+    RegionNode* slow_region = new (C, 1) RegionNode(1);
+    record_for_igvn(slow_region);
+    if (!stopped()) {
+      // It's an instance (we did array above).  Make the slow-path tests.
+      // If this is a virtual call, we generate a funny guard.  We grab
+      // the vtable entry corresponding to clone() from the target object.
+      // If the target method which we are calling happens to be the
+      // Object clone() method, we pass the guard.  We do not need this
+      // guard for non-virtual calls; the caller is known to be the native
+      // Object clone().
+      if (is_virtual) {
+        generate_virtual_guard(obj_klass, slow_region);
+      }
+
+      // The object must be cloneable and must not have a finalizer.
+      // Both of these conditions may be checked in a single test.
+      // We could optimize the cloneable test further, but we don't care.
+      generate_access_flags_guard(obj_klass,
+                                  // Test both conditions:
+                                  JVM_ACC_IS_CLONEABLE | JVM_ACC_HAS_FINALIZER,
+                                  // Must be cloneable but not finalizer:
+                                  JVM_ACC_IS_CLONEABLE,
+                                  slow_region);
+    }
 
     if (!stopped()) {
-      copy_to_clone(obj, alloc_obj, obj_size, true, false);
+      // It's an instance, and it passed the slow-path tests.
+      PreserveJVMState pjvms(this);
+      Node* obj_size  = NULL;
+      Node* alloc_obj = new_instance(obj_klass, NULL, raw_mem_only, &obj_size);
 
-      // Present the results of the copy.
-      result_reg->init_req(_array_path, control());
-      result_val->init_req(_array_path, alloc_obj);
-      result_i_o ->set_req(_array_path, i_o());
-      result_mem ->set_req(_array_path, reset_memory());
-    }
-  }
+      copy_to_clone(obj, alloc_obj, obj_size, false, !use_ReduceInitialCardMarks());
 
-  // We only go to the instance fast case code if we pass a number of guards.
-  // The paths which do not pass are accumulated in the slow_region.
-  RegionNode* slow_region = new (C, 1) RegionNode(1);
-  record_for_igvn(slow_region);
-  if (!stopped()) {
-    // It's an instance (we did array above).  Make the slow-path tests.
-    // If this is a virtual call, we generate a funny guard.  We grab
-    // the vtable entry corresponding to clone() from the target object.
-    // If the target method which we are calling happens to be the
-    // Object clone() method, we pass the guard.  We do not need this
-    // guard for non-virtual calls; the caller is known to be the native
-    // Object clone().
-    if (is_virtual) {
-      generate_virtual_guard(obj_klass, slow_region);
+      // Present the results of the slow call.
+      result_reg->init_req(_instance_path, control());
+      result_val->init_req(_instance_path, alloc_obj);
+      result_i_o ->set_req(_instance_path, i_o());
+      result_mem ->set_req(_instance_path, reset_memory());
     }
 
-    // The object must be cloneable and must not have a finalizer.
-    // Both of these conditions may be checked in a single test.
-    // We could optimize the cloneable test further, but we don't care.
-    generate_access_flags_guard(obj_klass,
-                                // Test both conditions:
-                                JVM_ACC_IS_CLONEABLE | JVM_ACC_HAS_FINALIZER,
-                                // Must be cloneable but not finalizer:
-                                JVM_ACC_IS_CLONEABLE,
-                                slow_region);
-  }
+    // Generate code for the slow case.  We make a call to clone().
+    set_control(_gvn.transform(slow_region));
+    if (!stopped()) {
+      PreserveJVMState pjvms(this);
+      CallJavaNode* slow_call = generate_method_call(vmIntrinsics::_clone, is_virtual);
+      Node* slow_result = set_results_for_java_call(slow_call);
+      // this->control() comes from set_results_for_java_call
+      result_reg->init_req(_slow_path, control());
+      result_val->init_req(_slow_path, slow_result);
+      result_i_o ->set_req(_slow_path, i_o());
+      result_mem ->set_req(_slow_path, reset_memory());
+    }
 
-  if (!stopped()) {
-    // It's an instance, and it passed the slow-path tests.
-    PreserveJVMState pjvms(this);
-    Node* obj_size = NULL;
-    Node* alloc_obj = new_instance(obj_klass, NULL, raw_mem_only, &obj_size);
-
-    copy_to_clone(obj, alloc_obj, obj_size, false, !use_ReduceInitialCardMarks());
-
-    // Present the results of the slow call.
-    result_reg->init_req(_instance_path, control());
-    result_val->init_req(_instance_path, alloc_obj);
-    result_i_o ->set_req(_instance_path, i_o());
-    result_mem ->set_req(_instance_path, reset_memory());
-  }
-
-  // Generate code for the slow case.  We make a call to clone().
-  set_control(_gvn.transform(slow_region));
-  if (!stopped()) {
-    PreserveJVMState pjvms(this);
-    CallJavaNode* slow_call = generate_method_call(vmIntrinsics::_clone, is_virtual);
-    Node* slow_result = set_results_for_java_call(slow_call);
-    // this->control() comes from set_results_for_java_call
-    result_reg->init_req(_slow_path, control());
-    result_val->init_req(_slow_path, slow_result);
-    result_i_o ->set_req(_slow_path, i_o());
-    result_mem ->set_req(_slow_path, reset_memory());
-  }
-
-  // Return the combined state.
-  set_control(    _gvn.transform(result_reg) );
-  set_i_o(        _gvn.transform(result_i_o) );
-  set_all_memory( _gvn.transform(result_mem) );
+    // Return the combined state.
+    set_control(    _gvn.transform(result_reg) );
+    set_i_o(        _gvn.transform(result_i_o) );
+    set_all_memory( _gvn.transform(result_mem) );
+  } //original reexecute and sp are set back here
 
   push(_gvn.transform(result_val));
 
diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/hotspot/src/share/vm/opto/loopnode.cpp
index a36d0a534fc..a1d87225203 100644
--- a/hotspot/src/share/vm/opto/loopnode.cpp
+++ b/hotspot/src/share/vm/opto/loopnode.cpp
@@ -1420,13 +1420,12 @@ static void log_loop_tree(IdealLoopTree* root, IdealLoopTree* loop, CompileLog*
 }
 
 //=============================================================================
-//------------------------------PhaseIdealLoop---------------------------------
+//----------------------------build_and_optimize-------------------------------
 // Create a PhaseLoop.  Build the ideal Loop tree.  Map each Ideal Node to
 // its corresponding LoopNode.  If 'optimize' is true, do some loop cleanups.
-PhaseIdealLoop::PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify_me, bool do_split_ifs )
-  : PhaseTransform(Ideal_Loop),
-    _igvn(igvn),
-    _dom_lca_tags(C->comp_arena()) {
+void PhaseIdealLoop::build_and_optimize(bool do_split_ifs) {
+  int old_progress = C->major_progress();
+
   // Reset major-progress flag for the driver's heuristics
   C->clear_major_progress();
 
@@ -1465,18 +1464,20 @@ PhaseIdealLoop::PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify
   }
 
   // No loops after all
-  if( !_ltree_root->_child ) C->set_has_loops(false);
+  if( !_ltree_root->_child && !_verify_only ) C->set_has_loops(false);
 
   // There should always be an outer loop containing the Root and Return nodes.
   // If not, we have a degenerate empty program.  Bail out in this case.
   if (!has_node(C->root())) {
-    C->clear_major_progress();
-    C->record_method_not_compilable("empty program detected during loop optimization");
+    if (!_verify_only) {
+      C->clear_major_progress();
+      C->record_method_not_compilable("empty program detected during loop optimization");
+    }
     return;
   }
 
   // Nothing to do, so get out
-  if( !C->has_loops() && !do_split_ifs && !verify_me) {
+  if( !C->has_loops() && !do_split_ifs && !_verify_me && !_verify_only ) {
     _igvn.optimize();           // Cleanup NeverBranches
     return;
   }
@@ -1486,7 +1487,7 @@ PhaseIdealLoop::PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify
 
   // Split shared headers and insert loop landing pads.
   // Do not bother doing this on the Root loop of course.
-  if( !verify_me && _ltree_root->_child ) {
+  if( !_verify_me && !_verify_only && _ltree_root->_child ) {
     if( _ltree_root->_child->beautify_loops( this ) ) {
       // Re-build loop tree!
       _ltree_root->_child = NULL;
@@ -1515,23 +1516,25 @@ PhaseIdealLoop::PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify
 
   Dominators();
 
-  // As a side effect, Dominators removed any unreachable CFG paths
-  // into RegionNodes.  It doesn't do this test against Root, so
-  // we do it here.
-  for( uint i = 1; i < C->root()->req(); i++ ) {
-    if( !_nodes[C->root()->in(i)->_idx] ) {    // Dead path into Root?
-      _igvn.hash_delete(C->root());
-      C->root()->del_req(i);
-      _igvn._worklist.push(C->root());
-      i--;                      // Rerun same iteration on compressed edges
+  if (!_verify_only) {
+    // As a side effect, Dominators removed any unreachable CFG paths
+    // into RegionNodes.  It doesn't do this test against Root, so
+    // we do it here.
+    for( uint i = 1; i < C->root()->req(); i++ ) {
+      if( !_nodes[C->root()->in(i)->_idx] ) {    // Dead path into Root?
+        _igvn.hash_delete(C->root());
+        C->root()->del_req(i);
+        _igvn._worklist.push(C->root());
+        i--;                      // Rerun same iteration on compressed edges
+      }
     }
-  }
 
-  // Given dominators, try to find inner loops with calls that must
-  // always be executed (call dominates loop tail).  These loops do
-  // not need a separate safepoint.
-  Node_List cisstack(a);
-  _ltree_root->check_safepts(visited, cisstack);
+    // Given dominators, try to find inner loops with calls that must
+    // always be executed (call dominates loop tail).  These loops do
+    // not need a separate safepoint.
+    Node_List cisstack(a);
+    _ltree_root->check_safepts(visited, cisstack);
+  }
 
   // Walk the DATA nodes and place into loops.  Find earliest control
   // node.  For CFG nodes, the _nodes array starts out and remains
@@ -1548,11 +1551,11 @@ PhaseIdealLoop::PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify
   // it will be processed among C->top() inputs
   worklist.push( C->top() );
   visited.set( C->top()->_idx ); // Set C->top() as visited now
-  build_loop_early( visited, worklist, nstack, verify_me );
+  build_loop_early( visited, worklist, nstack );
 
   // Given early legal placement, try finding counted loops.  This placement
   // is good enough to discover most loop invariants.
-  if( !verify_me )
+  if( !_verify_me && !_verify_only )
     _ltree_root->counted_loop( this );
 
   // Find latest loop placement.  Find ideal loop placement.
@@ -1562,16 +1565,25 @@ PhaseIdealLoop::PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify
   worklist.push( C->root() );
   NOT_PRODUCT( C->verify_graph_edges(); )
   worklist.push( C->top() );
-  build_loop_late( visited, worklist, nstack, verify_me );
+  build_loop_late( visited, worklist, nstack );
+
+  if (_verify_only) {
+    // restore major progress flag
+    for (int i = 0; i < old_progress; i++)
+      C->set_major_progress();
+    assert(C->unique() == unique, "verification mode made Nodes? ? ?");
+    assert(_igvn._worklist.size() == 0, "shouldn't push anything");
+    return;
+  }
 
   // clear out the dead code
   while(_deadlist.size()) {
-    igvn.remove_globally_dead_node(_deadlist.pop());
+    _igvn.remove_globally_dead_node(_deadlist.pop());
   }
 
 #ifndef PRODUCT
   C->verify_graph_edges();
-  if( verify_me ) {             // Nested verify pass?
+  if( _verify_me ) {             // Nested verify pass?
     // Check to see if the verify mode is broken
     assert(C->unique() == unique, "non-optimize mode made Nodes? ? ?");
     return;
@@ -1678,7 +1690,7 @@ static int fail;                // debug only, so its multi-thread dont care
 void PhaseIdealLoop::verify() const {
   int old_progress = C->major_progress();
   ResourceMark rm;
-  PhaseIdealLoop loop_verify( _igvn, this, false );
+  PhaseIdealLoop loop_verify( _igvn, this );
   VectorSet visited(Thread::current()->resource_area());
 
   fail = 0;
@@ -2138,54 +2150,58 @@ int PhaseIdealLoop::build_loop_tree_impl( Node *n, int pre_order ) {
         // optimizing an infinite loop?
         l = _ltree_root;        // Oops, found infinite loop
 
-        // Insert the NeverBranch between 'm' and it's control user.
-        NeverBranchNode *iff = new (C, 1) NeverBranchNode( m );
-        _igvn.register_new_node_with_optimizer(iff);
-        set_loop(iff, l);
-        Node *if_t = new (C, 1) CProjNode( iff, 0 );
-        _igvn.register_new_node_with_optimizer(if_t);
-        set_loop(if_t, l);
+        if (!_verify_only) {
+          // Insert the NeverBranch between 'm' and it's control user.
+          NeverBranchNode *iff = new (C, 1) NeverBranchNode( m );
+          _igvn.register_new_node_with_optimizer(iff);
+          set_loop(iff, l);
+          Node *if_t = new (C, 1) CProjNode( iff, 0 );
+          _igvn.register_new_node_with_optimizer(if_t);
+          set_loop(if_t, l);
 
-        Node* cfg = NULL;       // Find the One True Control User of m
-        for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
-          Node* x = m->fast_out(j);
-          if (x->is_CFG() && x != m && x != iff)
-            { cfg = x; break; }
+          Node* cfg = NULL;       // Find the One True Control User of m
+          for (DUIterator_Fast jmax, j = m->fast_outs(jmax); j < jmax; j++) {
+            Node* x = m->fast_out(j);
+            if (x->is_CFG() && x != m && x != iff)
+              { cfg = x; break; }
+          }
+          assert(cfg != NULL, "must find the control user of m");
+          uint k = 0;             // Probably cfg->in(0)
+          while( cfg->in(k) != m ) k++; // But check incase cfg is a Region
+          cfg->set_req( k, if_t ); // Now point to NeverBranch
+
+          // Now create the never-taken loop exit
+          Node *if_f = new (C, 1) CProjNode( iff, 1 );
+          _igvn.register_new_node_with_optimizer(if_f);
+          set_loop(if_f, l);
+          // Find frame ptr for Halt.  Relies on the optimizer
+          // V-N'ing.  Easier and quicker than searching through
+          // the program structure.
+          Node *frame = new (C, 1) ParmNode( C->start(), TypeFunc::FramePtr );
+          _igvn.register_new_node_with_optimizer(frame);
+          // Halt & Catch Fire
+          Node *halt = new (C, TypeFunc::Parms) HaltNode( if_f, frame );
+          _igvn.register_new_node_with_optimizer(halt);
+          set_loop(halt, l);
+          C->root()->add_req(halt);
         }
-        assert(cfg != NULL, "must find the control user of m");
-        uint k = 0;             // Probably cfg->in(0)
-        while( cfg->in(k) != m ) k++; // But check incase cfg is a Region
-        cfg->set_req( k, if_t ); // Now point to NeverBranch
-
-        // Now create the never-taken loop exit
-        Node *if_f = new (C, 1) CProjNode( iff, 1 );
-        _igvn.register_new_node_with_optimizer(if_f);
-        set_loop(if_f, l);
-        // Find frame ptr for Halt.  Relies on the optimizer
-        // V-N'ing.  Easier and quicker than searching through
-        // the program structure.
-        Node *frame = new (C, 1) ParmNode( C->start(), TypeFunc::FramePtr );
-        _igvn.register_new_node_with_optimizer(frame);
-        // Halt & Catch Fire
-        Node *halt = new (C, TypeFunc::Parms) HaltNode( if_f, frame );
-        _igvn.register_new_node_with_optimizer(halt);
-        set_loop(halt, l);
-        C->root()->add_req(halt);
         set_loop(C->root(), _ltree_root);
       }
     }
     // Weeny check for irreducible.  This child was already visited (this
     // IS the post-work phase).  Is this child's loop header post-visited
     // as well?  If so, then I found another entry into the loop.
-    while( is_postvisited(l->_head) ) {
-      // found irreducible
-      l->_irreducible = 1; // = true
-      l = l->_parent;
-      _has_irreducible_loops = true;
-      // Check for bad CFG here to prevent crash, and bailout of compile
-      if (l == NULL) {
-        C->record_method_not_compilable("unhandled CFG detected during loop optimization");
-        return pre_order;
+    if (!_verify_only) {
+      while( is_postvisited(l->_head) ) {
+        // found irreducible
+        l->_irreducible = 1; // = true
+        l = l->_parent;
+        _has_irreducible_loops = true;
+        // Check for bad CFG here to prevent crash, and bailout of compile
+        if (l == NULL) {
+          C->record_method_not_compilable("unhandled CFG detected during loop optimization");
+          return pre_order;
+        }
       }
     }
 
@@ -2253,7 +2269,7 @@ int PhaseIdealLoop::build_loop_tree_impl( Node *n, int pre_order ) {
 // Put Data nodes into some loop nest, by setting the _nodes[]->loop mapping.
 // First pass computes the earliest controlling node possible.  This is the
 // controlling input with the deepest dominating depth.
-void PhaseIdealLoop::build_loop_early( VectorSet &visited, Node_List &worklist, Node_Stack &nstack, const PhaseIdealLoop *verify_me ) {
+void PhaseIdealLoop::build_loop_early( VectorSet &visited, Node_List &worklist, Node_Stack &nstack ) {
   while (worklist.size() != 0) {
     // Use local variables nstack_top_n & nstack_top_i to cache values
     // on nstack's top.
@@ -2285,7 +2301,7 @@ void PhaseIdealLoop::build_loop_early( VectorSet &visited, Node_List &worklist,
           // (the old code here would yank a 2nd safepoint after seeing a
           // first one, even though the 1st did not dominate in the loop body
           // and thus could be avoided indefinitely)
-          if( !verify_me && ilt->_has_sfpt && n->Opcode() == Op_SafePoint &&
+          if( !_verify_only && !_verify_me && ilt->_has_sfpt && n->Opcode() == Op_SafePoint &&
               is_deleteable_safept(n)) {
             Node *in = n->in(TypeFunc::Control);
             lazy_replace(n,in);       // Pull safepoint now
@@ -2408,12 +2424,31 @@ Node *PhaseIdealLoop::compute_idom( Node *region ) const {
   return LCA;
 }
 
-//------------------------------get_late_ctrl----------------------------------
-// Compute latest legal control.
-Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
-  assert(early != NULL, "early control should not be NULL");
+bool PhaseIdealLoop::verify_dominance(Node* n, Node* use, Node* LCA, Node* early) {
+  bool had_error = false;
+#ifdef ASSERT
+  if (early != C->root()) {
+    // Make sure that there's a dominance path from use to LCA
+    Node* d = use;
+    while (d != LCA) {
+      d = idom(d);
+      if (d == C->root()) {
+        tty->print_cr("*** Use %d isn't dominated by def %s", use->_idx, n->_idx);
+        n->dump();
+        use->dump();
+        had_error = true;
+        break;
+      }
+    }
+  }
+#endif
+  return had_error;
+}
 
+
+Node* PhaseIdealLoop::compute_lca_of_uses(Node* n, Node* early, bool verify) {
   // Compute LCA over list of uses
+  bool had_error = false;
   Node *LCA = NULL;
   for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax && LCA != early; i++) {
     Node* c = n->fast_out(i);
@@ -2423,15 +2458,34 @@ Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
       for( uint j=1; j<c->req(); j++ ) {// For all inputs
         if( c->in(j) == n ) {   // Found matching input?
           Node *use = c->in(0)->in(j);
+          if (_verify_only && use->is_top()) continue;
           LCA = dom_lca_for_get_late_ctrl( LCA, use, n );
+          if (verify) had_error = verify_dominance(n, use, LCA, early) || had_error;
         }
       }
     } else {
       // For CFG data-users, use is in the block just prior
       Node *use = has_ctrl(c) ? get_ctrl(c) : c->in(0);
       LCA = dom_lca_for_get_late_ctrl( LCA, use, n );
+      if (verify) had_error = verify_dominance(n, use, LCA, early) || had_error;
     }
   }
+  assert(!had_error, "bad dominance");
+  return LCA;
+}
+
+//------------------------------get_late_ctrl----------------------------------
+// Compute latest legal control.
+Node *PhaseIdealLoop::get_late_ctrl( Node *n, Node *early ) {
+  assert(early != NULL, "early control should not be NULL");
+
+  Node* LCA = compute_lca_of_uses(n, early);
+#ifdef ASSERT
+  if (LCA == C->root() && LCA != early) {
+    // def doesn't dominate uses so print some useful debugging output
+    compute_lca_of_uses(n, early, true);
+  }
+#endif
 
   // if this is a load, check for anti-dependent stores
   // We use a conservative algorithm to identify potential interfering
@@ -2576,7 +2630,7 @@ void PhaseIdealLoop::clear_dom_lca_tags() {
 //------------------------------build_loop_late--------------------------------
 // Put Data nodes into some loop nest, by setting the _nodes[]->loop mapping.
 // Second pass finds latest legal placement, and ideal loop placement.
-void PhaseIdealLoop::build_loop_late( VectorSet &visited, Node_List &worklist, Node_Stack &nstack, const PhaseIdealLoop *verify_me ) {
+void PhaseIdealLoop::build_loop_late( VectorSet &visited, Node_List &worklist, Node_Stack &nstack ) {
   while (worklist.size() != 0) {
     Node *n = worklist.pop();
     // Only visit once
@@ -2612,7 +2666,7 @@ void PhaseIdealLoop::build_loop_late( VectorSet &visited, Node_List &worklist, N
         }
       } else {
         // All of n's children have been processed, complete post-processing.
-        build_loop_late_post(n, verify_me);
+        build_loop_late_post(n);
         if (nstack.is_empty()) {
           // Finished all nodes on stack.
           // Process next node on the worklist.
@@ -2631,9 +2685,9 @@ void PhaseIdealLoop::build_loop_late( VectorSet &visited, Node_List &worklist, N
 //------------------------------build_loop_late_post---------------------------
 // Put Data nodes into some loop nest, by setting the _nodes[]->loop mapping.
 // Second pass finds latest legal placement, and ideal loop placement.
-void PhaseIdealLoop::build_loop_late_post( Node *n, const PhaseIdealLoop *verify_me ) {
+void PhaseIdealLoop::build_loop_late_post( Node *n ) {
 
-  if (n->req() == 2 && n->Opcode() == Op_ConvI2L && !C->major_progress()) {
+  if (n->req() == 2 && n->Opcode() == Op_ConvI2L && !C->major_progress() && !_verify_only) {
     _igvn._worklist.push(n);  // Maybe we'll normalize it, if no more loops.
   }
 
@@ -2714,6 +2768,7 @@ void PhaseIdealLoop::build_loop_late_post( Node *n, const PhaseIdealLoop *verify
     if( get_loop(legal)->_nest < get_loop(least)->_nest )
       least = legal;
   }
+  assert(early == legal || legal != C->root(), "bad dominance of inputs");
 
   // Try not to place code on a loop entry projection
   // which can inhibit range check elimination.
@@ -2731,8 +2786,8 @@ void PhaseIdealLoop::build_loop_late_post( Node *n, const PhaseIdealLoop *verify
 #ifdef ASSERT
   // If verifying, verify that 'verify_me' has a legal location
   // and choose it as our location.
-  if( verify_me ) {
-    Node *v_ctrl = verify_me->get_ctrl_no_update(n);
+  if( _verify_me ) {
+    Node *v_ctrl = _verify_me->get_ctrl_no_update(n);
     Node *legal = LCA;
     while( early != legal ) {   // While not at earliest legal
       if( legal == v_ctrl ) break;  // Check for prior good location
diff --git a/hotspot/src/share/vm/opto/loopnode.hpp b/hotspot/src/share/vm/opto/loopnode.hpp
index ab172a3eb43..892095595ed 100644
--- a/hotspot/src/share/vm/opto/loopnode.hpp
+++ b/hotspot/src/share/vm/opto/loopnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -442,6 +442,9 @@ class PhaseIdealLoop : public PhaseTransform {
   uint *_preorders;
   uint _max_preorder;
 
+  const PhaseIdealLoop* _verify_me;
+  bool _verify_only;
+
   // Allocate _preorders[] array
   void allocate_preorders() {
     _max_preorder = C->unique()+8;
@@ -497,6 +500,12 @@ class PhaseIdealLoop : public PhaseTransform {
   Node_Array _dom_lca_tags;
   void   init_dom_lca_tags();
   void   clear_dom_lca_tags();
+
+  // Helper for debugging bad dominance relationships
+  bool verify_dominance(Node* n, Node* use, Node* LCA, Node* early);
+
+  Node* compute_lca_of_uses(Node* n, Node* early, bool verify = false);
+
   // Inline wrapper for frequent cases:
   // 1) only one use
   // 2) a use is the same as the current LCA passed as 'n1'
@@ -511,6 +520,7 @@ class PhaseIdealLoop : public PhaseTransform {
     return find_non_split_ctrl(n);
   }
   Node *dom_lca_for_get_late_ctrl_internal( Node *lca, Node *n, Node *tag );
+
   // true if CFG node d dominates CFG node n
   bool is_dominator(Node *d, Node *n);
 
@@ -621,9 +631,9 @@ private:
   IdealLoopTree *sort( IdealLoopTree *loop, IdealLoopTree *innermost );
 
   // Place Data nodes in some loop nest
-  void build_loop_early( VectorSet &visited, Node_List &worklist, Node_Stack &nstack, const PhaseIdealLoop *verify_me );
-  void build_loop_late ( VectorSet &visited, Node_List &worklist, Node_Stack &nstack, const PhaseIdealLoop *verify_me );
-  void build_loop_late_post ( Node* n, const PhaseIdealLoop *verify_me );
+  void build_loop_early( VectorSet &visited, Node_List &worklist, Node_Stack &nstack );
+  void build_loop_late ( VectorSet &visited, Node_List &worklist, Node_Stack &nstack );
+  void build_loop_late_post ( Node* n );
 
   // Array of immediate dominance info for each CFG node indexed by node idx
 private:
@@ -662,6 +672,19 @@ private:
   // Is safept not required by an outer loop?
   bool is_deleteable_safept(Node* sfpt);
 
+  // Perform verification that the graph is valid.
+  PhaseIdealLoop( PhaseIterGVN &igvn) :
+    PhaseTransform(Ideal_Loop),
+    _igvn(igvn),
+    _dom_lca_tags(C->comp_arena()),
+    _verify_me(NULL),
+    _verify_only(true) {
+    build_and_optimize(false);
+  }
+
+  // build the loop tree and perform any requested optimizations
+  void build_and_optimize(bool do_split_if);
+
 public:
   // Dominators for the sea of nodes
   void Dominators();
@@ -671,7 +694,32 @@ public:
   Node *dom_lca_internal( Node *n1, Node *n2 ) const;
 
   // Compute the Ideal Node to Loop mapping
-  PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify_me, bool do_split_ifs );
+  PhaseIdealLoop( PhaseIterGVN &igvn, bool do_split_ifs) :
+    PhaseTransform(Ideal_Loop),
+    _igvn(igvn),
+    _dom_lca_tags(C->comp_arena()),
+    _verify_me(NULL),
+    _verify_only(false) {
+    build_and_optimize(do_split_ifs);
+  }
+
+  // Verify that verify_me made the same decisions as a fresh run.
+  PhaseIdealLoop( PhaseIterGVN &igvn, const PhaseIdealLoop *verify_me) :
+    PhaseTransform(Ideal_Loop),
+    _igvn(igvn),
+    _dom_lca_tags(C->comp_arena()),
+    _verify_me(verify_me),
+    _verify_only(false) {
+    build_and_optimize(false);
+  }
+
+  // Build and verify the loop tree without modifying the graph.  This
+  // is useful to verify that all inputs properly dominate their uses.
+  static void verify(PhaseIterGVN& igvn) {
+#ifdef ASSERT
+    PhaseIdealLoop v(igvn);
+#endif
+  }
 
   // True if the method has at least 1 irreducible loop
   bool _has_irreducible_loops;
diff --git a/hotspot/src/share/vm/opto/mulnode.cpp b/hotspot/src/share/vm/opto/mulnode.cpp
index b9dc06bb369..af62a5fae76 100644
--- a/hotspot/src/share/vm/opto/mulnode.cpp
+++ b/hotspot/src/share/vm/opto/mulnode.cpp
@@ -608,16 +608,14 @@ Node *AndLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   }
 
   // Are we masking a long that was converted from an int with a mask
-  // that fits in 32-bits?  Commute them and use an AndINode.
-  if (op == Op_ConvI2L && (mask & CONST64(0xFFFFFFFF00000000)) == 0) {
-    // If we are doing an UI2L conversion (i.e. the mask is
-    // 0x00000000FFFFFFFF) we cannot convert the AndL to an AndI
-    // because the AndI would be optimized away later in Identity.
-    if (mask != CONST64(0x00000000FFFFFFFF)) {
-      Node* andi = new (phase->C, 3) AndINode(in1->in(1), phase->intcon(mask));
-      andi = phase->transform(andi);
-      return new (phase->C, 2) ConvI2LNode(andi);
-    }
+  // that fits in 32-bits?  Commute them and use an AndINode.  Don't
+  // convert masks which would cause a sign extension of the integer
+  // value.  This check includes UI2L masks (0x00000000FFFFFFFF) which
+  // would be optimized away later in Identity.
+  if (op == Op_ConvI2L && (mask & CONST64(0xFFFFFFFF80000000)) == 0) {
+    Node* andi = new (phase->C, 3) AndINode(in1->in(1), phase->intcon(mask));
+    andi = phase->transform(andi);
+    return new (phase->C, 2) ConvI2LNode(andi);
   }
 
   // Masking off sign bits?  Dont make them!
diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp
index 180e1c5da45..2a4919ada65 100644
--- a/hotspot/src/share/vm/opto/output.cpp
+++ b/hotspot/src/share/vm/opto/output.cpp
@@ -911,8 +911,9 @@ void Compile::Process_OopMap_Node(MachNode *mach, int current_offset) {
     ciMethod* scope_method = method ? method : _method;
     // Describe the scope here
     assert(jvms->bci() >= InvocationEntryBci && jvms->bci() <= 0x10000, "must be a valid or entry BCI");
+    assert(!jvms->should_reexecute() || depth==max_depth, "reexecute allowed only for the youngest");
     // Now we can describe the scope.
-    debug_info()->describe_scope(safepoint_pc_offset,scope_method,jvms->bci(),locvals,expvals,monvals);
+    debug_info()->describe_scope(safepoint_pc_offset,scope_method,jvms->bci(),jvms->should_reexecute(),locvals,expvals,monvals);
   } // End jvms loop
 
   // Mark the end of the scope set.
@@ -994,7 +995,8 @@ void NonSafepointEmitter::emit_non_safepoint() {
   for (int depth = 1; depth <= max_depth; depth++) {
     JVMState* jvms = youngest_jvms->of_depth(depth);
     ciMethod* method = jvms->has_method() ? jvms->method() : NULL;
-    debug_info->describe_scope(pc_offset, method, jvms->bci());
+    assert(!jvms->should_reexecute() || depth==max_depth, "reexecute allowed only for the youngest");
+    debug_info->describe_scope(pc_offset, method, jvms->bci(), jvms->should_reexecute());
   }
 
   // Mark the end of the scope set.
diff --git a/hotspot/src/share/vm/opto/phase.cpp b/hotspot/src/share/vm/opto/phase.cpp
index b0ea80a8242..5beaede7a17 100644
--- a/hotspot/src/share/vm/opto/phase.cpp
+++ b/hotspot/src/share/vm/opto/phase.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -53,6 +53,7 @@ elapsedTimer Phase::_t_codeGeneration;
 elapsedTimer Phase::_t_registerMethod;
 elapsedTimer Phase::_t_temporaryTimer1;
 elapsedTimer Phase::_t_temporaryTimer2;
+elapsedTimer Phase::_t_idealLoopVerify;
 
 // Subtimers for _t_optimizer
 elapsedTimer   Phase::_t_iterGVN;
@@ -88,51 +89,52 @@ void Phase::print_timers() {
   tty->print_cr ("Accumulated compiler times:");
   tty->print_cr ("---------------------------");
   tty->print_cr ("  Total compilation: %3.3f sec.", Phase::_t_totalCompilation.seconds());
-  tty->print    ("    method compilation : %3.3f sec", Phase::_t_methodCompilation.seconds());
+  tty->print    ("    method compilation   : %3.3f sec", Phase::_t_methodCompilation.seconds());
   tty->print    ("/%d bytes",_total_bytes_compiled);
   tty->print_cr (" (%3.0f bytes per sec) ", Phase::_total_bytes_compiled / Phase::_t_methodCompilation.seconds());
-  tty->print_cr ("    stub compilation   : %3.3f sec.", Phase::_t_stubCompilation.seconds());
+  tty->print_cr ("    stub compilation     : %3.3f sec.", Phase::_t_stubCompilation.seconds());
   tty->print_cr ("  Phases:");
-  tty->print_cr ("    parse        : %3.3f sec", Phase::_t_parser.seconds());
+  tty->print_cr ("    parse          : %3.3f sec", Phase::_t_parser.seconds());
   if (DoEscapeAnalysis) {
-    tty->print_cr ("    escape analysis : %3.3f sec", Phase::_t_escapeAnalysis.seconds());
+    tty->print_cr ("    escape analysis   : %3.3f sec", Phase::_t_escapeAnalysis.seconds());
   }
-  tty->print_cr ("    optimizer    : %3.3f sec", Phase::_t_optimizer.seconds());
+  tty->print_cr ("    optimizer      : %3.3f sec", Phase::_t_optimizer.seconds());
   if( Verbose || WizardMode ) {
-    tty->print_cr ("      iterGVN      : %3.3f sec", Phase::_t_iterGVN.seconds());
-    tty->print_cr ("      idealLoop    : %3.3f sec", Phase::_t_idealLoop.seconds());
-    tty->print_cr ("      ccp          : %3.3f sec", Phase::_t_ccp.seconds());
-    tty->print_cr ("      iterGVN2     : %3.3f sec", Phase::_t_iterGVN2.seconds());
-    tty->print_cr ("      graphReshape : %3.3f sec", Phase::_t_graphReshaping.seconds());
+    tty->print_cr ("      iterGVN        : %3.3f sec", Phase::_t_iterGVN.seconds());
+    tty->print_cr ("      idealLoop      : %3.3f sec", Phase::_t_idealLoop.seconds());
+    tty->print_cr ("      idealLoopVerify: %3.3f sec", Phase::_t_idealLoopVerify.seconds());
+    tty->print_cr ("      ccp            : %3.3f sec", Phase::_t_ccp.seconds());
+    tty->print_cr ("      iterGVN2       : %3.3f sec", Phase::_t_iterGVN2.seconds());
+    tty->print_cr ("      graphReshape   : %3.3f sec", Phase::_t_graphReshaping.seconds());
     double optimizer_subtotal = Phase::_t_iterGVN.seconds() +
       Phase::_t_idealLoop.seconds() + Phase::_t_ccp.seconds() +
       Phase::_t_graphReshaping.seconds();
     double percent_of_optimizer = ((optimizer_subtotal == 0.0) ? 0.0 : (optimizer_subtotal / Phase::_t_optimizer.seconds() * 100.0));
-    tty->print_cr ("      subtotal     : %3.3f sec,  %3.2f %%", optimizer_subtotal, percent_of_optimizer);
+    tty->print_cr ("      subtotal       : %3.3f sec,  %3.2f %%", optimizer_subtotal, percent_of_optimizer);
   }
-  tty->print_cr ("    matcher      : %3.3f sec", Phase::_t_matcher.seconds());
-  tty->print_cr ("    scheduler    : %3.3f sec", Phase::_t_scheduler.seconds());
-  tty->print_cr ("    regalloc     : %3.3f sec", Phase::_t_registerAllocation.seconds());
+  tty->print_cr ("    matcher        : %3.3f sec", Phase::_t_matcher.seconds());
+  tty->print_cr ("    scheduler      : %3.3f sec", Phase::_t_scheduler.seconds());
+  tty->print_cr ("    regalloc       : %3.3f sec", Phase::_t_registerAllocation.seconds());
   if( Verbose || WizardMode ) {
-    tty->print_cr ("      ctorChaitin  : %3.3f sec", Phase::_t_ctorChaitin.seconds());
-    tty->print_cr ("      buildIFG     : %3.3f sec", Phase::_t_buildIFGphysical.seconds());
-    tty->print_cr ("      computeLive  : %3.3f sec", Phase::_t_computeLive.seconds());
-    tty->print_cr ("      regAllocSplit: %3.3f sec", Phase::_t_regAllocSplit.seconds());
+    tty->print_cr ("      ctorChaitin    : %3.3f sec", Phase::_t_ctorChaitin.seconds());
+    tty->print_cr ("      buildIFG       : %3.3f sec", Phase::_t_buildIFGphysical.seconds());
+    tty->print_cr ("      computeLive    : %3.3f sec", Phase::_t_computeLive.seconds());
+    tty->print_cr ("      regAllocSplit  : %3.3f sec", Phase::_t_regAllocSplit.seconds());
     tty->print_cr ("      postAllocCopyRemoval: %3.3f sec", Phase::_t_postAllocCopyRemoval.seconds());
-    tty->print_cr ("      fixupSpills  : %3.3f sec", Phase::_t_fixupSpills.seconds());
+    tty->print_cr ("      fixupSpills    : %3.3f sec", Phase::_t_fixupSpills.seconds());
     double regalloc_subtotal = Phase::_t_ctorChaitin.seconds() +
       Phase::_t_buildIFGphysical.seconds() + Phase::_t_computeLive.seconds() +
       Phase::_t_regAllocSplit.seconds()    + Phase::_t_fixupSpills.seconds() +
       Phase::_t_postAllocCopyRemoval.seconds();
     double percent_of_regalloc = ((regalloc_subtotal == 0.0) ? 0.0 : (regalloc_subtotal / Phase::_t_registerAllocation.seconds() * 100.0));
-    tty->print_cr ("      subtotal     : %3.3f sec,  %3.2f %%", regalloc_subtotal, percent_of_regalloc);
+    tty->print_cr ("      subtotal       : %3.3f sec,  %3.2f %%", regalloc_subtotal, percent_of_regalloc);
   }
-  tty->print_cr ("    macroExpand  : %3.3f sec", Phase::_t_macroExpand.seconds());
-  tty->print_cr ("    blockOrdering: %3.3f sec", Phase::_t_blockOrdering.seconds());
-  tty->print_cr ("    peephole     : %3.3f sec", Phase::_t_peephole.seconds());
-  tty->print_cr ("    codeGen      : %3.3f sec", Phase::_t_codeGeneration.seconds());
-  tty->print_cr ("    install_code : %3.3f sec", Phase::_t_registerMethod.seconds());
-  tty->print_cr ("    ------------ : ----------");
+  tty->print_cr ("    macroExpand    : %3.3f sec", Phase::_t_macroExpand.seconds());
+  tty->print_cr ("    blockOrdering  : %3.3f sec", Phase::_t_blockOrdering.seconds());
+  tty->print_cr ("    peephole       : %3.3f sec", Phase::_t_peephole.seconds());
+  tty->print_cr ("    codeGen        : %3.3f sec", Phase::_t_codeGeneration.seconds());
+  tty->print_cr ("    install_code   : %3.3f sec", Phase::_t_registerMethod.seconds());
+  tty->print_cr ("    -------------- : ----------");
   double phase_subtotal = Phase::_t_parser.seconds() +
     (DoEscapeAnalysis ? Phase::_t_escapeAnalysis.seconds() : 0.0) +
     Phase::_t_optimizer.seconds() + Phase::_t_graphReshaping.seconds() +
@@ -143,7 +145,7 @@ void Phase::print_timers() {
   double percent_of_method_compile = ((phase_subtotal == 0.0) ? 0.0 : phase_subtotal / Phase::_t_methodCompilation.seconds()) * 100.0;
   // counters inside Compile::CodeGen include time for adapters and stubs
   // so phase-total can be greater than 100%
-  tty->print_cr ("    total        : %3.3f sec,  %3.2f %%", phase_subtotal, percent_of_method_compile);
+  tty->print_cr ("    total          : %3.3f sec,  %3.2f %%", phase_subtotal, percent_of_method_compile);
 
   assert( percent_of_method_compile > expected_method_compile_coverage ||
           phase_subtotal < minimum_meaningful_method_compile,
@@ -157,8 +159,8 @@ void Phase::print_timers() {
     tty->cr();
     tty->print_cr ("    temporaryTimer2: %3.3f sec", Phase::_t_temporaryTimer2.seconds());
   }
-  tty->print_cr ("    output    : %3.3f sec", Phase::_t_output.seconds());
-  tty->print_cr ("      isched    : %3.3f sec", Phase::_t_instrSched.seconds());
-  tty->print_cr ("      bldOopMaps: %3.3f sec", Phase::_t_buildOopMaps.seconds());
+  tty->print_cr ("    output         : %3.3f sec", Phase::_t_output.seconds());
+  tty->print_cr ("      isched         : %3.3f sec", Phase::_t_instrSched.seconds());
+  tty->print_cr ("      bldOopMaps     : %3.3f sec", Phase::_t_buildOopMaps.seconds());
 }
 #endif
diff --git a/hotspot/src/share/vm/opto/phase.hpp b/hotspot/src/share/vm/opto/phase.hpp
index a207968206f..d0d54e1d900 100644
--- a/hotspot/src/share/vm/opto/phase.hpp
+++ b/hotspot/src/share/vm/opto/phase.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -83,6 +83,7 @@ protected:
   static elapsedTimer _t_registerMethod;
   static elapsedTimer _t_temporaryTimer1;
   static elapsedTimer _t_temporaryTimer2;
+  static elapsedTimer _t_idealLoopVerify;
 
 // Subtimers for _t_optimizer
   static elapsedTimer   _t_iterGVN;
diff --git a/hotspot/src/share/vm/opto/phaseX.cpp b/hotspot/src/share/vm/opto/phaseX.cpp
index 78c48452244..02007014ddc 100644
--- a/hotspot/src/share/vm/opto/phaseX.cpp
+++ b/hotspot/src/share/vm/opto/phaseX.cpp
@@ -1622,9 +1622,11 @@ void Node::set_req_X( uint i, Node *n, PhaseIterGVN *igvn ) {
   // old goes dead?
   if( old ) {
     switch (old->outcnt()) {
-    case 0:      // Kill all his inputs, and recursively kill other dead nodes.
+    case 0:
+      // Put into the worklist to kill later. We do not kill it now because the
+      // recursive kill will delete the current node (this) if dead-loop exists
       if (!old->is_top())
-        igvn->remove_dead_node( old );
+        igvn->_worklist.push( old );
       break;
     case 1:
       if( old->is_Store() || old->has_special_unique_user() )
diff --git a/hotspot/src/share/vm/opto/postaloc.cpp b/hotspot/src/share/vm/opto/postaloc.cpp
index fa28c6aa1cc..d6bd919199a 100644
--- a/hotspot/src/share/vm/opto/postaloc.cpp
+++ b/hotspot/src/share/vm/opto/postaloc.cpp
@@ -88,6 +88,7 @@ int PhaseChaitin::yank_if_dead( Node *old, Block *current_block, Node_List *valu
       value->map(old_reg,NULL);  // Yank from value/regnd maps
       regnd->map(old_reg,NULL);  // This register's value is now unknown
     }
+    assert(old->req() <= 2, "can't handle more inputs");
     Node *tmp = old->req() > 1 ? old->in(1) : NULL;
     old->disconnect_inputs(NULL);
     if( !tmp ) break;
@@ -530,6 +531,16 @@ void PhaseChaitin::post_allocate_copy_removal() {
       // Do not change from int to pointer
       Node *val = skip_copies(n);
 
+      // Clear out a dead definition before starting so that the
+      // elimination code doesn't have to guard against it.  The
+      // definition could in fact be a kill projection with a count of
+      // 0 which is safe but since those are uninteresting for copy
+      // elimination just delete them as well.
+      if (regnd[nreg] != NULL && regnd[nreg]->outcnt() == 0) {
+        regnd.map(nreg, NULL);
+        value.map(nreg, NULL);
+      }
+
       uint n_ideal_reg = n->ideal_reg();
       if( is_single_register(n_ideal_reg) ) {
         // If Node 'n' does not change the value mapped by the register,
@@ -537,8 +548,7 @@ void PhaseChaitin::post_allocate_copy_removal() {
         // mapping so 'n' will go dead.
         if( value[nreg] != val ) {
           if (eliminate_copy_of_constant(val, n, b, value, regnd, nreg, OptoReg::Bad)) {
-            n->replace_by(regnd[nreg]);
-            j -= yank_if_dead(n,b,&value,&regnd);
+            j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
           } else {
             // Update the mapping: record new Node defined by the register
             regnd.map(nreg,n);
@@ -546,10 +556,9 @@ void PhaseChaitin::post_allocate_copy_removal() {
             // Node after skipping all copies.
             value.map(nreg,val);
           }
-        } else if( !may_be_copy_of_callee(n) && regnd[nreg]->outcnt() != 0 ) {
+        } else if( !may_be_copy_of_callee(n) ) {
           assert( n->is_Copy(), "" );
-          n->replace_by(regnd[nreg]);
-          j -= yank_if_dead(n,b,&value,&regnd);
+          j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
         }
       } else {
         // If the value occupies a register pair, record same info
@@ -565,18 +574,16 @@ void PhaseChaitin::post_allocate_copy_removal() {
         }
         if( value[nreg] != val || value[nreg_lo] != val ) {
           if (eliminate_copy_of_constant(val, n, b, value, regnd, nreg, nreg_lo)) {
-            n->replace_by(regnd[nreg]);
-            j -= yank_if_dead(n,b,&value,&regnd);
+            j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
           } else {
             regnd.map(nreg   , n );
             regnd.map(nreg_lo, n );
             value.map(nreg   ,val);
             value.map(nreg_lo,val);
           }
-        } else if( !may_be_copy_of_callee(n) && regnd[nreg]->outcnt() != 0 ) {
+        } else if( !may_be_copy_of_callee(n) ) {
           assert( n->is_Copy(), "" );
-          n->replace_by(regnd[nreg]);
-          j -= yank_if_dead(n,b,&value,&regnd);
+          j -= replace_and_yank_if_dead(n, nreg, b, value, regnd);
         }
       }
 
diff --git a/hotspot/src/share/vm/prims/jniCheck.cpp b/hotspot/src/share/vm/prims/jniCheck.cpp
index d3f35897976..0e3baac47ed 100644
--- a/hotspot/src/share/vm/prims/jniCheck.cpp
+++ b/hotspot/src/share/vm/prims/jniCheck.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc.  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
@@ -96,6 +96,7 @@ static const char * fatal_received_null_class = "JNI received a null class";
 static const char * fatal_class_not_a_class = "JNI received a class argument that is not a class";
 static const char * fatal_class_not_a_throwable_class = "JNI Throw or ThrowNew received a class argument that is not a Throwable or Throwable subclass";
 static const char * fatal_wrong_class_or_method = "Wrong object class or methodID passed to JNI call";
+static const char * fatal_non_weak_method = "non-weak methodID passed to JNI call";
 static const char * fatal_unknown_array_object = "Unknown array object passed to JNI array operations";
 static const char * fatal_object_array_expected = "Object array expected but not received for JNI array operation";
 static const char * fatal_non_array  = "Non-array passed to JNI array operations";
@@ -291,10 +292,16 @@ oop jniCheck::validate_handle(JavaThread* thr, jobject obj) {
 
 methodOop jniCheck::validate_jmethod_id(JavaThread* thr, jmethodID method_id) {
   ASSERT_OOPS_ALLOWED;
+  // do the fast jmethodID check first
   methodOop moop = JNIHandles::checked_resolve_jmethod_id(method_id);
   if (moop == NULL) {
     ReportJNIFatalError(thr, fatal_wrong_class_or_method);
   }
+  // jmethodIDs are supposed to be weak global handles, but that
+  // can be expensive so check it last
+  else if (!JNIHandles::is_weak_global_handle((jobject) method_id)) {
+    ReportJNIFatalError(thr, fatal_non_weak_method);
+  }
   return moop;
 }
 
diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
index 8333be3d70a..3e2e38246d0 100644
--- a/hotspot/src/share/vm/prims/jvm.cpp
+++ b/hotspot/src/share/vm/prims/jvm.cpp
@@ -638,11 +638,54 @@ JVM_ENTRY(void, JVM_ResolveClass(JNIEnv* env, jclass cls))
   if (PrintJVMWarnings) warning("JVM_ResolveClass not implemented");
 JVM_END
 
-// Common implementation for JVM_FindClassFromBootLoader and
-// JVM_FindClassFromLoader
-static jclass jvm_find_class_from_class_loader(JNIEnv* env, const char* name,
-                                  jboolean init, jobject loader,
-                                  jboolean throwError, TRAPS) {
+
+// Returns a class loaded by the bootstrap class loader; or null
+// if not found.  ClassNotFoundException is not thrown.
+//
+// Rationale behind JVM_FindClassFromBootLoader
+// a> JVM_FindClassFromClassLoader was never exported in the export tables.
+// b> because of (a) java.dll has a direct dependecy on the  unexported
+//    private symbol "_JVM_FindClassFromClassLoader@20".
+// c> the launcher cannot use the private symbol as it dynamically opens
+//    the entry point, so if something changes, the launcher will fail
+//    unexpectedly at runtime, it is safest for the launcher to dlopen a
+//    stable exported interface.
+// d> re-exporting JVM_FindClassFromClassLoader as public, will cause its
+//    signature to change from _JVM_FindClassFromClassLoader@20 to
+//    JVM_FindClassFromClassLoader and will not be backward compatible
+//    with older JDKs.
+// Thus a public/stable exported entry point is the right solution,
+// public here means public in linker semantics, and is exported only
+// to the JDK, and is not intended to be a public API.
+
+JVM_ENTRY(jclass, JVM_FindClassFromBootLoader(JNIEnv* env,
+                                              const char* name))
+  JVMWrapper2("JVM_FindClassFromBootLoader %s", name);
+
+  // Java libraries should ensure that name is never null...
+  if (name == NULL || (int)strlen(name) > symbolOopDesc::max_length()) {
+    // It's impossible to create this class;  the name cannot fit
+    // into the constant pool.
+    return NULL;
+  }
+
+  symbolHandle h_name = oopFactory::new_symbol_handle(name, CHECK_NULL);
+  klassOop k = SystemDictionary::resolve_or_null(h_name, CHECK_NULL);
+  if (k == NULL) {
+    return NULL;
+  }
+
+  if (TraceClassResolution) {
+    trace_class_resolution(k);
+  }
+  return (jclass) JNIHandles::make_local(env, Klass::cast(k)->java_mirror());
+JVM_END
+
+JVM_ENTRY(jclass, JVM_FindClassFromClassLoader(JNIEnv* env, const char* name,
+                                               jboolean init, jobject loader,
+                                               jboolean throwError))
+  JVMWrapper3("JVM_FindClassFromClassLoader %s throw %s", name,
+               throwError ? "error" : "exception");
   // Java libraries should ensure that name is never null...
   if (name == NULL || (int)strlen(name) > symbolOopDesc::max_length()) {
     // It's impossible to create this class;  the name cannot fit
@@ -662,40 +705,6 @@ static jclass jvm_find_class_from_class_loader(JNIEnv* env, const char* name,
     trace_class_resolution(java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(result)));
   }
   return result;
-}
-
-// Rationale behind JVM_FindClassFromBootLoader
-// a> JVM_FindClassFromClassLoader was never exported in the export tables.
-// b> because of (a) java.dll has a direct dependecy on the  unexported
-//    private symbol "_JVM_FindClassFromClassLoader@20".
-// c> the launcher cannot use the private symbol as it dynamically opens
-//    the entry point, so if something changes, the launcher will fail
-//    unexpectedly at runtime, it is safest for the launcher to dlopen a
-//    stable exported interface.
-// d> re-exporting JVM_FindClassFromClassLoader as public, will cause its
-//    signature to change from _JVM_FindClassFromClassLoader@20 to
-//    JVM_FindClassFromClassLoader and will not be backward compatible
-//    with older JDKs.
-// Thus a public/stable exported entry point is the right solution,
-// public here means public in linker semantics, and is exported only
-// to the JDK, and is not intended to be a public API.
-
-JVM_ENTRY(jclass, JVM_FindClassFromBootLoader(JNIEnv* env,
-                                              const char* name,
-                                              jboolean throwError))
-  JVMWrapper3("JVM_FindClassFromBootLoader %s throw %s", name,
-              throwError ? "error" : "exception");
-  return jvm_find_class_from_class_loader(env, name, JNI_FALSE,
-                                          (jobject)NULL, throwError, THREAD);
-JVM_END
-
-JVM_ENTRY(jclass, JVM_FindClassFromClassLoader(JNIEnv* env, const char* name,
-                                               jboolean init, jobject loader,
-                                               jboolean throwError))
-  JVMWrapper3("JVM_FindClassFromClassLoader %s throw %s", name,
-               throwError ? "error" : "exception");
-  return jvm_find_class_from_class_loader(env, name, init, loader,
-                                          throwError, THREAD);
 JVM_END
 
 
@@ -756,6 +765,20 @@ static void is_lock_held_by_thread(Handle loader, PerfCounter* counter, TRAPS) {
 static jclass jvm_define_class_common(JNIEnv *env, const char *name, jobject loader, const jbyte *buf, jsize len, jobject pd, const char *source, TRAPS) {
   if (source == NULL)  source = "__JVM_DefineClass__";
 
+  assert(THREAD->is_Java_thread(), "must be a JavaThread");
+  JavaThread* jt = (JavaThread*) THREAD;
+
+  PerfClassTraceTime vmtimer(ClassLoader::perf_define_appclass_time(),
+                             ClassLoader::perf_define_appclass_selftime(),
+                             ClassLoader::perf_define_appclasses(),
+                             jt->get_thread_stat()->perf_recursion_counts_addr(),
+                             jt->get_thread_stat()->perf_timers_addr(),
+                             PerfClassTraceTime::DEFINE_CLASS);
+
+  if (UsePerfData) {
+    ClassLoader::perf_app_classfile_bytes_read()->inc(len);
+  }
+
   // Since exceptions can be thrown, class initialization can take place
   // if name is NULL no check for class name in .class stream has to be made.
   symbolHandle class_name;
@@ -3905,6 +3928,7 @@ jclass find_class_from_class_loader(JNIEnv* env, symbolHandle name, jboolean ini
   //   The Java level wrapper will perform the necessary security check allowing
   //   us to pass the NULL as the initiating class loader.
   klassOop klass = SystemDictionary::resolve_or_fail(name, loader, protection_domain, throwError != 0, CHECK_NULL);
+
   KlassHandle klass_handle(THREAD, klass);
   // Check if we should initialize the class
   if (init && klass_handle->oop_is_instance()) {
diff --git a/hotspot/src/share/vm/prims/jvm.h b/hotspot/src/share/vm/prims/jvm.h
index 7dbc38d94b6..fea96ee4aa7 100644
--- a/hotspot/src/share/vm/prims/jvm.h
+++ b/hotspot/src/share/vm/prims/jvm.h
@@ -390,15 +390,10 @@ JVM_FindClassFromClassLoader(JNIEnv *env, const char *name, jboolean init,
                              jobject loader, jboolean throwError);
 
 /*
- * Find a class from a boot class loader. Throw ClassNotFoundException
- * or NoClassDefFoundError depending on the value of the last
- * argument. This is the same as FindClassFromClassLoader but provided
- * as a convenience method exported correctly on all platforms for
- * JSR 277 launcher class loading.
+ * Find a class from a boot class loader. Returns NULL if class not found.
  */
 JNIEXPORT jclass JNICALL
-JVM_FindClassFromBootLoader(JNIEnv *env, const char *name,
-                            jboolean throwError);
+JVM_FindClassFromBootLoader(JNIEnv *env, const char *name);
 
 /*
  * Find a class from a given class.
diff --git a/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp b/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp
index d083e5762f4..93217303fcf 100644
--- a/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiCodeBlobEvents.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -402,7 +402,7 @@ void JvmtiCodeBlobEvents::build_jvmti_addr_location_map(nmethod *nm,
 
     address scopes_data = nm->scopes_data_begin();
     for( pcd = nm->scopes_pcs_begin(); pcd < nm->scopes_pcs_end(); ++pcd ) {
-      ScopeDesc sc0(nm, pcd->scope_decode_offset());
+      ScopeDesc sc0(nm, pcd->scope_decode_offset(), pcd->should_reexecute());
       ScopeDesc *sd  = &sc0;
       while( !sd->is_top() ) { sd = sd->sender(); }
       int bci = sd->bci();
diff --git a/hotspot/src/share/vm/prims/jvmtiExport.cpp b/hotspot/src/share/vm/prims/jvmtiExport.cpp
index 50ecb4b9559..7a5068b43b3 100644
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -2427,6 +2427,11 @@ JvmtiGCMarker::JvmtiGCMarker(bool full) : _full(full), _invocation_count(0) {
     return;
   }
 
+  if (ForceFullGCJVMTIEpilogues) {
+    // force 'Full GC' was done semantics for JVMTI GC epilogues
+    _full = true;
+  }
+
   // GarbageCollectionStart event posted from VM thread - okay because
   // JVMTI is clear that the "world is stopped" and callback shouldn't
   // try to call into the VM.
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index 6eaa8cea6b8..43bcbb36145 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -1054,7 +1054,15 @@ void Arguments::set_cms_and_parnew_gc_flags() {
 
   // Unless explicitly requested otherwise, size young gen
   // for "short" pauses ~ 4M*ParallelGCThreads
-  if (FLAG_IS_DEFAULT(MaxNewSize)) {  // MaxNewSize not set at command-line
+
+  // If either MaxNewSize or NewRatio is set on the command line,
+  // assume the user is trying to set the size of the young gen.
+
+  if (FLAG_IS_DEFAULT(MaxNewSize) && FLAG_IS_DEFAULT(NewRatio)) {
+
+    // Set MaxNewSize to our calculated preferred_max_new_size unless
+    // NewSize was set on the command line and it is larger than
+    // preferred_max_new_size.
     if (!FLAG_IS_DEFAULT(NewSize)) {   // NewSize explicitly set at command-line
       FLAG_SET_ERGO(uintx, MaxNewSize, MAX2(NewSize, preferred_max_new_size));
     } else {
@@ -1063,15 +1071,32 @@ void Arguments::set_cms_and_parnew_gc_flags() {
     if(PrintGCDetails && Verbose) {
       // Too early to use gclog_or_tty
       tty->print_cr("Ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
-  }
-  }
-  // Unless explicitly requested otherwise, prefer a large
-  // Old to Young gen size so as to shift the collection load
-  // to the old generation concurrent collector
-  if (FLAG_IS_DEFAULT(NewRatio)) {
+    }
+
+    // Unless explicitly requested otherwise, prefer a large
+    // Old to Young gen size so as to shift the collection load
+    // to the old generation concurrent collector
+
+    // If this is only guarded by FLAG_IS_DEFAULT(NewRatio)
+    // then NewSize and OldSize may be calculated.  That would
+    // generally lead to some differences with ParNewGC for which
+    // there was no obvious reason.  Also limit to the case where
+    // MaxNewSize has not been set.
+
     FLAG_SET_ERGO(intx, NewRatio, MAX2(NewRatio, new_ratio));
 
-    size_t min_new  = align_size_up(ScaleForWordSize(min_new_default), os::vm_page_size());
+    // Code along this path potentially sets NewSize and OldSize
+
+    // Calculate the desired minimum size of the young gen but if
+    // NewSize has been set on the command line, use it here since
+    // it should be the final value.
+    size_t min_new;
+    if (FLAG_IS_DEFAULT(NewSize)) {
+      min_new = align_size_up(ScaleForWordSize(min_new_default),
+                              os::vm_page_size());
+    } else {
+      min_new = NewSize;
+    }
     size_t prev_initial_size = initial_heap_size();
     if (prev_initial_size != 0 && prev_initial_size < min_new+OldSize) {
       set_initial_heap_size(min_new+OldSize);
@@ -1083,9 +1108,11 @@ void Arguments::set_cms_and_parnew_gc_flags() {
                 initial_heap_size()/M, prev_initial_size/M);
       }
     }
+
     // MaxHeapSize is aligned down in collectorPolicy
-    size_t max_heap = align_size_down(MaxHeapSize,
-                                      CardTableRS::ct_max_alignment_constraint());
+    size_t max_heap =
+      align_size_down(MaxHeapSize,
+                      CardTableRS::ct_max_alignment_constraint());
 
     if(PrintGCDetails && Verbose) {
       // Too early to use gclog_or_tty
@@ -1150,8 +1177,9 @@ void Arguments::set_cms_and_parnew_gc_flags() {
       // CMSParPromoteBlocksToClaim is a collector-specific flag, so
       // we'll let it to take precedence.
       jio_fprintf(defaultStream::error_stream(),
-                  "Both OldPLABSize and CMSParPromoteBlocksToClaim options are specified "
-                  "for the CMS collector. CMSParPromoteBlocksToClaim will take precedence.\n");
+                  "Both OldPLABSize and CMSParPromoteBlocksToClaim"
+                  " options are specified for the CMS collector."
+                  " CMSParPromoteBlocksToClaim will take precedence.\n");
     }
   }
 }
@@ -1205,10 +1233,8 @@ void Arguments::set_ergonomics_flags() {
   // Check that UseCompressedOops can be set with the max heap size allocated
   // by ergonomics.
   if (MaxHeapSize <= max_heap_for_compressed_oops()) {
-    if (FLAG_IS_DEFAULT(UseCompressedOops)) {
-      // Turn off until bug is fixed.
-      // the following line to return it to default status.
-      // FLAG_SET_ERGO(bool, UseCompressedOops, true);
+    if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
+      FLAG_SET_ERGO(bool, UseCompressedOops, true);
     }
 #ifdef _WIN64
     if (UseLargePages && UseCompressedOops) {
@@ -1424,6 +1450,7 @@ static void set_serial_gc_flags() {
   FLAG_SET_DEFAULT(UseSerialGC, true);
   FLAG_SET_DEFAULT(UseParNewGC, false);
   FLAG_SET_DEFAULT(UseConcMarkSweepGC, false);
+  FLAG_SET_DEFAULT(CMSIncrementalMode, false);  // special CMS suboption
   FLAG_SET_DEFAULT(UseParallelGC, false);
   FLAG_SET_DEFAULT(UseParallelOldGC, false);
   FLAG_SET_DEFAULT(UseG1GC, false);
@@ -1431,7 +1458,7 @@ static void set_serial_gc_flags() {
 
 static bool verify_serial_gc_flags() {
   return (UseSerialGC &&
-        !(UseParNewGC || UseConcMarkSweepGC || UseG1GC ||
+        !(UseParNewGC || (UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC ||
           UseParallelGC || UseParallelOldGC));
 }
 
@@ -1546,7 +1573,7 @@ bool Arguments::check_vm_args_consistency() {
   status = status && verify_percentage(GCHeapFreeLimit, "GCHeapFreeLimit");
 
   // Check user specified sharing option conflict with Parallel GC
-  bool cannot_share = (UseConcMarkSweepGC || UseG1GC || UseParNewGC ||
+  bool cannot_share = ((UseConcMarkSweepGC || CMSIncrementalMode) || UseG1GC || UseParNewGC ||
                        UseParallelGC || UseParallelOldGC ||
                        SOLARIS_ONLY(UseISM) NOT_SOLARIS(UseLargePages));
 
@@ -1554,9 +1581,17 @@ bool Arguments::check_vm_args_consistency() {
     // Either force sharing on by forcing the other options off, or
     // force sharing off.
     if (DumpSharedSpaces || ForceSharedSpaces) {
+      jio_fprintf(defaultStream::error_stream(),
+                  "Reverting to Serial GC because of %s \n",
+                  ForceSharedSpaces ? " -Xshare:on" : "-Xshare:dump");
       set_serial_gc_flags();
       FLAG_SET_DEFAULT(SOLARIS_ONLY(UseISM) NOT_SOLARIS(UseLargePages), false);
     } else {
+      if (UseSharedSpaces) {
+        jio_fprintf(defaultStream::error_stream(),
+                    "Turning off use of shared archive because of "
+                    "choice of garbage collector or large pages \n");
+      }
       no_shared_spaces();
     }
   }
diff --git a/hotspot/src/share/vm/runtime/atomic.hpp b/hotspot/src/share/vm/runtime/atomic.hpp
index c54103cbd49..9c8ba27bacc 100644
--- a/hotspot/src/share/vm/runtime/atomic.hpp
+++ b/hotspot/src/share/vm/runtime/atomic.hpp
@@ -39,6 +39,8 @@ class Atomic : AllStatic {
   static void store_ptr(intptr_t store_value, volatile intptr_t* dest);
   static void store_ptr(void*    store_value, volatile void*     dest);
 
+  static jlong load(volatile jlong* src);
+
   // Atomically add to a location, return updated value
   static jint     add    (jint     add_value, volatile jint*     dest);
   static intptr_t add_ptr(intptr_t add_value, volatile intptr_t* dest);
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index 781bc93aae5..c167ca7d922 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -1082,6 +1082,9 @@ class CommandLineFlags {
   product(ccstr, TraceJVMTI, NULL,                                          \
           "Trace flags for JVMTI functions and events")                     \
                                                                             \
+  product(bool, ForceFullGCJVMTIEpilogues, false,                           \
+          "Force 'Full GC' was done semantics for JVMTI GC epilogues")      \
+                                                                            \
   /* This option can change an EMCP method into an obsolete method. */      \
   /* This can affect tests that except specific methods to be EMCP. */      \
   /* This option should be used with caution. */                            \
@@ -1704,6 +1707,9 @@ class CommandLineFlags {
   product(bool, TLABStats, true,                                            \
           "Print various TLAB related information")                         \
                                                                             \
+  product(bool, PrintRevisitStats, false,                                   \
+          "Print revisit (klass and MDO) stack related information")        \
+                                                                            \
   product_pd(bool, NeverActAsServerClassMachine,                            \
           "Never act like a server-class machine")                          \
                                                                             \
@@ -2924,12 +2930,6 @@ class CommandLineFlags {
           "how many entries we'll try to leave on the stack during "        \
           "parallel GC")                                                    \
                                                                             \
-  product(intx, DCQBarrierQueueBufferSize, 256,                             \
-          "Number of elements in a dirty card queue buffer")                \
-                                                                            \
-  product(intx, DCQBarrierProcessCompletedThreshold, 5,                     \
-          "Number of completed dirty card buffers to trigger processing.")  \
-                                                                            \
   /* stack parameters */                                                    \
   product_pd(intx, StackYellowPages,                                        \
           "Number of yellow zone (recoverable overflows) pages")            \
@@ -3037,6 +3037,9 @@ class CommandLineFlags {
           "Wait for this many CI accesses to occur in all compiles before " \
           "beginning to throw OutOfMemoryErrors in each compile")           \
                                                                             \
+  notproduct(bool, CIObjectFactoryVerify, false,                            \
+          "enable potentially expensive verification in ciObjectFactory")   \
+                                                                            \
   /* Priorities */                                                          \
   product_pd(bool, UseThreadPriorities,  "Use native thread priorities")    \
                                                                             \
@@ -3287,7 +3290,7 @@ class CommandLineFlags {
   product(uintx, SharedReadWriteSize,  12*M,                                \
           "Size of read-write space in permanent generation (in bytes)")    \
                                                                             \
-  product(uintx, SharedReadOnlySize,    8*M,                                \
+  product(uintx, SharedReadOnlySize,   10*M,                                \
           "Size of read-only space in permanent generation (in bytes)")     \
                                                                             \
   product(uintx, SharedMiscDataSize,    4*M,                                \
@@ -3312,7 +3315,7 @@ class CommandLineFlags {
   product(bool, AnonymousClasses, false,                                    \
           "support sun.misc.Unsafe.defineAnonymousClass")                   \
                                                                             \
-  product(bool, EnableMethodHandles, false,                                 \
+  experimental(bool, EnableMethodHandles, false,                            \
           "support method handles (true by default under JSR 292)")         \
                                                                             \
   diagnostic(intx, MethodHandlePushLimit, 3,                                \
@@ -3327,7 +3330,7 @@ class CommandLineFlags {
   diagnostic(bool, OptimizeMethodHandles, true,                             \
           "when constructing method handles, try to improve them")          \
                                                                             \
-  product(bool, EnableInvokeDynamic, false,                                 \
+  experimental(bool, EnableInvokeDynamic, false,                            \
           "recognize the invokedynamic instruction")                        \
                                                                             \
   develop(bool, TraceInvokeDynamic, false,                                  \
diff --git a/hotspot/src/share/vm/runtime/jniHandles.hpp b/hotspot/src/share/vm/runtime/jniHandles.hpp
index 88cb71559a1..99c4245028e 100644
--- a/hotspot/src/share/vm/runtime/jniHandles.hpp
+++ b/hotspot/src/share/vm/runtime/jniHandles.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -196,12 +196,16 @@ inline methodOop JNIHandles::resolve_jmethod_id(jmethodID mid) {
 };
 
 inline methodOop JNIHandles::checked_resolve_jmethod_id(jmethodID mid) {
-  jobject handle = (jobject)mid;
-  if (is_weak_global_handle(handle)) {
-    return (methodOop) resolve_non_null(handle);
-  } else {
+  if (mid == NULL) {
     return (methodOop) NULL;
   }
+
+  oop o = resolve_non_null((jobject) mid);
+  if (!o->is_method()) {
+    return (methodOop) NULL;
+  }
+
+  return (methodOop) o;
 };
 
 
diff --git a/hotspot/src/share/vm/runtime/perfData.hpp b/hotspot/src/share/vm/runtime/perfData.hpp
index 16c0c742b47..f98a5f3cb44 100644
--- a/hotspot/src/share/vm/runtime/perfData.hpp
+++ b/hotspot/src/share/vm/runtime/perfData.hpp
@@ -868,6 +868,10 @@ class PerfDataManager : AllStatic {
   {counter = PerfDataManager::create_counter(counter_ns, counter_name, \
                                              PerfData::U_Events,CHECK);}
 
+#define NEWPERFBYTECOUNTER(counter, counter_ns, counter_name)  \
+  {counter = PerfDataManager::create_counter(counter_ns, counter_name, \
+                                             PerfData::U_Bytes,CHECK);}
+
 // Utility Classes
 
 /*
diff --git a/hotspot/src/share/vm/runtime/sweeper.cpp b/hotspot/src/share/vm/runtime/sweeper.cpp
index bfa4761d4c2..7452d2d9cbb 100644
--- a/hotspot/src/share/vm/runtime/sweeper.cpp
+++ b/hotspot/src/share/vm/runtime/sweeper.cpp
@@ -125,8 +125,14 @@ void NMethodSweeper::process_nmethod(nmethod *nm) {
     // there are no inline caches that referes to it.
     if (nm->is_marked_for_reclamation()) {
       assert(!nm->is_locked_by_vm(), "must not flush locked nmethods");
+      if (PrintMethodFlushing && Verbose) {
+        tty->print_cr("### Nmethod 0x%x (marked for reclamation) being flushed", nm);
+      }
       nm->flush();
     } else {
+      if (PrintMethodFlushing && Verbose) {
+        tty->print_cr("### Nmethod 0x%x (zombie) being marked for reclamation", nm);
+      }
       nm->mark_for_reclamation();
       _rescan = true;
     }
@@ -134,6 +140,9 @@ void NMethodSweeper::process_nmethod(nmethod *nm) {
     // If there is no current activations of this method on the
     // stack we can safely convert it to a zombie method
     if (nm->can_not_entrant_be_converted()) {
+      if (PrintMethodFlushing && Verbose) {
+        tty->print_cr("### Nmethod 0x%x (not entrant) being made zombie", nm);
+      }
       nm->make_zombie();
       _rescan = true;
     } else {
@@ -146,7 +155,9 @@ void NMethodSweeper::process_nmethod(nmethod *nm) {
     }
   } else if (nm->is_unloaded()) {
     // Unloaded code, just make it a zombie
-    if (nm->is_osr_only_method()) {
+    if (PrintMethodFlushing && Verbose)
+      tty->print_cr("### Nmethod 0x%x (unloaded) being made zombie", nm);
+    if (nm->is_osr_method()) {
       // No inline caches will ever point to osr methods, so we can just remove it
       nm->flush();
     } else {
diff --git a/hotspot/src/share/vm/runtime/vframeArray.cpp b/hotspot/src/share/vm/runtime/vframeArray.cpp
index 426f57e2cb9..3f507d2174f 100644
--- a/hotspot/src/share/vm/runtime/vframeArray.cpp
+++ b/hotspot/src/share/vm/runtime/vframeArray.cpp
@@ -44,6 +44,7 @@ void vframeArrayElement::fill_in(compiledVFrame* vf) {
 
   _method = vf->method();
   _bci    = vf->raw_bci();
+  _reexecute = vf->should_reexecute();
 
   int index;
 
@@ -148,16 +149,20 @@ void vframeArrayElement::unpack_on_stack(int callee_parameters,
   // C++ interpreter doesn't need a pc since it will figure out what to do when it
   // begins execution
   address pc;
-  bool use_next_mdp; // true if we should use the mdp associated with the next bci
-                     // rather than the one associated with bcp
+  bool use_next_mdp = false; // true if we should use the mdp associated with the next bci
+                             // rather than the one associated with bcp
   if (raw_bci() == SynchronizationEntryBCI) {
     // We are deoptimizing while hanging in prologue code for synchronized method
     bcp = method()->bcp_from(0); // first byte code
     pc  = Interpreter::deopt_entry(vtos, 0); // step = 0 since we don't skip current bytecode
-    use_next_mdp = false;
+  } else if (should_reexecute()) { //reexecute this bytecode
+    assert(is_top_frame, "reexecute allowed only for the top frame");
+    bcp = method()->bcp_from(bci());
+    pc  = Interpreter::deopt_reexecute_entry(method(), bcp);
   } else {
     bcp = method()->bcp_from(bci());
-    pc  = Interpreter::continuation_for(method(), bcp, callee_parameters, is_top_frame, use_next_mdp);
+    pc  = Interpreter::deopt_continue_after_entry(method(), bcp, callee_parameters, is_top_frame);
+    use_next_mdp = true;
   }
   assert(Bytecodes::is_defined(*bcp), "must be a valid bytecode");
 
diff --git a/hotspot/src/share/vm/runtime/vframeArray.hpp b/hotspot/src/share/vm/runtime/vframeArray.hpp
index 767b98907b9..869fcdebe13 100644
--- a/hotspot/src/share/vm/runtime/vframeArray.hpp
+++ b/hotspot/src/share/vm/runtime/vframeArray.hpp
@@ -41,7 +41,8 @@ class vframeArrayElement : public _ValueObj {
   private:
 
     frame _frame;                                                // the interpreter frame we will unpack into
-    int _bci;                                                    // raw bci for this vframe
+    int  _bci;                                                   // raw bci for this vframe
+    bool _reexecute;                                             // whether sould we reexecute this bytecode
     methodOop  _method;                                          // the method for this vframe
     MonitorChunk* _monitors;                                     // active monitors for this vframe
     StackValueCollection* _locals;
@@ -54,6 +55,7 @@ class vframeArrayElement : public _ValueObj {
   int bci(void) const;
 
   int raw_bci(void) const            { return _bci; }
+  bool should_reexecute(void) const  { return _reexecute; }
 
   methodOop method(void) const       { return _method; }
 
diff --git a/hotspot/src/share/vm/runtime/vframe_hp.cpp b/hotspot/src/share/vm/runtime/vframe_hp.cpp
index 1c991d91bc9..0043f459b4a 100644
--- a/hotspot/src/share/vm/runtime/vframe_hp.cpp
+++ b/hotspot/src/share/vm/runtime/vframe_hp.cpp
@@ -276,6 +276,15 @@ int compiledVFrame::raw_bci() const {
   return scope()->bci();
 }
 
+bool compiledVFrame::should_reexecute() const {
+  if (scope() == NULL) {
+    // native nmethods have no scope the method/bci is implied
+    nmethod* nm = code();
+    assert(nm->is_native_method(), "must be native");
+    return false;
+  }
+  return scope()->should_reexecute();
+}
 
 vframe* compiledVFrame::sender() const {
   const frame f = fr();
diff --git a/hotspot/src/share/vm/runtime/vframe_hp.hpp b/hotspot/src/share/vm/runtime/vframe_hp.hpp
index a0dd0be2fdc..3e1a01f2599 100644
--- a/hotspot/src/share/vm/runtime/vframe_hp.hpp
+++ b/hotspot/src/share/vm/runtime/vframe_hp.hpp
@@ -25,11 +25,12 @@
 class compiledVFrame: public javaVFrame {
  public:
   // JVM state
-  methodOop                    method()         const;
-  int                          bci()            const;
-  StackValueCollection*        locals()         const;
-  StackValueCollection*        expressions()    const;
-  GrowableArray<MonitorInfo*>* monitors()       const;
+  methodOop                    method()             const;
+  int                          bci()                const;
+  bool                         should_reexecute()   const;
+  StackValueCollection*        locals()             const;
+  StackValueCollection*        expressions()        const;
+  GrowableArray<MonitorInfo*>* monitors()           const;
 
   void set_locals(StackValueCollection* values) const;
 
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index c0226759c70..00dac588541 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -593,6 +593,7 @@ static inline uint64_t cast_uint64_t(size_t x)
                                                                                                                                      \
   nonstatic_field(PcDesc,                      _pc_offset,                                    int)                                   \
   nonstatic_field(PcDesc,                      _scope_decode_offset,                          int)                                   \
+  nonstatic_field(PcDesc,                      _flags,                        PcDesc::PcDescFlags)                                   \
                                                                                                                                      \
   /***************************************************/                                                                              \
   /* CodeBlobs (NOTE: incomplete, but only a little) */                                                                              \
@@ -1158,6 +1159,7 @@ static inline uint64_t cast_uint64_t(size_t x)
   /***************************************/                               \
                                                                           \
   declare_toplevel_type(PcDesc)                                           \
+  declare_integer_type(PcDesc::PcDescFlags)                               \
                                                                           \
   /************************/                                              \
   /* OopMap and OopMapSet */                                              \
diff --git a/hotspot/src/share/vm/services/threadService.cpp b/hotspot/src/share/vm/services/threadService.cpp
index ee56b62f70a..a09ce5a59a3 100644
--- a/hotspot/src/share/vm/services/threadService.cpp
+++ b/hotspot/src/share/vm/services/threadService.cpp
@@ -688,10 +688,9 @@ ThreadStatistics::ThreadStatistics() {
   _contended_enter_count = 0;
   _monitor_wait_count = 0;
   _sleep_count = 0;
-  _class_init_recursion_count = 0;
-  _class_verify_recursion_count = 0;
   _count_pending_reset = false;
   _timer_pending_reset = false;
+  memset((void*) _perf_recursion_counts, 0, sizeof(_perf_recursion_counts));
 }
 
 ThreadSnapshot::ThreadSnapshot(JavaThread* thread) {
diff --git a/hotspot/src/share/vm/services/threadService.hpp b/hotspot/src/share/vm/services/threadService.hpp
index b9cd3bbe612..eec88a0f88b 100644
--- a/hotspot/src/share/vm/services/threadService.hpp
+++ b/hotspot/src/share/vm/services/threadService.hpp
@@ -120,9 +120,8 @@ private:
   bool         _timer_pending_reset;
 
   // Keep accurate times for potentially recursive class operations
-  int          _class_init_recursion_count;
-  int          _class_verify_recursion_count;
-  int          _class_link_recursion_count;
+  int           _perf_recursion_counts[6];
+  elapsedTimer  _perf_timers[6];
 
   // utility functions
   void  check_and_reset_count()            {
@@ -165,9 +164,8 @@ public:
   void reset_count_stat()                  { _count_pending_reset = true; }
   void reset_time_stat()                   { _timer_pending_reset = true; }
 
-  int* class_init_recursion_count_addr()   { return &_class_init_recursion_count; }
-  int* class_verify_recursion_count_addr() { return &_class_verify_recursion_count; }
-  int* class_link_recursion_count_addr()   { return &_class_link_recursion_count; }
+  int* perf_recursion_counts_addr()        { return _perf_recursion_counts; }
+  elapsedTimer* perf_timers_addr()         { return _perf_timers; }
 };
 
 // Thread snapshot to represent the thread state and statistics
diff --git a/hotspot/src/share/vm/utilities/taskqueue.hpp b/hotspot/src/share/vm/utilities/taskqueue.hpp
index 489122afcd9..34ca1668c7f 100644
--- a/hotspot/src/share/vm/utilities/taskqueue.hpp
+++ b/hotspot/src/share/vm/utilities/taskqueue.hpp
@@ -22,94 +22,90 @@
  *
  */
 
-#ifdef LP64
-typedef juint TAG_TYPE;
-// for a taskqueue size of 4M
-#define LOG_TASKQ_SIZE 22
-#else
-typedef jushort TAG_TYPE;
-// for a taskqueue size of 16K
-#define LOG_TASKQ_SIZE 14
-#endif
-
 class TaskQueueSuper: public CHeapObj {
 protected:
-  // The first free element after the last one pushed (mod _n).
+  // Internal type for indexing the queue; also used for the tag.
+  typedef NOT_LP64(uint16_t) LP64_ONLY(uint32_t) idx_t;
+
+  // The first free element after the last one pushed (mod N).
   volatile uint _bottom;
 
-  // log2 of the size of the queue.
-  enum SomeProtectedConstants {
-    Log_n = LOG_TASKQ_SIZE
+  enum {
+    N = 1 << NOT_LP64(14) LP64_ONLY(17), // Queue size: 16K or 128K
+    MOD_N_MASK = N - 1                   // To compute x mod N efficiently.
   };
-#undef LOG_TASKQ_SIZE
 
-  // Size of the queue.
-  uint n() { return (1 << Log_n); }
-  // For computing "x mod n" efficiently.
-  uint n_mod_mask() { return n() - 1; }
+  class Age {
+  public:
+    Age(size_t data = 0)         { _data = data; }
+    Age(const Age& age)          { _data = age._data; }
+    Age(idx_t top, idx_t tag)    { _fields._top = top; _fields._tag = tag; }
 
-  struct Age {
-    TAG_TYPE _top;
-    TAG_TYPE _tag;
+    Age   get()        const volatile { return _data; }
+    void  set(Age age) volatile       { _data = age._data; }
 
-    TAG_TYPE tag() const { return _tag; }
-    TAG_TYPE top() const { return _top; }
+    idx_t top()        const volatile { return _fields._top; }
+    idx_t tag()        const volatile { return _fields._tag; }
 
-    Age() { _tag = 0; _top = 0; }
-
-    friend bool operator ==(const Age& a1, const Age& a2) {
-      return a1.tag() == a2.tag() && a1.top() == a2.top();
+    // Increment top; if it wraps, increment tag also.
+    void increment() {
+      _fields._top = increment_index(_fields._top);
+      if (_fields._top == 0) ++_fields._tag;
     }
+
+    Age cmpxchg(const Age new_age, const Age old_age) volatile {
+      return (size_t) Atomic::cmpxchg_ptr((intptr_t)new_age._data,
+                                          (volatile intptr_t *)&_data,
+                                          (intptr_t)old_age._data);
+    }
+
+    bool operator ==(const Age& other) const { return _data == other._data; }
+
+  private:
+    struct fields {
+      idx_t _top;
+      idx_t _tag;
+    };
+    union {
+      size_t _data;
+      fields _fields;
+    };
   };
-  Age _age;
-  // These make sure we do single atomic reads and writes.
-  Age get_age() {
-    uint res = *(volatile uint*)(&_age);
-    return *(Age*)(&res);
+
+  volatile Age _age;
+
+  // These both operate mod N.
+  static uint increment_index(uint ind) {
+    return (ind + 1) & MOD_N_MASK;
   }
-  void set_age(Age a) {
-    *(volatile uint*)(&_age) = *(uint*)(&a);
+  static uint decrement_index(uint ind) {
+    return (ind - 1) & MOD_N_MASK;
   }
 
-  TAG_TYPE get_top() {
-    return get_age().top();
-  }
-
-  // These both operate mod _n.
-  uint increment_index(uint ind) {
-    return (ind + 1) & n_mod_mask();
-  }
-  uint decrement_index(uint ind) {
-    return (ind - 1) & n_mod_mask();
-  }
-
-  // Returns a number in the range [0.._n).  If the result is "n-1", it
-  // should be interpreted as 0.
+  // Returns a number in the range [0..N).  If the result is "N-1", it should be
+  // interpreted as 0.
   uint dirty_size(uint bot, uint top) {
-    return ((int)bot - (int)top) & n_mod_mask();
+    return (bot - top) & MOD_N_MASK;
   }
 
   // Returns the size corresponding to the given "bot" and "top".
   uint size(uint bot, uint top) {
     uint sz = dirty_size(bot, top);
-    // Has the queue "wrapped", so that bottom is less than top?
-    // There's a complicated special case here.  A pair of threads could
-    // perform pop_local and pop_global operations concurrently, starting
-    // from a state in which _bottom == _top+1.  The pop_local could
-    // succeed in decrementing _bottom, and the pop_global in incrementing
-    // _top (in which case the pop_global will be awarded the contested
-    // queue element.)  The resulting state must be interpreted as an empty
-    // queue.  (We only need to worry about one such event: only the queue
-    // owner performs pop_local's, and several concurrent threads
-    // attempting to perform the pop_global will all perform the same CAS,
-    // and only one can succeed.  Any stealing thread that reads after
-    // either the increment or decrement will see an empty queue, and will
-    // not join the competitors.  The "sz == -1 || sz == _n-1" state will
-    // not be modified  by concurrent queues, so the owner thread can reset
-    // the state to _bottom == top so subsequent pushes will be performed
-    // normally.
-    if (sz == (n()-1)) return 0;
-    else return sz;
+    // Has the queue "wrapped", so that bottom is less than top?  There's a
+    // complicated special case here.  A pair of threads could perform pop_local
+    // and pop_global operations concurrently, starting from a state in which
+    // _bottom == _top+1.  The pop_local could succeed in decrementing _bottom,
+    // and the pop_global in incrementing _top (in which case the pop_global
+    // will be awarded the contested queue element.)  The resulting state must
+    // be interpreted as an empty queue.  (We only need to worry about one such
+    // event: only the queue owner performs pop_local's, and several concurrent
+    // threads attempting to perform the pop_global will all perform the same
+    // CAS, and only one can succeed.)  Any stealing thread that reads after
+    // either the increment or decrement will see an empty queue, and will not
+    // join the competitors.  The "sz == -1 || sz == N-1" state will not be
+    // modified by concurrent queues, so the owner thread can reset the state to
+    // _bottom == top so subsequent pushes will be performed normally.
+    return (sz == N - 1) ? 0 : sz;
   }
 
 public:
@@ -122,22 +118,21 @@ public:
   // The "careful" version admits the possibility of pop_local/pop_global
   // races.
   uint size() {
-    return size(_bottom, get_top());
+    return size(_bottom, _age.top());
   }
 
   uint dirty_size() {
-    return dirty_size(_bottom, get_top());
+    return dirty_size(_bottom, _age.top());
   }
 
   void set_empty() {
     _bottom = 0;
-    _age = Age();
+    _age.set(0);
   }
 
   // Maximum number of elements allowed in the queue.  This is two less
   // than the actual queue size, for somewhat complicated reasons.
-  uint max_elems() { return n() - 2; }
-
+  uint max_elems() { return N - 2; }
 };
 
 template<class E> class GenericTaskQueue: public TaskQueueSuper {
@@ -179,12 +174,12 @@ private:
 
 template<class E>
 GenericTaskQueue<E>::GenericTaskQueue():TaskQueueSuper() {
-  assert(sizeof(Age) == sizeof(int), "Depends on this.");
+  assert(sizeof(Age) == sizeof(size_t), "Depends on this.");
 }
 
 template<class E>
 void GenericTaskQueue<E>::initialize() {
-  _elems = NEW_C_HEAP_ARRAY(E, n());
+  _elems = NEW_C_HEAP_ARRAY(E, N);
   guarantee(_elems != NULL, "Allocation failed.");
 }
 
@@ -208,14 +203,14 @@ void GenericTaskQueue<E>::oops_do(OopClosure* f) {
 
 template<class E>
 bool GenericTaskQueue<E>::push_slow(E t, uint dirty_n_elems) {
-  if (dirty_n_elems == n() - 1) {
+  if (dirty_n_elems == N - 1) {
     // Actually means 0, so do the push.
     uint localBot = _bottom;
     _elems[localBot] = t;
     _bottom = increment_index(localBot);
     return true;
-  } else
-    return false;
+  }
+  return false;
 }
 
 template<class E>
@@ -230,53 +225,45 @@ pop_local_slow(uint localBot, Age oldAge) {
   // then have the owner thread do a pop followed by another push.  Without
   // the incrementing of "tag", the pop_global's CAS could succeed,
   // allowing it to believe it has claimed the stale element.)
-  Age newAge;
-  newAge._top = localBot;
-  newAge._tag = oldAge.tag() + 1;
+  Age newAge((idx_t)localBot, oldAge.tag() + 1);
   // Perhaps a competing pop_global has already incremented "top", in which
   // case it wins the element.
   if (localBot == oldAge.top()) {
-    Age tempAge;
     // No competing pop_global has yet incremented "top"; we'll try to
     // install new_age, thus claiming the element.
-    assert(sizeof(Age) == sizeof(int), "Assumption about CAS unit.");
-    *(uint*)&tempAge = Atomic::cmpxchg(*(uint*)&newAge, (volatile uint*)&_age, *(uint*)&oldAge);
+    Age tempAge = _age.cmpxchg(newAge, oldAge);
     if (tempAge == oldAge) {
       // We win.
-      assert(dirty_size(localBot, get_top()) != n() - 1,
-             "Shouldn't be possible...");
+      assert(dirty_size(localBot, _age.top()) != N - 1, "sanity");
       return true;
     }
   }
-  // We fail; a completing pop_global gets the element.  But the queue is
-  // empty (and top is greater than bottom.)  Fix this representation of
-  // the empty queue to become the canonical one.
-  set_age(newAge);
-  assert(dirty_size(localBot, get_top()) != n() - 1,
-         "Shouldn't be possible...");
+  // We lose; a completing pop_global gets the element.  But the queue is empty
+  // and top is greater than bottom.  Fix this representation of the empty queue
+  // to become the canonical one.
+  _age.set(newAge);
+  assert(dirty_size(localBot, _age.top()) != N - 1, "sanity");
   return false;
 }
 
 template<class E>
 bool GenericTaskQueue<E>::pop_global(E& t) {
-  Age newAge;
-  Age oldAge = get_age();
+  Age oldAge = _age.get();
   uint localBot = _bottom;
   uint n_elems = size(localBot, oldAge.top());
   if (n_elems == 0) {
     return false;
   }
+
   t = _elems[oldAge.top()];
-  newAge = oldAge;
-  newAge._top = increment_index(newAge.top());
-  if ( newAge._top == 0 ) newAge._tag++;
-  Age resAge;
-  *(uint*)&resAge = Atomic::cmpxchg(*(uint*)&newAge, (volatile uint*)&_age, *(uint*)&oldAge);
+  Age newAge(oldAge);
+  newAge.increment();
+  Age resAge = _age.cmpxchg(newAge, oldAge);
+
   // Note that using "_bottom" here might fail, since a pop_local might
   // have decremented it.
-  assert(dirty_size(localBot, newAge._top) != n() - 1,
-         "Shouldn't be possible...");
-  return (resAge == oldAge);
+  assert(dirty_size(localBot, newAge.top()) != N - 1, "sanity");
+  return resAge == oldAge;
 }
 
 template<class E>
@@ -459,7 +446,7 @@ public:
     return offer_termination(NULL);
   }
 
-  // As above, but it also terminates of the should_exit_termination()
+  // As above, but it also terminates if the should_exit_termination()
   // method of the terminator parameter returns true. If terminator is
   // NULL, then it is ignored.
   bool offer_termination(TerminatorTerminator* terminator);
@@ -492,11 +479,10 @@ template<class E> inline bool GenericTaskQueue<E>::push(E t) {
   }
 #else
   uint localBot = _bottom;
-  assert((localBot >= 0) && (localBot < n()), "_bottom out of range.");
-  TAG_TYPE top = get_top();
+  assert((localBot >= 0) && (localBot < N), "_bottom out of range.");
+  idx_t top = _age.top();
   uint dirty_n_elems = dirty_size(localBot, top);
-  assert((dirty_n_elems >= 0) && (dirty_n_elems < n()),
-         "n_elems out of range.");
+  assert((dirty_n_elems >= 0) && (dirty_n_elems < N), "n_elems out of range.");
   if (dirty_n_elems < max_elems()) {
     _elems[localBot] = t;
     _bottom = increment_index(localBot);
@@ -517,12 +503,12 @@ template<class E> inline bool GenericTaskQueue<E>::pop_local(E& t) {
   return true;
 #else
   uint localBot = _bottom;
-  // This value cannot be n-1.  That can only occur as a result of
+  // This value cannot be N-1.  That can only occur as a result of
   // the assignment to bottom in this method.  If it does, this method
   // resets the size( to 0 before the next call (which is sequential,
   // since this is pop_local.)
-  uint dirty_n_elems = dirty_size(localBot, get_top());
-  assert(dirty_n_elems != n() - 1, "Shouldn't be possible...");
+  uint dirty_n_elems = dirty_size(localBot, _age.top());
+  assert(dirty_n_elems != N - 1, "Shouldn't be possible...");
   if (dirty_n_elems == 0) return false;
   localBot = decrement_index(localBot);
   _bottom = localBot;
@@ -534,15 +520,14 @@ template<class E> inline bool GenericTaskQueue<E>::pop_local(E& t) {
   // If there's still at least one element in the queue, based on the
   // "_bottom" and "age" we've read, then there can be no interference with
   // a "pop_global" operation, and we're done.
-  TAG_TYPE tp = get_top();    // XXX
+  idx_t tp = _age.top();    // XXX
   if (size(localBot, tp) > 0) {
-    assert(dirty_size(localBot, tp) != n() - 1,
-           "Shouldn't be possible...");
+    assert(dirty_size(localBot, tp) != N - 1, "sanity");
     return true;
   } else {
     // Otherwise, the queue contained exactly one element; we take the slow
     // path.
-    return pop_local_slow(localBot, get_age());
+    return pop_local_slow(localBot, _age.get());
   }
 #endif
 }
diff --git a/hotspot/test/compiler/6795465/Test6795465.java b/hotspot/test/compiler/6795465/Test6795465.java
new file mode 100644
index 00000000000..505eee8c681
--- /dev/null
+++ b/hotspot/test/compiler/6795465/Test6795465.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6795465
+ * @summary Crash in assembler_sparc.cpp with client compiler on solaris-sparc
+ *
+ * @run main Test6795465
+ */
+
+public class Test6795465 {
+    static long var_1 = -1;
+
+    void test() {
+        long var_2 = var_1 * 1;
+        var_2 = var_2 + (new byte[1])[0];
+    }
+
+    public static void main(String[] args) {
+        Test6795465 t = new Test6795465();
+        for (int i = 0; i < 200000; i++) {
+            t.test();
+        }
+    }
+}
diff --git a/hotspot/test/compiler/6826736/Test.java b/hotspot/test/compiler/6826736/Test.java
index 02d0b2a9de7..263f0697876 100644
--- a/hotspot/test/compiler/6826736/Test.java
+++ b/hotspot/test/compiler/6826736/Test.java
@@ -27,7 +27,7 @@
  * @bug 6826736
  * @summary CMS: core dump with -XX:+UseCompressedOops
  *
- * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -Xbatch -XX:+ScavengeALot -XX:+UseCompressedOops -XX:HeapBaseMinAddress=32g -XX:CompileThreshold=100 -XX:CompileOnly=Test.test -XX:-BlockLayoutRotateLoops -XX:LoopUnrollLimit=0 Test
+ * @run main/othervm/timeout=600 -XX:+IgnoreUnrecognizedVMOptions -Xbatch -XX:+ScavengeALot -XX:+UseCompressedOops -XX:HeapBaseMinAddress=32g -XX:CompileThreshold=100 -XX:CompileOnly=Test.test -XX:-BlockLayoutRotateLoops -XX:LoopUnrollLimit=0 Test
  */
 
 public class Test {
diff --git a/hotspot/test/compiler/6833129/Test.java b/hotspot/test/compiler/6833129/Test.java
new file mode 100644
index 00000000000..45e9472e567
--- /dev/null
+++ b/hotspot/test/compiler/6833129/Test.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6833129
+ * @summary Object.clone() and Arrays.copyOf ignore coping with -XX:+DeoptimizeALot
+ * @run main/othervm -Xbatch -XX:+DeoptimizeALot Test
+ */
+
+public class Test{
+    public static void init(int src[]) {
+        for (int i =0; i<src.length; i++) {
+            src[i] =  i;
+        }
+    }
+
+    public static void clone_and_verify(int src[]) {
+        for (int i = 0; i < src.length; i++) {
+            int [] src_clone = src.clone();
+            if (src[i] != src_clone[i]) {
+                System.out.println("Error: allocated but not copied: ");
+                for( int j =0; j < src_clone.length; j++)
+                    System.out.print(" " + src_clone[j]);
+                System.out.println();
+                System.exit(97);
+            }
+        }
+    }
+
+    public static void test() {
+        int[] src = new int[34];
+        init(src);
+        clone_and_verify(src);
+    }
+
+    public static void main(String[] args) {
+        for (int i=0; i< 20000; i++) {
+            test();
+        }
+    }
+}
diff --git a/hotspot/test/compiler/6851282/Test.java b/hotspot/test/compiler/6851282/Test.java
index 1f5ec198e73..6ef29c9c9e5 100644
--- a/hotspot/test/compiler/6851282/Test.java
+++ b/hotspot/test/compiler/6851282/Test.java
@@ -27,7 +27,7 @@
  * @bug 6851282
  * @summary JIT miscompilation results in null entry in array when using CompressedOops
  *
- * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops Test
+ * @run main/othervm/timeout=600 -Xmx256m -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops Test
  */
 
 import java.util.ArrayList;
diff --git a/hotspot/test/compiler/6863155/Test6863155.java b/hotspot/test/compiler/6863155/Test6863155.java
new file mode 100644
index 00000000000..b77090bff61
--- /dev/null
+++ b/hotspot/test/compiler/6863155/Test6863155.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6863155
+ * @summary Server compiler generates incorrect code (x86, long, bitshift, bitmask)
+ *
+ * @run main/othervm -Xcomp -XX:CompileOnly=Test6863155.test Test6863155
+ */
+
+public class Test6863155 {
+    private static long test(byte b) {
+        return b << 24 & 0xff000000L;
+    }
+
+    public static void main(String... args) {
+        long result = test((byte) 0xc2);
+        long expected = 0x00000000c2000000L;
+        if (result != expected)
+            throw new InternalError(Long.toHexString(result) + " != " + Long.toHexString(expected));
+    }
+}
diff --git a/hotspot/test/compiler/6863420/Test.java b/hotspot/test/compiler/6863420/Test.java
new file mode 100644
index 00000000000..58a0e8123db
--- /dev/null
+++ b/hotspot/test/compiler/6863420/Test.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2009 D.E. Shaw.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/**
+ * @test
+ * @bug 6863420
+ * @summary os::javaTimeNanos() go backward on Solaris x86
+ *
+ * @run main/othervm Test
+ */
+
+public class Test {
+    static long value = 0;
+    static boolean got_backward_time = false;
+
+    public static void main(String args[]) {
+        final int count = 100000;
+
+        for (int numThreads = 1; numThreads <= 32; numThreads++) {
+            final int numRuns = 1;
+            for (int t=1; t <= numRuns; t++) {
+                final int curRun = t;
+
+                System.out.println("Spawning " + numThreads + " threads");
+                final Thread threads[] = new Thread[numThreads];
+                for (int i = 0; i < threads.length; i++) {
+                    Runnable thread =
+                        new Runnable() {
+                            public void run() {
+                                for (long l = 0; l < 100000; l++) {
+                                    final long start = System.nanoTime();
+                                    if (value == 12345678) {
+                                        System.out.println("Wow!");
+                                    }
+                                    final long end = System.nanoTime();
+                                    final long time = end - start;
+                                    value += time;
+                                    if (time < 0) {
+                                        System.out.println(
+                                            "Backwards: " +
+                                            "start=" + start + " " +
+                                            "end=" + end + " " +
+                                            "time= " + time
+                                        );
+                                        got_backward_time = true;
+                                    }
+                                }
+                            }
+                        };
+                    threads[i] = new Thread(thread, "Thread" + i);
+                }
+                for (int i = 0; i < threads.length; i++) {
+                    threads[i].start();
+                }
+                for (int i = 0; i < threads.length; i++) {
+                    try {
+                        threads[i].join();
+                    }
+                    catch (InterruptedException e) {
+                        continue;
+                    }
+                }
+            }
+        }
+
+        if (got_backward_time) {
+            System.exit(97);
+        }
+    }
+}
diff --git a/hotspot/test/compiler/6865031/Test.java b/hotspot/test/compiler/6865031/Test.java
new file mode 100644
index 00000000000..3262410840c
--- /dev/null
+++ b/hotspot/test/compiler/6865031/Test.java
@@ -0,0 +1,650 @@
+/*
+ * Copyright 2009 Goldman Sachs International.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 6865031
+ * @summary Application gives bad result (throws bad exception) with compressed oops
+ * @run main/othervm -XX:+UseCompressedOops -XX:HeapBaseMinAddress=32g -XX:-LoopUnswitching -XX:CompileCommand=inline,AbstractMemoryEfficientList.equals Test hello goodbye
+ */
+
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+interface MyList {
+    public int size();
+    public Object set(final int index, final Object element);
+    public Object get(final int index);
+}
+
+abstract class AbstractMemoryEfficientList implements MyList {
+    abstract public int size();
+    abstract public Object get(final int index);
+    abstract public Object set(final int index, final Object element);
+
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        }
+
+        if (!(o instanceof MyList)) {
+            return false;
+        }
+
+        final MyList that = (MyList) o;
+        if (this.size() != that.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < this.size(); i++) {
+            try {
+                if (!((this.get(i)).equals(that.get(i)))) {
+                    return false;
+                }
+            } catch (IndexOutOfBoundsException e) {
+                System.out.println("THROWING RT EXC");
+                System.out.println("concurrent modification of this:" + this.getClass() + ":" + System.identityHashCode(this) + "; that:" + that.getClass() + ":" + System.identityHashCode(that) + "; i:" + i);
+                e.printStackTrace();
+                System.exit(97);
+                throw new RuntimeException("concurrent modification of this:" + this.getClass() + ":" + System.identityHashCode(this) + "; that:" + that.getClass() + ":" + System.identityHashCode(that) + "; i:" + i, e);
+            }
+        }
+        return true;
+    }
+
+    public int hashCode() {
+        int hashCode = 1;
+        for (int i = 0; i < this.size(); i++) {
+            Object obj = this.get(i);
+            hashCode = 31 * hashCode + (obj == null ? 0 : obj.hashCode());
+        }
+        return hashCode;
+    }
+}
+
+final class SingletonList extends AbstractMemoryEfficientList {
+    private Object element1;
+
+    SingletonList(final Object obj1) {
+        super();
+        this.element1 = obj1;
+    }
+
+    public int size() {
+        return 1;
+    }
+
+    public Object get(final int index) {
+        if (index == 0) {
+            return this.element1;
+        } else {
+            throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + this.size());
+        }
+    }
+
+    public Object set(final int index, final Object element) {
+        if (index == 0) {
+            final Object previousElement = this.element1;
+            this.element1 = element;
+            return previousElement;
+        } else {
+            throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + this.size());
+        }
+    }
+}
+
+final class DoubletonList extends AbstractMemoryEfficientList {
+    private Object element1;
+    private Object element2;
+
+    DoubletonList(final Object obj1, final Object obj2) {
+        this.element1 = obj1;
+        this.element2 = obj2;
+    }
+
+    public int size() {
+        return 2;
+    }
+
+    public Object get(final int index) {
+        switch (index) {
+            case 0 : return this.element1;
+            case 1 : return this.element2;
+            default: throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + this.size());
+        }
+    }
+
+    public Object set(final int index, final Object element) {
+        switch (index) {
+            case 0 :
+            {
+                final Object previousElement = this.element1;
+                this.element1 = element;
+                return previousElement;
+            }
+            case 1 :
+            {
+                final Object previousElement = this.element2;
+                this.element2 = element;
+                return previousElement;
+            }
+            default : throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + this.size());
+        }
+    }
+}
+
+class WeakPool<V> {
+    protected static final int DEFAULT_INITIAL_CAPACITY = 16;
+    private static final int MAXIMUM_CAPACITY = 1 << 30;
+    private static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+    protected Entry<V>[] table;
+
+    private int size;
+    protected int threshold;
+    private final float loadFactor;
+    private final ReferenceQueue<V> queue = new ReferenceQueue<V>();
+
+    public WeakPool()
+    {
+        this.loadFactor = DEFAULT_LOAD_FACTOR;
+        threshold = DEFAULT_INITIAL_CAPACITY;
+        table = new Entry[DEFAULT_INITIAL_CAPACITY];
+    }
+
+    /**
+     * Check for equality of non-null reference x and possibly-null y.  By
+     * default uses Object.equals.
+     */
+    private boolean eq(Object x, Object y)
+    {
+        return x == y || x.equals(y);
+    }
+
+    /**
+     * Return index for hash code h.
+     */
+    private int indexFor(int h, int length)
+    {
+        return h & length - 1;
+    }
+
+    /**
+     * Expunge stale entries from the table.
+     */
+    private void expungeStaleEntries()
+    {
+        Object r;
+        while ((r = queue.poll()) != null)
+        {
+            Entry e = (Entry) r;
+            int h = e.hash;
+            int i = indexFor(h, table.length);
+
+            // System.out.println("EXPUNGING " + h);
+            Entry<V> prev = table[i];
+            Entry<V> p = prev;
+            while (p != null)
+            {
+                Entry<V> next = p.next;
+                if (p == e)
+                {
+                    if (prev == e)
+                    {
+                        table[i] = next;
+                    }
+                    else
+                    {
+                        prev.next = next;
+                    }
+                    e.next = null;  // Help GC
+                    size--;
+                    break;
+                }
+                prev = p;
+                p = next;
+            }
+        }
+    }
+
+    /**
+     * Return the table after first expunging stale entries
+     */
+    private Entry<V>[] getTable()
+    {
+        expungeStaleEntries();
+        return table;
+    }
+
+    /**
+     * Returns the number of key-value mappings in this map.
+     * This result is a snapshot, and may not reflect unprocessed
+     * entries that will be removed before next attempted access
+     * because they are no longer referenced.
+     */
+    public int size()
+    {
+        if (size == 0)
+        {
+            return 0;
+        }
+        expungeStaleEntries();
+        return size;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this map contains no key-value mappings.
+     * This result is a snapshot, and may not reflect unprocessed
+     * entries that will be removed before next attempted access
+     * because they are no longer referenced.
+     */
+    public boolean isEmpty()
+    {
+        return size() == 0;
+    }
+
+    /**
+     * Returns the value stored in the pool that equals the requested key
+     * or <tt>null</tt> if the map contains no mapping for
+     * this key (or the key is null)
+     *
+     * @param key the key whose equals value is to be returned.
+     * @return the object that is equal the specified key, or
+     *         <tt>null</tt> if key is null or no object in the pool equals the key.
+     */
+    public V get(V key)
+    {
+        if (key == null)
+        {
+            return null;
+        }
+        int h = key.hashCode();
+        Entry<V>[] tab = getTable();
+        int index = indexFor(h, tab.length);
+        Entry<V> e = tab[index];
+        while (e != null)
+        {
+            V candidate = e.get();
+            if (e.hash == h && eq(key, candidate))
+            {
+                return candidate;
+            }
+            e = e.next;
+        }
+        return null;
+    }
+
+    /**
+     * Returns the entry associated with the specified key in the HashMap.
+     * Returns null if the HashMap contains no mapping for this key.
+     */
+    Entry getEntry(Object key)
+    {
+        int h = key.hashCode();
+        Entry[] tab = getTable();
+        int index = indexFor(h, tab.length);
+        Entry e = tab[index];
+        while (e != null && !(e.hash == h && eq(key, e.get())))
+        {
+            e = e.next;
+        }
+        return e;
+    }
+
+    /**
+     * Places the object into the pool. If the object is null, nothing happens.
+     * If an equal object already exists, it is not replaced.
+     *
+     * @param key the object to put into the pool. key may be null.
+     * @return the object in the pool that is equal to the key, or the newly placed key if no such object existed when put was called
+     */
+    public V put(V key)
+    {
+        if (key == null)
+        {
+            return null;
+        }
+        int h = key.hashCode();
+        Entry<V>[] tab = getTable();
+        int i = indexFor(h, tab.length);
+
+        for (Entry<V> e = tab[i]; e != null; e = e.next)
+        {
+            V candidate = e.get();
+            if (h == e.hash && eq(key, candidate))
+            {
+                return candidate;
+            }
+        }
+
+        tab[i] = new Entry<V>(key, queue, h, tab[i]);
+
+        if (++size >= threshold)
+        {
+            resize(tab.length * 2);
+        }
+
+    // System.out.println("Added " + key + " to pool");
+        return key;
+    }
+
+    /**
+     * Rehashes the contents of this map into a new array with a
+     * larger capacity.  This method is called automatically when the
+     * number of keys in this map reaches its threshold.
+     * <p/>
+     * If current capacity is MAXIMUM_CAPACITY, this method does not
+     * resize the map, but but sets threshold to Integer.MAX_VALUE.
+     * This has the effect of preventing future calls.
+     *
+     * @param newCapacity the new capacity, MUST be a power of two;
+     *                    must be greater than current capacity unless current
+     *                    capacity is MAXIMUM_CAPACITY (in which case value
+     *                    is irrelevant).
+     */
+    void resize(int newCapacity)
+    {
+        Entry<V>[] oldTable = getTable();
+        int oldCapacity = oldTable.length;
+        if (oldCapacity == MAXIMUM_CAPACITY)
+        {
+            threshold = Integer.MAX_VALUE;
+            return;
+        }
+
+        Entry<V>[] newTable = new Entry[newCapacity];
+        transfer(oldTable, newTable);
+        table = newTable;
+
+        /*
+         * If ignoring null elements and processing ref queue caused massive
+         * shrinkage, then restore old table.  This should be rare, but avoids
+         * unbounded expansion of garbage-filled tables.
+         */
+        if (size >= threshold / 2)
+        {
+            threshold = (int) (newCapacity * loadFactor);
+        }
+        else
+        {
+            expungeStaleEntries();
+            transfer(newTable, oldTable);
+            table = oldTable;
+        }
+    }
+
+    /**
+     * Transfer all entries from src to dest tables
+     */
+    private void transfer(Entry[] src, Entry[] dest)
+    {
+        for (int j = 0; j < src.length; ++j)
+        {
+            Entry e = src[j];
+            src[j] = null;
+            while (e != null)
+            {
+                Entry next = e.next;
+                Object key = e.get();
+                if (key == null)
+                {
+                    e.next = null;  // Help GC
+                    size--;
+                }
+                else
+                {
+                    int i = indexFor(e.hash, dest.length);
+                    e.next = dest[i];
+                    dest[i] = e;
+                }
+                e = next;
+            }
+        }
+    }
+
+    /**
+     * Removes the object in the pool that equals the key.
+     *
+     * @param key
+     * @return previous value associated with specified key, or <tt>null</tt>
+     *         if there was no mapping for key or the key is null.
+     */
+    public V removeFromPool(V key)
+    {
+        if (key == null)
+        {
+            return null;
+        }
+        int h = key.hashCode();
+        Entry<V>[] tab = getTable();
+        int i = indexFor(h, tab.length);
+        Entry<V> prev = tab[i];
+        Entry<V> e = prev;
+
+        while (e != null)
+        {
+            Entry<V> next = e.next;
+            V candidate = e.get();
+            if (h == e.hash && eq(key, candidate))
+            {
+                size--;
+                if (prev == e)
+                {
+                    tab[i] = next;
+                }
+                else
+                {
+                    prev.next = next;
+                }
+                return candidate;
+            }
+            prev = e;
+            e = next;
+        }
+
+        return null;
+    }
+
+    /**
+     * Removes all mappings from this map.
+     */
+    public void clear()
+    {
+        // clear out ref queue. We don't need to expunge entries
+        // since table is getting cleared.
+        while (queue.poll() != null)
+        {
+            // nop
+        }
+
+        table = new Entry[DEFAULT_INITIAL_CAPACITY];
+        threshold = DEFAULT_INITIAL_CAPACITY;
+        size = 0;
+
+        // Allocation of array may have caused GC, which may have caused
+        // additional entries to go stale.  Removing these entries from the
+        // reference queue will make them eligible for reclamation.
+        while (queue.poll() != null)
+        {
+            // nop
+        }
+    }
+
+    /**
+     * The entries in this hash table extend WeakReference, using its main ref
+     * field as the key.
+     */
+    protected static class Entry<V>
+    extends WeakReference<V>
+    {
+        private final int hash;
+        private Entry<V> next;
+
+        /**
+         * Create new entry.
+         */
+        Entry(final V key, final ReferenceQueue<V> queue, final int hash, final Entry<V> next)
+        {
+            super(key, queue);
+            this.hash = hash;
+            this.next = next;
+        }
+
+        public V getKey()
+        {
+            return super.get();
+        }
+
+        public boolean equals(Object o)
+        {
+            if (!(o instanceof WeakPool.Entry))
+            {
+                return false;
+            }
+            WeakPool.Entry<V> that = (WeakPool.Entry<V>) o;
+            V k1 = this.getKey();
+            V k2 = that.getKey();
+            return (k1==k2 || k1.equals(k2));
+        }
+
+        public int hashCode()
+        {
+            return this.hash;
+        }
+
+        public String toString()
+        {
+            return String.valueOf(this.getKey());
+        }
+    }
+}
+
+final class MultiSynonymKey {
+    private List<MyList> keys;
+
+    public MultiSynonymKey() {
+        keys = new ArrayList<MyList>();
+    }
+
+    public MultiSynonymKey(MyList... arg) {
+        keys = Arrays.asList(arg);
+    }
+
+    public List<MyList> getKeys() {
+        return keys;
+    }
+
+    public int hashCode() {
+        return this.getKeys().hashCode();
+    }
+
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (!(obj instanceof MultiSynonymKey)) {
+            return false;
+        }
+
+        MultiSynonymKey that = (MultiSynonymKey) obj;
+        return this.getKeys().equals(that.getKeys());
+    }
+
+    public String toString() {
+        return this.getClass().getName() + this.getKeys().toString();
+    }
+}
+
+public class Test extends Thread {
+    static public Test test;
+    static private byte[] arg1;
+    static private byte[] arg2;
+    static public WeakPool<MultiSynonymKey> wp;
+    public volatile MultiSynonymKey ml1;
+    public volatile MultiSynonymKey ml2;
+    private volatile MultiSynonymKey ml3;
+
+    public void run() {
+        int count=0;
+        while (true) {
+            try {
+                Thread.sleep(10);
+            } catch (Exception e) {}
+            synchronized (wp) {
+                ml2 = new MultiSynonymKey(new DoubletonList(new String(arg1), new String(arg2)));
+                wp.put(ml2);
+                ml3 = new MultiSynonymKey(new DoubletonList(new String(arg1), new String(arg2)));
+            }
+            try {
+                Thread.sleep(10);
+            } catch (Exception e) {}
+            synchronized (wp) {
+                ml1 = new MultiSynonymKey(new SingletonList(new String(arg1)));
+                wp.put(ml1);
+                ml3 = new MultiSynonymKey(new SingletonList(new String(arg1)));
+            }
+            if (count++==100)
+                System.exit(95);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        wp = new WeakPool<MultiSynonymKey>();
+        test = new Test();
+
+        test.arg1 = args[0].getBytes();
+        test.arg2 = args[1].getBytes();
+
+        test.ml1 = new MultiSynonymKey(new SingletonList(new String(test.arg1)));
+        test.ml2 = new MultiSynonymKey(new DoubletonList(new String(test.arg1), new String(test.arg2)));
+        test.ml3 = new MultiSynonymKey(new DoubletonList(new String(test.arg1), new String(test.arg2)));
+
+        wp.put(test.ml1);
+        wp.put(test.ml2);
+
+        test.setDaemon(true);
+        test.start();
+
+        int counter = 0;
+        while (true) {
+            synchronized (wp) {
+                MultiSynonymKey foo = test.ml3;
+
+                if (wp.put(foo) == foo) {
+                    // System.out.println("foo " + counter);
+                    // System.out.println(foo);
+                }
+            }
+            counter++;
+        }
+    }
+
+    private boolean eq(Object x, Object y) {
+        return x == y || x.equals(y);
+    }
+}
diff --git a/hotspot/test/compiler/6866651/Test.java b/hotspot/test/compiler/6866651/Test.java
new file mode 100644
index 00000000000..484c5c3d5d0
--- /dev/null
+++ b/hotspot/test/compiler/6866651/Test.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6866651
+ * @summary delay dead node elimination in set_req_X to prevent killing the current node when it is in use
+ *
+ * @run main Test
+ */
+
+public class Test {
+
+    static int sum() {
+        int s = 0;
+        for (int x = 1, y = 0; x != 0; x++, y--) {
+            s ^= y;
+        }
+        return s;
+    }
+
+    public static void main(final String[] args) {
+        for (int k = 0; k < 2; k++) {
+            System.err.println(String.valueOf(sum()));
+        }
+    }
+}
diff --git a/hotspot/test/gc/6845368/bigobj.java b/hotspot/test/gc/6845368/bigobj.java
new file mode 100644
index 00000000000..087bdc9236b
--- /dev/null
+++ b/hotspot/test/gc/6845368/bigobj.java
@@ -0,0 +1,65563 @@
+/*
+   @test
+   @bug 6845368
+   @summary ensure gc updates references > 64K bytes from the start of the obj
+   @author John Coomes
+   @run main/othervm -Xmx64m bigobj
+*/
+
+// Allocate an object with a block of reference fields that starts more
+// than 64K bytes from the start of the object.  This is done with
+// inheritance because VMs typically rearrange the order fields appear in
+// memory, and group fields of the same type together within an object (i.e.,
+// in a single object, all reference fields could be put into a block near the
+// start of the object).
+//
+// A block of reference fields > 64K bytes from the start of the object would
+// cause HotSpot's OopMapBlock _offset field to overflow, so any references in
+// that block would not be updated properly after GC.
+//
+// After allocating the big object, set a reference field within the
+// block to a known object, provoke GC, then make sure the field was
+// updated properly.
+
+public class bigobj extends bigparent {
+    public static void main(String argv[]) {
+        bigobj c = new bigobj();
+        Object o = c.o = new Object();
+
+        // Provoke GC so o is moved (if this is a moving collector).
+        for (int i = 0; i < 64 * 1024 * 1024; i++) new Object();
+
+        if (o != c.o) {
+            System.out.println("failed:  o=" + o + " != c.o=" + c.o);
+            throw new RuntimeException("failed - c.o was not updated");
+        }
+    }
+
+    Object o;
+}
+
+class bigparent {
+    public long l00001;
+    public long l00002;
+    public long l00003;
+    public long l00004;
+    public long l00005;
+    public long l00006;
+    public long l00007;
+    public long l00008;
+    public long l00009;
+    public long l00010;
+    public long l00011;
+    public long l00012;
+    public long l00013;
+    public long l00014;
+    public long l00015;
+    public long l00016;
+    public long l00017;
+    public long l00018;
+    public long l00019;
+    public long l00020;
+    public long l00021;
+    public long l00022;
+    public long l00023;
+    public long l00024;
+    public long l00025;
+    public long l00026;
+    public long l00027;
+    public long l00028;
+    public long l00029;
+    public long l00030;
+    public long l00031;
+    public long l00032;
+    public long l00033;
+    public long l00034;
+    public long l00035;
+    public long l00036;
+    public long l00037;
+    public long l00038;
+    public long l00039;
+    public long l00040;
+    public long l00041;
+    public long l00042;
+    public long l00043;
+    public long l00044;
+    public long l00045;
+    public long l00046;
+    public long l00047;
+    public long l00048;
+    public long l00049;
+    public long l00050;
+    public long l00051;
+    public long l00052;
+    public long l00053;
+    public long l00054;
+    public long l00055;
+    public long l00056;
+    public long l00057;
+    public long l00058;
+    public long l00059;
+    public long l00060;
+    public long l00061;
+    public long l00062;
+    public long l00063;
+    public long l00064;
+    public long l00065;
+    public long l00066;
+    public long l00067;
+    public long l00068;
+    public long l00069;
+    public long l00070;
+    public long l00071;
+    public long l00072;
+    public long l00073;
+    public long l00074;
+    public long l00075;
+    public long l00076;
+    public long l00077;
+    public long l00078;
+    public long l00079;
+    public long l00080;
+    public long l00081;
+    public long l00082;
+    public long l00083;
+    public long l00084;
+    public long l00085;
+    public long l00086;
+    public long l00087;
+    public long l00088;
+    public long l00089;
+    public long l00090;
+    public long l00091;
+    public long l00092;
+    public long l00093;
+    public long l00094;
+    public long l00095;
+    public long l00096;
+    public long l00097;
+    public long l00098;
+    public long l00099;
+    public long l00100;
+    public long l00101;
+    public long l00102;
+    public long l00103;
+    public long l00104;
+    public long l00105;
+    public long l00106;
+    public long l00107;
+    public long l00108;
+    public long l00109;
+    public long l00110;
+    public long l00111;
+    public long l00112;
+    public long l00113;
+    public long l00114;
+    public long l00115;
+    public long l00116;
+    public long l00117;
+    public long l00118;
+    public long l00119;
+    public long l00120;
+    public long l00121;
+    public long l00122;
+    public long l00123;
+    public long l00124;
+    public long l00125;
+    public long l00126;
+    public long l00127;
+    public long l00128;
+    public long l00129;
+    public long l00130;
+    public long l00131;
+    public long l00132;
+    public long l00133;
+    public long l00134;
+    public long l00135;
+    public long l00136;
+    public long l00137;
+    public long l00138;
+    public long l00139;
+    public long l00140;
+    public long l00141;
+    public long l00142;
+    public long l00143;
+    public long l00144;
+    public long l00145;
+    public long l00146;
+    public long l00147;
+    public long l00148;
+    public long l00149;
+    public long l00150;
+    public long l00151;
+    public long l00152;
+    public long l00153;
+    public long l00154;
+    public long l00155;
+    public long l00156;
+    public long l00157;
+    public long l00158;
+    public long l00159;
+    public long l00160;
+    public long l00161;
+    public long l00162;
+    public long l00163;
+    public long l00164;
+    public long l00165;
+    public long l00166;
+    public long l00167;
+    public long l00168;
+    public long l00169;
+    public long l00170;
+    public long l00171;
+    public long l00172;
+    public long l00173;
+    public long l00174;
+    public long l00175;
+    public long l00176;
+    public long l00177;
+    public long l00178;
+    public long l00179;
+    public long l00180;
+    public long l00181;
+    public long l00182;
+    public long l00183;
+    public long l00184;
+    public long l00185;
+    public long l00186;
+    public long l00187;
+    public long l00188;
+    public long l00189;
+    public long l00190;
+    public long l00191;
+    public long l00192;
+    public long l00193;
+    public long l00194;
+    public long l00195;
+    public long l00196;
+    public long l00197;
+    public long l00198;
+    public long l00199;
+    public long l00200;
+    public long l00201;
+    public long l00202;
+    public long l00203;
+    public long l00204;
+    public long l00205;
+    public long l00206;
+    public long l00207;
+    public long l00208;
+    public long l00209;
+    public long l00210;
+    public long l00211;
+    public long l00212;
+    public long l00213;
+    public long l00214;
+    public long l00215;
+    public long l00216;
+    public long l00217;
+    public long l00218;
+    public long l00219;
+    public long l00220;
+    public long l00221;
+    public long l00222;
+    public long l00223;
+    public long l00224;
+    public long l00225;
+    public long l00226;
+    public long l00227;
+    public long l00228;
+    public long l00229;
+    public long l00230;
+    public long l00231;
+    public long l00232;
+    public long l00233;
+    public long l00234;
+    public long l00235;
+    public long l00236;
+    public long l00237;
+    public long l00238;
+    public long l00239;
+    public long l00240;
+    public long l00241;
+    public long l00242;
+    public long l00243;
+    public long l00244;
+    public long l00245;
+    public long l00246;
+    public long l00247;
+    public long l00248;
+    public long l00249;
+    public long l00250;
+    public long l00251;
+    public long l00252;
+    public long l00253;
+    public long l00254;
+    public long l00255;
+    public long l00256;
+    public long l00257;
+    public long l00258;
+    public long l00259;
+    public long l00260;
+    public long l00261;
+    public long l00262;
+    public long l00263;
+    public long l00264;
+    public long l00265;
+    public long l00266;
+    public long l00267;
+    public long l00268;
+    public long l00269;
+    public long l00270;
+    public long l00271;
+    public long l00272;
+    public long l00273;
+    public long l00274;
+    public long l00275;
+    public long l00276;
+    public long l00277;
+    public long l00278;
+    public long l00279;
+    public long l00280;
+    public long l00281;
+    public long l00282;
+    public long l00283;
+    public long l00284;
+    public long l00285;
+    public long l00286;
+    public long l00287;
+    public long l00288;
+    public long l00289;
+    public long l00290;
+    public long l00291;
+    public long l00292;
+    public long l00293;
+    public long l00294;
+    public long l00295;
+    public long l00296;
+    public long l00297;
+    public long l00298;
+    public long l00299;
+    public long l00300;
+    public long l00301;
+    public long l00302;
+    public long l00303;
+    public long l00304;
+    public long l00305;
+    public long l00306;
+    public long l00307;
+    public long l00308;
+    public long l00309;
+    public long l00310;
+    public long l00311;
+    public long l00312;
+    public long l00313;
+    public long l00314;
+    public long l00315;
+    public long l00316;
+    public long l00317;
+    public long l00318;
+    public long l00319;
+    public long l00320;
+    public long l00321;
+    public long l00322;
+    public long l00323;
+    public long l00324;
+    public long l00325;
+    public long l00326;
+    public long l00327;
+    public long l00328;
+    public long l00329;
+    public long l00330;
+    public long l00331;
+    public long l00332;
+    public long l00333;
+    public long l00334;
+    public long l00335;
+    public long l00336;
+    public long l00337;
+    public long l00338;
+    public long l00339;
+    public long l00340;
+    public long l00341;
+    public long l00342;
+    public long l00343;
+    public long l00344;
+    public long l00345;
+    public long l00346;
+    public long l00347;
+    public long l00348;
+    public long l00349;
+    public long l00350;
+    public long l00351;
+    public long l00352;
+    public long l00353;
+    public long l00354;
+    public long l00355;
+    public long l00356;
+    public long l00357;
+    public long l00358;
+    public long l00359;
+    public long l00360;
+    public long l00361;
+    public long l00362;
+    public long l00363;
+    public long l00364;
+    public long l00365;
+    public long l00366;
+    public long l00367;
+    public long l00368;
+    public long l00369;
+    public long l00370;
+    public long l00371;
+    public long l00372;
+    public long l00373;
+    public long l00374;
+    public long l00375;
+    public long l00376;
+    public long l00377;
+    public long l00378;
+    public long l00379;
+    public long l00380;
+    public long l00381;
+    public long l00382;
+    public long l00383;
+    public long l00384;
+    public long l00385;
+    public long l00386;
+    public long l00387;
+    public long l00388;
+    public long l00389;
+    public long l00390;
+    public long l00391;
+    public long l00392;
+    public long l00393;
+    public long l00394;
+    public long l00395;
+    public long l00396;
+    public long l00397;
+    public long l00398;
+    public long l00399;
+    public long l00400;
+    public long l00401;
+    public long l00402;
+    public long l00403;
+    public long l00404;
+    public long l00405;
+    public long l00406;
+    public long l00407;
+    public long l00408;
+    public long l00409;
+    public long l00410;
+    public long l00411;
+    public long l00412;
+    public long l00413;
+    public long l00414;
+    public long l00415;
+    public long l00416;
+    public long l00417;
+    public long l00418;
+    public long l00419;
+    public long l00420;
+    public long l00421;
+    public long l00422;
+    public long l00423;
+    public long l00424;
+    public long l00425;
+    public long l00426;
+    public long l00427;
+    public long l00428;
+    public long l00429;
+    public long l00430;
+    public long l00431;
+    public long l00432;
+    public long l00433;
+    public long l00434;
+    public long l00435;
+    public long l00436;
+    public long l00437;
+    public long l00438;
+    public long l00439;
+    public long l00440;
+    public long l00441;
+    public long l00442;
+    public long l00443;
+    public long l00444;
+    public long l00445;
+    public long l00446;
+    public long l00447;
+    public long l00448;
+    public long l00449;
+    public long l00450;
+    public long l00451;
+    public long l00452;
+    public long l00453;
+    public long l00454;
+    public long l00455;
+    public long l00456;
+    public long l00457;
+    public long l00458;
+    public long l00459;
+    public long l00460;
+    public long l00461;
+    public long l00462;
+    public long l00463;
+    public long l00464;
+    public long l00465;
+    public long l00466;
+    public long l00467;
+    public long l00468;
+    public long l00469;
+    public long l00470;
+    public long l00471;
+    public long l00472;
+    public long l00473;
+    public long l00474;
+    public long l00475;
+    public long l00476;
+    public long l00477;
+    public long l00478;
+    public long l00479;
+    public long l00480;
+    public long l00481;
+    public long l00482;
+    public long l00483;
+    public long l00484;
+    public long l00485;
+    public long l00486;
+    public long l00487;
+    public long l00488;
+    public long l00489;
+    public long l00490;
+    public long l00491;
+    public long l00492;
+    public long l00493;
+    public long l00494;
+    public long l00495;
+    public long l00496;
+    public long l00497;
+    public long l00498;
+    public long l00499;
+    public long l00500;
+    public long l00501;
+    public long l00502;
+    public long l00503;
+    public long l00504;
+    public long l00505;
+    public long l00506;
+    public long l00507;
+    public long l00508;
+    public long l00509;
+    public long l00510;
+    public long l00511;
+    public long l00512;
+    public long l00513;
+    public long l00514;
+    public long l00515;
+    public long l00516;
+    public long l00517;
+    public long l00518;
+    public long l00519;
+    public long l00520;
+    public long l00521;
+    public long l00522;
+    public long l00523;
+    public long l00524;
+    public long l00525;
+    public long l00526;
+    public long l00527;
+    public long l00528;
+    public long l00529;
+    public long l00530;
+    public long l00531;
+    public long l00532;
+    public long l00533;
+    public long l00534;
+    public long l00535;
+    public long l00536;
+    public long l00537;
+    public long l00538;
+    public long l00539;
+    public long l00540;
+    public long l00541;
+    public long l00542;
+    public long l00543;
+    public long l00544;
+    public long l00545;
+    public long l00546;
+    public long l00547;
+    public long l00548;
+    public long l00549;
+    public long l00550;
+    public long l00551;
+    public long l00552;
+    public long l00553;
+    public long l00554;
+    public long l00555;
+    public long l00556;
+    public long l00557;
+    public long l00558;
+    public long l00559;
+    public long l00560;
+    public long l00561;
+    public long l00562;
+    public long l00563;
+    public long l00564;
+    public long l00565;
+    public long l00566;
+    public long l00567;
+    public long l00568;
+    public long l00569;
+    public long l00570;
+    public long l00571;
+    public long l00572;
+    public long l00573;
+    public long l00574;
+    public long l00575;
+    public long l00576;
+    public long l00577;
+    public long l00578;
+    public long l00579;
+    public long l00580;
+    public long l00581;
+    public long l00582;
+    public long l00583;
+    public long l00584;
+    public long l00585;
+    public long l00586;
+    public long l00587;
+    public long l00588;
+    public long l00589;
+    public long l00590;
+    public long l00591;
+    public long l00592;
+    public long l00593;
+    public long l00594;
+    public long l00595;
+    public long l00596;
+    public long l00597;
+    public long l00598;
+    public long l00599;
+    public long l00600;
+    public long l00601;
+    public long l00602;
+    public long l00603;
+    public long l00604;
+    public long l00605;
+    public long l00606;
+    public long l00607;
+    public long l00608;
+    public long l00609;
+    public long l00610;
+    public long l00611;
+    public long l00612;
+    public long l00613;
+    public long l00614;
+    public long l00615;
+    public long l00616;
+    public long l00617;
+    public long l00618;
+    public long l00619;
+    public long l00620;
+    public long l00621;
+    public long l00622;
+    public long l00623;
+    public long l00624;
+    public long l00625;
+    public long l00626;
+    public long l00627;
+    public long l00628;
+    public long l00629;
+    public long l00630;
+    public long l00631;
+    public long l00632;
+    public long l00633;
+    public long l00634;
+    public long l00635;
+    public long l00636;
+    public long l00637;
+    public long l00638;
+    public long l00639;
+    public long l00640;
+    public long l00641;
+    public long l00642;
+    public long l00643;
+    public long l00644;
+    public long l00645;
+    public long l00646;
+    public long l00647;
+    public long l00648;
+    public long l00649;
+    public long l00650;
+    public long l00651;
+    public long l00652;
+    public long l00653;
+    public long l00654;
+    public long l00655;
+    public long l00656;
+    public long l00657;
+    public long l00658;
+    public long l00659;
+    public long l00660;
+    public long l00661;
+    public long l00662;
+    public long l00663;
+    public long l00664;
+    public long l00665;
+    public long l00666;
+    public long l00667;
+    public long l00668;
+    public long l00669;
+    public long l00670;
+    public long l00671;
+    public long l00672;
+    public long l00673;
+    public long l00674;
+    public long l00675;
+    public long l00676;
+    public long l00677;
+    public long l00678;
+    public long l00679;
+    public long l00680;
+    public long l00681;
+    public long l00682;
+    public long l00683;
+    public long l00684;
+    public long l00685;
+    public long l00686;
+    public long l00687;
+    public long l00688;
+    public long l00689;
+    public long l00690;
+    public long l00691;
+    public long l00692;
+    public long l00693;
+    public long l00694;
+    public long l00695;
+    public long l00696;
+    public long l00697;
+    public long l00698;
+    public long l00699;
+    public long l00700;
+    public long l00701;
+    public long l00702;
+    public long l00703;
+    public long l00704;
+    public long l00705;
+    public long l00706;
+    public long l00707;
+    public long l00708;
+    public long l00709;
+    public long l00710;
+    public long l00711;
+    public long l00712;
+    public long l00713;
+    public long l00714;
+    public long l00715;
+    public long l00716;
+    public long l00717;
+    public long l00718;
+    public long l00719;
+    public long l00720;
+    public long l00721;
+    public long l00722;
+    public long l00723;
+    public long l00724;
+    public long l00725;
+    public long l00726;
+    public long l00727;
+    public long l00728;
+    public long l00729;
+    public long l00730;
+    public long l00731;
+    public long l00732;
+    public long l00733;
+    public long l00734;
+    public long l00735;
+    public long l00736;
+    public long l00737;
+    public long l00738;
+    public long l00739;
+    public long l00740;
+    public long l00741;
+    public long l00742;
+    public long l00743;
+    public long l00744;
+    public long l00745;
+    public long l00746;
+    public long l00747;
+    public long l00748;
+    public long l00749;
+    public long l00750;
+    public long l00751;
+    public long l00752;
+    public long l00753;
+    public long l00754;
+    public long l00755;
+    public long l00756;
+    public long l00757;
+    public long l00758;
+    public long l00759;
+    public long l00760;
+    public long l00761;
+    public long l00762;
+    public long l00763;
+    public long l00764;
+    public long l00765;
+    public long l00766;
+    public long l00767;
+    public long l00768;
+    public long l00769;
+    public long l00770;
+    public long l00771;
+    public long l00772;
+    public long l00773;
+    public long l00774;
+    public long l00775;
+    public long l00776;
+    public long l00777;
+    public long l00778;
+    public long l00779;
+    public long l00780;
+    public long l00781;
+    public long l00782;
+    public long l00783;
+    public long l00784;
+    public long l00785;
+    public long l00786;
+    public long l00787;
+    public long l00788;
+    public long l00789;
+    public long l00790;
+    public long l00791;
+    public long l00792;
+    public long l00793;
+    public long l00794;
+    public long l00795;
+    public long l00796;
+    public long l00797;
+    public long l00798;
+    public long l00799;
+    public long l00800;
+    public long l00801;
+    public long l00802;
+    public long l00803;
+    public long l00804;
+    public long l00805;
+    public long l00806;
+    public long l00807;
+    public long l00808;
+    public long l00809;
+    public long l00810;
+    public long l00811;
+    public long l00812;
+    public long l00813;
+    public long l00814;
+    public long l00815;
+    public long l00816;
+    public long l00817;
+    public long l00818;
+    public long l00819;
+    public long l00820;
+    public long l00821;
+    public long l00822;
+    public long l00823;
+    public long l00824;
+    public long l00825;
+    public long l00826;
+    public long l00827;
+    public long l00828;
+    public long l00829;
+    public long l00830;
+    public long l00831;
+    public long l00832;
+    public long l00833;
+    public long l00834;
+    public long l00835;
+    public long l00836;
+    public long l00837;
+    public long l00838;
+    public long l00839;
+    public long l00840;
+    public long l00841;
+    public long l00842;
+    public long l00843;
+    public long l00844;
+    public long l00845;
+    public long l00846;
+    public long l00847;
+    public long l00848;
+    public long l00849;
+    public long l00850;
+    public long l00851;
+    public long l00852;
+    public long l00853;
+    public long l00854;
+    public long l00855;
+    public long l00856;
+    public long l00857;
+    public long l00858;
+    public long l00859;
+    public long l00860;
+    public long l00861;
+    public long l00862;
+    public long l00863;
+    public long l00864;
+    public long l00865;
+    public long l00866;
+    public long l00867;
+    public long l00868;
+    public long l00869;
+    public long l00870;
+    public long l00871;
+    public long l00872;
+    public long l00873;
+    public long l00874;
+    public long l00875;
+    public long l00876;
+    public long l00877;
+    public long l00878;
+    public long l00879;
+    public long l00880;
+    public long l00881;
+    public long l00882;
+    public long l00883;
+    public long l00884;
+    public long l00885;
+    public long l00886;
+    public long l00887;
+    public long l00888;
+    public long l00889;
+    public long l00890;
+    public long l00891;
+    public long l00892;
+    public long l00893;
+    public long l00894;
+    public long l00895;
+    public long l00896;
+    public long l00897;
+    public long l00898;
+    public long l00899;
+    public long l00900;
+    public long l00901;
+    public long l00902;
+    public long l00903;
+    public long l00904;
+    public long l00905;
+    public long l00906;
+    public long l00907;
+    public long l00908;
+    public long l00909;
+    public long l00910;
+    public long l00911;
+    public long l00912;
+    public long l00913;
+    public long l00914;
+    public long l00915;
+    public long l00916;
+    public long l00917;
+    public long l00918;
+    public long l00919;
+    public long l00920;
+    public long l00921;
+    public long l00922;
+    public long l00923;
+    public long l00924;
+    public long l00925;
+    public long l00926;
+    public long l00927;
+    public long l00928;
+    public long l00929;
+    public long l00930;
+    public long l00931;
+    public long l00932;
+    public long l00933;
+    public long l00934;
+    public long l00935;
+    public long l00936;
+    public long l00937;
+    public long l00938;
+    public long l00939;
+    public long l00940;
+    public long l00941;
+    public long l00942;
+    public long l00943;
+    public long l00944;
+    public long l00945;
+    public long l00946;
+    public long l00947;
+    public long l00948;
+    public long l00949;
+    public long l00950;
+    public long l00951;
+    public long l00952;
+    public long l00953;
+    public long l00954;
+    public long l00955;
+    public long l00956;
+    public long l00957;
+    public long l00958;
+    public long l00959;
+    public long l00960;
+    public long l00961;
+    public long l00962;
+    public long l00963;
+    public long l00964;
+    public long l00965;
+    public long l00966;
+    public long l00967;
+    public long l00968;
+    public long l00969;
+    public long l00970;
+    public long l00971;
+    public long l00972;
+    public long l00973;
+    public long l00974;
+    public long l00975;
+    public long l00976;
+    public long l00977;
+    public long l00978;
+    public long l00979;
+    public long l00980;
+    public long l00981;
+    public long l00982;
+    public long l00983;
+    public long l00984;
+    public long l00985;
+    public long l00986;
+    public long l00987;
+    public long l00988;
+    public long l00989;
+    public long l00990;
+    public long l00991;
+    public long l00992;
+    public long l00993;
+    public long l00994;
+    public long l00995;
+    public long l00996;
+    public long l00997;
+    public long l00998;
+    public long l00999;
+    public long l01000;
+    public long l01001;
+    public long l01002;
+    public long l01003;
+    public long l01004;
+    public long l01005;
+    public long l01006;
+    public long l01007;
+    public long l01008;
+    public long l01009;
+    public long l01010;
+    public long l01011;
+    public long l01012;
+    public long l01013;
+    public long l01014;
+    public long l01015;
+    public long l01016;
+    public long l01017;
+    public long l01018;
+    public long l01019;
+    public long l01020;
+    public long l01021;
+    public long l01022;
+    public long l01023;
+    public long l01024;
+    public long l01025;
+    public long l01026;
+    public long l01027;
+    public long l01028;
+    public long l01029;
+    public long l01030;
+    public long l01031;
+    public long l01032;
+    public long l01033;
+    public long l01034;
+    public long l01035;
+    public long l01036;
+    public long l01037;
+    public long l01038;
+    public long l01039;
+    public long l01040;
+    public long l01041;
+    public long l01042;
+    public long l01043;
+    public long l01044;
+    public long l01045;
+    public long l01046;
+    public long l01047;
+    public long l01048;
+    public long l01049;
+    public long l01050;
+    public long l01051;
+    public long l01052;
+    public long l01053;
+    public long l01054;
+    public long l01055;
+    public long l01056;
+    public long l01057;
+    public long l01058;
+    public long l01059;
+    public long l01060;
+    public long l01061;
+    public long l01062;
+    public long l01063;
+    public long l01064;
+    public long l01065;
+    public long l01066;
+    public long l01067;
+    public long l01068;
+    public long l01069;
+    public long l01070;
+    public long l01071;
+    public long l01072;
+    public long l01073;
+    public long l01074;
+    public long l01075;
+    public long l01076;
+    public long l01077;
+    public long l01078;
+    public long l01079;
+    public long l01080;
+    public long l01081;
+    public long l01082;
+    public long l01083;
+    public long l01084;
+    public long l01085;
+    public long l01086;
+    public long l01087;
+    public long l01088;
+    public long l01089;
+    public long l01090;
+    public long l01091;
+    public long l01092;
+    public long l01093;
+    public long l01094;
+    public long l01095;
+    public long l01096;
+    public long l01097;
+    public long l01098;
+    public long l01099;
+    public long l01100;
+    public long l01101;
+    public long l01102;
+    public long l01103;
+    public long l01104;
+    public long l01105;
+    public long l01106;
+    public long l01107;
+    public long l01108;
+    public long l01109;
+    public long l01110;
+    public long l01111;
+    public long l01112;
+    public long l01113;
+    public long l01114;
+    public long l01115;
+    public long l01116;
+    public long l01117;
+    public long l01118;
+    public long l01119;
+    public long l01120;
+    public long l01121;
+    public long l01122;
+    public long l01123;
+    public long l01124;
+    public long l01125;
+    public long l01126;
+    public long l01127;
+    public long l01128;
+    public long l01129;
+    public long l01130;
+    public long l01131;
+    public long l01132;
+    public long l01133;
+    public long l01134;
+    public long l01135;
+    public long l01136;
+    public long l01137;
+    public long l01138;
+    public long l01139;
+    public long l01140;
+    public long l01141;
+    public long l01142;
+    public long l01143;
+    public long l01144;
+    public long l01145;
+    public long l01146;
+    public long l01147;
+    public long l01148;
+    public long l01149;
+    public long l01150;
+    public long l01151;
+    public long l01152;
+    public long l01153;
+    public long l01154;
+    public long l01155;
+    public long l01156;
+    public long l01157;
+    public long l01158;
+    public long l01159;
+    public long l01160;
+    public long l01161;
+    public long l01162;
+    public long l01163;
+    public long l01164;
+    public long l01165;
+    public long l01166;
+    public long l01167;
+    public long l01168;
+    public long l01169;
+    public long l01170;
+    public long l01171;
+    public long l01172;
+    public long l01173;
+    public long l01174;
+    public long l01175;
+    public long l01176;
+    public long l01177;
+    public long l01178;
+    public long l01179;
+    public long l01180;
+    public long l01181;
+    public long l01182;
+    public long l01183;
+    public long l01184;
+    public long l01185;
+    public long l01186;
+    public long l01187;
+    public long l01188;
+    public long l01189;
+    public long l01190;
+    public long l01191;
+    public long l01192;
+    public long l01193;
+    public long l01194;
+    public long l01195;
+    public long l01196;
+    public long l01197;
+    public long l01198;
+    public long l01199;
+    public long l01200;
+    public long l01201;
+    public long l01202;
+    public long l01203;
+    public long l01204;
+    public long l01205;
+    public long l01206;
+    public long l01207;
+    public long l01208;
+    public long l01209;
+    public long l01210;
+    public long l01211;
+    public long l01212;
+    public long l01213;
+    public long l01214;
+    public long l01215;
+    public long l01216;
+    public long l01217;
+    public long l01218;
+    public long l01219;
+    public long l01220;
+    public long l01221;
+    public long l01222;
+    public long l01223;
+    public long l01224;
+    public long l01225;
+    public long l01226;
+    public long l01227;
+    public long l01228;
+    public long l01229;
+    public long l01230;
+    public long l01231;
+    public long l01232;
+    public long l01233;
+    public long l01234;
+    public long l01235;
+    public long l01236;
+    public long l01237;
+    public long l01238;
+    public long l01239;
+    public long l01240;
+    public long l01241;
+    public long l01242;
+    public long l01243;
+    public long l01244;
+    public long l01245;
+    public long l01246;
+    public long l01247;
+    public long l01248;
+    public long l01249;
+    public long l01250;
+    public long l01251;
+    public long l01252;
+    public long l01253;
+    public long l01254;
+    public long l01255;
+    public long l01256;
+    public long l01257;
+    public long l01258;
+    public long l01259;
+    public long l01260;
+    public long l01261;
+    public long l01262;
+    public long l01263;
+    public long l01264;
+    public long l01265;
+    public long l01266;
+    public long l01267;
+    public long l01268;
+    public long l01269;
+    public long l01270;
+    public long l01271;
+    public long l01272;
+    public long l01273;
+    public long l01274;
+    public long l01275;
+    public long l01276;
+    public long l01277;
+    public long l01278;
+    public long l01279;
+    public long l01280;
+    public long l01281;
+    public long l01282;
+    public long l01283;
+    public long l01284;
+    public long l01285;
+    public long l01286;
+    public long l01287;
+    public long l01288;
+    public long l01289;
+    public long l01290;
+    public long l01291;
+    public long l01292;
+    public long l01293;
+    public long l01294;
+    public long l01295;
+    public long l01296;
+    public long l01297;
+    public long l01298;
+    public long l01299;
+    public long l01300;
+    public long l01301;
+    public long l01302;
+    public long l01303;
+    public long l01304;
+    public long l01305;
+    public long l01306;
+    public long l01307;
+    public long l01308;
+    public long l01309;
+    public long l01310;
+    public long l01311;
+    public long l01312;
+    public long l01313;
+    public long l01314;
+    public long l01315;
+    public long l01316;
+    public long l01317;
+    public long l01318;
+    public long l01319;
+    public long l01320;
+    public long l01321;
+    public long l01322;
+    public long l01323;
+    public long l01324;
+    public long l01325;
+    public long l01326;
+    public long l01327;
+    public long l01328;
+    public long l01329;
+    public long l01330;
+    public long l01331;
+    public long l01332;
+    public long l01333;
+    public long l01334;
+    public long l01335;
+    public long l01336;
+    public long l01337;
+    public long l01338;
+    public long l01339;
+    public long l01340;
+    public long l01341;
+    public long l01342;
+    public long l01343;
+    public long l01344;
+    public long l01345;
+    public long l01346;
+    public long l01347;
+    public long l01348;
+    public long l01349;
+    public long l01350;
+    public long l01351;
+    public long l01352;
+    public long l01353;
+    public long l01354;
+    public long l01355;
+    public long l01356;
+    public long l01357;
+    public long l01358;
+    public long l01359;
+    public long l01360;
+    public long l01361;
+    public long l01362;
+    public long l01363;
+    public long l01364;
+    public long l01365;
+    public long l01366;
+    public long l01367;
+    public long l01368;
+    public long l01369;
+    public long l01370;
+    public long l01371;
+    public long l01372;
+    public long l01373;
+    public long l01374;
+    public long l01375;
+    public long l01376;
+    public long l01377;
+    public long l01378;
+    public long l01379;
+    public long l01380;
+    public long l01381;
+    public long l01382;
+    public long l01383;
+    public long l01384;
+    public long l01385;
+    public long l01386;
+    public long l01387;
+    public long l01388;
+    public long l01389;
+    public long l01390;
+    public long l01391;
+    public long l01392;
+    public long l01393;
+    public long l01394;
+    public long l01395;
+    public long l01396;
+    public long l01397;
+    public long l01398;
+    public long l01399;
+    public long l01400;
+    public long l01401;
+    public long l01402;
+    public long l01403;
+    public long l01404;
+    public long l01405;
+    public long l01406;
+    public long l01407;
+    public long l01408;
+    public long l01409;
+    public long l01410;
+    public long l01411;
+    public long l01412;
+    public long l01413;
+    public long l01414;
+    public long l01415;
+    public long l01416;
+    public long l01417;
+    public long l01418;
+    public long l01419;
+    public long l01420;
+    public long l01421;
+    public long l01422;
+    public long l01423;
+    public long l01424;
+    public long l01425;
+    public long l01426;
+    public long l01427;
+    public long l01428;
+    public long l01429;
+    public long l01430;
+    public long l01431;
+    public long l01432;
+    public long l01433;
+    public long l01434;
+    public long l01435;
+    public long l01436;
+    public long l01437;
+    public long l01438;
+    public long l01439;
+    public long l01440;
+    public long l01441;
+    public long l01442;
+    public long l01443;
+    public long l01444;
+    public long l01445;
+    public long l01446;
+    public long l01447;
+    public long l01448;
+    public long l01449;
+    public long l01450;
+    public long l01451;
+    public long l01452;
+    public long l01453;
+    public long l01454;
+    public long l01455;
+    public long l01456;
+    public long l01457;
+    public long l01458;
+    public long l01459;
+    public long l01460;
+    public long l01461;
+    public long l01462;
+    public long l01463;
+    public long l01464;
+    public long l01465;
+    public long l01466;
+    public long l01467;
+    public long l01468;
+    public long l01469;
+    public long l01470;
+    public long l01471;
+    public long l01472;
+    public long l01473;
+    public long l01474;
+    public long l01475;
+    public long l01476;
+    public long l01477;
+    public long l01478;
+    public long l01479;
+    public long l01480;
+    public long l01481;
+    public long l01482;
+    public long l01483;
+    public long l01484;
+    public long l01485;
+    public long l01486;
+    public long l01487;
+    public long l01488;
+    public long l01489;
+    public long l01490;
+    public long l01491;
+    public long l01492;
+    public long l01493;
+    public long l01494;
+    public long l01495;
+    public long l01496;
+    public long l01497;
+    public long l01498;
+    public long l01499;
+    public long l01500;
+    public long l01501;
+    public long l01502;
+    public long l01503;
+    public long l01504;
+    public long l01505;
+    public long l01506;
+    public long l01507;
+    public long l01508;
+    public long l01509;
+    public long l01510;
+    public long l01511;
+    public long l01512;
+    public long l01513;
+    public long l01514;
+    public long l01515;
+    public long l01516;
+    public long l01517;
+    public long l01518;
+    public long l01519;
+    public long l01520;
+    public long l01521;
+    public long l01522;
+    public long l01523;
+    public long l01524;
+    public long l01525;
+    public long l01526;
+    public long l01527;
+    public long l01528;
+    public long l01529;
+    public long l01530;
+    public long l01531;
+    public long l01532;
+    public long l01533;
+    public long l01534;
+    public long l01535;
+    public long l01536;
+    public long l01537;
+    public long l01538;
+    public long l01539;
+    public long l01540;
+    public long l01541;
+    public long l01542;
+    public long l01543;
+    public long l01544;
+    public long l01545;
+    public long l01546;
+    public long l01547;
+    public long l01548;
+    public long l01549;
+    public long l01550;
+    public long l01551;
+    public long l01552;
+    public long l01553;
+    public long l01554;
+    public long l01555;
+    public long l01556;
+    public long l01557;
+    public long l01558;
+    public long l01559;
+    public long l01560;
+    public long l01561;
+    public long l01562;
+    public long l01563;
+    public long l01564;
+    public long l01565;
+    public long l01566;
+    public long l01567;
+    public long l01568;
+    public long l01569;
+    public long l01570;
+    public long l01571;
+    public long l01572;
+    public long l01573;
+    public long l01574;
+    public long l01575;
+    public long l01576;
+    public long l01577;
+    public long l01578;
+    public long l01579;
+    public long l01580;
+    public long l01581;
+    public long l01582;
+    public long l01583;
+    public long l01584;
+    public long l01585;
+    public long l01586;
+    public long l01587;
+    public long l01588;
+    public long l01589;
+    public long l01590;
+    public long l01591;
+    public long l01592;
+    public long l01593;
+    public long l01594;
+    public long l01595;
+    public long l01596;
+    public long l01597;
+    public long l01598;
+    public long l01599;
+    public long l01600;
+    public long l01601;
+    public long l01602;
+    public long l01603;
+    public long l01604;
+    public long l01605;
+    public long l01606;
+    public long l01607;
+    public long l01608;
+    public long l01609;
+    public long l01610;
+    public long l01611;
+    public long l01612;
+    public long l01613;
+    public long l01614;
+    public long l01615;
+    public long l01616;
+    public long l01617;
+    public long l01618;
+    public long l01619;
+    public long l01620;
+    public long l01621;
+    public long l01622;
+    public long l01623;
+    public long l01624;
+    public long l01625;
+    public long l01626;
+    public long l01627;
+    public long l01628;
+    public long l01629;
+    public long l01630;
+    public long l01631;
+    public long l01632;
+    public long l01633;
+    public long l01634;
+    public long l01635;
+    public long l01636;
+    public long l01637;
+    public long l01638;
+    public long l01639;
+    public long l01640;
+    public long l01641;
+    public long l01642;
+    public long l01643;
+    public long l01644;
+    public long l01645;
+    public long l01646;
+    public long l01647;
+    public long l01648;
+    public long l01649;
+    public long l01650;
+    public long l01651;
+    public long l01652;
+    public long l01653;
+    public long l01654;
+    public long l01655;
+    public long l01656;
+    public long l01657;
+    public long l01658;
+    public long l01659;
+    public long l01660;
+    public long l01661;
+    public long l01662;
+    public long l01663;
+    public long l01664;
+    public long l01665;
+    public long l01666;
+    public long l01667;
+    public long l01668;
+    public long l01669;
+    public long l01670;
+    public long l01671;
+    public long l01672;
+    public long l01673;
+    public long l01674;
+    public long l01675;
+    public long l01676;
+    public long l01677;
+    public long l01678;
+    public long l01679;
+    public long l01680;
+    public long l01681;
+    public long l01682;
+    public long l01683;
+    public long l01684;
+    public long l01685;
+    public long l01686;
+    public long l01687;
+    public long l01688;
+    public long l01689;
+    public long l01690;
+    public long l01691;
+    public long l01692;
+    public long l01693;
+    public long l01694;
+    public long l01695;
+    public long l01696;
+    public long l01697;
+    public long l01698;
+    public long l01699;
+    public long l01700;
+    public long l01701;
+    public long l01702;
+    public long l01703;
+    public long l01704;
+    public long l01705;
+    public long l01706;
+    public long l01707;
+    public long l01708;
+    public long l01709;
+    public long l01710;
+    public long l01711;
+    public long l01712;
+    public long l01713;
+    public long l01714;
+    public long l01715;
+    public long l01716;
+    public long l01717;
+    public long l01718;
+    public long l01719;
+    public long l01720;
+    public long l01721;
+    public long l01722;
+    public long l01723;
+    public long l01724;
+    public long l01725;
+    public long l01726;
+    public long l01727;
+    public long l01728;
+    public long l01729;
+    public long l01730;
+    public long l01731;
+    public long l01732;
+    public long l01733;
+    public long l01734;
+    public long l01735;
+    public long l01736;
+    public long l01737;
+    public long l01738;
+    public long l01739;
+    public long l01740;
+    public long l01741;
+    public long l01742;
+    public long l01743;
+    public long l01744;
+    public long l01745;
+    public long l01746;
+    public long l01747;
+    public long l01748;
+    public long l01749;
+    public long l01750;
+    public long l01751;
+    public long l01752;
+    public long l01753;
+    public long l01754;
+    public long l01755;
+    public long l01756;
+    public long l01757;
+    public long l01758;
+    public long l01759;
+    public long l01760;
+    public long l01761;
+    public long l01762;
+    public long l01763;
+    public long l01764;
+    public long l01765;
+    public long l01766;
+    public long l01767;
+    public long l01768;
+    public long l01769;
+    public long l01770;
+    public long l01771;
+    public long l01772;
+    public long l01773;
+    public long l01774;
+    public long l01775;
+    public long l01776;
+    public long l01777;
+    public long l01778;
+    public long l01779;
+    public long l01780;
+    public long l01781;
+    public long l01782;
+    public long l01783;
+    public long l01784;
+    public long l01785;
+    public long l01786;
+    public long l01787;
+    public long l01788;
+    public long l01789;
+    public long l01790;
+    public long l01791;
+    public long l01792;
+    public long l01793;
+    public long l01794;
+    public long l01795;
+    public long l01796;
+    public long l01797;
+    public long l01798;
+    public long l01799;
+    public long l01800;
+    public long l01801;
+    public long l01802;
+    public long l01803;
+    public long l01804;
+    public long l01805;
+    public long l01806;
+    public long l01807;
+    public long l01808;
+    public long l01809;
+    public long l01810;
+    public long l01811;
+    public long l01812;
+    public long l01813;
+    public long l01814;
+    public long l01815;
+    public long l01816;
+    public long l01817;
+    public long l01818;
+    public long l01819;
+    public long l01820;
+    public long l01821;
+    public long l01822;
+    public long l01823;
+    public long l01824;
+    public long l01825;
+    public long l01826;
+    public long l01827;
+    public long l01828;
+    public long l01829;
+    public long l01830;
+    public long l01831;
+    public long l01832;
+    public long l01833;
+    public long l01834;
+    public long l01835;
+    public long l01836;
+    public long l01837;
+    public long l01838;
+    public long l01839;
+    public long l01840;
+    public long l01841;
+    public long l01842;
+    public long l01843;
+    public long l01844;
+    public long l01845;
+    public long l01846;
+    public long l01847;
+    public long l01848;
+    public long l01849;
+    public long l01850;
+    public long l01851;
+    public long l01852;
+    public long l01853;
+    public long l01854;
+    public long l01855;
+    public long l01856;
+    public long l01857;
+    public long l01858;
+    public long l01859;
+    public long l01860;
+    public long l01861;
+    public long l01862;
+    public long l01863;
+    public long l01864;
+    public long l01865;
+    public long l01866;
+    public long l01867;
+    public long l01868;
+    public long l01869;
+    public long l01870;
+    public long l01871;
+    public long l01872;
+    public long l01873;
+    public long l01874;
+    public long l01875;
+    public long l01876;
+    public long l01877;
+    public long l01878;
+    public long l01879;
+    public long l01880;
+    public long l01881;
+    public long l01882;
+    public long l01883;
+    public long l01884;
+    public long l01885;
+    public long l01886;
+    public long l01887;
+    public long l01888;
+    public long l01889;
+    public long l01890;
+    public long l01891;
+    public long l01892;
+    public long l01893;
+    public long l01894;
+    public long l01895;
+    public long l01896;
+    public long l01897;
+    public long l01898;
+    public long l01899;
+    public long l01900;
+    public long l01901;
+    public long l01902;
+    public long l01903;
+    public long l01904;
+    public long l01905;
+    public long l01906;
+    public long l01907;
+    public long l01908;
+    public long l01909;
+    public long l01910;
+    public long l01911;
+    public long l01912;
+    public long l01913;
+    public long l01914;
+    public long l01915;
+    public long l01916;
+    public long l01917;
+    public long l01918;
+    public long l01919;
+    public long l01920;
+    public long l01921;
+    public long l01922;
+    public long l01923;
+    public long l01924;
+    public long l01925;
+    public long l01926;
+    public long l01927;
+    public long l01928;
+    public long l01929;
+    public long l01930;
+    public long l01931;
+    public long l01932;
+    public long l01933;
+    public long l01934;
+    public long l01935;
+    public long l01936;
+    public long l01937;
+    public long l01938;
+    public long l01939;
+    public long l01940;
+    public long l01941;
+    public long l01942;
+    public long l01943;
+    public long l01944;
+    public long l01945;
+    public long l01946;
+    public long l01947;
+    public long l01948;
+    public long l01949;
+    public long l01950;
+    public long l01951;
+    public long l01952;
+    public long l01953;
+    public long l01954;
+    public long l01955;
+    public long l01956;
+    public long l01957;
+    public long l01958;
+    public long l01959;
+    public long l01960;
+    public long l01961;
+    public long l01962;
+    public long l01963;
+    public long l01964;
+    public long l01965;
+    public long l01966;
+    public long l01967;
+    public long l01968;
+    public long l01969;
+    public long l01970;
+    public long l01971;
+    public long l01972;
+    public long l01973;
+    public long l01974;
+    public long l01975;
+    public long l01976;
+    public long l01977;
+    public long l01978;
+    public long l01979;
+    public long l01980;
+    public long l01981;
+    public long l01982;
+    public long l01983;
+    public long l01984;
+    public long l01985;
+    public long l01986;
+    public long l01987;
+    public long l01988;
+    public long l01989;
+    public long l01990;
+    public long l01991;
+    public long l01992;
+    public long l01993;
+    public long l01994;
+    public long l01995;
+    public long l01996;
+    public long l01997;
+    public long l01998;
+    public long l01999;
+    public long l02000;
+    public long l02001;
+    public long l02002;
+    public long l02003;
+    public long l02004;
+    public long l02005;
+    public long l02006;
+    public long l02007;
+    public long l02008;
+    public long l02009;
+    public long l02010;
+    public long l02011;
+    public long l02012;
+    public long l02013;
+    public long l02014;
+    public long l02015;
+    public long l02016;
+    public long l02017;
+    public long l02018;
+    public long l02019;
+    public long l02020;
+    public long l02021;
+    public long l02022;
+    public long l02023;
+    public long l02024;
+    public long l02025;
+    public long l02026;
+    public long l02027;
+    public long l02028;
+    public long l02029;
+    public long l02030;
+    public long l02031;
+    public long l02032;
+    public long l02033;
+    public long l02034;
+    public long l02035;
+    public long l02036;
+    public long l02037;
+    public long l02038;
+    public long l02039;
+    public long l02040;
+    public long l02041;
+    public long l02042;
+    public long l02043;
+    public long l02044;
+    public long l02045;
+    public long l02046;
+    public long l02047;
+    public long l02048;
+    public long l02049;
+    public long l02050;
+    public long l02051;
+    public long l02052;
+    public long l02053;
+    public long l02054;
+    public long l02055;
+    public long l02056;
+    public long l02057;
+    public long l02058;
+    public long l02059;
+    public long l02060;
+    public long l02061;
+    public long l02062;
+    public long l02063;
+    public long l02064;
+    public long l02065;
+    public long l02066;
+    public long l02067;
+    public long l02068;
+    public long l02069;
+    public long l02070;
+    public long l02071;
+    public long l02072;
+    public long l02073;
+    public long l02074;
+    public long l02075;
+    public long l02076;
+    public long l02077;
+    public long l02078;
+    public long l02079;
+    public long l02080;
+    public long l02081;
+    public long l02082;
+    public long l02083;
+    public long l02084;
+    public long l02085;
+    public long l02086;
+    public long l02087;
+    public long l02088;
+    public long l02089;
+    public long l02090;
+    public long l02091;
+    public long l02092;
+    public long l02093;
+    public long l02094;
+    public long l02095;
+    public long l02096;
+    public long l02097;
+    public long l02098;
+    public long l02099;
+    public long l02100;
+    public long l02101;
+    public long l02102;
+    public long l02103;
+    public long l02104;
+    public long l02105;
+    public long l02106;
+    public long l02107;
+    public long l02108;
+    public long l02109;
+    public long l02110;
+    public long l02111;
+    public long l02112;
+    public long l02113;
+    public long l02114;
+    public long l02115;
+    public long l02116;
+    public long l02117;
+    public long l02118;
+    public long l02119;
+    public long l02120;
+    public long l02121;
+    public long l02122;
+    public long l02123;
+    public long l02124;
+    public long l02125;
+    public long l02126;
+    public long l02127;
+    public long l02128;
+    public long l02129;
+    public long l02130;
+    public long l02131;
+    public long l02132;
+    public long l02133;
+    public long l02134;
+    public long l02135;
+    public long l02136;
+    public long l02137;
+    public long l02138;
+    public long l02139;
+    public long l02140;
+    public long l02141;
+    public long l02142;
+    public long l02143;
+    public long l02144;
+    public long l02145;
+    public long l02146;
+    public long l02147;
+    public long l02148;
+    public long l02149;
+    public long l02150;
+    public long l02151;
+    public long l02152;
+    public long l02153;
+    public long l02154;
+    public long l02155;
+    public long l02156;
+    public long l02157;
+    public long l02158;
+    public long l02159;
+    public long l02160;
+    public long l02161;
+    public long l02162;
+    public long l02163;
+    public long l02164;
+    public long l02165;
+    public long l02166;
+    public long l02167;
+    public long l02168;
+    public long l02169;
+    public long l02170;
+    public long l02171;
+    public long l02172;
+    public long l02173;
+    public long l02174;
+    public long l02175;
+    public long l02176;
+    public long l02177;
+    public long l02178;
+    public long l02179;
+    public long l02180;
+    public long l02181;
+    public long l02182;
+    public long l02183;
+    public long l02184;
+    public long l02185;
+    public long l02186;
+    public long l02187;
+    public long l02188;
+    public long l02189;
+    public long l02190;
+    public long l02191;
+    public long l02192;
+    public long l02193;
+    public long l02194;
+    public long l02195;
+    public long l02196;
+    public long l02197;
+    public long l02198;
+    public long l02199;
+    public long l02200;
+    public long l02201;
+    public long l02202;
+    public long l02203;
+    public long l02204;
+    public long l02205;
+    public long l02206;
+    public long l02207;
+    public long l02208;
+    public long l02209;
+    public long l02210;
+    public long l02211;
+    public long l02212;
+    public long l02213;
+    public long l02214;
+    public long l02215;
+    public long l02216;
+    public long l02217;
+    public long l02218;
+    public long l02219;
+    public long l02220;
+    public long l02221;
+    public long l02222;
+    public long l02223;
+    public long l02224;
+    public long l02225;
+    public long l02226;
+    public long l02227;
+    public long l02228;
+    public long l02229;
+    public long l02230;
+    public long l02231;
+    public long l02232;
+    public long l02233;
+    public long l02234;
+    public long l02235;
+    public long l02236;
+    public long l02237;
+    public long l02238;
+    public long l02239;
+    public long l02240;
+    public long l02241;
+    public long l02242;
+    public long l02243;
+    public long l02244;
+    public long l02245;
+    public long l02246;
+    public long l02247;
+    public long l02248;
+    public long l02249;
+    public long l02250;
+    public long l02251;
+    public long l02252;
+    public long l02253;
+    public long l02254;
+    public long l02255;
+    public long l02256;
+    public long l02257;
+    public long l02258;
+    public long l02259;
+    public long l02260;
+    public long l02261;
+    public long l02262;
+    public long l02263;
+    public long l02264;
+    public long l02265;
+    public long l02266;
+    public long l02267;
+    public long l02268;
+    public long l02269;
+    public long l02270;
+    public long l02271;
+    public long l02272;
+    public long l02273;
+    public long l02274;
+    public long l02275;
+    public long l02276;
+    public long l02277;
+    public long l02278;
+    public long l02279;
+    public long l02280;
+    public long l02281;
+    public long l02282;
+    public long l02283;
+    public long l02284;
+    public long l02285;
+    public long l02286;
+    public long l02287;
+    public long l02288;
+    public long l02289;
+    public long l02290;
+    public long l02291;
+    public long l02292;
+    public long l02293;
+    public long l02294;
+    public long l02295;
+    public long l02296;
+    public long l02297;
+    public long l02298;
+    public long l02299;
+    public long l02300;
+    public long l02301;
+    public long l02302;
+    public long l02303;
+    public long l02304;
+    public long l02305;
+    public long l02306;
+    public long l02307;
+    public long l02308;
+    public long l02309;
+    public long l02310;
+    public long l02311;
+    public long l02312;
+    public long l02313;
+    public long l02314;
+    public long l02315;
+    public long l02316;
+    public long l02317;
+    public long l02318;
+    public long l02319;
+    public long l02320;
+    public long l02321;
+    public long l02322;
+    public long l02323;
+    public long l02324;
+    public long l02325;
+    public long l02326;
+    public long l02327;
+    public long l02328;
+    public long l02329;
+    public long l02330;
+    public long l02331;
+    public long l02332;
+    public long l02333;
+    public long l02334;
+    public long l02335;
+    public long l02336;
+    public long l02337;
+    public long l02338;
+    public long l02339;
+    public long l02340;
+    public long l02341;
+    public long l02342;
+    public long l02343;
+    public long l02344;
+    public long l02345;
+    public long l02346;
+    public long l02347;
+    public long l02348;
+    public long l02349;
+    public long l02350;
+    public long l02351;
+    public long l02352;
+    public long l02353;
+    public long l02354;
+    public long l02355;
+    public long l02356;
+    public long l02357;
+    public long l02358;
+    public long l02359;
+    public long l02360;
+    public long l02361;
+    public long l02362;
+    public long l02363;
+    public long l02364;
+    public long l02365;
+    public long l02366;
+    public long l02367;
+    public long l02368;
+    public long l02369;
+    public long l02370;
+    public long l02371;
+    public long l02372;
+    public long l02373;
+    public long l02374;
+    public long l02375;
+    public long l02376;
+    public long l02377;
+    public long l02378;
+    public long l02379;
+    public long l02380;
+    public long l02381;
+    public long l02382;
+    public long l02383;
+    public long l02384;
+    public long l02385;
+    public long l02386;
+    public long l02387;
+    public long l02388;
+    public long l02389;
+    public long l02390;
+    public long l02391;
+    public long l02392;
+    public long l02393;
+    public long l02394;
+    public long l02395;
+    public long l02396;
+    public long l02397;
+    public long l02398;
+    public long l02399;
+    public long l02400;
+    public long l02401;
+    public long l02402;
+    public long l02403;
+    public long l02404;
+    public long l02405;
+    public long l02406;
+    public long l02407;
+    public long l02408;
+    public long l02409;
+    public long l02410;
+    public long l02411;
+    public long l02412;
+    public long l02413;
+    public long l02414;
+    public long l02415;
+    public long l02416;
+    public long l02417;
+    public long l02418;
+    public long l02419;
+    public long l02420;
+    public long l02421;
+    public long l02422;
+    public long l02423;
+    public long l02424;
+    public long l02425;
+    public long l02426;
+    public long l02427;
+    public long l02428;
+    public long l02429;
+    public long l02430;
+    public long l02431;
+    public long l02432;
+    public long l02433;
+    public long l02434;
+    public long l02435;
+    public long l02436;
+    public long l02437;
+    public long l02438;
+    public long l02439;
+    public long l02440;
+    public long l02441;
+    public long l02442;
+    public long l02443;
+    public long l02444;
+    public long l02445;
+    public long l02446;
+    public long l02447;
+    public long l02448;
+    public long l02449;
+    public long l02450;
+    public long l02451;
+    public long l02452;
+    public long l02453;
+    public long l02454;
+    public long l02455;
+    public long l02456;
+    public long l02457;
+    public long l02458;
+    public long l02459;
+    public long l02460;
+    public long l02461;
+    public long l02462;
+    public long l02463;
+    public long l02464;
+    public long l02465;
+    public long l02466;
+    public long l02467;
+    public long l02468;
+    public long l02469;
+    public long l02470;
+    public long l02471;
+    public long l02472;
+    public long l02473;
+    public long l02474;
+    public long l02475;
+    public long l02476;
+    public long l02477;
+    public long l02478;
+    public long l02479;
+    public long l02480;
+    public long l02481;
+    public long l02482;
+    public long l02483;
+    public long l02484;
+    public long l02485;
+    public long l02486;
+    public long l02487;
+    public long l02488;
+    public long l02489;
+    public long l02490;
+    public long l02491;
+    public long l02492;
+    public long l02493;
+    public long l02494;
+    public long l02495;
+    public long l02496;
+    public long l02497;
+    public long l02498;
+    public long l02499;
+    public long l02500;
+    public long l02501;
+    public long l02502;
+    public long l02503;
+    public long l02504;
+    public long l02505;
+    public long l02506;
+    public long l02507;
+    public long l02508;
+    public long l02509;
+    public long l02510;
+    public long l02511;
+    public long l02512;
+    public long l02513;
+    public long l02514;
+    public long l02515;
+    public long l02516;
+    public long l02517;
+    public long l02518;
+    public long l02519;
+    public long l02520;
+    public long l02521;
+    public long l02522;
+    public long l02523;
+    public long l02524;
+    public long l02525;
+    public long l02526;
+    public long l02527;
+    public long l02528;
+    public long l02529;
+    public long l02530;
+    public long l02531;
+    public long l02532;
+    public long l02533;
+    public long l02534;
+    public long l02535;
+    public long l02536;
+    public long l02537;
+    public long l02538;
+    public long l02539;
+    public long l02540;
+    public long l02541;
+    public long l02542;
+    public long l02543;
+    public long l02544;
+    public long l02545;
+    public long l02546;
+    public long l02547;
+    public long l02548;
+    public long l02549;
+    public long l02550;
+    public long l02551;
+    public long l02552;
+    public long l02553;
+    public long l02554;
+    public long l02555;
+    public long l02556;
+    public long l02557;
+    public long l02558;
+    public long l02559;
+    public long l02560;
+    public long l02561;
+    public long l02562;
+    public long l02563;
+    public long l02564;
+    public long l02565;
+    public long l02566;
+    public long l02567;
+    public long l02568;
+    public long l02569;
+    public long l02570;
+    public long l02571;
+    public long l02572;
+    public long l02573;
+    public long l02574;
+    public long l02575;
+    public long l02576;
+    public long l02577;
+    public long l02578;
+    public long l02579;
+    public long l02580;
+    public long l02581;
+    public long l02582;
+    public long l02583;
+    public long l02584;
+    public long l02585;
+    public long l02586;
+    public long l02587;
+    public long l02588;
+    public long l02589;
+    public long l02590;
+    public long l02591;
+    public long l02592;
+    public long l02593;
+    public long l02594;
+    public long l02595;
+    public long l02596;
+    public long l02597;
+    public long l02598;
+    public long l02599;
+    public long l02600;
+    public long l02601;
+    public long l02602;
+    public long l02603;
+    public long l02604;
+    public long l02605;
+    public long l02606;
+    public long l02607;
+    public long l02608;
+    public long l02609;
+    public long l02610;
+    public long l02611;
+    public long l02612;
+    public long l02613;
+    public long l02614;
+    public long l02615;
+    public long l02616;
+    public long l02617;
+    public long l02618;
+    public long l02619;
+    public long l02620;
+    public long l02621;
+    public long l02622;
+    public long l02623;
+    public long l02624;
+    public long l02625;
+    public long l02626;
+    public long l02627;
+    public long l02628;
+    public long l02629;
+    public long l02630;
+    public long l02631;
+    public long l02632;
+    public long l02633;
+    public long l02634;
+    public long l02635;
+    public long l02636;
+    public long l02637;
+    public long l02638;
+    public long l02639;
+    public long l02640;
+    public long l02641;
+    public long l02642;
+    public long l02643;
+    public long l02644;
+    public long l02645;
+    public long l02646;
+    public long l02647;
+    public long l02648;
+    public long l02649;
+    public long l02650;
+    public long l02651;
+    public long l02652;
+    public long l02653;
+    public long l02654;
+    public long l02655;
+    public long l02656;
+    public long l02657;
+    public long l02658;
+    public long l02659;
+    public long l02660;
+    public long l02661;
+    public long l02662;
+    public long l02663;
+    public long l02664;
+    public long l02665;
+    public long l02666;
+    public long l02667;
+    public long l02668;
+    public long l02669;
+    public long l02670;
+    public long l02671;
+    public long l02672;
+    public long l02673;
+    public long l02674;
+    public long l02675;
+    public long l02676;
+    public long l02677;
+    public long l02678;
+    public long l02679;
+    public long l02680;
+    public long l02681;
+    public long l02682;
+    public long l02683;
+    public long l02684;
+    public long l02685;
+    public long l02686;
+    public long l02687;
+    public long l02688;
+    public long l02689;
+    public long l02690;
+    public long l02691;
+    public long l02692;
+    public long l02693;
+    public long l02694;
+    public long l02695;
+    public long l02696;
+    public long l02697;
+    public long l02698;
+    public long l02699;
+    public long l02700;
+    public long l02701;
+    public long l02702;
+    public long l02703;
+    public long l02704;
+    public long l02705;
+    public long l02706;
+    public long l02707;
+    public long l02708;
+    public long l02709;
+    public long l02710;
+    public long l02711;
+    public long l02712;
+    public long l02713;
+    public long l02714;
+    public long l02715;
+    public long l02716;
+    public long l02717;
+    public long l02718;
+    public long l02719;
+    public long l02720;
+    public long l02721;
+    public long l02722;
+    public long l02723;
+    public long l02724;
+    public long l02725;
+    public long l02726;
+    public long l02727;
+    public long l02728;
+    public long l02729;
+    public long l02730;
+    public long l02731;
+    public long l02732;
+    public long l02733;
+    public long l02734;
+    public long l02735;
+    public long l02736;
+    public long l02737;
+    public long l02738;
+    public long l02739;
+    public long l02740;
+    public long l02741;
+    public long l02742;
+    public long l02743;
+    public long l02744;
+    public long l02745;
+    public long l02746;
+    public long l02747;
+    public long l02748;
+    public long l02749;
+    public long l02750;
+    public long l02751;
+    public long l02752;
+    public long l02753;
+    public long l02754;
+    public long l02755;
+    public long l02756;
+    public long l02757;
+    public long l02758;
+    public long l02759;
+    public long l02760;
+    public long l02761;
+    public long l02762;
+    public long l02763;
+    public long l02764;
+    public long l02765;
+    public long l02766;
+    public long l02767;
+    public long l02768;
+    public long l02769;
+    public long l02770;
+    public long l02771;
+    public long l02772;
+    public long l02773;
+    public long l02774;
+    public long l02775;
+    public long l02776;
+    public long l02777;
+    public long l02778;
+    public long l02779;
+    public long l02780;
+    public long l02781;
+    public long l02782;
+    public long l02783;
+    public long l02784;
+    public long l02785;
+    public long l02786;
+    public long l02787;
+    public long l02788;
+    public long l02789;
+    public long l02790;
+    public long l02791;
+    public long l02792;
+    public long l02793;
+    public long l02794;
+    public long l02795;
+    public long l02796;
+    public long l02797;
+    public long l02798;
+    public long l02799;
+    public long l02800;
+    public long l02801;
+    public long l02802;
+    public long l02803;
+    public long l02804;
+    public long l02805;
+    public long l02806;
+    public long l02807;
+    public long l02808;
+    public long l02809;
+    public long l02810;
+    public long l02811;
+    public long l02812;
+    public long l02813;
+    public long l02814;
+    public long l02815;
+    public long l02816;
+    public long l02817;
+    public long l02818;
+    public long l02819;
+    public long l02820;
+    public long l02821;
+    public long l02822;
+    public long l02823;
+    public long l02824;
+    public long l02825;
+    public long l02826;
+    public long l02827;
+    public long l02828;
+    public long l02829;
+    public long l02830;
+    public long l02831;
+    public long l02832;
+    public long l02833;
+    public long l02834;
+    public long l02835;
+    public long l02836;
+    public long l02837;
+    public long l02838;
+    public long l02839;
+    public long l02840;
+    public long l02841;
+    public long l02842;
+    public long l02843;
+    public long l02844;
+    public long l02845;
+    public long l02846;
+    public long l02847;
+    public long l02848;
+    public long l02849;
+    public long l02850;
+    public long l02851;
+    public long l02852;
+    public long l02853;
+    public long l02854;
+    public long l02855;
+    public long l02856;
+    public long l02857;
+    public long l02858;
+    public long l02859;
+    public long l02860;
+    public long l02861;
+    public long l02862;
+    public long l02863;
+    public long l02864;
+    public long l02865;
+    public long l02866;
+    public long l02867;
+    public long l02868;
+    public long l02869;
+    public long l02870;
+    public long l02871;
+    public long l02872;
+    public long l02873;
+    public long l02874;
+    public long l02875;
+    public long l02876;
+    public long l02877;
+    public long l02878;
+    public long l02879;
+    public long l02880;
+    public long l02881;
+    public long l02882;
+    public long l02883;
+    public long l02884;
+    public long l02885;
+    public long l02886;
+    public long l02887;
+    public long l02888;
+    public long l02889;
+    public long l02890;
+    public long l02891;
+    public long l02892;
+    public long l02893;
+    public long l02894;
+    public long l02895;
+    public long l02896;
+    public long l02897;
+    public long l02898;
+    public long l02899;
+    public long l02900;
+    public long l02901;
+    public long l02902;
+    public long l02903;
+    public long l02904;
+    public long l02905;
+    public long l02906;
+    public long l02907;
+    public long l02908;
+    public long l02909;
+    public long l02910;
+    public long l02911;
+    public long l02912;
+    public long l02913;
+    public long l02914;
+    public long l02915;
+    public long l02916;
+    public long l02917;
+    public long l02918;
+    public long l02919;
+    public long l02920;
+    public long l02921;
+    public long l02922;
+    public long l02923;
+    public long l02924;
+    public long l02925;
+    public long l02926;
+    public long l02927;
+    public long l02928;
+    public long l02929;
+    public long l02930;
+    public long l02931;
+    public long l02932;
+    public long l02933;
+    public long l02934;
+    public long l02935;
+    public long l02936;
+    public long l02937;
+    public long l02938;
+    public long l02939;
+    public long l02940;
+    public long l02941;
+    public long l02942;
+    public long l02943;
+    public long l02944;
+    public long l02945;
+    public long l02946;
+    public long l02947;
+    public long l02948;
+    public long l02949;
+    public long l02950;
+    public long l02951;
+    public long l02952;
+    public long l02953;
+    public long l02954;
+    public long l02955;
+    public long l02956;
+    public long l02957;
+    public long l02958;
+    public long l02959;
+    public long l02960;
+    public long l02961;
+    public long l02962;
+    public long l02963;
+    public long l02964;
+    public long l02965;
+    public long l02966;
+    public long l02967;
+    public long l02968;
+    public long l02969;
+    public long l02970;
+    public long l02971;
+    public long l02972;
+    public long l02973;
+    public long l02974;
+    public long l02975;
+    public long l02976;
+    public long l02977;
+    public long l02978;
+    public long l02979;
+    public long l02980;
+    public long l02981;
+    public long l02982;
+    public long l02983;
+    public long l02984;
+    public long l02985;
+    public long l02986;
+    public long l02987;
+    public long l02988;
+    public long l02989;
+    public long l02990;
+    public long l02991;
+    public long l02992;
+    public long l02993;
+    public long l02994;
+    public long l02995;
+    public long l02996;
+    public long l02997;
+    public long l02998;
+    public long l02999;
+    public long l03000;
+    public long l03001;
+    public long l03002;
+    public long l03003;
+    public long l03004;
+    public long l03005;
+    public long l03006;
+    public long l03007;
+    public long l03008;
+    public long l03009;
+    public long l03010;
+    public long l03011;
+    public long l03012;
+    public long l03013;
+    public long l03014;
+    public long l03015;
+    public long l03016;
+    public long l03017;
+    public long l03018;
+    public long l03019;
+    public long l03020;
+    public long l03021;
+    public long l03022;
+    public long l03023;
+    public long l03024;
+    public long l03025;
+    public long l03026;
+    public long l03027;
+    public long l03028;
+    public long l03029;
+    public long l03030;
+    public long l03031;
+    public long l03032;
+    public long l03033;
+    public long l03034;
+    public long l03035;
+    public long l03036;
+    public long l03037;
+    public long l03038;
+    public long l03039;
+    public long l03040;
+    public long l03041;
+    public long l03042;
+    public long l03043;
+    public long l03044;
+    public long l03045;
+    public long l03046;
+    public long l03047;
+    public long l03048;
+    public long l03049;
+    public long l03050;
+    public long l03051;
+    public long l03052;
+    public long l03053;
+    public long l03054;
+    public long l03055;
+    public long l03056;
+    public long l03057;
+    public long l03058;
+    public long l03059;
+    public long l03060;
+    public long l03061;
+    public long l03062;
+    public long l03063;
+    public long l03064;
+    public long l03065;
+    public long l03066;
+    public long l03067;
+    public long l03068;
+    public long l03069;
+    public long l03070;
+    public long l03071;
+    public long l03072;
+    public long l03073;
+    public long l03074;
+    public long l03075;
+    public long l03076;
+    public long l03077;
+    public long l03078;
+    public long l03079;
+    public long l03080;
+    public long l03081;
+    public long l03082;
+    public long l03083;
+    public long l03084;
+    public long l03085;
+    public long l03086;
+    public long l03087;
+    public long l03088;
+    public long l03089;
+    public long l03090;
+    public long l03091;
+    public long l03092;
+    public long l03093;
+    public long l03094;
+    public long l03095;
+    public long l03096;
+    public long l03097;
+    public long l03098;
+    public long l03099;
+    public long l03100;
+    public long l03101;
+    public long l03102;
+    public long l03103;
+    public long l03104;
+    public long l03105;
+    public long l03106;
+    public long l03107;
+    public long l03108;
+    public long l03109;
+    public long l03110;
+    public long l03111;
+    public long l03112;
+    public long l03113;
+    public long l03114;
+    public long l03115;
+    public long l03116;
+    public long l03117;
+    public long l03118;
+    public long l03119;
+    public long l03120;
+    public long l03121;
+    public long l03122;
+    public long l03123;
+    public long l03124;
+    public long l03125;
+    public long l03126;
+    public long l03127;
+    public long l03128;
+    public long l03129;
+    public long l03130;
+    public long l03131;
+    public long l03132;
+    public long l03133;
+    public long l03134;
+    public long l03135;
+    public long l03136;
+    public long l03137;
+    public long l03138;
+    public long l03139;
+    public long l03140;
+    public long l03141;
+    public long l03142;
+    public long l03143;
+    public long l03144;
+    public long l03145;
+    public long l03146;
+    public long l03147;
+    public long l03148;
+    public long l03149;
+    public long l03150;
+    public long l03151;
+    public long l03152;
+    public long l03153;
+    public long l03154;
+    public long l03155;
+    public long l03156;
+    public long l03157;
+    public long l03158;
+    public long l03159;
+    public long l03160;
+    public long l03161;
+    public long l03162;
+    public long l03163;
+    public long l03164;
+    public long l03165;
+    public long l03166;
+    public long l03167;
+    public long l03168;
+    public long l03169;
+    public long l03170;
+    public long l03171;
+    public long l03172;
+    public long l03173;
+    public long l03174;
+    public long l03175;
+    public long l03176;
+    public long l03177;
+    public long l03178;
+    public long l03179;
+    public long l03180;
+    public long l03181;
+    public long l03182;
+    public long l03183;
+    public long l03184;
+    public long l03185;
+    public long l03186;
+    public long l03187;
+    public long l03188;
+    public long l03189;
+    public long l03190;
+    public long l03191;
+    public long l03192;
+    public long l03193;
+    public long l03194;
+    public long l03195;
+    public long l03196;
+    public long l03197;
+    public long l03198;
+    public long l03199;
+    public long l03200;
+    public long l03201;
+    public long l03202;
+    public long l03203;
+    public long l03204;
+    public long l03205;
+    public long l03206;
+    public long l03207;
+    public long l03208;
+    public long l03209;
+    public long l03210;
+    public long l03211;
+    public long l03212;
+    public long l03213;
+    public long l03214;
+    public long l03215;
+    public long l03216;
+    public long l03217;
+    public long l03218;
+    public long l03219;
+    public long l03220;
+    public long l03221;
+    public long l03222;
+    public long l03223;
+    public long l03224;
+    public long l03225;
+    public long l03226;
+    public long l03227;
+    public long l03228;
+    public long l03229;
+    public long l03230;
+    public long l03231;
+    public long l03232;
+    public long l03233;
+    public long l03234;
+    public long l03235;
+    public long l03236;
+    public long l03237;
+    public long l03238;
+    public long l03239;
+    public long l03240;
+    public long l03241;
+    public long l03242;
+    public long l03243;
+    public long l03244;
+    public long l03245;
+    public long l03246;
+    public long l03247;
+    public long l03248;
+    public long l03249;
+    public long l03250;
+    public long l03251;
+    public long l03252;
+    public long l03253;
+    public long l03254;
+    public long l03255;
+    public long l03256;
+    public long l03257;
+    public long l03258;
+    public long l03259;
+    public long l03260;
+    public long l03261;
+    public long l03262;
+    public long l03263;
+    public long l03264;
+    public long l03265;
+    public long l03266;
+    public long l03267;
+    public long l03268;
+    public long l03269;
+    public long l03270;
+    public long l03271;
+    public long l03272;
+    public long l03273;
+    public long l03274;
+    public long l03275;
+    public long l03276;
+    public long l03277;
+    public long l03278;
+    public long l03279;
+    public long l03280;
+    public long l03281;
+    public long l03282;
+    public long l03283;
+    public long l03284;
+    public long l03285;
+    public long l03286;
+    public long l03287;
+    public long l03288;
+    public long l03289;
+    public long l03290;
+    public long l03291;
+    public long l03292;
+    public long l03293;
+    public long l03294;
+    public long l03295;
+    public long l03296;
+    public long l03297;
+    public long l03298;
+    public long l03299;
+    public long l03300;
+    public long l03301;
+    public long l03302;
+    public long l03303;
+    public long l03304;
+    public long l03305;
+    public long l03306;
+    public long l03307;
+    public long l03308;
+    public long l03309;
+    public long l03310;
+    public long l03311;
+    public long l03312;
+    public long l03313;
+    public long l03314;
+    public long l03315;
+    public long l03316;
+    public long l03317;
+    public long l03318;
+    public long l03319;
+    public long l03320;
+    public long l03321;
+    public long l03322;
+    public long l03323;
+    public long l03324;
+    public long l03325;
+    public long l03326;
+    public long l03327;
+    public long l03328;
+    public long l03329;
+    public long l03330;
+    public long l03331;
+    public long l03332;
+    public long l03333;
+    public long l03334;
+    public long l03335;
+    public long l03336;
+    public long l03337;
+    public long l03338;
+    public long l03339;
+    public long l03340;
+    public long l03341;
+    public long l03342;
+    public long l03343;
+    public long l03344;
+    public long l03345;
+    public long l03346;
+    public long l03347;
+    public long l03348;
+    public long l03349;
+    public long l03350;
+    public long l03351;
+    public long l03352;
+    public long l03353;
+    public long l03354;
+    public long l03355;
+    public long l03356;
+    public long l03357;
+    public long l03358;
+    public long l03359;
+    public long l03360;
+    public long l03361;
+    public long l03362;
+    public long l03363;
+    public long l03364;
+    public long l03365;
+    public long l03366;
+    public long l03367;
+    public long l03368;
+    public long l03369;
+    public long l03370;
+    public long l03371;
+    public long l03372;
+    public long l03373;
+    public long l03374;
+    public long l03375;
+    public long l03376;
+    public long l03377;
+    public long l03378;
+    public long l03379;
+    public long l03380;
+    public long l03381;
+    public long l03382;
+    public long l03383;
+    public long l03384;
+    public long l03385;
+    public long l03386;
+    public long l03387;
+    public long l03388;
+    public long l03389;
+    public long l03390;
+    public long l03391;
+    public long l03392;
+    public long l03393;
+    public long l03394;
+    public long l03395;
+    public long l03396;
+    public long l03397;
+    public long l03398;
+    public long l03399;
+    public long l03400;
+    public long l03401;
+    public long l03402;
+    public long l03403;
+    public long l03404;
+    public long l03405;
+    public long l03406;
+    public long l03407;
+    public long l03408;
+    public long l03409;
+    public long l03410;
+    public long l03411;
+    public long l03412;
+    public long l03413;
+    public long l03414;
+    public long l03415;
+    public long l03416;
+    public long l03417;
+    public long l03418;
+    public long l03419;
+    public long l03420;
+    public long l03421;
+    public long l03422;
+    public long l03423;
+    public long l03424;
+    public long l03425;
+    public long l03426;
+    public long l03427;
+    public long l03428;
+    public long l03429;
+    public long l03430;
+    public long l03431;
+    public long l03432;
+    public long l03433;
+    public long l03434;
+    public long l03435;
+    public long l03436;
+    public long l03437;
+    public long l03438;
+    public long l03439;
+    public long l03440;
+    public long l03441;
+    public long l03442;
+    public long l03443;
+    public long l03444;
+    public long l03445;
+    public long l03446;
+    public long l03447;
+    public long l03448;
+    public long l03449;
+    public long l03450;
+    public long l03451;
+    public long l03452;
+    public long l03453;
+    public long l03454;
+    public long l03455;
+    public long l03456;
+    public long l03457;
+    public long l03458;
+    public long l03459;
+    public long l03460;
+    public long l03461;
+    public long l03462;
+    public long l03463;
+    public long l03464;
+    public long l03465;
+    public long l03466;
+    public long l03467;
+    public long l03468;
+    public long l03469;
+    public long l03470;
+    public long l03471;
+    public long l03472;
+    public long l03473;
+    public long l03474;
+    public long l03475;
+    public long l03476;
+    public long l03477;
+    public long l03478;
+    public long l03479;
+    public long l03480;
+    public long l03481;
+    public long l03482;
+    public long l03483;
+    public long l03484;
+    public long l03485;
+    public long l03486;
+    public long l03487;
+    public long l03488;
+    public long l03489;
+    public long l03490;
+    public long l03491;
+    public long l03492;
+    public long l03493;
+    public long l03494;
+    public long l03495;
+    public long l03496;
+    public long l03497;
+    public long l03498;
+    public long l03499;
+    public long l03500;
+    public long l03501;
+    public long l03502;
+    public long l03503;
+    public long l03504;
+    public long l03505;
+    public long l03506;
+    public long l03507;
+    public long l03508;
+    public long l03509;
+    public long l03510;
+    public long l03511;
+    public long l03512;
+    public long l03513;
+    public long l03514;
+    public long l03515;
+    public long l03516;
+    public long l03517;
+    public long l03518;
+    public long l03519;
+    public long l03520;
+    public long l03521;
+    public long l03522;
+    public long l03523;
+    public long l03524;
+    public long l03525;
+    public long l03526;
+    public long l03527;
+    public long l03528;
+    public long l03529;
+    public long l03530;
+    public long l03531;
+    public long l03532;
+    public long l03533;
+    public long l03534;
+    public long l03535;
+    public long l03536;
+    public long l03537;
+    public long l03538;
+    public long l03539;
+    public long l03540;
+    public long l03541;
+    public long l03542;
+    public long l03543;
+    public long l03544;
+    public long l03545;
+    public long l03546;
+    public long l03547;
+    public long l03548;
+    public long l03549;
+    public long l03550;
+    public long l03551;
+    public long l03552;
+    public long l03553;
+    public long l03554;
+    public long l03555;
+    public long l03556;
+    public long l03557;
+    public long l03558;
+    public long l03559;
+    public long l03560;
+    public long l03561;
+    public long l03562;
+    public long l03563;
+    public long l03564;
+    public long l03565;
+    public long l03566;
+    public long l03567;
+    public long l03568;
+    public long l03569;
+    public long l03570;
+    public long l03571;
+    public long l03572;
+    public long l03573;
+    public long l03574;
+    public long l03575;
+    public long l03576;
+    public long l03577;
+    public long l03578;
+    public long l03579;
+    public long l03580;
+    public long l03581;
+    public long l03582;
+    public long l03583;
+    public long l03584;
+    public long l03585;
+    public long l03586;
+    public long l03587;
+    public long l03588;
+    public long l03589;
+    public long l03590;
+    public long l03591;
+    public long l03592;
+    public long l03593;
+    public long l03594;
+    public long l03595;
+    public long l03596;
+    public long l03597;
+    public long l03598;
+    public long l03599;
+    public long l03600;
+    public long l03601;
+    public long l03602;
+    public long l03603;
+    public long l03604;
+    public long l03605;
+    public long l03606;
+    public long l03607;
+    public long l03608;
+    public long l03609;
+    public long l03610;
+    public long l03611;
+    public long l03612;
+    public long l03613;
+    public long l03614;
+    public long l03615;
+    public long l03616;
+    public long l03617;
+    public long l03618;
+    public long l03619;
+    public long l03620;
+    public long l03621;
+    public long l03622;
+    public long l03623;
+    public long l03624;
+    public long l03625;
+    public long l03626;
+    public long l03627;
+    public long l03628;
+    public long l03629;
+    public long l03630;
+    public long l03631;
+    public long l03632;
+    public long l03633;
+    public long l03634;
+    public long l03635;
+    public long l03636;
+    public long l03637;
+    public long l03638;
+    public long l03639;
+    public long l03640;
+    public long l03641;
+    public long l03642;
+    public long l03643;
+    public long l03644;
+    public long l03645;
+    public long l03646;
+    public long l03647;
+    public long l03648;
+    public long l03649;
+    public long l03650;
+    public long l03651;
+    public long l03652;
+    public long l03653;
+    public long l03654;
+    public long l03655;
+    public long l03656;
+    public long l03657;
+    public long l03658;
+    public long l03659;
+    public long l03660;
+    public long l03661;
+    public long l03662;
+    public long l03663;
+    public long l03664;
+    public long l03665;
+    public long l03666;
+    public long l03667;
+    public long l03668;
+    public long l03669;
+    public long l03670;
+    public long l03671;
+    public long l03672;
+    public long l03673;
+    public long l03674;
+    public long l03675;
+    public long l03676;
+    public long l03677;
+    public long l03678;
+    public long l03679;
+    public long l03680;
+    public long l03681;
+    public long l03682;
+    public long l03683;
+    public long l03684;
+    public long l03685;
+    public long l03686;
+    public long l03687;
+    public long l03688;
+    public long l03689;
+    public long l03690;
+    public long l03691;
+    public long l03692;
+    public long l03693;
+    public long l03694;
+    public long l03695;
+    public long l03696;
+    public long l03697;
+    public long l03698;
+    public long l03699;
+    public long l03700;
+    public long l03701;
+    public long l03702;
+    public long l03703;
+    public long l03704;
+    public long l03705;
+    public long l03706;
+    public long l03707;
+    public long l03708;
+    public long l03709;
+    public long l03710;
+    public long l03711;
+    public long l03712;
+    public long l03713;
+    public long l03714;
+    public long l03715;
+    public long l03716;
+    public long l03717;
+    public long l03718;
+    public long l03719;
+    public long l03720;
+    public long l03721;
+    public long l03722;
+    public long l03723;
+    public long l03724;
+    public long l03725;
+    public long l03726;
+    public long l03727;
+    public long l03728;
+    public long l03729;
+    public long l03730;
+    public long l03731;
+    public long l03732;
+    public long l03733;
+    public long l03734;
+    public long l03735;
+    public long l03736;
+    public long l03737;
+    public long l03738;
+    public long l03739;
+    public long l03740;
+    public long l03741;
+    public long l03742;
+    public long l03743;
+    public long l03744;
+    public long l03745;
+    public long l03746;
+    public long l03747;
+    public long l03748;
+    public long l03749;
+    public long l03750;
+    public long l03751;
+    public long l03752;
+    public long l03753;
+    public long l03754;
+    public long l03755;
+    public long l03756;
+    public long l03757;
+    public long l03758;
+    public long l03759;
+    public long l03760;
+    public long l03761;
+    public long l03762;
+    public long l03763;
+    public long l03764;
+    public long l03765;
+    public long l03766;
+    public long l03767;
+    public long l03768;
+    public long l03769;
+    public long l03770;
+    public long l03771;
+    public long l03772;
+    public long l03773;
+    public long l03774;
+    public long l03775;
+    public long l03776;
+    public long l03777;
+    public long l03778;
+    public long l03779;
+    public long l03780;
+    public long l03781;
+    public long l03782;
+    public long l03783;
+    public long l03784;
+    public long l03785;
+    public long l03786;
+    public long l03787;
+    public long l03788;
+    public long l03789;
+    public long l03790;
+    public long l03791;
+    public long l03792;
+    public long l03793;
+    public long l03794;
+    public long l03795;
+    public long l03796;
+    public long l03797;
+    public long l03798;
+    public long l03799;
+    public long l03800;
+    public long l03801;
+    public long l03802;
+    public long l03803;
+    public long l03804;
+    public long l03805;
+    public long l03806;
+    public long l03807;
+    public long l03808;
+    public long l03809;
+    public long l03810;
+    public long l03811;
+    public long l03812;
+    public long l03813;
+    public long l03814;
+    public long l03815;
+    public long l03816;
+    public long l03817;
+    public long l03818;
+    public long l03819;
+    public long l03820;
+    public long l03821;
+    public long l03822;
+    public long l03823;
+    public long l03824;
+    public long l03825;
+    public long l03826;
+    public long l03827;
+    public long l03828;
+    public long l03829;
+    public long l03830;
+    public long l03831;
+    public long l03832;
+    public long l03833;
+    public long l03834;
+    public long l03835;
+    public long l03836;
+    public long l03837;
+    public long l03838;
+    public long l03839;
+    public long l03840;
+    public long l03841;
+    public long l03842;
+    public long l03843;
+    public long l03844;
+    public long l03845;
+    public long l03846;
+    public long l03847;
+    public long l03848;
+    public long l03849;
+    public long l03850;
+    public long l03851;
+    public long l03852;
+    public long l03853;
+    public long l03854;
+    public long l03855;
+    public long l03856;
+    public long l03857;
+    public long l03858;
+    public long l03859;
+    public long l03860;
+    public long l03861;
+    public long l03862;
+    public long l03863;
+    public long l03864;
+    public long l03865;
+    public long l03866;
+    public long l03867;
+    public long l03868;
+    public long l03869;
+    public long l03870;
+    public long l03871;
+    public long l03872;
+    public long l03873;
+    public long l03874;
+    public long l03875;
+    public long l03876;
+    public long l03877;
+    public long l03878;
+    public long l03879;
+    public long l03880;
+    public long l03881;
+    public long l03882;
+    public long l03883;
+    public long l03884;
+    public long l03885;
+    public long l03886;
+    public long l03887;
+    public long l03888;
+    public long l03889;
+    public long l03890;
+    public long l03891;
+    public long l03892;
+    public long l03893;
+    public long l03894;
+    public long l03895;
+    public long l03896;
+    public long l03897;
+    public long l03898;
+    public long l03899;
+    public long l03900;
+    public long l03901;
+    public long l03902;
+    public long l03903;
+    public long l03904;
+    public long l03905;
+    public long l03906;
+    public long l03907;
+    public long l03908;
+    public long l03909;
+    public long l03910;
+    public long l03911;
+    public long l03912;
+    public long l03913;
+    public long l03914;
+    public long l03915;
+    public long l03916;
+    public long l03917;
+    public long l03918;
+    public long l03919;
+    public long l03920;
+    public long l03921;
+    public long l03922;
+    public long l03923;
+    public long l03924;
+    public long l03925;
+    public long l03926;
+    public long l03927;
+    public long l03928;
+    public long l03929;
+    public long l03930;
+    public long l03931;
+    public long l03932;
+    public long l03933;
+    public long l03934;
+    public long l03935;
+    public long l03936;
+    public long l03937;
+    public long l03938;
+    public long l03939;
+    public long l03940;
+    public long l03941;
+    public long l03942;
+    public long l03943;
+    public long l03944;
+    public long l03945;
+    public long l03946;
+    public long l03947;
+    public long l03948;
+    public long l03949;
+    public long l03950;
+    public long l03951;
+    public long l03952;
+    public long l03953;
+    public long l03954;
+    public long l03955;
+    public long l03956;
+    public long l03957;
+    public long l03958;
+    public long l03959;
+    public long l03960;
+    public long l03961;
+    public long l03962;
+    public long l03963;
+    public long l03964;
+    public long l03965;
+    public long l03966;
+    public long l03967;
+    public long l03968;
+    public long l03969;
+    public long l03970;
+    public long l03971;
+    public long l03972;
+    public long l03973;
+    public long l03974;
+    public long l03975;
+    public long l03976;
+    public long l03977;
+    public long l03978;
+    public long l03979;
+    public long l03980;
+    public long l03981;
+    public long l03982;
+    public long l03983;
+    public long l03984;
+    public long l03985;
+    public long l03986;
+    public long l03987;
+    public long l03988;
+    public long l03989;
+    public long l03990;
+    public long l03991;
+    public long l03992;
+    public long l03993;
+    public long l03994;
+    public long l03995;
+    public long l03996;
+    public long l03997;
+    public long l03998;
+    public long l03999;
+    public long l04000;
+    public long l04001;
+    public long l04002;
+    public long l04003;
+    public long l04004;
+    public long l04005;
+    public long l04006;
+    public long l04007;
+    public long l04008;
+    public long l04009;
+    public long l04010;
+    public long l04011;
+    public long l04012;
+    public long l04013;
+    public long l04014;
+    public long l04015;
+    public long l04016;
+    public long l04017;
+    public long l04018;
+    public long l04019;
+    public long l04020;
+    public long l04021;
+    public long l04022;
+    public long l04023;
+    public long l04024;
+    public long l04025;
+    public long l04026;
+    public long l04027;
+    public long l04028;
+    public long l04029;
+    public long l04030;
+    public long l04031;
+    public long l04032;
+    public long l04033;
+    public long l04034;
+    public long l04035;
+    public long l04036;
+    public long l04037;
+    public long l04038;
+    public long l04039;
+    public long l04040;
+    public long l04041;
+    public long l04042;
+    public long l04043;
+    public long l04044;
+    public long l04045;
+    public long l04046;
+    public long l04047;
+    public long l04048;
+    public long l04049;
+    public long l04050;
+    public long l04051;
+    public long l04052;
+    public long l04053;
+    public long l04054;
+    public long l04055;
+    public long l04056;
+    public long l04057;
+    public long l04058;
+    public long l04059;
+    public long l04060;
+    public long l04061;
+    public long l04062;
+    public long l04063;
+    public long l04064;
+    public long l04065;
+    public long l04066;
+    public long l04067;
+    public long l04068;
+    public long l04069;
+    public long l04070;
+    public long l04071;
+    public long l04072;
+    public long l04073;
+    public long l04074;
+    public long l04075;
+    public long l04076;
+    public long l04077;
+    public long l04078;
+    public long l04079;
+    public long l04080;
+    public long l04081;
+    public long l04082;
+    public long l04083;
+    public long l04084;
+    public long l04085;
+    public long l04086;
+    public long l04087;
+    public long l04088;
+    public long l04089;
+    public long l04090;
+    public long l04091;
+    public long l04092;
+    public long l04093;
+    public long l04094;
+    public long l04095;
+    public long l04096;
+    public long l04097;
+    public long l04098;
+    public long l04099;
+    public long l04100;
+    public long l04101;
+    public long l04102;
+    public long l04103;
+    public long l04104;
+    public long l04105;
+    public long l04106;
+    public long l04107;
+    public long l04108;
+    public long l04109;
+    public long l04110;
+    public long l04111;
+    public long l04112;
+    public long l04113;
+    public long l04114;
+    public long l04115;
+    public long l04116;
+    public long l04117;
+    public long l04118;
+    public long l04119;
+    public long l04120;
+    public long l04121;
+    public long l04122;
+    public long l04123;
+    public long l04124;
+    public long l04125;
+    public long l04126;
+    public long l04127;
+    public long l04128;
+    public long l04129;
+    public long l04130;
+    public long l04131;
+    public long l04132;
+    public long l04133;
+    public long l04134;
+    public long l04135;
+    public long l04136;
+    public long l04137;
+    public long l04138;
+    public long l04139;
+    public long l04140;
+    public long l04141;
+    public long l04142;
+    public long l04143;
+    public long l04144;
+    public long l04145;
+    public long l04146;
+    public long l04147;
+    public long l04148;
+    public long l04149;
+    public long l04150;
+    public long l04151;
+    public long l04152;
+    public long l04153;
+    public long l04154;
+    public long l04155;
+    public long l04156;
+    public long l04157;
+    public long l04158;
+    public long l04159;
+    public long l04160;
+    public long l04161;
+    public long l04162;
+    public long l04163;
+    public long l04164;
+    public long l04165;
+    public long l04166;
+    public long l04167;
+    public long l04168;
+    public long l04169;
+    public long l04170;
+    public long l04171;
+    public long l04172;
+    public long l04173;
+    public long l04174;
+    public long l04175;
+    public long l04176;
+    public long l04177;
+    public long l04178;
+    public long l04179;
+    public long l04180;
+    public long l04181;
+    public long l04182;
+    public long l04183;
+    public long l04184;
+    public long l04185;
+    public long l04186;
+    public long l04187;
+    public long l04188;
+    public long l04189;
+    public long l04190;
+    public long l04191;
+    public long l04192;
+    public long l04193;
+    public long l04194;
+    public long l04195;
+    public long l04196;
+    public long l04197;
+    public long l04198;
+    public long l04199;
+    public long l04200;
+    public long l04201;
+    public long l04202;
+    public long l04203;
+    public long l04204;
+    public long l04205;
+    public long l04206;
+    public long l04207;
+    public long l04208;
+    public long l04209;
+    public long l04210;
+    public long l04211;
+    public long l04212;
+    public long l04213;
+    public long l04214;
+    public long l04215;
+    public long l04216;
+    public long l04217;
+    public long l04218;
+    public long l04219;
+    public long l04220;
+    public long l04221;
+    public long l04222;
+    public long l04223;
+    public long l04224;
+    public long l04225;
+    public long l04226;
+    public long l04227;
+    public long l04228;
+    public long l04229;
+    public long l04230;
+    public long l04231;
+    public long l04232;
+    public long l04233;
+    public long l04234;
+    public long l04235;
+    public long l04236;
+    public long l04237;
+    public long l04238;
+    public long l04239;
+    public long l04240;
+    public long l04241;
+    public long l04242;
+    public long l04243;
+    public long l04244;
+    public long l04245;
+    public long l04246;
+    public long l04247;
+    public long l04248;
+    public long l04249;
+    public long l04250;
+    public long l04251;
+    public long l04252;
+    public long l04253;
+    public long l04254;
+    public long l04255;
+    public long l04256;
+    public long l04257;
+    public long l04258;
+    public long l04259;
+    public long l04260;
+    public long l04261;
+    public long l04262;
+    public long l04263;
+    public long l04264;
+    public long l04265;
+    public long l04266;
+    public long l04267;
+    public long l04268;
+    public long l04269;
+    public long l04270;
+    public long l04271;
+    public long l04272;
+    public long l04273;
+    public long l04274;
+    public long l04275;
+    public long l04276;
+    public long l04277;
+    public long l04278;
+    public long l04279;
+    public long l04280;
+    public long l04281;
+    public long l04282;
+    public long l04283;
+    public long l04284;
+    public long l04285;
+    public long l04286;
+    public long l04287;
+    public long l04288;
+    public long l04289;
+    public long l04290;
+    public long l04291;
+    public long l04292;
+    public long l04293;
+    public long l04294;
+    public long l04295;
+    public long l04296;
+    public long l04297;
+    public long l04298;
+    public long l04299;
+    public long l04300;
+    public long l04301;
+    public long l04302;
+    public long l04303;
+    public long l04304;
+    public long l04305;
+    public long l04306;
+    public long l04307;
+    public long l04308;
+    public long l04309;
+    public long l04310;
+    public long l04311;
+    public long l04312;
+    public long l04313;
+    public long l04314;
+    public long l04315;
+    public long l04316;
+    public long l04317;
+    public long l04318;
+    public long l04319;
+    public long l04320;
+    public long l04321;
+    public long l04322;
+    public long l04323;
+    public long l04324;
+    public long l04325;
+    public long l04326;
+    public long l04327;
+    public long l04328;
+    public long l04329;
+    public long l04330;
+    public long l04331;
+    public long l04332;
+    public long l04333;
+    public long l04334;
+    public long l04335;
+    public long l04336;
+    public long l04337;
+    public long l04338;
+    public long l04339;
+    public long l04340;
+    public long l04341;
+    public long l04342;
+    public long l04343;
+    public long l04344;
+    public long l04345;
+    public long l04346;
+    public long l04347;
+    public long l04348;
+    public long l04349;
+    public long l04350;
+    public long l04351;
+    public long l04352;
+    public long l04353;
+    public long l04354;
+    public long l04355;
+    public long l04356;
+    public long l04357;
+    public long l04358;
+    public long l04359;
+    public long l04360;
+    public long l04361;
+    public long l04362;
+    public long l04363;
+    public long l04364;
+    public long l04365;
+    public long l04366;
+    public long l04367;
+    public long l04368;
+    public long l04369;
+    public long l04370;
+    public long l04371;
+    public long l04372;
+    public long l04373;
+    public long l04374;
+    public long l04375;
+    public long l04376;
+    public long l04377;
+    public long l04378;
+    public long l04379;
+    public long l04380;
+    public long l04381;
+    public long l04382;
+    public long l04383;
+    public long l04384;
+    public long l04385;
+    public long l04386;
+    public long l04387;
+    public long l04388;
+    public long l04389;
+    public long l04390;
+    public long l04391;
+    public long l04392;
+    public long l04393;
+    public long l04394;
+    public long l04395;
+    public long l04396;
+    public long l04397;
+    public long l04398;
+    public long l04399;
+    public long l04400;
+    public long l04401;
+    public long l04402;
+    public long l04403;
+    public long l04404;
+    public long l04405;
+    public long l04406;
+    public long l04407;
+    public long l04408;
+    public long l04409;
+    public long l04410;
+    public long l04411;
+    public long l04412;
+    public long l04413;
+    public long l04414;
+    public long l04415;
+    public long l04416;
+    public long l04417;
+    public long l04418;
+    public long l04419;
+    public long l04420;
+    public long l04421;
+    public long l04422;
+    public long l04423;
+    public long l04424;
+    public long l04425;
+    public long l04426;
+    public long l04427;
+    public long l04428;
+    public long l04429;
+    public long l04430;
+    public long l04431;
+    public long l04432;
+    public long l04433;
+    public long l04434;
+    public long l04435;
+    public long l04436;
+    public long l04437;
+    public long l04438;
+    public long l04439;
+    public long l04440;
+    public long l04441;
+    public long l04442;
+    public long l04443;
+    public long l04444;
+    public long l04445;
+    public long l04446;
+    public long l04447;
+    public long l04448;
+    public long l04449;
+    public long l04450;
+    public long l04451;
+    public long l04452;
+    public long l04453;
+    public long l04454;
+    public long l04455;
+    public long l04456;
+    public long l04457;
+    public long l04458;
+    public long l04459;
+    public long l04460;
+    public long l04461;
+    public long l04462;
+    public long l04463;
+    public long l04464;
+    public long l04465;
+    public long l04466;
+    public long l04467;
+    public long l04468;
+    public long l04469;
+    public long l04470;
+    public long l04471;
+    public long l04472;
+    public long l04473;
+    public long l04474;
+    public long l04475;
+    public long l04476;
+    public long l04477;
+    public long l04478;
+    public long l04479;
+    public long l04480;
+    public long l04481;
+    public long l04482;
+    public long l04483;
+    public long l04484;
+    public long l04485;
+    public long l04486;
+    public long l04487;
+    public long l04488;
+    public long l04489;
+    public long l04490;
+    public long l04491;
+    public long l04492;
+    public long l04493;
+    public long l04494;
+    public long l04495;
+    public long l04496;
+    public long l04497;
+    public long l04498;
+    public long l04499;
+    public long l04500;
+    public long l04501;
+    public long l04502;
+    public long l04503;
+    public long l04504;
+    public long l04505;
+    public long l04506;
+    public long l04507;
+    public long l04508;
+    public long l04509;
+    public long l04510;
+    public long l04511;
+    public long l04512;
+    public long l04513;
+    public long l04514;
+    public long l04515;
+    public long l04516;
+    public long l04517;
+    public long l04518;
+    public long l04519;
+    public long l04520;
+    public long l04521;
+    public long l04522;
+    public long l04523;
+    public long l04524;
+    public long l04525;
+    public long l04526;
+    public long l04527;
+    public long l04528;
+    public long l04529;
+    public long l04530;
+    public long l04531;
+    public long l04532;
+    public long l04533;
+    public long l04534;
+    public long l04535;
+    public long l04536;
+    public long l04537;
+    public long l04538;
+    public long l04539;
+    public long l04540;
+    public long l04541;
+    public long l04542;
+    public long l04543;
+    public long l04544;
+    public long l04545;
+    public long l04546;
+    public long l04547;
+    public long l04548;
+    public long l04549;
+    public long l04550;
+    public long l04551;
+    public long l04552;
+    public long l04553;
+    public long l04554;
+    public long l04555;
+    public long l04556;
+    public long l04557;
+    public long l04558;
+    public long l04559;
+    public long l04560;
+    public long l04561;
+    public long l04562;
+    public long l04563;
+    public long l04564;
+    public long l04565;
+    public long l04566;
+    public long l04567;
+    public long l04568;
+    public long l04569;
+    public long l04570;
+    public long l04571;
+    public long l04572;
+    public long l04573;
+    public long l04574;
+    public long l04575;
+    public long l04576;
+    public long l04577;
+    public long l04578;
+    public long l04579;
+    public long l04580;
+    public long l04581;
+    public long l04582;
+    public long l04583;
+    public long l04584;
+    public long l04585;
+    public long l04586;
+    public long l04587;
+    public long l04588;
+    public long l04589;
+    public long l04590;
+    public long l04591;
+    public long l04592;
+    public long l04593;
+    public long l04594;
+    public long l04595;
+    public long l04596;
+    public long l04597;
+    public long l04598;
+    public long l04599;
+    public long l04600;
+    public long l04601;
+    public long l04602;
+    public long l04603;
+    public long l04604;
+    public long l04605;
+    public long l04606;
+    public long l04607;
+    public long l04608;
+    public long l04609;
+    public long l04610;
+    public long l04611;
+    public long l04612;
+    public long l04613;
+    public long l04614;
+    public long l04615;
+    public long l04616;
+    public long l04617;
+    public long l04618;
+    public long l04619;
+    public long l04620;
+    public long l04621;
+    public long l04622;
+    public long l04623;
+    public long l04624;
+    public long l04625;
+    public long l04626;
+    public long l04627;
+    public long l04628;
+    public long l04629;
+    public long l04630;
+    public long l04631;
+    public long l04632;
+    public long l04633;
+    public long l04634;
+    public long l04635;
+    public long l04636;
+    public long l04637;
+    public long l04638;
+    public long l04639;
+    public long l04640;
+    public long l04641;
+    public long l04642;
+    public long l04643;
+    public long l04644;
+    public long l04645;
+    public long l04646;
+    public long l04647;
+    public long l04648;
+    public long l04649;
+    public long l04650;
+    public long l04651;
+    public long l04652;
+    public long l04653;
+    public long l04654;
+    public long l04655;
+    public long l04656;
+    public long l04657;
+    public long l04658;
+    public long l04659;
+    public long l04660;
+    public long l04661;
+    public long l04662;
+    public long l04663;
+    public long l04664;
+    public long l04665;
+    public long l04666;
+    public long l04667;
+    public long l04668;
+    public long l04669;
+    public long l04670;
+    public long l04671;
+    public long l04672;
+    public long l04673;
+    public long l04674;
+    public long l04675;
+    public long l04676;
+    public long l04677;
+    public long l04678;
+    public long l04679;
+    public long l04680;
+    public long l04681;
+    public long l04682;
+    public long l04683;
+    public long l04684;
+    public long l04685;
+    public long l04686;
+    public long l04687;
+    public long l04688;
+    public long l04689;
+    public long l04690;
+    public long l04691;
+    public long l04692;
+    public long l04693;
+    public long l04694;
+    public long l04695;
+    public long l04696;
+    public long l04697;
+    public long l04698;
+    public long l04699;
+    public long l04700;
+    public long l04701;
+    public long l04702;
+    public long l04703;
+    public long l04704;
+    public long l04705;
+    public long l04706;
+    public long l04707;
+    public long l04708;
+    public long l04709;
+    public long l04710;
+    public long l04711;
+    public long l04712;
+    public long l04713;
+    public long l04714;
+    public long l04715;
+    public long l04716;
+    public long l04717;
+    public long l04718;
+    public long l04719;
+    public long l04720;
+    public long l04721;
+    public long l04722;
+    public long l04723;
+    public long l04724;
+    public long l04725;
+    public long l04726;
+    public long l04727;
+    public long l04728;
+    public long l04729;
+    public long l04730;
+    public long l04731;
+    public long l04732;
+    public long l04733;
+    public long l04734;
+    public long l04735;
+    public long l04736;
+    public long l04737;
+    public long l04738;
+    public long l04739;
+    public long l04740;
+    public long l04741;
+    public long l04742;
+    public long l04743;
+    public long l04744;
+    public long l04745;
+    public long l04746;
+    public long l04747;
+    public long l04748;
+    public long l04749;
+    public long l04750;
+    public long l04751;
+    public long l04752;
+    public long l04753;
+    public long l04754;
+    public long l04755;
+    public long l04756;
+    public long l04757;
+    public long l04758;
+    public long l04759;
+    public long l04760;
+    public long l04761;
+    public long l04762;
+    public long l04763;
+    public long l04764;
+    public long l04765;
+    public long l04766;
+    public long l04767;
+    public long l04768;
+    public long l04769;
+    public long l04770;
+    public long l04771;
+    public long l04772;
+    public long l04773;
+    public long l04774;
+    public long l04775;
+    public long l04776;
+    public long l04777;
+    public long l04778;
+    public long l04779;
+    public long l04780;
+    public long l04781;
+    public long l04782;
+    public long l04783;
+    public long l04784;
+    public long l04785;
+    public long l04786;
+    public long l04787;
+    public long l04788;
+    public long l04789;
+    public long l04790;
+    public long l04791;
+    public long l04792;
+    public long l04793;
+    public long l04794;
+    public long l04795;
+    public long l04796;
+    public long l04797;
+    public long l04798;
+    public long l04799;
+    public long l04800;
+    public long l04801;
+    public long l04802;
+    public long l04803;
+    public long l04804;
+    public long l04805;
+    public long l04806;
+    public long l04807;
+    public long l04808;
+    public long l04809;
+    public long l04810;
+    public long l04811;
+    public long l04812;
+    public long l04813;
+    public long l04814;
+    public long l04815;
+    public long l04816;
+    public long l04817;
+    public long l04818;
+    public long l04819;
+    public long l04820;
+    public long l04821;
+    public long l04822;
+    public long l04823;
+    public long l04824;
+    public long l04825;
+    public long l04826;
+    public long l04827;
+    public long l04828;
+    public long l04829;
+    public long l04830;
+    public long l04831;
+    public long l04832;
+    public long l04833;
+    public long l04834;
+    public long l04835;
+    public long l04836;
+    public long l04837;
+    public long l04838;
+    public long l04839;
+    public long l04840;
+    public long l04841;
+    public long l04842;
+    public long l04843;
+    public long l04844;
+    public long l04845;
+    public long l04846;
+    public long l04847;
+    public long l04848;
+    public long l04849;
+    public long l04850;
+    public long l04851;
+    public long l04852;
+    public long l04853;
+    public long l04854;
+    public long l04855;
+    public long l04856;
+    public long l04857;
+    public long l04858;
+    public long l04859;
+    public long l04860;
+    public long l04861;
+    public long l04862;
+    public long l04863;
+    public long l04864;
+    public long l04865;
+    public long l04866;
+    public long l04867;
+    public long l04868;
+    public long l04869;
+    public long l04870;
+    public long l04871;
+    public long l04872;
+    public long l04873;
+    public long l04874;
+    public long l04875;
+    public long l04876;
+    public long l04877;
+    public long l04878;
+    public long l04879;
+    public long l04880;
+    public long l04881;
+    public long l04882;
+    public long l04883;
+    public long l04884;
+    public long l04885;
+    public long l04886;
+    public long l04887;
+    public long l04888;
+    public long l04889;
+    public long l04890;
+    public long l04891;
+    public long l04892;
+    public long l04893;
+    public long l04894;
+    public long l04895;
+    public long l04896;
+    public long l04897;
+    public long l04898;
+    public long l04899;
+    public long l04900;
+    public long l04901;
+    public long l04902;
+    public long l04903;
+    public long l04904;
+    public long l04905;
+    public long l04906;
+    public long l04907;
+    public long l04908;
+    public long l04909;
+    public long l04910;
+    public long l04911;
+    public long l04912;
+    public long l04913;
+    public long l04914;
+    public long l04915;
+    public long l04916;
+    public long l04917;
+    public long l04918;
+    public long l04919;
+    public long l04920;
+    public long l04921;
+    public long l04922;
+    public long l04923;
+    public long l04924;
+    public long l04925;
+    public long l04926;
+    public long l04927;
+    public long l04928;
+    public long l04929;
+    public long l04930;
+    public long l04931;
+    public long l04932;
+    public long l04933;
+    public long l04934;
+    public long l04935;
+    public long l04936;
+    public long l04937;
+    public long l04938;
+    public long l04939;
+    public long l04940;
+    public long l04941;
+    public long l04942;
+    public long l04943;
+    public long l04944;
+    public long l04945;
+    public long l04946;
+    public long l04947;
+    public long l04948;
+    public long l04949;
+    public long l04950;
+    public long l04951;
+    public long l04952;
+    public long l04953;
+    public long l04954;
+    public long l04955;
+    public long l04956;
+    public long l04957;
+    public long l04958;
+    public long l04959;
+    public long l04960;
+    public long l04961;
+    public long l04962;
+    public long l04963;
+    public long l04964;
+    public long l04965;
+    public long l04966;
+    public long l04967;
+    public long l04968;
+    public long l04969;
+    public long l04970;
+    public long l04971;
+    public long l04972;
+    public long l04973;
+    public long l04974;
+    public long l04975;
+    public long l04976;
+    public long l04977;
+    public long l04978;
+    public long l04979;
+    public long l04980;
+    public long l04981;
+    public long l04982;
+    public long l04983;
+    public long l04984;
+    public long l04985;
+    public long l04986;
+    public long l04987;
+    public long l04988;
+    public long l04989;
+    public long l04990;
+    public long l04991;
+    public long l04992;
+    public long l04993;
+    public long l04994;
+    public long l04995;
+    public long l04996;
+    public long l04997;
+    public long l04998;
+    public long l04999;
+    public long l05000;
+    public long l05001;
+    public long l05002;
+    public long l05003;
+    public long l05004;
+    public long l05005;
+    public long l05006;
+    public long l05007;
+    public long l05008;
+    public long l05009;
+    public long l05010;
+    public long l05011;
+    public long l05012;
+    public long l05013;
+    public long l05014;
+    public long l05015;
+    public long l05016;
+    public long l05017;
+    public long l05018;
+    public long l05019;
+    public long l05020;
+    public long l05021;
+    public long l05022;
+    public long l05023;
+    public long l05024;
+    public long l05025;
+    public long l05026;
+    public long l05027;
+    public long l05028;
+    public long l05029;
+    public long l05030;
+    public long l05031;
+    public long l05032;
+    public long l05033;
+    public long l05034;
+    public long l05035;
+    public long l05036;
+    public long l05037;
+    public long l05038;
+    public long l05039;
+    public long l05040;
+    public long l05041;
+    public long l05042;
+    public long l05043;
+    public long l05044;
+    public long l05045;
+    public long l05046;
+    public long l05047;
+    public long l05048;
+    public long l05049;
+    public long l05050;
+    public long l05051;
+    public long l05052;
+    public long l05053;
+    public long l05054;
+    public long l05055;
+    public long l05056;
+    public long l05057;
+    public long l05058;
+    public long l05059;
+    public long l05060;
+    public long l05061;
+    public long l05062;
+    public long l05063;
+    public long l05064;
+    public long l05065;
+    public long l05066;
+    public long l05067;
+    public long l05068;
+    public long l05069;
+    public long l05070;
+    public long l05071;
+    public long l05072;
+    public long l05073;
+    public long l05074;
+    public long l05075;
+    public long l05076;
+    public long l05077;
+    public long l05078;
+    public long l05079;
+    public long l05080;
+    public long l05081;
+    public long l05082;
+    public long l05083;
+    public long l05084;
+    public long l05085;
+    public long l05086;
+    public long l05087;
+    public long l05088;
+    public long l05089;
+    public long l05090;
+    public long l05091;
+    public long l05092;
+    public long l05093;
+    public long l05094;
+    public long l05095;
+    public long l05096;
+    public long l05097;
+    public long l05098;
+    public long l05099;
+    public long l05100;
+    public long l05101;
+    public long l05102;
+    public long l05103;
+    public long l05104;
+    public long l05105;
+    public long l05106;
+    public long l05107;
+    public long l05108;
+    public long l05109;
+    public long l05110;
+    public long l05111;
+    public long l05112;
+    public long l05113;
+    public long l05114;
+    public long l05115;
+    public long l05116;
+    public long l05117;
+    public long l05118;
+    public long l05119;
+    public long l05120;
+    public long l05121;
+    public long l05122;
+    public long l05123;
+    public long l05124;
+    public long l05125;
+    public long l05126;
+    public long l05127;
+    public long l05128;
+    public long l05129;
+    public long l05130;
+    public long l05131;
+    public long l05132;
+    public long l05133;
+    public long l05134;
+    public long l05135;
+    public long l05136;
+    public long l05137;
+    public long l05138;
+    public long l05139;
+    public long l05140;
+    public long l05141;
+    public long l05142;
+    public long l05143;
+    public long l05144;
+    public long l05145;
+    public long l05146;
+    public long l05147;
+    public long l05148;
+    public long l05149;
+    public long l05150;
+    public long l05151;
+    public long l05152;
+    public long l05153;
+    public long l05154;
+    public long l05155;
+    public long l05156;
+    public long l05157;
+    public long l05158;
+    public long l05159;
+    public long l05160;
+    public long l05161;
+    public long l05162;
+    public long l05163;
+    public long l05164;
+    public long l05165;
+    public long l05166;
+    public long l05167;
+    public long l05168;
+    public long l05169;
+    public long l05170;
+    public long l05171;
+    public long l05172;
+    public long l05173;
+    public long l05174;
+    public long l05175;
+    public long l05176;
+    public long l05177;
+    public long l05178;
+    public long l05179;
+    public long l05180;
+    public long l05181;
+    public long l05182;
+    public long l05183;
+    public long l05184;
+    public long l05185;
+    public long l05186;
+    public long l05187;
+    public long l05188;
+    public long l05189;
+    public long l05190;
+    public long l05191;
+    public long l05192;
+    public long l05193;
+    public long l05194;
+    public long l05195;
+    public long l05196;
+    public long l05197;
+    public long l05198;
+    public long l05199;
+    public long l05200;
+    public long l05201;
+    public long l05202;
+    public long l05203;
+    public long l05204;
+    public long l05205;
+    public long l05206;
+    public long l05207;
+    public long l05208;
+    public long l05209;
+    public long l05210;
+    public long l05211;
+    public long l05212;
+    public long l05213;
+    public long l05214;
+    public long l05215;
+    public long l05216;
+    public long l05217;
+    public long l05218;
+    public long l05219;
+    public long l05220;
+    public long l05221;
+    public long l05222;
+    public long l05223;
+    public long l05224;
+    public long l05225;
+    public long l05226;
+    public long l05227;
+    public long l05228;
+    public long l05229;
+    public long l05230;
+    public long l05231;
+    public long l05232;
+    public long l05233;
+    public long l05234;
+    public long l05235;
+    public long l05236;
+    public long l05237;
+    public long l05238;
+    public long l05239;
+    public long l05240;
+    public long l05241;
+    public long l05242;
+    public long l05243;
+    public long l05244;
+    public long l05245;
+    public long l05246;
+    public long l05247;
+    public long l05248;
+    public long l05249;
+    public long l05250;
+    public long l05251;
+    public long l05252;
+    public long l05253;
+    public long l05254;
+    public long l05255;
+    public long l05256;
+    public long l05257;
+    public long l05258;
+    public long l05259;
+    public long l05260;
+    public long l05261;
+    public long l05262;
+    public long l05263;
+    public long l05264;
+    public long l05265;
+    public long l05266;
+    public long l05267;
+    public long l05268;
+    public long l05269;
+    public long l05270;
+    public long l05271;
+    public long l05272;
+    public long l05273;
+    public long l05274;
+    public long l05275;
+    public long l05276;
+    public long l05277;
+    public long l05278;
+    public long l05279;
+    public long l05280;
+    public long l05281;
+    public long l05282;
+    public long l05283;
+    public long l05284;
+    public long l05285;
+    public long l05286;
+    public long l05287;
+    public long l05288;
+    public long l05289;
+    public long l05290;
+    public long l05291;
+    public long l05292;
+    public long l05293;
+    public long l05294;
+    public long l05295;
+    public long l05296;
+    public long l05297;
+    public long l05298;
+    public long l05299;
+    public long l05300;
+    public long l05301;
+    public long l05302;
+    public long l05303;
+    public long l05304;
+    public long l05305;
+    public long l05306;
+    public long l05307;
+    public long l05308;
+    public long l05309;
+    public long l05310;
+    public long l05311;
+    public long l05312;
+    public long l05313;
+    public long l05314;
+    public long l05315;
+    public long l05316;
+    public long l05317;
+    public long l05318;
+    public long l05319;
+    public long l05320;
+    public long l05321;
+    public long l05322;
+    public long l05323;
+    public long l05324;
+    public long l05325;
+    public long l05326;
+    public long l05327;
+    public long l05328;
+    public long l05329;
+    public long l05330;
+    public long l05331;
+    public long l05332;
+    public long l05333;
+    public long l05334;
+    public long l05335;
+    public long l05336;
+    public long l05337;
+    public long l05338;
+    public long l05339;
+    public long l05340;
+    public long l05341;
+    public long l05342;
+    public long l05343;
+    public long l05344;
+    public long l05345;
+    public long l05346;
+    public long l05347;
+    public long l05348;
+    public long l05349;
+    public long l05350;
+    public long l05351;
+    public long l05352;
+    public long l05353;
+    public long l05354;
+    public long l05355;
+    public long l05356;
+    public long l05357;
+    public long l05358;
+    public long l05359;
+    public long l05360;
+    public long l05361;
+    public long l05362;
+    public long l05363;
+    public long l05364;
+    public long l05365;
+    public long l05366;
+    public long l05367;
+    public long l05368;
+    public long l05369;
+    public long l05370;
+    public long l05371;
+    public long l05372;
+    public long l05373;
+    public long l05374;
+    public long l05375;
+    public long l05376;
+    public long l05377;
+    public long l05378;
+    public long l05379;
+    public long l05380;
+    public long l05381;
+    public long l05382;
+    public long l05383;
+    public long l05384;
+    public long l05385;
+    public long l05386;
+    public long l05387;
+    public long l05388;
+    public long l05389;
+    public long l05390;
+    public long l05391;
+    public long l05392;
+    public long l05393;
+    public long l05394;
+    public long l05395;
+    public long l05396;
+    public long l05397;
+    public long l05398;
+    public long l05399;
+    public long l05400;
+    public long l05401;
+    public long l05402;
+    public long l05403;
+    public long l05404;
+    public long l05405;
+    public long l05406;
+    public long l05407;
+    public long l05408;
+    public long l05409;
+    public long l05410;
+    public long l05411;
+    public long l05412;
+    public long l05413;
+    public long l05414;
+    public long l05415;
+    public long l05416;
+    public long l05417;
+    public long l05418;
+    public long l05419;
+    public long l05420;
+    public long l05421;
+    public long l05422;
+    public long l05423;
+    public long l05424;
+    public long l05425;
+    public long l05426;
+    public long l05427;
+    public long l05428;
+    public long l05429;
+    public long l05430;
+    public long l05431;
+    public long l05432;
+    public long l05433;
+    public long l05434;
+    public long l05435;
+    public long l05436;
+    public long l05437;
+    public long l05438;
+    public long l05439;
+    public long l05440;
+    public long l05441;
+    public long l05442;
+    public long l05443;
+    public long l05444;
+    public long l05445;
+    public long l05446;
+    public long l05447;
+    public long l05448;
+    public long l05449;
+    public long l05450;
+    public long l05451;
+    public long l05452;
+    public long l05453;
+    public long l05454;
+    public long l05455;
+    public long l05456;
+    public long l05457;
+    public long l05458;
+    public long l05459;
+    public long l05460;
+    public long l05461;
+    public long l05462;
+    public long l05463;
+    public long l05464;
+    public long l05465;
+    public long l05466;
+    public long l05467;
+    public long l05468;
+    public long l05469;
+    public long l05470;
+    public long l05471;
+    public long l05472;
+    public long l05473;
+    public long l05474;
+    public long l05475;
+    public long l05476;
+    public long l05477;
+    public long l05478;
+    public long l05479;
+    public long l05480;
+    public long l05481;
+    public long l05482;
+    public long l05483;
+    public long l05484;
+    public long l05485;
+    public long l05486;
+    public long l05487;
+    public long l05488;
+    public long l05489;
+    public long l05490;
+    public long l05491;
+    public long l05492;
+    public long l05493;
+    public long l05494;
+    public long l05495;
+    public long l05496;
+    public long l05497;
+    public long l05498;
+    public long l05499;
+    public long l05500;
+    public long l05501;
+    public long l05502;
+    public long l05503;
+    public long l05504;
+    public long l05505;
+    public long l05506;
+    public long l05507;
+    public long l05508;
+    public long l05509;
+    public long l05510;
+    public long l05511;
+    public long l05512;
+    public long l05513;
+    public long l05514;
+    public long l05515;
+    public long l05516;
+    public long l05517;
+    public long l05518;
+    public long l05519;
+    public long l05520;
+    public long l05521;
+    public long l05522;
+    public long l05523;
+    public long l05524;
+    public long l05525;
+    public long l05526;
+    public long l05527;
+    public long l05528;
+    public long l05529;
+    public long l05530;
+    public long l05531;
+    public long l05532;
+    public long l05533;
+    public long l05534;
+    public long l05535;
+    public long l05536;
+    public long l05537;
+    public long l05538;
+    public long l05539;
+    public long l05540;
+    public long l05541;
+    public long l05542;
+    public long l05543;
+    public long l05544;
+    public long l05545;
+    public long l05546;
+    public long l05547;
+    public long l05548;
+    public long l05549;
+    public long l05550;
+    public long l05551;
+    public long l05552;
+    public long l05553;
+    public long l05554;
+    public long l05555;
+    public long l05556;
+    public long l05557;
+    public long l05558;
+    public long l05559;
+    public long l05560;
+    public long l05561;
+    public long l05562;
+    public long l05563;
+    public long l05564;
+    public long l05565;
+    public long l05566;
+    public long l05567;
+    public long l05568;
+    public long l05569;
+    public long l05570;
+    public long l05571;
+    public long l05572;
+    public long l05573;
+    public long l05574;
+    public long l05575;
+    public long l05576;
+    public long l05577;
+    public long l05578;
+    public long l05579;
+    public long l05580;
+    public long l05581;
+    public long l05582;
+    public long l05583;
+    public long l05584;
+    public long l05585;
+    public long l05586;
+    public long l05587;
+    public long l05588;
+    public long l05589;
+    public long l05590;
+    public long l05591;
+    public long l05592;
+    public long l05593;
+    public long l05594;
+    public long l05595;
+    public long l05596;
+    public long l05597;
+    public long l05598;
+    public long l05599;
+    public long l05600;
+    public long l05601;
+    public long l05602;
+    public long l05603;
+    public long l05604;
+    public long l05605;
+    public long l05606;
+    public long l05607;
+    public long l05608;
+    public long l05609;
+    public long l05610;
+    public long l05611;
+    public long l05612;
+    public long l05613;
+    public long l05614;
+    public long l05615;
+    public long l05616;
+    public long l05617;
+    public long l05618;
+    public long l05619;
+    public long l05620;
+    public long l05621;
+    public long l05622;
+    public long l05623;
+    public long l05624;
+    public long l05625;
+    public long l05626;
+    public long l05627;
+    public long l05628;
+    public long l05629;
+    public long l05630;
+    public long l05631;
+    public long l05632;
+    public long l05633;
+    public long l05634;
+    public long l05635;
+    public long l05636;
+    public long l05637;
+    public long l05638;
+    public long l05639;
+    public long l05640;
+    public long l05641;
+    public long l05642;
+    public long l05643;
+    public long l05644;
+    public long l05645;
+    public long l05646;
+    public long l05647;
+    public long l05648;
+    public long l05649;
+    public long l05650;
+    public long l05651;
+    public long l05652;
+    public long l05653;
+    public long l05654;
+    public long l05655;
+    public long l05656;
+    public long l05657;
+    public long l05658;
+    public long l05659;
+    public long l05660;
+    public long l05661;
+    public long l05662;
+    public long l05663;
+    public long l05664;
+    public long l05665;
+    public long l05666;
+    public long l05667;
+    public long l05668;
+    public long l05669;
+    public long l05670;
+    public long l05671;
+    public long l05672;
+    public long l05673;
+    public long l05674;
+    public long l05675;
+    public long l05676;
+    public long l05677;
+    public long l05678;
+    public long l05679;
+    public long l05680;
+    public long l05681;
+    public long l05682;
+    public long l05683;
+    public long l05684;
+    public long l05685;
+    public long l05686;
+    public long l05687;
+    public long l05688;
+    public long l05689;
+    public long l05690;
+    public long l05691;
+    public long l05692;
+    public long l05693;
+    public long l05694;
+    public long l05695;
+    public long l05696;
+    public long l05697;
+    public long l05698;
+    public long l05699;
+    public long l05700;
+    public long l05701;
+    public long l05702;
+    public long l05703;
+    public long l05704;
+    public long l05705;
+    public long l05706;
+    public long l05707;
+    public long l05708;
+    public long l05709;
+    public long l05710;
+    public long l05711;
+    public long l05712;
+    public long l05713;
+    public long l05714;
+    public long l05715;
+    public long l05716;
+    public long l05717;
+    public long l05718;
+    public long l05719;
+    public long l05720;
+    public long l05721;
+    public long l05722;
+    public long l05723;
+    public long l05724;
+    public long l05725;
+    public long l05726;
+    public long l05727;
+    public long l05728;
+    public long l05729;
+    public long l05730;
+    public long l05731;
+    public long l05732;
+    public long l05733;
+    public long l05734;
+    public long l05735;
+    public long l05736;
+    public long l05737;
+    public long l05738;
+    public long l05739;
+    public long l05740;
+    public long l05741;
+    public long l05742;
+    public long l05743;
+    public long l05744;
+    public long l05745;
+    public long l05746;
+    public long l05747;
+    public long l05748;
+    public long l05749;
+    public long l05750;
+    public long l05751;
+    public long l05752;
+    public long l05753;
+    public long l05754;
+    public long l05755;
+    public long l05756;
+    public long l05757;
+    public long l05758;
+    public long l05759;
+    public long l05760;
+    public long l05761;
+    public long l05762;
+    public long l05763;
+    public long l05764;
+    public long l05765;
+    public long l05766;
+    public long l05767;
+    public long l05768;
+    public long l05769;
+    public long l05770;
+    public long l05771;
+    public long l05772;
+    public long l05773;
+    public long l05774;
+    public long l05775;
+    public long l05776;
+    public long l05777;
+    public long l05778;
+    public long l05779;
+    public long l05780;
+    public long l05781;
+    public long l05782;
+    public long l05783;
+    public long l05784;
+    public long l05785;
+    public long l05786;
+    public long l05787;
+    public long l05788;
+    public long l05789;
+    public long l05790;
+    public long l05791;
+    public long l05792;
+    public long l05793;
+    public long l05794;
+    public long l05795;
+    public long l05796;
+    public long l05797;
+    public long l05798;
+    public long l05799;
+    public long l05800;
+    public long l05801;
+    public long l05802;
+    public long l05803;
+    public long l05804;
+    public long l05805;
+    public long l05806;
+    public long l05807;
+    public long l05808;
+    public long l05809;
+    public long l05810;
+    public long l05811;
+    public long l05812;
+    public long l05813;
+    public long l05814;
+    public long l05815;
+    public long l05816;
+    public long l05817;
+    public long l05818;
+    public long l05819;
+    public long l05820;
+    public long l05821;
+    public long l05822;
+    public long l05823;
+    public long l05824;
+    public long l05825;
+    public long l05826;
+    public long l05827;
+    public long l05828;
+    public long l05829;
+    public long l05830;
+    public long l05831;
+    public long l05832;
+    public long l05833;
+    public long l05834;
+    public long l05835;
+    public long l05836;
+    public long l05837;
+    public long l05838;
+    public long l05839;
+    public long l05840;
+    public long l05841;
+    public long l05842;
+    public long l05843;
+    public long l05844;
+    public long l05845;
+    public long l05846;
+    public long l05847;
+    public long l05848;
+    public long l05849;
+    public long l05850;
+    public long l05851;
+    public long l05852;
+    public long l05853;
+    public long l05854;
+    public long l05855;
+    public long l05856;
+    public long l05857;
+    public long l05858;
+    public long l05859;
+    public long l05860;
+    public long l05861;
+    public long l05862;
+    public long l05863;
+    public long l05864;
+    public long l05865;
+    public long l05866;
+    public long l05867;
+    public long l05868;
+    public long l05869;
+    public long l05870;
+    public long l05871;
+    public long l05872;
+    public long l05873;
+    public long l05874;
+    public long l05875;
+    public long l05876;
+    public long l05877;
+    public long l05878;
+    public long l05879;
+    public long l05880;
+    public long l05881;
+    public long l05882;
+    public long l05883;
+    public long l05884;
+    public long l05885;
+    public long l05886;
+    public long l05887;
+    public long l05888;
+    public long l05889;
+    public long l05890;
+    public long l05891;
+    public long l05892;
+    public long l05893;
+    public long l05894;
+    public long l05895;
+    public long l05896;
+    public long l05897;
+    public long l05898;
+    public long l05899;
+    public long l05900;
+    public long l05901;
+    public long l05902;
+    public long l05903;
+    public long l05904;
+    public long l05905;
+    public long l05906;
+    public long l05907;
+    public long l05908;
+    public long l05909;
+    public long l05910;
+    public long l05911;
+    public long l05912;
+    public long l05913;
+    public long l05914;
+    public long l05915;
+    public long l05916;
+    public long l05917;
+    public long l05918;
+    public long l05919;
+    public long l05920;
+    public long l05921;
+    public long l05922;
+    public long l05923;
+    public long l05924;
+    public long l05925;
+    public long l05926;
+    public long l05927;
+    public long l05928;
+    public long l05929;
+    public long l05930;
+    public long l05931;
+    public long l05932;
+    public long l05933;
+    public long l05934;
+    public long l05935;
+    public long l05936;
+    public long l05937;
+    public long l05938;
+    public long l05939;
+    public long l05940;
+    public long l05941;
+    public long l05942;
+    public long l05943;
+    public long l05944;
+    public long l05945;
+    public long l05946;
+    public long l05947;
+    public long l05948;
+    public long l05949;
+    public long l05950;
+    public long l05951;
+    public long l05952;
+    public long l05953;
+    public long l05954;
+    public long l05955;
+    public long l05956;
+    public long l05957;
+    public long l05958;
+    public long l05959;
+    public long l05960;
+    public long l05961;
+    public long l05962;
+    public long l05963;
+    public long l05964;
+    public long l05965;
+    public long l05966;
+    public long l05967;
+    public long l05968;
+    public long l05969;
+    public long l05970;
+    public long l05971;
+    public long l05972;
+    public long l05973;
+    public long l05974;
+    public long l05975;
+    public long l05976;
+    public long l05977;
+    public long l05978;
+    public long l05979;
+    public long l05980;
+    public long l05981;
+    public long l05982;
+    public long l05983;
+    public long l05984;
+    public long l05985;
+    public long l05986;
+    public long l05987;
+    public long l05988;
+    public long l05989;
+    public long l05990;
+    public long l05991;
+    public long l05992;
+    public long l05993;
+    public long l05994;
+    public long l05995;
+    public long l05996;
+    public long l05997;
+    public long l05998;
+    public long l05999;
+    public long l06000;
+    public long l06001;
+    public long l06002;
+    public long l06003;
+    public long l06004;
+    public long l06005;
+    public long l06006;
+    public long l06007;
+    public long l06008;
+    public long l06009;
+    public long l06010;
+    public long l06011;
+    public long l06012;
+    public long l06013;
+    public long l06014;
+    public long l06015;
+    public long l06016;
+    public long l06017;
+    public long l06018;
+    public long l06019;
+    public long l06020;
+    public long l06021;
+    public long l06022;
+    public long l06023;
+    public long l06024;
+    public long l06025;
+    public long l06026;
+    public long l06027;
+    public long l06028;
+    public long l06029;
+    public long l06030;
+    public long l06031;
+    public long l06032;
+    public long l06033;
+    public long l06034;
+    public long l06035;
+    public long l06036;
+    public long l06037;
+    public long l06038;
+    public long l06039;
+    public long l06040;
+    public long l06041;
+    public long l06042;
+    public long l06043;
+    public long l06044;
+    public long l06045;
+    public long l06046;
+    public long l06047;
+    public long l06048;
+    public long l06049;
+    public long l06050;
+    public long l06051;
+    public long l06052;
+    public long l06053;
+    public long l06054;
+    public long l06055;
+    public long l06056;
+    public long l06057;
+    public long l06058;
+    public long l06059;
+    public long l06060;
+    public long l06061;
+    public long l06062;
+    public long l06063;
+    public long l06064;
+    public long l06065;
+    public long l06066;
+    public long l06067;
+    public long l06068;
+    public long l06069;
+    public long l06070;
+    public long l06071;
+    public long l06072;
+    public long l06073;
+    public long l06074;
+    public long l06075;
+    public long l06076;
+    public long l06077;
+    public long l06078;
+    public long l06079;
+    public long l06080;
+    public long l06081;
+    public long l06082;
+    public long l06083;
+    public long l06084;
+    public long l06085;
+    public long l06086;
+    public long l06087;
+    public long l06088;
+    public long l06089;
+    public long l06090;
+    public long l06091;
+    public long l06092;
+    public long l06093;
+    public long l06094;
+    public long l06095;
+    public long l06096;
+    public long l06097;
+    public long l06098;
+    public long l06099;
+    public long l06100;
+    public long l06101;
+    public long l06102;
+    public long l06103;
+    public long l06104;
+    public long l06105;
+    public long l06106;
+    public long l06107;
+    public long l06108;
+    public long l06109;
+    public long l06110;
+    public long l06111;
+    public long l06112;
+    public long l06113;
+    public long l06114;
+    public long l06115;
+    public long l06116;
+    public long l06117;
+    public long l06118;
+    public long l06119;
+    public long l06120;
+    public long l06121;
+    public long l06122;
+    public long l06123;
+    public long l06124;
+    public long l06125;
+    public long l06126;
+    public long l06127;
+    public long l06128;
+    public long l06129;
+    public long l06130;
+    public long l06131;
+    public long l06132;
+    public long l06133;
+    public long l06134;
+    public long l06135;
+    public long l06136;
+    public long l06137;
+    public long l06138;
+    public long l06139;
+    public long l06140;
+    public long l06141;
+    public long l06142;
+    public long l06143;
+    public long l06144;
+    public long l06145;
+    public long l06146;
+    public long l06147;
+    public long l06148;
+    public long l06149;
+    public long l06150;
+    public long l06151;
+    public long l06152;
+    public long l06153;
+    public long l06154;
+    public long l06155;
+    public long l06156;
+    public long l06157;
+    public long l06158;
+    public long l06159;
+    public long l06160;
+    public long l06161;
+    public long l06162;
+    public long l06163;
+    public long l06164;
+    public long l06165;
+    public long l06166;
+    public long l06167;
+    public long l06168;
+    public long l06169;
+    public long l06170;
+    public long l06171;
+    public long l06172;
+    public long l06173;
+    public long l06174;
+    public long l06175;
+    public long l06176;
+    public long l06177;
+    public long l06178;
+    public long l06179;
+    public long l06180;
+    public long l06181;
+    public long l06182;
+    public long l06183;
+    public long l06184;
+    public long l06185;
+    public long l06186;
+    public long l06187;
+    public long l06188;
+    public long l06189;
+    public long l06190;
+    public long l06191;
+    public long l06192;
+    public long l06193;
+    public long l06194;
+    public long l06195;
+    public long l06196;
+    public long l06197;
+    public long l06198;
+    public long l06199;
+    public long l06200;
+    public long l06201;
+    public long l06202;
+    public long l06203;
+    public long l06204;
+    public long l06205;
+    public long l06206;
+    public long l06207;
+    public long l06208;
+    public long l06209;
+    public long l06210;
+    public long l06211;
+    public long l06212;
+    public long l06213;
+    public long l06214;
+    public long l06215;
+    public long l06216;
+    public long l06217;
+    public long l06218;
+    public long l06219;
+    public long l06220;
+    public long l06221;
+    public long l06222;
+    public long l06223;
+    public long l06224;
+    public long l06225;
+    public long l06226;
+    public long l06227;
+    public long l06228;
+    public long l06229;
+    public long l06230;
+    public long l06231;
+    public long l06232;
+    public long l06233;
+    public long l06234;
+    public long l06235;
+    public long l06236;
+    public long l06237;
+    public long l06238;
+    public long l06239;
+    public long l06240;
+    public long l06241;
+    public long l06242;
+    public long l06243;
+    public long l06244;
+    public long l06245;
+    public long l06246;
+    public long l06247;
+    public long l06248;
+    public long l06249;
+    public long l06250;
+    public long l06251;
+    public long l06252;
+    public long l06253;
+    public long l06254;
+    public long l06255;
+    public long l06256;
+    public long l06257;
+    public long l06258;
+    public long l06259;
+    public long l06260;
+    public long l06261;
+    public long l06262;
+    public long l06263;
+    public long l06264;
+    public long l06265;
+    public long l06266;
+    public long l06267;
+    public long l06268;
+    public long l06269;
+    public long l06270;
+    public long l06271;
+    public long l06272;
+    public long l06273;
+    public long l06274;
+    public long l06275;
+    public long l06276;
+    public long l06277;
+    public long l06278;
+    public long l06279;
+    public long l06280;
+    public long l06281;
+    public long l06282;
+    public long l06283;
+    public long l06284;
+    public long l06285;
+    public long l06286;
+    public long l06287;
+    public long l06288;
+    public long l06289;
+    public long l06290;
+    public long l06291;
+    public long l06292;
+    public long l06293;
+    public long l06294;
+    public long l06295;
+    public long l06296;
+    public long l06297;
+    public long l06298;
+    public long l06299;
+    public long l06300;
+    public long l06301;
+    public long l06302;
+    public long l06303;
+    public long l06304;
+    public long l06305;
+    public long l06306;
+    public long l06307;
+    public long l06308;
+    public long l06309;
+    public long l06310;
+    public long l06311;
+    public long l06312;
+    public long l06313;
+    public long l06314;
+    public long l06315;
+    public long l06316;
+    public long l06317;
+    public long l06318;
+    public long l06319;
+    public long l06320;
+    public long l06321;
+    public long l06322;
+    public long l06323;
+    public long l06324;
+    public long l06325;
+    public long l06326;
+    public long l06327;
+    public long l06328;
+    public long l06329;
+    public long l06330;
+    public long l06331;
+    public long l06332;
+    public long l06333;
+    public long l06334;
+    public long l06335;
+    public long l06336;
+    public long l06337;
+    public long l06338;
+    public long l06339;
+    public long l06340;
+    public long l06341;
+    public long l06342;
+    public long l06343;
+    public long l06344;
+    public long l06345;
+    public long l06346;
+    public long l06347;
+    public long l06348;
+    public long l06349;
+    public long l06350;
+    public long l06351;
+    public long l06352;
+    public long l06353;
+    public long l06354;
+    public long l06355;
+    public long l06356;
+    public long l06357;
+    public long l06358;
+    public long l06359;
+    public long l06360;
+    public long l06361;
+    public long l06362;
+    public long l06363;
+    public long l06364;
+    public long l06365;
+    public long l06366;
+    public long l06367;
+    public long l06368;
+    public long l06369;
+    public long l06370;
+    public long l06371;
+    public long l06372;
+    public long l06373;
+    public long l06374;
+    public long l06375;
+    public long l06376;
+    public long l06377;
+    public long l06378;
+    public long l06379;
+    public long l06380;
+    public long l06381;
+    public long l06382;
+    public long l06383;
+    public long l06384;
+    public long l06385;
+    public long l06386;
+    public long l06387;
+    public long l06388;
+    public long l06389;
+    public long l06390;
+    public long l06391;
+    public long l06392;
+    public long l06393;
+    public long l06394;
+    public long l06395;
+    public long l06396;
+    public long l06397;
+    public long l06398;
+    public long l06399;
+    public long l06400;
+    public long l06401;
+    public long l06402;
+    public long l06403;
+    public long l06404;
+    public long l06405;
+    public long l06406;
+    public long l06407;
+    public long l06408;
+    public long l06409;
+    public long l06410;
+    public long l06411;
+    public long l06412;
+    public long l06413;
+    public long l06414;
+    public long l06415;
+    public long l06416;
+    public long l06417;
+    public long l06418;
+    public long l06419;
+    public long l06420;
+    public long l06421;
+    public long l06422;
+    public long l06423;
+    public long l06424;
+    public long l06425;
+    public long l06426;
+    public long l06427;
+    public long l06428;
+    public long l06429;
+    public long l06430;
+    public long l06431;
+    public long l06432;
+    public long l06433;
+    public long l06434;
+    public long l06435;
+    public long l06436;
+    public long l06437;
+    public long l06438;
+    public long l06439;
+    public long l06440;
+    public long l06441;
+    public long l06442;
+    public long l06443;
+    public long l06444;
+    public long l06445;
+    public long l06446;
+    public long l06447;
+    public long l06448;
+    public long l06449;
+    public long l06450;
+    public long l06451;
+    public long l06452;
+    public long l06453;
+    public long l06454;
+    public long l06455;
+    public long l06456;
+    public long l06457;
+    public long l06458;
+    public long l06459;
+    public long l06460;
+    public long l06461;
+    public long l06462;
+    public long l06463;
+    public long l06464;
+    public long l06465;
+    public long l06466;
+    public long l06467;
+    public long l06468;
+    public long l06469;
+    public long l06470;
+    public long l06471;
+    public long l06472;
+    public long l06473;
+    public long l06474;
+    public long l06475;
+    public long l06476;
+    public long l06477;
+    public long l06478;
+    public long l06479;
+    public long l06480;
+    public long l06481;
+    public long l06482;
+    public long l06483;
+    public long l06484;
+    public long l06485;
+    public long l06486;
+    public long l06487;
+    public long l06488;
+    public long l06489;
+    public long l06490;
+    public long l06491;
+    public long l06492;
+    public long l06493;
+    public long l06494;
+    public long l06495;
+    public long l06496;
+    public long l06497;
+    public long l06498;
+    public long l06499;
+    public long l06500;
+    public long l06501;
+    public long l06502;
+    public long l06503;
+    public long l06504;
+    public long l06505;
+    public long l06506;
+    public long l06507;
+    public long l06508;
+    public long l06509;
+    public long l06510;
+    public long l06511;
+    public long l06512;
+    public long l06513;
+    public long l06514;
+    public long l06515;
+    public long l06516;
+    public long l06517;
+    public long l06518;
+    public long l06519;
+    public long l06520;
+    public long l06521;
+    public long l06522;
+    public long l06523;
+    public long l06524;
+    public long l06525;
+    public long l06526;
+    public long l06527;
+    public long l06528;
+    public long l06529;
+    public long l06530;
+    public long l06531;
+    public long l06532;
+    public long l06533;
+    public long l06534;
+    public long l06535;
+    public long l06536;
+    public long l06537;
+    public long l06538;
+    public long l06539;
+    public long l06540;
+    public long l06541;
+    public long l06542;
+    public long l06543;
+    public long l06544;
+    public long l06545;
+    public long l06546;
+    public long l06547;
+    public long l06548;
+    public long l06549;
+    public long l06550;
+    public long l06551;
+    public long l06552;
+    public long l06553;
+    public long l06554;
+    public long l06555;
+    public long l06556;
+    public long l06557;
+    public long l06558;
+    public long l06559;
+    public long l06560;
+    public long l06561;
+    public long l06562;
+    public long l06563;
+    public long l06564;
+    public long l06565;
+    public long l06566;
+    public long l06567;
+    public long l06568;
+    public long l06569;
+    public long l06570;
+    public long l06571;
+    public long l06572;
+    public long l06573;
+    public long l06574;
+    public long l06575;
+    public long l06576;
+    public long l06577;
+    public long l06578;
+    public long l06579;
+    public long l06580;
+    public long l06581;
+    public long l06582;
+    public long l06583;
+    public long l06584;
+    public long l06585;
+    public long l06586;
+    public long l06587;
+    public long l06588;
+    public long l06589;
+    public long l06590;
+    public long l06591;
+    public long l06592;
+    public long l06593;
+    public long l06594;
+    public long l06595;
+    public long l06596;
+    public long l06597;
+    public long l06598;
+    public long l06599;
+    public long l06600;
+    public long l06601;
+    public long l06602;
+    public long l06603;
+    public long l06604;
+    public long l06605;
+    public long l06606;
+    public long l06607;
+    public long l06608;
+    public long l06609;
+    public long l06610;
+    public long l06611;
+    public long l06612;
+    public long l06613;
+    public long l06614;
+    public long l06615;
+    public long l06616;
+    public long l06617;
+    public long l06618;
+    public long l06619;
+    public long l06620;
+    public long l06621;
+    public long l06622;
+    public long l06623;
+    public long l06624;
+    public long l06625;
+    public long l06626;
+    public long l06627;
+    public long l06628;
+    public long l06629;
+    public long l06630;
+    public long l06631;
+    public long l06632;
+    public long l06633;
+    public long l06634;
+    public long l06635;
+    public long l06636;
+    public long l06637;
+    public long l06638;
+    public long l06639;
+    public long l06640;
+    public long l06641;
+    public long l06642;
+    public long l06643;
+    public long l06644;
+    public long l06645;
+    public long l06646;
+    public long l06647;
+    public long l06648;
+    public long l06649;
+    public long l06650;
+    public long l06651;
+    public long l06652;
+    public long l06653;
+    public long l06654;
+    public long l06655;
+    public long l06656;
+    public long l06657;
+    public long l06658;
+    public long l06659;
+    public long l06660;
+    public long l06661;
+    public long l06662;
+    public long l06663;
+    public long l06664;
+    public long l06665;
+    public long l06666;
+    public long l06667;
+    public long l06668;
+    public long l06669;
+    public long l06670;
+    public long l06671;
+    public long l06672;
+    public long l06673;
+    public long l06674;
+    public long l06675;
+    public long l06676;
+    public long l06677;
+    public long l06678;
+    public long l06679;
+    public long l06680;
+    public long l06681;
+    public long l06682;
+    public long l06683;
+    public long l06684;
+    public long l06685;
+    public long l06686;
+    public long l06687;
+    public long l06688;
+    public long l06689;
+    public long l06690;
+    public long l06691;
+    public long l06692;
+    public long l06693;
+    public long l06694;
+    public long l06695;
+    public long l06696;
+    public long l06697;
+    public long l06698;
+    public long l06699;
+    public long l06700;
+    public long l06701;
+    public long l06702;
+    public long l06703;
+    public long l06704;
+    public long l06705;
+    public long l06706;
+    public long l06707;
+    public long l06708;
+    public long l06709;
+    public long l06710;
+    public long l06711;
+    public long l06712;
+    public long l06713;
+    public long l06714;
+    public long l06715;
+    public long l06716;
+    public long l06717;
+    public long l06718;
+    public long l06719;
+    public long l06720;
+    public long l06721;
+    public long l06722;
+    public long l06723;
+    public long l06724;
+    public long l06725;
+    public long l06726;
+    public long l06727;
+    public long l06728;
+    public long l06729;
+    public long l06730;
+    public long l06731;
+    public long l06732;
+    public long l06733;
+    public long l06734;
+    public long l06735;
+    public long l06736;
+    public long l06737;
+    public long l06738;
+    public long l06739;
+    public long l06740;
+    public long l06741;
+    public long l06742;
+    public long l06743;
+    public long l06744;
+    public long l06745;
+    public long l06746;
+    public long l06747;
+    public long l06748;
+    public long l06749;
+    public long l06750;
+    public long l06751;
+    public long l06752;
+    public long l06753;
+    public long l06754;
+    public long l06755;
+    public long l06756;
+    public long l06757;
+    public long l06758;
+    public long l06759;
+    public long l06760;
+    public long l06761;
+    public long l06762;
+    public long l06763;
+    public long l06764;
+    public long l06765;
+    public long l06766;
+    public long l06767;
+    public long l06768;
+    public long l06769;
+    public long l06770;
+    public long l06771;
+    public long l06772;
+    public long l06773;
+    public long l06774;
+    public long l06775;
+    public long l06776;
+    public long l06777;
+    public long l06778;
+    public long l06779;
+    public long l06780;
+    public long l06781;
+    public long l06782;
+    public long l06783;
+    public long l06784;
+    public long l06785;
+    public long l06786;
+    public long l06787;
+    public long l06788;
+    public long l06789;
+    public long l06790;
+    public long l06791;
+    public long l06792;
+    public long l06793;
+    public long l06794;
+    public long l06795;
+    public long l06796;
+    public long l06797;
+    public long l06798;
+    public long l06799;
+    public long l06800;
+    public long l06801;
+    public long l06802;
+    public long l06803;
+    public long l06804;
+    public long l06805;
+    public long l06806;
+    public long l06807;
+    public long l06808;
+    public long l06809;
+    public long l06810;
+    public long l06811;
+    public long l06812;
+    public long l06813;
+    public long l06814;
+    public long l06815;
+    public long l06816;
+    public long l06817;
+    public long l06818;
+    public long l06819;
+    public long l06820;
+    public long l06821;
+    public long l06822;
+    public long l06823;
+    public long l06824;
+    public long l06825;
+    public long l06826;
+    public long l06827;
+    public long l06828;
+    public long l06829;
+    public long l06830;
+    public long l06831;
+    public long l06832;
+    public long l06833;
+    public long l06834;
+    public long l06835;
+    public long l06836;
+    public long l06837;
+    public long l06838;
+    public long l06839;
+    public long l06840;
+    public long l06841;
+    public long l06842;
+    public long l06843;
+    public long l06844;
+    public long l06845;
+    public long l06846;
+    public long l06847;
+    public long l06848;
+    public long l06849;
+    public long l06850;
+    public long l06851;
+    public long l06852;
+    public long l06853;
+    public long l06854;
+    public long l06855;
+    public long l06856;
+    public long l06857;
+    public long l06858;
+    public long l06859;
+    public long l06860;
+    public long l06861;
+    public long l06862;
+    public long l06863;
+    public long l06864;
+    public long l06865;
+    public long l06866;
+    public long l06867;
+    public long l06868;
+    public long l06869;
+    public long l06870;
+    public long l06871;
+    public long l06872;
+    public long l06873;
+    public long l06874;
+    public long l06875;
+    public long l06876;
+    public long l06877;
+    public long l06878;
+    public long l06879;
+    public long l06880;
+    public long l06881;
+    public long l06882;
+    public long l06883;
+    public long l06884;
+    public long l06885;
+    public long l06886;
+    public long l06887;
+    public long l06888;
+    public long l06889;
+    public long l06890;
+    public long l06891;
+    public long l06892;
+    public long l06893;
+    public long l06894;
+    public long l06895;
+    public long l06896;
+    public long l06897;
+    public long l06898;
+    public long l06899;
+    public long l06900;
+    public long l06901;
+    public long l06902;
+    public long l06903;
+    public long l06904;
+    public long l06905;
+    public long l06906;
+    public long l06907;
+    public long l06908;
+    public long l06909;
+    public long l06910;
+    public long l06911;
+    public long l06912;
+    public long l06913;
+    public long l06914;
+    public long l06915;
+    public long l06916;
+    public long l06917;
+    public long l06918;
+    public long l06919;
+    public long l06920;
+    public long l06921;
+    public long l06922;
+    public long l06923;
+    public long l06924;
+    public long l06925;
+    public long l06926;
+    public long l06927;
+    public long l06928;
+    public long l06929;
+    public long l06930;
+    public long l06931;
+    public long l06932;
+    public long l06933;
+    public long l06934;
+    public long l06935;
+    public long l06936;
+    public long l06937;
+    public long l06938;
+    public long l06939;
+    public long l06940;
+    public long l06941;
+    public long l06942;
+    public long l06943;
+    public long l06944;
+    public long l06945;
+    public long l06946;
+    public long l06947;
+    public long l06948;
+    public long l06949;
+    public long l06950;
+    public long l06951;
+    public long l06952;
+    public long l06953;
+    public long l06954;
+    public long l06955;
+    public long l06956;
+    public long l06957;
+    public long l06958;
+    public long l06959;
+    public long l06960;
+    public long l06961;
+    public long l06962;
+    public long l06963;
+    public long l06964;
+    public long l06965;
+    public long l06966;
+    public long l06967;
+    public long l06968;
+    public long l06969;
+    public long l06970;
+    public long l06971;
+    public long l06972;
+    public long l06973;
+    public long l06974;
+    public long l06975;
+    public long l06976;
+    public long l06977;
+    public long l06978;
+    public long l06979;
+    public long l06980;
+    public long l06981;
+    public long l06982;
+    public long l06983;
+    public long l06984;
+    public long l06985;
+    public long l06986;
+    public long l06987;
+    public long l06988;
+    public long l06989;
+    public long l06990;
+    public long l06991;
+    public long l06992;
+    public long l06993;
+    public long l06994;
+    public long l06995;
+    public long l06996;
+    public long l06997;
+    public long l06998;
+    public long l06999;
+    public long l07000;
+    public long l07001;
+    public long l07002;
+    public long l07003;
+    public long l07004;
+    public long l07005;
+    public long l07006;
+    public long l07007;
+    public long l07008;
+    public long l07009;
+    public long l07010;
+    public long l07011;
+    public long l07012;
+    public long l07013;
+    public long l07014;
+    public long l07015;
+    public long l07016;
+    public long l07017;
+    public long l07018;
+    public long l07019;
+    public long l07020;
+    public long l07021;
+    public long l07022;
+    public long l07023;
+    public long l07024;
+    public long l07025;
+    public long l07026;
+    public long l07027;
+    public long l07028;
+    public long l07029;
+    public long l07030;
+    public long l07031;
+    public long l07032;
+    public long l07033;
+    public long l07034;
+    public long l07035;
+    public long l07036;
+    public long l07037;
+    public long l07038;
+    public long l07039;
+    public long l07040;
+    public long l07041;
+    public long l07042;
+    public long l07043;
+    public long l07044;
+    public long l07045;
+    public long l07046;
+    public long l07047;
+    public long l07048;
+    public long l07049;
+    public long l07050;
+    public long l07051;
+    public long l07052;
+    public long l07053;
+    public long l07054;
+    public long l07055;
+    public long l07056;
+    public long l07057;
+    public long l07058;
+    public long l07059;
+    public long l07060;
+    public long l07061;
+    public long l07062;
+    public long l07063;
+    public long l07064;
+    public long l07065;
+    public long l07066;
+    public long l07067;
+    public long l07068;
+    public long l07069;
+    public long l07070;
+    public long l07071;
+    public long l07072;
+    public long l07073;
+    public long l07074;
+    public long l07075;
+    public long l07076;
+    public long l07077;
+    public long l07078;
+    public long l07079;
+    public long l07080;
+    public long l07081;
+    public long l07082;
+    public long l07083;
+    public long l07084;
+    public long l07085;
+    public long l07086;
+    public long l07087;
+    public long l07088;
+    public long l07089;
+    public long l07090;
+    public long l07091;
+    public long l07092;
+    public long l07093;
+    public long l07094;
+    public long l07095;
+    public long l07096;
+    public long l07097;
+    public long l07098;
+    public long l07099;
+    public long l07100;
+    public long l07101;
+    public long l07102;
+    public long l07103;
+    public long l07104;
+    public long l07105;
+    public long l07106;
+    public long l07107;
+    public long l07108;
+    public long l07109;
+    public long l07110;
+    public long l07111;
+    public long l07112;
+    public long l07113;
+    public long l07114;
+    public long l07115;
+    public long l07116;
+    public long l07117;
+    public long l07118;
+    public long l07119;
+    public long l07120;
+    public long l07121;
+    public long l07122;
+    public long l07123;
+    public long l07124;
+    public long l07125;
+    public long l07126;
+    public long l07127;
+    public long l07128;
+    public long l07129;
+    public long l07130;
+    public long l07131;
+    public long l07132;
+    public long l07133;
+    public long l07134;
+    public long l07135;
+    public long l07136;
+    public long l07137;
+    public long l07138;
+    public long l07139;
+    public long l07140;
+    public long l07141;
+    public long l07142;
+    public long l07143;
+    public long l07144;
+    public long l07145;
+    public long l07146;
+    public long l07147;
+    public long l07148;
+    public long l07149;
+    public long l07150;
+    public long l07151;
+    public long l07152;
+    public long l07153;
+    public long l07154;
+    public long l07155;
+    public long l07156;
+    public long l07157;
+    public long l07158;
+    public long l07159;
+    public long l07160;
+    public long l07161;
+    public long l07162;
+    public long l07163;
+    public long l07164;
+    public long l07165;
+    public long l07166;
+    public long l07167;
+    public long l07168;
+    public long l07169;
+    public long l07170;
+    public long l07171;
+    public long l07172;
+    public long l07173;
+    public long l07174;
+    public long l07175;
+    public long l07176;
+    public long l07177;
+    public long l07178;
+    public long l07179;
+    public long l07180;
+    public long l07181;
+    public long l07182;
+    public long l07183;
+    public long l07184;
+    public long l07185;
+    public long l07186;
+    public long l07187;
+    public long l07188;
+    public long l07189;
+    public long l07190;
+    public long l07191;
+    public long l07192;
+    public long l07193;
+    public long l07194;
+    public long l07195;
+    public long l07196;
+    public long l07197;
+    public long l07198;
+    public long l07199;
+    public long l07200;
+    public long l07201;
+    public long l07202;
+    public long l07203;
+    public long l07204;
+    public long l07205;
+    public long l07206;
+    public long l07207;
+    public long l07208;
+    public long l07209;
+    public long l07210;
+    public long l07211;
+    public long l07212;
+    public long l07213;
+    public long l07214;
+    public long l07215;
+    public long l07216;
+    public long l07217;
+    public long l07218;
+    public long l07219;
+    public long l07220;
+    public long l07221;
+    public long l07222;
+    public long l07223;
+    public long l07224;
+    public long l07225;
+    public long l07226;
+    public long l07227;
+    public long l07228;
+    public long l07229;
+    public long l07230;
+    public long l07231;
+    public long l07232;
+    public long l07233;
+    public long l07234;
+    public long l07235;
+    public long l07236;
+    public long l07237;
+    public long l07238;
+    public long l07239;
+    public long l07240;
+    public long l07241;
+    public long l07242;
+    public long l07243;
+    public long l07244;
+    public long l07245;
+    public long l07246;
+    public long l07247;
+    public long l07248;
+    public long l07249;
+    public long l07250;
+    public long l07251;
+    public long l07252;
+    public long l07253;
+    public long l07254;
+    public long l07255;
+    public long l07256;
+    public long l07257;
+    public long l07258;
+    public long l07259;
+    public long l07260;
+    public long l07261;
+    public long l07262;
+    public long l07263;
+    public long l07264;
+    public long l07265;
+    public long l07266;
+    public long l07267;
+    public long l07268;
+    public long l07269;
+    public long l07270;
+    public long l07271;
+    public long l07272;
+    public long l07273;
+    public long l07274;
+    public long l07275;
+    public long l07276;
+    public long l07277;
+    public long l07278;
+    public long l07279;
+    public long l07280;
+    public long l07281;
+    public long l07282;
+    public long l07283;
+    public long l07284;
+    public long l07285;
+    public long l07286;
+    public long l07287;
+    public long l07288;
+    public long l07289;
+    public long l07290;
+    public long l07291;
+    public long l07292;
+    public long l07293;
+    public long l07294;
+    public long l07295;
+    public long l07296;
+    public long l07297;
+    public long l07298;
+    public long l07299;
+    public long l07300;
+    public long l07301;
+    public long l07302;
+    public long l07303;
+    public long l07304;
+    public long l07305;
+    public long l07306;
+    public long l07307;
+    public long l07308;
+    public long l07309;
+    public long l07310;
+    public long l07311;
+    public long l07312;
+    public long l07313;
+    public long l07314;
+    public long l07315;
+    public long l07316;
+    public long l07317;
+    public long l07318;
+    public long l07319;
+    public long l07320;
+    public long l07321;
+    public long l07322;
+    public long l07323;
+    public long l07324;
+    public long l07325;
+    public long l07326;
+    public long l07327;
+    public long l07328;
+    public long l07329;
+    public long l07330;
+    public long l07331;
+    public long l07332;
+    public long l07333;
+    public long l07334;
+    public long l07335;
+    public long l07336;
+    public long l07337;
+    public long l07338;
+    public long l07339;
+    public long l07340;
+    public long l07341;
+    public long l07342;
+    public long l07343;
+    public long l07344;
+    public long l07345;
+    public long l07346;
+    public long l07347;
+    public long l07348;
+    public long l07349;
+    public long l07350;
+    public long l07351;
+    public long l07352;
+    public long l07353;
+    public long l07354;
+    public long l07355;
+    public long l07356;
+    public long l07357;
+    public long l07358;
+    public long l07359;
+    public long l07360;
+    public long l07361;
+    public long l07362;
+    public long l07363;
+    public long l07364;
+    public long l07365;
+    public long l07366;
+    public long l07367;
+    public long l07368;
+    public long l07369;
+    public long l07370;
+    public long l07371;
+    public long l07372;
+    public long l07373;
+    public long l07374;
+    public long l07375;
+    public long l07376;
+    public long l07377;
+    public long l07378;
+    public long l07379;
+    public long l07380;
+    public long l07381;
+    public long l07382;
+    public long l07383;
+    public long l07384;
+    public long l07385;
+    public long l07386;
+    public long l07387;
+    public long l07388;
+    public long l07389;
+    public long l07390;
+    public long l07391;
+    public long l07392;
+    public long l07393;
+    public long l07394;
+    public long l07395;
+    public long l07396;
+    public long l07397;
+    public long l07398;
+    public long l07399;
+    public long l07400;
+    public long l07401;
+    public long l07402;
+    public long l07403;
+    public long l07404;
+    public long l07405;
+    public long l07406;
+    public long l07407;
+    public long l07408;
+    public long l07409;
+    public long l07410;
+    public long l07411;
+    public long l07412;
+    public long l07413;
+    public long l07414;
+    public long l07415;
+    public long l07416;
+    public long l07417;
+    public long l07418;
+    public long l07419;
+    public long l07420;
+    public long l07421;
+    public long l07422;
+    public long l07423;
+    public long l07424;
+    public long l07425;
+    public long l07426;
+    public long l07427;
+    public long l07428;
+    public long l07429;
+    public long l07430;
+    public long l07431;
+    public long l07432;
+    public long l07433;
+    public long l07434;
+    public long l07435;
+    public long l07436;
+    public long l07437;
+    public long l07438;
+    public long l07439;
+    public long l07440;
+    public long l07441;
+    public long l07442;
+    public long l07443;
+    public long l07444;
+    public long l07445;
+    public long l07446;
+    public long l07447;
+    public long l07448;
+    public long l07449;
+    public long l07450;
+    public long l07451;
+    public long l07452;
+    public long l07453;
+    public long l07454;
+    public long l07455;
+    public long l07456;
+    public long l07457;
+    public long l07458;
+    public long l07459;
+    public long l07460;
+    public long l07461;
+    public long l07462;
+    public long l07463;
+    public long l07464;
+    public long l07465;
+    public long l07466;
+    public long l07467;
+    public long l07468;
+    public long l07469;
+    public long l07470;
+    public long l07471;
+    public long l07472;
+    public long l07473;
+    public long l07474;
+    public long l07475;
+    public long l07476;
+    public long l07477;
+    public long l07478;
+    public long l07479;
+    public long l07480;
+    public long l07481;
+    public long l07482;
+    public long l07483;
+    public long l07484;
+    public long l07485;
+    public long l07486;
+    public long l07487;
+    public long l07488;
+    public long l07489;
+    public long l07490;
+    public long l07491;
+    public long l07492;
+    public long l07493;
+    public long l07494;
+    public long l07495;
+    public long l07496;
+    public long l07497;
+    public long l07498;
+    public long l07499;
+    public long l07500;
+    public long l07501;
+    public long l07502;
+    public long l07503;
+    public long l07504;
+    public long l07505;
+    public long l07506;
+    public long l07507;
+    public long l07508;
+    public long l07509;
+    public long l07510;
+    public long l07511;
+    public long l07512;
+    public long l07513;
+    public long l07514;
+    public long l07515;
+    public long l07516;
+    public long l07517;
+    public long l07518;
+    public long l07519;
+    public long l07520;
+    public long l07521;
+    public long l07522;
+    public long l07523;
+    public long l07524;
+    public long l07525;
+    public long l07526;
+    public long l07527;
+    public long l07528;
+    public long l07529;
+    public long l07530;
+    public long l07531;
+    public long l07532;
+    public long l07533;
+    public long l07534;
+    public long l07535;
+    public long l07536;
+    public long l07537;
+    public long l07538;
+    public long l07539;
+    public long l07540;
+    public long l07541;
+    public long l07542;
+    public long l07543;
+    public long l07544;
+    public long l07545;
+    public long l07546;
+    public long l07547;
+    public long l07548;
+    public long l07549;
+    public long l07550;
+    public long l07551;
+    public long l07552;
+    public long l07553;
+    public long l07554;
+    public long l07555;
+    public long l07556;
+    public long l07557;
+    public long l07558;
+    public long l07559;
+    public long l07560;
+    public long l07561;
+    public long l07562;
+    public long l07563;
+    public long l07564;
+    public long l07565;
+    public long l07566;
+    public long l07567;
+    public long l07568;
+    public long l07569;
+    public long l07570;
+    public long l07571;
+    public long l07572;
+    public long l07573;
+    public long l07574;
+    public long l07575;
+    public long l07576;
+    public long l07577;
+    public long l07578;
+    public long l07579;
+    public long l07580;
+    public long l07581;
+    public long l07582;
+    public long l07583;
+    public long l07584;
+    public long l07585;
+    public long l07586;
+    public long l07587;
+    public long l07588;
+    public long l07589;
+    public long l07590;
+    public long l07591;
+    public long l07592;
+    public long l07593;
+    public long l07594;
+    public long l07595;
+    public long l07596;
+    public long l07597;
+    public long l07598;
+    public long l07599;
+    public long l07600;
+    public long l07601;
+    public long l07602;
+    public long l07603;
+    public long l07604;
+    public long l07605;
+    public long l07606;
+    public long l07607;
+    public long l07608;
+    public long l07609;
+    public long l07610;
+    public long l07611;
+    public long l07612;
+    public long l07613;
+    public long l07614;
+    public long l07615;
+    public long l07616;
+    public long l07617;
+    public long l07618;
+    public long l07619;
+    public long l07620;
+    public long l07621;
+    public long l07622;
+    public long l07623;
+    public long l07624;
+    public long l07625;
+    public long l07626;
+    public long l07627;
+    public long l07628;
+    public long l07629;
+    public long l07630;
+    public long l07631;
+    public long l07632;
+    public long l07633;
+    public long l07634;
+    public long l07635;
+    public long l07636;
+    public long l07637;
+    public long l07638;
+    public long l07639;
+    public long l07640;
+    public long l07641;
+    public long l07642;
+    public long l07643;
+    public long l07644;
+    public long l07645;
+    public long l07646;
+    public long l07647;
+    public long l07648;
+    public long l07649;
+    public long l07650;
+    public long l07651;
+    public long l07652;
+    public long l07653;
+    public long l07654;
+    public long l07655;
+    public long l07656;
+    public long l07657;
+    public long l07658;
+    public long l07659;
+    public long l07660;
+    public long l07661;
+    public long l07662;
+    public long l07663;
+    public long l07664;
+    public long l07665;
+    public long l07666;
+    public long l07667;
+    public long l07668;
+    public long l07669;
+    public long l07670;
+    public long l07671;
+    public long l07672;
+    public long l07673;
+    public long l07674;
+    public long l07675;
+    public long l07676;
+    public long l07677;
+    public long l07678;
+    public long l07679;
+    public long l07680;
+    public long l07681;
+    public long l07682;
+    public long l07683;
+    public long l07684;
+    public long l07685;
+    public long l07686;
+    public long l07687;
+    public long l07688;
+    public long l07689;
+    public long l07690;
+    public long l07691;
+    public long l07692;
+    public long l07693;
+    public long l07694;
+    public long l07695;
+    public long l07696;
+    public long l07697;
+    public long l07698;
+    public long l07699;
+    public long l07700;
+    public long l07701;
+    public long l07702;
+    public long l07703;
+    public long l07704;
+    public long l07705;
+    public long l07706;
+    public long l07707;
+    public long l07708;
+    public long l07709;
+    public long l07710;
+    public long l07711;
+    public long l07712;
+    public long l07713;
+    public long l07714;
+    public long l07715;
+    public long l07716;
+    public long l07717;
+    public long l07718;
+    public long l07719;
+    public long l07720;
+    public long l07721;
+    public long l07722;
+    public long l07723;
+    public long l07724;
+    public long l07725;
+    public long l07726;
+    public long l07727;
+    public long l07728;
+    public long l07729;
+    public long l07730;
+    public long l07731;
+    public long l07732;
+    public long l07733;
+    public long l07734;
+    public long l07735;
+    public long l07736;
+    public long l07737;
+    public long l07738;
+    public long l07739;
+    public long l07740;
+    public long l07741;
+    public long l07742;
+    public long l07743;
+    public long l07744;
+    public long l07745;
+    public long l07746;
+    public long l07747;
+    public long l07748;
+    public long l07749;
+    public long l07750;
+    public long l07751;
+    public long l07752;
+    public long l07753;
+    public long l07754;
+    public long l07755;
+    public long l07756;
+    public long l07757;
+    public long l07758;
+    public long l07759;
+    public long l07760;
+    public long l07761;
+    public long l07762;
+    public long l07763;
+    public long l07764;
+    public long l07765;
+    public long l07766;
+    public long l07767;
+    public long l07768;
+    public long l07769;
+    public long l07770;
+    public long l07771;
+    public long l07772;
+    public long l07773;
+    public long l07774;
+    public long l07775;
+    public long l07776;
+    public long l07777;
+    public long l07778;
+    public long l07779;
+    public long l07780;
+    public long l07781;
+    public long l07782;
+    public long l07783;
+    public long l07784;
+    public long l07785;
+    public long l07786;
+    public long l07787;
+    public long l07788;
+    public long l07789;
+    public long l07790;
+    public long l07791;
+    public long l07792;
+    public long l07793;
+    public long l07794;
+    public long l07795;
+    public long l07796;
+    public long l07797;
+    public long l07798;
+    public long l07799;
+    public long l07800;
+    public long l07801;
+    public long l07802;
+    public long l07803;
+    public long l07804;
+    public long l07805;
+    public long l07806;
+    public long l07807;
+    public long l07808;
+    public long l07809;
+    public long l07810;
+    public long l07811;
+    public long l07812;
+    public long l07813;
+    public long l07814;
+    public long l07815;
+    public long l07816;
+    public long l07817;
+    public long l07818;
+    public long l07819;
+    public long l07820;
+    public long l07821;
+    public long l07822;
+    public long l07823;
+    public long l07824;
+    public long l07825;
+    public long l07826;
+    public long l07827;
+    public long l07828;
+    public long l07829;
+    public long l07830;
+    public long l07831;
+    public long l07832;
+    public long l07833;
+    public long l07834;
+    public long l07835;
+    public long l07836;
+    public long l07837;
+    public long l07838;
+    public long l07839;
+    public long l07840;
+    public long l07841;
+    public long l07842;
+    public long l07843;
+    public long l07844;
+    public long l07845;
+    public long l07846;
+    public long l07847;
+    public long l07848;
+    public long l07849;
+    public long l07850;
+    public long l07851;
+    public long l07852;
+    public long l07853;
+    public long l07854;
+    public long l07855;
+    public long l07856;
+    public long l07857;
+    public long l07858;
+    public long l07859;
+    public long l07860;
+    public long l07861;
+    public long l07862;
+    public long l07863;
+    public long l07864;
+    public long l07865;
+    public long l07866;
+    public long l07867;
+    public long l07868;
+    public long l07869;
+    public long l07870;
+    public long l07871;
+    public long l07872;
+    public long l07873;
+    public long l07874;
+    public long l07875;
+    public long l07876;
+    public long l07877;
+    public long l07878;
+    public long l07879;
+    public long l07880;
+    public long l07881;
+    public long l07882;
+    public long l07883;
+    public long l07884;
+    public long l07885;
+    public long l07886;
+    public long l07887;
+    public long l07888;
+    public long l07889;
+    public long l07890;
+    public long l07891;
+    public long l07892;
+    public long l07893;
+    public long l07894;
+    public long l07895;
+    public long l07896;
+    public long l07897;
+    public long l07898;
+    public long l07899;
+    public long l07900;
+    public long l07901;
+    public long l07902;
+    public long l07903;
+    public long l07904;
+    public long l07905;
+    public long l07906;
+    public long l07907;
+    public long l07908;
+    public long l07909;
+    public long l07910;
+    public long l07911;
+    public long l07912;
+    public long l07913;
+    public long l07914;
+    public long l07915;
+    public long l07916;
+    public long l07917;
+    public long l07918;
+    public long l07919;
+    public long l07920;
+    public long l07921;
+    public long l07922;
+    public long l07923;
+    public long l07924;
+    public long l07925;
+    public long l07926;
+    public long l07927;
+    public long l07928;
+    public long l07929;
+    public long l07930;
+    public long l07931;
+    public long l07932;
+    public long l07933;
+    public long l07934;
+    public long l07935;
+    public long l07936;
+    public long l07937;
+    public long l07938;
+    public long l07939;
+    public long l07940;
+    public long l07941;
+    public long l07942;
+    public long l07943;
+    public long l07944;
+    public long l07945;
+    public long l07946;
+    public long l07947;
+    public long l07948;
+    public long l07949;
+    public long l07950;
+    public long l07951;
+    public long l07952;
+    public long l07953;
+    public long l07954;
+    public long l07955;
+    public long l07956;
+    public long l07957;
+    public long l07958;
+    public long l07959;
+    public long l07960;
+    public long l07961;
+    public long l07962;
+    public long l07963;
+    public long l07964;
+    public long l07965;
+    public long l07966;
+    public long l07967;
+    public long l07968;
+    public long l07969;
+    public long l07970;
+    public long l07971;
+    public long l07972;
+    public long l07973;
+    public long l07974;
+    public long l07975;
+    public long l07976;
+    public long l07977;
+    public long l07978;
+    public long l07979;
+    public long l07980;
+    public long l07981;
+    public long l07982;
+    public long l07983;
+    public long l07984;
+    public long l07985;
+    public long l07986;
+    public long l07987;
+    public long l07988;
+    public long l07989;
+    public long l07990;
+    public long l07991;
+    public long l07992;
+    public long l07993;
+    public long l07994;
+    public long l07995;
+    public long l07996;
+    public long l07997;
+    public long l07998;
+    public long l07999;
+    public long l08000;
+    public long l08001;
+    public long l08002;
+    public long l08003;
+    public long l08004;
+    public long l08005;
+    public long l08006;
+    public long l08007;
+    public long l08008;
+    public long l08009;
+    public long l08010;
+    public long l08011;
+    public long l08012;
+    public long l08013;
+    public long l08014;
+    public long l08015;
+    public long l08016;
+    public long l08017;
+    public long l08018;
+    public long l08019;
+    public long l08020;
+    public long l08021;
+    public long l08022;
+    public long l08023;
+    public long l08024;
+    public long l08025;
+    public long l08026;
+    public long l08027;
+    public long l08028;
+    public long l08029;
+    public long l08030;
+    public long l08031;
+    public long l08032;
+    public long l08033;
+    public long l08034;
+    public long l08035;
+    public long l08036;
+    public long l08037;
+    public long l08038;
+    public long l08039;
+    public long l08040;
+    public long l08041;
+    public long l08042;
+    public long l08043;
+    public long l08044;
+    public long l08045;
+    public long l08046;
+    public long l08047;
+    public long l08048;
+    public long l08049;
+    public long l08050;
+    public long l08051;
+    public long l08052;
+    public long l08053;
+    public long l08054;
+    public long l08055;
+    public long l08056;
+    public long l08057;
+    public long l08058;
+    public long l08059;
+    public long l08060;
+    public long l08061;
+    public long l08062;
+    public long l08063;
+    public long l08064;
+    public long l08065;
+    public long l08066;
+    public long l08067;
+    public long l08068;
+    public long l08069;
+    public long l08070;
+    public long l08071;
+    public long l08072;
+    public long l08073;
+    public long l08074;
+    public long l08075;
+    public long l08076;
+    public long l08077;
+    public long l08078;
+    public long l08079;
+    public long l08080;
+    public long l08081;
+    public long l08082;
+    public long l08083;
+    public long l08084;
+    public long l08085;
+    public long l08086;
+    public long l08087;
+    public long l08088;
+    public long l08089;
+    public long l08090;
+    public long l08091;
+    public long l08092;
+    public long l08093;
+    public long l08094;
+    public long l08095;
+    public long l08096;
+    public long l08097;
+    public long l08098;
+    public long l08099;
+    public long l08100;
+    public long l08101;
+    public long l08102;
+    public long l08103;
+    public long l08104;
+    public long l08105;
+    public long l08106;
+    public long l08107;
+    public long l08108;
+    public long l08109;
+    public long l08110;
+    public long l08111;
+    public long l08112;
+    public long l08113;
+    public long l08114;
+    public long l08115;
+    public long l08116;
+    public long l08117;
+    public long l08118;
+    public long l08119;
+    public long l08120;
+    public long l08121;
+    public long l08122;
+    public long l08123;
+    public long l08124;
+    public long l08125;
+    public long l08126;
+    public long l08127;
+    public long l08128;
+    public long l08129;
+    public long l08130;
+    public long l08131;
+    public long l08132;
+    public long l08133;
+    public long l08134;
+    public long l08135;
+    public long l08136;
+    public long l08137;
+    public long l08138;
+    public long l08139;
+    public long l08140;
+    public long l08141;
+    public long l08142;
+    public long l08143;
+    public long l08144;
+    public long l08145;
+    public long l08146;
+    public long l08147;
+    public long l08148;
+    public long l08149;
+    public long l08150;
+    public long l08151;
+    public long l08152;
+    public long l08153;
+    public long l08154;
+    public long l08155;
+    public long l08156;
+    public long l08157;
+    public long l08158;
+    public long l08159;
+    public long l08160;
+    public long l08161;
+    public long l08162;
+    public long l08163;
+    public long l08164;
+    public long l08165;
+    public long l08166;
+    public long l08167;
+    public long l08168;
+    public long l08169;
+    public long l08170;
+    public long l08171;
+    public long l08172;
+    public long l08173;
+    public long l08174;
+    public long l08175;
+    public long l08176;
+    public long l08177;
+    public long l08178;
+    public long l08179;
+    public long l08180;
+    public long l08181;
+    public long l08182;
+    public long l08183;
+    public long l08184;
+    public long l08185;
+    public long l08186;
+    public long l08187;
+    public long l08188;
+    public long l08189;
+    public long l08190;
+    public long l08191;
+    public long l08192;
+    public long l08193;
+    public long l08194;
+    public long l08195;
+    public long l08196;
+    public long l08197;
+    public long l08198;
+    public long l08199;
+    public long l08200;
+    public long l08201;
+    public long l08202;
+    public long l08203;
+    public long l08204;
+    public long l08205;
+    public long l08206;
+    public long l08207;
+    public long l08208;
+    public long l08209;
+    public long l08210;
+    public long l08211;
+    public long l08212;
+    public long l08213;
+    public long l08214;
+    public long l08215;
+    public long l08216;
+    public long l08217;
+    public long l08218;
+    public long l08219;
+    public long l08220;
+    public long l08221;
+    public long l08222;
+    public long l08223;
+    public long l08224;
+    public long l08225;
+    public long l08226;
+    public long l08227;
+    public long l08228;
+    public long l08229;
+    public long l08230;
+    public long l08231;
+    public long l08232;
+    public long l08233;
+    public long l08234;
+    public long l08235;
+    public long l08236;
+    public long l08237;
+    public long l08238;
+    public long l08239;
+    public long l08240;
+    public long l08241;
+    public long l08242;
+    public long l08243;
+    public long l08244;
+    public long l08245;
+    public long l08246;
+    public long l08247;
+    public long l08248;
+    public long l08249;
+    public long l08250;
+    public long l08251;
+    public long l08252;
+    public long l08253;
+    public long l08254;
+    public long l08255;
+    public long l08256;
+    public long l08257;
+    public long l08258;
+    public long l08259;
+    public long l08260;
+    public long l08261;
+    public long l08262;
+    public long l08263;
+    public long l08264;
+    public long l08265;
+    public long l08266;
+    public long l08267;
+    public long l08268;
+    public long l08269;
+    public long l08270;
+    public long l08271;
+    public long l08272;
+    public long l08273;
+    public long l08274;
+    public long l08275;
+    public long l08276;
+    public long l08277;
+    public long l08278;
+    public long l08279;
+    public long l08280;
+    public long l08281;
+    public long l08282;
+    public long l08283;
+    public long l08284;
+    public long l08285;
+    public long l08286;
+    public long l08287;
+    public long l08288;
+    public long l08289;
+    public long l08290;
+    public long l08291;
+    public long l08292;
+    public long l08293;
+    public long l08294;
+    public long l08295;
+    public long l08296;
+    public long l08297;
+    public long l08298;
+    public long l08299;
+    public long l08300;
+    public long l08301;
+    public long l08302;
+    public long l08303;
+    public long l08304;
+    public long l08305;
+    public long l08306;
+    public long l08307;
+    public long l08308;
+    public long l08309;
+    public long l08310;
+    public long l08311;
+    public long l08312;
+    public long l08313;
+    public long l08314;
+    public long l08315;
+    public long l08316;
+    public long l08317;
+    public long l08318;
+    public long l08319;
+    public long l08320;
+    public long l08321;
+    public long l08322;
+    public long l08323;
+    public long l08324;
+    public long l08325;
+    public long l08326;
+    public long l08327;
+    public long l08328;
+    public long l08329;
+    public long l08330;
+    public long l08331;
+    public long l08332;
+    public long l08333;
+    public long l08334;
+    public long l08335;
+    public long l08336;
+    public long l08337;
+    public long l08338;
+    public long l08339;
+    public long l08340;
+    public long l08341;
+    public long l08342;
+    public long l08343;
+    public long l08344;
+    public long l08345;
+    public long l08346;
+    public long l08347;
+    public long l08348;
+    public long l08349;
+    public long l08350;
+    public long l08351;
+    public long l08352;
+    public long l08353;
+    public long l08354;
+    public long l08355;
+    public long l08356;
+    public long l08357;
+    public long l08358;
+    public long l08359;
+    public long l08360;
+    public long l08361;
+    public long l08362;
+    public long l08363;
+    public long l08364;
+    public long l08365;
+    public long l08366;
+    public long l08367;
+    public long l08368;
+    public long l08369;
+    public long l08370;
+    public long l08371;
+    public long l08372;
+    public long l08373;
+    public long l08374;
+    public long l08375;
+    public long l08376;
+    public long l08377;
+    public long l08378;
+    public long l08379;
+    public long l08380;
+    public long l08381;
+    public long l08382;
+    public long l08383;
+    public long l08384;
+    public long l08385;
+    public long l08386;
+    public long l08387;
+    public long l08388;
+    public long l08389;
+    public long l08390;
+    public long l08391;
+    public long l08392;
+    public long l08393;
+    public long l08394;
+    public long l08395;
+    public long l08396;
+    public long l08397;
+    public long l08398;
+    public long l08399;
+    public long l08400;
+    public long l08401;
+    public long l08402;
+    public long l08403;
+    public long l08404;
+    public long l08405;
+    public long l08406;
+    public long l08407;
+    public long l08408;
+    public long l08409;
+    public long l08410;
+    public long l08411;
+    public long l08412;
+    public long l08413;
+    public long l08414;
+    public long l08415;
+    public long l08416;
+    public long l08417;
+    public long l08418;
+    public long l08419;
+    public long l08420;
+    public long l08421;
+    public long l08422;
+    public long l08423;
+    public long l08424;
+    public long l08425;
+    public long l08426;
+    public long l08427;
+    public long l08428;
+    public long l08429;
+    public long l08430;
+    public long l08431;
+    public long l08432;
+    public long l08433;
+    public long l08434;
+    public long l08435;
+    public long l08436;
+    public long l08437;
+    public long l08438;
+    public long l08439;
+    public long l08440;
+    public long l08441;
+    public long l08442;
+    public long l08443;
+    public long l08444;
+    public long l08445;
+    public long l08446;
+    public long l08447;
+    public long l08448;
+    public long l08449;
+    public long l08450;
+    public long l08451;
+    public long l08452;
+    public long l08453;
+    public long l08454;
+    public long l08455;
+    public long l08456;
+    public long l08457;
+    public long l08458;
+    public long l08459;
+    public long l08460;
+    public long l08461;
+    public long l08462;
+    public long l08463;
+    public long l08464;
+    public long l08465;
+    public long l08466;
+    public long l08467;
+    public long l08468;
+    public long l08469;
+    public long l08470;
+    public long l08471;
+    public long l08472;
+    public long l08473;
+    public long l08474;
+    public long l08475;
+    public long l08476;
+    public long l08477;
+    public long l08478;
+    public long l08479;
+    public long l08480;
+    public long l08481;
+    public long l08482;
+    public long l08483;
+    public long l08484;
+    public long l08485;
+    public long l08486;
+    public long l08487;
+    public long l08488;
+    public long l08489;
+    public long l08490;
+    public long l08491;
+    public long l08492;
+    public long l08493;
+    public long l08494;
+    public long l08495;
+    public long l08496;
+    public long l08497;
+    public long l08498;
+    public long l08499;
+    public long l08500;
+    public long l08501;
+    public long l08502;
+    public long l08503;
+    public long l08504;
+    public long l08505;
+    public long l08506;
+    public long l08507;
+    public long l08508;
+    public long l08509;
+    public long l08510;
+    public long l08511;
+    public long l08512;
+    public long l08513;
+    public long l08514;
+    public long l08515;
+    public long l08516;
+    public long l08517;
+    public long l08518;
+    public long l08519;
+    public long l08520;
+    public long l08521;
+    public long l08522;
+    public long l08523;
+    public long l08524;
+    public long l08525;
+    public long l08526;
+    public long l08527;
+    public long l08528;
+    public long l08529;
+    public long l08530;
+    public long l08531;
+    public long l08532;
+    public long l08533;
+    public long l08534;
+    public long l08535;
+    public long l08536;
+    public long l08537;
+    public long l08538;
+    public long l08539;
+    public long l08540;
+    public long l08541;
+    public long l08542;
+    public long l08543;
+    public long l08544;
+    public long l08545;
+    public long l08546;
+    public long l08547;
+    public long l08548;
+    public long l08549;
+    public long l08550;
+    public long l08551;
+    public long l08552;
+    public long l08553;
+    public long l08554;
+    public long l08555;
+    public long l08556;
+    public long l08557;
+    public long l08558;
+    public long l08559;
+    public long l08560;
+    public long l08561;
+    public long l08562;
+    public long l08563;
+    public long l08564;
+    public long l08565;
+    public long l08566;
+    public long l08567;
+    public long l08568;
+    public long l08569;
+    public long l08570;
+    public long l08571;
+    public long l08572;
+    public long l08573;
+    public long l08574;
+    public long l08575;
+    public long l08576;
+    public long l08577;
+    public long l08578;
+    public long l08579;
+    public long l08580;
+    public long l08581;
+    public long l08582;
+    public long l08583;
+    public long l08584;
+    public long l08585;
+    public long l08586;
+    public long l08587;
+    public long l08588;
+    public long l08589;
+    public long l08590;
+    public long l08591;
+    public long l08592;
+    public long l08593;
+    public long l08594;
+    public long l08595;
+    public long l08596;
+    public long l08597;
+    public long l08598;
+    public long l08599;
+    public long l08600;
+    public long l08601;
+    public long l08602;
+    public long l08603;
+    public long l08604;
+    public long l08605;
+    public long l08606;
+    public long l08607;
+    public long l08608;
+    public long l08609;
+    public long l08610;
+    public long l08611;
+    public long l08612;
+    public long l08613;
+    public long l08614;
+    public long l08615;
+    public long l08616;
+    public long l08617;
+    public long l08618;
+    public long l08619;
+    public long l08620;
+    public long l08621;
+    public long l08622;
+    public long l08623;
+    public long l08624;
+    public long l08625;
+    public long l08626;
+    public long l08627;
+    public long l08628;
+    public long l08629;
+    public long l08630;
+    public long l08631;
+    public long l08632;
+    public long l08633;
+    public long l08634;
+    public long l08635;
+    public long l08636;
+    public long l08637;
+    public long l08638;
+    public long l08639;
+    public long l08640;
+    public long l08641;
+    public long l08642;
+    public long l08643;
+    public long l08644;
+    public long l08645;
+    public long l08646;
+    public long l08647;
+    public long l08648;
+    public long l08649;
+    public long l08650;
+    public long l08651;
+    public long l08652;
+    public long l08653;
+    public long l08654;
+    public long l08655;
+    public long l08656;
+    public long l08657;
+    public long l08658;
+    public long l08659;
+    public long l08660;
+    public long l08661;
+    public long l08662;
+    public long l08663;
+    public long l08664;
+    public long l08665;
+    public long l08666;
+    public long l08667;
+    public long l08668;
+    public long l08669;
+    public long l08670;
+    public long l08671;
+    public long l08672;
+    public long l08673;
+    public long l08674;
+    public long l08675;
+    public long l08676;
+    public long l08677;
+    public long l08678;
+    public long l08679;
+    public long l08680;
+    public long l08681;
+    public long l08682;
+    public long l08683;
+    public long l08684;
+    public long l08685;
+    public long l08686;
+    public long l08687;
+    public long l08688;
+    public long l08689;
+    public long l08690;
+    public long l08691;
+    public long l08692;
+    public long l08693;
+    public long l08694;
+    public long l08695;
+    public long l08696;
+    public long l08697;
+    public long l08698;
+    public long l08699;
+    public long l08700;
+    public long l08701;
+    public long l08702;
+    public long l08703;
+    public long l08704;
+    public long l08705;
+    public long l08706;
+    public long l08707;
+    public long l08708;
+    public long l08709;
+    public long l08710;
+    public long l08711;
+    public long l08712;
+    public long l08713;
+    public long l08714;
+    public long l08715;
+    public long l08716;
+    public long l08717;
+    public long l08718;
+    public long l08719;
+    public long l08720;
+    public long l08721;
+    public long l08722;
+    public long l08723;
+    public long l08724;
+    public long l08725;
+    public long l08726;
+    public long l08727;
+    public long l08728;
+    public long l08729;
+    public long l08730;
+    public long l08731;
+    public long l08732;
+    public long l08733;
+    public long l08734;
+    public long l08735;
+    public long l08736;
+    public long l08737;
+    public long l08738;
+    public long l08739;
+    public long l08740;
+    public long l08741;
+    public long l08742;
+    public long l08743;
+    public long l08744;
+    public long l08745;
+    public long l08746;
+    public long l08747;
+    public long l08748;
+    public long l08749;
+    public long l08750;
+    public long l08751;
+    public long l08752;
+    public long l08753;
+    public long l08754;
+    public long l08755;
+    public long l08756;
+    public long l08757;
+    public long l08758;
+    public long l08759;
+    public long l08760;
+    public long l08761;
+    public long l08762;
+    public long l08763;
+    public long l08764;
+    public long l08765;
+    public long l08766;
+    public long l08767;
+    public long l08768;
+    public long l08769;
+    public long l08770;
+    public long l08771;
+    public long l08772;
+    public long l08773;
+    public long l08774;
+    public long l08775;
+    public long l08776;
+    public long l08777;
+    public long l08778;
+    public long l08779;
+    public long l08780;
+    public long l08781;
+    public long l08782;
+    public long l08783;
+    public long l08784;
+    public long l08785;
+    public long l08786;
+    public long l08787;
+    public long l08788;
+    public long l08789;
+    public long l08790;
+    public long l08791;
+    public long l08792;
+    public long l08793;
+    public long l08794;
+    public long l08795;
+    public long l08796;
+    public long l08797;
+    public long l08798;
+    public long l08799;
+    public long l08800;
+    public long l08801;
+    public long l08802;
+    public long l08803;
+    public long l08804;
+    public long l08805;
+    public long l08806;
+    public long l08807;
+    public long l08808;
+    public long l08809;
+    public long l08810;
+    public long l08811;
+    public long l08812;
+    public long l08813;
+    public long l08814;
+    public long l08815;
+    public long l08816;
+    public long l08817;
+    public long l08818;
+    public long l08819;
+    public long l08820;
+    public long l08821;
+    public long l08822;
+    public long l08823;
+    public long l08824;
+    public long l08825;
+    public long l08826;
+    public long l08827;
+    public long l08828;
+    public long l08829;
+    public long l08830;
+    public long l08831;
+    public long l08832;
+    public long l08833;
+    public long l08834;
+    public long l08835;
+    public long l08836;
+    public long l08837;
+    public long l08838;
+    public long l08839;
+    public long l08840;
+    public long l08841;
+    public long l08842;
+    public long l08843;
+    public long l08844;
+    public long l08845;
+    public long l08846;
+    public long l08847;
+    public long l08848;
+    public long l08849;
+    public long l08850;
+    public long l08851;
+    public long l08852;
+    public long l08853;
+    public long l08854;
+    public long l08855;
+    public long l08856;
+    public long l08857;
+    public long l08858;
+    public long l08859;
+    public long l08860;
+    public long l08861;
+    public long l08862;
+    public long l08863;
+    public long l08864;
+    public long l08865;
+    public long l08866;
+    public long l08867;
+    public long l08868;
+    public long l08869;
+    public long l08870;
+    public long l08871;
+    public long l08872;
+    public long l08873;
+    public long l08874;
+    public long l08875;
+    public long l08876;
+    public long l08877;
+    public long l08878;
+    public long l08879;
+    public long l08880;
+    public long l08881;
+    public long l08882;
+    public long l08883;
+    public long l08884;
+    public long l08885;
+    public long l08886;
+    public long l08887;
+    public long l08888;
+    public long l08889;
+    public long l08890;
+    public long l08891;
+    public long l08892;
+    public long l08893;
+    public long l08894;
+    public long l08895;
+    public long l08896;
+    public long l08897;
+    public long l08898;
+    public long l08899;
+    public long l08900;
+    public long l08901;
+    public long l08902;
+    public long l08903;
+    public long l08904;
+    public long l08905;
+    public long l08906;
+    public long l08907;
+    public long l08908;
+    public long l08909;
+    public long l08910;
+    public long l08911;
+    public long l08912;
+    public long l08913;
+    public long l08914;
+    public long l08915;
+    public long l08916;
+    public long l08917;
+    public long l08918;
+    public long l08919;
+    public long l08920;
+    public long l08921;
+    public long l08922;
+    public long l08923;
+    public long l08924;
+    public long l08925;
+    public long l08926;
+    public long l08927;
+    public long l08928;
+    public long l08929;
+    public long l08930;
+    public long l08931;
+    public long l08932;
+    public long l08933;
+    public long l08934;
+    public long l08935;
+    public long l08936;
+    public long l08937;
+    public long l08938;
+    public long l08939;
+    public long l08940;
+    public long l08941;
+    public long l08942;
+    public long l08943;
+    public long l08944;
+    public long l08945;
+    public long l08946;
+    public long l08947;
+    public long l08948;
+    public long l08949;
+    public long l08950;
+    public long l08951;
+    public long l08952;
+    public long l08953;
+    public long l08954;
+    public long l08955;
+    public long l08956;
+    public long l08957;
+    public long l08958;
+    public long l08959;
+    public long l08960;
+    public long l08961;
+    public long l08962;
+    public long l08963;
+    public long l08964;
+    public long l08965;
+    public long l08966;
+    public long l08967;
+    public long l08968;
+    public long l08969;
+    public long l08970;
+    public long l08971;
+    public long l08972;
+    public long l08973;
+    public long l08974;
+    public long l08975;
+    public long l08976;
+    public long l08977;
+    public long l08978;
+    public long l08979;
+    public long l08980;
+    public long l08981;
+    public long l08982;
+    public long l08983;
+    public long l08984;
+    public long l08985;
+    public long l08986;
+    public long l08987;
+    public long l08988;
+    public long l08989;
+    public long l08990;
+    public long l08991;
+    public long l08992;
+    public long l08993;
+    public long l08994;
+    public long l08995;
+    public long l08996;
+    public long l08997;
+    public long l08998;
+    public long l08999;
+    public long l09000;
+    public long l09001;
+    public long l09002;
+    public long l09003;
+    public long l09004;
+    public long l09005;
+    public long l09006;
+    public long l09007;
+    public long l09008;
+    public long l09009;
+    public long l09010;
+    public long l09011;
+    public long l09012;
+    public long l09013;
+    public long l09014;
+    public long l09015;
+    public long l09016;
+    public long l09017;
+    public long l09018;
+    public long l09019;
+    public long l09020;
+    public long l09021;
+    public long l09022;
+    public long l09023;
+    public long l09024;
+    public long l09025;
+    public long l09026;
+    public long l09027;
+    public long l09028;
+    public long l09029;
+    public long l09030;
+    public long l09031;
+    public long l09032;
+    public long l09033;
+    public long l09034;
+    public long l09035;
+    public long l09036;
+    public long l09037;
+    public long l09038;
+    public long l09039;
+    public long l09040;
+    public long l09041;
+    public long l09042;
+    public long l09043;
+    public long l09044;
+    public long l09045;
+    public long l09046;
+    public long l09047;
+    public long l09048;
+    public long l09049;
+    public long l09050;
+    public long l09051;
+    public long l09052;
+    public long l09053;
+    public long l09054;
+    public long l09055;
+    public long l09056;
+    public long l09057;
+    public long l09058;
+    public long l09059;
+    public long l09060;
+    public long l09061;
+    public long l09062;
+    public long l09063;
+    public long l09064;
+    public long l09065;
+    public long l09066;
+    public long l09067;
+    public long l09068;
+    public long l09069;
+    public long l09070;
+    public long l09071;
+    public long l09072;
+    public long l09073;
+    public long l09074;
+    public long l09075;
+    public long l09076;
+    public long l09077;
+    public long l09078;
+    public long l09079;
+    public long l09080;
+    public long l09081;
+    public long l09082;
+    public long l09083;
+    public long l09084;
+    public long l09085;
+    public long l09086;
+    public long l09087;
+    public long l09088;
+    public long l09089;
+    public long l09090;
+    public long l09091;
+    public long l09092;
+    public long l09093;
+    public long l09094;
+    public long l09095;
+    public long l09096;
+    public long l09097;
+    public long l09098;
+    public long l09099;
+    public long l09100;
+    public long l09101;
+    public long l09102;
+    public long l09103;
+    public long l09104;
+    public long l09105;
+    public long l09106;
+    public long l09107;
+    public long l09108;
+    public long l09109;
+    public long l09110;
+    public long l09111;
+    public long l09112;
+    public long l09113;
+    public long l09114;
+    public long l09115;
+    public long l09116;
+    public long l09117;
+    public long l09118;
+    public long l09119;
+    public long l09120;
+    public long l09121;
+    public long l09122;
+    public long l09123;
+    public long l09124;
+    public long l09125;
+    public long l09126;
+    public long l09127;
+    public long l09128;
+    public long l09129;
+    public long l09130;
+    public long l09131;
+    public long l09132;
+    public long l09133;
+    public long l09134;
+    public long l09135;
+    public long l09136;
+    public long l09137;
+    public long l09138;
+    public long l09139;
+    public long l09140;
+    public long l09141;
+    public long l09142;
+    public long l09143;
+    public long l09144;
+    public long l09145;
+    public long l09146;
+    public long l09147;
+    public long l09148;
+    public long l09149;
+    public long l09150;
+    public long l09151;
+    public long l09152;
+    public long l09153;
+    public long l09154;
+    public long l09155;
+    public long l09156;
+    public long l09157;
+    public long l09158;
+    public long l09159;
+    public long l09160;
+    public long l09161;
+    public long l09162;
+    public long l09163;
+    public long l09164;
+    public long l09165;
+    public long l09166;
+    public long l09167;
+    public long l09168;
+    public long l09169;
+    public long l09170;
+    public long l09171;
+    public long l09172;
+    public long l09173;
+    public long l09174;
+    public long l09175;
+    public long l09176;
+    public long l09177;
+    public long l09178;
+    public long l09179;
+    public long l09180;
+    public long l09181;
+    public long l09182;
+    public long l09183;
+    public long l09184;
+    public long l09185;
+    public long l09186;
+    public long l09187;
+    public long l09188;
+    public long l09189;
+    public long l09190;
+    public long l09191;
+    public long l09192;
+    public long l09193;
+    public long l09194;
+    public long l09195;
+    public long l09196;
+    public long l09197;
+    public long l09198;
+    public long l09199;
+    public long l09200;
+    public long l09201;
+    public long l09202;
+    public long l09203;
+    public long l09204;
+    public long l09205;
+    public long l09206;
+    public long l09207;
+    public long l09208;
+    public long l09209;
+    public long l09210;
+    public long l09211;
+    public long l09212;
+    public long l09213;
+    public long l09214;
+    public long l09215;
+    public long l09216;
+    public long l09217;
+    public long l09218;
+    public long l09219;
+    public long l09220;
+    public long l09221;
+    public long l09222;
+    public long l09223;
+    public long l09224;
+    public long l09225;
+    public long l09226;
+    public long l09227;
+    public long l09228;
+    public long l09229;
+    public long l09230;
+    public long l09231;
+    public long l09232;
+    public long l09233;
+    public long l09234;
+    public long l09235;
+    public long l09236;
+    public long l09237;
+    public long l09238;
+    public long l09239;
+    public long l09240;
+    public long l09241;
+    public long l09242;
+    public long l09243;
+    public long l09244;
+    public long l09245;
+    public long l09246;
+    public long l09247;
+    public long l09248;
+    public long l09249;
+    public long l09250;
+    public long l09251;
+    public long l09252;
+    public long l09253;
+    public long l09254;
+    public long l09255;
+    public long l09256;
+    public long l09257;
+    public long l09258;
+    public long l09259;
+    public long l09260;
+    public long l09261;
+    public long l09262;
+    public long l09263;
+    public long l09264;
+    public long l09265;
+    public long l09266;
+    public long l09267;
+    public long l09268;
+    public long l09269;
+    public long l09270;
+    public long l09271;
+    public long l09272;
+    public long l09273;
+    public long l09274;
+    public long l09275;
+    public long l09276;
+    public long l09277;
+    public long l09278;
+    public long l09279;
+    public long l09280;
+    public long l09281;
+    public long l09282;
+    public long l09283;
+    public long l09284;
+    public long l09285;
+    public long l09286;
+    public long l09287;
+    public long l09288;
+    public long l09289;
+    public long l09290;
+    public long l09291;
+    public long l09292;
+    public long l09293;
+    public long l09294;
+    public long l09295;
+    public long l09296;
+    public long l09297;
+    public long l09298;
+    public long l09299;
+    public long l09300;
+    public long l09301;
+    public long l09302;
+    public long l09303;
+    public long l09304;
+    public long l09305;
+    public long l09306;
+    public long l09307;
+    public long l09308;
+    public long l09309;
+    public long l09310;
+    public long l09311;
+    public long l09312;
+    public long l09313;
+    public long l09314;
+    public long l09315;
+    public long l09316;
+    public long l09317;
+    public long l09318;
+    public long l09319;
+    public long l09320;
+    public long l09321;
+    public long l09322;
+    public long l09323;
+    public long l09324;
+    public long l09325;
+    public long l09326;
+    public long l09327;
+    public long l09328;
+    public long l09329;
+    public long l09330;
+    public long l09331;
+    public long l09332;
+    public long l09333;
+    public long l09334;
+    public long l09335;
+    public long l09336;
+    public long l09337;
+    public long l09338;
+    public long l09339;
+    public long l09340;
+    public long l09341;
+    public long l09342;
+    public long l09343;
+    public long l09344;
+    public long l09345;
+    public long l09346;
+    public long l09347;
+    public long l09348;
+    public long l09349;
+    public long l09350;
+    public long l09351;
+    public long l09352;
+    public long l09353;
+    public long l09354;
+    public long l09355;
+    public long l09356;
+    public long l09357;
+    public long l09358;
+    public long l09359;
+    public long l09360;
+    public long l09361;
+    public long l09362;
+    public long l09363;
+    public long l09364;
+    public long l09365;
+    public long l09366;
+    public long l09367;
+    public long l09368;
+    public long l09369;
+    public long l09370;
+    public long l09371;
+    public long l09372;
+    public long l09373;
+    public long l09374;
+    public long l09375;
+    public long l09376;
+    public long l09377;
+    public long l09378;
+    public long l09379;
+    public long l09380;
+    public long l09381;
+    public long l09382;
+    public long l09383;
+    public long l09384;
+    public long l09385;
+    public long l09386;
+    public long l09387;
+    public long l09388;
+    public long l09389;
+    public long l09390;
+    public long l09391;
+    public long l09392;
+    public long l09393;
+    public long l09394;
+    public long l09395;
+    public long l09396;
+    public long l09397;
+    public long l09398;
+    public long l09399;
+    public long l09400;
+    public long l09401;
+    public long l09402;
+    public long l09403;
+    public long l09404;
+    public long l09405;
+    public long l09406;
+    public long l09407;
+    public long l09408;
+    public long l09409;
+    public long l09410;
+    public long l09411;
+    public long l09412;
+    public long l09413;
+    public long l09414;
+    public long l09415;
+    public long l09416;
+    public long l09417;
+    public long l09418;
+    public long l09419;
+    public long l09420;
+    public long l09421;
+    public long l09422;
+    public long l09423;
+    public long l09424;
+    public long l09425;
+    public long l09426;
+    public long l09427;
+    public long l09428;
+    public long l09429;
+    public long l09430;
+    public long l09431;
+    public long l09432;
+    public long l09433;
+    public long l09434;
+    public long l09435;
+    public long l09436;
+    public long l09437;
+    public long l09438;
+    public long l09439;
+    public long l09440;
+    public long l09441;
+    public long l09442;
+    public long l09443;
+    public long l09444;
+    public long l09445;
+    public long l09446;
+    public long l09447;
+    public long l09448;
+    public long l09449;
+    public long l09450;
+    public long l09451;
+    public long l09452;
+    public long l09453;
+    public long l09454;
+    public long l09455;
+    public long l09456;
+    public long l09457;
+    public long l09458;
+    public long l09459;
+    public long l09460;
+    public long l09461;
+    public long l09462;
+    public long l09463;
+    public long l09464;
+    public long l09465;
+    public long l09466;
+    public long l09467;
+    public long l09468;
+    public long l09469;
+    public long l09470;
+    public long l09471;
+    public long l09472;
+    public long l09473;
+    public long l09474;
+    public long l09475;
+    public long l09476;
+    public long l09477;
+    public long l09478;
+    public long l09479;
+    public long l09480;
+    public long l09481;
+    public long l09482;
+    public long l09483;
+    public long l09484;
+    public long l09485;
+    public long l09486;
+    public long l09487;
+    public long l09488;
+    public long l09489;
+    public long l09490;
+    public long l09491;
+    public long l09492;
+    public long l09493;
+    public long l09494;
+    public long l09495;
+    public long l09496;
+    public long l09497;
+    public long l09498;
+    public long l09499;
+    public long l09500;
+    public long l09501;
+    public long l09502;
+    public long l09503;
+    public long l09504;
+    public long l09505;
+    public long l09506;
+    public long l09507;
+    public long l09508;
+    public long l09509;
+    public long l09510;
+    public long l09511;
+    public long l09512;
+    public long l09513;
+    public long l09514;
+    public long l09515;
+    public long l09516;
+    public long l09517;
+    public long l09518;
+    public long l09519;
+    public long l09520;
+    public long l09521;
+    public long l09522;
+    public long l09523;
+    public long l09524;
+    public long l09525;
+    public long l09526;
+    public long l09527;
+    public long l09528;
+    public long l09529;
+    public long l09530;
+    public long l09531;
+    public long l09532;
+    public long l09533;
+    public long l09534;
+    public long l09535;
+    public long l09536;
+    public long l09537;
+    public long l09538;
+    public long l09539;
+    public long l09540;
+    public long l09541;
+    public long l09542;
+    public long l09543;
+    public long l09544;
+    public long l09545;
+    public long l09546;
+    public long l09547;
+    public long l09548;
+    public long l09549;
+    public long l09550;
+    public long l09551;
+    public long l09552;
+    public long l09553;
+    public long l09554;
+    public long l09555;
+    public long l09556;
+    public long l09557;
+    public long l09558;
+    public long l09559;
+    public long l09560;
+    public long l09561;
+    public long l09562;
+    public long l09563;
+    public long l09564;
+    public long l09565;
+    public long l09566;
+    public long l09567;
+    public long l09568;
+    public long l09569;
+    public long l09570;
+    public long l09571;
+    public long l09572;
+    public long l09573;
+    public long l09574;
+    public long l09575;
+    public long l09576;
+    public long l09577;
+    public long l09578;
+    public long l09579;
+    public long l09580;
+    public long l09581;
+    public long l09582;
+    public long l09583;
+    public long l09584;
+    public long l09585;
+    public long l09586;
+    public long l09587;
+    public long l09588;
+    public long l09589;
+    public long l09590;
+    public long l09591;
+    public long l09592;
+    public long l09593;
+    public long l09594;
+    public long l09595;
+    public long l09596;
+    public long l09597;
+    public long l09598;
+    public long l09599;
+    public long l09600;
+    public long l09601;
+    public long l09602;
+    public long l09603;
+    public long l09604;
+    public long l09605;
+    public long l09606;
+    public long l09607;
+    public long l09608;
+    public long l09609;
+    public long l09610;
+    public long l09611;
+    public long l09612;
+    public long l09613;
+    public long l09614;
+    public long l09615;
+    public long l09616;
+    public long l09617;
+    public long l09618;
+    public long l09619;
+    public long l09620;
+    public long l09621;
+    public long l09622;
+    public long l09623;
+    public long l09624;
+    public long l09625;
+    public long l09626;
+    public long l09627;
+    public long l09628;
+    public long l09629;
+    public long l09630;
+    public long l09631;
+    public long l09632;
+    public long l09633;
+    public long l09634;
+    public long l09635;
+    public long l09636;
+    public long l09637;
+    public long l09638;
+    public long l09639;
+    public long l09640;
+    public long l09641;
+    public long l09642;
+    public long l09643;
+    public long l09644;
+    public long l09645;
+    public long l09646;
+    public long l09647;
+    public long l09648;
+    public long l09649;
+    public long l09650;
+    public long l09651;
+    public long l09652;
+    public long l09653;
+    public long l09654;
+    public long l09655;
+    public long l09656;
+    public long l09657;
+    public long l09658;
+    public long l09659;
+    public long l09660;
+    public long l09661;
+    public long l09662;
+    public long l09663;
+    public long l09664;
+    public long l09665;
+    public long l09666;
+    public long l09667;
+    public long l09668;
+    public long l09669;
+    public long l09670;
+    public long l09671;
+    public long l09672;
+    public long l09673;
+    public long l09674;
+    public long l09675;
+    public long l09676;
+    public long l09677;
+    public long l09678;
+    public long l09679;
+    public long l09680;
+    public long l09681;
+    public long l09682;
+    public long l09683;
+    public long l09684;
+    public long l09685;
+    public long l09686;
+    public long l09687;
+    public long l09688;
+    public long l09689;
+    public long l09690;
+    public long l09691;
+    public long l09692;
+    public long l09693;
+    public long l09694;
+    public long l09695;
+    public long l09696;
+    public long l09697;
+    public long l09698;
+    public long l09699;
+    public long l09700;
+    public long l09701;
+    public long l09702;
+    public long l09703;
+    public long l09704;
+    public long l09705;
+    public long l09706;
+    public long l09707;
+    public long l09708;
+    public long l09709;
+    public long l09710;
+    public long l09711;
+    public long l09712;
+    public long l09713;
+    public long l09714;
+    public long l09715;
+    public long l09716;
+    public long l09717;
+    public long l09718;
+    public long l09719;
+    public long l09720;
+    public long l09721;
+    public long l09722;
+    public long l09723;
+    public long l09724;
+    public long l09725;
+    public long l09726;
+    public long l09727;
+    public long l09728;
+    public long l09729;
+    public long l09730;
+    public long l09731;
+    public long l09732;
+    public long l09733;
+    public long l09734;
+    public long l09735;
+    public long l09736;
+    public long l09737;
+    public long l09738;
+    public long l09739;
+    public long l09740;
+    public long l09741;
+    public long l09742;
+    public long l09743;
+    public long l09744;
+    public long l09745;
+    public long l09746;
+    public long l09747;
+    public long l09748;
+    public long l09749;
+    public long l09750;
+    public long l09751;
+    public long l09752;
+    public long l09753;
+    public long l09754;
+    public long l09755;
+    public long l09756;
+    public long l09757;
+    public long l09758;
+    public long l09759;
+    public long l09760;
+    public long l09761;
+    public long l09762;
+    public long l09763;
+    public long l09764;
+    public long l09765;
+    public long l09766;
+    public long l09767;
+    public long l09768;
+    public long l09769;
+    public long l09770;
+    public long l09771;
+    public long l09772;
+    public long l09773;
+    public long l09774;
+    public long l09775;
+    public long l09776;
+    public long l09777;
+    public long l09778;
+    public long l09779;
+    public long l09780;
+    public long l09781;
+    public long l09782;
+    public long l09783;
+    public long l09784;
+    public long l09785;
+    public long l09786;
+    public long l09787;
+    public long l09788;
+    public long l09789;
+    public long l09790;
+    public long l09791;
+    public long l09792;
+    public long l09793;
+    public long l09794;
+    public long l09795;
+    public long l09796;
+    public long l09797;
+    public long l09798;
+    public long l09799;
+    public long l09800;
+    public long l09801;
+    public long l09802;
+    public long l09803;
+    public long l09804;
+    public long l09805;
+    public long l09806;
+    public long l09807;
+    public long l09808;
+    public long l09809;
+    public long l09810;
+    public long l09811;
+    public long l09812;
+    public long l09813;
+    public long l09814;
+    public long l09815;
+    public long l09816;
+    public long l09817;
+    public long l09818;
+    public long l09819;
+    public long l09820;
+    public long l09821;
+    public long l09822;
+    public long l09823;
+    public long l09824;
+    public long l09825;
+    public long l09826;
+    public long l09827;
+    public long l09828;
+    public long l09829;
+    public long l09830;
+    public long l09831;
+    public long l09832;
+    public long l09833;
+    public long l09834;
+    public long l09835;
+    public long l09836;
+    public long l09837;
+    public long l09838;
+    public long l09839;
+    public long l09840;
+    public long l09841;
+    public long l09842;
+    public long l09843;
+    public long l09844;
+    public long l09845;
+    public long l09846;
+    public long l09847;
+    public long l09848;
+    public long l09849;
+    public long l09850;
+    public long l09851;
+    public long l09852;
+    public long l09853;
+    public long l09854;
+    public long l09855;
+    public long l09856;
+    public long l09857;
+    public long l09858;
+    public long l09859;
+    public long l09860;
+    public long l09861;
+    public long l09862;
+    public long l09863;
+    public long l09864;
+    public long l09865;
+    public long l09866;
+    public long l09867;
+    public long l09868;
+    public long l09869;
+    public long l09870;
+    public long l09871;
+    public long l09872;
+    public long l09873;
+    public long l09874;
+    public long l09875;
+    public long l09876;
+    public long l09877;
+    public long l09878;
+    public long l09879;
+    public long l09880;
+    public long l09881;
+    public long l09882;
+    public long l09883;
+    public long l09884;
+    public long l09885;
+    public long l09886;
+    public long l09887;
+    public long l09888;
+    public long l09889;
+    public long l09890;
+    public long l09891;
+    public long l09892;
+    public long l09893;
+    public long l09894;
+    public long l09895;
+    public long l09896;
+    public long l09897;
+    public long l09898;
+    public long l09899;
+    public long l09900;
+    public long l09901;
+    public long l09902;
+    public long l09903;
+    public long l09904;
+    public long l09905;
+    public long l09906;
+    public long l09907;
+    public long l09908;
+    public long l09909;
+    public long l09910;
+    public long l09911;
+    public long l09912;
+    public long l09913;
+    public long l09914;
+    public long l09915;
+    public long l09916;
+    public long l09917;
+    public long l09918;
+    public long l09919;
+    public long l09920;
+    public long l09921;
+    public long l09922;
+    public long l09923;
+    public long l09924;
+    public long l09925;
+    public long l09926;
+    public long l09927;
+    public long l09928;
+    public long l09929;
+    public long l09930;
+    public long l09931;
+    public long l09932;
+    public long l09933;
+    public long l09934;
+    public long l09935;
+    public long l09936;
+    public long l09937;
+    public long l09938;
+    public long l09939;
+    public long l09940;
+    public long l09941;
+    public long l09942;
+    public long l09943;
+    public long l09944;
+    public long l09945;
+    public long l09946;
+    public long l09947;
+    public long l09948;
+    public long l09949;
+    public long l09950;
+    public long l09951;
+    public long l09952;
+    public long l09953;
+    public long l09954;
+    public long l09955;
+    public long l09956;
+    public long l09957;
+    public long l09958;
+    public long l09959;
+    public long l09960;
+    public long l09961;
+    public long l09962;
+    public long l09963;
+    public long l09964;
+    public long l09965;
+    public long l09966;
+    public long l09967;
+    public long l09968;
+    public long l09969;
+    public long l09970;
+    public long l09971;
+    public long l09972;
+    public long l09973;
+    public long l09974;
+    public long l09975;
+    public long l09976;
+    public long l09977;
+    public long l09978;
+    public long l09979;
+    public long l09980;
+    public long l09981;
+    public long l09982;
+    public long l09983;
+    public long l09984;
+    public long l09985;
+    public long l09986;
+    public long l09987;
+    public long l09988;
+    public long l09989;
+    public long l09990;
+    public long l09991;
+    public long l09992;
+    public long l09993;
+    public long l09994;
+    public long l09995;
+    public long l09996;
+    public long l09997;
+    public long l09998;
+    public long l09999;
+    public long l10000;
+    public long l10001;
+    public long l10002;
+    public long l10003;
+    public long l10004;
+    public long l10005;
+    public long l10006;
+    public long l10007;
+    public long l10008;
+    public long l10009;
+    public long l10010;
+    public long l10011;
+    public long l10012;
+    public long l10013;
+    public long l10014;
+    public long l10015;
+    public long l10016;
+    public long l10017;
+    public long l10018;
+    public long l10019;
+    public long l10020;
+    public long l10021;
+    public long l10022;
+    public long l10023;
+    public long l10024;
+    public long l10025;
+    public long l10026;
+    public long l10027;
+    public long l10028;
+    public long l10029;
+    public long l10030;
+    public long l10031;
+    public long l10032;
+    public long l10033;
+    public long l10034;
+    public long l10035;
+    public long l10036;
+    public long l10037;
+    public long l10038;
+    public long l10039;
+    public long l10040;
+    public long l10041;
+    public long l10042;
+    public long l10043;
+    public long l10044;
+    public long l10045;
+    public long l10046;
+    public long l10047;
+    public long l10048;
+    public long l10049;
+    public long l10050;
+    public long l10051;
+    public long l10052;
+    public long l10053;
+    public long l10054;
+    public long l10055;
+    public long l10056;
+    public long l10057;
+    public long l10058;
+    public long l10059;
+    public long l10060;
+    public long l10061;
+    public long l10062;
+    public long l10063;
+    public long l10064;
+    public long l10065;
+    public long l10066;
+    public long l10067;
+    public long l10068;
+    public long l10069;
+    public long l10070;
+    public long l10071;
+    public long l10072;
+    public long l10073;
+    public long l10074;
+    public long l10075;
+    public long l10076;
+    public long l10077;
+    public long l10078;
+    public long l10079;
+    public long l10080;
+    public long l10081;
+    public long l10082;
+    public long l10083;
+    public long l10084;
+    public long l10085;
+    public long l10086;
+    public long l10087;
+    public long l10088;
+    public long l10089;
+    public long l10090;
+    public long l10091;
+    public long l10092;
+    public long l10093;
+    public long l10094;
+    public long l10095;
+    public long l10096;
+    public long l10097;
+    public long l10098;
+    public long l10099;
+    public long l10100;
+    public long l10101;
+    public long l10102;
+    public long l10103;
+    public long l10104;
+    public long l10105;
+    public long l10106;
+    public long l10107;
+    public long l10108;
+    public long l10109;
+    public long l10110;
+    public long l10111;
+    public long l10112;
+    public long l10113;
+    public long l10114;
+    public long l10115;
+    public long l10116;
+    public long l10117;
+    public long l10118;
+    public long l10119;
+    public long l10120;
+    public long l10121;
+    public long l10122;
+    public long l10123;
+    public long l10124;
+    public long l10125;
+    public long l10126;
+    public long l10127;
+    public long l10128;
+    public long l10129;
+    public long l10130;
+    public long l10131;
+    public long l10132;
+    public long l10133;
+    public long l10134;
+    public long l10135;
+    public long l10136;
+    public long l10137;
+    public long l10138;
+    public long l10139;
+    public long l10140;
+    public long l10141;
+    public long l10142;
+    public long l10143;
+    public long l10144;
+    public long l10145;
+    public long l10146;
+    public long l10147;
+    public long l10148;
+    public long l10149;
+    public long l10150;
+    public long l10151;
+    public long l10152;
+    public long l10153;
+    public long l10154;
+    public long l10155;
+    public long l10156;
+    public long l10157;
+    public long l10158;
+    public long l10159;
+    public long l10160;
+    public long l10161;
+    public long l10162;
+    public long l10163;
+    public long l10164;
+    public long l10165;
+    public long l10166;
+    public long l10167;
+    public long l10168;
+    public long l10169;
+    public long l10170;
+    public long l10171;
+    public long l10172;
+    public long l10173;
+    public long l10174;
+    public long l10175;
+    public long l10176;
+    public long l10177;
+    public long l10178;
+    public long l10179;
+    public long l10180;
+    public long l10181;
+    public long l10182;
+    public long l10183;
+    public long l10184;
+    public long l10185;
+    public long l10186;
+    public long l10187;
+    public long l10188;
+    public long l10189;
+    public long l10190;
+    public long l10191;
+    public long l10192;
+    public long l10193;
+    public long l10194;
+    public long l10195;
+    public long l10196;
+    public long l10197;
+    public long l10198;
+    public long l10199;
+    public long l10200;
+    public long l10201;
+    public long l10202;
+    public long l10203;
+    public long l10204;
+    public long l10205;
+    public long l10206;
+    public long l10207;
+    public long l10208;
+    public long l10209;
+    public long l10210;
+    public long l10211;
+    public long l10212;
+    public long l10213;
+    public long l10214;
+    public long l10215;
+    public long l10216;
+    public long l10217;
+    public long l10218;
+    public long l10219;
+    public long l10220;
+    public long l10221;
+    public long l10222;
+    public long l10223;
+    public long l10224;
+    public long l10225;
+    public long l10226;
+    public long l10227;
+    public long l10228;
+    public long l10229;
+    public long l10230;
+    public long l10231;
+    public long l10232;
+    public long l10233;
+    public long l10234;
+    public long l10235;
+    public long l10236;
+    public long l10237;
+    public long l10238;
+    public long l10239;
+    public long l10240;
+    public long l10241;
+    public long l10242;
+    public long l10243;
+    public long l10244;
+    public long l10245;
+    public long l10246;
+    public long l10247;
+    public long l10248;
+    public long l10249;
+    public long l10250;
+    public long l10251;
+    public long l10252;
+    public long l10253;
+    public long l10254;
+    public long l10255;
+    public long l10256;
+    public long l10257;
+    public long l10258;
+    public long l10259;
+    public long l10260;
+    public long l10261;
+    public long l10262;
+    public long l10263;
+    public long l10264;
+    public long l10265;
+    public long l10266;
+    public long l10267;
+    public long l10268;
+    public long l10269;
+    public long l10270;
+    public long l10271;
+    public long l10272;
+    public long l10273;
+    public long l10274;
+    public long l10275;
+    public long l10276;
+    public long l10277;
+    public long l10278;
+    public long l10279;
+    public long l10280;
+    public long l10281;
+    public long l10282;
+    public long l10283;
+    public long l10284;
+    public long l10285;
+    public long l10286;
+    public long l10287;
+    public long l10288;
+    public long l10289;
+    public long l10290;
+    public long l10291;
+    public long l10292;
+    public long l10293;
+    public long l10294;
+    public long l10295;
+    public long l10296;
+    public long l10297;
+    public long l10298;
+    public long l10299;
+    public long l10300;
+    public long l10301;
+    public long l10302;
+    public long l10303;
+    public long l10304;
+    public long l10305;
+    public long l10306;
+    public long l10307;
+    public long l10308;
+    public long l10309;
+    public long l10310;
+    public long l10311;
+    public long l10312;
+    public long l10313;
+    public long l10314;
+    public long l10315;
+    public long l10316;
+    public long l10317;
+    public long l10318;
+    public long l10319;
+    public long l10320;
+    public long l10321;
+    public long l10322;
+    public long l10323;
+    public long l10324;
+    public long l10325;
+    public long l10326;
+    public long l10327;
+    public long l10328;
+    public long l10329;
+    public long l10330;
+    public long l10331;
+    public long l10332;
+    public long l10333;
+    public long l10334;
+    public long l10335;
+    public long l10336;
+    public long l10337;
+    public long l10338;
+    public long l10339;
+    public long l10340;
+    public long l10341;
+    public long l10342;
+    public long l10343;
+    public long l10344;
+    public long l10345;
+    public long l10346;
+    public long l10347;
+    public long l10348;
+    public long l10349;
+    public long l10350;
+    public long l10351;
+    public long l10352;
+    public long l10353;
+    public long l10354;
+    public long l10355;
+    public long l10356;
+    public long l10357;
+    public long l10358;
+    public long l10359;
+    public long l10360;
+    public long l10361;
+    public long l10362;
+    public long l10363;
+    public long l10364;
+    public long l10365;
+    public long l10366;
+    public long l10367;
+    public long l10368;
+    public long l10369;
+    public long l10370;
+    public long l10371;
+    public long l10372;
+    public long l10373;
+    public long l10374;
+    public long l10375;
+    public long l10376;
+    public long l10377;
+    public long l10378;
+    public long l10379;
+    public long l10380;
+    public long l10381;
+    public long l10382;
+    public long l10383;
+    public long l10384;
+    public long l10385;
+    public long l10386;
+    public long l10387;
+    public long l10388;
+    public long l10389;
+    public long l10390;
+    public long l10391;
+    public long l10392;
+    public long l10393;
+    public long l10394;
+    public long l10395;
+    public long l10396;
+    public long l10397;
+    public long l10398;
+    public long l10399;
+    public long l10400;
+    public long l10401;
+    public long l10402;
+    public long l10403;
+    public long l10404;
+    public long l10405;
+    public long l10406;
+    public long l10407;
+    public long l10408;
+    public long l10409;
+    public long l10410;
+    public long l10411;
+    public long l10412;
+    public long l10413;
+    public long l10414;
+    public long l10415;
+    public long l10416;
+    public long l10417;
+    public long l10418;
+    public long l10419;
+    public long l10420;
+    public long l10421;
+    public long l10422;
+    public long l10423;
+    public long l10424;
+    public long l10425;
+    public long l10426;
+    public long l10427;
+    public long l10428;
+    public long l10429;
+    public long l10430;
+    public long l10431;
+    public long l10432;
+    public long l10433;
+    public long l10434;
+    public long l10435;
+    public long l10436;
+    public long l10437;
+    public long l10438;
+    public long l10439;
+    public long l10440;
+    public long l10441;
+    public long l10442;
+    public long l10443;
+    public long l10444;
+    public long l10445;
+    public long l10446;
+    public long l10447;
+    public long l10448;
+    public long l10449;
+    public long l10450;
+    public long l10451;
+    public long l10452;
+    public long l10453;
+    public long l10454;
+    public long l10455;
+    public long l10456;
+    public long l10457;
+    public long l10458;
+    public long l10459;
+    public long l10460;
+    public long l10461;
+    public long l10462;
+    public long l10463;
+    public long l10464;
+    public long l10465;
+    public long l10466;
+    public long l10467;
+    public long l10468;
+    public long l10469;
+    public long l10470;
+    public long l10471;
+    public long l10472;
+    public long l10473;
+    public long l10474;
+    public long l10475;
+    public long l10476;
+    public long l10477;
+    public long l10478;
+    public long l10479;
+    public long l10480;
+    public long l10481;
+    public long l10482;
+    public long l10483;
+    public long l10484;
+    public long l10485;
+    public long l10486;
+    public long l10487;
+    public long l10488;
+    public long l10489;
+    public long l10490;
+    public long l10491;
+    public long l10492;
+    public long l10493;
+    public long l10494;
+    public long l10495;
+    public long l10496;
+    public long l10497;
+    public long l10498;
+    public long l10499;
+    public long l10500;
+    public long l10501;
+    public long l10502;
+    public long l10503;
+    public long l10504;
+    public long l10505;
+    public long l10506;
+    public long l10507;
+    public long l10508;
+    public long l10509;
+    public long l10510;
+    public long l10511;
+    public long l10512;
+    public long l10513;
+    public long l10514;
+    public long l10515;
+    public long l10516;
+    public long l10517;
+    public long l10518;
+    public long l10519;
+    public long l10520;
+    public long l10521;
+    public long l10522;
+    public long l10523;
+    public long l10524;
+    public long l10525;
+    public long l10526;
+    public long l10527;
+    public long l10528;
+    public long l10529;
+    public long l10530;
+    public long l10531;
+    public long l10532;
+    public long l10533;
+    public long l10534;
+    public long l10535;
+    public long l10536;
+    public long l10537;
+    public long l10538;
+    public long l10539;
+    public long l10540;
+    public long l10541;
+    public long l10542;
+    public long l10543;
+    public long l10544;
+    public long l10545;
+    public long l10546;
+    public long l10547;
+    public long l10548;
+    public long l10549;
+    public long l10550;
+    public long l10551;
+    public long l10552;
+    public long l10553;
+    public long l10554;
+    public long l10555;
+    public long l10556;
+    public long l10557;
+    public long l10558;
+    public long l10559;
+    public long l10560;
+    public long l10561;
+    public long l10562;
+    public long l10563;
+    public long l10564;
+    public long l10565;
+    public long l10566;
+    public long l10567;
+    public long l10568;
+    public long l10569;
+    public long l10570;
+    public long l10571;
+    public long l10572;
+    public long l10573;
+    public long l10574;
+    public long l10575;
+    public long l10576;
+    public long l10577;
+    public long l10578;
+    public long l10579;
+    public long l10580;
+    public long l10581;
+    public long l10582;
+    public long l10583;
+    public long l10584;
+    public long l10585;
+    public long l10586;
+    public long l10587;
+    public long l10588;
+    public long l10589;
+    public long l10590;
+    public long l10591;
+    public long l10592;
+    public long l10593;
+    public long l10594;
+    public long l10595;
+    public long l10596;
+    public long l10597;
+    public long l10598;
+    public long l10599;
+    public long l10600;
+    public long l10601;
+    public long l10602;
+    public long l10603;
+    public long l10604;
+    public long l10605;
+    public long l10606;
+    public long l10607;
+    public long l10608;
+    public long l10609;
+    public long l10610;
+    public long l10611;
+    public long l10612;
+    public long l10613;
+    public long l10614;
+    public long l10615;
+    public long l10616;
+    public long l10617;
+    public long l10618;
+    public long l10619;
+    public long l10620;
+    public long l10621;
+    public long l10622;
+    public long l10623;
+    public long l10624;
+    public long l10625;
+    public long l10626;
+    public long l10627;
+    public long l10628;
+    public long l10629;
+    public long l10630;
+    public long l10631;
+    public long l10632;
+    public long l10633;
+    public long l10634;
+    public long l10635;
+    public long l10636;
+    public long l10637;
+    public long l10638;
+    public long l10639;
+    public long l10640;
+    public long l10641;
+    public long l10642;
+    public long l10643;
+    public long l10644;
+    public long l10645;
+    public long l10646;
+    public long l10647;
+    public long l10648;
+    public long l10649;
+    public long l10650;
+    public long l10651;
+    public long l10652;
+    public long l10653;
+    public long l10654;
+    public long l10655;
+    public long l10656;
+    public long l10657;
+    public long l10658;
+    public long l10659;
+    public long l10660;
+    public long l10661;
+    public long l10662;
+    public long l10663;
+    public long l10664;
+    public long l10665;
+    public long l10666;
+    public long l10667;
+    public long l10668;
+    public long l10669;
+    public long l10670;
+    public long l10671;
+    public long l10672;
+    public long l10673;
+    public long l10674;
+    public long l10675;
+    public long l10676;
+    public long l10677;
+    public long l10678;
+    public long l10679;
+    public long l10680;
+    public long l10681;
+    public long l10682;
+    public long l10683;
+    public long l10684;
+    public long l10685;
+    public long l10686;
+    public long l10687;
+    public long l10688;
+    public long l10689;
+    public long l10690;
+    public long l10691;
+    public long l10692;
+    public long l10693;
+    public long l10694;
+    public long l10695;
+    public long l10696;
+    public long l10697;
+    public long l10698;
+    public long l10699;
+    public long l10700;
+    public long l10701;
+    public long l10702;
+    public long l10703;
+    public long l10704;
+    public long l10705;
+    public long l10706;
+    public long l10707;
+    public long l10708;
+    public long l10709;
+    public long l10710;
+    public long l10711;
+    public long l10712;
+    public long l10713;
+    public long l10714;
+    public long l10715;
+    public long l10716;
+    public long l10717;
+    public long l10718;
+    public long l10719;
+    public long l10720;
+    public long l10721;
+    public long l10722;
+    public long l10723;
+    public long l10724;
+    public long l10725;
+    public long l10726;
+    public long l10727;
+    public long l10728;
+    public long l10729;
+    public long l10730;
+    public long l10731;
+    public long l10732;
+    public long l10733;
+    public long l10734;
+    public long l10735;
+    public long l10736;
+    public long l10737;
+    public long l10738;
+    public long l10739;
+    public long l10740;
+    public long l10741;
+    public long l10742;
+    public long l10743;
+    public long l10744;
+    public long l10745;
+    public long l10746;
+    public long l10747;
+    public long l10748;
+    public long l10749;
+    public long l10750;
+    public long l10751;
+    public long l10752;
+    public long l10753;
+    public long l10754;
+    public long l10755;
+    public long l10756;
+    public long l10757;
+    public long l10758;
+    public long l10759;
+    public long l10760;
+    public long l10761;
+    public long l10762;
+    public long l10763;
+    public long l10764;
+    public long l10765;
+    public long l10766;
+    public long l10767;
+    public long l10768;
+    public long l10769;
+    public long l10770;
+    public long l10771;
+    public long l10772;
+    public long l10773;
+    public long l10774;
+    public long l10775;
+    public long l10776;
+    public long l10777;
+    public long l10778;
+    public long l10779;
+    public long l10780;
+    public long l10781;
+    public long l10782;
+    public long l10783;
+    public long l10784;
+    public long l10785;
+    public long l10786;
+    public long l10787;
+    public long l10788;
+    public long l10789;
+    public long l10790;
+    public long l10791;
+    public long l10792;
+    public long l10793;
+    public long l10794;
+    public long l10795;
+    public long l10796;
+    public long l10797;
+    public long l10798;
+    public long l10799;
+    public long l10800;
+    public long l10801;
+    public long l10802;
+    public long l10803;
+    public long l10804;
+    public long l10805;
+    public long l10806;
+    public long l10807;
+    public long l10808;
+    public long l10809;
+    public long l10810;
+    public long l10811;
+    public long l10812;
+    public long l10813;
+    public long l10814;
+    public long l10815;
+    public long l10816;
+    public long l10817;
+    public long l10818;
+    public long l10819;
+    public long l10820;
+    public long l10821;
+    public long l10822;
+    public long l10823;
+    public long l10824;
+    public long l10825;
+    public long l10826;
+    public long l10827;
+    public long l10828;
+    public long l10829;
+    public long l10830;
+    public long l10831;
+    public long l10832;
+    public long l10833;
+    public long l10834;
+    public long l10835;
+    public long l10836;
+    public long l10837;
+    public long l10838;
+    public long l10839;
+    public long l10840;
+    public long l10841;
+    public long l10842;
+    public long l10843;
+    public long l10844;
+    public long l10845;
+    public long l10846;
+    public long l10847;
+    public long l10848;
+    public long l10849;
+    public long l10850;
+    public long l10851;
+    public long l10852;
+    public long l10853;
+    public long l10854;
+    public long l10855;
+    public long l10856;
+    public long l10857;
+    public long l10858;
+    public long l10859;
+    public long l10860;
+    public long l10861;
+    public long l10862;
+    public long l10863;
+    public long l10864;
+    public long l10865;
+    public long l10866;
+    public long l10867;
+    public long l10868;
+    public long l10869;
+    public long l10870;
+    public long l10871;
+    public long l10872;
+    public long l10873;
+    public long l10874;
+    public long l10875;
+    public long l10876;
+    public long l10877;
+    public long l10878;
+    public long l10879;
+    public long l10880;
+    public long l10881;
+    public long l10882;
+    public long l10883;
+    public long l10884;
+    public long l10885;
+    public long l10886;
+    public long l10887;
+    public long l10888;
+    public long l10889;
+    public long l10890;
+    public long l10891;
+    public long l10892;
+    public long l10893;
+    public long l10894;
+    public long l10895;
+    public long l10896;
+    public long l10897;
+    public long l10898;
+    public long l10899;
+    public long l10900;
+    public long l10901;
+    public long l10902;
+    public long l10903;
+    public long l10904;
+    public long l10905;
+    public long l10906;
+    public long l10907;
+    public long l10908;
+    public long l10909;
+    public long l10910;
+    public long l10911;
+    public long l10912;
+    public long l10913;
+    public long l10914;
+    public long l10915;
+    public long l10916;
+    public long l10917;
+    public long l10918;
+    public long l10919;
+    public long l10920;
+    public long l10921;
+    public long l10922;
+    public long l10923;
+    public long l10924;
+    public long l10925;
+    public long l10926;
+    public long l10927;
+    public long l10928;
+    public long l10929;
+    public long l10930;
+    public long l10931;
+    public long l10932;
+    public long l10933;
+    public long l10934;
+    public long l10935;
+    public long l10936;
+    public long l10937;
+    public long l10938;
+    public long l10939;
+    public long l10940;
+    public long l10941;
+    public long l10942;
+    public long l10943;
+    public long l10944;
+    public long l10945;
+    public long l10946;
+    public long l10947;
+    public long l10948;
+    public long l10949;
+    public long l10950;
+    public long l10951;
+    public long l10952;
+    public long l10953;
+    public long l10954;
+    public long l10955;
+    public long l10956;
+    public long l10957;
+    public long l10958;
+    public long l10959;
+    public long l10960;
+    public long l10961;
+    public long l10962;
+    public long l10963;
+    public long l10964;
+    public long l10965;
+    public long l10966;
+    public long l10967;
+    public long l10968;
+    public long l10969;
+    public long l10970;
+    public long l10971;
+    public long l10972;
+    public long l10973;
+    public long l10974;
+    public long l10975;
+    public long l10976;
+    public long l10977;
+    public long l10978;
+    public long l10979;
+    public long l10980;
+    public long l10981;
+    public long l10982;
+    public long l10983;
+    public long l10984;
+    public long l10985;
+    public long l10986;
+    public long l10987;
+    public long l10988;
+    public long l10989;
+    public long l10990;
+    public long l10991;
+    public long l10992;
+    public long l10993;
+    public long l10994;
+    public long l10995;
+    public long l10996;
+    public long l10997;
+    public long l10998;
+    public long l10999;
+    public long l11000;
+    public long l11001;
+    public long l11002;
+    public long l11003;
+    public long l11004;
+    public long l11005;
+    public long l11006;
+    public long l11007;
+    public long l11008;
+    public long l11009;
+    public long l11010;
+    public long l11011;
+    public long l11012;
+    public long l11013;
+    public long l11014;
+    public long l11015;
+    public long l11016;
+    public long l11017;
+    public long l11018;
+    public long l11019;
+    public long l11020;
+    public long l11021;
+    public long l11022;
+    public long l11023;
+    public long l11024;
+    public long l11025;
+    public long l11026;
+    public long l11027;
+    public long l11028;
+    public long l11029;
+    public long l11030;
+    public long l11031;
+    public long l11032;
+    public long l11033;
+    public long l11034;
+    public long l11035;
+    public long l11036;
+    public long l11037;
+    public long l11038;
+    public long l11039;
+    public long l11040;
+    public long l11041;
+    public long l11042;
+    public long l11043;
+    public long l11044;
+    public long l11045;
+    public long l11046;
+    public long l11047;
+    public long l11048;
+    public long l11049;
+    public long l11050;
+    public long l11051;
+    public long l11052;
+    public long l11053;
+    public long l11054;
+    public long l11055;
+    public long l11056;
+    public long l11057;
+    public long l11058;
+    public long l11059;
+    public long l11060;
+    public long l11061;
+    public long l11062;
+    public long l11063;
+    public long l11064;
+    public long l11065;
+    public long l11066;
+    public long l11067;
+    public long l11068;
+    public long l11069;
+    public long l11070;
+    public long l11071;
+    public long l11072;
+    public long l11073;
+    public long l11074;
+    public long l11075;
+    public long l11076;
+    public long l11077;
+    public long l11078;
+    public long l11079;
+    public long l11080;
+    public long l11081;
+    public long l11082;
+    public long l11083;
+    public long l11084;
+    public long l11085;
+    public long l11086;
+    public long l11087;
+    public long l11088;
+    public long l11089;
+    public long l11090;
+    public long l11091;
+    public long l11092;
+    public long l11093;
+    public long l11094;
+    public long l11095;
+    public long l11096;
+    public long l11097;
+    public long l11098;
+    public long l11099;
+    public long l11100;
+    public long l11101;
+    public long l11102;
+    public long l11103;
+    public long l11104;
+    public long l11105;
+    public long l11106;
+    public long l11107;
+    public long l11108;
+    public long l11109;
+    public long l11110;
+    public long l11111;
+    public long l11112;
+    public long l11113;
+    public long l11114;
+    public long l11115;
+    public long l11116;
+    public long l11117;
+    public long l11118;
+    public long l11119;
+    public long l11120;
+    public long l11121;
+    public long l11122;
+    public long l11123;
+    public long l11124;
+    public long l11125;
+    public long l11126;
+    public long l11127;
+    public long l11128;
+    public long l11129;
+    public long l11130;
+    public long l11131;
+    public long l11132;
+    public long l11133;
+    public long l11134;
+    public long l11135;
+    public long l11136;
+    public long l11137;
+    public long l11138;
+    public long l11139;
+    public long l11140;
+    public long l11141;
+    public long l11142;
+    public long l11143;
+    public long l11144;
+    public long l11145;
+    public long l11146;
+    public long l11147;
+    public long l11148;
+    public long l11149;
+    public long l11150;
+    public long l11151;
+    public long l11152;
+    public long l11153;
+    public long l11154;
+    public long l11155;
+    public long l11156;
+    public long l11157;
+    public long l11158;
+    public long l11159;
+    public long l11160;
+    public long l11161;
+    public long l11162;
+    public long l11163;
+    public long l11164;
+    public long l11165;
+    public long l11166;
+    public long l11167;
+    public long l11168;
+    public long l11169;
+    public long l11170;
+    public long l11171;
+    public long l11172;
+    public long l11173;
+    public long l11174;
+    public long l11175;
+    public long l11176;
+    public long l11177;
+    public long l11178;
+    public long l11179;
+    public long l11180;
+    public long l11181;
+    public long l11182;
+    public long l11183;
+    public long l11184;
+    public long l11185;
+    public long l11186;
+    public long l11187;
+    public long l11188;
+    public long l11189;
+    public long l11190;
+    public long l11191;
+    public long l11192;
+    public long l11193;
+    public long l11194;
+    public long l11195;
+    public long l11196;
+    public long l11197;
+    public long l11198;
+    public long l11199;
+    public long l11200;
+    public long l11201;
+    public long l11202;
+    public long l11203;
+    public long l11204;
+    public long l11205;
+    public long l11206;
+    public long l11207;
+    public long l11208;
+    public long l11209;
+    public long l11210;
+    public long l11211;
+    public long l11212;
+    public long l11213;
+    public long l11214;
+    public long l11215;
+    public long l11216;
+    public long l11217;
+    public long l11218;
+    public long l11219;
+    public long l11220;
+    public long l11221;
+    public long l11222;
+    public long l11223;
+    public long l11224;
+    public long l11225;
+    public long l11226;
+    public long l11227;
+    public long l11228;
+    public long l11229;
+    public long l11230;
+    public long l11231;
+    public long l11232;
+    public long l11233;
+    public long l11234;
+    public long l11235;
+    public long l11236;
+    public long l11237;
+    public long l11238;
+    public long l11239;
+    public long l11240;
+    public long l11241;
+    public long l11242;
+    public long l11243;
+    public long l11244;
+    public long l11245;
+    public long l11246;
+    public long l11247;
+    public long l11248;
+    public long l11249;
+    public long l11250;
+    public long l11251;
+    public long l11252;
+    public long l11253;
+    public long l11254;
+    public long l11255;
+    public long l11256;
+    public long l11257;
+    public long l11258;
+    public long l11259;
+    public long l11260;
+    public long l11261;
+    public long l11262;
+    public long l11263;
+    public long l11264;
+    public long l11265;
+    public long l11266;
+    public long l11267;
+    public long l11268;
+    public long l11269;
+    public long l11270;
+    public long l11271;
+    public long l11272;
+    public long l11273;
+    public long l11274;
+    public long l11275;
+    public long l11276;
+    public long l11277;
+    public long l11278;
+    public long l11279;
+    public long l11280;
+    public long l11281;
+    public long l11282;
+    public long l11283;
+    public long l11284;
+    public long l11285;
+    public long l11286;
+    public long l11287;
+    public long l11288;
+    public long l11289;
+    public long l11290;
+    public long l11291;
+    public long l11292;
+    public long l11293;
+    public long l11294;
+    public long l11295;
+    public long l11296;
+    public long l11297;
+    public long l11298;
+    public long l11299;
+    public long l11300;
+    public long l11301;
+    public long l11302;
+    public long l11303;
+    public long l11304;
+    public long l11305;
+    public long l11306;
+    public long l11307;
+    public long l11308;
+    public long l11309;
+    public long l11310;
+    public long l11311;
+    public long l11312;
+    public long l11313;
+    public long l11314;
+    public long l11315;
+    public long l11316;
+    public long l11317;
+    public long l11318;
+    public long l11319;
+    public long l11320;
+    public long l11321;
+    public long l11322;
+    public long l11323;
+    public long l11324;
+    public long l11325;
+    public long l11326;
+    public long l11327;
+    public long l11328;
+    public long l11329;
+    public long l11330;
+    public long l11331;
+    public long l11332;
+    public long l11333;
+    public long l11334;
+    public long l11335;
+    public long l11336;
+    public long l11337;
+    public long l11338;
+    public long l11339;
+    public long l11340;
+    public long l11341;
+    public long l11342;
+    public long l11343;
+    public long l11344;
+    public long l11345;
+    public long l11346;
+    public long l11347;
+    public long l11348;
+    public long l11349;
+    public long l11350;
+    public long l11351;
+    public long l11352;
+    public long l11353;
+    public long l11354;
+    public long l11355;
+    public long l11356;
+    public long l11357;
+    public long l11358;
+    public long l11359;
+    public long l11360;
+    public long l11361;
+    public long l11362;
+    public long l11363;
+    public long l11364;
+    public long l11365;
+    public long l11366;
+    public long l11367;
+    public long l11368;
+    public long l11369;
+    public long l11370;
+    public long l11371;
+    public long l11372;
+    public long l11373;
+    public long l11374;
+    public long l11375;
+    public long l11376;
+    public long l11377;
+    public long l11378;
+    public long l11379;
+    public long l11380;
+    public long l11381;
+    public long l11382;
+    public long l11383;
+    public long l11384;
+    public long l11385;
+    public long l11386;
+    public long l11387;
+    public long l11388;
+    public long l11389;
+    public long l11390;
+    public long l11391;
+    public long l11392;
+    public long l11393;
+    public long l11394;
+    public long l11395;
+    public long l11396;
+    public long l11397;
+    public long l11398;
+    public long l11399;
+    public long l11400;
+    public long l11401;
+    public long l11402;
+    public long l11403;
+    public long l11404;
+    public long l11405;
+    public long l11406;
+    public long l11407;
+    public long l11408;
+    public long l11409;
+    public long l11410;
+    public long l11411;
+    public long l11412;
+    public long l11413;
+    public long l11414;
+    public long l11415;
+    public long l11416;
+    public long l11417;
+    public long l11418;
+    public long l11419;
+    public long l11420;
+    public long l11421;
+    public long l11422;
+    public long l11423;
+    public long l11424;
+    public long l11425;
+    public long l11426;
+    public long l11427;
+    public long l11428;
+    public long l11429;
+    public long l11430;
+    public long l11431;
+    public long l11432;
+    public long l11433;
+    public long l11434;
+    public long l11435;
+    public long l11436;
+    public long l11437;
+    public long l11438;
+    public long l11439;
+    public long l11440;
+    public long l11441;
+    public long l11442;
+    public long l11443;
+    public long l11444;
+    public long l11445;
+    public long l11446;
+    public long l11447;
+    public long l11448;
+    public long l11449;
+    public long l11450;
+    public long l11451;
+    public long l11452;
+    public long l11453;
+    public long l11454;
+    public long l11455;
+    public long l11456;
+    public long l11457;
+    public long l11458;
+    public long l11459;
+    public long l11460;
+    public long l11461;
+    public long l11462;
+    public long l11463;
+    public long l11464;
+    public long l11465;
+    public long l11466;
+    public long l11467;
+    public long l11468;
+    public long l11469;
+    public long l11470;
+    public long l11471;
+    public long l11472;
+    public long l11473;
+    public long l11474;
+    public long l11475;
+    public long l11476;
+    public long l11477;
+    public long l11478;
+    public long l11479;
+    public long l11480;
+    public long l11481;
+    public long l11482;
+    public long l11483;
+    public long l11484;
+    public long l11485;
+    public long l11486;
+    public long l11487;
+    public long l11488;
+    public long l11489;
+    public long l11490;
+    public long l11491;
+    public long l11492;
+    public long l11493;
+    public long l11494;
+    public long l11495;
+    public long l11496;
+    public long l11497;
+    public long l11498;
+    public long l11499;
+    public long l11500;
+    public long l11501;
+    public long l11502;
+    public long l11503;
+    public long l11504;
+    public long l11505;
+    public long l11506;
+    public long l11507;
+    public long l11508;
+    public long l11509;
+    public long l11510;
+    public long l11511;
+    public long l11512;
+    public long l11513;
+    public long l11514;
+    public long l11515;
+    public long l11516;
+    public long l11517;
+    public long l11518;
+    public long l11519;
+    public long l11520;
+    public long l11521;
+    public long l11522;
+    public long l11523;
+    public long l11524;
+    public long l11525;
+    public long l11526;
+    public long l11527;
+    public long l11528;
+    public long l11529;
+    public long l11530;
+    public long l11531;
+    public long l11532;
+    public long l11533;
+    public long l11534;
+    public long l11535;
+    public long l11536;
+    public long l11537;
+    public long l11538;
+    public long l11539;
+    public long l11540;
+    public long l11541;
+    public long l11542;
+    public long l11543;
+    public long l11544;
+    public long l11545;
+    public long l11546;
+    public long l11547;
+    public long l11548;
+    public long l11549;
+    public long l11550;
+    public long l11551;
+    public long l11552;
+    public long l11553;
+    public long l11554;
+    public long l11555;
+    public long l11556;
+    public long l11557;
+    public long l11558;
+    public long l11559;
+    public long l11560;
+    public long l11561;
+    public long l11562;
+    public long l11563;
+    public long l11564;
+    public long l11565;
+    public long l11566;
+    public long l11567;
+    public long l11568;
+    public long l11569;
+    public long l11570;
+    public long l11571;
+    public long l11572;
+    public long l11573;
+    public long l11574;
+    public long l11575;
+    public long l11576;
+    public long l11577;
+    public long l11578;
+    public long l11579;
+    public long l11580;
+    public long l11581;
+    public long l11582;
+    public long l11583;
+    public long l11584;
+    public long l11585;
+    public long l11586;
+    public long l11587;
+    public long l11588;
+    public long l11589;
+    public long l11590;
+    public long l11591;
+    public long l11592;
+    public long l11593;
+    public long l11594;
+    public long l11595;
+    public long l11596;
+    public long l11597;
+    public long l11598;
+    public long l11599;
+    public long l11600;
+    public long l11601;
+    public long l11602;
+    public long l11603;
+    public long l11604;
+    public long l11605;
+    public long l11606;
+    public long l11607;
+    public long l11608;
+    public long l11609;
+    public long l11610;
+    public long l11611;
+    public long l11612;
+    public long l11613;
+    public long l11614;
+    public long l11615;
+    public long l11616;
+    public long l11617;
+    public long l11618;
+    public long l11619;
+    public long l11620;
+    public long l11621;
+    public long l11622;
+    public long l11623;
+    public long l11624;
+    public long l11625;
+    public long l11626;
+    public long l11627;
+    public long l11628;
+    public long l11629;
+    public long l11630;
+    public long l11631;
+    public long l11632;
+    public long l11633;
+    public long l11634;
+    public long l11635;
+    public long l11636;
+    public long l11637;
+    public long l11638;
+    public long l11639;
+    public long l11640;
+    public long l11641;
+    public long l11642;
+    public long l11643;
+    public long l11644;
+    public long l11645;
+    public long l11646;
+    public long l11647;
+    public long l11648;
+    public long l11649;
+    public long l11650;
+    public long l11651;
+    public long l11652;
+    public long l11653;
+    public long l11654;
+    public long l11655;
+    public long l11656;
+    public long l11657;
+    public long l11658;
+    public long l11659;
+    public long l11660;
+    public long l11661;
+    public long l11662;
+    public long l11663;
+    public long l11664;
+    public long l11665;
+    public long l11666;
+    public long l11667;
+    public long l11668;
+    public long l11669;
+    public long l11670;
+    public long l11671;
+    public long l11672;
+    public long l11673;
+    public long l11674;
+    public long l11675;
+    public long l11676;
+    public long l11677;
+    public long l11678;
+    public long l11679;
+    public long l11680;
+    public long l11681;
+    public long l11682;
+    public long l11683;
+    public long l11684;
+    public long l11685;
+    public long l11686;
+    public long l11687;
+    public long l11688;
+    public long l11689;
+    public long l11690;
+    public long l11691;
+    public long l11692;
+    public long l11693;
+    public long l11694;
+    public long l11695;
+    public long l11696;
+    public long l11697;
+    public long l11698;
+    public long l11699;
+    public long l11700;
+    public long l11701;
+    public long l11702;
+    public long l11703;
+    public long l11704;
+    public long l11705;
+    public long l11706;
+    public long l11707;
+    public long l11708;
+    public long l11709;
+    public long l11710;
+    public long l11711;
+    public long l11712;
+    public long l11713;
+    public long l11714;
+    public long l11715;
+    public long l11716;
+    public long l11717;
+    public long l11718;
+    public long l11719;
+    public long l11720;
+    public long l11721;
+    public long l11722;
+    public long l11723;
+    public long l11724;
+    public long l11725;
+    public long l11726;
+    public long l11727;
+    public long l11728;
+    public long l11729;
+    public long l11730;
+    public long l11731;
+    public long l11732;
+    public long l11733;
+    public long l11734;
+    public long l11735;
+    public long l11736;
+    public long l11737;
+    public long l11738;
+    public long l11739;
+    public long l11740;
+    public long l11741;
+    public long l11742;
+    public long l11743;
+    public long l11744;
+    public long l11745;
+    public long l11746;
+    public long l11747;
+    public long l11748;
+    public long l11749;
+    public long l11750;
+    public long l11751;
+    public long l11752;
+    public long l11753;
+    public long l11754;
+    public long l11755;
+    public long l11756;
+    public long l11757;
+    public long l11758;
+    public long l11759;
+    public long l11760;
+    public long l11761;
+    public long l11762;
+    public long l11763;
+    public long l11764;
+    public long l11765;
+    public long l11766;
+    public long l11767;
+    public long l11768;
+    public long l11769;
+    public long l11770;
+    public long l11771;
+    public long l11772;
+    public long l11773;
+    public long l11774;
+    public long l11775;
+    public long l11776;
+    public long l11777;
+    public long l11778;
+    public long l11779;
+    public long l11780;
+    public long l11781;
+    public long l11782;
+    public long l11783;
+    public long l11784;
+    public long l11785;
+    public long l11786;
+    public long l11787;
+    public long l11788;
+    public long l11789;
+    public long l11790;
+    public long l11791;
+    public long l11792;
+    public long l11793;
+    public long l11794;
+    public long l11795;
+    public long l11796;
+    public long l11797;
+    public long l11798;
+    public long l11799;
+    public long l11800;
+    public long l11801;
+    public long l11802;
+    public long l11803;
+    public long l11804;
+    public long l11805;
+    public long l11806;
+    public long l11807;
+    public long l11808;
+    public long l11809;
+    public long l11810;
+    public long l11811;
+    public long l11812;
+    public long l11813;
+    public long l11814;
+    public long l11815;
+    public long l11816;
+    public long l11817;
+    public long l11818;
+    public long l11819;
+    public long l11820;
+    public long l11821;
+    public long l11822;
+    public long l11823;
+    public long l11824;
+    public long l11825;
+    public long l11826;
+    public long l11827;
+    public long l11828;
+    public long l11829;
+    public long l11830;
+    public long l11831;
+    public long l11832;
+    public long l11833;
+    public long l11834;
+    public long l11835;
+    public long l11836;
+    public long l11837;
+    public long l11838;
+    public long l11839;
+    public long l11840;
+    public long l11841;
+    public long l11842;
+    public long l11843;
+    public long l11844;
+    public long l11845;
+    public long l11846;
+    public long l11847;
+    public long l11848;
+    public long l11849;
+    public long l11850;
+    public long l11851;
+    public long l11852;
+    public long l11853;
+    public long l11854;
+    public long l11855;
+    public long l11856;
+    public long l11857;
+    public long l11858;
+    public long l11859;
+    public long l11860;
+    public long l11861;
+    public long l11862;
+    public long l11863;
+    public long l11864;
+    public long l11865;
+    public long l11866;
+    public long l11867;
+    public long l11868;
+    public long l11869;
+    public long l11870;
+    public long l11871;
+    public long l11872;
+    public long l11873;
+    public long l11874;
+    public long l11875;
+    public long l11876;
+    public long l11877;
+    public long l11878;
+    public long l11879;
+    public long l11880;
+    public long l11881;
+    public long l11882;
+    public long l11883;
+    public long l11884;
+    public long l11885;
+    public long l11886;
+    public long l11887;
+    public long l11888;
+    public long l11889;
+    public long l11890;
+    public long l11891;
+    public long l11892;
+    public long l11893;
+    public long l11894;
+    public long l11895;
+    public long l11896;
+    public long l11897;
+    public long l11898;
+    public long l11899;
+    public long l11900;
+    public long l11901;
+    public long l11902;
+    public long l11903;
+    public long l11904;
+    public long l11905;
+    public long l11906;
+    public long l11907;
+    public long l11908;
+    public long l11909;
+    public long l11910;
+    public long l11911;
+    public long l11912;
+    public long l11913;
+    public long l11914;
+    public long l11915;
+    public long l11916;
+    public long l11917;
+    public long l11918;
+    public long l11919;
+    public long l11920;
+    public long l11921;
+    public long l11922;
+    public long l11923;
+    public long l11924;
+    public long l11925;
+    public long l11926;
+    public long l11927;
+    public long l11928;
+    public long l11929;
+    public long l11930;
+    public long l11931;
+    public long l11932;
+    public long l11933;
+    public long l11934;
+    public long l11935;
+    public long l11936;
+    public long l11937;
+    public long l11938;
+    public long l11939;
+    public long l11940;
+    public long l11941;
+    public long l11942;
+    public long l11943;
+    public long l11944;
+    public long l11945;
+    public long l11946;
+    public long l11947;
+    public long l11948;
+    public long l11949;
+    public long l11950;
+    public long l11951;
+    public long l11952;
+    public long l11953;
+    public long l11954;
+    public long l11955;
+    public long l11956;
+    public long l11957;
+    public long l11958;
+    public long l11959;
+    public long l11960;
+    public long l11961;
+    public long l11962;
+    public long l11963;
+    public long l11964;
+    public long l11965;
+    public long l11966;
+    public long l11967;
+    public long l11968;
+    public long l11969;
+    public long l11970;
+    public long l11971;
+    public long l11972;
+    public long l11973;
+    public long l11974;
+    public long l11975;
+    public long l11976;
+    public long l11977;
+    public long l11978;
+    public long l11979;
+    public long l11980;
+    public long l11981;
+    public long l11982;
+    public long l11983;
+    public long l11984;
+    public long l11985;
+    public long l11986;
+    public long l11987;
+    public long l11988;
+    public long l11989;
+    public long l11990;
+    public long l11991;
+    public long l11992;
+    public long l11993;
+    public long l11994;
+    public long l11995;
+    public long l11996;
+    public long l11997;
+    public long l11998;
+    public long l11999;
+    public long l12000;
+    public long l12001;
+    public long l12002;
+    public long l12003;
+    public long l12004;
+    public long l12005;
+    public long l12006;
+    public long l12007;
+    public long l12008;
+    public long l12009;
+    public long l12010;
+    public long l12011;
+    public long l12012;
+    public long l12013;
+    public long l12014;
+    public long l12015;
+    public long l12016;
+    public long l12017;
+    public long l12018;
+    public long l12019;
+    public long l12020;
+    public long l12021;
+    public long l12022;
+    public long l12023;
+    public long l12024;
+    public long l12025;
+    public long l12026;
+    public long l12027;
+    public long l12028;
+    public long l12029;
+    public long l12030;
+    public long l12031;
+    public long l12032;
+    public long l12033;
+    public long l12034;
+    public long l12035;
+    public long l12036;
+    public long l12037;
+    public long l12038;
+    public long l12039;
+    public long l12040;
+    public long l12041;
+    public long l12042;
+    public long l12043;
+    public long l12044;
+    public long l12045;
+    public long l12046;
+    public long l12047;
+    public long l12048;
+    public long l12049;
+    public long l12050;
+    public long l12051;
+    public long l12052;
+    public long l12053;
+    public long l12054;
+    public long l12055;
+    public long l12056;
+    public long l12057;
+    public long l12058;
+    public long l12059;
+    public long l12060;
+    public long l12061;
+    public long l12062;
+    public long l12063;
+    public long l12064;
+    public long l12065;
+    public long l12066;
+    public long l12067;
+    public long l12068;
+    public long l12069;
+    public long l12070;
+    public long l12071;
+    public long l12072;
+    public long l12073;
+    public long l12074;
+    public long l12075;
+    public long l12076;
+    public long l12077;
+    public long l12078;
+    public long l12079;
+    public long l12080;
+    public long l12081;
+    public long l12082;
+    public long l12083;
+    public long l12084;
+    public long l12085;
+    public long l12086;
+    public long l12087;
+    public long l12088;
+    public long l12089;
+    public long l12090;
+    public long l12091;
+    public long l12092;
+    public long l12093;
+    public long l12094;
+    public long l12095;
+    public long l12096;
+    public long l12097;
+    public long l12098;
+    public long l12099;
+    public long l12100;
+    public long l12101;
+    public long l12102;
+    public long l12103;
+    public long l12104;
+    public long l12105;
+    public long l12106;
+    public long l12107;
+    public long l12108;
+    public long l12109;
+    public long l12110;
+    public long l12111;
+    public long l12112;
+    public long l12113;
+    public long l12114;
+    public long l12115;
+    public long l12116;
+    public long l12117;
+    public long l12118;
+    public long l12119;
+    public long l12120;
+    public long l12121;
+    public long l12122;
+    public long l12123;
+    public long l12124;
+    public long l12125;
+    public long l12126;
+    public long l12127;
+    public long l12128;
+    public long l12129;
+    public long l12130;
+    public long l12131;
+    public long l12132;
+    public long l12133;
+    public long l12134;
+    public long l12135;
+    public long l12136;
+    public long l12137;
+    public long l12138;
+    public long l12139;
+    public long l12140;
+    public long l12141;
+    public long l12142;
+    public long l12143;
+    public long l12144;
+    public long l12145;
+    public long l12146;
+    public long l12147;
+    public long l12148;
+    public long l12149;
+    public long l12150;
+    public long l12151;
+    public long l12152;
+    public long l12153;
+    public long l12154;
+    public long l12155;
+    public long l12156;
+    public long l12157;
+    public long l12158;
+    public long l12159;
+    public long l12160;
+    public long l12161;
+    public long l12162;
+    public long l12163;
+    public long l12164;
+    public long l12165;
+    public long l12166;
+    public long l12167;
+    public long l12168;
+    public long l12169;
+    public long l12170;
+    public long l12171;
+    public long l12172;
+    public long l12173;
+    public long l12174;
+    public long l12175;
+    public long l12176;
+    public long l12177;
+    public long l12178;
+    public long l12179;
+    public long l12180;
+    public long l12181;
+    public long l12182;
+    public long l12183;
+    public long l12184;
+    public long l12185;
+    public long l12186;
+    public long l12187;
+    public long l12188;
+    public long l12189;
+    public long l12190;
+    public long l12191;
+    public long l12192;
+    public long l12193;
+    public long l12194;
+    public long l12195;
+    public long l12196;
+    public long l12197;
+    public long l12198;
+    public long l12199;
+    public long l12200;
+    public long l12201;
+    public long l12202;
+    public long l12203;
+    public long l12204;
+    public long l12205;
+    public long l12206;
+    public long l12207;
+    public long l12208;
+    public long l12209;
+    public long l12210;
+    public long l12211;
+    public long l12212;
+    public long l12213;
+    public long l12214;
+    public long l12215;
+    public long l12216;
+    public long l12217;
+    public long l12218;
+    public long l12219;
+    public long l12220;
+    public long l12221;
+    public long l12222;
+    public long l12223;
+    public long l12224;
+    public long l12225;
+    public long l12226;
+    public long l12227;
+    public long l12228;
+    public long l12229;
+    public long l12230;
+    public long l12231;
+    public long l12232;
+    public long l12233;
+    public long l12234;
+    public long l12235;
+    public long l12236;
+    public long l12237;
+    public long l12238;
+    public long l12239;
+    public long l12240;
+    public long l12241;
+    public long l12242;
+    public long l12243;
+    public long l12244;
+    public long l12245;
+    public long l12246;
+    public long l12247;
+    public long l12248;
+    public long l12249;
+    public long l12250;
+    public long l12251;
+    public long l12252;
+    public long l12253;
+    public long l12254;
+    public long l12255;
+    public long l12256;
+    public long l12257;
+    public long l12258;
+    public long l12259;
+    public long l12260;
+    public long l12261;
+    public long l12262;
+    public long l12263;
+    public long l12264;
+    public long l12265;
+    public long l12266;
+    public long l12267;
+    public long l12268;
+    public long l12269;
+    public long l12270;
+    public long l12271;
+    public long l12272;
+    public long l12273;
+    public long l12274;
+    public long l12275;
+    public long l12276;
+    public long l12277;
+    public long l12278;
+    public long l12279;
+    public long l12280;
+    public long l12281;
+    public long l12282;
+    public long l12283;
+    public long l12284;
+    public long l12285;
+    public long l12286;
+    public long l12287;
+    public long l12288;
+    public long l12289;
+    public long l12290;
+    public long l12291;
+    public long l12292;
+    public long l12293;
+    public long l12294;
+    public long l12295;
+    public long l12296;
+    public long l12297;
+    public long l12298;
+    public long l12299;
+    public long l12300;
+    public long l12301;
+    public long l12302;
+    public long l12303;
+    public long l12304;
+    public long l12305;
+    public long l12306;
+    public long l12307;
+    public long l12308;
+    public long l12309;
+    public long l12310;
+    public long l12311;
+    public long l12312;
+    public long l12313;
+    public long l12314;
+    public long l12315;
+    public long l12316;
+    public long l12317;
+    public long l12318;
+    public long l12319;
+    public long l12320;
+    public long l12321;
+    public long l12322;
+    public long l12323;
+    public long l12324;
+    public long l12325;
+    public long l12326;
+    public long l12327;
+    public long l12328;
+    public long l12329;
+    public long l12330;
+    public long l12331;
+    public long l12332;
+    public long l12333;
+    public long l12334;
+    public long l12335;
+    public long l12336;
+    public long l12337;
+    public long l12338;
+    public long l12339;
+    public long l12340;
+    public long l12341;
+    public long l12342;
+    public long l12343;
+    public long l12344;
+    public long l12345;
+    public long l12346;
+    public long l12347;
+    public long l12348;
+    public long l12349;
+    public long l12350;
+    public long l12351;
+    public long l12352;
+    public long l12353;
+    public long l12354;
+    public long l12355;
+    public long l12356;
+    public long l12357;
+    public long l12358;
+    public long l12359;
+    public long l12360;
+    public long l12361;
+    public long l12362;
+    public long l12363;
+    public long l12364;
+    public long l12365;
+    public long l12366;
+    public long l12367;
+    public long l12368;
+    public long l12369;
+    public long l12370;
+    public long l12371;
+    public long l12372;
+    public long l12373;
+    public long l12374;
+    public long l12375;
+    public long l12376;
+    public long l12377;
+    public long l12378;
+    public long l12379;
+    public long l12380;
+    public long l12381;
+    public long l12382;
+    public long l12383;
+    public long l12384;
+    public long l12385;
+    public long l12386;
+    public long l12387;
+    public long l12388;
+    public long l12389;
+    public long l12390;
+    public long l12391;
+    public long l12392;
+    public long l12393;
+    public long l12394;
+    public long l12395;
+    public long l12396;
+    public long l12397;
+    public long l12398;
+    public long l12399;
+    public long l12400;
+    public long l12401;
+    public long l12402;
+    public long l12403;
+    public long l12404;
+    public long l12405;
+    public long l12406;
+    public long l12407;
+    public long l12408;
+    public long l12409;
+    public long l12410;
+    public long l12411;
+    public long l12412;
+    public long l12413;
+    public long l12414;
+    public long l12415;
+    public long l12416;
+    public long l12417;
+    public long l12418;
+    public long l12419;
+    public long l12420;
+    public long l12421;
+    public long l12422;
+    public long l12423;
+    public long l12424;
+    public long l12425;
+    public long l12426;
+    public long l12427;
+    public long l12428;
+    public long l12429;
+    public long l12430;
+    public long l12431;
+    public long l12432;
+    public long l12433;
+    public long l12434;
+    public long l12435;
+    public long l12436;
+    public long l12437;
+    public long l12438;
+    public long l12439;
+    public long l12440;
+    public long l12441;
+    public long l12442;
+    public long l12443;
+    public long l12444;
+    public long l12445;
+    public long l12446;
+    public long l12447;
+    public long l12448;
+    public long l12449;
+    public long l12450;
+    public long l12451;
+    public long l12452;
+    public long l12453;
+    public long l12454;
+    public long l12455;
+    public long l12456;
+    public long l12457;
+    public long l12458;
+    public long l12459;
+    public long l12460;
+    public long l12461;
+    public long l12462;
+    public long l12463;
+    public long l12464;
+    public long l12465;
+    public long l12466;
+    public long l12467;
+    public long l12468;
+    public long l12469;
+    public long l12470;
+    public long l12471;
+    public long l12472;
+    public long l12473;
+    public long l12474;
+    public long l12475;
+    public long l12476;
+    public long l12477;
+    public long l12478;
+    public long l12479;
+    public long l12480;
+    public long l12481;
+    public long l12482;
+    public long l12483;
+    public long l12484;
+    public long l12485;
+    public long l12486;
+    public long l12487;
+    public long l12488;
+    public long l12489;
+    public long l12490;
+    public long l12491;
+    public long l12492;
+    public long l12493;
+    public long l12494;
+    public long l12495;
+    public long l12496;
+    public long l12497;
+    public long l12498;
+    public long l12499;
+    public long l12500;
+    public long l12501;
+    public long l12502;
+    public long l12503;
+    public long l12504;
+    public long l12505;
+    public long l12506;
+    public long l12507;
+    public long l12508;
+    public long l12509;
+    public long l12510;
+    public long l12511;
+    public long l12512;
+    public long l12513;
+    public long l12514;
+    public long l12515;
+    public long l12516;
+    public long l12517;
+    public long l12518;
+    public long l12519;
+    public long l12520;
+    public long l12521;
+    public long l12522;
+    public long l12523;
+    public long l12524;
+    public long l12525;
+    public long l12526;
+    public long l12527;
+    public long l12528;
+    public long l12529;
+    public long l12530;
+    public long l12531;
+    public long l12532;
+    public long l12533;
+    public long l12534;
+    public long l12535;
+    public long l12536;
+    public long l12537;
+    public long l12538;
+    public long l12539;
+    public long l12540;
+    public long l12541;
+    public long l12542;
+    public long l12543;
+    public long l12544;
+    public long l12545;
+    public long l12546;
+    public long l12547;
+    public long l12548;
+    public long l12549;
+    public long l12550;
+    public long l12551;
+    public long l12552;
+    public long l12553;
+    public long l12554;
+    public long l12555;
+    public long l12556;
+    public long l12557;
+    public long l12558;
+    public long l12559;
+    public long l12560;
+    public long l12561;
+    public long l12562;
+    public long l12563;
+    public long l12564;
+    public long l12565;
+    public long l12566;
+    public long l12567;
+    public long l12568;
+    public long l12569;
+    public long l12570;
+    public long l12571;
+    public long l12572;
+    public long l12573;
+    public long l12574;
+    public long l12575;
+    public long l12576;
+    public long l12577;
+    public long l12578;
+    public long l12579;
+    public long l12580;
+    public long l12581;
+    public long l12582;
+    public long l12583;
+    public long l12584;
+    public long l12585;
+    public long l12586;
+    public long l12587;
+    public long l12588;
+    public long l12589;
+    public long l12590;
+    public long l12591;
+    public long l12592;
+    public long l12593;
+    public long l12594;
+    public long l12595;
+    public long l12596;
+    public long l12597;
+    public long l12598;
+    public long l12599;
+    public long l12600;
+    public long l12601;
+    public long l12602;
+    public long l12603;
+    public long l12604;
+    public long l12605;
+    public long l12606;
+    public long l12607;
+    public long l12608;
+    public long l12609;
+    public long l12610;
+    public long l12611;
+    public long l12612;
+    public long l12613;
+    public long l12614;
+    public long l12615;
+    public long l12616;
+    public long l12617;
+    public long l12618;
+    public long l12619;
+    public long l12620;
+    public long l12621;
+    public long l12622;
+    public long l12623;
+    public long l12624;
+    public long l12625;
+    public long l12626;
+    public long l12627;
+    public long l12628;
+    public long l12629;
+    public long l12630;
+    public long l12631;
+    public long l12632;
+    public long l12633;
+    public long l12634;
+    public long l12635;
+    public long l12636;
+    public long l12637;
+    public long l12638;
+    public long l12639;
+    public long l12640;
+    public long l12641;
+    public long l12642;
+    public long l12643;
+    public long l12644;
+    public long l12645;
+    public long l12646;
+    public long l12647;
+    public long l12648;
+    public long l12649;
+    public long l12650;
+    public long l12651;
+    public long l12652;
+    public long l12653;
+    public long l12654;
+    public long l12655;
+    public long l12656;
+    public long l12657;
+    public long l12658;
+    public long l12659;
+    public long l12660;
+    public long l12661;
+    public long l12662;
+    public long l12663;
+    public long l12664;
+    public long l12665;
+    public long l12666;
+    public long l12667;
+    public long l12668;
+    public long l12669;
+    public long l12670;
+    public long l12671;
+    public long l12672;
+    public long l12673;
+    public long l12674;
+    public long l12675;
+    public long l12676;
+    public long l12677;
+    public long l12678;
+    public long l12679;
+    public long l12680;
+    public long l12681;
+    public long l12682;
+    public long l12683;
+    public long l12684;
+    public long l12685;
+    public long l12686;
+    public long l12687;
+    public long l12688;
+    public long l12689;
+    public long l12690;
+    public long l12691;
+    public long l12692;
+    public long l12693;
+    public long l12694;
+    public long l12695;
+    public long l12696;
+    public long l12697;
+    public long l12698;
+    public long l12699;
+    public long l12700;
+    public long l12701;
+    public long l12702;
+    public long l12703;
+    public long l12704;
+    public long l12705;
+    public long l12706;
+    public long l12707;
+    public long l12708;
+    public long l12709;
+    public long l12710;
+    public long l12711;
+    public long l12712;
+    public long l12713;
+    public long l12714;
+    public long l12715;
+    public long l12716;
+    public long l12717;
+    public long l12718;
+    public long l12719;
+    public long l12720;
+    public long l12721;
+    public long l12722;
+    public long l12723;
+    public long l12724;
+    public long l12725;
+    public long l12726;
+    public long l12727;
+    public long l12728;
+    public long l12729;
+    public long l12730;
+    public long l12731;
+    public long l12732;
+    public long l12733;
+    public long l12734;
+    public long l12735;
+    public long l12736;
+    public long l12737;
+    public long l12738;
+    public long l12739;
+    public long l12740;
+    public long l12741;
+    public long l12742;
+    public long l12743;
+    public long l12744;
+    public long l12745;
+    public long l12746;
+    public long l12747;
+    public long l12748;
+    public long l12749;
+    public long l12750;
+    public long l12751;
+    public long l12752;
+    public long l12753;
+    public long l12754;
+    public long l12755;
+    public long l12756;
+    public long l12757;
+    public long l12758;
+    public long l12759;
+    public long l12760;
+    public long l12761;
+    public long l12762;
+    public long l12763;
+    public long l12764;
+    public long l12765;
+    public long l12766;
+    public long l12767;
+    public long l12768;
+    public long l12769;
+    public long l12770;
+    public long l12771;
+    public long l12772;
+    public long l12773;
+    public long l12774;
+    public long l12775;
+    public long l12776;
+    public long l12777;
+    public long l12778;
+    public long l12779;
+    public long l12780;
+    public long l12781;
+    public long l12782;
+    public long l12783;
+    public long l12784;
+    public long l12785;
+    public long l12786;
+    public long l12787;
+    public long l12788;
+    public long l12789;
+    public long l12790;
+    public long l12791;
+    public long l12792;
+    public long l12793;
+    public long l12794;
+    public long l12795;
+    public long l12796;
+    public long l12797;
+    public long l12798;
+    public long l12799;
+    public long l12800;
+    public long l12801;
+    public long l12802;
+    public long l12803;
+    public long l12804;
+    public long l12805;
+    public long l12806;
+    public long l12807;
+    public long l12808;
+    public long l12809;
+    public long l12810;
+    public long l12811;
+    public long l12812;
+    public long l12813;
+    public long l12814;
+    public long l12815;
+    public long l12816;
+    public long l12817;
+    public long l12818;
+    public long l12819;
+    public long l12820;
+    public long l12821;
+    public long l12822;
+    public long l12823;
+    public long l12824;
+    public long l12825;
+    public long l12826;
+    public long l12827;
+    public long l12828;
+    public long l12829;
+    public long l12830;
+    public long l12831;
+    public long l12832;
+    public long l12833;
+    public long l12834;
+    public long l12835;
+    public long l12836;
+    public long l12837;
+    public long l12838;
+    public long l12839;
+    public long l12840;
+    public long l12841;
+    public long l12842;
+    public long l12843;
+    public long l12844;
+    public long l12845;
+    public long l12846;
+    public long l12847;
+    public long l12848;
+    public long l12849;
+    public long l12850;
+    public long l12851;
+    public long l12852;
+    public long l12853;
+    public long l12854;
+    public long l12855;
+    public long l12856;
+    public long l12857;
+    public long l12858;
+    public long l12859;
+    public long l12860;
+    public long l12861;
+    public long l12862;
+    public long l12863;
+    public long l12864;
+    public long l12865;
+    public long l12866;
+    public long l12867;
+    public long l12868;
+    public long l12869;
+    public long l12870;
+    public long l12871;
+    public long l12872;
+    public long l12873;
+    public long l12874;
+    public long l12875;
+    public long l12876;
+    public long l12877;
+    public long l12878;
+    public long l12879;
+    public long l12880;
+    public long l12881;
+    public long l12882;
+    public long l12883;
+    public long l12884;
+    public long l12885;
+    public long l12886;
+    public long l12887;
+    public long l12888;
+    public long l12889;
+    public long l12890;
+    public long l12891;
+    public long l12892;
+    public long l12893;
+    public long l12894;
+    public long l12895;
+    public long l12896;
+    public long l12897;
+    public long l12898;
+    public long l12899;
+    public long l12900;
+    public long l12901;
+    public long l12902;
+    public long l12903;
+    public long l12904;
+    public long l12905;
+    public long l12906;
+    public long l12907;
+    public long l12908;
+    public long l12909;
+    public long l12910;
+    public long l12911;
+    public long l12912;
+    public long l12913;
+    public long l12914;
+    public long l12915;
+    public long l12916;
+    public long l12917;
+    public long l12918;
+    public long l12919;
+    public long l12920;
+    public long l12921;
+    public long l12922;
+    public long l12923;
+    public long l12924;
+    public long l12925;
+    public long l12926;
+    public long l12927;
+    public long l12928;
+    public long l12929;
+    public long l12930;
+    public long l12931;
+    public long l12932;
+    public long l12933;
+    public long l12934;
+    public long l12935;
+    public long l12936;
+    public long l12937;
+    public long l12938;
+    public long l12939;
+    public long l12940;
+    public long l12941;
+    public long l12942;
+    public long l12943;
+    public long l12944;
+    public long l12945;
+    public long l12946;
+    public long l12947;
+    public long l12948;
+    public long l12949;
+    public long l12950;
+    public long l12951;
+    public long l12952;
+    public long l12953;
+    public long l12954;
+    public long l12955;
+    public long l12956;
+    public long l12957;
+    public long l12958;
+    public long l12959;
+    public long l12960;
+    public long l12961;
+    public long l12962;
+    public long l12963;
+    public long l12964;
+    public long l12965;
+    public long l12966;
+    public long l12967;
+    public long l12968;
+    public long l12969;
+    public long l12970;
+    public long l12971;
+    public long l12972;
+    public long l12973;
+    public long l12974;
+    public long l12975;
+    public long l12976;
+    public long l12977;
+    public long l12978;
+    public long l12979;
+    public long l12980;
+    public long l12981;
+    public long l12982;
+    public long l12983;
+    public long l12984;
+    public long l12985;
+    public long l12986;
+    public long l12987;
+    public long l12988;
+    public long l12989;
+    public long l12990;
+    public long l12991;
+    public long l12992;
+    public long l12993;
+    public long l12994;
+    public long l12995;
+    public long l12996;
+    public long l12997;
+    public long l12998;
+    public long l12999;
+    public long l13000;
+    public long l13001;
+    public long l13002;
+    public long l13003;
+    public long l13004;
+    public long l13005;
+    public long l13006;
+    public long l13007;
+    public long l13008;
+    public long l13009;
+    public long l13010;
+    public long l13011;
+    public long l13012;
+    public long l13013;
+    public long l13014;
+    public long l13015;
+    public long l13016;
+    public long l13017;
+    public long l13018;
+    public long l13019;
+    public long l13020;
+    public long l13021;
+    public long l13022;
+    public long l13023;
+    public long l13024;
+    public long l13025;
+    public long l13026;
+    public long l13027;
+    public long l13028;
+    public long l13029;
+    public long l13030;
+    public long l13031;
+    public long l13032;
+    public long l13033;
+    public long l13034;
+    public long l13035;
+    public long l13036;
+    public long l13037;
+    public long l13038;
+    public long l13039;
+    public long l13040;
+    public long l13041;
+    public long l13042;
+    public long l13043;
+    public long l13044;
+    public long l13045;
+    public long l13046;
+    public long l13047;
+    public long l13048;
+    public long l13049;
+    public long l13050;
+    public long l13051;
+    public long l13052;
+    public long l13053;
+    public long l13054;
+    public long l13055;
+    public long l13056;
+    public long l13057;
+    public long l13058;
+    public long l13059;
+    public long l13060;
+    public long l13061;
+    public long l13062;
+    public long l13063;
+    public long l13064;
+    public long l13065;
+    public long l13066;
+    public long l13067;
+    public long l13068;
+    public long l13069;
+    public long l13070;
+    public long l13071;
+    public long l13072;
+    public long l13073;
+    public long l13074;
+    public long l13075;
+    public long l13076;
+    public long l13077;
+    public long l13078;
+    public long l13079;
+    public long l13080;
+    public long l13081;
+    public long l13082;
+    public long l13083;
+    public long l13084;
+    public long l13085;
+    public long l13086;
+    public long l13087;
+    public long l13088;
+    public long l13089;
+    public long l13090;
+    public long l13091;
+    public long l13092;
+    public long l13093;
+    public long l13094;
+    public long l13095;
+    public long l13096;
+    public long l13097;
+    public long l13098;
+    public long l13099;
+    public long l13100;
+    public long l13101;
+    public long l13102;
+    public long l13103;
+    public long l13104;
+    public long l13105;
+    public long l13106;
+    public long l13107;
+    public long l13108;
+    public long l13109;
+    public long l13110;
+    public long l13111;
+    public long l13112;
+    public long l13113;
+    public long l13114;
+    public long l13115;
+    public long l13116;
+    public long l13117;
+    public long l13118;
+    public long l13119;
+    public long l13120;
+    public long l13121;
+    public long l13122;
+    public long l13123;
+    public long l13124;
+    public long l13125;
+    public long l13126;
+    public long l13127;
+    public long l13128;
+    public long l13129;
+    public long l13130;
+    public long l13131;
+    public long l13132;
+    public long l13133;
+    public long l13134;
+    public long l13135;
+    public long l13136;
+    public long l13137;
+    public long l13138;
+    public long l13139;
+    public long l13140;
+    public long l13141;
+    public long l13142;
+    public long l13143;
+    public long l13144;
+    public long l13145;
+    public long l13146;
+    public long l13147;
+    public long l13148;
+    public long l13149;
+    public long l13150;
+    public long l13151;
+    public long l13152;
+    public long l13153;
+    public long l13154;
+    public long l13155;
+    public long l13156;
+    public long l13157;
+    public long l13158;
+    public long l13159;
+    public long l13160;
+    public long l13161;
+    public long l13162;
+    public long l13163;
+    public long l13164;
+    public long l13165;
+    public long l13166;
+    public long l13167;
+    public long l13168;
+    public long l13169;
+    public long l13170;
+    public long l13171;
+    public long l13172;
+    public long l13173;
+    public long l13174;
+    public long l13175;
+    public long l13176;
+    public long l13177;
+    public long l13178;
+    public long l13179;
+    public long l13180;
+    public long l13181;
+    public long l13182;
+    public long l13183;
+    public long l13184;
+    public long l13185;
+    public long l13186;
+    public long l13187;
+    public long l13188;
+    public long l13189;
+    public long l13190;
+    public long l13191;
+    public long l13192;
+    public long l13193;
+    public long l13194;
+    public long l13195;
+    public long l13196;
+    public long l13197;
+    public long l13198;
+    public long l13199;
+    public long l13200;
+    public long l13201;
+    public long l13202;
+    public long l13203;
+    public long l13204;
+    public long l13205;
+    public long l13206;
+    public long l13207;
+    public long l13208;
+    public long l13209;
+    public long l13210;
+    public long l13211;
+    public long l13212;
+    public long l13213;
+    public long l13214;
+    public long l13215;
+    public long l13216;
+    public long l13217;
+    public long l13218;
+    public long l13219;
+    public long l13220;
+    public long l13221;
+    public long l13222;
+    public long l13223;
+    public long l13224;
+    public long l13225;
+    public long l13226;
+    public long l13227;
+    public long l13228;
+    public long l13229;
+    public long l13230;
+    public long l13231;
+    public long l13232;
+    public long l13233;
+    public long l13234;
+    public long l13235;
+    public long l13236;
+    public long l13237;
+    public long l13238;
+    public long l13239;
+    public long l13240;
+    public long l13241;
+    public long l13242;
+    public long l13243;
+    public long l13244;
+    public long l13245;
+    public long l13246;
+    public long l13247;
+    public long l13248;
+    public long l13249;
+    public long l13250;
+    public long l13251;
+    public long l13252;
+    public long l13253;
+    public long l13254;
+    public long l13255;
+    public long l13256;
+    public long l13257;
+    public long l13258;
+    public long l13259;
+    public long l13260;
+    public long l13261;
+    public long l13262;
+    public long l13263;
+    public long l13264;
+    public long l13265;
+    public long l13266;
+    public long l13267;
+    public long l13268;
+    public long l13269;
+    public long l13270;
+    public long l13271;
+    public long l13272;
+    public long l13273;
+    public long l13274;
+    public long l13275;
+    public long l13276;
+    public long l13277;
+    public long l13278;
+    public long l13279;
+    public long l13280;
+    public long l13281;
+    public long l13282;
+    public long l13283;
+    public long l13284;
+    public long l13285;
+    public long l13286;
+    public long l13287;
+    public long l13288;
+    public long l13289;
+    public long l13290;
+    public long l13291;
+    public long l13292;
+    public long l13293;
+    public long l13294;
+    public long l13295;
+    public long l13296;
+    public long l13297;
+    public long l13298;
+    public long l13299;
+    public long l13300;
+    public long l13301;
+    public long l13302;
+    public long l13303;
+    public long l13304;
+    public long l13305;
+    public long l13306;
+    public long l13307;
+    public long l13308;
+    public long l13309;
+    public long l13310;
+    public long l13311;
+    public long l13312;
+    public long l13313;
+    public long l13314;
+    public long l13315;
+    public long l13316;
+    public long l13317;
+    public long l13318;
+    public long l13319;
+    public long l13320;
+    public long l13321;
+    public long l13322;
+    public long l13323;
+    public long l13324;
+    public long l13325;
+    public long l13326;
+    public long l13327;
+    public long l13328;
+    public long l13329;
+    public long l13330;
+    public long l13331;
+    public long l13332;
+    public long l13333;
+    public long l13334;
+    public long l13335;
+    public long l13336;
+    public long l13337;
+    public long l13338;
+    public long l13339;
+    public long l13340;
+    public long l13341;
+    public long l13342;
+    public long l13343;
+    public long l13344;
+    public long l13345;
+    public long l13346;
+    public long l13347;
+    public long l13348;
+    public long l13349;
+    public long l13350;
+    public long l13351;
+    public long l13352;
+    public long l13353;
+    public long l13354;
+    public long l13355;
+    public long l13356;
+    public long l13357;
+    public long l13358;
+    public long l13359;
+    public long l13360;
+    public long l13361;
+    public long l13362;
+    public long l13363;
+    public long l13364;
+    public long l13365;
+    public long l13366;
+    public long l13367;
+    public long l13368;
+    public long l13369;
+    public long l13370;
+    public long l13371;
+    public long l13372;
+    public long l13373;
+    public long l13374;
+    public long l13375;
+    public long l13376;
+    public long l13377;
+    public long l13378;
+    public long l13379;
+    public long l13380;
+    public long l13381;
+    public long l13382;
+    public long l13383;
+    public long l13384;
+    public long l13385;
+    public long l13386;
+    public long l13387;
+    public long l13388;
+    public long l13389;
+    public long l13390;
+    public long l13391;
+    public long l13392;
+    public long l13393;
+    public long l13394;
+    public long l13395;
+    public long l13396;
+    public long l13397;
+    public long l13398;
+    public long l13399;
+    public long l13400;
+    public long l13401;
+    public long l13402;
+    public long l13403;
+    public long l13404;
+    public long l13405;
+    public long l13406;
+    public long l13407;
+    public long l13408;
+    public long l13409;
+    public long l13410;
+    public long l13411;
+    public long l13412;
+    public long l13413;
+    public long l13414;
+    public long l13415;
+    public long l13416;
+    public long l13417;
+    public long l13418;
+    public long l13419;
+    public long l13420;
+    public long l13421;
+    public long l13422;
+    public long l13423;
+    public long l13424;
+    public long l13425;
+    public long l13426;
+    public long l13427;
+    public long l13428;
+    public long l13429;
+    public long l13430;
+    public long l13431;
+    public long l13432;
+    public long l13433;
+    public long l13434;
+    public long l13435;
+    public long l13436;
+    public long l13437;
+    public long l13438;
+    public long l13439;
+    public long l13440;
+    public long l13441;
+    public long l13442;
+    public long l13443;
+    public long l13444;
+    public long l13445;
+    public long l13446;
+    public long l13447;
+    public long l13448;
+    public long l13449;
+    public long l13450;
+    public long l13451;
+    public long l13452;
+    public long l13453;
+    public long l13454;
+    public long l13455;
+    public long l13456;
+    public long l13457;
+    public long l13458;
+    public long l13459;
+    public long l13460;
+    public long l13461;
+    public long l13462;
+    public long l13463;
+    public long l13464;
+    public long l13465;
+    public long l13466;
+    public long l13467;
+    public long l13468;
+    public long l13469;
+    public long l13470;
+    public long l13471;
+    public long l13472;
+    public long l13473;
+    public long l13474;
+    public long l13475;
+    public long l13476;
+    public long l13477;
+    public long l13478;
+    public long l13479;
+    public long l13480;
+    public long l13481;
+    public long l13482;
+    public long l13483;
+    public long l13484;
+    public long l13485;
+    public long l13486;
+    public long l13487;
+    public long l13488;
+    public long l13489;
+    public long l13490;
+    public long l13491;
+    public long l13492;
+    public long l13493;
+    public long l13494;
+    public long l13495;
+    public long l13496;
+    public long l13497;
+    public long l13498;
+    public long l13499;
+    public long l13500;
+    public long l13501;
+    public long l13502;
+    public long l13503;
+    public long l13504;
+    public long l13505;
+    public long l13506;
+    public long l13507;
+    public long l13508;
+    public long l13509;
+    public long l13510;
+    public long l13511;
+    public long l13512;
+    public long l13513;
+    public long l13514;
+    public long l13515;
+    public long l13516;
+    public long l13517;
+    public long l13518;
+    public long l13519;
+    public long l13520;
+    public long l13521;
+    public long l13522;
+    public long l13523;
+    public long l13524;
+    public long l13525;
+    public long l13526;
+    public long l13527;
+    public long l13528;
+    public long l13529;
+    public long l13530;
+    public long l13531;
+    public long l13532;
+    public long l13533;
+    public long l13534;
+    public long l13535;
+    public long l13536;
+    public long l13537;
+    public long l13538;
+    public long l13539;
+    public long l13540;
+    public long l13541;
+    public long l13542;
+    public long l13543;
+    public long l13544;
+    public long l13545;
+    public long l13546;
+    public long l13547;
+    public long l13548;
+    public long l13549;
+    public long l13550;
+    public long l13551;
+    public long l13552;
+    public long l13553;
+    public long l13554;
+    public long l13555;
+    public long l13556;
+    public long l13557;
+    public long l13558;
+    public long l13559;
+    public long l13560;
+    public long l13561;
+    public long l13562;
+    public long l13563;
+    public long l13564;
+    public long l13565;
+    public long l13566;
+    public long l13567;
+    public long l13568;
+    public long l13569;
+    public long l13570;
+    public long l13571;
+    public long l13572;
+    public long l13573;
+    public long l13574;
+    public long l13575;
+    public long l13576;
+    public long l13577;
+    public long l13578;
+    public long l13579;
+    public long l13580;
+    public long l13581;
+    public long l13582;
+    public long l13583;
+    public long l13584;
+    public long l13585;
+    public long l13586;
+    public long l13587;
+    public long l13588;
+    public long l13589;
+    public long l13590;
+    public long l13591;
+    public long l13592;
+    public long l13593;
+    public long l13594;
+    public long l13595;
+    public long l13596;
+    public long l13597;
+    public long l13598;
+    public long l13599;
+    public long l13600;
+    public long l13601;
+    public long l13602;
+    public long l13603;
+    public long l13604;
+    public long l13605;
+    public long l13606;
+    public long l13607;
+    public long l13608;
+    public long l13609;
+    public long l13610;
+    public long l13611;
+    public long l13612;
+    public long l13613;
+    public long l13614;
+    public long l13615;
+    public long l13616;
+    public long l13617;
+    public long l13618;
+    public long l13619;
+    public long l13620;
+    public long l13621;
+    public long l13622;
+    public long l13623;
+    public long l13624;
+    public long l13625;
+    public long l13626;
+    public long l13627;
+    public long l13628;
+    public long l13629;
+    public long l13630;
+    public long l13631;
+    public long l13632;
+    public long l13633;
+    public long l13634;
+    public long l13635;
+    public long l13636;
+    public long l13637;
+    public long l13638;
+    public long l13639;
+    public long l13640;
+    public long l13641;
+    public long l13642;
+    public long l13643;
+    public long l13644;
+    public long l13645;
+    public long l13646;
+    public long l13647;
+    public long l13648;
+    public long l13649;
+    public long l13650;
+    public long l13651;
+    public long l13652;
+    public long l13653;
+    public long l13654;
+    public long l13655;
+    public long l13656;
+    public long l13657;
+    public long l13658;
+    public long l13659;
+    public long l13660;
+    public long l13661;
+    public long l13662;
+    public long l13663;
+    public long l13664;
+    public long l13665;
+    public long l13666;
+    public long l13667;
+    public long l13668;
+    public long l13669;
+    public long l13670;
+    public long l13671;
+    public long l13672;
+    public long l13673;
+    public long l13674;
+    public long l13675;
+    public long l13676;
+    public long l13677;
+    public long l13678;
+    public long l13679;
+    public long l13680;
+    public long l13681;
+    public long l13682;
+    public long l13683;
+    public long l13684;
+    public long l13685;
+    public long l13686;
+    public long l13687;
+    public long l13688;
+    public long l13689;
+    public long l13690;
+    public long l13691;
+    public long l13692;
+    public long l13693;
+    public long l13694;
+    public long l13695;
+    public long l13696;
+    public long l13697;
+    public long l13698;
+    public long l13699;
+    public long l13700;
+    public long l13701;
+    public long l13702;
+    public long l13703;
+    public long l13704;
+    public long l13705;
+    public long l13706;
+    public long l13707;
+    public long l13708;
+    public long l13709;
+    public long l13710;
+    public long l13711;
+    public long l13712;
+    public long l13713;
+    public long l13714;
+    public long l13715;
+    public long l13716;
+    public long l13717;
+    public long l13718;
+    public long l13719;
+    public long l13720;
+    public long l13721;
+    public long l13722;
+    public long l13723;
+    public long l13724;
+    public long l13725;
+    public long l13726;
+    public long l13727;
+    public long l13728;
+    public long l13729;
+    public long l13730;
+    public long l13731;
+    public long l13732;
+    public long l13733;
+    public long l13734;
+    public long l13735;
+    public long l13736;
+    public long l13737;
+    public long l13738;
+    public long l13739;
+    public long l13740;
+    public long l13741;
+    public long l13742;
+    public long l13743;
+    public long l13744;
+    public long l13745;
+    public long l13746;
+    public long l13747;
+    public long l13748;
+    public long l13749;
+    public long l13750;
+    public long l13751;
+    public long l13752;
+    public long l13753;
+    public long l13754;
+    public long l13755;
+    public long l13756;
+    public long l13757;
+    public long l13758;
+    public long l13759;
+    public long l13760;
+    public long l13761;
+    public long l13762;
+    public long l13763;
+    public long l13764;
+    public long l13765;
+    public long l13766;
+    public long l13767;
+    public long l13768;
+    public long l13769;
+    public long l13770;
+    public long l13771;
+    public long l13772;
+    public long l13773;
+    public long l13774;
+    public long l13775;
+    public long l13776;
+    public long l13777;
+    public long l13778;
+    public long l13779;
+    public long l13780;
+    public long l13781;
+    public long l13782;
+    public long l13783;
+    public long l13784;
+    public long l13785;
+    public long l13786;
+    public long l13787;
+    public long l13788;
+    public long l13789;
+    public long l13790;
+    public long l13791;
+    public long l13792;
+    public long l13793;
+    public long l13794;
+    public long l13795;
+    public long l13796;
+    public long l13797;
+    public long l13798;
+    public long l13799;
+    public long l13800;
+    public long l13801;
+    public long l13802;
+    public long l13803;
+    public long l13804;
+    public long l13805;
+    public long l13806;
+    public long l13807;
+    public long l13808;
+    public long l13809;
+    public long l13810;
+    public long l13811;
+    public long l13812;
+    public long l13813;
+    public long l13814;
+    public long l13815;
+    public long l13816;
+    public long l13817;
+    public long l13818;
+    public long l13819;
+    public long l13820;
+    public long l13821;
+    public long l13822;
+    public long l13823;
+    public long l13824;
+    public long l13825;
+    public long l13826;
+    public long l13827;
+    public long l13828;
+    public long l13829;
+    public long l13830;
+    public long l13831;
+    public long l13832;
+    public long l13833;
+    public long l13834;
+    public long l13835;
+    public long l13836;
+    public long l13837;
+    public long l13838;
+    public long l13839;
+    public long l13840;
+    public long l13841;
+    public long l13842;
+    public long l13843;
+    public long l13844;
+    public long l13845;
+    public long l13846;
+    public long l13847;
+    public long l13848;
+    public long l13849;
+    public long l13850;
+    public long l13851;
+    public long l13852;
+    public long l13853;
+    public long l13854;
+    public long l13855;
+    public long l13856;
+    public long l13857;
+    public long l13858;
+    public long l13859;
+    public long l13860;
+    public long l13861;
+    public long l13862;
+    public long l13863;
+    public long l13864;
+    public long l13865;
+    public long l13866;
+    public long l13867;
+    public long l13868;
+    public long l13869;
+    public long l13870;
+    public long l13871;
+    public long l13872;
+    public long l13873;
+    public long l13874;
+    public long l13875;
+    public long l13876;
+    public long l13877;
+    public long l13878;
+    public long l13879;
+    public long l13880;
+    public long l13881;
+    public long l13882;
+    public long l13883;
+    public long l13884;
+    public long l13885;
+    public long l13886;
+    public long l13887;
+    public long l13888;
+    public long l13889;
+    public long l13890;
+    public long l13891;
+    public long l13892;
+    public long l13893;
+    public long l13894;
+    public long l13895;
+    public long l13896;
+    public long l13897;
+    public long l13898;
+    public long l13899;
+    public long l13900;
+    public long l13901;
+    public long l13902;
+    public long l13903;
+    public long l13904;
+    public long l13905;
+    public long l13906;
+    public long l13907;
+    public long l13908;
+    public long l13909;
+    public long l13910;
+    public long l13911;
+    public long l13912;
+    public long l13913;
+    public long l13914;
+    public long l13915;
+    public long l13916;
+    public long l13917;
+    public long l13918;
+    public long l13919;
+    public long l13920;
+    public long l13921;
+    public long l13922;
+    public long l13923;
+    public long l13924;
+    public long l13925;
+    public long l13926;
+    public long l13927;
+    public long l13928;
+    public long l13929;
+    public long l13930;
+    public long l13931;
+    public long l13932;
+    public long l13933;
+    public long l13934;
+    public long l13935;
+    public long l13936;
+    public long l13937;
+    public long l13938;
+    public long l13939;
+    public long l13940;
+    public long l13941;
+    public long l13942;
+    public long l13943;
+    public long l13944;
+    public long l13945;
+    public long l13946;
+    public long l13947;
+    public long l13948;
+    public long l13949;
+    public long l13950;
+    public long l13951;
+    public long l13952;
+    public long l13953;
+    public long l13954;
+    public long l13955;
+    public long l13956;
+    public long l13957;
+    public long l13958;
+    public long l13959;
+    public long l13960;
+    public long l13961;
+    public long l13962;
+    public long l13963;
+    public long l13964;
+    public long l13965;
+    public long l13966;
+    public long l13967;
+    public long l13968;
+    public long l13969;
+    public long l13970;
+    public long l13971;
+    public long l13972;
+    public long l13973;
+    public long l13974;
+    public long l13975;
+    public long l13976;
+    public long l13977;
+    public long l13978;
+    public long l13979;
+    public long l13980;
+    public long l13981;
+    public long l13982;
+    public long l13983;
+    public long l13984;
+    public long l13985;
+    public long l13986;
+    public long l13987;
+    public long l13988;
+    public long l13989;
+    public long l13990;
+    public long l13991;
+    public long l13992;
+    public long l13993;
+    public long l13994;
+    public long l13995;
+    public long l13996;
+    public long l13997;
+    public long l13998;
+    public long l13999;
+    public long l14000;
+    public long l14001;
+    public long l14002;
+    public long l14003;
+    public long l14004;
+    public long l14005;
+    public long l14006;
+    public long l14007;
+    public long l14008;
+    public long l14009;
+    public long l14010;
+    public long l14011;
+    public long l14012;
+    public long l14013;
+    public long l14014;
+    public long l14015;
+    public long l14016;
+    public long l14017;
+    public long l14018;
+    public long l14019;
+    public long l14020;
+    public long l14021;
+    public long l14022;
+    public long l14023;
+    public long l14024;
+    public long l14025;
+    public long l14026;
+    public long l14027;
+    public long l14028;
+    public long l14029;
+    public long l14030;
+    public long l14031;
+    public long l14032;
+    public long l14033;
+    public long l14034;
+    public long l14035;
+    public long l14036;
+    public long l14037;
+    public long l14038;
+    public long l14039;
+    public long l14040;
+    public long l14041;
+    public long l14042;
+    public long l14043;
+    public long l14044;
+    public long l14045;
+    public long l14046;
+    public long l14047;
+    public long l14048;
+    public long l14049;
+    public long l14050;
+    public long l14051;
+    public long l14052;
+    public long l14053;
+    public long l14054;
+    public long l14055;
+    public long l14056;
+    public long l14057;
+    public long l14058;
+    public long l14059;
+    public long l14060;
+    public long l14061;
+    public long l14062;
+    public long l14063;
+    public long l14064;
+    public long l14065;
+    public long l14066;
+    public long l14067;
+    public long l14068;
+    public long l14069;
+    public long l14070;
+    public long l14071;
+    public long l14072;
+    public long l14073;
+    public long l14074;
+    public long l14075;
+    public long l14076;
+    public long l14077;
+    public long l14078;
+    public long l14079;
+    public long l14080;
+    public long l14081;
+    public long l14082;
+    public long l14083;
+    public long l14084;
+    public long l14085;
+    public long l14086;
+    public long l14087;
+    public long l14088;
+    public long l14089;
+    public long l14090;
+    public long l14091;
+    public long l14092;
+    public long l14093;
+    public long l14094;
+    public long l14095;
+    public long l14096;
+    public long l14097;
+    public long l14098;
+    public long l14099;
+    public long l14100;
+    public long l14101;
+    public long l14102;
+    public long l14103;
+    public long l14104;
+    public long l14105;
+    public long l14106;
+    public long l14107;
+    public long l14108;
+    public long l14109;
+    public long l14110;
+    public long l14111;
+    public long l14112;
+    public long l14113;
+    public long l14114;
+    public long l14115;
+    public long l14116;
+    public long l14117;
+    public long l14118;
+    public long l14119;
+    public long l14120;
+    public long l14121;
+    public long l14122;
+    public long l14123;
+    public long l14124;
+    public long l14125;
+    public long l14126;
+    public long l14127;
+    public long l14128;
+    public long l14129;
+    public long l14130;
+    public long l14131;
+    public long l14132;
+    public long l14133;
+    public long l14134;
+    public long l14135;
+    public long l14136;
+    public long l14137;
+    public long l14138;
+    public long l14139;
+    public long l14140;
+    public long l14141;
+    public long l14142;
+    public long l14143;
+    public long l14144;
+    public long l14145;
+    public long l14146;
+    public long l14147;
+    public long l14148;
+    public long l14149;
+    public long l14150;
+    public long l14151;
+    public long l14152;
+    public long l14153;
+    public long l14154;
+    public long l14155;
+    public long l14156;
+    public long l14157;
+    public long l14158;
+    public long l14159;
+    public long l14160;
+    public long l14161;
+    public long l14162;
+    public long l14163;
+    public long l14164;
+    public long l14165;
+    public long l14166;
+    public long l14167;
+    public long l14168;
+    public long l14169;
+    public long l14170;
+    public long l14171;
+    public long l14172;
+    public long l14173;
+    public long l14174;
+    public long l14175;
+    public long l14176;
+    public long l14177;
+    public long l14178;
+    public long l14179;
+    public long l14180;
+    public long l14181;
+    public long l14182;
+    public long l14183;
+    public long l14184;
+    public long l14185;
+    public long l14186;
+    public long l14187;
+    public long l14188;
+    public long l14189;
+    public long l14190;
+    public long l14191;
+    public long l14192;
+    public long l14193;
+    public long l14194;
+    public long l14195;
+    public long l14196;
+    public long l14197;
+    public long l14198;
+    public long l14199;
+    public long l14200;
+    public long l14201;
+    public long l14202;
+    public long l14203;
+    public long l14204;
+    public long l14205;
+    public long l14206;
+    public long l14207;
+    public long l14208;
+    public long l14209;
+    public long l14210;
+    public long l14211;
+    public long l14212;
+    public long l14213;
+    public long l14214;
+    public long l14215;
+    public long l14216;
+    public long l14217;
+    public long l14218;
+    public long l14219;
+    public long l14220;
+    public long l14221;
+    public long l14222;
+    public long l14223;
+    public long l14224;
+    public long l14225;
+    public long l14226;
+    public long l14227;
+    public long l14228;
+    public long l14229;
+    public long l14230;
+    public long l14231;
+    public long l14232;
+    public long l14233;
+    public long l14234;
+    public long l14235;
+    public long l14236;
+    public long l14237;
+    public long l14238;
+    public long l14239;
+    public long l14240;
+    public long l14241;
+    public long l14242;
+    public long l14243;
+    public long l14244;
+    public long l14245;
+    public long l14246;
+    public long l14247;
+    public long l14248;
+    public long l14249;
+    public long l14250;
+    public long l14251;
+    public long l14252;
+    public long l14253;
+    public long l14254;
+    public long l14255;
+    public long l14256;
+    public long l14257;
+    public long l14258;
+    public long l14259;
+    public long l14260;
+    public long l14261;
+    public long l14262;
+    public long l14263;
+    public long l14264;
+    public long l14265;
+    public long l14266;
+    public long l14267;
+    public long l14268;
+    public long l14269;
+    public long l14270;
+    public long l14271;
+    public long l14272;
+    public long l14273;
+    public long l14274;
+    public long l14275;
+    public long l14276;
+    public long l14277;
+    public long l14278;
+    public long l14279;
+    public long l14280;
+    public long l14281;
+    public long l14282;
+    public long l14283;
+    public long l14284;
+    public long l14285;
+    public long l14286;
+    public long l14287;
+    public long l14288;
+    public long l14289;
+    public long l14290;
+    public long l14291;
+    public long l14292;
+    public long l14293;
+    public long l14294;
+    public long l14295;
+    public long l14296;
+    public long l14297;
+    public long l14298;
+    public long l14299;
+    public long l14300;
+    public long l14301;
+    public long l14302;
+    public long l14303;
+    public long l14304;
+    public long l14305;
+    public long l14306;
+    public long l14307;
+    public long l14308;
+    public long l14309;
+    public long l14310;
+    public long l14311;
+    public long l14312;
+    public long l14313;
+    public long l14314;
+    public long l14315;
+    public long l14316;
+    public long l14317;
+    public long l14318;
+    public long l14319;
+    public long l14320;
+    public long l14321;
+    public long l14322;
+    public long l14323;
+    public long l14324;
+    public long l14325;
+    public long l14326;
+    public long l14327;
+    public long l14328;
+    public long l14329;
+    public long l14330;
+    public long l14331;
+    public long l14332;
+    public long l14333;
+    public long l14334;
+    public long l14335;
+    public long l14336;
+    public long l14337;
+    public long l14338;
+    public long l14339;
+    public long l14340;
+    public long l14341;
+    public long l14342;
+    public long l14343;
+    public long l14344;
+    public long l14345;
+    public long l14346;
+    public long l14347;
+    public long l14348;
+    public long l14349;
+    public long l14350;
+    public long l14351;
+    public long l14352;
+    public long l14353;
+    public long l14354;
+    public long l14355;
+    public long l14356;
+    public long l14357;
+    public long l14358;
+    public long l14359;
+    public long l14360;
+    public long l14361;
+    public long l14362;
+    public long l14363;
+    public long l14364;
+    public long l14365;
+    public long l14366;
+    public long l14367;
+    public long l14368;
+    public long l14369;
+    public long l14370;
+    public long l14371;
+    public long l14372;
+    public long l14373;
+    public long l14374;
+    public long l14375;
+    public long l14376;
+    public long l14377;
+    public long l14378;
+    public long l14379;
+    public long l14380;
+    public long l14381;
+    public long l14382;
+    public long l14383;
+    public long l14384;
+    public long l14385;
+    public long l14386;
+    public long l14387;
+    public long l14388;
+    public long l14389;
+    public long l14390;
+    public long l14391;
+    public long l14392;
+    public long l14393;
+    public long l14394;
+    public long l14395;
+    public long l14396;
+    public long l14397;
+    public long l14398;
+    public long l14399;
+    public long l14400;
+    public long l14401;
+    public long l14402;
+    public long l14403;
+    public long l14404;
+    public long l14405;
+    public long l14406;
+    public long l14407;
+    public long l14408;
+    public long l14409;
+    public long l14410;
+    public long l14411;
+    public long l14412;
+    public long l14413;
+    public long l14414;
+    public long l14415;
+    public long l14416;
+    public long l14417;
+    public long l14418;
+    public long l14419;
+    public long l14420;
+    public long l14421;
+    public long l14422;
+    public long l14423;
+    public long l14424;
+    public long l14425;
+    public long l14426;
+    public long l14427;
+    public long l14428;
+    public long l14429;
+    public long l14430;
+    public long l14431;
+    public long l14432;
+    public long l14433;
+    public long l14434;
+    public long l14435;
+    public long l14436;
+    public long l14437;
+    public long l14438;
+    public long l14439;
+    public long l14440;
+    public long l14441;
+    public long l14442;
+    public long l14443;
+    public long l14444;
+    public long l14445;
+    public long l14446;
+    public long l14447;
+    public long l14448;
+    public long l14449;
+    public long l14450;
+    public long l14451;
+    public long l14452;
+    public long l14453;
+    public long l14454;
+    public long l14455;
+    public long l14456;
+    public long l14457;
+    public long l14458;
+    public long l14459;
+    public long l14460;
+    public long l14461;
+    public long l14462;
+    public long l14463;
+    public long l14464;
+    public long l14465;
+    public long l14466;
+    public long l14467;
+    public long l14468;
+    public long l14469;
+    public long l14470;
+    public long l14471;
+    public long l14472;
+    public long l14473;
+    public long l14474;
+    public long l14475;
+    public long l14476;
+    public long l14477;
+    public long l14478;
+    public long l14479;
+    public long l14480;
+    public long l14481;
+    public long l14482;
+    public long l14483;
+    public long l14484;
+    public long l14485;
+    public long l14486;
+    public long l14487;
+    public long l14488;
+    public long l14489;
+    public long l14490;
+    public long l14491;
+    public long l14492;
+    public long l14493;
+    public long l14494;
+    public long l14495;
+    public long l14496;
+    public long l14497;
+    public long l14498;
+    public long l14499;
+    public long l14500;
+    public long l14501;
+    public long l14502;
+    public long l14503;
+    public long l14504;
+    public long l14505;
+    public long l14506;
+    public long l14507;
+    public long l14508;
+    public long l14509;
+    public long l14510;
+    public long l14511;
+    public long l14512;
+    public long l14513;
+    public long l14514;
+    public long l14515;
+    public long l14516;
+    public long l14517;
+    public long l14518;
+    public long l14519;
+    public long l14520;
+    public long l14521;
+    public long l14522;
+    public long l14523;
+    public long l14524;
+    public long l14525;
+    public long l14526;
+    public long l14527;
+    public long l14528;
+    public long l14529;
+    public long l14530;
+    public long l14531;
+    public long l14532;
+    public long l14533;
+    public long l14534;
+    public long l14535;
+    public long l14536;
+    public long l14537;
+    public long l14538;
+    public long l14539;
+    public long l14540;
+    public long l14541;
+    public long l14542;
+    public long l14543;
+    public long l14544;
+    public long l14545;
+    public long l14546;
+    public long l14547;
+    public long l14548;
+    public long l14549;
+    public long l14550;
+    public long l14551;
+    public long l14552;
+    public long l14553;
+    public long l14554;
+    public long l14555;
+    public long l14556;
+    public long l14557;
+    public long l14558;
+    public long l14559;
+    public long l14560;
+    public long l14561;
+    public long l14562;
+    public long l14563;
+    public long l14564;
+    public long l14565;
+    public long l14566;
+    public long l14567;
+    public long l14568;
+    public long l14569;
+    public long l14570;
+    public long l14571;
+    public long l14572;
+    public long l14573;
+    public long l14574;
+    public long l14575;
+    public long l14576;
+    public long l14577;
+    public long l14578;
+    public long l14579;
+    public long l14580;
+    public long l14581;
+    public long l14582;
+    public long l14583;
+    public long l14584;
+    public long l14585;
+    public long l14586;
+    public long l14587;
+    public long l14588;
+    public long l14589;
+    public long l14590;
+    public long l14591;
+    public long l14592;
+    public long l14593;
+    public long l14594;
+    public long l14595;
+    public long l14596;
+    public long l14597;
+    public long l14598;
+    public long l14599;
+    public long l14600;
+    public long l14601;
+    public long l14602;
+    public long l14603;
+    public long l14604;
+    public long l14605;
+    public long l14606;
+    public long l14607;
+    public long l14608;
+    public long l14609;
+    public long l14610;
+    public long l14611;
+    public long l14612;
+    public long l14613;
+    public long l14614;
+    public long l14615;
+    public long l14616;
+    public long l14617;
+    public long l14618;
+    public long l14619;
+    public long l14620;
+    public long l14621;
+    public long l14622;
+    public long l14623;
+    public long l14624;
+    public long l14625;
+    public long l14626;
+    public long l14627;
+    public long l14628;
+    public long l14629;
+    public long l14630;
+    public long l14631;
+    public long l14632;
+    public long l14633;
+    public long l14634;
+    public long l14635;
+    public long l14636;
+    public long l14637;
+    public long l14638;
+    public long l14639;
+    public long l14640;
+    public long l14641;
+    public long l14642;
+    public long l14643;
+    public long l14644;
+    public long l14645;
+    public long l14646;
+    public long l14647;
+    public long l14648;
+    public long l14649;
+    public long l14650;
+    public long l14651;
+    public long l14652;
+    public long l14653;
+    public long l14654;
+    public long l14655;
+    public long l14656;
+    public long l14657;
+    public long l14658;
+    public long l14659;
+    public long l14660;
+    public long l14661;
+    public long l14662;
+    public long l14663;
+    public long l14664;
+    public long l14665;
+    public long l14666;
+    public long l14667;
+    public long l14668;
+    public long l14669;
+    public long l14670;
+    public long l14671;
+    public long l14672;
+    public long l14673;
+    public long l14674;
+    public long l14675;
+    public long l14676;
+    public long l14677;
+    public long l14678;
+    public long l14679;
+    public long l14680;
+    public long l14681;
+    public long l14682;
+    public long l14683;
+    public long l14684;
+    public long l14685;
+    public long l14686;
+    public long l14687;
+    public long l14688;
+    public long l14689;
+    public long l14690;
+    public long l14691;
+    public long l14692;
+    public long l14693;
+    public long l14694;
+    public long l14695;
+    public long l14696;
+    public long l14697;
+    public long l14698;
+    public long l14699;
+    public long l14700;
+    public long l14701;
+    public long l14702;
+    public long l14703;
+    public long l14704;
+    public long l14705;
+    public long l14706;
+    public long l14707;
+    public long l14708;
+    public long l14709;
+    public long l14710;
+    public long l14711;
+    public long l14712;
+    public long l14713;
+    public long l14714;
+    public long l14715;
+    public long l14716;
+    public long l14717;
+    public long l14718;
+    public long l14719;
+    public long l14720;
+    public long l14721;
+    public long l14722;
+    public long l14723;
+    public long l14724;
+    public long l14725;
+    public long l14726;
+    public long l14727;
+    public long l14728;
+    public long l14729;
+    public long l14730;
+    public long l14731;
+    public long l14732;
+    public long l14733;
+    public long l14734;
+    public long l14735;
+    public long l14736;
+    public long l14737;
+    public long l14738;
+    public long l14739;
+    public long l14740;
+    public long l14741;
+    public long l14742;
+    public long l14743;
+    public long l14744;
+    public long l14745;
+    public long l14746;
+    public long l14747;
+    public long l14748;
+    public long l14749;
+    public long l14750;
+    public long l14751;
+    public long l14752;
+    public long l14753;
+    public long l14754;
+    public long l14755;
+    public long l14756;
+    public long l14757;
+    public long l14758;
+    public long l14759;
+    public long l14760;
+    public long l14761;
+    public long l14762;
+    public long l14763;
+    public long l14764;
+    public long l14765;
+    public long l14766;
+    public long l14767;
+    public long l14768;
+    public long l14769;
+    public long l14770;
+    public long l14771;
+    public long l14772;
+    public long l14773;
+    public long l14774;
+    public long l14775;
+    public long l14776;
+    public long l14777;
+    public long l14778;
+    public long l14779;
+    public long l14780;
+    public long l14781;
+    public long l14782;
+    public long l14783;
+    public long l14784;
+    public long l14785;
+    public long l14786;
+    public long l14787;
+    public long l14788;
+    public long l14789;
+    public long l14790;
+    public long l14791;
+    public long l14792;
+    public long l14793;
+    public long l14794;
+    public long l14795;
+    public long l14796;
+    public long l14797;
+    public long l14798;
+    public long l14799;
+    public long l14800;
+    public long l14801;
+    public long l14802;
+    public long l14803;
+    public long l14804;
+    public long l14805;
+    public long l14806;
+    public long l14807;
+    public long l14808;
+    public long l14809;
+    public long l14810;
+    public long l14811;
+    public long l14812;
+    public long l14813;
+    public long l14814;
+    public long l14815;
+    public long l14816;
+    public long l14817;
+    public long l14818;
+    public long l14819;
+    public long l14820;
+    public long l14821;
+    public long l14822;
+    public long l14823;
+    public long l14824;
+    public long l14825;
+    public long l14826;
+    public long l14827;
+    public long l14828;
+    public long l14829;
+    public long l14830;
+    public long l14831;
+    public long l14832;
+    public long l14833;
+    public long l14834;
+    public long l14835;
+    public long l14836;
+    public long l14837;
+    public long l14838;
+    public long l14839;
+    public long l14840;
+    public long l14841;
+    public long l14842;
+    public long l14843;
+    public long l14844;
+    public long l14845;
+    public long l14846;
+    public long l14847;
+    public long l14848;
+    public long l14849;
+    public long l14850;
+    public long l14851;
+    public long l14852;
+    public long l14853;
+    public long l14854;
+    public long l14855;
+    public long l14856;
+    public long l14857;
+    public long l14858;
+    public long l14859;
+    public long l14860;
+    public long l14861;
+    public long l14862;
+    public long l14863;
+    public long l14864;
+    public long l14865;
+    public long l14866;
+    public long l14867;
+    public long l14868;
+    public long l14869;
+    public long l14870;
+    public long l14871;
+    public long l14872;
+    public long l14873;
+    public long l14874;
+    public long l14875;
+    public long l14876;
+    public long l14877;
+    public long l14878;
+    public long l14879;
+    public long l14880;
+    public long l14881;
+    public long l14882;
+    public long l14883;
+    public long l14884;
+    public long l14885;
+    public long l14886;
+    public long l14887;
+    public long l14888;
+    public long l14889;
+    public long l14890;
+    public long l14891;
+    public long l14892;
+    public long l14893;
+    public long l14894;
+    public long l14895;
+    public long l14896;
+    public long l14897;
+    public long l14898;
+    public long l14899;
+    public long l14900;
+    public long l14901;
+    public long l14902;
+    public long l14903;
+    public long l14904;
+    public long l14905;
+    public long l14906;
+    public long l14907;
+    public long l14908;
+    public long l14909;
+    public long l14910;
+    public long l14911;
+    public long l14912;
+    public long l14913;
+    public long l14914;
+    public long l14915;
+    public long l14916;
+    public long l14917;
+    public long l14918;
+    public long l14919;
+    public long l14920;
+    public long l14921;
+    public long l14922;
+    public long l14923;
+    public long l14924;
+    public long l14925;
+    public long l14926;
+    public long l14927;
+    public long l14928;
+    public long l14929;
+    public long l14930;
+    public long l14931;
+    public long l14932;
+    public long l14933;
+    public long l14934;
+    public long l14935;
+    public long l14936;
+    public long l14937;
+    public long l14938;
+    public long l14939;
+    public long l14940;
+    public long l14941;
+    public long l14942;
+    public long l14943;
+    public long l14944;
+    public long l14945;
+    public long l14946;
+    public long l14947;
+    public long l14948;
+    public long l14949;
+    public long l14950;
+    public long l14951;
+    public long l14952;
+    public long l14953;
+    public long l14954;
+    public long l14955;
+    public long l14956;
+    public long l14957;
+    public long l14958;
+    public long l14959;
+    public long l14960;
+    public long l14961;
+    public long l14962;
+    public long l14963;
+    public long l14964;
+    public long l14965;
+    public long l14966;
+    public long l14967;
+    public long l14968;
+    public long l14969;
+    public long l14970;
+    public long l14971;
+    public long l14972;
+    public long l14973;
+    public long l14974;
+    public long l14975;
+    public long l14976;
+    public long l14977;
+    public long l14978;
+    public long l14979;
+    public long l14980;
+    public long l14981;
+    public long l14982;
+    public long l14983;
+    public long l14984;
+    public long l14985;
+    public long l14986;
+    public long l14987;
+    public long l14988;
+    public long l14989;
+    public long l14990;
+    public long l14991;
+    public long l14992;
+    public long l14993;
+    public long l14994;
+    public long l14995;
+    public long l14996;
+    public long l14997;
+    public long l14998;
+    public long l14999;
+    public long l15000;
+    public long l15001;
+    public long l15002;
+    public long l15003;
+    public long l15004;
+    public long l15005;
+    public long l15006;
+    public long l15007;
+    public long l15008;
+    public long l15009;
+    public long l15010;
+    public long l15011;
+    public long l15012;
+    public long l15013;
+    public long l15014;
+    public long l15015;
+    public long l15016;
+    public long l15017;
+    public long l15018;
+    public long l15019;
+    public long l15020;
+    public long l15021;
+    public long l15022;
+    public long l15023;
+    public long l15024;
+    public long l15025;
+    public long l15026;
+    public long l15027;
+    public long l15028;
+    public long l15029;
+    public long l15030;
+    public long l15031;
+    public long l15032;
+    public long l15033;
+    public long l15034;
+    public long l15035;
+    public long l15036;
+    public long l15037;
+    public long l15038;
+    public long l15039;
+    public long l15040;
+    public long l15041;
+    public long l15042;
+    public long l15043;
+    public long l15044;
+    public long l15045;
+    public long l15046;
+    public long l15047;
+    public long l15048;
+    public long l15049;
+    public long l15050;
+    public long l15051;
+    public long l15052;
+    public long l15053;
+    public long l15054;
+    public long l15055;
+    public long l15056;
+    public long l15057;
+    public long l15058;
+    public long l15059;
+    public long l15060;
+    public long l15061;
+    public long l15062;
+    public long l15063;
+    public long l15064;
+    public long l15065;
+    public long l15066;
+    public long l15067;
+    public long l15068;
+    public long l15069;
+    public long l15070;
+    public long l15071;
+    public long l15072;
+    public long l15073;
+    public long l15074;
+    public long l15075;
+    public long l15076;
+    public long l15077;
+    public long l15078;
+    public long l15079;
+    public long l15080;
+    public long l15081;
+    public long l15082;
+    public long l15083;
+    public long l15084;
+    public long l15085;
+    public long l15086;
+    public long l15087;
+    public long l15088;
+    public long l15089;
+    public long l15090;
+    public long l15091;
+    public long l15092;
+    public long l15093;
+    public long l15094;
+    public long l15095;
+    public long l15096;
+    public long l15097;
+    public long l15098;
+    public long l15099;
+    public long l15100;
+    public long l15101;
+    public long l15102;
+    public long l15103;
+    public long l15104;
+    public long l15105;
+    public long l15106;
+    public long l15107;
+    public long l15108;
+    public long l15109;
+    public long l15110;
+    public long l15111;
+    public long l15112;
+    public long l15113;
+    public long l15114;
+    public long l15115;
+    public long l15116;
+    public long l15117;
+    public long l15118;
+    public long l15119;
+    public long l15120;
+    public long l15121;
+    public long l15122;
+    public long l15123;
+    public long l15124;
+    public long l15125;
+    public long l15126;
+    public long l15127;
+    public long l15128;
+    public long l15129;
+    public long l15130;
+    public long l15131;
+    public long l15132;
+    public long l15133;
+    public long l15134;
+    public long l15135;
+    public long l15136;
+    public long l15137;
+    public long l15138;
+    public long l15139;
+    public long l15140;
+    public long l15141;
+    public long l15142;
+    public long l15143;
+    public long l15144;
+    public long l15145;
+    public long l15146;
+    public long l15147;
+    public long l15148;
+    public long l15149;
+    public long l15150;
+    public long l15151;
+    public long l15152;
+    public long l15153;
+    public long l15154;
+    public long l15155;
+    public long l15156;
+    public long l15157;
+    public long l15158;
+    public long l15159;
+    public long l15160;
+    public long l15161;
+    public long l15162;
+    public long l15163;
+    public long l15164;
+    public long l15165;
+    public long l15166;
+    public long l15167;
+    public long l15168;
+    public long l15169;
+    public long l15170;
+    public long l15171;
+    public long l15172;
+    public long l15173;
+    public long l15174;
+    public long l15175;
+    public long l15176;
+    public long l15177;
+    public long l15178;
+    public long l15179;
+    public long l15180;
+    public long l15181;
+    public long l15182;
+    public long l15183;
+    public long l15184;
+    public long l15185;
+    public long l15186;
+    public long l15187;
+    public long l15188;
+    public long l15189;
+    public long l15190;
+    public long l15191;
+    public long l15192;
+    public long l15193;
+    public long l15194;
+    public long l15195;
+    public long l15196;
+    public long l15197;
+    public long l15198;
+    public long l15199;
+    public long l15200;
+    public long l15201;
+    public long l15202;
+    public long l15203;
+    public long l15204;
+    public long l15205;
+    public long l15206;
+    public long l15207;
+    public long l15208;
+    public long l15209;
+    public long l15210;
+    public long l15211;
+    public long l15212;
+    public long l15213;
+    public long l15214;
+    public long l15215;
+    public long l15216;
+    public long l15217;
+    public long l15218;
+    public long l15219;
+    public long l15220;
+    public long l15221;
+    public long l15222;
+    public long l15223;
+    public long l15224;
+    public long l15225;
+    public long l15226;
+    public long l15227;
+    public long l15228;
+    public long l15229;
+    public long l15230;
+    public long l15231;
+    public long l15232;
+    public long l15233;
+    public long l15234;
+    public long l15235;
+    public long l15236;
+    public long l15237;
+    public long l15238;
+    public long l15239;
+    public long l15240;
+    public long l15241;
+    public long l15242;
+    public long l15243;
+    public long l15244;
+    public long l15245;
+    public long l15246;
+    public long l15247;
+    public long l15248;
+    public long l15249;
+    public long l15250;
+    public long l15251;
+    public long l15252;
+    public long l15253;
+    public long l15254;
+    public long l15255;
+    public long l15256;
+    public long l15257;
+    public long l15258;
+    public long l15259;
+    public long l15260;
+    public long l15261;
+    public long l15262;
+    public long l15263;
+    public long l15264;
+    public long l15265;
+    public long l15266;
+    public long l15267;
+    public long l15268;
+    public long l15269;
+    public long l15270;
+    public long l15271;
+    public long l15272;
+    public long l15273;
+    public long l15274;
+    public long l15275;
+    public long l15276;
+    public long l15277;
+    public long l15278;
+    public long l15279;
+    public long l15280;
+    public long l15281;
+    public long l15282;
+    public long l15283;
+    public long l15284;
+    public long l15285;
+    public long l15286;
+    public long l15287;
+    public long l15288;
+    public long l15289;
+    public long l15290;
+    public long l15291;
+    public long l15292;
+    public long l15293;
+    public long l15294;
+    public long l15295;
+    public long l15296;
+    public long l15297;
+    public long l15298;
+    public long l15299;
+    public long l15300;
+    public long l15301;
+    public long l15302;
+    public long l15303;
+    public long l15304;
+    public long l15305;
+    public long l15306;
+    public long l15307;
+    public long l15308;
+    public long l15309;
+    public long l15310;
+    public long l15311;
+    public long l15312;
+    public long l15313;
+    public long l15314;
+    public long l15315;
+    public long l15316;
+    public long l15317;
+    public long l15318;
+    public long l15319;
+    public long l15320;
+    public long l15321;
+    public long l15322;
+    public long l15323;
+    public long l15324;
+    public long l15325;
+    public long l15326;
+    public long l15327;
+    public long l15328;
+    public long l15329;
+    public long l15330;
+    public long l15331;
+    public long l15332;
+    public long l15333;
+    public long l15334;
+    public long l15335;
+    public long l15336;
+    public long l15337;
+    public long l15338;
+    public long l15339;
+    public long l15340;
+    public long l15341;
+    public long l15342;
+    public long l15343;
+    public long l15344;
+    public long l15345;
+    public long l15346;
+    public long l15347;
+    public long l15348;
+    public long l15349;
+    public long l15350;
+    public long l15351;
+    public long l15352;
+    public long l15353;
+    public long l15354;
+    public long l15355;
+    public long l15356;
+    public long l15357;
+    public long l15358;
+    public long l15359;
+    public long l15360;
+    public long l15361;
+    public long l15362;
+    public long l15363;
+    public long l15364;
+    public long l15365;
+    public long l15366;
+    public long l15367;
+    public long l15368;
+    public long l15369;
+    public long l15370;
+    public long l15371;
+    public long l15372;
+    public long l15373;
+    public long l15374;
+    public long l15375;
+    public long l15376;
+    public long l15377;
+    public long l15378;
+    public long l15379;
+    public long l15380;
+    public long l15381;
+    public long l15382;
+    public long l15383;
+    public long l15384;
+    public long l15385;
+    public long l15386;
+    public long l15387;
+    public long l15388;
+    public long l15389;
+    public long l15390;
+    public long l15391;
+    public long l15392;
+    public long l15393;
+    public long l15394;
+    public long l15395;
+    public long l15396;
+    public long l15397;
+    public long l15398;
+    public long l15399;
+    public long l15400;
+    public long l15401;
+    public long l15402;
+    public long l15403;
+    public long l15404;
+    public long l15405;
+    public long l15406;
+    public long l15407;
+    public long l15408;
+    public long l15409;
+    public long l15410;
+    public long l15411;
+    public long l15412;
+    public long l15413;
+    public long l15414;
+    public long l15415;
+    public long l15416;
+    public long l15417;
+    public long l15418;
+    public long l15419;
+    public long l15420;
+    public long l15421;
+    public long l15422;
+    public long l15423;
+    public long l15424;
+    public long l15425;
+    public long l15426;
+    public long l15427;
+    public long l15428;
+    public long l15429;
+    public long l15430;
+    public long l15431;
+    public long l15432;
+    public long l15433;
+    public long l15434;
+    public long l15435;
+    public long l15436;
+    public long l15437;
+    public long l15438;
+    public long l15439;
+    public long l15440;
+    public long l15441;
+    public long l15442;
+    public long l15443;
+    public long l15444;
+    public long l15445;
+    public long l15446;
+    public long l15447;
+    public long l15448;
+    public long l15449;
+    public long l15450;
+    public long l15451;
+    public long l15452;
+    public long l15453;
+    public long l15454;
+    public long l15455;
+    public long l15456;
+    public long l15457;
+    public long l15458;
+    public long l15459;
+    public long l15460;
+    public long l15461;
+    public long l15462;
+    public long l15463;
+    public long l15464;
+    public long l15465;
+    public long l15466;
+    public long l15467;
+    public long l15468;
+    public long l15469;
+    public long l15470;
+    public long l15471;
+    public long l15472;
+    public long l15473;
+    public long l15474;
+    public long l15475;
+    public long l15476;
+    public long l15477;
+    public long l15478;
+    public long l15479;
+    public long l15480;
+    public long l15481;
+    public long l15482;
+    public long l15483;
+    public long l15484;
+    public long l15485;
+    public long l15486;
+    public long l15487;
+    public long l15488;
+    public long l15489;
+    public long l15490;
+    public long l15491;
+    public long l15492;
+    public long l15493;
+    public long l15494;
+    public long l15495;
+    public long l15496;
+    public long l15497;
+    public long l15498;
+    public long l15499;
+    public long l15500;
+    public long l15501;
+    public long l15502;
+    public long l15503;
+    public long l15504;
+    public long l15505;
+    public long l15506;
+    public long l15507;
+    public long l15508;
+    public long l15509;
+    public long l15510;
+    public long l15511;
+    public long l15512;
+    public long l15513;
+    public long l15514;
+    public long l15515;
+    public long l15516;
+    public long l15517;
+    public long l15518;
+    public long l15519;
+    public long l15520;
+    public long l15521;
+    public long l15522;
+    public long l15523;
+    public long l15524;
+    public long l15525;
+    public long l15526;
+    public long l15527;
+    public long l15528;
+    public long l15529;
+    public long l15530;
+    public long l15531;
+    public long l15532;
+    public long l15533;
+    public long l15534;
+    public long l15535;
+    public long l15536;
+    public long l15537;
+    public long l15538;
+    public long l15539;
+    public long l15540;
+    public long l15541;
+    public long l15542;
+    public long l15543;
+    public long l15544;
+    public long l15545;
+    public long l15546;
+    public long l15547;
+    public long l15548;
+    public long l15549;
+    public long l15550;
+    public long l15551;
+    public long l15552;
+    public long l15553;
+    public long l15554;
+    public long l15555;
+    public long l15556;
+    public long l15557;
+    public long l15558;
+    public long l15559;
+    public long l15560;
+    public long l15561;
+    public long l15562;
+    public long l15563;
+    public long l15564;
+    public long l15565;
+    public long l15566;
+    public long l15567;
+    public long l15568;
+    public long l15569;
+    public long l15570;
+    public long l15571;
+    public long l15572;
+    public long l15573;
+    public long l15574;
+    public long l15575;
+    public long l15576;
+    public long l15577;
+    public long l15578;
+    public long l15579;
+    public long l15580;
+    public long l15581;
+    public long l15582;
+    public long l15583;
+    public long l15584;
+    public long l15585;
+    public long l15586;
+    public long l15587;
+    public long l15588;
+    public long l15589;
+    public long l15590;
+    public long l15591;
+    public long l15592;
+    public long l15593;
+    public long l15594;
+    public long l15595;
+    public long l15596;
+    public long l15597;
+    public long l15598;
+    public long l15599;
+    public long l15600;
+    public long l15601;
+    public long l15602;
+    public long l15603;
+    public long l15604;
+    public long l15605;
+    public long l15606;
+    public long l15607;
+    public long l15608;
+    public long l15609;
+    public long l15610;
+    public long l15611;
+    public long l15612;
+    public long l15613;
+    public long l15614;
+    public long l15615;
+    public long l15616;
+    public long l15617;
+    public long l15618;
+    public long l15619;
+    public long l15620;
+    public long l15621;
+    public long l15622;
+    public long l15623;
+    public long l15624;
+    public long l15625;
+    public long l15626;
+    public long l15627;
+    public long l15628;
+    public long l15629;
+    public long l15630;
+    public long l15631;
+    public long l15632;
+    public long l15633;
+    public long l15634;
+    public long l15635;
+    public long l15636;
+    public long l15637;
+    public long l15638;
+    public long l15639;
+    public long l15640;
+    public long l15641;
+    public long l15642;
+    public long l15643;
+    public long l15644;
+    public long l15645;
+    public long l15646;
+    public long l15647;
+    public long l15648;
+    public long l15649;
+    public long l15650;
+    public long l15651;
+    public long l15652;
+    public long l15653;
+    public long l15654;
+    public long l15655;
+    public long l15656;
+    public long l15657;
+    public long l15658;
+    public long l15659;
+    public long l15660;
+    public long l15661;
+    public long l15662;
+    public long l15663;
+    public long l15664;
+    public long l15665;
+    public long l15666;
+    public long l15667;
+    public long l15668;
+    public long l15669;
+    public long l15670;
+    public long l15671;
+    public long l15672;
+    public long l15673;
+    public long l15674;
+    public long l15675;
+    public long l15676;
+    public long l15677;
+    public long l15678;
+    public long l15679;
+    public long l15680;
+    public long l15681;
+    public long l15682;
+    public long l15683;
+    public long l15684;
+    public long l15685;
+    public long l15686;
+    public long l15687;
+    public long l15688;
+    public long l15689;
+    public long l15690;
+    public long l15691;
+    public long l15692;
+    public long l15693;
+    public long l15694;
+    public long l15695;
+    public long l15696;
+    public long l15697;
+    public long l15698;
+    public long l15699;
+    public long l15700;
+    public long l15701;
+    public long l15702;
+    public long l15703;
+    public long l15704;
+    public long l15705;
+    public long l15706;
+    public long l15707;
+    public long l15708;
+    public long l15709;
+    public long l15710;
+    public long l15711;
+    public long l15712;
+    public long l15713;
+    public long l15714;
+    public long l15715;
+    public long l15716;
+    public long l15717;
+    public long l15718;
+    public long l15719;
+    public long l15720;
+    public long l15721;
+    public long l15722;
+    public long l15723;
+    public long l15724;
+    public long l15725;
+    public long l15726;
+    public long l15727;
+    public long l15728;
+    public long l15729;
+    public long l15730;
+    public long l15731;
+    public long l15732;
+    public long l15733;
+    public long l15734;
+    public long l15735;
+    public long l15736;
+    public long l15737;
+    public long l15738;
+    public long l15739;
+    public long l15740;
+    public long l15741;
+    public long l15742;
+    public long l15743;
+    public long l15744;
+    public long l15745;
+    public long l15746;
+    public long l15747;
+    public long l15748;
+    public long l15749;
+    public long l15750;
+    public long l15751;
+    public long l15752;
+    public long l15753;
+    public long l15754;
+    public long l15755;
+    public long l15756;
+    public long l15757;
+    public long l15758;
+    public long l15759;
+    public long l15760;
+    public long l15761;
+    public long l15762;
+    public long l15763;
+    public long l15764;
+    public long l15765;
+    public long l15766;
+    public long l15767;
+    public long l15768;
+    public long l15769;
+    public long l15770;
+    public long l15771;
+    public long l15772;
+    public long l15773;
+    public long l15774;
+    public long l15775;
+    public long l15776;
+    public long l15777;
+    public long l15778;
+    public long l15779;
+    public long l15780;
+    public long l15781;
+    public long l15782;
+    public long l15783;
+    public long l15784;
+    public long l15785;
+    public long l15786;
+    public long l15787;
+    public long l15788;
+    public long l15789;
+    public long l15790;
+    public long l15791;
+    public long l15792;
+    public long l15793;
+    public long l15794;
+    public long l15795;
+    public long l15796;
+    public long l15797;
+    public long l15798;
+    public long l15799;
+    public long l15800;
+    public long l15801;
+    public long l15802;
+    public long l15803;
+    public long l15804;
+    public long l15805;
+    public long l15806;
+    public long l15807;
+    public long l15808;
+    public long l15809;
+    public long l15810;
+    public long l15811;
+    public long l15812;
+    public long l15813;
+    public long l15814;
+    public long l15815;
+    public long l15816;
+    public long l15817;
+    public long l15818;
+    public long l15819;
+    public long l15820;
+    public long l15821;
+    public long l15822;
+    public long l15823;
+    public long l15824;
+    public long l15825;
+    public long l15826;
+    public long l15827;
+    public long l15828;
+    public long l15829;
+    public long l15830;
+    public long l15831;
+    public long l15832;
+    public long l15833;
+    public long l15834;
+    public long l15835;
+    public long l15836;
+    public long l15837;
+    public long l15838;
+    public long l15839;
+    public long l15840;
+    public long l15841;
+    public long l15842;
+    public long l15843;
+    public long l15844;
+    public long l15845;
+    public long l15846;
+    public long l15847;
+    public long l15848;
+    public long l15849;
+    public long l15850;
+    public long l15851;
+    public long l15852;
+    public long l15853;
+    public long l15854;
+    public long l15855;
+    public long l15856;
+    public long l15857;
+    public long l15858;
+    public long l15859;
+    public long l15860;
+    public long l15861;
+    public long l15862;
+    public long l15863;
+    public long l15864;
+    public long l15865;
+    public long l15866;
+    public long l15867;
+    public long l15868;
+    public long l15869;
+    public long l15870;
+    public long l15871;
+    public long l15872;
+    public long l15873;
+    public long l15874;
+    public long l15875;
+    public long l15876;
+    public long l15877;
+    public long l15878;
+    public long l15879;
+    public long l15880;
+    public long l15881;
+    public long l15882;
+    public long l15883;
+    public long l15884;
+    public long l15885;
+    public long l15886;
+    public long l15887;
+    public long l15888;
+    public long l15889;
+    public long l15890;
+    public long l15891;
+    public long l15892;
+    public long l15893;
+    public long l15894;
+    public long l15895;
+    public long l15896;
+    public long l15897;
+    public long l15898;
+    public long l15899;
+    public long l15900;
+    public long l15901;
+    public long l15902;
+    public long l15903;
+    public long l15904;
+    public long l15905;
+    public long l15906;
+    public long l15907;
+    public long l15908;
+    public long l15909;
+    public long l15910;
+    public long l15911;
+    public long l15912;
+    public long l15913;
+    public long l15914;
+    public long l15915;
+    public long l15916;
+    public long l15917;
+    public long l15918;
+    public long l15919;
+    public long l15920;
+    public long l15921;
+    public long l15922;
+    public long l15923;
+    public long l15924;
+    public long l15925;
+    public long l15926;
+    public long l15927;
+    public long l15928;
+    public long l15929;
+    public long l15930;
+    public long l15931;
+    public long l15932;
+    public long l15933;
+    public long l15934;
+    public long l15935;
+    public long l15936;
+    public long l15937;
+    public long l15938;
+    public long l15939;
+    public long l15940;
+    public long l15941;
+    public long l15942;
+    public long l15943;
+    public long l15944;
+    public long l15945;
+    public long l15946;
+    public long l15947;
+    public long l15948;
+    public long l15949;
+    public long l15950;
+    public long l15951;
+    public long l15952;
+    public long l15953;
+    public long l15954;
+    public long l15955;
+    public long l15956;
+    public long l15957;
+    public long l15958;
+    public long l15959;
+    public long l15960;
+    public long l15961;
+    public long l15962;
+    public long l15963;
+    public long l15964;
+    public long l15965;
+    public long l15966;
+    public long l15967;
+    public long l15968;
+    public long l15969;
+    public long l15970;
+    public long l15971;
+    public long l15972;
+    public long l15973;
+    public long l15974;
+    public long l15975;
+    public long l15976;
+    public long l15977;
+    public long l15978;
+    public long l15979;
+    public long l15980;
+    public long l15981;
+    public long l15982;
+    public long l15983;
+    public long l15984;
+    public long l15985;
+    public long l15986;
+    public long l15987;
+    public long l15988;
+    public long l15989;
+    public long l15990;
+    public long l15991;
+    public long l15992;
+    public long l15993;
+    public long l15994;
+    public long l15995;
+    public long l15996;
+    public long l15997;
+    public long l15998;
+    public long l15999;
+    public long l16000;
+    public long l16001;
+    public long l16002;
+    public long l16003;
+    public long l16004;
+    public long l16005;
+    public long l16006;
+    public long l16007;
+    public long l16008;
+    public long l16009;
+    public long l16010;
+    public long l16011;
+    public long l16012;
+    public long l16013;
+    public long l16014;
+    public long l16015;
+    public long l16016;
+    public long l16017;
+    public long l16018;
+    public long l16019;
+    public long l16020;
+    public long l16021;
+    public long l16022;
+    public long l16023;
+    public long l16024;
+    public long l16025;
+    public long l16026;
+    public long l16027;
+    public long l16028;
+    public long l16029;
+    public long l16030;
+    public long l16031;
+    public long l16032;
+    public long l16033;
+    public long l16034;
+    public long l16035;
+    public long l16036;
+    public long l16037;
+    public long l16038;
+    public long l16039;
+    public long l16040;
+    public long l16041;
+    public long l16042;
+    public long l16043;
+    public long l16044;
+    public long l16045;
+    public long l16046;
+    public long l16047;
+    public long l16048;
+    public long l16049;
+    public long l16050;
+    public long l16051;
+    public long l16052;
+    public long l16053;
+    public long l16054;
+    public long l16055;
+    public long l16056;
+    public long l16057;
+    public long l16058;
+    public long l16059;
+    public long l16060;
+    public long l16061;
+    public long l16062;
+    public long l16063;
+    public long l16064;
+    public long l16065;
+    public long l16066;
+    public long l16067;
+    public long l16068;
+    public long l16069;
+    public long l16070;
+    public long l16071;
+    public long l16072;
+    public long l16073;
+    public long l16074;
+    public long l16075;
+    public long l16076;
+    public long l16077;
+    public long l16078;
+    public long l16079;
+    public long l16080;
+    public long l16081;
+    public long l16082;
+    public long l16083;
+    public long l16084;
+    public long l16085;
+    public long l16086;
+    public long l16087;
+    public long l16088;
+    public long l16089;
+    public long l16090;
+    public long l16091;
+    public long l16092;
+    public long l16093;
+    public long l16094;
+    public long l16095;
+    public long l16096;
+    public long l16097;
+    public long l16098;
+    public long l16099;
+    public long l16100;
+    public long l16101;
+    public long l16102;
+    public long l16103;
+    public long l16104;
+    public long l16105;
+    public long l16106;
+    public long l16107;
+    public long l16108;
+    public long l16109;
+    public long l16110;
+    public long l16111;
+    public long l16112;
+    public long l16113;
+    public long l16114;
+    public long l16115;
+    public long l16116;
+    public long l16117;
+    public long l16118;
+    public long l16119;
+    public long l16120;
+    public long l16121;
+    public long l16122;
+    public long l16123;
+    public long l16124;
+    public long l16125;
+    public long l16126;
+    public long l16127;
+    public long l16128;
+    public long l16129;
+    public long l16130;
+    public long l16131;
+    public long l16132;
+    public long l16133;
+    public long l16134;
+    public long l16135;
+    public long l16136;
+    public long l16137;
+    public long l16138;
+    public long l16139;
+    public long l16140;
+    public long l16141;
+    public long l16142;
+    public long l16143;
+    public long l16144;
+    public long l16145;
+    public long l16146;
+    public long l16147;
+    public long l16148;
+    public long l16149;
+    public long l16150;
+    public long l16151;
+    public long l16152;
+    public long l16153;
+    public long l16154;
+    public long l16155;
+    public long l16156;
+    public long l16157;
+    public long l16158;
+    public long l16159;
+    public long l16160;
+    public long l16161;
+    public long l16162;
+    public long l16163;
+    public long l16164;
+    public long l16165;
+    public long l16166;
+    public long l16167;
+    public long l16168;
+    public long l16169;
+    public long l16170;
+    public long l16171;
+    public long l16172;
+    public long l16173;
+    public long l16174;
+    public long l16175;
+    public long l16176;
+    public long l16177;
+    public long l16178;
+    public long l16179;
+    public long l16180;
+    public long l16181;
+    public long l16182;
+    public long l16183;
+    public long l16184;
+    public long l16185;
+    public long l16186;
+    public long l16187;
+    public long l16188;
+    public long l16189;
+    public long l16190;
+    public long l16191;
+    public long l16192;
+    public long l16193;
+    public long l16194;
+    public long l16195;
+    public long l16196;
+    public long l16197;
+    public long l16198;
+    public long l16199;
+    public long l16200;
+    public long l16201;
+    public long l16202;
+    public long l16203;
+    public long l16204;
+    public long l16205;
+    public long l16206;
+    public long l16207;
+    public long l16208;
+    public long l16209;
+    public long l16210;
+    public long l16211;
+    public long l16212;
+    public long l16213;
+    public long l16214;
+    public long l16215;
+    public long l16216;
+    public long l16217;
+    public long l16218;
+    public long l16219;
+    public long l16220;
+    public long l16221;
+    public long l16222;
+    public long l16223;
+    public long l16224;
+    public long l16225;
+    public long l16226;
+    public long l16227;
+    public long l16228;
+    public long l16229;
+    public long l16230;
+    public long l16231;
+    public long l16232;
+    public long l16233;
+    public long l16234;
+    public long l16235;
+    public long l16236;
+    public long l16237;
+    public long l16238;
+    public long l16239;
+    public long l16240;
+    public long l16241;
+    public long l16242;
+    public long l16243;
+    public long l16244;
+    public long l16245;
+    public long l16246;
+    public long l16247;
+    public long l16248;
+    public long l16249;
+    public long l16250;
+    public long l16251;
+    public long l16252;
+    public long l16253;
+    public long l16254;
+    public long l16255;
+    public long l16256;
+    public long l16257;
+    public long l16258;
+    public long l16259;
+    public long l16260;
+    public long l16261;
+    public long l16262;
+    public long l16263;
+    public long l16264;
+    public long l16265;
+    public long l16266;
+    public long l16267;
+    public long l16268;
+    public long l16269;
+    public long l16270;
+    public long l16271;
+    public long l16272;
+    public long l16273;
+    public long l16274;
+    public long l16275;
+    public long l16276;
+    public long l16277;
+    public long l16278;
+    public long l16279;
+    public long l16280;
+    public long l16281;
+    public long l16282;
+    public long l16283;
+    public long l16284;
+    public long l16285;
+    public long l16286;
+    public long l16287;
+    public long l16288;
+    public long l16289;
+    public long l16290;
+    public long l16291;
+    public long l16292;
+    public long l16293;
+    public long l16294;
+    public long l16295;
+    public long l16296;
+    public long l16297;
+    public long l16298;
+    public long l16299;
+    public long l16300;
+    public long l16301;
+    public long l16302;
+    public long l16303;
+    public long l16304;
+    public long l16305;
+    public long l16306;
+    public long l16307;
+    public long l16308;
+    public long l16309;
+    public long l16310;
+    public long l16311;
+    public long l16312;
+    public long l16313;
+    public long l16314;
+    public long l16315;
+    public long l16316;
+    public long l16317;
+    public long l16318;
+    public long l16319;
+    public long l16320;
+    public long l16321;
+    public long l16322;
+    public long l16323;
+    public long l16324;
+    public long l16325;
+    public long l16326;
+    public long l16327;
+    public long l16328;
+    public long l16329;
+    public long l16330;
+    public long l16331;
+    public long l16332;
+    public long l16333;
+    public long l16334;
+    public long l16335;
+    public long l16336;
+    public long l16337;
+    public long l16338;
+    public long l16339;
+    public long l16340;
+    public long l16341;
+    public long l16342;
+    public long l16343;
+    public long l16344;
+    public long l16345;
+    public long l16346;
+    public long l16347;
+    public long l16348;
+    public long l16349;
+    public long l16350;
+    public long l16351;
+    public long l16352;
+    public long l16353;
+    public long l16354;
+    public long l16355;
+    public long l16356;
+    public long l16357;
+    public long l16358;
+    public long l16359;
+    public long l16360;
+    public long l16361;
+    public long l16362;
+    public long l16363;
+    public long l16364;
+    public long l16365;
+    public long l16366;
+    public long l16367;
+    public long l16368;
+    public long l16369;
+    public long l16370;
+    public long l16371;
+    public long l16372;
+    public long l16373;
+    public long l16374;
+    public long l16375;
+    public long l16376;
+    public long l16377;
+    public long l16378;
+    public long l16379;
+    public long l16380;
+    public long l16381;
+    public long l16382;
+    public long l16383;
+    public long l16384;
+    public long l16385;
+    public long l16386;
+    public long l16387;
+    public long l16388;
+    public long l16389;
+    public long l16390;
+    public long l16391;
+    public long l16392;
+    public long l16393;
+    public long l16394;
+    public long l16395;
+    public long l16396;
+    public long l16397;
+    public long l16398;
+    public long l16399;
+    public long l16400;
+    public long l16401;
+    public long l16402;
+    public long l16403;
+    public long l16404;
+    public long l16405;
+    public long l16406;
+    public long l16407;
+    public long l16408;
+    public long l16409;
+    public long l16410;
+    public long l16411;
+    public long l16412;
+    public long l16413;
+    public long l16414;
+    public long l16415;
+    public long l16416;
+    public long l16417;
+    public long l16418;
+    public long l16419;
+    public long l16420;
+    public long l16421;
+    public long l16422;
+    public long l16423;
+    public long l16424;
+    public long l16425;
+    public long l16426;
+    public long l16427;
+    public long l16428;
+    public long l16429;
+    public long l16430;
+    public long l16431;
+    public long l16432;
+    public long l16433;
+    public long l16434;
+    public long l16435;
+    public long l16436;
+    public long l16437;
+    public long l16438;
+    public long l16439;
+    public long l16440;
+    public long l16441;
+    public long l16442;
+    public long l16443;
+    public long l16444;
+    public long l16445;
+    public long l16446;
+    public long l16447;
+    public long l16448;
+    public long l16449;
+    public long l16450;
+    public long l16451;
+    public long l16452;
+    public long l16453;
+    public long l16454;
+    public long l16455;
+    public long l16456;
+    public long l16457;
+    public long l16458;
+    public long l16459;
+    public long l16460;
+    public long l16461;
+    public long l16462;
+    public long l16463;
+    public long l16464;
+    public long l16465;
+    public long l16466;
+    public long l16467;
+    public long l16468;
+    public long l16469;
+    public long l16470;
+    public long l16471;
+    public long l16472;
+    public long l16473;
+    public long l16474;
+    public long l16475;
+    public long l16476;
+    public long l16477;
+    public long l16478;
+    public long l16479;
+    public long l16480;
+    public long l16481;
+    public long l16482;
+    public long l16483;
+    public long l16484;
+    public long l16485;
+    public long l16486;
+    public long l16487;
+    public long l16488;
+    public long l16489;
+    public long l16490;
+    public long l16491;
+    public long l16492;
+    public long l16493;
+    public long l16494;
+    public long l16495;
+    public long l16496;
+    public long l16497;
+    public long l16498;
+    public long l16499;
+    public long l16500;
+    public long l16501;
+    public long l16502;
+    public long l16503;
+    public long l16504;
+    public long l16505;
+    public long l16506;
+    public long l16507;
+    public long l16508;
+    public long l16509;
+    public long l16510;
+    public long l16511;
+    public long l16512;
+    public long l16513;
+    public long l16514;
+    public long l16515;
+    public long l16516;
+    public long l16517;
+    public long l16518;
+    public long l16519;
+    public long l16520;
+    public long l16521;
+    public long l16522;
+    public long l16523;
+    public long l16524;
+    public long l16525;
+    public long l16526;
+    public long l16527;
+    public long l16528;
+    public long l16529;
+    public long l16530;
+    public long l16531;
+    public long l16532;
+    public long l16533;
+    public long l16534;
+    public long l16535;
+    public long l16536;
+    public long l16537;
+    public long l16538;
+    public long l16539;
+    public long l16540;
+    public long l16541;
+    public long l16542;
+    public long l16543;
+    public long l16544;
+    public long l16545;
+    public long l16546;
+    public long l16547;
+    public long l16548;
+    public long l16549;
+    public long l16550;
+    public long l16551;
+    public long l16552;
+    public long l16553;
+    public long l16554;
+    public long l16555;
+    public long l16556;
+    public long l16557;
+    public long l16558;
+    public long l16559;
+    public long l16560;
+    public long l16561;
+    public long l16562;
+    public long l16563;
+    public long l16564;
+    public long l16565;
+    public long l16566;
+    public long l16567;
+    public long l16568;
+    public long l16569;
+    public long l16570;
+    public long l16571;
+    public long l16572;
+    public long l16573;
+    public long l16574;
+    public long l16575;
+    public long l16576;
+    public long l16577;
+    public long l16578;
+    public long l16579;
+    public long l16580;
+    public long l16581;
+    public long l16582;
+    public long l16583;
+    public long l16584;
+    public long l16585;
+    public long l16586;
+    public long l16587;
+    public long l16588;
+    public long l16589;
+    public long l16590;
+    public long l16591;
+    public long l16592;
+    public long l16593;
+    public long l16594;
+    public long l16595;
+    public long l16596;
+    public long l16597;
+    public long l16598;
+    public long l16599;
+    public long l16600;
+    public long l16601;
+    public long l16602;
+    public long l16603;
+    public long l16604;
+    public long l16605;
+    public long l16606;
+    public long l16607;
+    public long l16608;
+    public long l16609;
+    public long l16610;
+    public long l16611;
+    public long l16612;
+    public long l16613;
+    public long l16614;
+    public long l16615;
+    public long l16616;
+    public long l16617;
+    public long l16618;
+    public long l16619;
+    public long l16620;
+    public long l16621;
+    public long l16622;
+    public long l16623;
+    public long l16624;
+    public long l16625;
+    public long l16626;
+    public long l16627;
+    public long l16628;
+    public long l16629;
+    public long l16630;
+    public long l16631;
+    public long l16632;
+    public long l16633;
+    public long l16634;
+    public long l16635;
+    public long l16636;
+    public long l16637;
+    public long l16638;
+    public long l16639;
+    public long l16640;
+    public long l16641;
+    public long l16642;
+    public long l16643;
+    public long l16644;
+    public long l16645;
+    public long l16646;
+    public long l16647;
+    public long l16648;
+    public long l16649;
+    public long l16650;
+    public long l16651;
+    public long l16652;
+    public long l16653;
+    public long l16654;
+    public long l16655;
+    public long l16656;
+    public long l16657;
+    public long l16658;
+    public long l16659;
+    public long l16660;
+    public long l16661;
+    public long l16662;
+    public long l16663;
+    public long l16664;
+    public long l16665;
+    public long l16666;
+    public long l16667;
+    public long l16668;
+    public long l16669;
+    public long l16670;
+    public long l16671;
+    public long l16672;
+    public long l16673;
+    public long l16674;
+    public long l16675;
+    public long l16676;
+    public long l16677;
+    public long l16678;
+    public long l16679;
+    public long l16680;
+    public long l16681;
+    public long l16682;
+    public long l16683;
+    public long l16684;
+    public long l16685;
+    public long l16686;
+    public long l16687;
+    public long l16688;
+    public long l16689;
+    public long l16690;
+    public long l16691;
+    public long l16692;
+    public long l16693;
+    public long l16694;
+    public long l16695;
+    public long l16696;
+    public long l16697;
+    public long l16698;
+    public long l16699;
+    public long l16700;
+    public long l16701;
+    public long l16702;
+    public long l16703;
+    public long l16704;
+    public long l16705;
+    public long l16706;
+    public long l16707;
+    public long l16708;
+    public long l16709;
+    public long l16710;
+    public long l16711;
+    public long l16712;
+    public long l16713;
+    public long l16714;
+    public long l16715;
+    public long l16716;
+    public long l16717;
+    public long l16718;
+    public long l16719;
+    public long l16720;
+    public long l16721;
+    public long l16722;
+    public long l16723;
+    public long l16724;
+    public long l16725;
+    public long l16726;
+    public long l16727;
+    public long l16728;
+    public long l16729;
+    public long l16730;
+    public long l16731;
+    public long l16732;
+    public long l16733;
+    public long l16734;
+    public long l16735;
+    public long l16736;
+    public long l16737;
+    public long l16738;
+    public long l16739;
+    public long l16740;
+    public long l16741;
+    public long l16742;
+    public long l16743;
+    public long l16744;
+    public long l16745;
+    public long l16746;
+    public long l16747;
+    public long l16748;
+    public long l16749;
+    public long l16750;
+    public long l16751;
+    public long l16752;
+    public long l16753;
+    public long l16754;
+    public long l16755;
+    public long l16756;
+    public long l16757;
+    public long l16758;
+    public long l16759;
+    public long l16760;
+    public long l16761;
+    public long l16762;
+    public long l16763;
+    public long l16764;
+    public long l16765;
+    public long l16766;
+    public long l16767;
+    public long l16768;
+    public long l16769;
+    public long l16770;
+    public long l16771;
+    public long l16772;
+    public long l16773;
+    public long l16774;
+    public long l16775;
+    public long l16776;
+    public long l16777;
+    public long l16778;
+    public long l16779;
+    public long l16780;
+    public long l16781;
+    public long l16782;
+    public long l16783;
+    public long l16784;
+    public long l16785;
+    public long l16786;
+    public long l16787;
+    public long l16788;
+    public long l16789;
+    public long l16790;
+    public long l16791;
+    public long l16792;
+    public long l16793;
+    public long l16794;
+    public long l16795;
+    public long l16796;
+    public long l16797;
+    public long l16798;
+    public long l16799;
+    public long l16800;
+    public long l16801;
+    public long l16802;
+    public long l16803;
+    public long l16804;
+    public long l16805;
+    public long l16806;
+    public long l16807;
+    public long l16808;
+    public long l16809;
+    public long l16810;
+    public long l16811;
+    public long l16812;
+    public long l16813;
+    public long l16814;
+    public long l16815;
+    public long l16816;
+    public long l16817;
+    public long l16818;
+    public long l16819;
+    public long l16820;
+    public long l16821;
+    public long l16822;
+    public long l16823;
+    public long l16824;
+    public long l16825;
+    public long l16826;
+    public long l16827;
+    public long l16828;
+    public long l16829;
+    public long l16830;
+    public long l16831;
+    public long l16832;
+    public long l16833;
+    public long l16834;
+    public long l16835;
+    public long l16836;
+    public long l16837;
+    public long l16838;
+    public long l16839;
+    public long l16840;
+    public long l16841;
+    public long l16842;
+    public long l16843;
+    public long l16844;
+    public long l16845;
+    public long l16846;
+    public long l16847;
+    public long l16848;
+    public long l16849;
+    public long l16850;
+    public long l16851;
+    public long l16852;
+    public long l16853;
+    public long l16854;
+    public long l16855;
+    public long l16856;
+    public long l16857;
+    public long l16858;
+    public long l16859;
+    public long l16860;
+    public long l16861;
+    public long l16862;
+    public long l16863;
+    public long l16864;
+    public long l16865;
+    public long l16866;
+    public long l16867;
+    public long l16868;
+    public long l16869;
+    public long l16870;
+    public long l16871;
+    public long l16872;
+    public long l16873;
+    public long l16874;
+    public long l16875;
+    public long l16876;
+    public long l16877;
+    public long l16878;
+    public long l16879;
+    public long l16880;
+    public long l16881;
+    public long l16882;
+    public long l16883;
+    public long l16884;
+    public long l16885;
+    public long l16886;
+    public long l16887;
+    public long l16888;
+    public long l16889;
+    public long l16890;
+    public long l16891;
+    public long l16892;
+    public long l16893;
+    public long l16894;
+    public long l16895;
+    public long l16896;
+    public long l16897;
+    public long l16898;
+    public long l16899;
+    public long l16900;
+    public long l16901;
+    public long l16902;
+    public long l16903;
+    public long l16904;
+    public long l16905;
+    public long l16906;
+    public long l16907;
+    public long l16908;
+    public long l16909;
+    public long l16910;
+    public long l16911;
+    public long l16912;
+    public long l16913;
+    public long l16914;
+    public long l16915;
+    public long l16916;
+    public long l16917;
+    public long l16918;
+    public long l16919;
+    public long l16920;
+    public long l16921;
+    public long l16922;
+    public long l16923;
+    public long l16924;
+    public long l16925;
+    public long l16926;
+    public long l16927;
+    public long l16928;
+    public long l16929;
+    public long l16930;
+    public long l16931;
+    public long l16932;
+    public long l16933;
+    public long l16934;
+    public long l16935;
+    public long l16936;
+    public long l16937;
+    public long l16938;
+    public long l16939;
+    public long l16940;
+    public long l16941;
+    public long l16942;
+    public long l16943;
+    public long l16944;
+    public long l16945;
+    public long l16946;
+    public long l16947;
+    public long l16948;
+    public long l16949;
+    public long l16950;
+    public long l16951;
+    public long l16952;
+    public long l16953;
+    public long l16954;
+    public long l16955;
+    public long l16956;
+    public long l16957;
+    public long l16958;
+    public long l16959;
+    public long l16960;
+    public long l16961;
+    public long l16962;
+    public long l16963;
+    public long l16964;
+    public long l16965;
+    public long l16966;
+    public long l16967;
+    public long l16968;
+    public long l16969;
+    public long l16970;
+    public long l16971;
+    public long l16972;
+    public long l16973;
+    public long l16974;
+    public long l16975;
+    public long l16976;
+    public long l16977;
+    public long l16978;
+    public long l16979;
+    public long l16980;
+    public long l16981;
+    public long l16982;
+    public long l16983;
+    public long l16984;
+    public long l16985;
+    public long l16986;
+    public long l16987;
+    public long l16988;
+    public long l16989;
+    public long l16990;
+    public long l16991;
+    public long l16992;
+    public long l16993;
+    public long l16994;
+    public long l16995;
+    public long l16996;
+    public long l16997;
+    public long l16998;
+    public long l16999;
+    public long l17000;
+    public long l17001;
+    public long l17002;
+    public long l17003;
+    public long l17004;
+    public long l17005;
+    public long l17006;
+    public long l17007;
+    public long l17008;
+    public long l17009;
+    public long l17010;
+    public long l17011;
+    public long l17012;
+    public long l17013;
+    public long l17014;
+    public long l17015;
+    public long l17016;
+    public long l17017;
+    public long l17018;
+    public long l17019;
+    public long l17020;
+    public long l17021;
+    public long l17022;
+    public long l17023;
+    public long l17024;
+    public long l17025;
+    public long l17026;
+    public long l17027;
+    public long l17028;
+    public long l17029;
+    public long l17030;
+    public long l17031;
+    public long l17032;
+    public long l17033;
+    public long l17034;
+    public long l17035;
+    public long l17036;
+    public long l17037;
+    public long l17038;
+    public long l17039;
+    public long l17040;
+    public long l17041;
+    public long l17042;
+    public long l17043;
+    public long l17044;
+    public long l17045;
+    public long l17046;
+    public long l17047;
+    public long l17048;
+    public long l17049;
+    public long l17050;
+    public long l17051;
+    public long l17052;
+    public long l17053;
+    public long l17054;
+    public long l17055;
+    public long l17056;
+    public long l17057;
+    public long l17058;
+    public long l17059;
+    public long l17060;
+    public long l17061;
+    public long l17062;
+    public long l17063;
+    public long l17064;
+    public long l17065;
+    public long l17066;
+    public long l17067;
+    public long l17068;
+    public long l17069;
+    public long l17070;
+    public long l17071;
+    public long l17072;
+    public long l17073;
+    public long l17074;
+    public long l17075;
+    public long l17076;
+    public long l17077;
+    public long l17078;
+    public long l17079;
+    public long l17080;
+    public long l17081;
+    public long l17082;
+    public long l17083;
+    public long l17084;
+    public long l17085;
+    public long l17086;
+    public long l17087;
+    public long l17088;
+    public long l17089;
+    public long l17090;
+    public long l17091;
+    public long l17092;
+    public long l17093;
+    public long l17094;
+    public long l17095;
+    public long l17096;
+    public long l17097;
+    public long l17098;
+    public long l17099;
+    public long l17100;
+    public long l17101;
+    public long l17102;
+    public long l17103;
+    public long l17104;
+    public long l17105;
+    public long l17106;
+    public long l17107;
+    public long l17108;
+    public long l17109;
+    public long l17110;
+    public long l17111;
+    public long l17112;
+    public long l17113;
+    public long l17114;
+    public long l17115;
+    public long l17116;
+    public long l17117;
+    public long l17118;
+    public long l17119;
+    public long l17120;
+    public long l17121;
+    public long l17122;
+    public long l17123;
+    public long l17124;
+    public long l17125;
+    public long l17126;
+    public long l17127;
+    public long l17128;
+    public long l17129;
+    public long l17130;
+    public long l17131;
+    public long l17132;
+    public long l17133;
+    public long l17134;
+    public long l17135;
+    public long l17136;
+    public long l17137;
+    public long l17138;
+    public long l17139;
+    public long l17140;
+    public long l17141;
+    public long l17142;
+    public long l17143;
+    public long l17144;
+    public long l17145;
+    public long l17146;
+    public long l17147;
+    public long l17148;
+    public long l17149;
+    public long l17150;
+    public long l17151;
+    public long l17152;
+    public long l17153;
+    public long l17154;
+    public long l17155;
+    public long l17156;
+    public long l17157;
+    public long l17158;
+    public long l17159;
+    public long l17160;
+    public long l17161;
+    public long l17162;
+    public long l17163;
+    public long l17164;
+    public long l17165;
+    public long l17166;
+    public long l17167;
+    public long l17168;
+    public long l17169;
+    public long l17170;
+    public long l17171;
+    public long l17172;
+    public long l17173;
+    public long l17174;
+    public long l17175;
+    public long l17176;
+    public long l17177;
+    public long l17178;
+    public long l17179;
+    public long l17180;
+    public long l17181;
+    public long l17182;
+    public long l17183;
+    public long l17184;
+    public long l17185;
+    public long l17186;
+    public long l17187;
+    public long l17188;
+    public long l17189;
+    public long l17190;
+    public long l17191;
+    public long l17192;
+    public long l17193;
+    public long l17194;
+    public long l17195;
+    public long l17196;
+    public long l17197;
+    public long l17198;
+    public long l17199;
+    public long l17200;
+    public long l17201;
+    public long l17202;
+    public long l17203;
+    public long l17204;
+    public long l17205;
+    public long l17206;
+    public long l17207;
+    public long l17208;
+    public long l17209;
+    public long l17210;
+    public long l17211;
+    public long l17212;
+    public long l17213;
+    public long l17214;
+    public long l17215;
+    public long l17216;
+    public long l17217;
+    public long l17218;
+    public long l17219;
+    public long l17220;
+    public long l17221;
+    public long l17222;
+    public long l17223;
+    public long l17224;
+    public long l17225;
+    public long l17226;
+    public long l17227;
+    public long l17228;
+    public long l17229;
+    public long l17230;
+    public long l17231;
+    public long l17232;
+    public long l17233;
+    public long l17234;
+    public long l17235;
+    public long l17236;
+    public long l17237;
+    public long l17238;
+    public long l17239;
+    public long l17240;
+    public long l17241;
+    public long l17242;
+    public long l17243;
+    public long l17244;
+    public long l17245;
+    public long l17246;
+    public long l17247;
+    public long l17248;
+    public long l17249;
+    public long l17250;
+    public long l17251;
+    public long l17252;
+    public long l17253;
+    public long l17254;
+    public long l17255;
+    public long l17256;
+    public long l17257;
+    public long l17258;
+    public long l17259;
+    public long l17260;
+    public long l17261;
+    public long l17262;
+    public long l17263;
+    public long l17264;
+    public long l17265;
+    public long l17266;
+    public long l17267;
+    public long l17268;
+    public long l17269;
+    public long l17270;
+    public long l17271;
+    public long l17272;
+    public long l17273;
+    public long l17274;
+    public long l17275;
+    public long l17276;
+    public long l17277;
+    public long l17278;
+    public long l17279;
+    public long l17280;
+    public long l17281;
+    public long l17282;
+    public long l17283;
+    public long l17284;
+    public long l17285;
+    public long l17286;
+    public long l17287;
+    public long l17288;
+    public long l17289;
+    public long l17290;
+    public long l17291;
+    public long l17292;
+    public long l17293;
+    public long l17294;
+    public long l17295;
+    public long l17296;
+    public long l17297;
+    public long l17298;
+    public long l17299;
+    public long l17300;
+    public long l17301;
+    public long l17302;
+    public long l17303;
+    public long l17304;
+    public long l17305;
+    public long l17306;
+    public long l17307;
+    public long l17308;
+    public long l17309;
+    public long l17310;
+    public long l17311;
+    public long l17312;
+    public long l17313;
+    public long l17314;
+    public long l17315;
+    public long l17316;
+    public long l17317;
+    public long l17318;
+    public long l17319;
+    public long l17320;
+    public long l17321;
+    public long l17322;
+    public long l17323;
+    public long l17324;
+    public long l17325;
+    public long l17326;
+    public long l17327;
+    public long l17328;
+    public long l17329;
+    public long l17330;
+    public long l17331;
+    public long l17332;
+    public long l17333;
+    public long l17334;
+    public long l17335;
+    public long l17336;
+    public long l17337;
+    public long l17338;
+    public long l17339;
+    public long l17340;
+    public long l17341;
+    public long l17342;
+    public long l17343;
+    public long l17344;
+    public long l17345;
+    public long l17346;
+    public long l17347;
+    public long l17348;
+    public long l17349;
+    public long l17350;
+    public long l17351;
+    public long l17352;
+    public long l17353;
+    public long l17354;
+    public long l17355;
+    public long l17356;
+    public long l17357;
+    public long l17358;
+    public long l17359;
+    public long l17360;
+    public long l17361;
+    public long l17362;
+    public long l17363;
+    public long l17364;
+    public long l17365;
+    public long l17366;
+    public long l17367;
+    public long l17368;
+    public long l17369;
+    public long l17370;
+    public long l17371;
+    public long l17372;
+    public long l17373;
+    public long l17374;
+    public long l17375;
+    public long l17376;
+    public long l17377;
+    public long l17378;
+    public long l17379;
+    public long l17380;
+    public long l17381;
+    public long l17382;
+    public long l17383;
+    public long l17384;
+    public long l17385;
+    public long l17386;
+    public long l17387;
+    public long l17388;
+    public long l17389;
+    public long l17390;
+    public long l17391;
+    public long l17392;
+    public long l17393;
+    public long l17394;
+    public long l17395;
+    public long l17396;
+    public long l17397;
+    public long l17398;
+    public long l17399;
+    public long l17400;
+    public long l17401;
+    public long l17402;
+    public long l17403;
+    public long l17404;
+    public long l17405;
+    public long l17406;
+    public long l17407;
+    public long l17408;
+    public long l17409;
+    public long l17410;
+    public long l17411;
+    public long l17412;
+    public long l17413;
+    public long l17414;
+    public long l17415;
+    public long l17416;
+    public long l17417;
+    public long l17418;
+    public long l17419;
+    public long l17420;
+    public long l17421;
+    public long l17422;
+    public long l17423;
+    public long l17424;
+    public long l17425;
+    public long l17426;
+    public long l17427;
+    public long l17428;
+    public long l17429;
+    public long l17430;
+    public long l17431;
+    public long l17432;
+    public long l17433;
+    public long l17434;
+    public long l17435;
+    public long l17436;
+    public long l17437;
+    public long l17438;
+    public long l17439;
+    public long l17440;
+    public long l17441;
+    public long l17442;
+    public long l17443;
+    public long l17444;
+    public long l17445;
+    public long l17446;
+    public long l17447;
+    public long l17448;
+    public long l17449;
+    public long l17450;
+    public long l17451;
+    public long l17452;
+    public long l17453;
+    public long l17454;
+    public long l17455;
+    public long l17456;
+    public long l17457;
+    public long l17458;
+    public long l17459;
+    public long l17460;
+    public long l17461;
+    public long l17462;
+    public long l17463;
+    public long l17464;
+    public long l17465;
+    public long l17466;
+    public long l17467;
+    public long l17468;
+    public long l17469;
+    public long l17470;
+    public long l17471;
+    public long l17472;
+    public long l17473;
+    public long l17474;
+    public long l17475;
+    public long l17476;
+    public long l17477;
+    public long l17478;
+    public long l17479;
+    public long l17480;
+    public long l17481;
+    public long l17482;
+    public long l17483;
+    public long l17484;
+    public long l17485;
+    public long l17486;
+    public long l17487;
+    public long l17488;
+    public long l17489;
+    public long l17490;
+    public long l17491;
+    public long l17492;
+    public long l17493;
+    public long l17494;
+    public long l17495;
+    public long l17496;
+    public long l17497;
+    public long l17498;
+    public long l17499;
+    public long l17500;
+    public long l17501;
+    public long l17502;
+    public long l17503;
+    public long l17504;
+    public long l17505;
+    public long l17506;
+    public long l17507;
+    public long l17508;
+    public long l17509;
+    public long l17510;
+    public long l17511;
+    public long l17512;
+    public long l17513;
+    public long l17514;
+    public long l17515;
+    public long l17516;
+    public long l17517;
+    public long l17518;
+    public long l17519;
+    public long l17520;
+    public long l17521;
+    public long l17522;
+    public long l17523;
+    public long l17524;
+    public long l17525;
+    public long l17526;
+    public long l17527;
+    public long l17528;
+    public long l17529;
+    public long l17530;
+    public long l17531;
+    public long l17532;
+    public long l17533;
+    public long l17534;
+    public long l17535;
+    public long l17536;
+    public long l17537;
+    public long l17538;
+    public long l17539;
+    public long l17540;
+    public long l17541;
+    public long l17542;
+    public long l17543;
+    public long l17544;
+    public long l17545;
+    public long l17546;
+    public long l17547;
+    public long l17548;
+    public long l17549;
+    public long l17550;
+    public long l17551;
+    public long l17552;
+    public long l17553;
+    public long l17554;
+    public long l17555;
+    public long l17556;
+    public long l17557;
+    public long l17558;
+    public long l17559;
+    public long l17560;
+    public long l17561;
+    public long l17562;
+    public long l17563;
+    public long l17564;
+    public long l17565;
+    public long l17566;
+    public long l17567;
+    public long l17568;
+    public long l17569;
+    public long l17570;
+    public long l17571;
+    public long l17572;
+    public long l17573;
+    public long l17574;
+    public long l17575;
+    public long l17576;
+    public long l17577;
+    public long l17578;
+    public long l17579;
+    public long l17580;
+    public long l17581;
+    public long l17582;
+    public long l17583;
+    public long l17584;
+    public long l17585;
+    public long l17586;
+    public long l17587;
+    public long l17588;
+    public long l17589;
+    public long l17590;
+    public long l17591;
+    public long l17592;
+    public long l17593;
+    public long l17594;
+    public long l17595;
+    public long l17596;
+    public long l17597;
+    public long l17598;
+    public long l17599;
+    public long l17600;
+    public long l17601;
+    public long l17602;
+    public long l17603;
+    public long l17604;
+    public long l17605;
+    public long l17606;
+    public long l17607;
+    public long l17608;
+    public long l17609;
+    public long l17610;
+    public long l17611;
+    public long l17612;
+    public long l17613;
+    public long l17614;
+    public long l17615;
+    public long l17616;
+    public long l17617;
+    public long l17618;
+    public long l17619;
+    public long l17620;
+    public long l17621;
+    public long l17622;
+    public long l17623;
+    public long l17624;
+    public long l17625;
+    public long l17626;
+    public long l17627;
+    public long l17628;
+    public long l17629;
+    public long l17630;
+    public long l17631;
+    public long l17632;
+    public long l17633;
+    public long l17634;
+    public long l17635;
+    public long l17636;
+    public long l17637;
+    public long l17638;
+    public long l17639;
+    public long l17640;
+    public long l17641;
+    public long l17642;
+    public long l17643;
+    public long l17644;
+    public long l17645;
+    public long l17646;
+    public long l17647;
+    public long l17648;
+    public long l17649;
+    public long l17650;
+    public long l17651;
+    public long l17652;
+    public long l17653;
+    public long l17654;
+    public long l17655;
+    public long l17656;
+    public long l17657;
+    public long l17658;
+    public long l17659;
+    public long l17660;
+    public long l17661;
+    public long l17662;
+    public long l17663;
+    public long l17664;
+    public long l17665;
+    public long l17666;
+    public long l17667;
+    public long l17668;
+    public long l17669;
+    public long l17670;
+    public long l17671;
+    public long l17672;
+    public long l17673;
+    public long l17674;
+    public long l17675;
+    public long l17676;
+    public long l17677;
+    public long l17678;
+    public long l17679;
+    public long l17680;
+    public long l17681;
+    public long l17682;
+    public long l17683;
+    public long l17684;
+    public long l17685;
+    public long l17686;
+    public long l17687;
+    public long l17688;
+    public long l17689;
+    public long l17690;
+    public long l17691;
+    public long l17692;
+    public long l17693;
+    public long l17694;
+    public long l17695;
+    public long l17696;
+    public long l17697;
+    public long l17698;
+    public long l17699;
+    public long l17700;
+    public long l17701;
+    public long l17702;
+    public long l17703;
+    public long l17704;
+    public long l17705;
+    public long l17706;
+    public long l17707;
+    public long l17708;
+    public long l17709;
+    public long l17710;
+    public long l17711;
+    public long l17712;
+    public long l17713;
+    public long l17714;
+    public long l17715;
+    public long l17716;
+    public long l17717;
+    public long l17718;
+    public long l17719;
+    public long l17720;
+    public long l17721;
+    public long l17722;
+    public long l17723;
+    public long l17724;
+    public long l17725;
+    public long l17726;
+    public long l17727;
+    public long l17728;
+    public long l17729;
+    public long l17730;
+    public long l17731;
+    public long l17732;
+    public long l17733;
+    public long l17734;
+    public long l17735;
+    public long l17736;
+    public long l17737;
+    public long l17738;
+    public long l17739;
+    public long l17740;
+    public long l17741;
+    public long l17742;
+    public long l17743;
+    public long l17744;
+    public long l17745;
+    public long l17746;
+    public long l17747;
+    public long l17748;
+    public long l17749;
+    public long l17750;
+    public long l17751;
+    public long l17752;
+    public long l17753;
+    public long l17754;
+    public long l17755;
+    public long l17756;
+    public long l17757;
+    public long l17758;
+    public long l17759;
+    public long l17760;
+    public long l17761;
+    public long l17762;
+    public long l17763;
+    public long l17764;
+    public long l17765;
+    public long l17766;
+    public long l17767;
+    public long l17768;
+    public long l17769;
+    public long l17770;
+    public long l17771;
+    public long l17772;
+    public long l17773;
+    public long l17774;
+    public long l17775;
+    public long l17776;
+    public long l17777;
+    public long l17778;
+    public long l17779;
+    public long l17780;
+    public long l17781;
+    public long l17782;
+    public long l17783;
+    public long l17784;
+    public long l17785;
+    public long l17786;
+    public long l17787;
+    public long l17788;
+    public long l17789;
+    public long l17790;
+    public long l17791;
+    public long l17792;
+    public long l17793;
+    public long l17794;
+    public long l17795;
+    public long l17796;
+    public long l17797;
+    public long l17798;
+    public long l17799;
+    public long l17800;
+    public long l17801;
+    public long l17802;
+    public long l17803;
+    public long l17804;
+    public long l17805;
+    public long l17806;
+    public long l17807;
+    public long l17808;
+    public long l17809;
+    public long l17810;
+    public long l17811;
+    public long l17812;
+    public long l17813;
+    public long l17814;
+    public long l17815;
+    public long l17816;
+    public long l17817;
+    public long l17818;
+    public long l17819;
+    public long l17820;
+    public long l17821;
+    public long l17822;
+    public long l17823;
+    public long l17824;
+    public long l17825;
+    public long l17826;
+    public long l17827;
+    public long l17828;
+    public long l17829;
+    public long l17830;
+    public long l17831;
+    public long l17832;
+    public long l17833;
+    public long l17834;
+    public long l17835;
+    public long l17836;
+    public long l17837;
+    public long l17838;
+    public long l17839;
+    public long l17840;
+    public long l17841;
+    public long l17842;
+    public long l17843;
+    public long l17844;
+    public long l17845;
+    public long l17846;
+    public long l17847;
+    public long l17848;
+    public long l17849;
+    public long l17850;
+    public long l17851;
+    public long l17852;
+    public long l17853;
+    public long l17854;
+    public long l17855;
+    public long l17856;
+    public long l17857;
+    public long l17858;
+    public long l17859;
+    public long l17860;
+    public long l17861;
+    public long l17862;
+    public long l17863;
+    public long l17864;
+    public long l17865;
+    public long l17866;
+    public long l17867;
+    public long l17868;
+    public long l17869;
+    public long l17870;
+    public long l17871;
+    public long l17872;
+    public long l17873;
+    public long l17874;
+    public long l17875;
+    public long l17876;
+    public long l17877;
+    public long l17878;
+    public long l17879;
+    public long l17880;
+    public long l17881;
+    public long l17882;
+    public long l17883;
+    public long l17884;
+    public long l17885;
+    public long l17886;
+    public long l17887;
+    public long l17888;
+    public long l17889;
+    public long l17890;
+    public long l17891;
+    public long l17892;
+    public long l17893;
+    public long l17894;
+    public long l17895;
+    public long l17896;
+    public long l17897;
+    public long l17898;
+    public long l17899;
+    public long l17900;
+    public long l17901;
+    public long l17902;
+    public long l17903;
+    public long l17904;
+    public long l17905;
+    public long l17906;
+    public long l17907;
+    public long l17908;
+    public long l17909;
+    public long l17910;
+    public long l17911;
+    public long l17912;
+    public long l17913;
+    public long l17914;
+    public long l17915;
+    public long l17916;
+    public long l17917;
+    public long l17918;
+    public long l17919;
+    public long l17920;
+    public long l17921;
+    public long l17922;
+    public long l17923;
+    public long l17924;
+    public long l17925;
+    public long l17926;
+    public long l17927;
+    public long l17928;
+    public long l17929;
+    public long l17930;
+    public long l17931;
+    public long l17932;
+    public long l17933;
+    public long l17934;
+    public long l17935;
+    public long l17936;
+    public long l17937;
+    public long l17938;
+    public long l17939;
+    public long l17940;
+    public long l17941;
+    public long l17942;
+    public long l17943;
+    public long l17944;
+    public long l17945;
+    public long l17946;
+    public long l17947;
+    public long l17948;
+    public long l17949;
+    public long l17950;
+    public long l17951;
+    public long l17952;
+    public long l17953;
+    public long l17954;
+    public long l17955;
+    public long l17956;
+    public long l17957;
+    public long l17958;
+    public long l17959;
+    public long l17960;
+    public long l17961;
+    public long l17962;
+    public long l17963;
+    public long l17964;
+    public long l17965;
+    public long l17966;
+    public long l17967;
+    public long l17968;
+    public long l17969;
+    public long l17970;
+    public long l17971;
+    public long l17972;
+    public long l17973;
+    public long l17974;
+    public long l17975;
+    public long l17976;
+    public long l17977;
+    public long l17978;
+    public long l17979;
+    public long l17980;
+    public long l17981;
+    public long l17982;
+    public long l17983;
+    public long l17984;
+    public long l17985;
+    public long l17986;
+    public long l17987;
+    public long l17988;
+    public long l17989;
+    public long l17990;
+    public long l17991;
+    public long l17992;
+    public long l17993;
+    public long l17994;
+    public long l17995;
+    public long l17996;
+    public long l17997;
+    public long l17998;
+    public long l17999;
+    public long l18000;
+    public long l18001;
+    public long l18002;
+    public long l18003;
+    public long l18004;
+    public long l18005;
+    public long l18006;
+    public long l18007;
+    public long l18008;
+    public long l18009;
+    public long l18010;
+    public long l18011;
+    public long l18012;
+    public long l18013;
+    public long l18014;
+    public long l18015;
+    public long l18016;
+    public long l18017;
+    public long l18018;
+    public long l18019;
+    public long l18020;
+    public long l18021;
+    public long l18022;
+    public long l18023;
+    public long l18024;
+    public long l18025;
+    public long l18026;
+    public long l18027;
+    public long l18028;
+    public long l18029;
+    public long l18030;
+    public long l18031;
+    public long l18032;
+    public long l18033;
+    public long l18034;
+    public long l18035;
+    public long l18036;
+    public long l18037;
+    public long l18038;
+    public long l18039;
+    public long l18040;
+    public long l18041;
+    public long l18042;
+    public long l18043;
+    public long l18044;
+    public long l18045;
+    public long l18046;
+    public long l18047;
+    public long l18048;
+    public long l18049;
+    public long l18050;
+    public long l18051;
+    public long l18052;
+    public long l18053;
+    public long l18054;
+    public long l18055;
+    public long l18056;
+    public long l18057;
+    public long l18058;
+    public long l18059;
+    public long l18060;
+    public long l18061;
+    public long l18062;
+    public long l18063;
+    public long l18064;
+    public long l18065;
+    public long l18066;
+    public long l18067;
+    public long l18068;
+    public long l18069;
+    public long l18070;
+    public long l18071;
+    public long l18072;
+    public long l18073;
+    public long l18074;
+    public long l18075;
+    public long l18076;
+    public long l18077;
+    public long l18078;
+    public long l18079;
+    public long l18080;
+    public long l18081;
+    public long l18082;
+    public long l18083;
+    public long l18084;
+    public long l18085;
+    public long l18086;
+    public long l18087;
+    public long l18088;
+    public long l18089;
+    public long l18090;
+    public long l18091;
+    public long l18092;
+    public long l18093;
+    public long l18094;
+    public long l18095;
+    public long l18096;
+    public long l18097;
+    public long l18098;
+    public long l18099;
+    public long l18100;
+    public long l18101;
+    public long l18102;
+    public long l18103;
+    public long l18104;
+    public long l18105;
+    public long l18106;
+    public long l18107;
+    public long l18108;
+    public long l18109;
+    public long l18110;
+    public long l18111;
+    public long l18112;
+    public long l18113;
+    public long l18114;
+    public long l18115;
+    public long l18116;
+    public long l18117;
+    public long l18118;
+    public long l18119;
+    public long l18120;
+    public long l18121;
+    public long l18122;
+    public long l18123;
+    public long l18124;
+    public long l18125;
+    public long l18126;
+    public long l18127;
+    public long l18128;
+    public long l18129;
+    public long l18130;
+    public long l18131;
+    public long l18132;
+    public long l18133;
+    public long l18134;
+    public long l18135;
+    public long l18136;
+    public long l18137;
+    public long l18138;
+    public long l18139;
+    public long l18140;
+    public long l18141;
+    public long l18142;
+    public long l18143;
+    public long l18144;
+    public long l18145;
+    public long l18146;
+    public long l18147;
+    public long l18148;
+    public long l18149;
+    public long l18150;
+    public long l18151;
+    public long l18152;
+    public long l18153;
+    public long l18154;
+    public long l18155;
+    public long l18156;
+    public long l18157;
+    public long l18158;
+    public long l18159;
+    public long l18160;
+    public long l18161;
+    public long l18162;
+    public long l18163;
+    public long l18164;
+    public long l18165;
+    public long l18166;
+    public long l18167;
+    public long l18168;
+    public long l18169;
+    public long l18170;
+    public long l18171;
+    public long l18172;
+    public long l18173;
+    public long l18174;
+    public long l18175;
+    public long l18176;
+    public long l18177;
+    public long l18178;
+    public long l18179;
+    public long l18180;
+    public long l18181;
+    public long l18182;
+    public long l18183;
+    public long l18184;
+    public long l18185;
+    public long l18186;
+    public long l18187;
+    public long l18188;
+    public long l18189;
+    public long l18190;
+    public long l18191;
+    public long l18192;
+    public long l18193;
+    public long l18194;
+    public long l18195;
+    public long l18196;
+    public long l18197;
+    public long l18198;
+    public long l18199;
+    public long l18200;
+    public long l18201;
+    public long l18202;
+    public long l18203;
+    public long l18204;
+    public long l18205;
+    public long l18206;
+    public long l18207;
+    public long l18208;
+    public long l18209;
+    public long l18210;
+    public long l18211;
+    public long l18212;
+    public long l18213;
+    public long l18214;
+    public long l18215;
+    public long l18216;
+    public long l18217;
+    public long l18218;
+    public long l18219;
+    public long l18220;
+    public long l18221;
+    public long l18222;
+    public long l18223;
+    public long l18224;
+    public long l18225;
+    public long l18226;
+    public long l18227;
+    public long l18228;
+    public long l18229;
+    public long l18230;
+    public long l18231;
+    public long l18232;
+    public long l18233;
+    public long l18234;
+    public long l18235;
+    public long l18236;
+    public long l18237;
+    public long l18238;
+    public long l18239;
+    public long l18240;
+    public long l18241;
+    public long l18242;
+    public long l18243;
+    public long l18244;
+    public long l18245;
+    public long l18246;
+    public long l18247;
+    public long l18248;
+    public long l18249;
+    public long l18250;
+    public long l18251;
+    public long l18252;
+    public long l18253;
+    public long l18254;
+    public long l18255;
+    public long l18256;
+    public long l18257;
+    public long l18258;
+    public long l18259;
+    public long l18260;
+    public long l18261;
+    public long l18262;
+    public long l18263;
+    public long l18264;
+    public long l18265;
+    public long l18266;
+    public long l18267;
+    public long l18268;
+    public long l18269;
+    public long l18270;
+    public long l18271;
+    public long l18272;
+    public long l18273;
+    public long l18274;
+    public long l18275;
+    public long l18276;
+    public long l18277;
+    public long l18278;
+    public long l18279;
+    public long l18280;
+    public long l18281;
+    public long l18282;
+    public long l18283;
+    public long l18284;
+    public long l18285;
+    public long l18286;
+    public long l18287;
+    public long l18288;
+    public long l18289;
+    public long l18290;
+    public long l18291;
+    public long l18292;
+    public long l18293;
+    public long l18294;
+    public long l18295;
+    public long l18296;
+    public long l18297;
+    public long l18298;
+    public long l18299;
+    public long l18300;
+    public long l18301;
+    public long l18302;
+    public long l18303;
+    public long l18304;
+    public long l18305;
+    public long l18306;
+    public long l18307;
+    public long l18308;
+    public long l18309;
+    public long l18310;
+    public long l18311;
+    public long l18312;
+    public long l18313;
+    public long l18314;
+    public long l18315;
+    public long l18316;
+    public long l18317;
+    public long l18318;
+    public long l18319;
+    public long l18320;
+    public long l18321;
+    public long l18322;
+    public long l18323;
+    public long l18324;
+    public long l18325;
+    public long l18326;
+    public long l18327;
+    public long l18328;
+    public long l18329;
+    public long l18330;
+    public long l18331;
+    public long l18332;
+    public long l18333;
+    public long l18334;
+    public long l18335;
+    public long l18336;
+    public long l18337;
+    public long l18338;
+    public long l18339;
+    public long l18340;
+    public long l18341;
+    public long l18342;
+    public long l18343;
+    public long l18344;
+    public long l18345;
+    public long l18346;
+    public long l18347;
+    public long l18348;
+    public long l18349;
+    public long l18350;
+    public long l18351;
+    public long l18352;
+    public long l18353;
+    public long l18354;
+    public long l18355;
+    public long l18356;
+    public long l18357;
+    public long l18358;
+    public long l18359;
+    public long l18360;
+    public long l18361;
+    public long l18362;
+    public long l18363;
+    public long l18364;
+    public long l18365;
+    public long l18366;
+    public long l18367;
+    public long l18368;
+    public long l18369;
+    public long l18370;
+    public long l18371;
+    public long l18372;
+    public long l18373;
+    public long l18374;
+    public long l18375;
+    public long l18376;
+    public long l18377;
+    public long l18378;
+    public long l18379;
+    public long l18380;
+    public long l18381;
+    public long l18382;
+    public long l18383;
+    public long l18384;
+    public long l18385;
+    public long l18386;
+    public long l18387;
+    public long l18388;
+    public long l18389;
+    public long l18390;
+    public long l18391;
+    public long l18392;
+    public long l18393;
+    public long l18394;
+    public long l18395;
+    public long l18396;
+    public long l18397;
+    public long l18398;
+    public long l18399;
+    public long l18400;
+    public long l18401;
+    public long l18402;
+    public long l18403;
+    public long l18404;
+    public long l18405;
+    public long l18406;
+    public long l18407;
+    public long l18408;
+    public long l18409;
+    public long l18410;
+    public long l18411;
+    public long l18412;
+    public long l18413;
+    public long l18414;
+    public long l18415;
+    public long l18416;
+    public long l18417;
+    public long l18418;
+    public long l18419;
+    public long l18420;
+    public long l18421;
+    public long l18422;
+    public long l18423;
+    public long l18424;
+    public long l18425;
+    public long l18426;
+    public long l18427;
+    public long l18428;
+    public long l18429;
+    public long l18430;
+    public long l18431;
+    public long l18432;
+    public long l18433;
+    public long l18434;
+    public long l18435;
+    public long l18436;
+    public long l18437;
+    public long l18438;
+    public long l18439;
+    public long l18440;
+    public long l18441;
+    public long l18442;
+    public long l18443;
+    public long l18444;
+    public long l18445;
+    public long l18446;
+    public long l18447;
+    public long l18448;
+    public long l18449;
+    public long l18450;
+    public long l18451;
+    public long l18452;
+    public long l18453;
+    public long l18454;
+    public long l18455;
+    public long l18456;
+    public long l18457;
+    public long l18458;
+    public long l18459;
+    public long l18460;
+    public long l18461;
+    public long l18462;
+    public long l18463;
+    public long l18464;
+    public long l18465;
+    public long l18466;
+    public long l18467;
+    public long l18468;
+    public long l18469;
+    public long l18470;
+    public long l18471;
+    public long l18472;
+    public long l18473;
+    public long l18474;
+    public long l18475;
+    public long l18476;
+    public long l18477;
+    public long l18478;
+    public long l18479;
+    public long l18480;
+    public long l18481;
+    public long l18482;
+    public long l18483;
+    public long l18484;
+    public long l18485;
+    public long l18486;
+    public long l18487;
+    public long l18488;
+    public long l18489;
+    public long l18490;
+    public long l18491;
+    public long l18492;
+    public long l18493;
+    public long l18494;
+    public long l18495;
+    public long l18496;
+    public long l18497;
+    public long l18498;
+    public long l18499;
+    public long l18500;
+    public long l18501;
+    public long l18502;
+    public long l18503;
+    public long l18504;
+    public long l18505;
+    public long l18506;
+    public long l18507;
+    public long l18508;
+    public long l18509;
+    public long l18510;
+    public long l18511;
+    public long l18512;
+    public long l18513;
+    public long l18514;
+    public long l18515;
+    public long l18516;
+    public long l18517;
+    public long l18518;
+    public long l18519;
+    public long l18520;
+    public long l18521;
+    public long l18522;
+    public long l18523;
+    public long l18524;
+    public long l18525;
+    public long l18526;
+    public long l18527;
+    public long l18528;
+    public long l18529;
+    public long l18530;
+    public long l18531;
+    public long l18532;
+    public long l18533;
+    public long l18534;
+    public long l18535;
+    public long l18536;
+    public long l18537;
+    public long l18538;
+    public long l18539;
+    public long l18540;
+    public long l18541;
+    public long l18542;
+    public long l18543;
+    public long l18544;
+    public long l18545;
+    public long l18546;
+    public long l18547;
+    public long l18548;
+    public long l18549;
+    public long l18550;
+    public long l18551;
+    public long l18552;
+    public long l18553;
+    public long l18554;
+    public long l18555;
+    public long l18556;
+    public long l18557;
+    public long l18558;
+    public long l18559;
+    public long l18560;
+    public long l18561;
+    public long l18562;
+    public long l18563;
+    public long l18564;
+    public long l18565;
+    public long l18566;
+    public long l18567;
+    public long l18568;
+    public long l18569;
+    public long l18570;
+    public long l18571;
+    public long l18572;
+    public long l18573;
+    public long l18574;
+    public long l18575;
+    public long l18576;
+    public long l18577;
+    public long l18578;
+    public long l18579;
+    public long l18580;
+    public long l18581;
+    public long l18582;
+    public long l18583;
+    public long l18584;
+    public long l18585;
+    public long l18586;
+    public long l18587;
+    public long l18588;
+    public long l18589;
+    public long l18590;
+    public long l18591;
+    public long l18592;
+    public long l18593;
+    public long l18594;
+    public long l18595;
+    public long l18596;
+    public long l18597;
+    public long l18598;
+    public long l18599;
+    public long l18600;
+    public long l18601;
+    public long l18602;
+    public long l18603;
+    public long l18604;
+    public long l18605;
+    public long l18606;
+    public long l18607;
+    public long l18608;
+    public long l18609;
+    public long l18610;
+    public long l18611;
+    public long l18612;
+    public long l18613;
+    public long l18614;
+    public long l18615;
+    public long l18616;
+    public long l18617;
+    public long l18618;
+    public long l18619;
+    public long l18620;
+    public long l18621;
+    public long l18622;
+    public long l18623;
+    public long l18624;
+    public long l18625;
+    public long l18626;
+    public long l18627;
+    public long l18628;
+    public long l18629;
+    public long l18630;
+    public long l18631;
+    public long l18632;
+    public long l18633;
+    public long l18634;
+    public long l18635;
+    public long l18636;
+    public long l18637;
+    public long l18638;
+    public long l18639;
+    public long l18640;
+    public long l18641;
+    public long l18642;
+    public long l18643;
+    public long l18644;
+    public long l18645;
+    public long l18646;
+    public long l18647;
+    public long l18648;
+    public long l18649;
+    public long l18650;
+    public long l18651;
+    public long l18652;
+    public long l18653;
+    public long l18654;
+    public long l18655;
+    public long l18656;
+    public long l18657;
+    public long l18658;
+    public long l18659;
+    public long l18660;
+    public long l18661;
+    public long l18662;
+    public long l18663;
+    public long l18664;
+    public long l18665;
+    public long l18666;
+    public long l18667;
+    public long l18668;
+    public long l18669;
+    public long l18670;
+    public long l18671;
+    public long l18672;
+    public long l18673;
+    public long l18674;
+    public long l18675;
+    public long l18676;
+    public long l18677;
+    public long l18678;
+    public long l18679;
+    public long l18680;
+    public long l18681;
+    public long l18682;
+    public long l18683;
+    public long l18684;
+    public long l18685;
+    public long l18686;
+    public long l18687;
+    public long l18688;
+    public long l18689;
+    public long l18690;
+    public long l18691;
+    public long l18692;
+    public long l18693;
+    public long l18694;
+    public long l18695;
+    public long l18696;
+    public long l18697;
+    public long l18698;
+    public long l18699;
+    public long l18700;
+    public long l18701;
+    public long l18702;
+    public long l18703;
+    public long l18704;
+    public long l18705;
+    public long l18706;
+    public long l18707;
+    public long l18708;
+    public long l18709;
+    public long l18710;
+    public long l18711;
+    public long l18712;
+    public long l18713;
+    public long l18714;
+    public long l18715;
+    public long l18716;
+    public long l18717;
+    public long l18718;
+    public long l18719;
+    public long l18720;
+    public long l18721;
+    public long l18722;
+    public long l18723;
+    public long l18724;
+    public long l18725;
+    public long l18726;
+    public long l18727;
+    public long l18728;
+    public long l18729;
+    public long l18730;
+    public long l18731;
+    public long l18732;
+    public long l18733;
+    public long l18734;
+    public long l18735;
+    public long l18736;
+    public long l18737;
+    public long l18738;
+    public long l18739;
+    public long l18740;
+    public long l18741;
+    public long l18742;
+    public long l18743;
+    public long l18744;
+    public long l18745;
+    public long l18746;
+    public long l18747;
+    public long l18748;
+    public long l18749;
+    public long l18750;
+    public long l18751;
+    public long l18752;
+    public long l18753;
+    public long l18754;
+    public long l18755;
+    public long l18756;
+    public long l18757;
+    public long l18758;
+    public long l18759;
+    public long l18760;
+    public long l18761;
+    public long l18762;
+    public long l18763;
+    public long l18764;
+    public long l18765;
+    public long l18766;
+    public long l18767;
+    public long l18768;
+    public long l18769;
+    public long l18770;
+    public long l18771;
+    public long l18772;
+    public long l18773;
+    public long l18774;
+    public long l18775;
+    public long l18776;
+    public long l18777;
+    public long l18778;
+    public long l18779;
+    public long l18780;
+    public long l18781;
+    public long l18782;
+    public long l18783;
+    public long l18784;
+    public long l18785;
+    public long l18786;
+    public long l18787;
+    public long l18788;
+    public long l18789;
+    public long l18790;
+    public long l18791;
+    public long l18792;
+    public long l18793;
+    public long l18794;
+    public long l18795;
+    public long l18796;
+    public long l18797;
+    public long l18798;
+    public long l18799;
+    public long l18800;
+    public long l18801;
+    public long l18802;
+    public long l18803;
+    public long l18804;
+    public long l18805;
+    public long l18806;
+    public long l18807;
+    public long l18808;
+    public long l18809;
+    public long l18810;
+    public long l18811;
+    public long l18812;
+    public long l18813;
+    public long l18814;
+    public long l18815;
+    public long l18816;
+    public long l18817;
+    public long l18818;
+    public long l18819;
+    public long l18820;
+    public long l18821;
+    public long l18822;
+    public long l18823;
+    public long l18824;
+    public long l18825;
+    public long l18826;
+    public long l18827;
+    public long l18828;
+    public long l18829;
+    public long l18830;
+    public long l18831;
+    public long l18832;
+    public long l18833;
+    public long l18834;
+    public long l18835;
+    public long l18836;
+    public long l18837;
+    public long l18838;
+    public long l18839;
+    public long l18840;
+    public long l18841;
+    public long l18842;
+    public long l18843;
+    public long l18844;
+    public long l18845;
+    public long l18846;
+    public long l18847;
+    public long l18848;
+    public long l18849;
+    public long l18850;
+    public long l18851;
+    public long l18852;
+    public long l18853;
+    public long l18854;
+    public long l18855;
+    public long l18856;
+    public long l18857;
+    public long l18858;
+    public long l18859;
+    public long l18860;
+    public long l18861;
+    public long l18862;
+    public long l18863;
+    public long l18864;
+    public long l18865;
+    public long l18866;
+    public long l18867;
+    public long l18868;
+    public long l18869;
+    public long l18870;
+    public long l18871;
+    public long l18872;
+    public long l18873;
+    public long l18874;
+    public long l18875;
+    public long l18876;
+    public long l18877;
+    public long l18878;
+    public long l18879;
+    public long l18880;
+    public long l18881;
+    public long l18882;
+    public long l18883;
+    public long l18884;
+    public long l18885;
+    public long l18886;
+    public long l18887;
+    public long l18888;
+    public long l18889;
+    public long l18890;
+    public long l18891;
+    public long l18892;
+    public long l18893;
+    public long l18894;
+    public long l18895;
+    public long l18896;
+    public long l18897;
+    public long l18898;
+    public long l18899;
+    public long l18900;
+    public long l18901;
+    public long l18902;
+    public long l18903;
+    public long l18904;
+    public long l18905;
+    public long l18906;
+    public long l18907;
+    public long l18908;
+    public long l18909;
+    public long l18910;
+    public long l18911;
+    public long l18912;
+    public long l18913;
+    public long l18914;
+    public long l18915;
+    public long l18916;
+    public long l18917;
+    public long l18918;
+    public long l18919;
+    public long l18920;
+    public long l18921;
+    public long l18922;
+    public long l18923;
+    public long l18924;
+    public long l18925;
+    public long l18926;
+    public long l18927;
+    public long l18928;
+    public long l18929;
+    public long l18930;
+    public long l18931;
+    public long l18932;
+    public long l18933;
+    public long l18934;
+    public long l18935;
+    public long l18936;
+    public long l18937;
+    public long l18938;
+    public long l18939;
+    public long l18940;
+    public long l18941;
+    public long l18942;
+    public long l18943;
+    public long l18944;
+    public long l18945;
+    public long l18946;
+    public long l18947;
+    public long l18948;
+    public long l18949;
+    public long l18950;
+    public long l18951;
+    public long l18952;
+    public long l18953;
+    public long l18954;
+    public long l18955;
+    public long l18956;
+    public long l18957;
+    public long l18958;
+    public long l18959;
+    public long l18960;
+    public long l18961;
+    public long l18962;
+    public long l18963;
+    public long l18964;
+    public long l18965;
+    public long l18966;
+    public long l18967;
+    public long l18968;
+    public long l18969;
+    public long l18970;
+    public long l18971;
+    public long l18972;
+    public long l18973;
+    public long l18974;
+    public long l18975;
+    public long l18976;
+    public long l18977;
+    public long l18978;
+    public long l18979;
+    public long l18980;
+    public long l18981;
+    public long l18982;
+    public long l18983;
+    public long l18984;
+    public long l18985;
+    public long l18986;
+    public long l18987;
+    public long l18988;
+    public long l18989;
+    public long l18990;
+    public long l18991;
+    public long l18992;
+    public long l18993;
+    public long l18994;
+    public long l18995;
+    public long l18996;
+    public long l18997;
+    public long l18998;
+    public long l18999;
+    public long l19000;
+    public long l19001;
+    public long l19002;
+    public long l19003;
+    public long l19004;
+    public long l19005;
+    public long l19006;
+    public long l19007;
+    public long l19008;
+    public long l19009;
+    public long l19010;
+    public long l19011;
+    public long l19012;
+    public long l19013;
+    public long l19014;
+    public long l19015;
+    public long l19016;
+    public long l19017;
+    public long l19018;
+    public long l19019;
+    public long l19020;
+    public long l19021;
+    public long l19022;
+    public long l19023;
+    public long l19024;
+    public long l19025;
+    public long l19026;
+    public long l19027;
+    public long l19028;
+    public long l19029;
+    public long l19030;
+    public long l19031;
+    public long l19032;
+    public long l19033;
+    public long l19034;
+    public long l19035;
+    public long l19036;
+    public long l19037;
+    public long l19038;
+    public long l19039;
+    public long l19040;
+    public long l19041;
+    public long l19042;
+    public long l19043;
+    public long l19044;
+    public long l19045;
+    public long l19046;
+    public long l19047;
+    public long l19048;
+    public long l19049;
+    public long l19050;
+    public long l19051;
+    public long l19052;
+    public long l19053;
+    public long l19054;
+    public long l19055;
+    public long l19056;
+    public long l19057;
+    public long l19058;
+    public long l19059;
+    public long l19060;
+    public long l19061;
+    public long l19062;
+    public long l19063;
+    public long l19064;
+    public long l19065;
+    public long l19066;
+    public long l19067;
+    public long l19068;
+    public long l19069;
+    public long l19070;
+    public long l19071;
+    public long l19072;
+    public long l19073;
+    public long l19074;
+    public long l19075;
+    public long l19076;
+    public long l19077;
+    public long l19078;
+    public long l19079;
+    public long l19080;
+    public long l19081;
+    public long l19082;
+    public long l19083;
+    public long l19084;
+    public long l19085;
+    public long l19086;
+    public long l19087;
+    public long l19088;
+    public long l19089;
+    public long l19090;
+    public long l19091;
+    public long l19092;
+    public long l19093;
+    public long l19094;
+    public long l19095;
+    public long l19096;
+    public long l19097;
+    public long l19098;
+    public long l19099;
+    public long l19100;
+    public long l19101;
+    public long l19102;
+    public long l19103;
+    public long l19104;
+    public long l19105;
+    public long l19106;
+    public long l19107;
+    public long l19108;
+    public long l19109;
+    public long l19110;
+    public long l19111;
+    public long l19112;
+    public long l19113;
+    public long l19114;
+    public long l19115;
+    public long l19116;
+    public long l19117;
+    public long l19118;
+    public long l19119;
+    public long l19120;
+    public long l19121;
+    public long l19122;
+    public long l19123;
+    public long l19124;
+    public long l19125;
+    public long l19126;
+    public long l19127;
+    public long l19128;
+    public long l19129;
+    public long l19130;
+    public long l19131;
+    public long l19132;
+    public long l19133;
+    public long l19134;
+    public long l19135;
+    public long l19136;
+    public long l19137;
+    public long l19138;
+    public long l19139;
+    public long l19140;
+    public long l19141;
+    public long l19142;
+    public long l19143;
+    public long l19144;
+    public long l19145;
+    public long l19146;
+    public long l19147;
+    public long l19148;
+    public long l19149;
+    public long l19150;
+    public long l19151;
+    public long l19152;
+    public long l19153;
+    public long l19154;
+    public long l19155;
+    public long l19156;
+    public long l19157;
+    public long l19158;
+    public long l19159;
+    public long l19160;
+    public long l19161;
+    public long l19162;
+    public long l19163;
+    public long l19164;
+    public long l19165;
+    public long l19166;
+    public long l19167;
+    public long l19168;
+    public long l19169;
+    public long l19170;
+    public long l19171;
+    public long l19172;
+    public long l19173;
+    public long l19174;
+    public long l19175;
+    public long l19176;
+    public long l19177;
+    public long l19178;
+    public long l19179;
+    public long l19180;
+    public long l19181;
+    public long l19182;
+    public long l19183;
+    public long l19184;
+    public long l19185;
+    public long l19186;
+    public long l19187;
+    public long l19188;
+    public long l19189;
+    public long l19190;
+    public long l19191;
+    public long l19192;
+    public long l19193;
+    public long l19194;
+    public long l19195;
+    public long l19196;
+    public long l19197;
+    public long l19198;
+    public long l19199;
+    public long l19200;
+    public long l19201;
+    public long l19202;
+    public long l19203;
+    public long l19204;
+    public long l19205;
+    public long l19206;
+    public long l19207;
+    public long l19208;
+    public long l19209;
+    public long l19210;
+    public long l19211;
+    public long l19212;
+    public long l19213;
+    public long l19214;
+    public long l19215;
+    public long l19216;
+    public long l19217;
+    public long l19218;
+    public long l19219;
+    public long l19220;
+    public long l19221;
+    public long l19222;
+    public long l19223;
+    public long l19224;
+    public long l19225;
+    public long l19226;
+    public long l19227;
+    public long l19228;
+    public long l19229;
+    public long l19230;
+    public long l19231;
+    public long l19232;
+    public long l19233;
+    public long l19234;
+    public long l19235;
+    public long l19236;
+    public long l19237;
+    public long l19238;
+    public long l19239;
+    public long l19240;
+    public long l19241;
+    public long l19242;
+    public long l19243;
+    public long l19244;
+    public long l19245;
+    public long l19246;
+    public long l19247;
+    public long l19248;
+    public long l19249;
+    public long l19250;
+    public long l19251;
+    public long l19252;
+    public long l19253;
+    public long l19254;
+    public long l19255;
+    public long l19256;
+    public long l19257;
+    public long l19258;
+    public long l19259;
+    public long l19260;
+    public long l19261;
+    public long l19262;
+    public long l19263;
+    public long l19264;
+    public long l19265;
+    public long l19266;
+    public long l19267;
+    public long l19268;
+    public long l19269;
+    public long l19270;
+    public long l19271;
+    public long l19272;
+    public long l19273;
+    public long l19274;
+    public long l19275;
+    public long l19276;
+    public long l19277;
+    public long l19278;
+    public long l19279;
+    public long l19280;
+    public long l19281;
+    public long l19282;
+    public long l19283;
+    public long l19284;
+    public long l19285;
+    public long l19286;
+    public long l19287;
+    public long l19288;
+    public long l19289;
+    public long l19290;
+    public long l19291;
+    public long l19292;
+    public long l19293;
+    public long l19294;
+    public long l19295;
+    public long l19296;
+    public long l19297;
+    public long l19298;
+    public long l19299;
+    public long l19300;
+    public long l19301;
+    public long l19302;
+    public long l19303;
+    public long l19304;
+    public long l19305;
+    public long l19306;
+    public long l19307;
+    public long l19308;
+    public long l19309;
+    public long l19310;
+    public long l19311;
+    public long l19312;
+    public long l19313;
+    public long l19314;
+    public long l19315;
+    public long l19316;
+    public long l19317;
+    public long l19318;
+    public long l19319;
+    public long l19320;
+    public long l19321;
+    public long l19322;
+    public long l19323;
+    public long l19324;
+    public long l19325;
+    public long l19326;
+    public long l19327;
+    public long l19328;
+    public long l19329;
+    public long l19330;
+    public long l19331;
+    public long l19332;
+    public long l19333;
+    public long l19334;
+    public long l19335;
+    public long l19336;
+    public long l19337;
+    public long l19338;
+    public long l19339;
+    public long l19340;
+    public long l19341;
+    public long l19342;
+    public long l19343;
+    public long l19344;
+    public long l19345;
+    public long l19346;
+    public long l19347;
+    public long l19348;
+    public long l19349;
+    public long l19350;
+    public long l19351;
+    public long l19352;
+    public long l19353;
+    public long l19354;
+    public long l19355;
+    public long l19356;
+    public long l19357;
+    public long l19358;
+    public long l19359;
+    public long l19360;
+    public long l19361;
+    public long l19362;
+    public long l19363;
+    public long l19364;
+    public long l19365;
+    public long l19366;
+    public long l19367;
+    public long l19368;
+    public long l19369;
+    public long l19370;
+    public long l19371;
+    public long l19372;
+    public long l19373;
+    public long l19374;
+    public long l19375;
+    public long l19376;
+    public long l19377;
+    public long l19378;
+    public long l19379;
+    public long l19380;
+    public long l19381;
+    public long l19382;
+    public long l19383;
+    public long l19384;
+    public long l19385;
+    public long l19386;
+    public long l19387;
+    public long l19388;
+    public long l19389;
+    public long l19390;
+    public long l19391;
+    public long l19392;
+    public long l19393;
+    public long l19394;
+    public long l19395;
+    public long l19396;
+    public long l19397;
+    public long l19398;
+    public long l19399;
+    public long l19400;
+    public long l19401;
+    public long l19402;
+    public long l19403;
+    public long l19404;
+    public long l19405;
+    public long l19406;
+    public long l19407;
+    public long l19408;
+    public long l19409;
+    public long l19410;
+    public long l19411;
+    public long l19412;
+    public long l19413;
+    public long l19414;
+    public long l19415;
+    public long l19416;
+    public long l19417;
+    public long l19418;
+    public long l19419;
+    public long l19420;
+    public long l19421;
+    public long l19422;
+    public long l19423;
+    public long l19424;
+    public long l19425;
+    public long l19426;
+    public long l19427;
+    public long l19428;
+    public long l19429;
+    public long l19430;
+    public long l19431;
+    public long l19432;
+    public long l19433;
+    public long l19434;
+    public long l19435;
+    public long l19436;
+    public long l19437;
+    public long l19438;
+    public long l19439;
+    public long l19440;
+    public long l19441;
+    public long l19442;
+    public long l19443;
+    public long l19444;
+    public long l19445;
+    public long l19446;
+    public long l19447;
+    public long l19448;
+    public long l19449;
+    public long l19450;
+    public long l19451;
+    public long l19452;
+    public long l19453;
+    public long l19454;
+    public long l19455;
+    public long l19456;
+    public long l19457;
+    public long l19458;
+    public long l19459;
+    public long l19460;
+    public long l19461;
+    public long l19462;
+    public long l19463;
+    public long l19464;
+    public long l19465;
+    public long l19466;
+    public long l19467;
+    public long l19468;
+    public long l19469;
+    public long l19470;
+    public long l19471;
+    public long l19472;
+    public long l19473;
+    public long l19474;
+    public long l19475;
+    public long l19476;
+    public long l19477;
+    public long l19478;
+    public long l19479;
+    public long l19480;
+    public long l19481;
+    public long l19482;
+    public long l19483;
+    public long l19484;
+    public long l19485;
+    public long l19486;
+    public long l19487;
+    public long l19488;
+    public long l19489;
+    public long l19490;
+    public long l19491;
+    public long l19492;
+    public long l19493;
+    public long l19494;
+    public long l19495;
+    public long l19496;
+    public long l19497;
+    public long l19498;
+    public long l19499;
+    public long l19500;
+    public long l19501;
+    public long l19502;
+    public long l19503;
+    public long l19504;
+    public long l19505;
+    public long l19506;
+    public long l19507;
+    public long l19508;
+    public long l19509;
+    public long l19510;
+    public long l19511;
+    public long l19512;
+    public long l19513;
+    public long l19514;
+    public long l19515;
+    public long l19516;
+    public long l19517;
+    public long l19518;
+    public long l19519;
+    public long l19520;
+    public long l19521;
+    public long l19522;
+    public long l19523;
+    public long l19524;
+    public long l19525;
+    public long l19526;
+    public long l19527;
+    public long l19528;
+    public long l19529;
+    public long l19530;
+    public long l19531;
+    public long l19532;
+    public long l19533;
+    public long l19534;
+    public long l19535;
+    public long l19536;
+    public long l19537;
+    public long l19538;
+    public long l19539;
+    public long l19540;
+    public long l19541;
+    public long l19542;
+    public long l19543;
+    public long l19544;
+    public long l19545;
+    public long l19546;
+    public long l19547;
+    public long l19548;
+    public long l19549;
+    public long l19550;
+    public long l19551;
+    public long l19552;
+    public long l19553;
+    public long l19554;
+    public long l19555;
+    public long l19556;
+    public long l19557;
+    public long l19558;
+    public long l19559;
+    public long l19560;
+    public long l19561;
+    public long l19562;
+    public long l19563;
+    public long l19564;
+    public long l19565;
+    public long l19566;
+    public long l19567;
+    public long l19568;
+    public long l19569;
+    public long l19570;
+    public long l19571;
+    public long l19572;
+    public long l19573;
+    public long l19574;
+    public long l19575;
+    public long l19576;
+    public long l19577;
+    public long l19578;
+    public long l19579;
+    public long l19580;
+    public long l19581;
+    public long l19582;
+    public long l19583;
+    public long l19584;
+    public long l19585;
+    public long l19586;
+    public long l19587;
+    public long l19588;
+    public long l19589;
+    public long l19590;
+    public long l19591;
+    public long l19592;
+    public long l19593;
+    public long l19594;
+    public long l19595;
+    public long l19596;
+    public long l19597;
+    public long l19598;
+    public long l19599;
+    public long l19600;
+    public long l19601;
+    public long l19602;
+    public long l19603;
+    public long l19604;
+    public long l19605;
+    public long l19606;
+    public long l19607;
+    public long l19608;
+    public long l19609;
+    public long l19610;
+    public long l19611;
+    public long l19612;
+    public long l19613;
+    public long l19614;
+    public long l19615;
+    public long l19616;
+    public long l19617;
+    public long l19618;
+    public long l19619;
+    public long l19620;
+    public long l19621;
+    public long l19622;
+    public long l19623;
+    public long l19624;
+    public long l19625;
+    public long l19626;
+    public long l19627;
+    public long l19628;
+    public long l19629;
+    public long l19630;
+    public long l19631;
+    public long l19632;
+    public long l19633;
+    public long l19634;
+    public long l19635;
+    public long l19636;
+    public long l19637;
+    public long l19638;
+    public long l19639;
+    public long l19640;
+    public long l19641;
+    public long l19642;
+    public long l19643;
+    public long l19644;
+    public long l19645;
+    public long l19646;
+    public long l19647;
+    public long l19648;
+    public long l19649;
+    public long l19650;
+    public long l19651;
+    public long l19652;
+    public long l19653;
+    public long l19654;
+    public long l19655;
+    public long l19656;
+    public long l19657;
+    public long l19658;
+    public long l19659;
+    public long l19660;
+    public long l19661;
+    public long l19662;
+    public long l19663;
+    public long l19664;
+    public long l19665;
+    public long l19666;
+    public long l19667;
+    public long l19668;
+    public long l19669;
+    public long l19670;
+    public long l19671;
+    public long l19672;
+    public long l19673;
+    public long l19674;
+    public long l19675;
+    public long l19676;
+    public long l19677;
+    public long l19678;
+    public long l19679;
+    public long l19680;
+    public long l19681;
+    public long l19682;
+    public long l19683;
+    public long l19684;
+    public long l19685;
+    public long l19686;
+    public long l19687;
+    public long l19688;
+    public long l19689;
+    public long l19690;
+    public long l19691;
+    public long l19692;
+    public long l19693;
+    public long l19694;
+    public long l19695;
+    public long l19696;
+    public long l19697;
+    public long l19698;
+    public long l19699;
+    public long l19700;
+    public long l19701;
+    public long l19702;
+    public long l19703;
+    public long l19704;
+    public long l19705;
+    public long l19706;
+    public long l19707;
+    public long l19708;
+    public long l19709;
+    public long l19710;
+    public long l19711;
+    public long l19712;
+    public long l19713;
+    public long l19714;
+    public long l19715;
+    public long l19716;
+    public long l19717;
+    public long l19718;
+    public long l19719;
+    public long l19720;
+    public long l19721;
+    public long l19722;
+    public long l19723;
+    public long l19724;
+    public long l19725;
+    public long l19726;
+    public long l19727;
+    public long l19728;
+    public long l19729;
+    public long l19730;
+    public long l19731;
+    public long l19732;
+    public long l19733;
+    public long l19734;
+    public long l19735;
+    public long l19736;
+    public long l19737;
+    public long l19738;
+    public long l19739;
+    public long l19740;
+    public long l19741;
+    public long l19742;
+    public long l19743;
+    public long l19744;
+    public long l19745;
+    public long l19746;
+    public long l19747;
+    public long l19748;
+    public long l19749;
+    public long l19750;
+    public long l19751;
+    public long l19752;
+    public long l19753;
+    public long l19754;
+    public long l19755;
+    public long l19756;
+    public long l19757;
+    public long l19758;
+    public long l19759;
+    public long l19760;
+    public long l19761;
+    public long l19762;
+    public long l19763;
+    public long l19764;
+    public long l19765;
+    public long l19766;
+    public long l19767;
+    public long l19768;
+    public long l19769;
+    public long l19770;
+    public long l19771;
+    public long l19772;
+    public long l19773;
+    public long l19774;
+    public long l19775;
+    public long l19776;
+    public long l19777;
+    public long l19778;
+    public long l19779;
+    public long l19780;
+    public long l19781;
+    public long l19782;
+    public long l19783;
+    public long l19784;
+    public long l19785;
+    public long l19786;
+    public long l19787;
+    public long l19788;
+    public long l19789;
+    public long l19790;
+    public long l19791;
+    public long l19792;
+    public long l19793;
+    public long l19794;
+    public long l19795;
+    public long l19796;
+    public long l19797;
+    public long l19798;
+    public long l19799;
+    public long l19800;
+    public long l19801;
+    public long l19802;
+    public long l19803;
+    public long l19804;
+    public long l19805;
+    public long l19806;
+    public long l19807;
+    public long l19808;
+    public long l19809;
+    public long l19810;
+    public long l19811;
+    public long l19812;
+    public long l19813;
+    public long l19814;
+    public long l19815;
+    public long l19816;
+    public long l19817;
+    public long l19818;
+    public long l19819;
+    public long l19820;
+    public long l19821;
+    public long l19822;
+    public long l19823;
+    public long l19824;
+    public long l19825;
+    public long l19826;
+    public long l19827;
+    public long l19828;
+    public long l19829;
+    public long l19830;
+    public long l19831;
+    public long l19832;
+    public long l19833;
+    public long l19834;
+    public long l19835;
+    public long l19836;
+    public long l19837;
+    public long l19838;
+    public long l19839;
+    public long l19840;
+    public long l19841;
+    public long l19842;
+    public long l19843;
+    public long l19844;
+    public long l19845;
+    public long l19846;
+    public long l19847;
+    public long l19848;
+    public long l19849;
+    public long l19850;
+    public long l19851;
+    public long l19852;
+    public long l19853;
+    public long l19854;
+    public long l19855;
+    public long l19856;
+    public long l19857;
+    public long l19858;
+    public long l19859;
+    public long l19860;
+    public long l19861;
+    public long l19862;
+    public long l19863;
+    public long l19864;
+    public long l19865;
+    public long l19866;
+    public long l19867;
+    public long l19868;
+    public long l19869;
+    public long l19870;
+    public long l19871;
+    public long l19872;
+    public long l19873;
+    public long l19874;
+    public long l19875;
+    public long l19876;
+    public long l19877;
+    public long l19878;
+    public long l19879;
+    public long l19880;
+    public long l19881;
+    public long l19882;
+    public long l19883;
+    public long l19884;
+    public long l19885;
+    public long l19886;
+    public long l19887;
+    public long l19888;
+    public long l19889;
+    public long l19890;
+    public long l19891;
+    public long l19892;
+    public long l19893;
+    public long l19894;
+    public long l19895;
+    public long l19896;
+    public long l19897;
+    public long l19898;
+    public long l19899;
+    public long l19900;
+    public long l19901;
+    public long l19902;
+    public long l19903;
+    public long l19904;
+    public long l19905;
+    public long l19906;
+    public long l19907;
+    public long l19908;
+    public long l19909;
+    public long l19910;
+    public long l19911;
+    public long l19912;
+    public long l19913;
+    public long l19914;
+    public long l19915;
+    public long l19916;
+    public long l19917;
+    public long l19918;
+    public long l19919;
+    public long l19920;
+    public long l19921;
+    public long l19922;
+    public long l19923;
+    public long l19924;
+    public long l19925;
+    public long l19926;
+    public long l19927;
+    public long l19928;
+    public long l19929;
+    public long l19930;
+    public long l19931;
+    public long l19932;
+    public long l19933;
+    public long l19934;
+    public long l19935;
+    public long l19936;
+    public long l19937;
+    public long l19938;
+    public long l19939;
+    public long l19940;
+    public long l19941;
+    public long l19942;
+    public long l19943;
+    public long l19944;
+    public long l19945;
+    public long l19946;
+    public long l19947;
+    public long l19948;
+    public long l19949;
+    public long l19950;
+    public long l19951;
+    public long l19952;
+    public long l19953;
+    public long l19954;
+    public long l19955;
+    public long l19956;
+    public long l19957;
+    public long l19958;
+    public long l19959;
+    public long l19960;
+    public long l19961;
+    public long l19962;
+    public long l19963;
+    public long l19964;
+    public long l19965;
+    public long l19966;
+    public long l19967;
+    public long l19968;
+    public long l19969;
+    public long l19970;
+    public long l19971;
+    public long l19972;
+    public long l19973;
+    public long l19974;
+    public long l19975;
+    public long l19976;
+    public long l19977;
+    public long l19978;
+    public long l19979;
+    public long l19980;
+    public long l19981;
+    public long l19982;
+    public long l19983;
+    public long l19984;
+    public long l19985;
+    public long l19986;
+    public long l19987;
+    public long l19988;
+    public long l19989;
+    public long l19990;
+    public long l19991;
+    public long l19992;
+    public long l19993;
+    public long l19994;
+    public long l19995;
+    public long l19996;
+    public long l19997;
+    public long l19998;
+    public long l19999;
+    public long l20000;
+    public long l20001;
+    public long l20002;
+    public long l20003;
+    public long l20004;
+    public long l20005;
+    public long l20006;
+    public long l20007;
+    public long l20008;
+    public long l20009;
+    public long l20010;
+    public long l20011;
+    public long l20012;
+    public long l20013;
+    public long l20014;
+    public long l20015;
+    public long l20016;
+    public long l20017;
+    public long l20018;
+    public long l20019;
+    public long l20020;
+    public long l20021;
+    public long l20022;
+    public long l20023;
+    public long l20024;
+    public long l20025;
+    public long l20026;
+    public long l20027;
+    public long l20028;
+    public long l20029;
+    public long l20030;
+    public long l20031;
+    public long l20032;
+    public long l20033;
+    public long l20034;
+    public long l20035;
+    public long l20036;
+    public long l20037;
+    public long l20038;
+    public long l20039;
+    public long l20040;
+    public long l20041;
+    public long l20042;
+    public long l20043;
+    public long l20044;
+    public long l20045;
+    public long l20046;
+    public long l20047;
+    public long l20048;
+    public long l20049;
+    public long l20050;
+    public long l20051;
+    public long l20052;
+    public long l20053;
+    public long l20054;
+    public long l20055;
+    public long l20056;
+    public long l20057;
+    public long l20058;
+    public long l20059;
+    public long l20060;
+    public long l20061;
+    public long l20062;
+    public long l20063;
+    public long l20064;
+    public long l20065;
+    public long l20066;
+    public long l20067;
+    public long l20068;
+    public long l20069;
+    public long l20070;
+    public long l20071;
+    public long l20072;
+    public long l20073;
+    public long l20074;
+    public long l20075;
+    public long l20076;
+    public long l20077;
+    public long l20078;
+    public long l20079;
+    public long l20080;
+    public long l20081;
+    public long l20082;
+    public long l20083;
+    public long l20084;
+    public long l20085;
+    public long l20086;
+    public long l20087;
+    public long l20088;
+    public long l20089;
+    public long l20090;
+    public long l20091;
+    public long l20092;
+    public long l20093;
+    public long l20094;
+    public long l20095;
+    public long l20096;
+    public long l20097;
+    public long l20098;
+    public long l20099;
+    public long l20100;
+    public long l20101;
+    public long l20102;
+    public long l20103;
+    public long l20104;
+    public long l20105;
+    public long l20106;
+    public long l20107;
+    public long l20108;
+    public long l20109;
+    public long l20110;
+    public long l20111;
+    public long l20112;
+    public long l20113;
+    public long l20114;
+    public long l20115;
+    public long l20116;
+    public long l20117;
+    public long l20118;
+    public long l20119;
+    public long l20120;
+    public long l20121;
+    public long l20122;
+    public long l20123;
+    public long l20124;
+    public long l20125;
+    public long l20126;
+    public long l20127;
+    public long l20128;
+    public long l20129;
+    public long l20130;
+    public long l20131;
+    public long l20132;
+    public long l20133;
+    public long l20134;
+    public long l20135;
+    public long l20136;
+    public long l20137;
+    public long l20138;
+    public long l20139;
+    public long l20140;
+    public long l20141;
+    public long l20142;
+    public long l20143;
+    public long l20144;
+    public long l20145;
+    public long l20146;
+    public long l20147;
+    public long l20148;
+    public long l20149;
+    public long l20150;
+    public long l20151;
+    public long l20152;
+    public long l20153;
+    public long l20154;
+    public long l20155;
+    public long l20156;
+    public long l20157;
+    public long l20158;
+    public long l20159;
+    public long l20160;
+    public long l20161;
+    public long l20162;
+    public long l20163;
+    public long l20164;
+    public long l20165;
+    public long l20166;
+    public long l20167;
+    public long l20168;
+    public long l20169;
+    public long l20170;
+    public long l20171;
+    public long l20172;
+    public long l20173;
+    public long l20174;
+    public long l20175;
+    public long l20176;
+    public long l20177;
+    public long l20178;
+    public long l20179;
+    public long l20180;
+    public long l20181;
+    public long l20182;
+    public long l20183;
+    public long l20184;
+    public long l20185;
+    public long l20186;
+    public long l20187;
+    public long l20188;
+    public long l20189;
+    public long l20190;
+    public long l20191;
+    public long l20192;
+    public long l20193;
+    public long l20194;
+    public long l20195;
+    public long l20196;
+    public long l20197;
+    public long l20198;
+    public long l20199;
+    public long l20200;
+    public long l20201;
+    public long l20202;
+    public long l20203;
+    public long l20204;
+    public long l20205;
+    public long l20206;
+    public long l20207;
+    public long l20208;
+    public long l20209;
+    public long l20210;
+    public long l20211;
+    public long l20212;
+    public long l20213;
+    public long l20214;
+    public long l20215;
+    public long l20216;
+    public long l20217;
+    public long l20218;
+    public long l20219;
+    public long l20220;
+    public long l20221;
+    public long l20222;
+    public long l20223;
+    public long l20224;
+    public long l20225;
+    public long l20226;
+    public long l20227;
+    public long l20228;
+    public long l20229;
+    public long l20230;
+    public long l20231;
+    public long l20232;
+    public long l20233;
+    public long l20234;
+    public long l20235;
+    public long l20236;
+    public long l20237;
+    public long l20238;
+    public long l20239;
+    public long l20240;
+    public long l20241;
+    public long l20242;
+    public long l20243;
+    public long l20244;
+    public long l20245;
+    public long l20246;
+    public long l20247;
+    public long l20248;
+    public long l20249;
+    public long l20250;
+    public long l20251;
+    public long l20252;
+    public long l20253;
+    public long l20254;
+    public long l20255;
+    public long l20256;
+    public long l20257;
+    public long l20258;
+    public long l20259;
+    public long l20260;
+    public long l20261;
+    public long l20262;
+    public long l20263;
+    public long l20264;
+    public long l20265;
+    public long l20266;
+    public long l20267;
+    public long l20268;
+    public long l20269;
+    public long l20270;
+    public long l20271;
+    public long l20272;
+    public long l20273;
+    public long l20274;
+    public long l20275;
+    public long l20276;
+    public long l20277;
+    public long l20278;
+    public long l20279;
+    public long l20280;
+    public long l20281;
+    public long l20282;
+    public long l20283;
+    public long l20284;
+    public long l20285;
+    public long l20286;
+    public long l20287;
+    public long l20288;
+    public long l20289;
+    public long l20290;
+    public long l20291;
+    public long l20292;
+    public long l20293;
+    public long l20294;
+    public long l20295;
+    public long l20296;
+    public long l20297;
+    public long l20298;
+    public long l20299;
+    public long l20300;
+    public long l20301;
+    public long l20302;
+    public long l20303;
+    public long l20304;
+    public long l20305;
+    public long l20306;
+    public long l20307;
+    public long l20308;
+    public long l20309;
+    public long l20310;
+    public long l20311;
+    public long l20312;
+    public long l20313;
+    public long l20314;
+    public long l20315;
+    public long l20316;
+    public long l20317;
+    public long l20318;
+    public long l20319;
+    public long l20320;
+    public long l20321;
+    public long l20322;
+    public long l20323;
+    public long l20324;
+    public long l20325;
+    public long l20326;
+    public long l20327;
+    public long l20328;
+    public long l20329;
+    public long l20330;
+    public long l20331;
+    public long l20332;
+    public long l20333;
+    public long l20334;
+    public long l20335;
+    public long l20336;
+    public long l20337;
+    public long l20338;
+    public long l20339;
+    public long l20340;
+    public long l20341;
+    public long l20342;
+    public long l20343;
+    public long l20344;
+    public long l20345;
+    public long l20346;
+    public long l20347;
+    public long l20348;
+    public long l20349;
+    public long l20350;
+    public long l20351;
+    public long l20352;
+    public long l20353;
+    public long l20354;
+    public long l20355;
+    public long l20356;
+    public long l20357;
+    public long l20358;
+    public long l20359;
+    public long l20360;
+    public long l20361;
+    public long l20362;
+    public long l20363;
+    public long l20364;
+    public long l20365;
+    public long l20366;
+    public long l20367;
+    public long l20368;
+    public long l20369;
+    public long l20370;
+    public long l20371;
+    public long l20372;
+    public long l20373;
+    public long l20374;
+    public long l20375;
+    public long l20376;
+    public long l20377;
+    public long l20378;
+    public long l20379;
+    public long l20380;
+    public long l20381;
+    public long l20382;
+    public long l20383;
+    public long l20384;
+    public long l20385;
+    public long l20386;
+    public long l20387;
+    public long l20388;
+    public long l20389;
+    public long l20390;
+    public long l20391;
+    public long l20392;
+    public long l20393;
+    public long l20394;
+    public long l20395;
+    public long l20396;
+    public long l20397;
+    public long l20398;
+    public long l20399;
+    public long l20400;
+    public long l20401;
+    public long l20402;
+    public long l20403;
+    public long l20404;
+    public long l20405;
+    public long l20406;
+    public long l20407;
+    public long l20408;
+    public long l20409;
+    public long l20410;
+    public long l20411;
+    public long l20412;
+    public long l20413;
+    public long l20414;
+    public long l20415;
+    public long l20416;
+    public long l20417;
+    public long l20418;
+    public long l20419;
+    public long l20420;
+    public long l20421;
+    public long l20422;
+    public long l20423;
+    public long l20424;
+    public long l20425;
+    public long l20426;
+    public long l20427;
+    public long l20428;
+    public long l20429;
+    public long l20430;
+    public long l20431;
+    public long l20432;
+    public long l20433;
+    public long l20434;
+    public long l20435;
+    public long l20436;
+    public long l20437;
+    public long l20438;
+    public long l20439;
+    public long l20440;
+    public long l20441;
+    public long l20442;
+    public long l20443;
+    public long l20444;
+    public long l20445;
+    public long l20446;
+    public long l20447;
+    public long l20448;
+    public long l20449;
+    public long l20450;
+    public long l20451;
+    public long l20452;
+    public long l20453;
+    public long l20454;
+    public long l20455;
+    public long l20456;
+    public long l20457;
+    public long l20458;
+    public long l20459;
+    public long l20460;
+    public long l20461;
+    public long l20462;
+    public long l20463;
+    public long l20464;
+    public long l20465;
+    public long l20466;
+    public long l20467;
+    public long l20468;
+    public long l20469;
+    public long l20470;
+    public long l20471;
+    public long l20472;
+    public long l20473;
+    public long l20474;
+    public long l20475;
+    public long l20476;
+    public long l20477;
+    public long l20478;
+    public long l20479;
+    public long l20480;
+    public long l20481;
+    public long l20482;
+    public long l20483;
+    public long l20484;
+    public long l20485;
+    public long l20486;
+    public long l20487;
+    public long l20488;
+    public long l20489;
+    public long l20490;
+    public long l20491;
+    public long l20492;
+    public long l20493;
+    public long l20494;
+    public long l20495;
+    public long l20496;
+    public long l20497;
+    public long l20498;
+    public long l20499;
+    public long l20500;
+    public long l20501;
+    public long l20502;
+    public long l20503;
+    public long l20504;
+    public long l20505;
+    public long l20506;
+    public long l20507;
+    public long l20508;
+    public long l20509;
+    public long l20510;
+    public long l20511;
+    public long l20512;
+    public long l20513;
+    public long l20514;
+    public long l20515;
+    public long l20516;
+    public long l20517;
+    public long l20518;
+    public long l20519;
+    public long l20520;
+    public long l20521;
+    public long l20522;
+    public long l20523;
+    public long l20524;
+    public long l20525;
+    public long l20526;
+    public long l20527;
+    public long l20528;
+    public long l20529;
+    public long l20530;
+    public long l20531;
+    public long l20532;
+    public long l20533;
+    public long l20534;
+    public long l20535;
+    public long l20536;
+    public long l20537;
+    public long l20538;
+    public long l20539;
+    public long l20540;
+    public long l20541;
+    public long l20542;
+    public long l20543;
+    public long l20544;
+    public long l20545;
+    public long l20546;
+    public long l20547;
+    public long l20548;
+    public long l20549;
+    public long l20550;
+    public long l20551;
+    public long l20552;
+    public long l20553;
+    public long l20554;
+    public long l20555;
+    public long l20556;
+    public long l20557;
+    public long l20558;
+    public long l20559;
+    public long l20560;
+    public long l20561;
+    public long l20562;
+    public long l20563;
+    public long l20564;
+    public long l20565;
+    public long l20566;
+    public long l20567;
+    public long l20568;
+    public long l20569;
+    public long l20570;
+    public long l20571;
+    public long l20572;
+    public long l20573;
+    public long l20574;
+    public long l20575;
+    public long l20576;
+    public long l20577;
+    public long l20578;
+    public long l20579;
+    public long l20580;
+    public long l20581;
+    public long l20582;
+    public long l20583;
+    public long l20584;
+    public long l20585;
+    public long l20586;
+    public long l20587;
+    public long l20588;
+    public long l20589;
+    public long l20590;
+    public long l20591;
+    public long l20592;
+    public long l20593;
+    public long l20594;
+    public long l20595;
+    public long l20596;
+    public long l20597;
+    public long l20598;
+    public long l20599;
+    public long l20600;
+    public long l20601;
+    public long l20602;
+    public long l20603;
+    public long l20604;
+    public long l20605;
+    public long l20606;
+    public long l20607;
+    public long l20608;
+    public long l20609;
+    public long l20610;
+    public long l20611;
+    public long l20612;
+    public long l20613;
+    public long l20614;
+    public long l20615;
+    public long l20616;
+    public long l20617;
+    public long l20618;
+    public long l20619;
+    public long l20620;
+    public long l20621;
+    public long l20622;
+    public long l20623;
+    public long l20624;
+    public long l20625;
+    public long l20626;
+    public long l20627;
+    public long l20628;
+    public long l20629;
+    public long l20630;
+    public long l20631;
+    public long l20632;
+    public long l20633;
+    public long l20634;
+    public long l20635;
+    public long l20636;
+    public long l20637;
+    public long l20638;
+    public long l20639;
+    public long l20640;
+    public long l20641;
+    public long l20642;
+    public long l20643;
+    public long l20644;
+    public long l20645;
+    public long l20646;
+    public long l20647;
+    public long l20648;
+    public long l20649;
+    public long l20650;
+    public long l20651;
+    public long l20652;
+    public long l20653;
+    public long l20654;
+    public long l20655;
+    public long l20656;
+    public long l20657;
+    public long l20658;
+    public long l20659;
+    public long l20660;
+    public long l20661;
+    public long l20662;
+    public long l20663;
+    public long l20664;
+    public long l20665;
+    public long l20666;
+    public long l20667;
+    public long l20668;
+    public long l20669;
+    public long l20670;
+    public long l20671;
+    public long l20672;
+    public long l20673;
+    public long l20674;
+    public long l20675;
+    public long l20676;
+    public long l20677;
+    public long l20678;
+    public long l20679;
+    public long l20680;
+    public long l20681;
+    public long l20682;
+    public long l20683;
+    public long l20684;
+    public long l20685;
+    public long l20686;
+    public long l20687;
+    public long l20688;
+    public long l20689;
+    public long l20690;
+    public long l20691;
+    public long l20692;
+    public long l20693;
+    public long l20694;
+    public long l20695;
+    public long l20696;
+    public long l20697;
+    public long l20698;
+    public long l20699;
+    public long l20700;
+    public long l20701;
+    public long l20702;
+    public long l20703;
+    public long l20704;
+    public long l20705;
+    public long l20706;
+    public long l20707;
+    public long l20708;
+    public long l20709;
+    public long l20710;
+    public long l20711;
+    public long l20712;
+    public long l20713;
+    public long l20714;
+    public long l20715;
+    public long l20716;
+    public long l20717;
+    public long l20718;
+    public long l20719;
+    public long l20720;
+    public long l20721;
+    public long l20722;
+    public long l20723;
+    public long l20724;
+    public long l20725;
+    public long l20726;
+    public long l20727;
+    public long l20728;
+    public long l20729;
+    public long l20730;
+    public long l20731;
+    public long l20732;
+    public long l20733;
+    public long l20734;
+    public long l20735;
+    public long l20736;
+    public long l20737;
+    public long l20738;
+    public long l20739;
+    public long l20740;
+    public long l20741;
+    public long l20742;
+    public long l20743;
+    public long l20744;
+    public long l20745;
+    public long l20746;
+    public long l20747;
+    public long l20748;
+    public long l20749;
+    public long l20750;
+    public long l20751;
+    public long l20752;
+    public long l20753;
+    public long l20754;
+    public long l20755;
+    public long l20756;
+    public long l20757;
+    public long l20758;
+    public long l20759;
+    public long l20760;
+    public long l20761;
+    public long l20762;
+    public long l20763;
+    public long l20764;
+    public long l20765;
+    public long l20766;
+    public long l20767;
+    public long l20768;
+    public long l20769;
+    public long l20770;
+    public long l20771;
+    public long l20772;
+    public long l20773;
+    public long l20774;
+    public long l20775;
+    public long l20776;
+    public long l20777;
+    public long l20778;
+    public long l20779;
+    public long l20780;
+    public long l20781;
+    public long l20782;
+    public long l20783;
+    public long l20784;
+    public long l20785;
+    public long l20786;
+    public long l20787;
+    public long l20788;
+    public long l20789;
+    public long l20790;
+    public long l20791;
+    public long l20792;
+    public long l20793;
+    public long l20794;
+    public long l20795;
+    public long l20796;
+    public long l20797;
+    public long l20798;
+    public long l20799;
+    public long l20800;
+    public long l20801;
+    public long l20802;
+    public long l20803;
+    public long l20804;
+    public long l20805;
+    public long l20806;
+    public long l20807;
+    public long l20808;
+    public long l20809;
+    public long l20810;
+    public long l20811;
+    public long l20812;
+    public long l20813;
+    public long l20814;
+    public long l20815;
+    public long l20816;
+    public long l20817;
+    public long l20818;
+    public long l20819;
+    public long l20820;
+    public long l20821;
+    public long l20822;
+    public long l20823;
+    public long l20824;
+    public long l20825;
+    public long l20826;
+    public long l20827;
+    public long l20828;
+    public long l20829;
+    public long l20830;
+    public long l20831;
+    public long l20832;
+    public long l20833;
+    public long l20834;
+    public long l20835;
+    public long l20836;
+    public long l20837;
+    public long l20838;
+    public long l20839;
+    public long l20840;
+    public long l20841;
+    public long l20842;
+    public long l20843;
+    public long l20844;
+    public long l20845;
+    public long l20846;
+    public long l20847;
+    public long l20848;
+    public long l20849;
+    public long l20850;
+    public long l20851;
+    public long l20852;
+    public long l20853;
+    public long l20854;
+    public long l20855;
+    public long l20856;
+    public long l20857;
+    public long l20858;
+    public long l20859;
+    public long l20860;
+    public long l20861;
+    public long l20862;
+    public long l20863;
+    public long l20864;
+    public long l20865;
+    public long l20866;
+    public long l20867;
+    public long l20868;
+    public long l20869;
+    public long l20870;
+    public long l20871;
+    public long l20872;
+    public long l20873;
+    public long l20874;
+    public long l20875;
+    public long l20876;
+    public long l20877;
+    public long l20878;
+    public long l20879;
+    public long l20880;
+    public long l20881;
+    public long l20882;
+    public long l20883;
+    public long l20884;
+    public long l20885;
+    public long l20886;
+    public long l20887;
+    public long l20888;
+    public long l20889;
+    public long l20890;
+    public long l20891;
+    public long l20892;
+    public long l20893;
+    public long l20894;
+    public long l20895;
+    public long l20896;
+    public long l20897;
+    public long l20898;
+    public long l20899;
+    public long l20900;
+    public long l20901;
+    public long l20902;
+    public long l20903;
+    public long l20904;
+    public long l20905;
+    public long l20906;
+    public long l20907;
+    public long l20908;
+    public long l20909;
+    public long l20910;
+    public long l20911;
+    public long l20912;
+    public long l20913;
+    public long l20914;
+    public long l20915;
+    public long l20916;
+    public long l20917;
+    public long l20918;
+    public long l20919;
+    public long l20920;
+    public long l20921;
+    public long l20922;
+    public long l20923;
+    public long l20924;
+    public long l20925;
+    public long l20926;
+    public long l20927;
+    public long l20928;
+    public long l20929;
+    public long l20930;
+    public long l20931;
+    public long l20932;
+    public long l20933;
+    public long l20934;
+    public long l20935;
+    public long l20936;
+    public long l20937;
+    public long l20938;
+    public long l20939;
+    public long l20940;
+    public long l20941;
+    public long l20942;
+    public long l20943;
+    public long l20944;
+    public long l20945;
+    public long l20946;
+    public long l20947;
+    public long l20948;
+    public long l20949;
+    public long l20950;
+    public long l20951;
+    public long l20952;
+    public long l20953;
+    public long l20954;
+    public long l20955;
+    public long l20956;
+    public long l20957;
+    public long l20958;
+    public long l20959;
+    public long l20960;
+    public long l20961;
+    public long l20962;
+    public long l20963;
+    public long l20964;
+    public long l20965;
+    public long l20966;
+    public long l20967;
+    public long l20968;
+    public long l20969;
+    public long l20970;
+    public long l20971;
+    public long l20972;
+    public long l20973;
+    public long l20974;
+    public long l20975;
+    public long l20976;
+    public long l20977;
+    public long l20978;
+    public long l20979;
+    public long l20980;
+    public long l20981;
+    public long l20982;
+    public long l20983;
+    public long l20984;
+    public long l20985;
+    public long l20986;
+    public long l20987;
+    public long l20988;
+    public long l20989;
+    public long l20990;
+    public long l20991;
+    public long l20992;
+    public long l20993;
+    public long l20994;
+    public long l20995;
+    public long l20996;
+    public long l20997;
+    public long l20998;
+    public long l20999;
+    public long l21000;
+    public long l21001;
+    public long l21002;
+    public long l21003;
+    public long l21004;
+    public long l21005;
+    public long l21006;
+    public long l21007;
+    public long l21008;
+    public long l21009;
+    public long l21010;
+    public long l21011;
+    public long l21012;
+    public long l21013;
+    public long l21014;
+    public long l21015;
+    public long l21016;
+    public long l21017;
+    public long l21018;
+    public long l21019;
+    public long l21020;
+    public long l21021;
+    public long l21022;
+    public long l21023;
+    public long l21024;
+    public long l21025;
+    public long l21026;
+    public long l21027;
+    public long l21028;
+    public long l21029;
+    public long l21030;
+    public long l21031;
+    public long l21032;
+    public long l21033;
+    public long l21034;
+    public long l21035;
+    public long l21036;
+    public long l21037;
+    public long l21038;
+    public long l21039;
+    public long l21040;
+    public long l21041;
+    public long l21042;
+    public long l21043;
+    public long l21044;
+    public long l21045;
+    public long l21046;
+    public long l21047;
+    public long l21048;
+    public long l21049;
+    public long l21050;
+    public long l21051;
+    public long l21052;
+    public long l21053;
+    public long l21054;
+    public long l21055;
+    public long l21056;
+    public long l21057;
+    public long l21058;
+    public long l21059;
+    public long l21060;
+    public long l21061;
+    public long l21062;
+    public long l21063;
+    public long l21064;
+    public long l21065;
+    public long l21066;
+    public long l21067;
+    public long l21068;
+    public long l21069;
+    public long l21070;
+    public long l21071;
+    public long l21072;
+    public long l21073;
+    public long l21074;
+    public long l21075;
+    public long l21076;
+    public long l21077;
+    public long l21078;
+    public long l21079;
+    public long l21080;
+    public long l21081;
+    public long l21082;
+    public long l21083;
+    public long l21084;
+    public long l21085;
+    public long l21086;
+    public long l21087;
+    public long l21088;
+    public long l21089;
+    public long l21090;
+    public long l21091;
+    public long l21092;
+    public long l21093;
+    public long l21094;
+    public long l21095;
+    public long l21096;
+    public long l21097;
+    public long l21098;
+    public long l21099;
+    public long l21100;
+    public long l21101;
+    public long l21102;
+    public long l21103;
+    public long l21104;
+    public long l21105;
+    public long l21106;
+    public long l21107;
+    public long l21108;
+    public long l21109;
+    public long l21110;
+    public long l21111;
+    public long l21112;
+    public long l21113;
+    public long l21114;
+    public long l21115;
+    public long l21116;
+    public long l21117;
+    public long l21118;
+    public long l21119;
+    public long l21120;
+    public long l21121;
+    public long l21122;
+    public long l21123;
+    public long l21124;
+    public long l21125;
+    public long l21126;
+    public long l21127;
+    public long l21128;
+    public long l21129;
+    public long l21130;
+    public long l21131;
+    public long l21132;
+    public long l21133;
+    public long l21134;
+    public long l21135;
+    public long l21136;
+    public long l21137;
+    public long l21138;
+    public long l21139;
+    public long l21140;
+    public long l21141;
+    public long l21142;
+    public long l21143;
+    public long l21144;
+    public long l21145;
+    public long l21146;
+    public long l21147;
+    public long l21148;
+    public long l21149;
+    public long l21150;
+    public long l21151;
+    public long l21152;
+    public long l21153;
+    public long l21154;
+    public long l21155;
+    public long l21156;
+    public long l21157;
+    public long l21158;
+    public long l21159;
+    public long l21160;
+    public long l21161;
+    public long l21162;
+    public long l21163;
+    public long l21164;
+    public long l21165;
+    public long l21166;
+    public long l21167;
+    public long l21168;
+    public long l21169;
+    public long l21170;
+    public long l21171;
+    public long l21172;
+    public long l21173;
+    public long l21174;
+    public long l21175;
+    public long l21176;
+    public long l21177;
+    public long l21178;
+    public long l21179;
+    public long l21180;
+    public long l21181;
+    public long l21182;
+    public long l21183;
+    public long l21184;
+    public long l21185;
+    public long l21186;
+    public long l21187;
+    public long l21188;
+    public long l21189;
+    public long l21190;
+    public long l21191;
+    public long l21192;
+    public long l21193;
+    public long l21194;
+    public long l21195;
+    public long l21196;
+    public long l21197;
+    public long l21198;
+    public long l21199;
+    public long l21200;
+    public long l21201;
+    public long l21202;
+    public long l21203;
+    public long l21204;
+    public long l21205;
+    public long l21206;
+    public long l21207;
+    public long l21208;
+    public long l21209;
+    public long l21210;
+    public long l21211;
+    public long l21212;
+    public long l21213;
+    public long l21214;
+    public long l21215;
+    public long l21216;
+    public long l21217;
+    public long l21218;
+    public long l21219;
+    public long l21220;
+    public long l21221;
+    public long l21222;
+    public long l21223;
+    public long l21224;
+    public long l21225;
+    public long l21226;
+    public long l21227;
+    public long l21228;
+    public long l21229;
+    public long l21230;
+    public long l21231;
+    public long l21232;
+    public long l21233;
+    public long l21234;
+    public long l21235;
+    public long l21236;
+    public long l21237;
+    public long l21238;
+    public long l21239;
+    public long l21240;
+    public long l21241;
+    public long l21242;
+    public long l21243;
+    public long l21244;
+    public long l21245;
+    public long l21246;
+    public long l21247;
+    public long l21248;
+    public long l21249;
+    public long l21250;
+    public long l21251;
+    public long l21252;
+    public long l21253;
+    public long l21254;
+    public long l21255;
+    public long l21256;
+    public long l21257;
+    public long l21258;
+    public long l21259;
+    public long l21260;
+    public long l21261;
+    public long l21262;
+    public long l21263;
+    public long l21264;
+    public long l21265;
+    public long l21266;
+    public long l21267;
+    public long l21268;
+    public long l21269;
+    public long l21270;
+    public long l21271;
+    public long l21272;
+    public long l21273;
+    public long l21274;
+    public long l21275;
+    public long l21276;
+    public long l21277;
+    public long l21278;
+    public long l21279;
+    public long l21280;
+    public long l21281;
+    public long l21282;
+    public long l21283;
+    public long l21284;
+    public long l21285;
+    public long l21286;
+    public long l21287;
+    public long l21288;
+    public long l21289;
+    public long l21290;
+    public long l21291;
+    public long l21292;
+    public long l21293;
+    public long l21294;
+    public long l21295;
+    public long l21296;
+    public long l21297;
+    public long l21298;
+    public long l21299;
+    public long l21300;
+    public long l21301;
+    public long l21302;
+    public long l21303;
+    public long l21304;
+    public long l21305;
+    public long l21306;
+    public long l21307;
+    public long l21308;
+    public long l21309;
+    public long l21310;
+    public long l21311;
+    public long l21312;
+    public long l21313;
+    public long l21314;
+    public long l21315;
+    public long l21316;
+    public long l21317;
+    public long l21318;
+    public long l21319;
+    public long l21320;
+    public long l21321;
+    public long l21322;
+    public long l21323;
+    public long l21324;
+    public long l21325;
+    public long l21326;
+    public long l21327;
+    public long l21328;
+    public long l21329;
+    public long l21330;
+    public long l21331;
+    public long l21332;
+    public long l21333;
+    public long l21334;
+    public long l21335;
+    public long l21336;
+    public long l21337;
+    public long l21338;
+    public long l21339;
+    public long l21340;
+    public long l21341;
+    public long l21342;
+    public long l21343;
+    public long l21344;
+    public long l21345;
+    public long l21346;
+    public long l21347;
+    public long l21348;
+    public long l21349;
+    public long l21350;
+    public long l21351;
+    public long l21352;
+    public long l21353;
+    public long l21354;
+    public long l21355;
+    public long l21356;
+    public long l21357;
+    public long l21358;
+    public long l21359;
+    public long l21360;
+    public long l21361;
+    public long l21362;
+    public long l21363;
+    public long l21364;
+    public long l21365;
+    public long l21366;
+    public long l21367;
+    public long l21368;
+    public long l21369;
+    public long l21370;
+    public long l21371;
+    public long l21372;
+    public long l21373;
+    public long l21374;
+    public long l21375;
+    public long l21376;
+    public long l21377;
+    public long l21378;
+    public long l21379;
+    public long l21380;
+    public long l21381;
+    public long l21382;
+    public long l21383;
+    public long l21384;
+    public long l21385;
+    public long l21386;
+    public long l21387;
+    public long l21388;
+    public long l21389;
+    public long l21390;
+    public long l21391;
+    public long l21392;
+    public long l21393;
+    public long l21394;
+    public long l21395;
+    public long l21396;
+    public long l21397;
+    public long l21398;
+    public long l21399;
+    public long l21400;
+    public long l21401;
+    public long l21402;
+    public long l21403;
+    public long l21404;
+    public long l21405;
+    public long l21406;
+    public long l21407;
+    public long l21408;
+    public long l21409;
+    public long l21410;
+    public long l21411;
+    public long l21412;
+    public long l21413;
+    public long l21414;
+    public long l21415;
+    public long l21416;
+    public long l21417;
+    public long l21418;
+    public long l21419;
+    public long l21420;
+    public long l21421;
+    public long l21422;
+    public long l21423;
+    public long l21424;
+    public long l21425;
+    public long l21426;
+    public long l21427;
+    public long l21428;
+    public long l21429;
+    public long l21430;
+    public long l21431;
+    public long l21432;
+    public long l21433;
+    public long l21434;
+    public long l21435;
+    public long l21436;
+    public long l21437;
+    public long l21438;
+    public long l21439;
+    public long l21440;
+    public long l21441;
+    public long l21442;
+    public long l21443;
+    public long l21444;
+    public long l21445;
+    public long l21446;
+    public long l21447;
+    public long l21448;
+    public long l21449;
+    public long l21450;
+    public long l21451;
+    public long l21452;
+    public long l21453;
+    public long l21454;
+    public long l21455;
+    public long l21456;
+    public long l21457;
+    public long l21458;
+    public long l21459;
+    public long l21460;
+    public long l21461;
+    public long l21462;
+    public long l21463;
+    public long l21464;
+    public long l21465;
+    public long l21466;
+    public long l21467;
+    public long l21468;
+    public long l21469;
+    public long l21470;
+    public long l21471;
+    public long l21472;
+    public long l21473;
+    public long l21474;
+    public long l21475;
+    public long l21476;
+    public long l21477;
+    public long l21478;
+    public long l21479;
+    public long l21480;
+    public long l21481;
+    public long l21482;
+    public long l21483;
+    public long l21484;
+    public long l21485;
+    public long l21486;
+    public long l21487;
+    public long l21488;
+    public long l21489;
+    public long l21490;
+    public long l21491;
+    public long l21492;
+    public long l21493;
+    public long l21494;
+    public long l21495;
+    public long l21496;
+    public long l21497;
+    public long l21498;
+    public long l21499;
+    public long l21500;
+    public long l21501;
+    public long l21502;
+    public long l21503;
+    public long l21504;
+    public long l21505;
+    public long l21506;
+    public long l21507;
+    public long l21508;
+    public long l21509;
+    public long l21510;
+    public long l21511;
+    public long l21512;
+    public long l21513;
+    public long l21514;
+    public long l21515;
+    public long l21516;
+    public long l21517;
+    public long l21518;
+    public long l21519;
+    public long l21520;
+    public long l21521;
+    public long l21522;
+    public long l21523;
+    public long l21524;
+    public long l21525;
+    public long l21526;
+    public long l21527;
+    public long l21528;
+    public long l21529;
+    public long l21530;
+    public long l21531;
+    public long l21532;
+    public long l21533;
+    public long l21534;
+    public long l21535;
+    public long l21536;
+    public long l21537;
+    public long l21538;
+    public long l21539;
+    public long l21540;
+    public long l21541;
+    public long l21542;
+    public long l21543;
+    public long l21544;
+    public long l21545;
+    public long l21546;
+    public long l21547;
+    public long l21548;
+    public long l21549;
+    public long l21550;
+    public long l21551;
+    public long l21552;
+    public long l21553;
+    public long l21554;
+    public long l21555;
+    public long l21556;
+    public long l21557;
+    public long l21558;
+    public long l21559;
+    public long l21560;
+    public long l21561;
+    public long l21562;
+    public long l21563;
+    public long l21564;
+    public long l21565;
+    public long l21566;
+    public long l21567;
+    public long l21568;
+    public long l21569;
+    public long l21570;
+    public long l21571;
+    public long l21572;
+    public long l21573;
+    public long l21574;
+    public long l21575;
+    public long l21576;
+    public long l21577;
+    public long l21578;
+    public long l21579;
+    public long l21580;
+    public long l21581;
+    public long l21582;
+    public long l21583;
+    public long l21584;
+    public long l21585;
+    public long l21586;
+    public long l21587;
+    public long l21588;
+    public long l21589;
+    public long l21590;
+    public long l21591;
+    public long l21592;
+    public long l21593;
+    public long l21594;
+    public long l21595;
+    public long l21596;
+    public long l21597;
+    public long l21598;
+    public long l21599;
+    public long l21600;
+    public long l21601;
+    public long l21602;
+    public long l21603;
+    public long l21604;
+    public long l21605;
+    public long l21606;
+    public long l21607;
+    public long l21608;
+    public long l21609;
+    public long l21610;
+    public long l21611;
+    public long l21612;
+    public long l21613;
+    public long l21614;
+    public long l21615;
+    public long l21616;
+    public long l21617;
+    public long l21618;
+    public long l21619;
+    public long l21620;
+    public long l21621;
+    public long l21622;
+    public long l21623;
+    public long l21624;
+    public long l21625;
+    public long l21626;
+    public long l21627;
+    public long l21628;
+    public long l21629;
+    public long l21630;
+    public long l21631;
+    public long l21632;
+    public long l21633;
+    public long l21634;
+    public long l21635;
+    public long l21636;
+    public long l21637;
+    public long l21638;
+    public long l21639;
+    public long l21640;
+    public long l21641;
+    public long l21642;
+    public long l21643;
+    public long l21644;
+    public long l21645;
+    public long l21646;
+    public long l21647;
+    public long l21648;
+    public long l21649;
+    public long l21650;
+    public long l21651;
+    public long l21652;
+    public long l21653;
+    public long l21654;
+    public long l21655;
+    public long l21656;
+    public long l21657;
+    public long l21658;
+    public long l21659;
+    public long l21660;
+    public long l21661;
+    public long l21662;
+    public long l21663;
+    public long l21664;
+    public long l21665;
+    public long l21666;
+    public long l21667;
+    public long l21668;
+    public long l21669;
+    public long l21670;
+    public long l21671;
+    public long l21672;
+    public long l21673;
+    public long l21674;
+    public long l21675;
+    public long l21676;
+    public long l21677;
+    public long l21678;
+    public long l21679;
+    public long l21680;
+    public long l21681;
+    public long l21682;
+    public long l21683;
+    public long l21684;
+    public long l21685;
+    public long l21686;
+    public long l21687;
+    public long l21688;
+    public long l21689;
+    public long l21690;
+    public long l21691;
+    public long l21692;
+    public long l21693;
+    public long l21694;
+    public long l21695;
+    public long l21696;
+    public long l21697;
+    public long l21698;
+    public long l21699;
+    public long l21700;
+    public long l21701;
+    public long l21702;
+    public long l21703;
+    public long l21704;
+    public long l21705;
+    public long l21706;
+    public long l21707;
+    public long l21708;
+    public long l21709;
+    public long l21710;
+    public long l21711;
+    public long l21712;
+    public long l21713;
+    public long l21714;
+    public long l21715;
+    public long l21716;
+    public long l21717;
+    public long l21718;
+    public long l21719;
+    public long l21720;
+    public long l21721;
+    public long l21722;
+    public long l21723;
+    public long l21724;
+    public long l21725;
+    public long l21726;
+    public long l21727;
+    public long l21728;
+    public long l21729;
+    public long l21730;
+    public long l21731;
+    public long l21732;
+    public long l21733;
+    public long l21734;
+    public long l21735;
+    public long l21736;
+    public long l21737;
+    public long l21738;
+    public long l21739;
+    public long l21740;
+    public long l21741;
+    public long l21742;
+    public long l21743;
+    public long l21744;
+    public long l21745;
+    public long l21746;
+    public long l21747;
+    public long l21748;
+    public long l21749;
+    public long l21750;
+    public long l21751;
+    public long l21752;
+    public long l21753;
+    public long l21754;
+    public long l21755;
+    public long l21756;
+    public long l21757;
+    public long l21758;
+    public long l21759;
+    public long l21760;
+    public long l21761;
+    public long l21762;
+    public long l21763;
+    public long l21764;
+    public long l21765;
+    public long l21766;
+    public long l21767;
+    public long l21768;
+    public long l21769;
+    public long l21770;
+    public long l21771;
+    public long l21772;
+    public long l21773;
+    public long l21774;
+    public long l21775;
+    public long l21776;
+    public long l21777;
+    public long l21778;
+    public long l21779;
+    public long l21780;
+    public long l21781;
+    public long l21782;
+    public long l21783;
+    public long l21784;
+    public long l21785;
+    public long l21786;
+    public long l21787;
+    public long l21788;
+    public long l21789;
+    public long l21790;
+    public long l21791;
+    public long l21792;
+    public long l21793;
+    public long l21794;
+    public long l21795;
+    public long l21796;
+    public long l21797;
+    public long l21798;
+    public long l21799;
+    public long l21800;
+    public long l21801;
+    public long l21802;
+    public long l21803;
+    public long l21804;
+    public long l21805;
+    public long l21806;
+    public long l21807;
+    public long l21808;
+    public long l21809;
+    public long l21810;
+    public long l21811;
+    public long l21812;
+    public long l21813;
+    public long l21814;
+    public long l21815;
+    public long l21816;
+    public long l21817;
+    public long l21818;
+    public long l21819;
+    public long l21820;
+    public long l21821;
+    public long l21822;
+    public long l21823;
+    public long l21824;
+    public long l21825;
+    public long l21826;
+    public long l21827;
+    public long l21828;
+    public long l21829;
+    public long l21830;
+    public long l21831;
+    public long l21832;
+    public long l21833;
+    public long l21834;
+    public long l21835;
+    public long l21836;
+    public long l21837;
+    public long l21838;
+    public long l21839;
+    public long l21840;
+    public long l21841;
+    public long l21842;
+    public long l21843;
+    public long l21844;
+    public long l21845;
+    public long l21846;
+    public long l21847;
+    public long l21848;
+    public long l21849;
+    public long l21850;
+    public long l21851;
+    public long l21852;
+    public long l21853;
+    public long l21854;
+    public long l21855;
+    public long l21856;
+    public long l21857;
+    public long l21858;
+    public long l21859;
+    public long l21860;
+    public long l21861;
+    public long l21862;
+    public long l21863;
+    public long l21864;
+    public long l21865;
+    public long l21866;
+    public long l21867;
+    public long l21868;
+    public long l21869;
+    public long l21870;
+    public long l21871;
+    public long l21872;
+    public long l21873;
+    public long l21874;
+    public long l21875;
+    public long l21876;
+    public long l21877;
+    public long l21878;
+    public long l21879;
+    public long l21880;
+    public long l21881;
+    public long l21882;
+    public long l21883;
+    public long l21884;
+    public long l21885;
+    public long l21886;
+    public long l21887;
+    public long l21888;
+    public long l21889;
+    public long l21890;
+    public long l21891;
+    public long l21892;
+    public long l21893;
+    public long l21894;
+    public long l21895;
+    public long l21896;
+    public long l21897;
+    public long l21898;
+    public long l21899;
+    public long l21900;
+    public long l21901;
+    public long l21902;
+    public long l21903;
+    public long l21904;
+    public long l21905;
+    public long l21906;
+    public long l21907;
+    public long l21908;
+    public long l21909;
+    public long l21910;
+    public long l21911;
+    public long l21912;
+    public long l21913;
+    public long l21914;
+    public long l21915;
+    public long l21916;
+    public long l21917;
+    public long l21918;
+    public long l21919;
+    public long l21920;
+    public long l21921;
+    public long l21922;
+    public long l21923;
+    public long l21924;
+    public long l21925;
+    public long l21926;
+    public long l21927;
+    public long l21928;
+    public long l21929;
+    public long l21930;
+    public long l21931;
+    public long l21932;
+    public long l21933;
+    public long l21934;
+    public long l21935;
+    public long l21936;
+    public long l21937;
+    public long l21938;
+    public long l21939;
+    public long l21940;
+    public long l21941;
+    public long l21942;
+    public long l21943;
+    public long l21944;
+    public long l21945;
+    public long l21946;
+    public long l21947;
+    public long l21948;
+    public long l21949;
+    public long l21950;
+    public long l21951;
+    public long l21952;
+    public long l21953;
+    public long l21954;
+    public long l21955;
+    public long l21956;
+    public long l21957;
+    public long l21958;
+    public long l21959;
+    public long l21960;
+    public long l21961;
+    public long l21962;
+    public long l21963;
+    public long l21964;
+    public long l21965;
+    public long l21966;
+    public long l21967;
+    public long l21968;
+    public long l21969;
+    public long l21970;
+    public long l21971;
+    public long l21972;
+    public long l21973;
+    public long l21974;
+    public long l21975;
+    public long l21976;
+    public long l21977;
+    public long l21978;
+    public long l21979;
+    public long l21980;
+    public long l21981;
+    public long l21982;
+    public long l21983;
+    public long l21984;
+    public long l21985;
+    public long l21986;
+    public long l21987;
+    public long l21988;
+    public long l21989;
+    public long l21990;
+    public long l21991;
+    public long l21992;
+    public long l21993;
+    public long l21994;
+    public long l21995;
+    public long l21996;
+    public long l21997;
+    public long l21998;
+    public long l21999;
+    public long l22000;
+    public long l22001;
+    public long l22002;
+    public long l22003;
+    public long l22004;
+    public long l22005;
+    public long l22006;
+    public long l22007;
+    public long l22008;
+    public long l22009;
+    public long l22010;
+    public long l22011;
+    public long l22012;
+    public long l22013;
+    public long l22014;
+    public long l22015;
+    public long l22016;
+    public long l22017;
+    public long l22018;
+    public long l22019;
+    public long l22020;
+    public long l22021;
+    public long l22022;
+    public long l22023;
+    public long l22024;
+    public long l22025;
+    public long l22026;
+    public long l22027;
+    public long l22028;
+    public long l22029;
+    public long l22030;
+    public long l22031;
+    public long l22032;
+    public long l22033;
+    public long l22034;
+    public long l22035;
+    public long l22036;
+    public long l22037;
+    public long l22038;
+    public long l22039;
+    public long l22040;
+    public long l22041;
+    public long l22042;
+    public long l22043;
+    public long l22044;
+    public long l22045;
+    public long l22046;
+    public long l22047;
+    public long l22048;
+    public long l22049;
+    public long l22050;
+    public long l22051;
+    public long l22052;
+    public long l22053;
+    public long l22054;
+    public long l22055;
+    public long l22056;
+    public long l22057;
+    public long l22058;
+    public long l22059;
+    public long l22060;
+    public long l22061;
+    public long l22062;
+    public long l22063;
+    public long l22064;
+    public long l22065;
+    public long l22066;
+    public long l22067;
+    public long l22068;
+    public long l22069;
+    public long l22070;
+    public long l22071;
+    public long l22072;
+    public long l22073;
+    public long l22074;
+    public long l22075;
+    public long l22076;
+    public long l22077;
+    public long l22078;
+    public long l22079;
+    public long l22080;
+    public long l22081;
+    public long l22082;
+    public long l22083;
+    public long l22084;
+    public long l22085;
+    public long l22086;
+    public long l22087;
+    public long l22088;
+    public long l22089;
+    public long l22090;
+    public long l22091;
+    public long l22092;
+    public long l22093;
+    public long l22094;
+    public long l22095;
+    public long l22096;
+    public long l22097;
+    public long l22098;
+    public long l22099;
+    public long l22100;
+    public long l22101;
+    public long l22102;
+    public long l22103;
+    public long l22104;
+    public long l22105;
+    public long l22106;
+    public long l22107;
+    public long l22108;
+    public long l22109;
+    public long l22110;
+    public long l22111;
+    public long l22112;
+    public long l22113;
+    public long l22114;
+    public long l22115;
+    public long l22116;
+    public long l22117;
+    public long l22118;
+    public long l22119;
+    public long l22120;
+    public long l22121;
+    public long l22122;
+    public long l22123;
+    public long l22124;
+    public long l22125;
+    public long l22126;
+    public long l22127;
+    public long l22128;
+    public long l22129;
+    public long l22130;
+    public long l22131;
+    public long l22132;
+    public long l22133;
+    public long l22134;
+    public long l22135;
+    public long l22136;
+    public long l22137;
+    public long l22138;
+    public long l22139;
+    public long l22140;
+    public long l22141;
+    public long l22142;
+    public long l22143;
+    public long l22144;
+    public long l22145;
+    public long l22146;
+    public long l22147;
+    public long l22148;
+    public long l22149;
+    public long l22150;
+    public long l22151;
+    public long l22152;
+    public long l22153;
+    public long l22154;
+    public long l22155;
+    public long l22156;
+    public long l22157;
+    public long l22158;
+    public long l22159;
+    public long l22160;
+    public long l22161;
+    public long l22162;
+    public long l22163;
+    public long l22164;
+    public long l22165;
+    public long l22166;
+    public long l22167;
+    public long l22168;
+    public long l22169;
+    public long l22170;
+    public long l22171;
+    public long l22172;
+    public long l22173;
+    public long l22174;
+    public long l22175;
+    public long l22176;
+    public long l22177;
+    public long l22178;
+    public long l22179;
+    public long l22180;
+    public long l22181;
+    public long l22182;
+    public long l22183;
+    public long l22184;
+    public long l22185;
+    public long l22186;
+    public long l22187;
+    public long l22188;
+    public long l22189;
+    public long l22190;
+    public long l22191;
+    public long l22192;
+    public long l22193;
+    public long l22194;
+    public long l22195;
+    public long l22196;
+    public long l22197;
+    public long l22198;
+    public long l22199;
+    public long l22200;
+    public long l22201;
+    public long l22202;
+    public long l22203;
+    public long l22204;
+    public long l22205;
+    public long l22206;
+    public long l22207;
+    public long l22208;
+    public long l22209;
+    public long l22210;
+    public long l22211;
+    public long l22212;
+    public long l22213;
+    public long l22214;
+    public long l22215;
+    public long l22216;
+    public long l22217;
+    public long l22218;
+    public long l22219;
+    public long l22220;
+    public long l22221;
+    public long l22222;
+    public long l22223;
+    public long l22224;
+    public long l22225;
+    public long l22226;
+    public long l22227;
+    public long l22228;
+    public long l22229;
+    public long l22230;
+    public long l22231;
+    public long l22232;
+    public long l22233;
+    public long l22234;
+    public long l22235;
+    public long l22236;
+    public long l22237;
+    public long l22238;
+    public long l22239;
+    public long l22240;
+    public long l22241;
+    public long l22242;
+    public long l22243;
+    public long l22244;
+    public long l22245;
+    public long l22246;
+    public long l22247;
+    public long l22248;
+    public long l22249;
+    public long l22250;
+    public long l22251;
+    public long l22252;
+    public long l22253;
+    public long l22254;
+    public long l22255;
+    public long l22256;
+    public long l22257;
+    public long l22258;
+    public long l22259;
+    public long l22260;
+    public long l22261;
+    public long l22262;
+    public long l22263;
+    public long l22264;
+    public long l22265;
+    public long l22266;
+    public long l22267;
+    public long l22268;
+    public long l22269;
+    public long l22270;
+    public long l22271;
+    public long l22272;
+    public long l22273;
+    public long l22274;
+    public long l22275;
+    public long l22276;
+    public long l22277;
+    public long l22278;
+    public long l22279;
+    public long l22280;
+    public long l22281;
+    public long l22282;
+    public long l22283;
+    public long l22284;
+    public long l22285;
+    public long l22286;
+    public long l22287;
+    public long l22288;
+    public long l22289;
+    public long l22290;
+    public long l22291;
+    public long l22292;
+    public long l22293;
+    public long l22294;
+    public long l22295;
+    public long l22296;
+    public long l22297;
+    public long l22298;
+    public long l22299;
+    public long l22300;
+    public long l22301;
+    public long l22302;
+    public long l22303;
+    public long l22304;
+    public long l22305;
+    public long l22306;
+    public long l22307;
+    public long l22308;
+    public long l22309;
+    public long l22310;
+    public long l22311;
+    public long l22312;
+    public long l22313;
+    public long l22314;
+    public long l22315;
+    public long l22316;
+    public long l22317;
+    public long l22318;
+    public long l22319;
+    public long l22320;
+    public long l22321;
+    public long l22322;
+    public long l22323;
+    public long l22324;
+    public long l22325;
+    public long l22326;
+    public long l22327;
+    public long l22328;
+    public long l22329;
+    public long l22330;
+    public long l22331;
+    public long l22332;
+    public long l22333;
+    public long l22334;
+    public long l22335;
+    public long l22336;
+    public long l22337;
+    public long l22338;
+    public long l22339;
+    public long l22340;
+    public long l22341;
+    public long l22342;
+    public long l22343;
+    public long l22344;
+    public long l22345;
+    public long l22346;
+    public long l22347;
+    public long l22348;
+    public long l22349;
+    public long l22350;
+    public long l22351;
+    public long l22352;
+    public long l22353;
+    public long l22354;
+    public long l22355;
+    public long l22356;
+    public long l22357;
+    public long l22358;
+    public long l22359;
+    public long l22360;
+    public long l22361;
+    public long l22362;
+    public long l22363;
+    public long l22364;
+    public long l22365;
+    public long l22366;
+    public long l22367;
+    public long l22368;
+    public long l22369;
+    public long l22370;
+    public long l22371;
+    public long l22372;
+    public long l22373;
+    public long l22374;
+    public long l22375;
+    public long l22376;
+    public long l22377;
+    public long l22378;
+    public long l22379;
+    public long l22380;
+    public long l22381;
+    public long l22382;
+    public long l22383;
+    public long l22384;
+    public long l22385;
+    public long l22386;
+    public long l22387;
+    public long l22388;
+    public long l22389;
+    public long l22390;
+    public long l22391;
+    public long l22392;
+    public long l22393;
+    public long l22394;
+    public long l22395;
+    public long l22396;
+    public long l22397;
+    public long l22398;
+    public long l22399;
+    public long l22400;
+    public long l22401;
+    public long l22402;
+    public long l22403;
+    public long l22404;
+    public long l22405;
+    public long l22406;
+    public long l22407;
+    public long l22408;
+    public long l22409;
+    public long l22410;
+    public long l22411;
+    public long l22412;
+    public long l22413;
+    public long l22414;
+    public long l22415;
+    public long l22416;
+    public long l22417;
+    public long l22418;
+    public long l22419;
+    public long l22420;
+    public long l22421;
+    public long l22422;
+    public long l22423;
+    public long l22424;
+    public long l22425;
+    public long l22426;
+    public long l22427;
+    public long l22428;
+    public long l22429;
+    public long l22430;
+    public long l22431;
+    public long l22432;
+    public long l22433;
+    public long l22434;
+    public long l22435;
+    public long l22436;
+    public long l22437;
+    public long l22438;
+    public long l22439;
+    public long l22440;
+    public long l22441;
+    public long l22442;
+    public long l22443;
+    public long l22444;
+    public long l22445;
+    public long l22446;
+    public long l22447;
+    public long l22448;
+    public long l22449;
+    public long l22450;
+    public long l22451;
+    public long l22452;
+    public long l22453;
+    public long l22454;
+    public long l22455;
+    public long l22456;
+    public long l22457;
+    public long l22458;
+    public long l22459;
+    public long l22460;
+    public long l22461;
+    public long l22462;
+    public long l22463;
+    public long l22464;
+    public long l22465;
+    public long l22466;
+    public long l22467;
+    public long l22468;
+    public long l22469;
+    public long l22470;
+    public long l22471;
+    public long l22472;
+    public long l22473;
+    public long l22474;
+    public long l22475;
+    public long l22476;
+    public long l22477;
+    public long l22478;
+    public long l22479;
+    public long l22480;
+    public long l22481;
+    public long l22482;
+    public long l22483;
+    public long l22484;
+    public long l22485;
+    public long l22486;
+    public long l22487;
+    public long l22488;
+    public long l22489;
+    public long l22490;
+    public long l22491;
+    public long l22492;
+    public long l22493;
+    public long l22494;
+    public long l22495;
+    public long l22496;
+    public long l22497;
+    public long l22498;
+    public long l22499;
+    public long l22500;
+    public long l22501;
+    public long l22502;
+    public long l22503;
+    public long l22504;
+    public long l22505;
+    public long l22506;
+    public long l22507;
+    public long l22508;
+    public long l22509;
+    public long l22510;
+    public long l22511;
+    public long l22512;
+    public long l22513;
+    public long l22514;
+    public long l22515;
+    public long l22516;
+    public long l22517;
+    public long l22518;
+    public long l22519;
+    public long l22520;
+    public long l22521;
+    public long l22522;
+    public long l22523;
+    public long l22524;
+    public long l22525;
+    public long l22526;
+    public long l22527;
+    public long l22528;
+    public long l22529;
+    public long l22530;
+    public long l22531;
+    public long l22532;
+    public long l22533;
+    public long l22534;
+    public long l22535;
+    public long l22536;
+    public long l22537;
+    public long l22538;
+    public long l22539;
+    public long l22540;
+    public long l22541;
+    public long l22542;
+    public long l22543;
+    public long l22544;
+    public long l22545;
+    public long l22546;
+    public long l22547;
+    public long l22548;
+    public long l22549;
+    public long l22550;
+    public long l22551;
+    public long l22552;
+    public long l22553;
+    public long l22554;
+    public long l22555;
+    public long l22556;
+    public long l22557;
+    public long l22558;
+    public long l22559;
+    public long l22560;
+    public long l22561;
+    public long l22562;
+    public long l22563;
+    public long l22564;
+    public long l22565;
+    public long l22566;
+    public long l22567;
+    public long l22568;
+    public long l22569;
+    public long l22570;
+    public long l22571;
+    public long l22572;
+    public long l22573;
+    public long l22574;
+    public long l22575;
+    public long l22576;
+    public long l22577;
+    public long l22578;
+    public long l22579;
+    public long l22580;
+    public long l22581;
+    public long l22582;
+    public long l22583;
+    public long l22584;
+    public long l22585;
+    public long l22586;
+    public long l22587;
+    public long l22588;
+    public long l22589;
+    public long l22590;
+    public long l22591;
+    public long l22592;
+    public long l22593;
+    public long l22594;
+    public long l22595;
+    public long l22596;
+    public long l22597;
+    public long l22598;
+    public long l22599;
+    public long l22600;
+    public long l22601;
+    public long l22602;
+    public long l22603;
+    public long l22604;
+    public long l22605;
+    public long l22606;
+    public long l22607;
+    public long l22608;
+    public long l22609;
+    public long l22610;
+    public long l22611;
+    public long l22612;
+    public long l22613;
+    public long l22614;
+    public long l22615;
+    public long l22616;
+    public long l22617;
+    public long l22618;
+    public long l22619;
+    public long l22620;
+    public long l22621;
+    public long l22622;
+    public long l22623;
+    public long l22624;
+    public long l22625;
+    public long l22626;
+    public long l22627;
+    public long l22628;
+    public long l22629;
+    public long l22630;
+    public long l22631;
+    public long l22632;
+    public long l22633;
+    public long l22634;
+    public long l22635;
+    public long l22636;
+    public long l22637;
+    public long l22638;
+    public long l22639;
+    public long l22640;
+    public long l22641;
+    public long l22642;
+    public long l22643;
+    public long l22644;
+    public long l22645;
+    public long l22646;
+    public long l22647;
+    public long l22648;
+    public long l22649;
+    public long l22650;
+    public long l22651;
+    public long l22652;
+    public long l22653;
+    public long l22654;
+    public long l22655;
+    public long l22656;
+    public long l22657;
+    public long l22658;
+    public long l22659;
+    public long l22660;
+    public long l22661;
+    public long l22662;
+    public long l22663;
+    public long l22664;
+    public long l22665;
+    public long l22666;
+    public long l22667;
+    public long l22668;
+    public long l22669;
+    public long l22670;
+    public long l22671;
+    public long l22672;
+    public long l22673;
+    public long l22674;
+    public long l22675;
+    public long l22676;
+    public long l22677;
+    public long l22678;
+    public long l22679;
+    public long l22680;
+    public long l22681;
+    public long l22682;
+    public long l22683;
+    public long l22684;
+    public long l22685;
+    public long l22686;
+    public long l22687;
+    public long l22688;
+    public long l22689;
+    public long l22690;
+    public long l22691;
+    public long l22692;
+    public long l22693;
+    public long l22694;
+    public long l22695;
+    public long l22696;
+    public long l22697;
+    public long l22698;
+    public long l22699;
+    public long l22700;
+    public long l22701;
+    public long l22702;
+    public long l22703;
+    public long l22704;
+    public long l22705;
+    public long l22706;
+    public long l22707;
+    public long l22708;
+    public long l22709;
+    public long l22710;
+    public long l22711;
+    public long l22712;
+    public long l22713;
+    public long l22714;
+    public long l22715;
+    public long l22716;
+    public long l22717;
+    public long l22718;
+    public long l22719;
+    public long l22720;
+    public long l22721;
+    public long l22722;
+    public long l22723;
+    public long l22724;
+    public long l22725;
+    public long l22726;
+    public long l22727;
+    public long l22728;
+    public long l22729;
+    public long l22730;
+    public long l22731;
+    public long l22732;
+    public long l22733;
+    public long l22734;
+    public long l22735;
+    public long l22736;
+    public long l22737;
+    public long l22738;
+    public long l22739;
+    public long l22740;
+    public long l22741;
+    public long l22742;
+    public long l22743;
+    public long l22744;
+    public long l22745;
+    public long l22746;
+    public long l22747;
+    public long l22748;
+    public long l22749;
+    public long l22750;
+    public long l22751;
+    public long l22752;
+    public long l22753;
+    public long l22754;
+    public long l22755;
+    public long l22756;
+    public long l22757;
+    public long l22758;
+    public long l22759;
+    public long l22760;
+    public long l22761;
+    public long l22762;
+    public long l22763;
+    public long l22764;
+    public long l22765;
+    public long l22766;
+    public long l22767;
+    public long l22768;
+    public long l22769;
+    public long l22770;
+    public long l22771;
+    public long l22772;
+    public long l22773;
+    public long l22774;
+    public long l22775;
+    public long l22776;
+    public long l22777;
+    public long l22778;
+    public long l22779;
+    public long l22780;
+    public long l22781;
+    public long l22782;
+    public long l22783;
+    public long l22784;
+    public long l22785;
+    public long l22786;
+    public long l22787;
+    public long l22788;
+    public long l22789;
+    public long l22790;
+    public long l22791;
+    public long l22792;
+    public long l22793;
+    public long l22794;
+    public long l22795;
+    public long l22796;
+    public long l22797;
+    public long l22798;
+    public long l22799;
+    public long l22800;
+    public long l22801;
+    public long l22802;
+    public long l22803;
+    public long l22804;
+    public long l22805;
+    public long l22806;
+    public long l22807;
+    public long l22808;
+    public long l22809;
+    public long l22810;
+    public long l22811;
+    public long l22812;
+    public long l22813;
+    public long l22814;
+    public long l22815;
+    public long l22816;
+    public long l22817;
+    public long l22818;
+    public long l22819;
+    public long l22820;
+    public long l22821;
+    public long l22822;
+    public long l22823;
+    public long l22824;
+    public long l22825;
+    public long l22826;
+    public long l22827;
+    public long l22828;
+    public long l22829;
+    public long l22830;
+    public long l22831;
+    public long l22832;
+    public long l22833;
+    public long l22834;
+    public long l22835;
+    public long l22836;
+    public long l22837;
+    public long l22838;
+    public long l22839;
+    public long l22840;
+    public long l22841;
+    public long l22842;
+    public long l22843;
+    public long l22844;
+    public long l22845;
+    public long l22846;
+    public long l22847;
+    public long l22848;
+    public long l22849;
+    public long l22850;
+    public long l22851;
+    public long l22852;
+    public long l22853;
+    public long l22854;
+    public long l22855;
+    public long l22856;
+    public long l22857;
+    public long l22858;
+    public long l22859;
+    public long l22860;
+    public long l22861;
+    public long l22862;
+    public long l22863;
+    public long l22864;
+    public long l22865;
+    public long l22866;
+    public long l22867;
+    public long l22868;
+    public long l22869;
+    public long l22870;
+    public long l22871;
+    public long l22872;
+    public long l22873;
+    public long l22874;
+    public long l22875;
+    public long l22876;
+    public long l22877;
+    public long l22878;
+    public long l22879;
+    public long l22880;
+    public long l22881;
+    public long l22882;
+    public long l22883;
+    public long l22884;
+    public long l22885;
+    public long l22886;
+    public long l22887;
+    public long l22888;
+    public long l22889;
+    public long l22890;
+    public long l22891;
+    public long l22892;
+    public long l22893;
+    public long l22894;
+    public long l22895;
+    public long l22896;
+    public long l22897;
+    public long l22898;
+    public long l22899;
+    public long l22900;
+    public long l22901;
+    public long l22902;
+    public long l22903;
+    public long l22904;
+    public long l22905;
+    public long l22906;
+    public long l22907;
+    public long l22908;
+    public long l22909;
+    public long l22910;
+    public long l22911;
+    public long l22912;
+    public long l22913;
+    public long l22914;
+    public long l22915;
+    public long l22916;
+    public long l22917;
+    public long l22918;
+    public long l22919;
+    public long l22920;
+    public long l22921;
+    public long l22922;
+    public long l22923;
+    public long l22924;
+    public long l22925;
+    public long l22926;
+    public long l22927;
+    public long l22928;
+    public long l22929;
+    public long l22930;
+    public long l22931;
+    public long l22932;
+    public long l22933;
+    public long l22934;
+    public long l22935;
+    public long l22936;
+    public long l22937;
+    public long l22938;
+    public long l22939;
+    public long l22940;
+    public long l22941;
+    public long l22942;
+    public long l22943;
+    public long l22944;
+    public long l22945;
+    public long l22946;
+    public long l22947;
+    public long l22948;
+    public long l22949;
+    public long l22950;
+    public long l22951;
+    public long l22952;
+    public long l22953;
+    public long l22954;
+    public long l22955;
+    public long l22956;
+    public long l22957;
+    public long l22958;
+    public long l22959;
+    public long l22960;
+    public long l22961;
+    public long l22962;
+    public long l22963;
+    public long l22964;
+    public long l22965;
+    public long l22966;
+    public long l22967;
+    public long l22968;
+    public long l22969;
+    public long l22970;
+    public long l22971;
+    public long l22972;
+    public long l22973;
+    public long l22974;
+    public long l22975;
+    public long l22976;
+    public long l22977;
+    public long l22978;
+    public long l22979;
+    public long l22980;
+    public long l22981;
+    public long l22982;
+    public long l22983;
+    public long l22984;
+    public long l22985;
+    public long l22986;
+    public long l22987;
+    public long l22988;
+    public long l22989;
+    public long l22990;
+    public long l22991;
+    public long l22992;
+    public long l22993;
+    public long l22994;
+    public long l22995;
+    public long l22996;
+    public long l22997;
+    public long l22998;
+    public long l22999;
+    public long l23000;
+    public long l23001;
+    public long l23002;
+    public long l23003;
+    public long l23004;
+    public long l23005;
+    public long l23006;
+    public long l23007;
+    public long l23008;
+    public long l23009;
+    public long l23010;
+    public long l23011;
+    public long l23012;
+    public long l23013;
+    public long l23014;
+    public long l23015;
+    public long l23016;
+    public long l23017;
+    public long l23018;
+    public long l23019;
+    public long l23020;
+    public long l23021;
+    public long l23022;
+    public long l23023;
+    public long l23024;
+    public long l23025;
+    public long l23026;
+    public long l23027;
+    public long l23028;
+    public long l23029;
+    public long l23030;
+    public long l23031;
+    public long l23032;
+    public long l23033;
+    public long l23034;
+    public long l23035;
+    public long l23036;
+    public long l23037;
+    public long l23038;
+    public long l23039;
+    public long l23040;
+    public long l23041;
+    public long l23042;
+    public long l23043;
+    public long l23044;
+    public long l23045;
+    public long l23046;
+    public long l23047;
+    public long l23048;
+    public long l23049;
+    public long l23050;
+    public long l23051;
+    public long l23052;
+    public long l23053;
+    public long l23054;
+    public long l23055;
+    public long l23056;
+    public long l23057;
+    public long l23058;
+    public long l23059;
+    public long l23060;
+    public long l23061;
+    public long l23062;
+    public long l23063;
+    public long l23064;
+    public long l23065;
+    public long l23066;
+    public long l23067;
+    public long l23068;
+    public long l23069;
+    public long l23070;
+    public long l23071;
+    public long l23072;
+    public long l23073;
+    public long l23074;
+    public long l23075;
+    public long l23076;
+    public long l23077;
+    public long l23078;
+    public long l23079;
+    public long l23080;
+    public long l23081;
+    public long l23082;
+    public long l23083;
+    public long l23084;
+    public long l23085;
+    public long l23086;
+    public long l23087;
+    public long l23088;
+    public long l23089;
+    public long l23090;
+    public long l23091;
+    public long l23092;
+    public long l23093;
+    public long l23094;
+    public long l23095;
+    public long l23096;
+    public long l23097;
+    public long l23098;
+    public long l23099;
+    public long l23100;
+    public long l23101;
+    public long l23102;
+    public long l23103;
+    public long l23104;
+    public long l23105;
+    public long l23106;
+    public long l23107;
+    public long l23108;
+    public long l23109;
+    public long l23110;
+    public long l23111;
+    public long l23112;
+    public long l23113;
+    public long l23114;
+    public long l23115;
+    public long l23116;
+    public long l23117;
+    public long l23118;
+    public long l23119;
+    public long l23120;
+    public long l23121;
+    public long l23122;
+    public long l23123;
+    public long l23124;
+    public long l23125;
+    public long l23126;
+    public long l23127;
+    public long l23128;
+    public long l23129;
+    public long l23130;
+    public long l23131;
+    public long l23132;
+    public long l23133;
+    public long l23134;
+    public long l23135;
+    public long l23136;
+    public long l23137;
+    public long l23138;
+    public long l23139;
+    public long l23140;
+    public long l23141;
+    public long l23142;
+    public long l23143;
+    public long l23144;
+    public long l23145;
+    public long l23146;
+    public long l23147;
+    public long l23148;
+    public long l23149;
+    public long l23150;
+    public long l23151;
+    public long l23152;
+    public long l23153;
+    public long l23154;
+    public long l23155;
+    public long l23156;
+    public long l23157;
+    public long l23158;
+    public long l23159;
+    public long l23160;
+    public long l23161;
+    public long l23162;
+    public long l23163;
+    public long l23164;
+    public long l23165;
+    public long l23166;
+    public long l23167;
+    public long l23168;
+    public long l23169;
+    public long l23170;
+    public long l23171;
+    public long l23172;
+    public long l23173;
+    public long l23174;
+    public long l23175;
+    public long l23176;
+    public long l23177;
+    public long l23178;
+    public long l23179;
+    public long l23180;
+    public long l23181;
+    public long l23182;
+    public long l23183;
+    public long l23184;
+    public long l23185;
+    public long l23186;
+    public long l23187;
+    public long l23188;
+    public long l23189;
+    public long l23190;
+    public long l23191;
+    public long l23192;
+    public long l23193;
+    public long l23194;
+    public long l23195;
+    public long l23196;
+    public long l23197;
+    public long l23198;
+    public long l23199;
+    public long l23200;
+    public long l23201;
+    public long l23202;
+    public long l23203;
+    public long l23204;
+    public long l23205;
+    public long l23206;
+    public long l23207;
+    public long l23208;
+    public long l23209;
+    public long l23210;
+    public long l23211;
+    public long l23212;
+    public long l23213;
+    public long l23214;
+    public long l23215;
+    public long l23216;
+    public long l23217;
+    public long l23218;
+    public long l23219;
+    public long l23220;
+    public long l23221;
+    public long l23222;
+    public long l23223;
+    public long l23224;
+    public long l23225;
+    public long l23226;
+    public long l23227;
+    public long l23228;
+    public long l23229;
+    public long l23230;
+    public long l23231;
+    public long l23232;
+    public long l23233;
+    public long l23234;
+    public long l23235;
+    public long l23236;
+    public long l23237;
+    public long l23238;
+    public long l23239;
+    public long l23240;
+    public long l23241;
+    public long l23242;
+    public long l23243;
+    public long l23244;
+    public long l23245;
+    public long l23246;
+    public long l23247;
+    public long l23248;
+    public long l23249;
+    public long l23250;
+    public long l23251;
+    public long l23252;
+    public long l23253;
+    public long l23254;
+    public long l23255;
+    public long l23256;
+    public long l23257;
+    public long l23258;
+    public long l23259;
+    public long l23260;
+    public long l23261;
+    public long l23262;
+    public long l23263;
+    public long l23264;
+    public long l23265;
+    public long l23266;
+    public long l23267;
+    public long l23268;
+    public long l23269;
+    public long l23270;
+    public long l23271;
+    public long l23272;
+    public long l23273;
+    public long l23274;
+    public long l23275;
+    public long l23276;
+    public long l23277;
+    public long l23278;
+    public long l23279;
+    public long l23280;
+    public long l23281;
+    public long l23282;
+    public long l23283;
+    public long l23284;
+    public long l23285;
+    public long l23286;
+    public long l23287;
+    public long l23288;
+    public long l23289;
+    public long l23290;
+    public long l23291;
+    public long l23292;
+    public long l23293;
+    public long l23294;
+    public long l23295;
+    public long l23296;
+    public long l23297;
+    public long l23298;
+    public long l23299;
+    public long l23300;
+    public long l23301;
+    public long l23302;
+    public long l23303;
+    public long l23304;
+    public long l23305;
+    public long l23306;
+    public long l23307;
+    public long l23308;
+    public long l23309;
+    public long l23310;
+    public long l23311;
+    public long l23312;
+    public long l23313;
+    public long l23314;
+    public long l23315;
+    public long l23316;
+    public long l23317;
+    public long l23318;
+    public long l23319;
+    public long l23320;
+    public long l23321;
+    public long l23322;
+    public long l23323;
+    public long l23324;
+    public long l23325;
+    public long l23326;
+    public long l23327;
+    public long l23328;
+    public long l23329;
+    public long l23330;
+    public long l23331;
+    public long l23332;
+    public long l23333;
+    public long l23334;
+    public long l23335;
+    public long l23336;
+    public long l23337;
+    public long l23338;
+    public long l23339;
+    public long l23340;
+    public long l23341;
+    public long l23342;
+    public long l23343;
+    public long l23344;
+    public long l23345;
+    public long l23346;
+    public long l23347;
+    public long l23348;
+    public long l23349;
+    public long l23350;
+    public long l23351;
+    public long l23352;
+    public long l23353;
+    public long l23354;
+    public long l23355;
+    public long l23356;
+    public long l23357;
+    public long l23358;
+    public long l23359;
+    public long l23360;
+    public long l23361;
+    public long l23362;
+    public long l23363;
+    public long l23364;
+    public long l23365;
+    public long l23366;
+    public long l23367;
+    public long l23368;
+    public long l23369;
+    public long l23370;
+    public long l23371;
+    public long l23372;
+    public long l23373;
+    public long l23374;
+    public long l23375;
+    public long l23376;
+    public long l23377;
+    public long l23378;
+    public long l23379;
+    public long l23380;
+    public long l23381;
+    public long l23382;
+    public long l23383;
+    public long l23384;
+    public long l23385;
+    public long l23386;
+    public long l23387;
+    public long l23388;
+    public long l23389;
+    public long l23390;
+    public long l23391;
+    public long l23392;
+    public long l23393;
+    public long l23394;
+    public long l23395;
+    public long l23396;
+    public long l23397;
+    public long l23398;
+    public long l23399;
+    public long l23400;
+    public long l23401;
+    public long l23402;
+    public long l23403;
+    public long l23404;
+    public long l23405;
+    public long l23406;
+    public long l23407;
+    public long l23408;
+    public long l23409;
+    public long l23410;
+    public long l23411;
+    public long l23412;
+    public long l23413;
+    public long l23414;
+    public long l23415;
+    public long l23416;
+    public long l23417;
+    public long l23418;
+    public long l23419;
+    public long l23420;
+    public long l23421;
+    public long l23422;
+    public long l23423;
+    public long l23424;
+    public long l23425;
+    public long l23426;
+    public long l23427;
+    public long l23428;
+    public long l23429;
+    public long l23430;
+    public long l23431;
+    public long l23432;
+    public long l23433;
+    public long l23434;
+    public long l23435;
+    public long l23436;
+    public long l23437;
+    public long l23438;
+    public long l23439;
+    public long l23440;
+    public long l23441;
+    public long l23442;
+    public long l23443;
+    public long l23444;
+    public long l23445;
+    public long l23446;
+    public long l23447;
+    public long l23448;
+    public long l23449;
+    public long l23450;
+    public long l23451;
+    public long l23452;
+    public long l23453;
+    public long l23454;
+    public long l23455;
+    public long l23456;
+    public long l23457;
+    public long l23458;
+    public long l23459;
+    public long l23460;
+    public long l23461;
+    public long l23462;
+    public long l23463;
+    public long l23464;
+    public long l23465;
+    public long l23466;
+    public long l23467;
+    public long l23468;
+    public long l23469;
+    public long l23470;
+    public long l23471;
+    public long l23472;
+    public long l23473;
+    public long l23474;
+    public long l23475;
+    public long l23476;
+    public long l23477;
+    public long l23478;
+    public long l23479;
+    public long l23480;
+    public long l23481;
+    public long l23482;
+    public long l23483;
+    public long l23484;
+    public long l23485;
+    public long l23486;
+    public long l23487;
+    public long l23488;
+    public long l23489;
+    public long l23490;
+    public long l23491;
+    public long l23492;
+    public long l23493;
+    public long l23494;
+    public long l23495;
+    public long l23496;
+    public long l23497;
+    public long l23498;
+    public long l23499;
+    public long l23500;
+    public long l23501;
+    public long l23502;
+    public long l23503;
+    public long l23504;
+    public long l23505;
+    public long l23506;
+    public long l23507;
+    public long l23508;
+    public long l23509;
+    public long l23510;
+    public long l23511;
+    public long l23512;
+    public long l23513;
+    public long l23514;
+    public long l23515;
+    public long l23516;
+    public long l23517;
+    public long l23518;
+    public long l23519;
+    public long l23520;
+    public long l23521;
+    public long l23522;
+    public long l23523;
+    public long l23524;
+    public long l23525;
+    public long l23526;
+    public long l23527;
+    public long l23528;
+    public long l23529;
+    public long l23530;
+    public long l23531;
+    public long l23532;
+    public long l23533;
+    public long l23534;
+    public long l23535;
+    public long l23536;
+    public long l23537;
+    public long l23538;
+    public long l23539;
+    public long l23540;
+    public long l23541;
+    public long l23542;
+    public long l23543;
+    public long l23544;
+    public long l23545;
+    public long l23546;
+    public long l23547;
+    public long l23548;
+    public long l23549;
+    public long l23550;
+    public long l23551;
+    public long l23552;
+    public long l23553;
+    public long l23554;
+    public long l23555;
+    public long l23556;
+    public long l23557;
+    public long l23558;
+    public long l23559;
+    public long l23560;
+    public long l23561;
+    public long l23562;
+    public long l23563;
+    public long l23564;
+    public long l23565;
+    public long l23566;
+    public long l23567;
+    public long l23568;
+    public long l23569;
+    public long l23570;
+    public long l23571;
+    public long l23572;
+    public long l23573;
+    public long l23574;
+    public long l23575;
+    public long l23576;
+    public long l23577;
+    public long l23578;
+    public long l23579;
+    public long l23580;
+    public long l23581;
+    public long l23582;
+    public long l23583;
+    public long l23584;
+    public long l23585;
+    public long l23586;
+    public long l23587;
+    public long l23588;
+    public long l23589;
+    public long l23590;
+    public long l23591;
+    public long l23592;
+    public long l23593;
+    public long l23594;
+    public long l23595;
+    public long l23596;
+    public long l23597;
+    public long l23598;
+    public long l23599;
+    public long l23600;
+    public long l23601;
+    public long l23602;
+    public long l23603;
+    public long l23604;
+    public long l23605;
+    public long l23606;
+    public long l23607;
+    public long l23608;
+    public long l23609;
+    public long l23610;
+    public long l23611;
+    public long l23612;
+    public long l23613;
+    public long l23614;
+    public long l23615;
+    public long l23616;
+    public long l23617;
+    public long l23618;
+    public long l23619;
+    public long l23620;
+    public long l23621;
+    public long l23622;
+    public long l23623;
+    public long l23624;
+    public long l23625;
+    public long l23626;
+    public long l23627;
+    public long l23628;
+    public long l23629;
+    public long l23630;
+    public long l23631;
+    public long l23632;
+    public long l23633;
+    public long l23634;
+    public long l23635;
+    public long l23636;
+    public long l23637;
+    public long l23638;
+    public long l23639;
+    public long l23640;
+    public long l23641;
+    public long l23642;
+    public long l23643;
+    public long l23644;
+    public long l23645;
+    public long l23646;
+    public long l23647;
+    public long l23648;
+    public long l23649;
+    public long l23650;
+    public long l23651;
+    public long l23652;
+    public long l23653;
+    public long l23654;
+    public long l23655;
+    public long l23656;
+    public long l23657;
+    public long l23658;
+    public long l23659;
+    public long l23660;
+    public long l23661;
+    public long l23662;
+    public long l23663;
+    public long l23664;
+    public long l23665;
+    public long l23666;
+    public long l23667;
+    public long l23668;
+    public long l23669;
+    public long l23670;
+    public long l23671;
+    public long l23672;
+    public long l23673;
+    public long l23674;
+    public long l23675;
+    public long l23676;
+    public long l23677;
+    public long l23678;
+    public long l23679;
+    public long l23680;
+    public long l23681;
+    public long l23682;
+    public long l23683;
+    public long l23684;
+    public long l23685;
+    public long l23686;
+    public long l23687;
+    public long l23688;
+    public long l23689;
+    public long l23690;
+    public long l23691;
+    public long l23692;
+    public long l23693;
+    public long l23694;
+    public long l23695;
+    public long l23696;
+    public long l23697;
+    public long l23698;
+    public long l23699;
+    public long l23700;
+    public long l23701;
+    public long l23702;
+    public long l23703;
+    public long l23704;
+    public long l23705;
+    public long l23706;
+    public long l23707;
+    public long l23708;
+    public long l23709;
+    public long l23710;
+    public long l23711;
+    public long l23712;
+    public long l23713;
+    public long l23714;
+    public long l23715;
+    public long l23716;
+    public long l23717;
+    public long l23718;
+    public long l23719;
+    public long l23720;
+    public long l23721;
+    public long l23722;
+    public long l23723;
+    public long l23724;
+    public long l23725;
+    public long l23726;
+    public long l23727;
+    public long l23728;
+    public long l23729;
+    public long l23730;
+    public long l23731;
+    public long l23732;
+    public long l23733;
+    public long l23734;
+    public long l23735;
+    public long l23736;
+    public long l23737;
+    public long l23738;
+    public long l23739;
+    public long l23740;
+    public long l23741;
+    public long l23742;
+    public long l23743;
+    public long l23744;
+    public long l23745;
+    public long l23746;
+    public long l23747;
+    public long l23748;
+    public long l23749;
+    public long l23750;
+    public long l23751;
+    public long l23752;
+    public long l23753;
+    public long l23754;
+    public long l23755;
+    public long l23756;
+    public long l23757;
+    public long l23758;
+    public long l23759;
+    public long l23760;
+    public long l23761;
+    public long l23762;
+    public long l23763;
+    public long l23764;
+    public long l23765;
+    public long l23766;
+    public long l23767;
+    public long l23768;
+    public long l23769;
+    public long l23770;
+    public long l23771;
+    public long l23772;
+    public long l23773;
+    public long l23774;
+    public long l23775;
+    public long l23776;
+    public long l23777;
+    public long l23778;
+    public long l23779;
+    public long l23780;
+    public long l23781;
+    public long l23782;
+    public long l23783;
+    public long l23784;
+    public long l23785;
+    public long l23786;
+    public long l23787;
+    public long l23788;
+    public long l23789;
+    public long l23790;
+    public long l23791;
+    public long l23792;
+    public long l23793;
+    public long l23794;
+    public long l23795;
+    public long l23796;
+    public long l23797;
+    public long l23798;
+    public long l23799;
+    public long l23800;
+    public long l23801;
+    public long l23802;
+    public long l23803;
+    public long l23804;
+    public long l23805;
+    public long l23806;
+    public long l23807;
+    public long l23808;
+    public long l23809;
+    public long l23810;
+    public long l23811;
+    public long l23812;
+    public long l23813;
+    public long l23814;
+    public long l23815;
+    public long l23816;
+    public long l23817;
+    public long l23818;
+    public long l23819;
+    public long l23820;
+    public long l23821;
+    public long l23822;
+    public long l23823;
+    public long l23824;
+    public long l23825;
+    public long l23826;
+    public long l23827;
+    public long l23828;
+    public long l23829;
+    public long l23830;
+    public long l23831;
+    public long l23832;
+    public long l23833;
+    public long l23834;
+    public long l23835;
+    public long l23836;
+    public long l23837;
+    public long l23838;
+    public long l23839;
+    public long l23840;
+    public long l23841;
+    public long l23842;
+    public long l23843;
+    public long l23844;
+    public long l23845;
+    public long l23846;
+    public long l23847;
+    public long l23848;
+    public long l23849;
+    public long l23850;
+    public long l23851;
+    public long l23852;
+    public long l23853;
+    public long l23854;
+    public long l23855;
+    public long l23856;
+    public long l23857;
+    public long l23858;
+    public long l23859;
+    public long l23860;
+    public long l23861;
+    public long l23862;
+    public long l23863;
+    public long l23864;
+    public long l23865;
+    public long l23866;
+    public long l23867;
+    public long l23868;
+    public long l23869;
+    public long l23870;
+    public long l23871;
+    public long l23872;
+    public long l23873;
+    public long l23874;
+    public long l23875;
+    public long l23876;
+    public long l23877;
+    public long l23878;
+    public long l23879;
+    public long l23880;
+    public long l23881;
+    public long l23882;
+    public long l23883;
+    public long l23884;
+    public long l23885;
+    public long l23886;
+    public long l23887;
+    public long l23888;
+    public long l23889;
+    public long l23890;
+    public long l23891;
+    public long l23892;
+    public long l23893;
+    public long l23894;
+    public long l23895;
+    public long l23896;
+    public long l23897;
+    public long l23898;
+    public long l23899;
+    public long l23900;
+    public long l23901;
+    public long l23902;
+    public long l23903;
+    public long l23904;
+    public long l23905;
+    public long l23906;
+    public long l23907;
+    public long l23908;
+    public long l23909;
+    public long l23910;
+    public long l23911;
+    public long l23912;
+    public long l23913;
+    public long l23914;
+    public long l23915;
+    public long l23916;
+    public long l23917;
+    public long l23918;
+    public long l23919;
+    public long l23920;
+    public long l23921;
+    public long l23922;
+    public long l23923;
+    public long l23924;
+    public long l23925;
+    public long l23926;
+    public long l23927;
+    public long l23928;
+    public long l23929;
+    public long l23930;
+    public long l23931;
+    public long l23932;
+    public long l23933;
+    public long l23934;
+    public long l23935;
+    public long l23936;
+    public long l23937;
+    public long l23938;
+    public long l23939;
+    public long l23940;
+    public long l23941;
+    public long l23942;
+    public long l23943;
+    public long l23944;
+    public long l23945;
+    public long l23946;
+    public long l23947;
+    public long l23948;
+    public long l23949;
+    public long l23950;
+    public long l23951;
+    public long l23952;
+    public long l23953;
+    public long l23954;
+    public long l23955;
+    public long l23956;
+    public long l23957;
+    public long l23958;
+    public long l23959;
+    public long l23960;
+    public long l23961;
+    public long l23962;
+    public long l23963;
+    public long l23964;
+    public long l23965;
+    public long l23966;
+    public long l23967;
+    public long l23968;
+    public long l23969;
+    public long l23970;
+    public long l23971;
+    public long l23972;
+    public long l23973;
+    public long l23974;
+    public long l23975;
+    public long l23976;
+    public long l23977;
+    public long l23978;
+    public long l23979;
+    public long l23980;
+    public long l23981;
+    public long l23982;
+    public long l23983;
+    public long l23984;
+    public long l23985;
+    public long l23986;
+    public long l23987;
+    public long l23988;
+    public long l23989;
+    public long l23990;
+    public long l23991;
+    public long l23992;
+    public long l23993;
+    public long l23994;
+    public long l23995;
+    public long l23996;
+    public long l23997;
+    public long l23998;
+    public long l23999;
+    public long l24000;
+    public long l24001;
+    public long l24002;
+    public long l24003;
+    public long l24004;
+    public long l24005;
+    public long l24006;
+    public long l24007;
+    public long l24008;
+    public long l24009;
+    public long l24010;
+    public long l24011;
+    public long l24012;
+    public long l24013;
+    public long l24014;
+    public long l24015;
+    public long l24016;
+    public long l24017;
+    public long l24018;
+    public long l24019;
+    public long l24020;
+    public long l24021;
+    public long l24022;
+    public long l24023;
+    public long l24024;
+    public long l24025;
+    public long l24026;
+    public long l24027;
+    public long l24028;
+    public long l24029;
+    public long l24030;
+    public long l24031;
+    public long l24032;
+    public long l24033;
+    public long l24034;
+    public long l24035;
+    public long l24036;
+    public long l24037;
+    public long l24038;
+    public long l24039;
+    public long l24040;
+    public long l24041;
+    public long l24042;
+    public long l24043;
+    public long l24044;
+    public long l24045;
+    public long l24046;
+    public long l24047;
+    public long l24048;
+    public long l24049;
+    public long l24050;
+    public long l24051;
+    public long l24052;
+    public long l24053;
+    public long l24054;
+    public long l24055;
+    public long l24056;
+    public long l24057;
+    public long l24058;
+    public long l24059;
+    public long l24060;
+    public long l24061;
+    public long l24062;
+    public long l24063;
+    public long l24064;
+    public long l24065;
+    public long l24066;
+    public long l24067;
+    public long l24068;
+    public long l24069;
+    public long l24070;
+    public long l24071;
+    public long l24072;
+    public long l24073;
+    public long l24074;
+    public long l24075;
+    public long l24076;
+    public long l24077;
+    public long l24078;
+    public long l24079;
+    public long l24080;
+    public long l24081;
+    public long l24082;
+    public long l24083;
+    public long l24084;
+    public long l24085;
+    public long l24086;
+    public long l24087;
+    public long l24088;
+    public long l24089;
+    public long l24090;
+    public long l24091;
+    public long l24092;
+    public long l24093;
+    public long l24094;
+    public long l24095;
+    public long l24096;
+    public long l24097;
+    public long l24098;
+    public long l24099;
+    public long l24100;
+    public long l24101;
+    public long l24102;
+    public long l24103;
+    public long l24104;
+    public long l24105;
+    public long l24106;
+    public long l24107;
+    public long l24108;
+    public long l24109;
+    public long l24110;
+    public long l24111;
+    public long l24112;
+    public long l24113;
+    public long l24114;
+    public long l24115;
+    public long l24116;
+    public long l24117;
+    public long l24118;
+    public long l24119;
+    public long l24120;
+    public long l24121;
+    public long l24122;
+    public long l24123;
+    public long l24124;
+    public long l24125;
+    public long l24126;
+    public long l24127;
+    public long l24128;
+    public long l24129;
+    public long l24130;
+    public long l24131;
+    public long l24132;
+    public long l24133;
+    public long l24134;
+    public long l24135;
+    public long l24136;
+    public long l24137;
+    public long l24138;
+    public long l24139;
+    public long l24140;
+    public long l24141;
+    public long l24142;
+    public long l24143;
+    public long l24144;
+    public long l24145;
+    public long l24146;
+    public long l24147;
+    public long l24148;
+    public long l24149;
+    public long l24150;
+    public long l24151;
+    public long l24152;
+    public long l24153;
+    public long l24154;
+    public long l24155;
+    public long l24156;
+    public long l24157;
+    public long l24158;
+    public long l24159;
+    public long l24160;
+    public long l24161;
+    public long l24162;
+    public long l24163;
+    public long l24164;
+    public long l24165;
+    public long l24166;
+    public long l24167;
+    public long l24168;
+    public long l24169;
+    public long l24170;
+    public long l24171;
+    public long l24172;
+    public long l24173;
+    public long l24174;
+    public long l24175;
+    public long l24176;
+    public long l24177;
+    public long l24178;
+    public long l24179;
+    public long l24180;
+    public long l24181;
+    public long l24182;
+    public long l24183;
+    public long l24184;
+    public long l24185;
+    public long l24186;
+    public long l24187;
+    public long l24188;
+    public long l24189;
+    public long l24190;
+    public long l24191;
+    public long l24192;
+    public long l24193;
+    public long l24194;
+    public long l24195;
+    public long l24196;
+    public long l24197;
+    public long l24198;
+    public long l24199;
+    public long l24200;
+    public long l24201;
+    public long l24202;
+    public long l24203;
+    public long l24204;
+    public long l24205;
+    public long l24206;
+    public long l24207;
+    public long l24208;
+    public long l24209;
+    public long l24210;
+    public long l24211;
+    public long l24212;
+    public long l24213;
+    public long l24214;
+    public long l24215;
+    public long l24216;
+    public long l24217;
+    public long l24218;
+    public long l24219;
+    public long l24220;
+    public long l24221;
+    public long l24222;
+    public long l24223;
+    public long l24224;
+    public long l24225;
+    public long l24226;
+    public long l24227;
+    public long l24228;
+    public long l24229;
+    public long l24230;
+    public long l24231;
+    public long l24232;
+    public long l24233;
+    public long l24234;
+    public long l24235;
+    public long l24236;
+    public long l24237;
+    public long l24238;
+    public long l24239;
+    public long l24240;
+    public long l24241;
+    public long l24242;
+    public long l24243;
+    public long l24244;
+    public long l24245;
+    public long l24246;
+    public long l24247;
+    public long l24248;
+    public long l24249;
+    public long l24250;
+    public long l24251;
+    public long l24252;
+    public long l24253;
+    public long l24254;
+    public long l24255;
+    public long l24256;
+    public long l24257;
+    public long l24258;
+    public long l24259;
+    public long l24260;
+    public long l24261;
+    public long l24262;
+    public long l24263;
+    public long l24264;
+    public long l24265;
+    public long l24266;
+    public long l24267;
+    public long l24268;
+    public long l24269;
+    public long l24270;
+    public long l24271;
+    public long l24272;
+    public long l24273;
+    public long l24274;
+    public long l24275;
+    public long l24276;
+    public long l24277;
+    public long l24278;
+    public long l24279;
+    public long l24280;
+    public long l24281;
+    public long l24282;
+    public long l24283;
+    public long l24284;
+    public long l24285;
+    public long l24286;
+    public long l24287;
+    public long l24288;
+    public long l24289;
+    public long l24290;
+    public long l24291;
+    public long l24292;
+    public long l24293;
+    public long l24294;
+    public long l24295;
+    public long l24296;
+    public long l24297;
+    public long l24298;
+    public long l24299;
+    public long l24300;
+    public long l24301;
+    public long l24302;
+    public long l24303;
+    public long l24304;
+    public long l24305;
+    public long l24306;
+    public long l24307;
+    public long l24308;
+    public long l24309;
+    public long l24310;
+    public long l24311;
+    public long l24312;
+    public long l24313;
+    public long l24314;
+    public long l24315;
+    public long l24316;
+    public long l24317;
+    public long l24318;
+    public long l24319;
+    public long l24320;
+    public long l24321;
+    public long l24322;
+    public long l24323;
+    public long l24324;
+    public long l24325;
+    public long l24326;
+    public long l24327;
+    public long l24328;
+    public long l24329;
+    public long l24330;
+    public long l24331;
+    public long l24332;
+    public long l24333;
+    public long l24334;
+    public long l24335;
+    public long l24336;
+    public long l24337;
+    public long l24338;
+    public long l24339;
+    public long l24340;
+    public long l24341;
+    public long l24342;
+    public long l24343;
+    public long l24344;
+    public long l24345;
+    public long l24346;
+    public long l24347;
+    public long l24348;
+    public long l24349;
+    public long l24350;
+    public long l24351;
+    public long l24352;
+    public long l24353;
+    public long l24354;
+    public long l24355;
+    public long l24356;
+    public long l24357;
+    public long l24358;
+    public long l24359;
+    public long l24360;
+    public long l24361;
+    public long l24362;
+    public long l24363;
+    public long l24364;
+    public long l24365;
+    public long l24366;
+    public long l24367;
+    public long l24368;
+    public long l24369;
+    public long l24370;
+    public long l24371;
+    public long l24372;
+    public long l24373;
+    public long l24374;
+    public long l24375;
+    public long l24376;
+    public long l24377;
+    public long l24378;
+    public long l24379;
+    public long l24380;
+    public long l24381;
+    public long l24382;
+    public long l24383;
+    public long l24384;
+    public long l24385;
+    public long l24386;
+    public long l24387;
+    public long l24388;
+    public long l24389;
+    public long l24390;
+    public long l24391;
+    public long l24392;
+    public long l24393;
+    public long l24394;
+    public long l24395;
+    public long l24396;
+    public long l24397;
+    public long l24398;
+    public long l24399;
+    public long l24400;
+    public long l24401;
+    public long l24402;
+    public long l24403;
+    public long l24404;
+    public long l24405;
+    public long l24406;
+    public long l24407;
+    public long l24408;
+    public long l24409;
+    public long l24410;
+    public long l24411;
+    public long l24412;
+    public long l24413;
+    public long l24414;
+    public long l24415;
+    public long l24416;
+    public long l24417;
+    public long l24418;
+    public long l24419;
+    public long l24420;
+    public long l24421;
+    public long l24422;
+    public long l24423;
+    public long l24424;
+    public long l24425;
+    public long l24426;
+    public long l24427;
+    public long l24428;
+    public long l24429;
+    public long l24430;
+    public long l24431;
+    public long l24432;
+    public long l24433;
+    public long l24434;
+    public long l24435;
+    public long l24436;
+    public long l24437;
+    public long l24438;
+    public long l24439;
+    public long l24440;
+    public long l24441;
+    public long l24442;
+    public long l24443;
+    public long l24444;
+    public long l24445;
+    public long l24446;
+    public long l24447;
+    public long l24448;
+    public long l24449;
+    public long l24450;
+    public long l24451;
+    public long l24452;
+    public long l24453;
+    public long l24454;
+    public long l24455;
+    public long l24456;
+    public long l24457;
+    public long l24458;
+    public long l24459;
+    public long l24460;
+    public long l24461;
+    public long l24462;
+    public long l24463;
+    public long l24464;
+    public long l24465;
+    public long l24466;
+    public long l24467;
+    public long l24468;
+    public long l24469;
+    public long l24470;
+    public long l24471;
+    public long l24472;
+    public long l24473;
+    public long l24474;
+    public long l24475;
+    public long l24476;
+    public long l24477;
+    public long l24478;
+    public long l24479;
+    public long l24480;
+    public long l24481;
+    public long l24482;
+    public long l24483;
+    public long l24484;
+    public long l24485;
+    public long l24486;
+    public long l24487;
+    public long l24488;
+    public long l24489;
+    public long l24490;
+    public long l24491;
+    public long l24492;
+    public long l24493;
+    public long l24494;
+    public long l24495;
+    public long l24496;
+    public long l24497;
+    public long l24498;
+    public long l24499;
+    public long l24500;
+    public long l24501;
+    public long l24502;
+    public long l24503;
+    public long l24504;
+    public long l24505;
+    public long l24506;
+    public long l24507;
+    public long l24508;
+    public long l24509;
+    public long l24510;
+    public long l24511;
+    public long l24512;
+    public long l24513;
+    public long l24514;
+    public long l24515;
+    public long l24516;
+    public long l24517;
+    public long l24518;
+    public long l24519;
+    public long l24520;
+    public long l24521;
+    public long l24522;
+    public long l24523;
+    public long l24524;
+    public long l24525;
+    public long l24526;
+    public long l24527;
+    public long l24528;
+    public long l24529;
+    public long l24530;
+    public long l24531;
+    public long l24532;
+    public long l24533;
+    public long l24534;
+    public long l24535;
+    public long l24536;
+    public long l24537;
+    public long l24538;
+    public long l24539;
+    public long l24540;
+    public long l24541;
+    public long l24542;
+    public long l24543;
+    public long l24544;
+    public long l24545;
+    public long l24546;
+    public long l24547;
+    public long l24548;
+    public long l24549;
+    public long l24550;
+    public long l24551;
+    public long l24552;
+    public long l24553;
+    public long l24554;
+    public long l24555;
+    public long l24556;
+    public long l24557;
+    public long l24558;
+    public long l24559;
+    public long l24560;
+    public long l24561;
+    public long l24562;
+    public long l24563;
+    public long l24564;
+    public long l24565;
+    public long l24566;
+    public long l24567;
+    public long l24568;
+    public long l24569;
+    public long l24570;
+    public long l24571;
+    public long l24572;
+    public long l24573;
+    public long l24574;
+    public long l24575;
+    public long l24576;
+    public long l24577;
+    public long l24578;
+    public long l24579;
+    public long l24580;
+    public long l24581;
+    public long l24582;
+    public long l24583;
+    public long l24584;
+    public long l24585;
+    public long l24586;
+    public long l24587;
+    public long l24588;
+    public long l24589;
+    public long l24590;
+    public long l24591;
+    public long l24592;
+    public long l24593;
+    public long l24594;
+    public long l24595;
+    public long l24596;
+    public long l24597;
+    public long l24598;
+    public long l24599;
+    public long l24600;
+    public long l24601;
+    public long l24602;
+    public long l24603;
+    public long l24604;
+    public long l24605;
+    public long l24606;
+    public long l24607;
+    public long l24608;
+    public long l24609;
+    public long l24610;
+    public long l24611;
+    public long l24612;
+    public long l24613;
+    public long l24614;
+    public long l24615;
+    public long l24616;
+    public long l24617;
+    public long l24618;
+    public long l24619;
+    public long l24620;
+    public long l24621;
+    public long l24622;
+    public long l24623;
+    public long l24624;
+    public long l24625;
+    public long l24626;
+    public long l24627;
+    public long l24628;
+    public long l24629;
+    public long l24630;
+    public long l24631;
+    public long l24632;
+    public long l24633;
+    public long l24634;
+    public long l24635;
+    public long l24636;
+    public long l24637;
+    public long l24638;
+    public long l24639;
+    public long l24640;
+    public long l24641;
+    public long l24642;
+    public long l24643;
+    public long l24644;
+    public long l24645;
+    public long l24646;
+    public long l24647;
+    public long l24648;
+    public long l24649;
+    public long l24650;
+    public long l24651;
+    public long l24652;
+    public long l24653;
+    public long l24654;
+    public long l24655;
+    public long l24656;
+    public long l24657;
+    public long l24658;
+    public long l24659;
+    public long l24660;
+    public long l24661;
+    public long l24662;
+    public long l24663;
+    public long l24664;
+    public long l24665;
+    public long l24666;
+    public long l24667;
+    public long l24668;
+    public long l24669;
+    public long l24670;
+    public long l24671;
+    public long l24672;
+    public long l24673;
+    public long l24674;
+    public long l24675;
+    public long l24676;
+    public long l24677;
+    public long l24678;
+    public long l24679;
+    public long l24680;
+    public long l24681;
+    public long l24682;
+    public long l24683;
+    public long l24684;
+    public long l24685;
+    public long l24686;
+    public long l24687;
+    public long l24688;
+    public long l24689;
+    public long l24690;
+    public long l24691;
+    public long l24692;
+    public long l24693;
+    public long l24694;
+    public long l24695;
+    public long l24696;
+    public long l24697;
+    public long l24698;
+    public long l24699;
+    public long l24700;
+    public long l24701;
+    public long l24702;
+    public long l24703;
+    public long l24704;
+    public long l24705;
+    public long l24706;
+    public long l24707;
+    public long l24708;
+    public long l24709;
+    public long l24710;
+    public long l24711;
+    public long l24712;
+    public long l24713;
+    public long l24714;
+    public long l24715;
+    public long l24716;
+    public long l24717;
+    public long l24718;
+    public long l24719;
+    public long l24720;
+    public long l24721;
+    public long l24722;
+    public long l24723;
+    public long l24724;
+    public long l24725;
+    public long l24726;
+    public long l24727;
+    public long l24728;
+    public long l24729;
+    public long l24730;
+    public long l24731;
+    public long l24732;
+    public long l24733;
+    public long l24734;
+    public long l24735;
+    public long l24736;
+    public long l24737;
+    public long l24738;
+    public long l24739;
+    public long l24740;
+    public long l24741;
+    public long l24742;
+    public long l24743;
+    public long l24744;
+    public long l24745;
+    public long l24746;
+    public long l24747;
+    public long l24748;
+    public long l24749;
+    public long l24750;
+    public long l24751;
+    public long l24752;
+    public long l24753;
+    public long l24754;
+    public long l24755;
+    public long l24756;
+    public long l24757;
+    public long l24758;
+    public long l24759;
+    public long l24760;
+    public long l24761;
+    public long l24762;
+    public long l24763;
+    public long l24764;
+    public long l24765;
+    public long l24766;
+    public long l24767;
+    public long l24768;
+    public long l24769;
+    public long l24770;
+    public long l24771;
+    public long l24772;
+    public long l24773;
+    public long l24774;
+    public long l24775;
+    public long l24776;
+    public long l24777;
+    public long l24778;
+    public long l24779;
+    public long l24780;
+    public long l24781;
+    public long l24782;
+    public long l24783;
+    public long l24784;
+    public long l24785;
+    public long l24786;
+    public long l24787;
+    public long l24788;
+    public long l24789;
+    public long l24790;
+    public long l24791;
+    public long l24792;
+    public long l24793;
+    public long l24794;
+    public long l24795;
+    public long l24796;
+    public long l24797;
+    public long l24798;
+    public long l24799;
+    public long l24800;
+    public long l24801;
+    public long l24802;
+    public long l24803;
+    public long l24804;
+    public long l24805;
+    public long l24806;
+    public long l24807;
+    public long l24808;
+    public long l24809;
+    public long l24810;
+    public long l24811;
+    public long l24812;
+    public long l24813;
+    public long l24814;
+    public long l24815;
+    public long l24816;
+    public long l24817;
+    public long l24818;
+    public long l24819;
+    public long l24820;
+    public long l24821;
+    public long l24822;
+    public long l24823;
+    public long l24824;
+    public long l24825;
+    public long l24826;
+    public long l24827;
+    public long l24828;
+    public long l24829;
+    public long l24830;
+    public long l24831;
+    public long l24832;
+    public long l24833;
+    public long l24834;
+    public long l24835;
+    public long l24836;
+    public long l24837;
+    public long l24838;
+    public long l24839;
+    public long l24840;
+    public long l24841;
+    public long l24842;
+    public long l24843;
+    public long l24844;
+    public long l24845;
+    public long l24846;
+    public long l24847;
+    public long l24848;
+    public long l24849;
+    public long l24850;
+    public long l24851;
+    public long l24852;
+    public long l24853;
+    public long l24854;
+    public long l24855;
+    public long l24856;
+    public long l24857;
+    public long l24858;
+    public long l24859;
+    public long l24860;
+    public long l24861;
+    public long l24862;
+    public long l24863;
+    public long l24864;
+    public long l24865;
+    public long l24866;
+    public long l24867;
+    public long l24868;
+    public long l24869;
+    public long l24870;
+    public long l24871;
+    public long l24872;
+    public long l24873;
+    public long l24874;
+    public long l24875;
+    public long l24876;
+    public long l24877;
+    public long l24878;
+    public long l24879;
+    public long l24880;
+    public long l24881;
+    public long l24882;
+    public long l24883;
+    public long l24884;
+    public long l24885;
+    public long l24886;
+    public long l24887;
+    public long l24888;
+    public long l24889;
+    public long l24890;
+    public long l24891;
+    public long l24892;
+    public long l24893;
+    public long l24894;
+    public long l24895;
+    public long l24896;
+    public long l24897;
+    public long l24898;
+    public long l24899;
+    public long l24900;
+    public long l24901;
+    public long l24902;
+    public long l24903;
+    public long l24904;
+    public long l24905;
+    public long l24906;
+    public long l24907;
+    public long l24908;
+    public long l24909;
+    public long l24910;
+    public long l24911;
+    public long l24912;
+    public long l24913;
+    public long l24914;
+    public long l24915;
+    public long l24916;
+    public long l24917;
+    public long l24918;
+    public long l24919;
+    public long l24920;
+    public long l24921;
+    public long l24922;
+    public long l24923;
+    public long l24924;
+    public long l24925;
+    public long l24926;
+    public long l24927;
+    public long l24928;
+    public long l24929;
+    public long l24930;
+    public long l24931;
+    public long l24932;
+    public long l24933;
+    public long l24934;
+    public long l24935;
+    public long l24936;
+    public long l24937;
+    public long l24938;
+    public long l24939;
+    public long l24940;
+    public long l24941;
+    public long l24942;
+    public long l24943;
+    public long l24944;
+    public long l24945;
+    public long l24946;
+    public long l24947;
+    public long l24948;
+    public long l24949;
+    public long l24950;
+    public long l24951;
+    public long l24952;
+    public long l24953;
+    public long l24954;
+    public long l24955;
+    public long l24956;
+    public long l24957;
+    public long l24958;
+    public long l24959;
+    public long l24960;
+    public long l24961;
+    public long l24962;
+    public long l24963;
+    public long l24964;
+    public long l24965;
+    public long l24966;
+    public long l24967;
+    public long l24968;
+    public long l24969;
+    public long l24970;
+    public long l24971;
+    public long l24972;
+    public long l24973;
+    public long l24974;
+    public long l24975;
+    public long l24976;
+    public long l24977;
+    public long l24978;
+    public long l24979;
+    public long l24980;
+    public long l24981;
+    public long l24982;
+    public long l24983;
+    public long l24984;
+    public long l24985;
+    public long l24986;
+    public long l24987;
+    public long l24988;
+    public long l24989;
+    public long l24990;
+    public long l24991;
+    public long l24992;
+    public long l24993;
+    public long l24994;
+    public long l24995;
+    public long l24996;
+    public long l24997;
+    public long l24998;
+    public long l24999;
+    public long l25000;
+    public long l25001;
+    public long l25002;
+    public long l25003;
+    public long l25004;
+    public long l25005;
+    public long l25006;
+    public long l25007;
+    public long l25008;
+    public long l25009;
+    public long l25010;
+    public long l25011;
+    public long l25012;
+    public long l25013;
+    public long l25014;
+    public long l25015;
+    public long l25016;
+    public long l25017;
+    public long l25018;
+    public long l25019;
+    public long l25020;
+    public long l25021;
+    public long l25022;
+    public long l25023;
+    public long l25024;
+    public long l25025;
+    public long l25026;
+    public long l25027;
+    public long l25028;
+    public long l25029;
+    public long l25030;
+    public long l25031;
+    public long l25032;
+    public long l25033;
+    public long l25034;
+    public long l25035;
+    public long l25036;
+    public long l25037;
+    public long l25038;
+    public long l25039;
+    public long l25040;
+    public long l25041;
+    public long l25042;
+    public long l25043;
+    public long l25044;
+    public long l25045;
+    public long l25046;
+    public long l25047;
+    public long l25048;
+    public long l25049;
+    public long l25050;
+    public long l25051;
+    public long l25052;
+    public long l25053;
+    public long l25054;
+    public long l25055;
+    public long l25056;
+    public long l25057;
+    public long l25058;
+    public long l25059;
+    public long l25060;
+    public long l25061;
+    public long l25062;
+    public long l25063;
+    public long l25064;
+    public long l25065;
+    public long l25066;
+    public long l25067;
+    public long l25068;
+    public long l25069;
+    public long l25070;
+    public long l25071;
+    public long l25072;
+    public long l25073;
+    public long l25074;
+    public long l25075;
+    public long l25076;
+    public long l25077;
+    public long l25078;
+    public long l25079;
+    public long l25080;
+    public long l25081;
+    public long l25082;
+    public long l25083;
+    public long l25084;
+    public long l25085;
+    public long l25086;
+    public long l25087;
+    public long l25088;
+    public long l25089;
+    public long l25090;
+    public long l25091;
+    public long l25092;
+    public long l25093;
+    public long l25094;
+    public long l25095;
+    public long l25096;
+    public long l25097;
+    public long l25098;
+    public long l25099;
+    public long l25100;
+    public long l25101;
+    public long l25102;
+    public long l25103;
+    public long l25104;
+    public long l25105;
+    public long l25106;
+    public long l25107;
+    public long l25108;
+    public long l25109;
+    public long l25110;
+    public long l25111;
+    public long l25112;
+    public long l25113;
+    public long l25114;
+    public long l25115;
+    public long l25116;
+    public long l25117;
+    public long l25118;
+    public long l25119;
+    public long l25120;
+    public long l25121;
+    public long l25122;
+    public long l25123;
+    public long l25124;
+    public long l25125;
+    public long l25126;
+    public long l25127;
+    public long l25128;
+    public long l25129;
+    public long l25130;
+    public long l25131;
+    public long l25132;
+    public long l25133;
+    public long l25134;
+    public long l25135;
+    public long l25136;
+    public long l25137;
+    public long l25138;
+    public long l25139;
+    public long l25140;
+    public long l25141;
+    public long l25142;
+    public long l25143;
+    public long l25144;
+    public long l25145;
+    public long l25146;
+    public long l25147;
+    public long l25148;
+    public long l25149;
+    public long l25150;
+    public long l25151;
+    public long l25152;
+    public long l25153;
+    public long l25154;
+    public long l25155;
+    public long l25156;
+    public long l25157;
+    public long l25158;
+    public long l25159;
+    public long l25160;
+    public long l25161;
+    public long l25162;
+    public long l25163;
+    public long l25164;
+    public long l25165;
+    public long l25166;
+    public long l25167;
+    public long l25168;
+    public long l25169;
+    public long l25170;
+    public long l25171;
+    public long l25172;
+    public long l25173;
+    public long l25174;
+    public long l25175;
+    public long l25176;
+    public long l25177;
+    public long l25178;
+    public long l25179;
+    public long l25180;
+    public long l25181;
+    public long l25182;
+    public long l25183;
+    public long l25184;
+    public long l25185;
+    public long l25186;
+    public long l25187;
+    public long l25188;
+    public long l25189;
+    public long l25190;
+    public long l25191;
+    public long l25192;
+    public long l25193;
+    public long l25194;
+    public long l25195;
+    public long l25196;
+    public long l25197;
+    public long l25198;
+    public long l25199;
+    public long l25200;
+    public long l25201;
+    public long l25202;
+    public long l25203;
+    public long l25204;
+    public long l25205;
+    public long l25206;
+    public long l25207;
+    public long l25208;
+    public long l25209;
+    public long l25210;
+    public long l25211;
+    public long l25212;
+    public long l25213;
+    public long l25214;
+    public long l25215;
+    public long l25216;
+    public long l25217;
+    public long l25218;
+    public long l25219;
+    public long l25220;
+    public long l25221;
+    public long l25222;
+    public long l25223;
+    public long l25224;
+    public long l25225;
+    public long l25226;
+    public long l25227;
+    public long l25228;
+    public long l25229;
+    public long l25230;
+    public long l25231;
+    public long l25232;
+    public long l25233;
+    public long l25234;
+    public long l25235;
+    public long l25236;
+    public long l25237;
+    public long l25238;
+    public long l25239;
+    public long l25240;
+    public long l25241;
+    public long l25242;
+    public long l25243;
+    public long l25244;
+    public long l25245;
+    public long l25246;
+    public long l25247;
+    public long l25248;
+    public long l25249;
+    public long l25250;
+    public long l25251;
+    public long l25252;
+    public long l25253;
+    public long l25254;
+    public long l25255;
+    public long l25256;
+    public long l25257;
+    public long l25258;
+    public long l25259;
+    public long l25260;
+    public long l25261;
+    public long l25262;
+    public long l25263;
+    public long l25264;
+    public long l25265;
+    public long l25266;
+    public long l25267;
+    public long l25268;
+    public long l25269;
+    public long l25270;
+    public long l25271;
+    public long l25272;
+    public long l25273;
+    public long l25274;
+    public long l25275;
+    public long l25276;
+    public long l25277;
+    public long l25278;
+    public long l25279;
+    public long l25280;
+    public long l25281;
+    public long l25282;
+    public long l25283;
+    public long l25284;
+    public long l25285;
+    public long l25286;
+    public long l25287;
+    public long l25288;
+    public long l25289;
+    public long l25290;
+    public long l25291;
+    public long l25292;
+    public long l25293;
+    public long l25294;
+    public long l25295;
+    public long l25296;
+    public long l25297;
+    public long l25298;
+    public long l25299;
+    public long l25300;
+    public long l25301;
+    public long l25302;
+    public long l25303;
+    public long l25304;
+    public long l25305;
+    public long l25306;
+    public long l25307;
+    public long l25308;
+    public long l25309;
+    public long l25310;
+    public long l25311;
+    public long l25312;
+    public long l25313;
+    public long l25314;
+    public long l25315;
+    public long l25316;
+    public long l25317;
+    public long l25318;
+    public long l25319;
+    public long l25320;
+    public long l25321;
+    public long l25322;
+    public long l25323;
+    public long l25324;
+    public long l25325;
+    public long l25326;
+    public long l25327;
+    public long l25328;
+    public long l25329;
+    public long l25330;
+    public long l25331;
+    public long l25332;
+    public long l25333;
+    public long l25334;
+    public long l25335;
+    public long l25336;
+    public long l25337;
+    public long l25338;
+    public long l25339;
+    public long l25340;
+    public long l25341;
+    public long l25342;
+    public long l25343;
+    public long l25344;
+    public long l25345;
+    public long l25346;
+    public long l25347;
+    public long l25348;
+    public long l25349;
+    public long l25350;
+    public long l25351;
+    public long l25352;
+    public long l25353;
+    public long l25354;
+    public long l25355;
+    public long l25356;
+    public long l25357;
+    public long l25358;
+    public long l25359;
+    public long l25360;
+    public long l25361;
+    public long l25362;
+    public long l25363;
+    public long l25364;
+    public long l25365;
+    public long l25366;
+    public long l25367;
+    public long l25368;
+    public long l25369;
+    public long l25370;
+    public long l25371;
+    public long l25372;
+    public long l25373;
+    public long l25374;
+    public long l25375;
+    public long l25376;
+    public long l25377;
+    public long l25378;
+    public long l25379;
+    public long l25380;
+    public long l25381;
+    public long l25382;
+    public long l25383;
+    public long l25384;
+    public long l25385;
+    public long l25386;
+    public long l25387;
+    public long l25388;
+    public long l25389;
+    public long l25390;
+    public long l25391;
+    public long l25392;
+    public long l25393;
+    public long l25394;
+    public long l25395;
+    public long l25396;
+    public long l25397;
+    public long l25398;
+    public long l25399;
+    public long l25400;
+    public long l25401;
+    public long l25402;
+    public long l25403;
+    public long l25404;
+    public long l25405;
+    public long l25406;
+    public long l25407;
+    public long l25408;
+    public long l25409;
+    public long l25410;
+    public long l25411;
+    public long l25412;
+    public long l25413;
+    public long l25414;
+    public long l25415;
+    public long l25416;
+    public long l25417;
+    public long l25418;
+    public long l25419;
+    public long l25420;
+    public long l25421;
+    public long l25422;
+    public long l25423;
+    public long l25424;
+    public long l25425;
+    public long l25426;
+    public long l25427;
+    public long l25428;
+    public long l25429;
+    public long l25430;
+    public long l25431;
+    public long l25432;
+    public long l25433;
+    public long l25434;
+    public long l25435;
+    public long l25436;
+    public long l25437;
+    public long l25438;
+    public long l25439;
+    public long l25440;
+    public long l25441;
+    public long l25442;
+    public long l25443;
+    public long l25444;
+    public long l25445;
+    public long l25446;
+    public long l25447;
+    public long l25448;
+    public long l25449;
+    public long l25450;
+    public long l25451;
+    public long l25452;
+    public long l25453;
+    public long l25454;
+    public long l25455;
+    public long l25456;
+    public long l25457;
+    public long l25458;
+    public long l25459;
+    public long l25460;
+    public long l25461;
+    public long l25462;
+    public long l25463;
+    public long l25464;
+    public long l25465;
+    public long l25466;
+    public long l25467;
+    public long l25468;
+    public long l25469;
+    public long l25470;
+    public long l25471;
+    public long l25472;
+    public long l25473;
+    public long l25474;
+    public long l25475;
+    public long l25476;
+    public long l25477;
+    public long l25478;
+    public long l25479;
+    public long l25480;
+    public long l25481;
+    public long l25482;
+    public long l25483;
+    public long l25484;
+    public long l25485;
+    public long l25486;
+    public long l25487;
+    public long l25488;
+    public long l25489;
+    public long l25490;
+    public long l25491;
+    public long l25492;
+    public long l25493;
+    public long l25494;
+    public long l25495;
+    public long l25496;
+    public long l25497;
+    public long l25498;
+    public long l25499;
+    public long l25500;
+    public long l25501;
+    public long l25502;
+    public long l25503;
+    public long l25504;
+    public long l25505;
+    public long l25506;
+    public long l25507;
+    public long l25508;
+    public long l25509;
+    public long l25510;
+    public long l25511;
+    public long l25512;
+    public long l25513;
+    public long l25514;
+    public long l25515;
+    public long l25516;
+    public long l25517;
+    public long l25518;
+    public long l25519;
+    public long l25520;
+    public long l25521;
+    public long l25522;
+    public long l25523;
+    public long l25524;
+    public long l25525;
+    public long l25526;
+    public long l25527;
+    public long l25528;
+    public long l25529;
+    public long l25530;
+    public long l25531;
+    public long l25532;
+    public long l25533;
+    public long l25534;
+    public long l25535;
+    public long l25536;
+    public long l25537;
+    public long l25538;
+    public long l25539;
+    public long l25540;
+    public long l25541;
+    public long l25542;
+    public long l25543;
+    public long l25544;
+    public long l25545;
+    public long l25546;
+    public long l25547;
+    public long l25548;
+    public long l25549;
+    public long l25550;
+    public long l25551;
+    public long l25552;
+    public long l25553;
+    public long l25554;
+    public long l25555;
+    public long l25556;
+    public long l25557;
+    public long l25558;
+    public long l25559;
+    public long l25560;
+    public long l25561;
+    public long l25562;
+    public long l25563;
+    public long l25564;
+    public long l25565;
+    public long l25566;
+    public long l25567;
+    public long l25568;
+    public long l25569;
+    public long l25570;
+    public long l25571;
+    public long l25572;
+    public long l25573;
+    public long l25574;
+    public long l25575;
+    public long l25576;
+    public long l25577;
+    public long l25578;
+    public long l25579;
+    public long l25580;
+    public long l25581;
+    public long l25582;
+    public long l25583;
+    public long l25584;
+    public long l25585;
+    public long l25586;
+    public long l25587;
+    public long l25588;
+    public long l25589;
+    public long l25590;
+    public long l25591;
+    public long l25592;
+    public long l25593;
+    public long l25594;
+    public long l25595;
+    public long l25596;
+    public long l25597;
+    public long l25598;
+    public long l25599;
+    public long l25600;
+    public long l25601;
+    public long l25602;
+    public long l25603;
+    public long l25604;
+    public long l25605;
+    public long l25606;
+    public long l25607;
+    public long l25608;
+    public long l25609;
+    public long l25610;
+    public long l25611;
+    public long l25612;
+    public long l25613;
+    public long l25614;
+    public long l25615;
+    public long l25616;
+    public long l25617;
+    public long l25618;
+    public long l25619;
+    public long l25620;
+    public long l25621;
+    public long l25622;
+    public long l25623;
+    public long l25624;
+    public long l25625;
+    public long l25626;
+    public long l25627;
+    public long l25628;
+    public long l25629;
+    public long l25630;
+    public long l25631;
+    public long l25632;
+    public long l25633;
+    public long l25634;
+    public long l25635;
+    public long l25636;
+    public long l25637;
+    public long l25638;
+    public long l25639;
+    public long l25640;
+    public long l25641;
+    public long l25642;
+    public long l25643;
+    public long l25644;
+    public long l25645;
+    public long l25646;
+    public long l25647;
+    public long l25648;
+    public long l25649;
+    public long l25650;
+    public long l25651;
+    public long l25652;
+    public long l25653;
+    public long l25654;
+    public long l25655;
+    public long l25656;
+    public long l25657;
+    public long l25658;
+    public long l25659;
+    public long l25660;
+    public long l25661;
+    public long l25662;
+    public long l25663;
+    public long l25664;
+    public long l25665;
+    public long l25666;
+    public long l25667;
+    public long l25668;
+    public long l25669;
+    public long l25670;
+    public long l25671;
+    public long l25672;
+    public long l25673;
+    public long l25674;
+    public long l25675;
+    public long l25676;
+    public long l25677;
+    public long l25678;
+    public long l25679;
+    public long l25680;
+    public long l25681;
+    public long l25682;
+    public long l25683;
+    public long l25684;
+    public long l25685;
+    public long l25686;
+    public long l25687;
+    public long l25688;
+    public long l25689;
+    public long l25690;
+    public long l25691;
+    public long l25692;
+    public long l25693;
+    public long l25694;
+    public long l25695;
+    public long l25696;
+    public long l25697;
+    public long l25698;
+    public long l25699;
+    public long l25700;
+    public long l25701;
+    public long l25702;
+    public long l25703;
+    public long l25704;
+    public long l25705;
+    public long l25706;
+    public long l25707;
+    public long l25708;
+    public long l25709;
+    public long l25710;
+    public long l25711;
+    public long l25712;
+    public long l25713;
+    public long l25714;
+    public long l25715;
+    public long l25716;
+    public long l25717;
+    public long l25718;
+    public long l25719;
+    public long l25720;
+    public long l25721;
+    public long l25722;
+    public long l25723;
+    public long l25724;
+    public long l25725;
+    public long l25726;
+    public long l25727;
+    public long l25728;
+    public long l25729;
+    public long l25730;
+    public long l25731;
+    public long l25732;
+    public long l25733;
+    public long l25734;
+    public long l25735;
+    public long l25736;
+    public long l25737;
+    public long l25738;
+    public long l25739;
+    public long l25740;
+    public long l25741;
+    public long l25742;
+    public long l25743;
+    public long l25744;
+    public long l25745;
+    public long l25746;
+    public long l25747;
+    public long l25748;
+    public long l25749;
+    public long l25750;
+    public long l25751;
+    public long l25752;
+    public long l25753;
+    public long l25754;
+    public long l25755;
+    public long l25756;
+    public long l25757;
+    public long l25758;
+    public long l25759;
+    public long l25760;
+    public long l25761;
+    public long l25762;
+    public long l25763;
+    public long l25764;
+    public long l25765;
+    public long l25766;
+    public long l25767;
+    public long l25768;
+    public long l25769;
+    public long l25770;
+    public long l25771;
+    public long l25772;
+    public long l25773;
+    public long l25774;
+    public long l25775;
+    public long l25776;
+    public long l25777;
+    public long l25778;
+    public long l25779;
+    public long l25780;
+    public long l25781;
+    public long l25782;
+    public long l25783;
+    public long l25784;
+    public long l25785;
+    public long l25786;
+    public long l25787;
+    public long l25788;
+    public long l25789;
+    public long l25790;
+    public long l25791;
+    public long l25792;
+    public long l25793;
+    public long l25794;
+    public long l25795;
+    public long l25796;
+    public long l25797;
+    public long l25798;
+    public long l25799;
+    public long l25800;
+    public long l25801;
+    public long l25802;
+    public long l25803;
+    public long l25804;
+    public long l25805;
+    public long l25806;
+    public long l25807;
+    public long l25808;
+    public long l25809;
+    public long l25810;
+    public long l25811;
+    public long l25812;
+    public long l25813;
+    public long l25814;
+    public long l25815;
+    public long l25816;
+    public long l25817;
+    public long l25818;
+    public long l25819;
+    public long l25820;
+    public long l25821;
+    public long l25822;
+    public long l25823;
+    public long l25824;
+    public long l25825;
+    public long l25826;
+    public long l25827;
+    public long l25828;
+    public long l25829;
+    public long l25830;
+    public long l25831;
+    public long l25832;
+    public long l25833;
+    public long l25834;
+    public long l25835;
+    public long l25836;
+    public long l25837;
+    public long l25838;
+    public long l25839;
+    public long l25840;
+    public long l25841;
+    public long l25842;
+    public long l25843;
+    public long l25844;
+    public long l25845;
+    public long l25846;
+    public long l25847;
+    public long l25848;
+    public long l25849;
+    public long l25850;
+    public long l25851;
+    public long l25852;
+    public long l25853;
+    public long l25854;
+    public long l25855;
+    public long l25856;
+    public long l25857;
+    public long l25858;
+    public long l25859;
+    public long l25860;
+    public long l25861;
+    public long l25862;
+    public long l25863;
+    public long l25864;
+    public long l25865;
+    public long l25866;
+    public long l25867;
+    public long l25868;
+    public long l25869;
+    public long l25870;
+    public long l25871;
+    public long l25872;
+    public long l25873;
+    public long l25874;
+    public long l25875;
+    public long l25876;
+    public long l25877;
+    public long l25878;
+    public long l25879;
+    public long l25880;
+    public long l25881;
+    public long l25882;
+    public long l25883;
+    public long l25884;
+    public long l25885;
+    public long l25886;
+    public long l25887;
+    public long l25888;
+    public long l25889;
+    public long l25890;
+    public long l25891;
+    public long l25892;
+    public long l25893;
+    public long l25894;
+    public long l25895;
+    public long l25896;
+    public long l25897;
+    public long l25898;
+    public long l25899;
+    public long l25900;
+    public long l25901;
+    public long l25902;
+    public long l25903;
+    public long l25904;
+    public long l25905;
+    public long l25906;
+    public long l25907;
+    public long l25908;
+    public long l25909;
+    public long l25910;
+    public long l25911;
+    public long l25912;
+    public long l25913;
+    public long l25914;
+    public long l25915;
+    public long l25916;
+    public long l25917;
+    public long l25918;
+    public long l25919;
+    public long l25920;
+    public long l25921;
+    public long l25922;
+    public long l25923;
+    public long l25924;
+    public long l25925;
+    public long l25926;
+    public long l25927;
+    public long l25928;
+    public long l25929;
+    public long l25930;
+    public long l25931;
+    public long l25932;
+    public long l25933;
+    public long l25934;
+    public long l25935;
+    public long l25936;
+    public long l25937;
+    public long l25938;
+    public long l25939;
+    public long l25940;
+    public long l25941;
+    public long l25942;
+    public long l25943;
+    public long l25944;
+    public long l25945;
+    public long l25946;
+    public long l25947;
+    public long l25948;
+    public long l25949;
+    public long l25950;
+    public long l25951;
+    public long l25952;
+    public long l25953;
+    public long l25954;
+    public long l25955;
+    public long l25956;
+    public long l25957;
+    public long l25958;
+    public long l25959;
+    public long l25960;
+    public long l25961;
+    public long l25962;
+    public long l25963;
+    public long l25964;
+    public long l25965;
+    public long l25966;
+    public long l25967;
+    public long l25968;
+    public long l25969;
+    public long l25970;
+    public long l25971;
+    public long l25972;
+    public long l25973;
+    public long l25974;
+    public long l25975;
+    public long l25976;
+    public long l25977;
+    public long l25978;
+    public long l25979;
+    public long l25980;
+    public long l25981;
+    public long l25982;
+    public long l25983;
+    public long l25984;
+    public long l25985;
+    public long l25986;
+    public long l25987;
+    public long l25988;
+    public long l25989;
+    public long l25990;
+    public long l25991;
+    public long l25992;
+    public long l25993;
+    public long l25994;
+    public long l25995;
+    public long l25996;
+    public long l25997;
+    public long l25998;
+    public long l25999;
+    public long l26000;
+    public long l26001;
+    public long l26002;
+    public long l26003;
+    public long l26004;
+    public long l26005;
+    public long l26006;
+    public long l26007;
+    public long l26008;
+    public long l26009;
+    public long l26010;
+    public long l26011;
+    public long l26012;
+    public long l26013;
+    public long l26014;
+    public long l26015;
+    public long l26016;
+    public long l26017;
+    public long l26018;
+    public long l26019;
+    public long l26020;
+    public long l26021;
+    public long l26022;
+    public long l26023;
+    public long l26024;
+    public long l26025;
+    public long l26026;
+    public long l26027;
+    public long l26028;
+    public long l26029;
+    public long l26030;
+    public long l26031;
+    public long l26032;
+    public long l26033;
+    public long l26034;
+    public long l26035;
+    public long l26036;
+    public long l26037;
+    public long l26038;
+    public long l26039;
+    public long l26040;
+    public long l26041;
+    public long l26042;
+    public long l26043;
+    public long l26044;
+    public long l26045;
+    public long l26046;
+    public long l26047;
+    public long l26048;
+    public long l26049;
+    public long l26050;
+    public long l26051;
+    public long l26052;
+    public long l26053;
+    public long l26054;
+    public long l26055;
+    public long l26056;
+    public long l26057;
+    public long l26058;
+    public long l26059;
+    public long l26060;
+    public long l26061;
+    public long l26062;
+    public long l26063;
+    public long l26064;
+    public long l26065;
+    public long l26066;
+    public long l26067;
+    public long l26068;
+    public long l26069;
+    public long l26070;
+    public long l26071;
+    public long l26072;
+    public long l26073;
+    public long l26074;
+    public long l26075;
+    public long l26076;
+    public long l26077;
+    public long l26078;
+    public long l26079;
+    public long l26080;
+    public long l26081;
+    public long l26082;
+    public long l26083;
+    public long l26084;
+    public long l26085;
+    public long l26086;
+    public long l26087;
+    public long l26088;
+    public long l26089;
+    public long l26090;
+    public long l26091;
+    public long l26092;
+    public long l26093;
+    public long l26094;
+    public long l26095;
+    public long l26096;
+    public long l26097;
+    public long l26098;
+    public long l26099;
+    public long l26100;
+    public long l26101;
+    public long l26102;
+    public long l26103;
+    public long l26104;
+    public long l26105;
+    public long l26106;
+    public long l26107;
+    public long l26108;
+    public long l26109;
+    public long l26110;
+    public long l26111;
+    public long l26112;
+    public long l26113;
+    public long l26114;
+    public long l26115;
+    public long l26116;
+    public long l26117;
+    public long l26118;
+    public long l26119;
+    public long l26120;
+    public long l26121;
+    public long l26122;
+    public long l26123;
+    public long l26124;
+    public long l26125;
+    public long l26126;
+    public long l26127;
+    public long l26128;
+    public long l26129;
+    public long l26130;
+    public long l26131;
+    public long l26132;
+    public long l26133;
+    public long l26134;
+    public long l26135;
+    public long l26136;
+    public long l26137;
+    public long l26138;
+    public long l26139;
+    public long l26140;
+    public long l26141;
+    public long l26142;
+    public long l26143;
+    public long l26144;
+    public long l26145;
+    public long l26146;
+    public long l26147;
+    public long l26148;
+    public long l26149;
+    public long l26150;
+    public long l26151;
+    public long l26152;
+    public long l26153;
+    public long l26154;
+    public long l26155;
+    public long l26156;
+    public long l26157;
+    public long l26158;
+    public long l26159;
+    public long l26160;
+    public long l26161;
+    public long l26162;
+    public long l26163;
+    public long l26164;
+    public long l26165;
+    public long l26166;
+    public long l26167;
+    public long l26168;
+    public long l26169;
+    public long l26170;
+    public long l26171;
+    public long l26172;
+    public long l26173;
+    public long l26174;
+    public long l26175;
+    public long l26176;
+    public long l26177;
+    public long l26178;
+    public long l26179;
+    public long l26180;
+    public long l26181;
+    public long l26182;
+    public long l26183;
+    public long l26184;
+    public long l26185;
+    public long l26186;
+    public long l26187;
+    public long l26188;
+    public long l26189;
+    public long l26190;
+    public long l26191;
+    public long l26192;
+    public long l26193;
+    public long l26194;
+    public long l26195;
+    public long l26196;
+    public long l26197;
+    public long l26198;
+    public long l26199;
+    public long l26200;
+    public long l26201;
+    public long l26202;
+    public long l26203;
+    public long l26204;
+    public long l26205;
+    public long l26206;
+    public long l26207;
+    public long l26208;
+    public long l26209;
+    public long l26210;
+    public long l26211;
+    public long l26212;
+    public long l26213;
+    public long l26214;
+    public long l26215;
+    public long l26216;
+    public long l26217;
+    public long l26218;
+    public long l26219;
+    public long l26220;
+    public long l26221;
+    public long l26222;
+    public long l26223;
+    public long l26224;
+    public long l26225;
+    public long l26226;
+    public long l26227;
+    public long l26228;
+    public long l26229;
+    public long l26230;
+    public long l26231;
+    public long l26232;
+    public long l26233;
+    public long l26234;
+    public long l26235;
+    public long l26236;
+    public long l26237;
+    public long l26238;
+    public long l26239;
+    public long l26240;
+    public long l26241;
+    public long l26242;
+    public long l26243;
+    public long l26244;
+    public long l26245;
+    public long l26246;
+    public long l26247;
+    public long l26248;
+    public long l26249;
+    public long l26250;
+    public long l26251;
+    public long l26252;
+    public long l26253;
+    public long l26254;
+    public long l26255;
+    public long l26256;
+    public long l26257;
+    public long l26258;
+    public long l26259;
+    public long l26260;
+    public long l26261;
+    public long l26262;
+    public long l26263;
+    public long l26264;
+    public long l26265;
+    public long l26266;
+    public long l26267;
+    public long l26268;
+    public long l26269;
+    public long l26270;
+    public long l26271;
+    public long l26272;
+    public long l26273;
+    public long l26274;
+    public long l26275;
+    public long l26276;
+    public long l26277;
+    public long l26278;
+    public long l26279;
+    public long l26280;
+    public long l26281;
+    public long l26282;
+    public long l26283;
+    public long l26284;
+    public long l26285;
+    public long l26286;
+    public long l26287;
+    public long l26288;
+    public long l26289;
+    public long l26290;
+    public long l26291;
+    public long l26292;
+    public long l26293;
+    public long l26294;
+    public long l26295;
+    public long l26296;
+    public long l26297;
+    public long l26298;
+    public long l26299;
+    public long l26300;
+    public long l26301;
+    public long l26302;
+    public long l26303;
+    public long l26304;
+    public long l26305;
+    public long l26306;
+    public long l26307;
+    public long l26308;
+    public long l26309;
+    public long l26310;
+    public long l26311;
+    public long l26312;
+    public long l26313;
+    public long l26314;
+    public long l26315;
+    public long l26316;
+    public long l26317;
+    public long l26318;
+    public long l26319;
+    public long l26320;
+    public long l26321;
+    public long l26322;
+    public long l26323;
+    public long l26324;
+    public long l26325;
+    public long l26326;
+    public long l26327;
+    public long l26328;
+    public long l26329;
+    public long l26330;
+    public long l26331;
+    public long l26332;
+    public long l26333;
+    public long l26334;
+    public long l26335;
+    public long l26336;
+    public long l26337;
+    public long l26338;
+    public long l26339;
+    public long l26340;
+    public long l26341;
+    public long l26342;
+    public long l26343;
+    public long l26344;
+    public long l26345;
+    public long l26346;
+    public long l26347;
+    public long l26348;
+    public long l26349;
+    public long l26350;
+    public long l26351;
+    public long l26352;
+    public long l26353;
+    public long l26354;
+    public long l26355;
+    public long l26356;
+    public long l26357;
+    public long l26358;
+    public long l26359;
+    public long l26360;
+    public long l26361;
+    public long l26362;
+    public long l26363;
+    public long l26364;
+    public long l26365;
+    public long l26366;
+    public long l26367;
+    public long l26368;
+    public long l26369;
+    public long l26370;
+    public long l26371;
+    public long l26372;
+    public long l26373;
+    public long l26374;
+    public long l26375;
+    public long l26376;
+    public long l26377;
+    public long l26378;
+    public long l26379;
+    public long l26380;
+    public long l26381;
+    public long l26382;
+    public long l26383;
+    public long l26384;
+    public long l26385;
+    public long l26386;
+    public long l26387;
+    public long l26388;
+    public long l26389;
+    public long l26390;
+    public long l26391;
+    public long l26392;
+    public long l26393;
+    public long l26394;
+    public long l26395;
+    public long l26396;
+    public long l26397;
+    public long l26398;
+    public long l26399;
+    public long l26400;
+    public long l26401;
+    public long l26402;
+    public long l26403;
+    public long l26404;
+    public long l26405;
+    public long l26406;
+    public long l26407;
+    public long l26408;
+    public long l26409;
+    public long l26410;
+    public long l26411;
+    public long l26412;
+    public long l26413;
+    public long l26414;
+    public long l26415;
+    public long l26416;
+    public long l26417;
+    public long l26418;
+    public long l26419;
+    public long l26420;
+    public long l26421;
+    public long l26422;
+    public long l26423;
+    public long l26424;
+    public long l26425;
+    public long l26426;
+    public long l26427;
+    public long l26428;
+    public long l26429;
+    public long l26430;
+    public long l26431;
+    public long l26432;
+    public long l26433;
+    public long l26434;
+    public long l26435;
+    public long l26436;
+    public long l26437;
+    public long l26438;
+    public long l26439;
+    public long l26440;
+    public long l26441;
+    public long l26442;
+    public long l26443;
+    public long l26444;
+    public long l26445;
+    public long l26446;
+    public long l26447;
+    public long l26448;
+    public long l26449;
+    public long l26450;
+    public long l26451;
+    public long l26452;
+    public long l26453;
+    public long l26454;
+    public long l26455;
+    public long l26456;
+    public long l26457;
+    public long l26458;
+    public long l26459;
+    public long l26460;
+    public long l26461;
+    public long l26462;
+    public long l26463;
+    public long l26464;
+    public long l26465;
+    public long l26466;
+    public long l26467;
+    public long l26468;
+    public long l26469;
+    public long l26470;
+    public long l26471;
+    public long l26472;
+    public long l26473;
+    public long l26474;
+    public long l26475;
+    public long l26476;
+    public long l26477;
+    public long l26478;
+    public long l26479;
+    public long l26480;
+    public long l26481;
+    public long l26482;
+    public long l26483;
+    public long l26484;
+    public long l26485;
+    public long l26486;
+    public long l26487;
+    public long l26488;
+    public long l26489;
+    public long l26490;
+    public long l26491;
+    public long l26492;
+    public long l26493;
+    public long l26494;
+    public long l26495;
+    public long l26496;
+    public long l26497;
+    public long l26498;
+    public long l26499;
+    public long l26500;
+    public long l26501;
+    public long l26502;
+    public long l26503;
+    public long l26504;
+    public long l26505;
+    public long l26506;
+    public long l26507;
+    public long l26508;
+    public long l26509;
+    public long l26510;
+    public long l26511;
+    public long l26512;
+    public long l26513;
+    public long l26514;
+    public long l26515;
+    public long l26516;
+    public long l26517;
+    public long l26518;
+    public long l26519;
+    public long l26520;
+    public long l26521;
+    public long l26522;
+    public long l26523;
+    public long l26524;
+    public long l26525;
+    public long l26526;
+    public long l26527;
+    public long l26528;
+    public long l26529;
+    public long l26530;
+    public long l26531;
+    public long l26532;
+    public long l26533;
+    public long l26534;
+    public long l26535;
+    public long l26536;
+    public long l26537;
+    public long l26538;
+    public long l26539;
+    public long l26540;
+    public long l26541;
+    public long l26542;
+    public long l26543;
+    public long l26544;
+    public long l26545;
+    public long l26546;
+    public long l26547;
+    public long l26548;
+    public long l26549;
+    public long l26550;
+    public long l26551;
+    public long l26552;
+    public long l26553;
+    public long l26554;
+    public long l26555;
+    public long l26556;
+    public long l26557;
+    public long l26558;
+    public long l26559;
+    public long l26560;
+    public long l26561;
+    public long l26562;
+    public long l26563;
+    public long l26564;
+    public long l26565;
+    public long l26566;
+    public long l26567;
+    public long l26568;
+    public long l26569;
+    public long l26570;
+    public long l26571;
+    public long l26572;
+    public long l26573;
+    public long l26574;
+    public long l26575;
+    public long l26576;
+    public long l26577;
+    public long l26578;
+    public long l26579;
+    public long l26580;
+    public long l26581;
+    public long l26582;
+    public long l26583;
+    public long l26584;
+    public long l26585;
+    public long l26586;
+    public long l26587;
+    public long l26588;
+    public long l26589;
+    public long l26590;
+    public long l26591;
+    public long l26592;
+    public long l26593;
+    public long l26594;
+    public long l26595;
+    public long l26596;
+    public long l26597;
+    public long l26598;
+    public long l26599;
+    public long l26600;
+    public long l26601;
+    public long l26602;
+    public long l26603;
+    public long l26604;
+    public long l26605;
+    public long l26606;
+    public long l26607;
+    public long l26608;
+    public long l26609;
+    public long l26610;
+    public long l26611;
+    public long l26612;
+    public long l26613;
+    public long l26614;
+    public long l26615;
+    public long l26616;
+    public long l26617;
+    public long l26618;
+    public long l26619;
+    public long l26620;
+    public long l26621;
+    public long l26622;
+    public long l26623;
+    public long l26624;
+    public long l26625;
+    public long l26626;
+    public long l26627;
+    public long l26628;
+    public long l26629;
+    public long l26630;
+    public long l26631;
+    public long l26632;
+    public long l26633;
+    public long l26634;
+    public long l26635;
+    public long l26636;
+    public long l26637;
+    public long l26638;
+    public long l26639;
+    public long l26640;
+    public long l26641;
+    public long l26642;
+    public long l26643;
+    public long l26644;
+    public long l26645;
+    public long l26646;
+    public long l26647;
+    public long l26648;
+    public long l26649;
+    public long l26650;
+    public long l26651;
+    public long l26652;
+    public long l26653;
+    public long l26654;
+    public long l26655;
+    public long l26656;
+    public long l26657;
+    public long l26658;
+    public long l26659;
+    public long l26660;
+    public long l26661;
+    public long l26662;
+    public long l26663;
+    public long l26664;
+    public long l26665;
+    public long l26666;
+    public long l26667;
+    public long l26668;
+    public long l26669;
+    public long l26670;
+    public long l26671;
+    public long l26672;
+    public long l26673;
+    public long l26674;
+    public long l26675;
+    public long l26676;
+    public long l26677;
+    public long l26678;
+    public long l26679;
+    public long l26680;
+    public long l26681;
+    public long l26682;
+    public long l26683;
+    public long l26684;
+    public long l26685;
+    public long l26686;
+    public long l26687;
+    public long l26688;
+    public long l26689;
+    public long l26690;
+    public long l26691;
+    public long l26692;
+    public long l26693;
+    public long l26694;
+    public long l26695;
+    public long l26696;
+    public long l26697;
+    public long l26698;
+    public long l26699;
+    public long l26700;
+    public long l26701;
+    public long l26702;
+    public long l26703;
+    public long l26704;
+    public long l26705;
+    public long l26706;
+    public long l26707;
+    public long l26708;
+    public long l26709;
+    public long l26710;
+    public long l26711;
+    public long l26712;
+    public long l26713;
+    public long l26714;
+    public long l26715;
+    public long l26716;
+    public long l26717;
+    public long l26718;
+    public long l26719;
+    public long l26720;
+    public long l26721;
+    public long l26722;
+    public long l26723;
+    public long l26724;
+    public long l26725;
+    public long l26726;
+    public long l26727;
+    public long l26728;
+    public long l26729;
+    public long l26730;
+    public long l26731;
+    public long l26732;
+    public long l26733;
+    public long l26734;
+    public long l26735;
+    public long l26736;
+    public long l26737;
+    public long l26738;
+    public long l26739;
+    public long l26740;
+    public long l26741;
+    public long l26742;
+    public long l26743;
+    public long l26744;
+    public long l26745;
+    public long l26746;
+    public long l26747;
+    public long l26748;
+    public long l26749;
+    public long l26750;
+    public long l26751;
+    public long l26752;
+    public long l26753;
+    public long l26754;
+    public long l26755;
+    public long l26756;
+    public long l26757;
+    public long l26758;
+    public long l26759;
+    public long l26760;
+    public long l26761;
+    public long l26762;
+    public long l26763;
+    public long l26764;
+    public long l26765;
+    public long l26766;
+    public long l26767;
+    public long l26768;
+    public long l26769;
+    public long l26770;
+    public long l26771;
+    public long l26772;
+    public long l26773;
+    public long l26774;
+    public long l26775;
+    public long l26776;
+    public long l26777;
+    public long l26778;
+    public long l26779;
+    public long l26780;
+    public long l26781;
+    public long l26782;
+    public long l26783;
+    public long l26784;
+    public long l26785;
+    public long l26786;
+    public long l26787;
+    public long l26788;
+    public long l26789;
+    public long l26790;
+    public long l26791;
+    public long l26792;
+    public long l26793;
+    public long l26794;
+    public long l26795;
+    public long l26796;
+    public long l26797;
+    public long l26798;
+    public long l26799;
+    public long l26800;
+    public long l26801;
+    public long l26802;
+    public long l26803;
+    public long l26804;
+    public long l26805;
+    public long l26806;
+    public long l26807;
+    public long l26808;
+    public long l26809;
+    public long l26810;
+    public long l26811;
+    public long l26812;
+    public long l26813;
+    public long l26814;
+    public long l26815;
+    public long l26816;
+    public long l26817;
+    public long l26818;
+    public long l26819;
+    public long l26820;
+    public long l26821;
+    public long l26822;
+    public long l26823;
+    public long l26824;
+    public long l26825;
+    public long l26826;
+    public long l26827;
+    public long l26828;
+    public long l26829;
+    public long l26830;
+    public long l26831;
+    public long l26832;
+    public long l26833;
+    public long l26834;
+    public long l26835;
+    public long l26836;
+    public long l26837;
+    public long l26838;
+    public long l26839;
+    public long l26840;
+    public long l26841;
+    public long l26842;
+    public long l26843;
+    public long l26844;
+    public long l26845;
+    public long l26846;
+    public long l26847;
+    public long l26848;
+    public long l26849;
+    public long l26850;
+    public long l26851;
+    public long l26852;
+    public long l26853;
+    public long l26854;
+    public long l26855;
+    public long l26856;
+    public long l26857;
+    public long l26858;
+    public long l26859;
+    public long l26860;
+    public long l26861;
+    public long l26862;
+    public long l26863;
+    public long l26864;
+    public long l26865;
+    public long l26866;
+    public long l26867;
+    public long l26868;
+    public long l26869;
+    public long l26870;
+    public long l26871;
+    public long l26872;
+    public long l26873;
+    public long l26874;
+    public long l26875;
+    public long l26876;
+    public long l26877;
+    public long l26878;
+    public long l26879;
+    public long l26880;
+    public long l26881;
+    public long l26882;
+    public long l26883;
+    public long l26884;
+    public long l26885;
+    public long l26886;
+    public long l26887;
+    public long l26888;
+    public long l26889;
+    public long l26890;
+    public long l26891;
+    public long l26892;
+    public long l26893;
+    public long l26894;
+    public long l26895;
+    public long l26896;
+    public long l26897;
+    public long l26898;
+    public long l26899;
+    public long l26900;
+    public long l26901;
+    public long l26902;
+    public long l26903;
+    public long l26904;
+    public long l26905;
+    public long l26906;
+    public long l26907;
+    public long l26908;
+    public long l26909;
+    public long l26910;
+    public long l26911;
+    public long l26912;
+    public long l26913;
+    public long l26914;
+    public long l26915;
+    public long l26916;
+    public long l26917;
+    public long l26918;
+    public long l26919;
+    public long l26920;
+    public long l26921;
+    public long l26922;
+    public long l26923;
+    public long l26924;
+    public long l26925;
+    public long l26926;
+    public long l26927;
+    public long l26928;
+    public long l26929;
+    public long l26930;
+    public long l26931;
+    public long l26932;
+    public long l26933;
+    public long l26934;
+    public long l26935;
+    public long l26936;
+    public long l26937;
+    public long l26938;
+    public long l26939;
+    public long l26940;
+    public long l26941;
+    public long l26942;
+    public long l26943;
+    public long l26944;
+    public long l26945;
+    public long l26946;
+    public long l26947;
+    public long l26948;
+    public long l26949;
+    public long l26950;
+    public long l26951;
+    public long l26952;
+    public long l26953;
+    public long l26954;
+    public long l26955;
+    public long l26956;
+    public long l26957;
+    public long l26958;
+    public long l26959;
+    public long l26960;
+    public long l26961;
+    public long l26962;
+    public long l26963;
+    public long l26964;
+    public long l26965;
+    public long l26966;
+    public long l26967;
+    public long l26968;
+    public long l26969;
+    public long l26970;
+    public long l26971;
+    public long l26972;
+    public long l26973;
+    public long l26974;
+    public long l26975;
+    public long l26976;
+    public long l26977;
+    public long l26978;
+    public long l26979;
+    public long l26980;
+    public long l26981;
+    public long l26982;
+    public long l26983;
+    public long l26984;
+    public long l26985;
+    public long l26986;
+    public long l26987;
+    public long l26988;
+    public long l26989;
+    public long l26990;
+    public long l26991;
+    public long l26992;
+    public long l26993;
+    public long l26994;
+    public long l26995;
+    public long l26996;
+    public long l26997;
+    public long l26998;
+    public long l26999;
+    public long l27000;
+    public long l27001;
+    public long l27002;
+    public long l27003;
+    public long l27004;
+    public long l27005;
+    public long l27006;
+    public long l27007;
+    public long l27008;
+    public long l27009;
+    public long l27010;
+    public long l27011;
+    public long l27012;
+    public long l27013;
+    public long l27014;
+    public long l27015;
+    public long l27016;
+    public long l27017;
+    public long l27018;
+    public long l27019;
+    public long l27020;
+    public long l27021;
+    public long l27022;
+    public long l27023;
+    public long l27024;
+    public long l27025;
+    public long l27026;
+    public long l27027;
+    public long l27028;
+    public long l27029;
+    public long l27030;
+    public long l27031;
+    public long l27032;
+    public long l27033;
+    public long l27034;
+    public long l27035;
+    public long l27036;
+    public long l27037;
+    public long l27038;
+    public long l27039;
+    public long l27040;
+    public long l27041;
+    public long l27042;
+    public long l27043;
+    public long l27044;
+    public long l27045;
+    public long l27046;
+    public long l27047;
+    public long l27048;
+    public long l27049;
+    public long l27050;
+    public long l27051;
+    public long l27052;
+    public long l27053;
+    public long l27054;
+    public long l27055;
+    public long l27056;
+    public long l27057;
+    public long l27058;
+    public long l27059;
+    public long l27060;
+    public long l27061;
+    public long l27062;
+    public long l27063;
+    public long l27064;
+    public long l27065;
+    public long l27066;
+    public long l27067;
+    public long l27068;
+    public long l27069;
+    public long l27070;
+    public long l27071;
+    public long l27072;
+    public long l27073;
+    public long l27074;
+    public long l27075;
+    public long l27076;
+    public long l27077;
+    public long l27078;
+    public long l27079;
+    public long l27080;
+    public long l27081;
+    public long l27082;
+    public long l27083;
+    public long l27084;
+    public long l27085;
+    public long l27086;
+    public long l27087;
+    public long l27088;
+    public long l27089;
+    public long l27090;
+    public long l27091;
+    public long l27092;
+    public long l27093;
+    public long l27094;
+    public long l27095;
+    public long l27096;
+    public long l27097;
+    public long l27098;
+    public long l27099;
+    public long l27100;
+    public long l27101;
+    public long l27102;
+    public long l27103;
+    public long l27104;
+    public long l27105;
+    public long l27106;
+    public long l27107;
+    public long l27108;
+    public long l27109;
+    public long l27110;
+    public long l27111;
+    public long l27112;
+    public long l27113;
+    public long l27114;
+    public long l27115;
+    public long l27116;
+    public long l27117;
+    public long l27118;
+    public long l27119;
+    public long l27120;
+    public long l27121;
+    public long l27122;
+    public long l27123;
+    public long l27124;
+    public long l27125;
+    public long l27126;
+    public long l27127;
+    public long l27128;
+    public long l27129;
+    public long l27130;
+    public long l27131;
+    public long l27132;
+    public long l27133;
+    public long l27134;
+    public long l27135;
+    public long l27136;
+    public long l27137;
+    public long l27138;
+    public long l27139;
+    public long l27140;
+    public long l27141;
+    public long l27142;
+    public long l27143;
+    public long l27144;
+    public long l27145;
+    public long l27146;
+    public long l27147;
+    public long l27148;
+    public long l27149;
+    public long l27150;
+    public long l27151;
+    public long l27152;
+    public long l27153;
+    public long l27154;
+    public long l27155;
+    public long l27156;
+    public long l27157;
+    public long l27158;
+    public long l27159;
+    public long l27160;
+    public long l27161;
+    public long l27162;
+    public long l27163;
+    public long l27164;
+    public long l27165;
+    public long l27166;
+    public long l27167;
+    public long l27168;
+    public long l27169;
+    public long l27170;
+    public long l27171;
+    public long l27172;
+    public long l27173;
+    public long l27174;
+    public long l27175;
+    public long l27176;
+    public long l27177;
+    public long l27178;
+    public long l27179;
+    public long l27180;
+    public long l27181;
+    public long l27182;
+    public long l27183;
+    public long l27184;
+    public long l27185;
+    public long l27186;
+    public long l27187;
+    public long l27188;
+    public long l27189;
+    public long l27190;
+    public long l27191;
+    public long l27192;
+    public long l27193;
+    public long l27194;
+    public long l27195;
+    public long l27196;
+    public long l27197;
+    public long l27198;
+    public long l27199;
+    public long l27200;
+    public long l27201;
+    public long l27202;
+    public long l27203;
+    public long l27204;
+    public long l27205;
+    public long l27206;
+    public long l27207;
+    public long l27208;
+    public long l27209;
+    public long l27210;
+    public long l27211;
+    public long l27212;
+    public long l27213;
+    public long l27214;
+    public long l27215;
+    public long l27216;
+    public long l27217;
+    public long l27218;
+    public long l27219;
+    public long l27220;
+    public long l27221;
+    public long l27222;
+    public long l27223;
+    public long l27224;
+    public long l27225;
+    public long l27226;
+    public long l27227;
+    public long l27228;
+    public long l27229;
+    public long l27230;
+    public long l27231;
+    public long l27232;
+    public long l27233;
+    public long l27234;
+    public long l27235;
+    public long l27236;
+    public long l27237;
+    public long l27238;
+    public long l27239;
+    public long l27240;
+    public long l27241;
+    public long l27242;
+    public long l27243;
+    public long l27244;
+    public long l27245;
+    public long l27246;
+    public long l27247;
+    public long l27248;
+    public long l27249;
+    public long l27250;
+    public long l27251;
+    public long l27252;
+    public long l27253;
+    public long l27254;
+    public long l27255;
+    public long l27256;
+    public long l27257;
+    public long l27258;
+    public long l27259;
+    public long l27260;
+    public long l27261;
+    public long l27262;
+    public long l27263;
+    public long l27264;
+    public long l27265;
+    public long l27266;
+    public long l27267;
+    public long l27268;
+    public long l27269;
+    public long l27270;
+    public long l27271;
+    public long l27272;
+    public long l27273;
+    public long l27274;
+    public long l27275;
+    public long l27276;
+    public long l27277;
+    public long l27278;
+    public long l27279;
+    public long l27280;
+    public long l27281;
+    public long l27282;
+    public long l27283;
+    public long l27284;
+    public long l27285;
+    public long l27286;
+    public long l27287;
+    public long l27288;
+    public long l27289;
+    public long l27290;
+    public long l27291;
+    public long l27292;
+    public long l27293;
+    public long l27294;
+    public long l27295;
+    public long l27296;
+    public long l27297;
+    public long l27298;
+    public long l27299;
+    public long l27300;
+    public long l27301;
+    public long l27302;
+    public long l27303;
+    public long l27304;
+    public long l27305;
+    public long l27306;
+    public long l27307;
+    public long l27308;
+    public long l27309;
+    public long l27310;
+    public long l27311;
+    public long l27312;
+    public long l27313;
+    public long l27314;
+    public long l27315;
+    public long l27316;
+    public long l27317;
+    public long l27318;
+    public long l27319;
+    public long l27320;
+    public long l27321;
+    public long l27322;
+    public long l27323;
+    public long l27324;
+    public long l27325;
+    public long l27326;
+    public long l27327;
+    public long l27328;
+    public long l27329;
+    public long l27330;
+    public long l27331;
+    public long l27332;
+    public long l27333;
+    public long l27334;
+    public long l27335;
+    public long l27336;
+    public long l27337;
+    public long l27338;
+    public long l27339;
+    public long l27340;
+    public long l27341;
+    public long l27342;
+    public long l27343;
+    public long l27344;
+    public long l27345;
+    public long l27346;
+    public long l27347;
+    public long l27348;
+    public long l27349;
+    public long l27350;
+    public long l27351;
+    public long l27352;
+    public long l27353;
+    public long l27354;
+    public long l27355;
+    public long l27356;
+    public long l27357;
+    public long l27358;
+    public long l27359;
+    public long l27360;
+    public long l27361;
+    public long l27362;
+    public long l27363;
+    public long l27364;
+    public long l27365;
+    public long l27366;
+    public long l27367;
+    public long l27368;
+    public long l27369;
+    public long l27370;
+    public long l27371;
+    public long l27372;
+    public long l27373;
+    public long l27374;
+    public long l27375;
+    public long l27376;
+    public long l27377;
+    public long l27378;
+    public long l27379;
+    public long l27380;
+    public long l27381;
+    public long l27382;
+    public long l27383;
+    public long l27384;
+    public long l27385;
+    public long l27386;
+    public long l27387;
+    public long l27388;
+    public long l27389;
+    public long l27390;
+    public long l27391;
+    public long l27392;
+    public long l27393;
+    public long l27394;
+    public long l27395;
+    public long l27396;
+    public long l27397;
+    public long l27398;
+    public long l27399;
+    public long l27400;
+    public long l27401;
+    public long l27402;
+    public long l27403;
+    public long l27404;
+    public long l27405;
+    public long l27406;
+    public long l27407;
+    public long l27408;
+    public long l27409;
+    public long l27410;
+    public long l27411;
+    public long l27412;
+    public long l27413;
+    public long l27414;
+    public long l27415;
+    public long l27416;
+    public long l27417;
+    public long l27418;
+    public long l27419;
+    public long l27420;
+    public long l27421;
+    public long l27422;
+    public long l27423;
+    public long l27424;
+    public long l27425;
+    public long l27426;
+    public long l27427;
+    public long l27428;
+    public long l27429;
+    public long l27430;
+    public long l27431;
+    public long l27432;
+    public long l27433;
+    public long l27434;
+    public long l27435;
+    public long l27436;
+    public long l27437;
+    public long l27438;
+    public long l27439;
+    public long l27440;
+    public long l27441;
+    public long l27442;
+    public long l27443;
+    public long l27444;
+    public long l27445;
+    public long l27446;
+    public long l27447;
+    public long l27448;
+    public long l27449;
+    public long l27450;
+    public long l27451;
+    public long l27452;
+    public long l27453;
+    public long l27454;
+    public long l27455;
+    public long l27456;
+    public long l27457;
+    public long l27458;
+    public long l27459;
+    public long l27460;
+    public long l27461;
+    public long l27462;
+    public long l27463;
+    public long l27464;
+    public long l27465;
+    public long l27466;
+    public long l27467;
+    public long l27468;
+    public long l27469;
+    public long l27470;
+    public long l27471;
+    public long l27472;
+    public long l27473;
+    public long l27474;
+    public long l27475;
+    public long l27476;
+    public long l27477;
+    public long l27478;
+    public long l27479;
+    public long l27480;
+    public long l27481;
+    public long l27482;
+    public long l27483;
+    public long l27484;
+    public long l27485;
+    public long l27486;
+    public long l27487;
+    public long l27488;
+    public long l27489;
+    public long l27490;
+    public long l27491;
+    public long l27492;
+    public long l27493;
+    public long l27494;
+    public long l27495;
+    public long l27496;
+    public long l27497;
+    public long l27498;
+    public long l27499;
+    public long l27500;
+    public long l27501;
+    public long l27502;
+    public long l27503;
+    public long l27504;
+    public long l27505;
+    public long l27506;
+    public long l27507;
+    public long l27508;
+    public long l27509;
+    public long l27510;
+    public long l27511;
+    public long l27512;
+    public long l27513;
+    public long l27514;
+    public long l27515;
+    public long l27516;
+    public long l27517;
+    public long l27518;
+    public long l27519;
+    public long l27520;
+    public long l27521;
+    public long l27522;
+    public long l27523;
+    public long l27524;
+    public long l27525;
+    public long l27526;
+    public long l27527;
+    public long l27528;
+    public long l27529;
+    public long l27530;
+    public long l27531;
+    public long l27532;
+    public long l27533;
+    public long l27534;
+    public long l27535;
+    public long l27536;
+    public long l27537;
+    public long l27538;
+    public long l27539;
+    public long l27540;
+    public long l27541;
+    public long l27542;
+    public long l27543;
+    public long l27544;
+    public long l27545;
+    public long l27546;
+    public long l27547;
+    public long l27548;
+    public long l27549;
+    public long l27550;
+    public long l27551;
+    public long l27552;
+    public long l27553;
+    public long l27554;
+    public long l27555;
+    public long l27556;
+    public long l27557;
+    public long l27558;
+    public long l27559;
+    public long l27560;
+    public long l27561;
+    public long l27562;
+    public long l27563;
+    public long l27564;
+    public long l27565;
+    public long l27566;
+    public long l27567;
+    public long l27568;
+    public long l27569;
+    public long l27570;
+    public long l27571;
+    public long l27572;
+    public long l27573;
+    public long l27574;
+    public long l27575;
+    public long l27576;
+    public long l27577;
+    public long l27578;
+    public long l27579;
+    public long l27580;
+    public long l27581;
+    public long l27582;
+    public long l27583;
+    public long l27584;
+    public long l27585;
+    public long l27586;
+    public long l27587;
+    public long l27588;
+    public long l27589;
+    public long l27590;
+    public long l27591;
+    public long l27592;
+    public long l27593;
+    public long l27594;
+    public long l27595;
+    public long l27596;
+    public long l27597;
+    public long l27598;
+    public long l27599;
+    public long l27600;
+    public long l27601;
+    public long l27602;
+    public long l27603;
+    public long l27604;
+    public long l27605;
+    public long l27606;
+    public long l27607;
+    public long l27608;
+    public long l27609;
+    public long l27610;
+    public long l27611;
+    public long l27612;
+    public long l27613;
+    public long l27614;
+    public long l27615;
+    public long l27616;
+    public long l27617;
+    public long l27618;
+    public long l27619;
+    public long l27620;
+    public long l27621;
+    public long l27622;
+    public long l27623;
+    public long l27624;
+    public long l27625;
+    public long l27626;
+    public long l27627;
+    public long l27628;
+    public long l27629;
+    public long l27630;
+    public long l27631;
+    public long l27632;
+    public long l27633;
+    public long l27634;
+    public long l27635;
+    public long l27636;
+    public long l27637;
+    public long l27638;
+    public long l27639;
+    public long l27640;
+    public long l27641;
+    public long l27642;
+    public long l27643;
+    public long l27644;
+    public long l27645;
+    public long l27646;
+    public long l27647;
+    public long l27648;
+    public long l27649;
+    public long l27650;
+    public long l27651;
+    public long l27652;
+    public long l27653;
+    public long l27654;
+    public long l27655;
+    public long l27656;
+    public long l27657;
+    public long l27658;
+    public long l27659;
+    public long l27660;
+    public long l27661;
+    public long l27662;
+    public long l27663;
+    public long l27664;
+    public long l27665;
+    public long l27666;
+    public long l27667;
+    public long l27668;
+    public long l27669;
+    public long l27670;
+    public long l27671;
+    public long l27672;
+    public long l27673;
+    public long l27674;
+    public long l27675;
+    public long l27676;
+    public long l27677;
+    public long l27678;
+    public long l27679;
+    public long l27680;
+    public long l27681;
+    public long l27682;
+    public long l27683;
+    public long l27684;
+    public long l27685;
+    public long l27686;
+    public long l27687;
+    public long l27688;
+    public long l27689;
+    public long l27690;
+    public long l27691;
+    public long l27692;
+    public long l27693;
+    public long l27694;
+    public long l27695;
+    public long l27696;
+    public long l27697;
+    public long l27698;
+    public long l27699;
+    public long l27700;
+    public long l27701;
+    public long l27702;
+    public long l27703;
+    public long l27704;
+    public long l27705;
+    public long l27706;
+    public long l27707;
+    public long l27708;
+    public long l27709;
+    public long l27710;
+    public long l27711;
+    public long l27712;
+    public long l27713;
+    public long l27714;
+    public long l27715;
+    public long l27716;
+    public long l27717;
+    public long l27718;
+    public long l27719;
+    public long l27720;
+    public long l27721;
+    public long l27722;
+    public long l27723;
+    public long l27724;
+    public long l27725;
+    public long l27726;
+    public long l27727;
+    public long l27728;
+    public long l27729;
+    public long l27730;
+    public long l27731;
+    public long l27732;
+    public long l27733;
+    public long l27734;
+    public long l27735;
+    public long l27736;
+    public long l27737;
+    public long l27738;
+    public long l27739;
+    public long l27740;
+    public long l27741;
+    public long l27742;
+    public long l27743;
+    public long l27744;
+    public long l27745;
+    public long l27746;
+    public long l27747;
+    public long l27748;
+    public long l27749;
+    public long l27750;
+    public long l27751;
+    public long l27752;
+    public long l27753;
+    public long l27754;
+    public long l27755;
+    public long l27756;
+    public long l27757;
+    public long l27758;
+    public long l27759;
+    public long l27760;
+    public long l27761;
+    public long l27762;
+    public long l27763;
+    public long l27764;
+    public long l27765;
+    public long l27766;
+    public long l27767;
+    public long l27768;
+    public long l27769;
+    public long l27770;
+    public long l27771;
+    public long l27772;
+    public long l27773;
+    public long l27774;
+    public long l27775;
+    public long l27776;
+    public long l27777;
+    public long l27778;
+    public long l27779;
+    public long l27780;
+    public long l27781;
+    public long l27782;
+    public long l27783;
+    public long l27784;
+    public long l27785;
+    public long l27786;
+    public long l27787;
+    public long l27788;
+    public long l27789;
+    public long l27790;
+    public long l27791;
+    public long l27792;
+    public long l27793;
+    public long l27794;
+    public long l27795;
+    public long l27796;
+    public long l27797;
+    public long l27798;
+    public long l27799;
+    public long l27800;
+    public long l27801;
+    public long l27802;
+    public long l27803;
+    public long l27804;
+    public long l27805;
+    public long l27806;
+    public long l27807;
+    public long l27808;
+    public long l27809;
+    public long l27810;
+    public long l27811;
+    public long l27812;
+    public long l27813;
+    public long l27814;
+    public long l27815;
+    public long l27816;
+    public long l27817;
+    public long l27818;
+    public long l27819;
+    public long l27820;
+    public long l27821;
+    public long l27822;
+    public long l27823;
+    public long l27824;
+    public long l27825;
+    public long l27826;
+    public long l27827;
+    public long l27828;
+    public long l27829;
+    public long l27830;
+    public long l27831;
+    public long l27832;
+    public long l27833;
+    public long l27834;
+    public long l27835;
+    public long l27836;
+    public long l27837;
+    public long l27838;
+    public long l27839;
+    public long l27840;
+    public long l27841;
+    public long l27842;
+    public long l27843;
+    public long l27844;
+    public long l27845;
+    public long l27846;
+    public long l27847;
+    public long l27848;
+    public long l27849;
+    public long l27850;
+    public long l27851;
+    public long l27852;
+    public long l27853;
+    public long l27854;
+    public long l27855;
+    public long l27856;
+    public long l27857;
+    public long l27858;
+    public long l27859;
+    public long l27860;
+    public long l27861;
+    public long l27862;
+    public long l27863;
+    public long l27864;
+    public long l27865;
+    public long l27866;
+    public long l27867;
+    public long l27868;
+    public long l27869;
+    public long l27870;
+    public long l27871;
+    public long l27872;
+    public long l27873;
+    public long l27874;
+    public long l27875;
+    public long l27876;
+    public long l27877;
+    public long l27878;
+    public long l27879;
+    public long l27880;
+    public long l27881;
+    public long l27882;
+    public long l27883;
+    public long l27884;
+    public long l27885;
+    public long l27886;
+    public long l27887;
+    public long l27888;
+    public long l27889;
+    public long l27890;
+    public long l27891;
+    public long l27892;
+    public long l27893;
+    public long l27894;
+    public long l27895;
+    public long l27896;
+    public long l27897;
+    public long l27898;
+    public long l27899;
+    public long l27900;
+    public long l27901;
+    public long l27902;
+    public long l27903;
+    public long l27904;
+    public long l27905;
+    public long l27906;
+    public long l27907;
+    public long l27908;
+    public long l27909;
+    public long l27910;
+    public long l27911;
+    public long l27912;
+    public long l27913;
+    public long l27914;
+    public long l27915;
+    public long l27916;
+    public long l27917;
+    public long l27918;
+    public long l27919;
+    public long l27920;
+    public long l27921;
+    public long l27922;
+    public long l27923;
+    public long l27924;
+    public long l27925;
+    public long l27926;
+    public long l27927;
+    public long l27928;
+    public long l27929;
+    public long l27930;
+    public long l27931;
+    public long l27932;
+    public long l27933;
+    public long l27934;
+    public long l27935;
+    public long l27936;
+    public long l27937;
+    public long l27938;
+    public long l27939;
+    public long l27940;
+    public long l27941;
+    public long l27942;
+    public long l27943;
+    public long l27944;
+    public long l27945;
+    public long l27946;
+    public long l27947;
+    public long l27948;
+    public long l27949;
+    public long l27950;
+    public long l27951;
+    public long l27952;
+    public long l27953;
+    public long l27954;
+    public long l27955;
+    public long l27956;
+    public long l27957;
+    public long l27958;
+    public long l27959;
+    public long l27960;
+    public long l27961;
+    public long l27962;
+    public long l27963;
+    public long l27964;
+    public long l27965;
+    public long l27966;
+    public long l27967;
+    public long l27968;
+    public long l27969;
+    public long l27970;
+    public long l27971;
+    public long l27972;
+    public long l27973;
+    public long l27974;
+    public long l27975;
+    public long l27976;
+    public long l27977;
+    public long l27978;
+    public long l27979;
+    public long l27980;
+    public long l27981;
+    public long l27982;
+    public long l27983;
+    public long l27984;
+    public long l27985;
+    public long l27986;
+    public long l27987;
+    public long l27988;
+    public long l27989;
+    public long l27990;
+    public long l27991;
+    public long l27992;
+    public long l27993;
+    public long l27994;
+    public long l27995;
+    public long l27996;
+    public long l27997;
+    public long l27998;
+    public long l27999;
+    public long l28000;
+    public long l28001;
+    public long l28002;
+    public long l28003;
+    public long l28004;
+    public long l28005;
+    public long l28006;
+    public long l28007;
+    public long l28008;
+    public long l28009;
+    public long l28010;
+    public long l28011;
+    public long l28012;
+    public long l28013;
+    public long l28014;
+    public long l28015;
+    public long l28016;
+    public long l28017;
+    public long l28018;
+    public long l28019;
+    public long l28020;
+    public long l28021;
+    public long l28022;
+    public long l28023;
+    public long l28024;
+    public long l28025;
+    public long l28026;
+    public long l28027;
+    public long l28028;
+    public long l28029;
+    public long l28030;
+    public long l28031;
+    public long l28032;
+    public long l28033;
+    public long l28034;
+    public long l28035;
+    public long l28036;
+    public long l28037;
+    public long l28038;
+    public long l28039;
+    public long l28040;
+    public long l28041;
+    public long l28042;
+    public long l28043;
+    public long l28044;
+    public long l28045;
+    public long l28046;
+    public long l28047;
+    public long l28048;
+    public long l28049;
+    public long l28050;
+    public long l28051;
+    public long l28052;
+    public long l28053;
+    public long l28054;
+    public long l28055;
+    public long l28056;
+    public long l28057;
+    public long l28058;
+    public long l28059;
+    public long l28060;
+    public long l28061;
+    public long l28062;
+    public long l28063;
+    public long l28064;
+    public long l28065;
+    public long l28066;
+    public long l28067;
+    public long l28068;
+    public long l28069;
+    public long l28070;
+    public long l28071;
+    public long l28072;
+    public long l28073;
+    public long l28074;
+    public long l28075;
+    public long l28076;
+    public long l28077;
+    public long l28078;
+    public long l28079;
+    public long l28080;
+    public long l28081;
+    public long l28082;
+    public long l28083;
+    public long l28084;
+    public long l28085;
+    public long l28086;
+    public long l28087;
+    public long l28088;
+    public long l28089;
+    public long l28090;
+    public long l28091;
+    public long l28092;
+    public long l28093;
+    public long l28094;
+    public long l28095;
+    public long l28096;
+    public long l28097;
+    public long l28098;
+    public long l28099;
+    public long l28100;
+    public long l28101;
+    public long l28102;
+    public long l28103;
+    public long l28104;
+    public long l28105;
+    public long l28106;
+    public long l28107;
+    public long l28108;
+    public long l28109;
+    public long l28110;
+    public long l28111;
+    public long l28112;
+    public long l28113;
+    public long l28114;
+    public long l28115;
+    public long l28116;
+    public long l28117;
+    public long l28118;
+    public long l28119;
+    public long l28120;
+    public long l28121;
+    public long l28122;
+    public long l28123;
+    public long l28124;
+    public long l28125;
+    public long l28126;
+    public long l28127;
+    public long l28128;
+    public long l28129;
+    public long l28130;
+    public long l28131;
+    public long l28132;
+    public long l28133;
+    public long l28134;
+    public long l28135;
+    public long l28136;
+    public long l28137;
+    public long l28138;
+    public long l28139;
+    public long l28140;
+    public long l28141;
+    public long l28142;
+    public long l28143;
+    public long l28144;
+    public long l28145;
+    public long l28146;
+    public long l28147;
+    public long l28148;
+    public long l28149;
+    public long l28150;
+    public long l28151;
+    public long l28152;
+    public long l28153;
+    public long l28154;
+    public long l28155;
+    public long l28156;
+    public long l28157;
+    public long l28158;
+    public long l28159;
+    public long l28160;
+    public long l28161;
+    public long l28162;
+    public long l28163;
+    public long l28164;
+    public long l28165;
+    public long l28166;
+    public long l28167;
+    public long l28168;
+    public long l28169;
+    public long l28170;
+    public long l28171;
+    public long l28172;
+    public long l28173;
+    public long l28174;
+    public long l28175;
+    public long l28176;
+    public long l28177;
+    public long l28178;
+    public long l28179;
+    public long l28180;
+    public long l28181;
+    public long l28182;
+    public long l28183;
+    public long l28184;
+    public long l28185;
+    public long l28186;
+    public long l28187;
+    public long l28188;
+    public long l28189;
+    public long l28190;
+    public long l28191;
+    public long l28192;
+    public long l28193;
+    public long l28194;
+    public long l28195;
+    public long l28196;
+    public long l28197;
+    public long l28198;
+    public long l28199;
+    public long l28200;
+    public long l28201;
+    public long l28202;
+    public long l28203;
+    public long l28204;
+    public long l28205;
+    public long l28206;
+    public long l28207;
+    public long l28208;
+    public long l28209;
+    public long l28210;
+    public long l28211;
+    public long l28212;
+    public long l28213;
+    public long l28214;
+    public long l28215;
+    public long l28216;
+    public long l28217;
+    public long l28218;
+    public long l28219;
+    public long l28220;
+    public long l28221;
+    public long l28222;
+    public long l28223;
+    public long l28224;
+    public long l28225;
+    public long l28226;
+    public long l28227;
+    public long l28228;
+    public long l28229;
+    public long l28230;
+    public long l28231;
+    public long l28232;
+    public long l28233;
+    public long l28234;
+    public long l28235;
+    public long l28236;
+    public long l28237;
+    public long l28238;
+    public long l28239;
+    public long l28240;
+    public long l28241;
+    public long l28242;
+    public long l28243;
+    public long l28244;
+    public long l28245;
+    public long l28246;
+    public long l28247;
+    public long l28248;
+    public long l28249;
+    public long l28250;
+    public long l28251;
+    public long l28252;
+    public long l28253;
+    public long l28254;
+    public long l28255;
+    public long l28256;
+    public long l28257;
+    public long l28258;
+    public long l28259;
+    public long l28260;
+    public long l28261;
+    public long l28262;
+    public long l28263;
+    public long l28264;
+    public long l28265;
+    public long l28266;
+    public long l28267;
+    public long l28268;
+    public long l28269;
+    public long l28270;
+    public long l28271;
+    public long l28272;
+    public long l28273;
+    public long l28274;
+    public long l28275;
+    public long l28276;
+    public long l28277;
+    public long l28278;
+    public long l28279;
+    public long l28280;
+    public long l28281;
+    public long l28282;
+    public long l28283;
+    public long l28284;
+    public long l28285;
+    public long l28286;
+    public long l28287;
+    public long l28288;
+    public long l28289;
+    public long l28290;
+    public long l28291;
+    public long l28292;
+    public long l28293;
+    public long l28294;
+    public long l28295;
+    public long l28296;
+    public long l28297;
+    public long l28298;
+    public long l28299;
+    public long l28300;
+    public long l28301;
+    public long l28302;
+    public long l28303;
+    public long l28304;
+    public long l28305;
+    public long l28306;
+    public long l28307;
+    public long l28308;
+    public long l28309;
+    public long l28310;
+    public long l28311;
+    public long l28312;
+    public long l28313;
+    public long l28314;
+    public long l28315;
+    public long l28316;
+    public long l28317;
+    public long l28318;
+    public long l28319;
+    public long l28320;
+    public long l28321;
+    public long l28322;
+    public long l28323;
+    public long l28324;
+    public long l28325;
+    public long l28326;
+    public long l28327;
+    public long l28328;
+    public long l28329;
+    public long l28330;
+    public long l28331;
+    public long l28332;
+    public long l28333;
+    public long l28334;
+    public long l28335;
+    public long l28336;
+    public long l28337;
+    public long l28338;
+    public long l28339;
+    public long l28340;
+    public long l28341;
+    public long l28342;
+    public long l28343;
+    public long l28344;
+    public long l28345;
+    public long l28346;
+    public long l28347;
+    public long l28348;
+    public long l28349;
+    public long l28350;
+    public long l28351;
+    public long l28352;
+    public long l28353;
+    public long l28354;
+    public long l28355;
+    public long l28356;
+    public long l28357;
+    public long l28358;
+    public long l28359;
+    public long l28360;
+    public long l28361;
+    public long l28362;
+    public long l28363;
+    public long l28364;
+    public long l28365;
+    public long l28366;
+    public long l28367;
+    public long l28368;
+    public long l28369;
+    public long l28370;
+    public long l28371;
+    public long l28372;
+    public long l28373;
+    public long l28374;
+    public long l28375;
+    public long l28376;
+    public long l28377;
+    public long l28378;
+    public long l28379;
+    public long l28380;
+    public long l28381;
+    public long l28382;
+    public long l28383;
+    public long l28384;
+    public long l28385;
+    public long l28386;
+    public long l28387;
+    public long l28388;
+    public long l28389;
+    public long l28390;
+    public long l28391;
+    public long l28392;
+    public long l28393;
+    public long l28394;
+    public long l28395;
+    public long l28396;
+    public long l28397;
+    public long l28398;
+    public long l28399;
+    public long l28400;
+    public long l28401;
+    public long l28402;
+    public long l28403;
+    public long l28404;
+    public long l28405;
+    public long l28406;
+    public long l28407;
+    public long l28408;
+    public long l28409;
+    public long l28410;
+    public long l28411;
+    public long l28412;
+    public long l28413;
+    public long l28414;
+    public long l28415;
+    public long l28416;
+    public long l28417;
+    public long l28418;
+    public long l28419;
+    public long l28420;
+    public long l28421;
+    public long l28422;
+    public long l28423;
+    public long l28424;
+    public long l28425;
+    public long l28426;
+    public long l28427;
+    public long l28428;
+    public long l28429;
+    public long l28430;
+    public long l28431;
+    public long l28432;
+    public long l28433;
+    public long l28434;
+    public long l28435;
+    public long l28436;
+    public long l28437;
+    public long l28438;
+    public long l28439;
+    public long l28440;
+    public long l28441;
+    public long l28442;
+    public long l28443;
+    public long l28444;
+    public long l28445;
+    public long l28446;
+    public long l28447;
+    public long l28448;
+    public long l28449;
+    public long l28450;
+    public long l28451;
+    public long l28452;
+    public long l28453;
+    public long l28454;
+    public long l28455;
+    public long l28456;
+    public long l28457;
+    public long l28458;
+    public long l28459;
+    public long l28460;
+    public long l28461;
+    public long l28462;
+    public long l28463;
+    public long l28464;
+    public long l28465;
+    public long l28466;
+    public long l28467;
+    public long l28468;
+    public long l28469;
+    public long l28470;
+    public long l28471;
+    public long l28472;
+    public long l28473;
+    public long l28474;
+    public long l28475;
+    public long l28476;
+    public long l28477;
+    public long l28478;
+    public long l28479;
+    public long l28480;
+    public long l28481;
+    public long l28482;
+    public long l28483;
+    public long l28484;
+    public long l28485;
+    public long l28486;
+    public long l28487;
+    public long l28488;
+    public long l28489;
+    public long l28490;
+    public long l28491;
+    public long l28492;
+    public long l28493;
+    public long l28494;
+    public long l28495;
+    public long l28496;
+    public long l28497;
+    public long l28498;
+    public long l28499;
+    public long l28500;
+    public long l28501;
+    public long l28502;
+    public long l28503;
+    public long l28504;
+    public long l28505;
+    public long l28506;
+    public long l28507;
+    public long l28508;
+    public long l28509;
+    public long l28510;
+    public long l28511;
+    public long l28512;
+    public long l28513;
+    public long l28514;
+    public long l28515;
+    public long l28516;
+    public long l28517;
+    public long l28518;
+    public long l28519;
+    public long l28520;
+    public long l28521;
+    public long l28522;
+    public long l28523;
+    public long l28524;
+    public long l28525;
+    public long l28526;
+    public long l28527;
+    public long l28528;
+    public long l28529;
+    public long l28530;
+    public long l28531;
+    public long l28532;
+    public long l28533;
+    public long l28534;
+    public long l28535;
+    public long l28536;
+    public long l28537;
+    public long l28538;
+    public long l28539;
+    public long l28540;
+    public long l28541;
+    public long l28542;
+    public long l28543;
+    public long l28544;
+    public long l28545;
+    public long l28546;
+    public long l28547;
+    public long l28548;
+    public long l28549;
+    public long l28550;
+    public long l28551;
+    public long l28552;
+    public long l28553;
+    public long l28554;
+    public long l28555;
+    public long l28556;
+    public long l28557;
+    public long l28558;
+    public long l28559;
+    public long l28560;
+    public long l28561;
+    public long l28562;
+    public long l28563;
+    public long l28564;
+    public long l28565;
+    public long l28566;
+    public long l28567;
+    public long l28568;
+    public long l28569;
+    public long l28570;
+    public long l28571;
+    public long l28572;
+    public long l28573;
+    public long l28574;
+    public long l28575;
+    public long l28576;
+    public long l28577;
+    public long l28578;
+    public long l28579;
+    public long l28580;
+    public long l28581;
+    public long l28582;
+    public long l28583;
+    public long l28584;
+    public long l28585;
+    public long l28586;
+    public long l28587;
+    public long l28588;
+    public long l28589;
+    public long l28590;
+    public long l28591;
+    public long l28592;
+    public long l28593;
+    public long l28594;
+    public long l28595;
+    public long l28596;
+    public long l28597;
+    public long l28598;
+    public long l28599;
+    public long l28600;
+    public long l28601;
+    public long l28602;
+    public long l28603;
+    public long l28604;
+    public long l28605;
+    public long l28606;
+    public long l28607;
+    public long l28608;
+    public long l28609;
+    public long l28610;
+    public long l28611;
+    public long l28612;
+    public long l28613;
+    public long l28614;
+    public long l28615;
+    public long l28616;
+    public long l28617;
+    public long l28618;
+    public long l28619;
+    public long l28620;
+    public long l28621;
+    public long l28622;
+    public long l28623;
+    public long l28624;
+    public long l28625;
+    public long l28626;
+    public long l28627;
+    public long l28628;
+    public long l28629;
+    public long l28630;
+    public long l28631;
+    public long l28632;
+    public long l28633;
+    public long l28634;
+    public long l28635;
+    public long l28636;
+    public long l28637;
+    public long l28638;
+    public long l28639;
+    public long l28640;
+    public long l28641;
+    public long l28642;
+    public long l28643;
+    public long l28644;
+    public long l28645;
+    public long l28646;
+    public long l28647;
+    public long l28648;
+    public long l28649;
+    public long l28650;
+    public long l28651;
+    public long l28652;
+    public long l28653;
+    public long l28654;
+    public long l28655;
+    public long l28656;
+    public long l28657;
+    public long l28658;
+    public long l28659;
+    public long l28660;
+    public long l28661;
+    public long l28662;
+    public long l28663;
+    public long l28664;
+    public long l28665;
+    public long l28666;
+    public long l28667;
+    public long l28668;
+    public long l28669;
+    public long l28670;
+    public long l28671;
+    public long l28672;
+    public long l28673;
+    public long l28674;
+    public long l28675;
+    public long l28676;
+    public long l28677;
+    public long l28678;
+    public long l28679;
+    public long l28680;
+    public long l28681;
+    public long l28682;
+    public long l28683;
+    public long l28684;
+    public long l28685;
+    public long l28686;
+    public long l28687;
+    public long l28688;
+    public long l28689;
+    public long l28690;
+    public long l28691;
+    public long l28692;
+    public long l28693;
+    public long l28694;
+    public long l28695;
+    public long l28696;
+    public long l28697;
+    public long l28698;
+    public long l28699;
+    public long l28700;
+    public long l28701;
+    public long l28702;
+    public long l28703;
+    public long l28704;
+    public long l28705;
+    public long l28706;
+    public long l28707;
+    public long l28708;
+    public long l28709;
+    public long l28710;
+    public long l28711;
+    public long l28712;
+    public long l28713;
+    public long l28714;
+    public long l28715;
+    public long l28716;
+    public long l28717;
+    public long l28718;
+    public long l28719;
+    public long l28720;
+    public long l28721;
+    public long l28722;
+    public long l28723;
+    public long l28724;
+    public long l28725;
+    public long l28726;
+    public long l28727;
+    public long l28728;
+    public long l28729;
+    public long l28730;
+    public long l28731;
+    public long l28732;
+    public long l28733;
+    public long l28734;
+    public long l28735;
+    public long l28736;
+    public long l28737;
+    public long l28738;
+    public long l28739;
+    public long l28740;
+    public long l28741;
+    public long l28742;
+    public long l28743;
+    public long l28744;
+    public long l28745;
+    public long l28746;
+    public long l28747;
+    public long l28748;
+    public long l28749;
+    public long l28750;
+    public long l28751;
+    public long l28752;
+    public long l28753;
+    public long l28754;
+    public long l28755;
+    public long l28756;
+    public long l28757;
+    public long l28758;
+    public long l28759;
+    public long l28760;
+    public long l28761;
+    public long l28762;
+    public long l28763;
+    public long l28764;
+    public long l28765;
+    public long l28766;
+    public long l28767;
+    public long l28768;
+    public long l28769;
+    public long l28770;
+    public long l28771;
+    public long l28772;
+    public long l28773;
+    public long l28774;
+    public long l28775;
+    public long l28776;
+    public long l28777;
+    public long l28778;
+    public long l28779;
+    public long l28780;
+    public long l28781;
+    public long l28782;
+    public long l28783;
+    public long l28784;
+    public long l28785;
+    public long l28786;
+    public long l28787;
+    public long l28788;
+    public long l28789;
+    public long l28790;
+    public long l28791;
+    public long l28792;
+    public long l28793;
+    public long l28794;
+    public long l28795;
+    public long l28796;
+    public long l28797;
+    public long l28798;
+    public long l28799;
+    public long l28800;
+    public long l28801;
+    public long l28802;
+    public long l28803;
+    public long l28804;
+    public long l28805;
+    public long l28806;
+    public long l28807;
+    public long l28808;
+    public long l28809;
+    public long l28810;
+    public long l28811;
+    public long l28812;
+    public long l28813;
+    public long l28814;
+    public long l28815;
+    public long l28816;
+    public long l28817;
+    public long l28818;
+    public long l28819;
+    public long l28820;
+    public long l28821;
+    public long l28822;
+    public long l28823;
+    public long l28824;
+    public long l28825;
+    public long l28826;
+    public long l28827;
+    public long l28828;
+    public long l28829;
+    public long l28830;
+    public long l28831;
+    public long l28832;
+    public long l28833;
+    public long l28834;
+    public long l28835;
+    public long l28836;
+    public long l28837;
+    public long l28838;
+    public long l28839;
+    public long l28840;
+    public long l28841;
+    public long l28842;
+    public long l28843;
+    public long l28844;
+    public long l28845;
+    public long l28846;
+    public long l28847;
+    public long l28848;
+    public long l28849;
+    public long l28850;
+    public long l28851;
+    public long l28852;
+    public long l28853;
+    public long l28854;
+    public long l28855;
+    public long l28856;
+    public long l28857;
+    public long l28858;
+    public long l28859;
+    public long l28860;
+    public long l28861;
+    public long l28862;
+    public long l28863;
+    public long l28864;
+    public long l28865;
+    public long l28866;
+    public long l28867;
+    public long l28868;
+    public long l28869;
+    public long l28870;
+    public long l28871;
+    public long l28872;
+    public long l28873;
+    public long l28874;
+    public long l28875;
+    public long l28876;
+    public long l28877;
+    public long l28878;
+    public long l28879;
+    public long l28880;
+    public long l28881;
+    public long l28882;
+    public long l28883;
+    public long l28884;
+    public long l28885;
+    public long l28886;
+    public long l28887;
+    public long l28888;
+    public long l28889;
+    public long l28890;
+    public long l28891;
+    public long l28892;
+    public long l28893;
+    public long l28894;
+    public long l28895;
+    public long l28896;
+    public long l28897;
+    public long l28898;
+    public long l28899;
+    public long l28900;
+    public long l28901;
+    public long l28902;
+    public long l28903;
+    public long l28904;
+    public long l28905;
+    public long l28906;
+    public long l28907;
+    public long l28908;
+    public long l28909;
+    public long l28910;
+    public long l28911;
+    public long l28912;
+    public long l28913;
+    public long l28914;
+    public long l28915;
+    public long l28916;
+    public long l28917;
+    public long l28918;
+    public long l28919;
+    public long l28920;
+    public long l28921;
+    public long l28922;
+    public long l28923;
+    public long l28924;
+    public long l28925;
+    public long l28926;
+    public long l28927;
+    public long l28928;
+    public long l28929;
+    public long l28930;
+    public long l28931;
+    public long l28932;
+    public long l28933;
+    public long l28934;
+    public long l28935;
+    public long l28936;
+    public long l28937;
+    public long l28938;
+    public long l28939;
+    public long l28940;
+    public long l28941;
+    public long l28942;
+    public long l28943;
+    public long l28944;
+    public long l28945;
+    public long l28946;
+    public long l28947;
+    public long l28948;
+    public long l28949;
+    public long l28950;
+    public long l28951;
+    public long l28952;
+    public long l28953;
+    public long l28954;
+    public long l28955;
+    public long l28956;
+    public long l28957;
+    public long l28958;
+    public long l28959;
+    public long l28960;
+    public long l28961;
+    public long l28962;
+    public long l28963;
+    public long l28964;
+    public long l28965;
+    public long l28966;
+    public long l28967;
+    public long l28968;
+    public long l28969;
+    public long l28970;
+    public long l28971;
+    public long l28972;
+    public long l28973;
+    public long l28974;
+    public long l28975;
+    public long l28976;
+    public long l28977;
+    public long l28978;
+    public long l28979;
+    public long l28980;
+    public long l28981;
+    public long l28982;
+    public long l28983;
+    public long l28984;
+    public long l28985;
+    public long l28986;
+    public long l28987;
+    public long l28988;
+    public long l28989;
+    public long l28990;
+    public long l28991;
+    public long l28992;
+    public long l28993;
+    public long l28994;
+    public long l28995;
+    public long l28996;
+    public long l28997;
+    public long l28998;
+    public long l28999;
+    public long l29000;
+    public long l29001;
+    public long l29002;
+    public long l29003;
+    public long l29004;
+    public long l29005;
+    public long l29006;
+    public long l29007;
+    public long l29008;
+    public long l29009;
+    public long l29010;
+    public long l29011;
+    public long l29012;
+    public long l29013;
+    public long l29014;
+    public long l29015;
+    public long l29016;
+    public long l29017;
+    public long l29018;
+    public long l29019;
+    public long l29020;
+    public long l29021;
+    public long l29022;
+    public long l29023;
+    public long l29024;
+    public long l29025;
+    public long l29026;
+    public long l29027;
+    public long l29028;
+    public long l29029;
+    public long l29030;
+    public long l29031;
+    public long l29032;
+    public long l29033;
+    public long l29034;
+    public long l29035;
+    public long l29036;
+    public long l29037;
+    public long l29038;
+    public long l29039;
+    public long l29040;
+    public long l29041;
+    public long l29042;
+    public long l29043;
+    public long l29044;
+    public long l29045;
+    public long l29046;
+    public long l29047;
+    public long l29048;
+    public long l29049;
+    public long l29050;
+    public long l29051;
+    public long l29052;
+    public long l29053;
+    public long l29054;
+    public long l29055;
+    public long l29056;
+    public long l29057;
+    public long l29058;
+    public long l29059;
+    public long l29060;
+    public long l29061;
+    public long l29062;
+    public long l29063;
+    public long l29064;
+    public long l29065;
+    public long l29066;
+    public long l29067;
+    public long l29068;
+    public long l29069;
+    public long l29070;
+    public long l29071;
+    public long l29072;
+    public long l29073;
+    public long l29074;
+    public long l29075;
+    public long l29076;
+    public long l29077;
+    public long l29078;
+    public long l29079;
+    public long l29080;
+    public long l29081;
+    public long l29082;
+    public long l29083;
+    public long l29084;
+    public long l29085;
+    public long l29086;
+    public long l29087;
+    public long l29088;
+    public long l29089;
+    public long l29090;
+    public long l29091;
+    public long l29092;
+    public long l29093;
+    public long l29094;
+    public long l29095;
+    public long l29096;
+    public long l29097;
+    public long l29098;
+    public long l29099;
+    public long l29100;
+    public long l29101;
+    public long l29102;
+    public long l29103;
+    public long l29104;
+    public long l29105;
+    public long l29106;
+    public long l29107;
+    public long l29108;
+    public long l29109;
+    public long l29110;
+    public long l29111;
+    public long l29112;
+    public long l29113;
+    public long l29114;
+    public long l29115;
+    public long l29116;
+    public long l29117;
+    public long l29118;
+    public long l29119;
+    public long l29120;
+    public long l29121;
+    public long l29122;
+    public long l29123;
+    public long l29124;
+    public long l29125;
+    public long l29126;
+    public long l29127;
+    public long l29128;
+    public long l29129;
+    public long l29130;
+    public long l29131;
+    public long l29132;
+    public long l29133;
+    public long l29134;
+    public long l29135;
+    public long l29136;
+    public long l29137;
+    public long l29138;
+    public long l29139;
+    public long l29140;
+    public long l29141;
+    public long l29142;
+    public long l29143;
+    public long l29144;
+    public long l29145;
+    public long l29146;
+    public long l29147;
+    public long l29148;
+    public long l29149;
+    public long l29150;
+    public long l29151;
+    public long l29152;
+    public long l29153;
+    public long l29154;
+    public long l29155;
+    public long l29156;
+    public long l29157;
+    public long l29158;
+    public long l29159;
+    public long l29160;
+    public long l29161;
+    public long l29162;
+    public long l29163;
+    public long l29164;
+    public long l29165;
+    public long l29166;
+    public long l29167;
+    public long l29168;
+    public long l29169;
+    public long l29170;
+    public long l29171;
+    public long l29172;
+    public long l29173;
+    public long l29174;
+    public long l29175;
+    public long l29176;
+    public long l29177;
+    public long l29178;
+    public long l29179;
+    public long l29180;
+    public long l29181;
+    public long l29182;
+    public long l29183;
+    public long l29184;
+    public long l29185;
+    public long l29186;
+    public long l29187;
+    public long l29188;
+    public long l29189;
+    public long l29190;
+    public long l29191;
+    public long l29192;
+    public long l29193;
+    public long l29194;
+    public long l29195;
+    public long l29196;
+    public long l29197;
+    public long l29198;
+    public long l29199;
+    public long l29200;
+    public long l29201;
+    public long l29202;
+    public long l29203;
+    public long l29204;
+    public long l29205;
+    public long l29206;
+    public long l29207;
+    public long l29208;
+    public long l29209;
+    public long l29210;
+    public long l29211;
+    public long l29212;
+    public long l29213;
+    public long l29214;
+    public long l29215;
+    public long l29216;
+    public long l29217;
+    public long l29218;
+    public long l29219;
+    public long l29220;
+    public long l29221;
+    public long l29222;
+    public long l29223;
+    public long l29224;
+    public long l29225;
+    public long l29226;
+    public long l29227;
+    public long l29228;
+    public long l29229;
+    public long l29230;
+    public long l29231;
+    public long l29232;
+    public long l29233;
+    public long l29234;
+    public long l29235;
+    public long l29236;
+    public long l29237;
+    public long l29238;
+    public long l29239;
+    public long l29240;
+    public long l29241;
+    public long l29242;
+    public long l29243;
+    public long l29244;
+    public long l29245;
+    public long l29246;
+    public long l29247;
+    public long l29248;
+    public long l29249;
+    public long l29250;
+    public long l29251;
+    public long l29252;
+    public long l29253;
+    public long l29254;
+    public long l29255;
+    public long l29256;
+    public long l29257;
+    public long l29258;
+    public long l29259;
+    public long l29260;
+    public long l29261;
+    public long l29262;
+    public long l29263;
+    public long l29264;
+    public long l29265;
+    public long l29266;
+    public long l29267;
+    public long l29268;
+    public long l29269;
+    public long l29270;
+    public long l29271;
+    public long l29272;
+    public long l29273;
+    public long l29274;
+    public long l29275;
+    public long l29276;
+    public long l29277;
+    public long l29278;
+    public long l29279;
+    public long l29280;
+    public long l29281;
+    public long l29282;
+    public long l29283;
+    public long l29284;
+    public long l29285;
+    public long l29286;
+    public long l29287;
+    public long l29288;
+    public long l29289;
+    public long l29290;
+    public long l29291;
+    public long l29292;
+    public long l29293;
+    public long l29294;
+    public long l29295;
+    public long l29296;
+    public long l29297;
+    public long l29298;
+    public long l29299;
+    public long l29300;
+    public long l29301;
+    public long l29302;
+    public long l29303;
+    public long l29304;
+    public long l29305;
+    public long l29306;
+    public long l29307;
+    public long l29308;
+    public long l29309;
+    public long l29310;
+    public long l29311;
+    public long l29312;
+    public long l29313;
+    public long l29314;
+    public long l29315;
+    public long l29316;
+    public long l29317;
+    public long l29318;
+    public long l29319;
+    public long l29320;
+    public long l29321;
+    public long l29322;
+    public long l29323;
+    public long l29324;
+    public long l29325;
+    public long l29326;
+    public long l29327;
+    public long l29328;
+    public long l29329;
+    public long l29330;
+    public long l29331;
+    public long l29332;
+    public long l29333;
+    public long l29334;
+    public long l29335;
+    public long l29336;
+    public long l29337;
+    public long l29338;
+    public long l29339;
+    public long l29340;
+    public long l29341;
+    public long l29342;
+    public long l29343;
+    public long l29344;
+    public long l29345;
+    public long l29346;
+    public long l29347;
+    public long l29348;
+    public long l29349;
+    public long l29350;
+    public long l29351;
+    public long l29352;
+    public long l29353;
+    public long l29354;
+    public long l29355;
+    public long l29356;
+    public long l29357;
+    public long l29358;
+    public long l29359;
+    public long l29360;
+    public long l29361;
+    public long l29362;
+    public long l29363;
+    public long l29364;
+    public long l29365;
+    public long l29366;
+    public long l29367;
+    public long l29368;
+    public long l29369;
+    public long l29370;
+    public long l29371;
+    public long l29372;
+    public long l29373;
+    public long l29374;
+    public long l29375;
+    public long l29376;
+    public long l29377;
+    public long l29378;
+    public long l29379;
+    public long l29380;
+    public long l29381;
+    public long l29382;
+    public long l29383;
+    public long l29384;
+    public long l29385;
+    public long l29386;
+    public long l29387;
+    public long l29388;
+    public long l29389;
+    public long l29390;
+    public long l29391;
+    public long l29392;
+    public long l29393;
+    public long l29394;
+    public long l29395;
+    public long l29396;
+    public long l29397;
+    public long l29398;
+    public long l29399;
+    public long l29400;
+    public long l29401;
+    public long l29402;
+    public long l29403;
+    public long l29404;
+    public long l29405;
+    public long l29406;
+    public long l29407;
+    public long l29408;
+    public long l29409;
+    public long l29410;
+    public long l29411;
+    public long l29412;
+    public long l29413;
+    public long l29414;
+    public long l29415;
+    public long l29416;
+    public long l29417;
+    public long l29418;
+    public long l29419;
+    public long l29420;
+    public long l29421;
+    public long l29422;
+    public long l29423;
+    public long l29424;
+    public long l29425;
+    public long l29426;
+    public long l29427;
+    public long l29428;
+    public long l29429;
+    public long l29430;
+    public long l29431;
+    public long l29432;
+    public long l29433;
+    public long l29434;
+    public long l29435;
+    public long l29436;
+    public long l29437;
+    public long l29438;
+    public long l29439;
+    public long l29440;
+    public long l29441;
+    public long l29442;
+    public long l29443;
+    public long l29444;
+    public long l29445;
+    public long l29446;
+    public long l29447;
+    public long l29448;
+    public long l29449;
+    public long l29450;
+    public long l29451;
+    public long l29452;
+    public long l29453;
+    public long l29454;
+    public long l29455;
+    public long l29456;
+    public long l29457;
+    public long l29458;
+    public long l29459;
+    public long l29460;
+    public long l29461;
+    public long l29462;
+    public long l29463;
+    public long l29464;
+    public long l29465;
+    public long l29466;
+    public long l29467;
+    public long l29468;
+    public long l29469;
+    public long l29470;
+    public long l29471;
+    public long l29472;
+    public long l29473;
+    public long l29474;
+    public long l29475;
+    public long l29476;
+    public long l29477;
+    public long l29478;
+    public long l29479;
+    public long l29480;
+    public long l29481;
+    public long l29482;
+    public long l29483;
+    public long l29484;
+    public long l29485;
+    public long l29486;
+    public long l29487;
+    public long l29488;
+    public long l29489;
+    public long l29490;
+    public long l29491;
+    public long l29492;
+    public long l29493;
+    public long l29494;
+    public long l29495;
+    public long l29496;
+    public long l29497;
+    public long l29498;
+    public long l29499;
+    public long l29500;
+    public long l29501;
+    public long l29502;
+    public long l29503;
+    public long l29504;
+    public long l29505;
+    public long l29506;
+    public long l29507;
+    public long l29508;
+    public long l29509;
+    public long l29510;
+    public long l29511;
+    public long l29512;
+    public long l29513;
+    public long l29514;
+    public long l29515;
+    public long l29516;
+    public long l29517;
+    public long l29518;
+    public long l29519;
+    public long l29520;
+    public long l29521;
+    public long l29522;
+    public long l29523;
+    public long l29524;
+    public long l29525;
+    public long l29526;
+    public long l29527;
+    public long l29528;
+    public long l29529;
+    public long l29530;
+    public long l29531;
+    public long l29532;
+    public long l29533;
+    public long l29534;
+    public long l29535;
+    public long l29536;
+    public long l29537;
+    public long l29538;
+    public long l29539;
+    public long l29540;
+    public long l29541;
+    public long l29542;
+    public long l29543;
+    public long l29544;
+    public long l29545;
+    public long l29546;
+    public long l29547;
+    public long l29548;
+    public long l29549;
+    public long l29550;
+    public long l29551;
+    public long l29552;
+    public long l29553;
+    public long l29554;
+    public long l29555;
+    public long l29556;
+    public long l29557;
+    public long l29558;
+    public long l29559;
+    public long l29560;
+    public long l29561;
+    public long l29562;
+    public long l29563;
+    public long l29564;
+    public long l29565;
+    public long l29566;
+    public long l29567;
+    public long l29568;
+    public long l29569;
+    public long l29570;
+    public long l29571;
+    public long l29572;
+    public long l29573;
+    public long l29574;
+    public long l29575;
+    public long l29576;
+    public long l29577;
+    public long l29578;
+    public long l29579;
+    public long l29580;
+    public long l29581;
+    public long l29582;
+    public long l29583;
+    public long l29584;
+    public long l29585;
+    public long l29586;
+    public long l29587;
+    public long l29588;
+    public long l29589;
+    public long l29590;
+    public long l29591;
+    public long l29592;
+    public long l29593;
+    public long l29594;
+    public long l29595;
+    public long l29596;
+    public long l29597;
+    public long l29598;
+    public long l29599;
+    public long l29600;
+    public long l29601;
+    public long l29602;
+    public long l29603;
+    public long l29604;
+    public long l29605;
+    public long l29606;
+    public long l29607;
+    public long l29608;
+    public long l29609;
+    public long l29610;
+    public long l29611;
+    public long l29612;
+    public long l29613;
+    public long l29614;
+    public long l29615;
+    public long l29616;
+    public long l29617;
+    public long l29618;
+    public long l29619;
+    public long l29620;
+    public long l29621;
+    public long l29622;
+    public long l29623;
+    public long l29624;
+    public long l29625;
+    public long l29626;
+    public long l29627;
+    public long l29628;
+    public long l29629;
+    public long l29630;
+    public long l29631;
+    public long l29632;
+    public long l29633;
+    public long l29634;
+    public long l29635;
+    public long l29636;
+    public long l29637;
+    public long l29638;
+    public long l29639;
+    public long l29640;
+    public long l29641;
+    public long l29642;
+    public long l29643;
+    public long l29644;
+    public long l29645;
+    public long l29646;
+    public long l29647;
+    public long l29648;
+    public long l29649;
+    public long l29650;
+    public long l29651;
+    public long l29652;
+    public long l29653;
+    public long l29654;
+    public long l29655;
+    public long l29656;
+    public long l29657;
+    public long l29658;
+    public long l29659;
+    public long l29660;
+    public long l29661;
+    public long l29662;
+    public long l29663;
+    public long l29664;
+    public long l29665;
+    public long l29666;
+    public long l29667;
+    public long l29668;
+    public long l29669;
+    public long l29670;
+    public long l29671;
+    public long l29672;
+    public long l29673;
+    public long l29674;
+    public long l29675;
+    public long l29676;
+    public long l29677;
+    public long l29678;
+    public long l29679;
+    public long l29680;
+    public long l29681;
+    public long l29682;
+    public long l29683;
+    public long l29684;
+    public long l29685;
+    public long l29686;
+    public long l29687;
+    public long l29688;
+    public long l29689;
+    public long l29690;
+    public long l29691;
+    public long l29692;
+    public long l29693;
+    public long l29694;
+    public long l29695;
+    public long l29696;
+    public long l29697;
+    public long l29698;
+    public long l29699;
+    public long l29700;
+    public long l29701;
+    public long l29702;
+    public long l29703;
+    public long l29704;
+    public long l29705;
+    public long l29706;
+    public long l29707;
+    public long l29708;
+    public long l29709;
+    public long l29710;
+    public long l29711;
+    public long l29712;
+    public long l29713;
+    public long l29714;
+    public long l29715;
+    public long l29716;
+    public long l29717;
+    public long l29718;
+    public long l29719;
+    public long l29720;
+    public long l29721;
+    public long l29722;
+    public long l29723;
+    public long l29724;
+    public long l29725;
+    public long l29726;
+    public long l29727;
+    public long l29728;
+    public long l29729;
+    public long l29730;
+    public long l29731;
+    public long l29732;
+    public long l29733;
+    public long l29734;
+    public long l29735;
+    public long l29736;
+    public long l29737;
+    public long l29738;
+    public long l29739;
+    public long l29740;
+    public long l29741;
+    public long l29742;
+    public long l29743;
+    public long l29744;
+    public long l29745;
+    public long l29746;
+    public long l29747;
+    public long l29748;
+    public long l29749;
+    public long l29750;
+    public long l29751;
+    public long l29752;
+    public long l29753;
+    public long l29754;
+    public long l29755;
+    public long l29756;
+    public long l29757;
+    public long l29758;
+    public long l29759;
+    public long l29760;
+    public long l29761;
+    public long l29762;
+    public long l29763;
+    public long l29764;
+    public long l29765;
+    public long l29766;
+    public long l29767;
+    public long l29768;
+    public long l29769;
+    public long l29770;
+    public long l29771;
+    public long l29772;
+    public long l29773;
+    public long l29774;
+    public long l29775;
+    public long l29776;
+    public long l29777;
+    public long l29778;
+    public long l29779;
+    public long l29780;
+    public long l29781;
+    public long l29782;
+    public long l29783;
+    public long l29784;
+    public long l29785;
+    public long l29786;
+    public long l29787;
+    public long l29788;
+    public long l29789;
+    public long l29790;
+    public long l29791;
+    public long l29792;
+    public long l29793;
+    public long l29794;
+    public long l29795;
+    public long l29796;
+    public long l29797;
+    public long l29798;
+    public long l29799;
+    public long l29800;
+    public long l29801;
+    public long l29802;
+    public long l29803;
+    public long l29804;
+    public long l29805;
+    public long l29806;
+    public long l29807;
+    public long l29808;
+    public long l29809;
+    public long l29810;
+    public long l29811;
+    public long l29812;
+    public long l29813;
+    public long l29814;
+    public long l29815;
+    public long l29816;
+    public long l29817;
+    public long l29818;
+    public long l29819;
+    public long l29820;
+    public long l29821;
+    public long l29822;
+    public long l29823;
+    public long l29824;
+    public long l29825;
+    public long l29826;
+    public long l29827;
+    public long l29828;
+    public long l29829;
+    public long l29830;
+    public long l29831;
+    public long l29832;
+    public long l29833;
+    public long l29834;
+    public long l29835;
+    public long l29836;
+    public long l29837;
+    public long l29838;
+    public long l29839;
+    public long l29840;
+    public long l29841;
+    public long l29842;
+    public long l29843;
+    public long l29844;
+    public long l29845;
+    public long l29846;
+    public long l29847;
+    public long l29848;
+    public long l29849;
+    public long l29850;
+    public long l29851;
+    public long l29852;
+    public long l29853;
+    public long l29854;
+    public long l29855;
+    public long l29856;
+    public long l29857;
+    public long l29858;
+    public long l29859;
+    public long l29860;
+    public long l29861;
+    public long l29862;
+    public long l29863;
+    public long l29864;
+    public long l29865;
+    public long l29866;
+    public long l29867;
+    public long l29868;
+    public long l29869;
+    public long l29870;
+    public long l29871;
+    public long l29872;
+    public long l29873;
+    public long l29874;
+    public long l29875;
+    public long l29876;
+    public long l29877;
+    public long l29878;
+    public long l29879;
+    public long l29880;
+    public long l29881;
+    public long l29882;
+    public long l29883;
+    public long l29884;
+    public long l29885;
+    public long l29886;
+    public long l29887;
+    public long l29888;
+    public long l29889;
+    public long l29890;
+    public long l29891;
+    public long l29892;
+    public long l29893;
+    public long l29894;
+    public long l29895;
+    public long l29896;
+    public long l29897;
+    public long l29898;
+    public long l29899;
+    public long l29900;
+    public long l29901;
+    public long l29902;
+    public long l29903;
+    public long l29904;
+    public long l29905;
+    public long l29906;
+    public long l29907;
+    public long l29908;
+    public long l29909;
+    public long l29910;
+    public long l29911;
+    public long l29912;
+    public long l29913;
+    public long l29914;
+    public long l29915;
+    public long l29916;
+    public long l29917;
+    public long l29918;
+    public long l29919;
+    public long l29920;
+    public long l29921;
+    public long l29922;
+    public long l29923;
+    public long l29924;
+    public long l29925;
+    public long l29926;
+    public long l29927;
+    public long l29928;
+    public long l29929;
+    public long l29930;
+    public long l29931;
+    public long l29932;
+    public long l29933;
+    public long l29934;
+    public long l29935;
+    public long l29936;
+    public long l29937;
+    public long l29938;
+    public long l29939;
+    public long l29940;
+    public long l29941;
+    public long l29942;
+    public long l29943;
+    public long l29944;
+    public long l29945;
+    public long l29946;
+    public long l29947;
+    public long l29948;
+    public long l29949;
+    public long l29950;
+    public long l29951;
+    public long l29952;
+    public long l29953;
+    public long l29954;
+    public long l29955;
+    public long l29956;
+    public long l29957;
+    public long l29958;
+    public long l29959;
+    public long l29960;
+    public long l29961;
+    public long l29962;
+    public long l29963;
+    public long l29964;
+    public long l29965;
+    public long l29966;
+    public long l29967;
+    public long l29968;
+    public long l29969;
+    public long l29970;
+    public long l29971;
+    public long l29972;
+    public long l29973;
+    public long l29974;
+    public long l29975;
+    public long l29976;
+    public long l29977;
+    public long l29978;
+    public long l29979;
+    public long l29980;
+    public long l29981;
+    public long l29982;
+    public long l29983;
+    public long l29984;
+    public long l29985;
+    public long l29986;
+    public long l29987;
+    public long l29988;
+    public long l29989;
+    public long l29990;
+    public long l29991;
+    public long l29992;
+    public long l29993;
+    public long l29994;
+    public long l29995;
+    public long l29996;
+    public long l29997;
+    public long l29998;
+    public long l29999;
+    public long l30000;
+    public long l30001;
+    public long l30002;
+    public long l30003;
+    public long l30004;
+    public long l30005;
+    public long l30006;
+    public long l30007;
+    public long l30008;
+    public long l30009;
+    public long l30010;
+    public long l30011;
+    public long l30012;
+    public long l30013;
+    public long l30014;
+    public long l30015;
+    public long l30016;
+    public long l30017;
+    public long l30018;
+    public long l30019;
+    public long l30020;
+    public long l30021;
+    public long l30022;
+    public long l30023;
+    public long l30024;
+    public long l30025;
+    public long l30026;
+    public long l30027;
+    public long l30028;
+    public long l30029;
+    public long l30030;
+    public long l30031;
+    public long l30032;
+    public long l30033;
+    public long l30034;
+    public long l30035;
+    public long l30036;
+    public long l30037;
+    public long l30038;
+    public long l30039;
+    public long l30040;
+    public long l30041;
+    public long l30042;
+    public long l30043;
+    public long l30044;
+    public long l30045;
+    public long l30046;
+    public long l30047;
+    public long l30048;
+    public long l30049;
+    public long l30050;
+    public long l30051;
+    public long l30052;
+    public long l30053;
+    public long l30054;
+    public long l30055;
+    public long l30056;
+    public long l30057;
+    public long l30058;
+    public long l30059;
+    public long l30060;
+    public long l30061;
+    public long l30062;
+    public long l30063;
+    public long l30064;
+    public long l30065;
+    public long l30066;
+    public long l30067;
+    public long l30068;
+    public long l30069;
+    public long l30070;
+    public long l30071;
+    public long l30072;
+    public long l30073;
+    public long l30074;
+    public long l30075;
+    public long l30076;
+    public long l30077;
+    public long l30078;
+    public long l30079;
+    public long l30080;
+    public long l30081;
+    public long l30082;
+    public long l30083;
+    public long l30084;
+    public long l30085;
+    public long l30086;
+    public long l30087;
+    public long l30088;
+    public long l30089;
+    public long l30090;
+    public long l30091;
+    public long l30092;
+    public long l30093;
+    public long l30094;
+    public long l30095;
+    public long l30096;
+    public long l30097;
+    public long l30098;
+    public long l30099;
+    public long l30100;
+    public long l30101;
+    public long l30102;
+    public long l30103;
+    public long l30104;
+    public long l30105;
+    public long l30106;
+    public long l30107;
+    public long l30108;
+    public long l30109;
+    public long l30110;
+    public long l30111;
+    public long l30112;
+    public long l30113;
+    public long l30114;
+    public long l30115;
+    public long l30116;
+    public long l30117;
+    public long l30118;
+    public long l30119;
+    public long l30120;
+    public long l30121;
+    public long l30122;
+    public long l30123;
+    public long l30124;
+    public long l30125;
+    public long l30126;
+    public long l30127;
+    public long l30128;
+    public long l30129;
+    public long l30130;
+    public long l30131;
+    public long l30132;
+    public long l30133;
+    public long l30134;
+    public long l30135;
+    public long l30136;
+    public long l30137;
+    public long l30138;
+    public long l30139;
+    public long l30140;
+    public long l30141;
+    public long l30142;
+    public long l30143;
+    public long l30144;
+    public long l30145;
+    public long l30146;
+    public long l30147;
+    public long l30148;
+    public long l30149;
+    public long l30150;
+    public long l30151;
+    public long l30152;
+    public long l30153;
+    public long l30154;
+    public long l30155;
+    public long l30156;
+    public long l30157;
+    public long l30158;
+    public long l30159;
+    public long l30160;
+    public long l30161;
+    public long l30162;
+    public long l30163;
+    public long l30164;
+    public long l30165;
+    public long l30166;
+    public long l30167;
+    public long l30168;
+    public long l30169;
+    public long l30170;
+    public long l30171;
+    public long l30172;
+    public long l30173;
+    public long l30174;
+    public long l30175;
+    public long l30176;
+    public long l30177;
+    public long l30178;
+    public long l30179;
+    public long l30180;
+    public long l30181;
+    public long l30182;
+    public long l30183;
+    public long l30184;
+    public long l30185;
+    public long l30186;
+    public long l30187;
+    public long l30188;
+    public long l30189;
+    public long l30190;
+    public long l30191;
+    public long l30192;
+    public long l30193;
+    public long l30194;
+    public long l30195;
+    public long l30196;
+    public long l30197;
+    public long l30198;
+    public long l30199;
+    public long l30200;
+    public long l30201;
+    public long l30202;
+    public long l30203;
+    public long l30204;
+    public long l30205;
+    public long l30206;
+    public long l30207;
+    public long l30208;
+    public long l30209;
+    public long l30210;
+    public long l30211;
+    public long l30212;
+    public long l30213;
+    public long l30214;
+    public long l30215;
+    public long l30216;
+    public long l30217;
+    public long l30218;
+    public long l30219;
+    public long l30220;
+    public long l30221;
+    public long l30222;
+    public long l30223;
+    public long l30224;
+    public long l30225;
+    public long l30226;
+    public long l30227;
+    public long l30228;
+    public long l30229;
+    public long l30230;
+    public long l30231;
+    public long l30232;
+    public long l30233;
+    public long l30234;
+    public long l30235;
+    public long l30236;
+    public long l30237;
+    public long l30238;
+    public long l30239;
+    public long l30240;
+    public long l30241;
+    public long l30242;
+    public long l30243;
+    public long l30244;
+    public long l30245;
+    public long l30246;
+    public long l30247;
+    public long l30248;
+    public long l30249;
+    public long l30250;
+    public long l30251;
+    public long l30252;
+    public long l30253;
+    public long l30254;
+    public long l30255;
+    public long l30256;
+    public long l30257;
+    public long l30258;
+    public long l30259;
+    public long l30260;
+    public long l30261;
+    public long l30262;
+    public long l30263;
+    public long l30264;
+    public long l30265;
+    public long l30266;
+    public long l30267;
+    public long l30268;
+    public long l30269;
+    public long l30270;
+    public long l30271;
+    public long l30272;
+    public long l30273;
+    public long l30274;
+    public long l30275;
+    public long l30276;
+    public long l30277;
+    public long l30278;
+    public long l30279;
+    public long l30280;
+    public long l30281;
+    public long l30282;
+    public long l30283;
+    public long l30284;
+    public long l30285;
+    public long l30286;
+    public long l30287;
+    public long l30288;
+    public long l30289;
+    public long l30290;
+    public long l30291;
+    public long l30292;
+    public long l30293;
+    public long l30294;
+    public long l30295;
+    public long l30296;
+    public long l30297;
+    public long l30298;
+    public long l30299;
+    public long l30300;
+    public long l30301;
+    public long l30302;
+    public long l30303;
+    public long l30304;
+    public long l30305;
+    public long l30306;
+    public long l30307;
+    public long l30308;
+    public long l30309;
+    public long l30310;
+    public long l30311;
+    public long l30312;
+    public long l30313;
+    public long l30314;
+    public long l30315;
+    public long l30316;
+    public long l30317;
+    public long l30318;
+    public long l30319;
+    public long l30320;
+    public long l30321;
+    public long l30322;
+    public long l30323;
+    public long l30324;
+    public long l30325;
+    public long l30326;
+    public long l30327;
+    public long l30328;
+    public long l30329;
+    public long l30330;
+    public long l30331;
+    public long l30332;
+    public long l30333;
+    public long l30334;
+    public long l30335;
+    public long l30336;
+    public long l30337;
+    public long l30338;
+    public long l30339;
+    public long l30340;
+    public long l30341;
+    public long l30342;
+    public long l30343;
+    public long l30344;
+    public long l30345;
+    public long l30346;
+    public long l30347;
+    public long l30348;
+    public long l30349;
+    public long l30350;
+    public long l30351;
+    public long l30352;
+    public long l30353;
+    public long l30354;
+    public long l30355;
+    public long l30356;
+    public long l30357;
+    public long l30358;
+    public long l30359;
+    public long l30360;
+    public long l30361;
+    public long l30362;
+    public long l30363;
+    public long l30364;
+    public long l30365;
+    public long l30366;
+    public long l30367;
+    public long l30368;
+    public long l30369;
+    public long l30370;
+    public long l30371;
+    public long l30372;
+    public long l30373;
+    public long l30374;
+    public long l30375;
+    public long l30376;
+    public long l30377;
+    public long l30378;
+    public long l30379;
+    public long l30380;
+    public long l30381;
+    public long l30382;
+    public long l30383;
+    public long l30384;
+    public long l30385;
+    public long l30386;
+    public long l30387;
+    public long l30388;
+    public long l30389;
+    public long l30390;
+    public long l30391;
+    public long l30392;
+    public long l30393;
+    public long l30394;
+    public long l30395;
+    public long l30396;
+    public long l30397;
+    public long l30398;
+    public long l30399;
+    public long l30400;
+    public long l30401;
+    public long l30402;
+    public long l30403;
+    public long l30404;
+    public long l30405;
+    public long l30406;
+    public long l30407;
+    public long l30408;
+    public long l30409;
+    public long l30410;
+    public long l30411;
+    public long l30412;
+    public long l30413;
+    public long l30414;
+    public long l30415;
+    public long l30416;
+    public long l30417;
+    public long l30418;
+    public long l30419;
+    public long l30420;
+    public long l30421;
+    public long l30422;
+    public long l30423;
+    public long l30424;
+    public long l30425;
+    public long l30426;
+    public long l30427;
+    public long l30428;
+    public long l30429;
+    public long l30430;
+    public long l30431;
+    public long l30432;
+    public long l30433;
+    public long l30434;
+    public long l30435;
+    public long l30436;
+    public long l30437;
+    public long l30438;
+    public long l30439;
+    public long l30440;
+    public long l30441;
+    public long l30442;
+    public long l30443;
+    public long l30444;
+    public long l30445;
+    public long l30446;
+    public long l30447;
+    public long l30448;
+    public long l30449;
+    public long l30450;
+    public long l30451;
+    public long l30452;
+    public long l30453;
+    public long l30454;
+    public long l30455;
+    public long l30456;
+    public long l30457;
+    public long l30458;
+    public long l30459;
+    public long l30460;
+    public long l30461;
+    public long l30462;
+    public long l30463;
+    public long l30464;
+    public long l30465;
+    public long l30466;
+    public long l30467;
+    public long l30468;
+    public long l30469;
+    public long l30470;
+    public long l30471;
+    public long l30472;
+    public long l30473;
+    public long l30474;
+    public long l30475;
+    public long l30476;
+    public long l30477;
+    public long l30478;
+    public long l30479;
+    public long l30480;
+    public long l30481;
+    public long l30482;
+    public long l30483;
+    public long l30484;
+    public long l30485;
+    public long l30486;
+    public long l30487;
+    public long l30488;
+    public long l30489;
+    public long l30490;
+    public long l30491;
+    public long l30492;
+    public long l30493;
+    public long l30494;
+    public long l30495;
+    public long l30496;
+    public long l30497;
+    public long l30498;
+    public long l30499;
+    public long l30500;
+    public long l30501;
+    public long l30502;
+    public long l30503;
+    public long l30504;
+    public long l30505;
+    public long l30506;
+    public long l30507;
+    public long l30508;
+    public long l30509;
+    public long l30510;
+    public long l30511;
+    public long l30512;
+    public long l30513;
+    public long l30514;
+    public long l30515;
+    public long l30516;
+    public long l30517;
+    public long l30518;
+    public long l30519;
+    public long l30520;
+    public long l30521;
+    public long l30522;
+    public long l30523;
+    public long l30524;
+    public long l30525;
+    public long l30526;
+    public long l30527;
+    public long l30528;
+    public long l30529;
+    public long l30530;
+    public long l30531;
+    public long l30532;
+    public long l30533;
+    public long l30534;
+    public long l30535;
+    public long l30536;
+    public long l30537;
+    public long l30538;
+    public long l30539;
+    public long l30540;
+    public long l30541;
+    public long l30542;
+    public long l30543;
+    public long l30544;
+    public long l30545;
+    public long l30546;
+    public long l30547;
+    public long l30548;
+    public long l30549;
+    public long l30550;
+    public long l30551;
+    public long l30552;
+    public long l30553;
+    public long l30554;
+    public long l30555;
+    public long l30556;
+    public long l30557;
+    public long l30558;
+    public long l30559;
+    public long l30560;
+    public long l30561;
+    public long l30562;
+    public long l30563;
+    public long l30564;
+    public long l30565;
+    public long l30566;
+    public long l30567;
+    public long l30568;
+    public long l30569;
+    public long l30570;
+    public long l30571;
+    public long l30572;
+    public long l30573;
+    public long l30574;
+    public long l30575;
+    public long l30576;
+    public long l30577;
+    public long l30578;
+    public long l30579;
+    public long l30580;
+    public long l30581;
+    public long l30582;
+    public long l30583;
+    public long l30584;
+    public long l30585;
+    public long l30586;
+    public long l30587;
+    public long l30588;
+    public long l30589;
+    public long l30590;
+    public long l30591;
+    public long l30592;
+    public long l30593;
+    public long l30594;
+    public long l30595;
+    public long l30596;
+    public long l30597;
+    public long l30598;
+    public long l30599;
+    public long l30600;
+    public long l30601;
+    public long l30602;
+    public long l30603;
+    public long l30604;
+    public long l30605;
+    public long l30606;
+    public long l30607;
+    public long l30608;
+    public long l30609;
+    public long l30610;
+    public long l30611;
+    public long l30612;
+    public long l30613;
+    public long l30614;
+    public long l30615;
+    public long l30616;
+    public long l30617;
+    public long l30618;
+    public long l30619;
+    public long l30620;
+    public long l30621;
+    public long l30622;
+    public long l30623;
+    public long l30624;
+    public long l30625;
+    public long l30626;
+    public long l30627;
+    public long l30628;
+    public long l30629;
+    public long l30630;
+    public long l30631;
+    public long l30632;
+    public long l30633;
+    public long l30634;
+    public long l30635;
+    public long l30636;
+    public long l30637;
+    public long l30638;
+    public long l30639;
+    public long l30640;
+    public long l30641;
+    public long l30642;
+    public long l30643;
+    public long l30644;
+    public long l30645;
+    public long l30646;
+    public long l30647;
+    public long l30648;
+    public long l30649;
+    public long l30650;
+    public long l30651;
+    public long l30652;
+    public long l30653;
+    public long l30654;
+    public long l30655;
+    public long l30656;
+    public long l30657;
+    public long l30658;
+    public long l30659;
+    public long l30660;
+    public long l30661;
+    public long l30662;
+    public long l30663;
+    public long l30664;
+    public long l30665;
+    public long l30666;
+    public long l30667;
+    public long l30668;
+    public long l30669;
+    public long l30670;
+    public long l30671;
+    public long l30672;
+    public long l30673;
+    public long l30674;
+    public long l30675;
+    public long l30676;
+    public long l30677;
+    public long l30678;
+    public long l30679;
+    public long l30680;
+    public long l30681;
+    public long l30682;
+    public long l30683;
+    public long l30684;
+    public long l30685;
+    public long l30686;
+    public long l30687;
+    public long l30688;
+    public long l30689;
+    public long l30690;
+    public long l30691;
+    public long l30692;
+    public long l30693;
+    public long l30694;
+    public long l30695;
+    public long l30696;
+    public long l30697;
+    public long l30698;
+    public long l30699;
+    public long l30700;
+    public long l30701;
+    public long l30702;
+    public long l30703;
+    public long l30704;
+    public long l30705;
+    public long l30706;
+    public long l30707;
+    public long l30708;
+    public long l30709;
+    public long l30710;
+    public long l30711;
+    public long l30712;
+    public long l30713;
+    public long l30714;
+    public long l30715;
+    public long l30716;
+    public long l30717;
+    public long l30718;
+    public long l30719;
+    public long l30720;
+    public long l30721;
+    public long l30722;
+    public long l30723;
+    public long l30724;
+    public long l30725;
+    public long l30726;
+    public long l30727;
+    public long l30728;
+    public long l30729;
+    public long l30730;
+    public long l30731;
+    public long l30732;
+    public long l30733;
+    public long l30734;
+    public long l30735;
+    public long l30736;
+    public long l30737;
+    public long l30738;
+    public long l30739;
+    public long l30740;
+    public long l30741;
+    public long l30742;
+    public long l30743;
+    public long l30744;
+    public long l30745;
+    public long l30746;
+    public long l30747;
+    public long l30748;
+    public long l30749;
+    public long l30750;
+    public long l30751;
+    public long l30752;
+    public long l30753;
+    public long l30754;
+    public long l30755;
+    public long l30756;
+    public long l30757;
+    public long l30758;
+    public long l30759;
+    public long l30760;
+    public long l30761;
+    public long l30762;
+    public long l30763;
+    public long l30764;
+    public long l30765;
+    public long l30766;
+    public long l30767;
+    public long l30768;
+    public long l30769;
+    public long l30770;
+    public long l30771;
+    public long l30772;
+    public long l30773;
+    public long l30774;
+    public long l30775;
+    public long l30776;
+    public long l30777;
+    public long l30778;
+    public long l30779;
+    public long l30780;
+    public long l30781;
+    public long l30782;
+    public long l30783;
+    public long l30784;
+    public long l30785;
+    public long l30786;
+    public long l30787;
+    public long l30788;
+    public long l30789;
+    public long l30790;
+    public long l30791;
+    public long l30792;
+    public long l30793;
+    public long l30794;
+    public long l30795;
+    public long l30796;
+    public long l30797;
+    public long l30798;
+    public long l30799;
+    public long l30800;
+    public long l30801;
+    public long l30802;
+    public long l30803;
+    public long l30804;
+    public long l30805;
+    public long l30806;
+    public long l30807;
+    public long l30808;
+    public long l30809;
+    public long l30810;
+    public long l30811;
+    public long l30812;
+    public long l30813;
+    public long l30814;
+    public long l30815;
+    public long l30816;
+    public long l30817;
+    public long l30818;
+    public long l30819;
+    public long l30820;
+    public long l30821;
+    public long l30822;
+    public long l30823;
+    public long l30824;
+    public long l30825;
+    public long l30826;
+    public long l30827;
+    public long l30828;
+    public long l30829;
+    public long l30830;
+    public long l30831;
+    public long l30832;
+    public long l30833;
+    public long l30834;
+    public long l30835;
+    public long l30836;
+    public long l30837;
+    public long l30838;
+    public long l30839;
+    public long l30840;
+    public long l30841;
+    public long l30842;
+    public long l30843;
+    public long l30844;
+    public long l30845;
+    public long l30846;
+    public long l30847;
+    public long l30848;
+    public long l30849;
+    public long l30850;
+    public long l30851;
+    public long l30852;
+    public long l30853;
+    public long l30854;
+    public long l30855;
+    public long l30856;
+    public long l30857;
+    public long l30858;
+    public long l30859;
+    public long l30860;
+    public long l30861;
+    public long l30862;
+    public long l30863;
+    public long l30864;
+    public long l30865;
+    public long l30866;
+    public long l30867;
+    public long l30868;
+    public long l30869;
+    public long l30870;
+    public long l30871;
+    public long l30872;
+    public long l30873;
+    public long l30874;
+    public long l30875;
+    public long l30876;
+    public long l30877;
+    public long l30878;
+    public long l30879;
+    public long l30880;
+    public long l30881;
+    public long l30882;
+    public long l30883;
+    public long l30884;
+    public long l30885;
+    public long l30886;
+    public long l30887;
+    public long l30888;
+    public long l30889;
+    public long l30890;
+    public long l30891;
+    public long l30892;
+    public long l30893;
+    public long l30894;
+    public long l30895;
+    public long l30896;
+    public long l30897;
+    public long l30898;
+    public long l30899;
+    public long l30900;
+    public long l30901;
+    public long l30902;
+    public long l30903;
+    public long l30904;
+    public long l30905;
+    public long l30906;
+    public long l30907;
+    public long l30908;
+    public long l30909;
+    public long l30910;
+    public long l30911;
+    public long l30912;
+    public long l30913;
+    public long l30914;
+    public long l30915;
+    public long l30916;
+    public long l30917;
+    public long l30918;
+    public long l30919;
+    public long l30920;
+    public long l30921;
+    public long l30922;
+    public long l30923;
+    public long l30924;
+    public long l30925;
+    public long l30926;
+    public long l30927;
+    public long l30928;
+    public long l30929;
+    public long l30930;
+    public long l30931;
+    public long l30932;
+    public long l30933;
+    public long l30934;
+    public long l30935;
+    public long l30936;
+    public long l30937;
+    public long l30938;
+    public long l30939;
+    public long l30940;
+    public long l30941;
+    public long l30942;
+    public long l30943;
+    public long l30944;
+    public long l30945;
+    public long l30946;
+    public long l30947;
+    public long l30948;
+    public long l30949;
+    public long l30950;
+    public long l30951;
+    public long l30952;
+    public long l30953;
+    public long l30954;
+    public long l30955;
+    public long l30956;
+    public long l30957;
+    public long l30958;
+    public long l30959;
+    public long l30960;
+    public long l30961;
+    public long l30962;
+    public long l30963;
+    public long l30964;
+    public long l30965;
+    public long l30966;
+    public long l30967;
+    public long l30968;
+    public long l30969;
+    public long l30970;
+    public long l30971;
+    public long l30972;
+    public long l30973;
+    public long l30974;
+    public long l30975;
+    public long l30976;
+    public long l30977;
+    public long l30978;
+    public long l30979;
+    public long l30980;
+    public long l30981;
+    public long l30982;
+    public long l30983;
+    public long l30984;
+    public long l30985;
+    public long l30986;
+    public long l30987;
+    public long l30988;
+    public long l30989;
+    public long l30990;
+    public long l30991;
+    public long l30992;
+    public long l30993;
+    public long l30994;
+    public long l30995;
+    public long l30996;
+    public long l30997;
+    public long l30998;
+    public long l30999;
+    public long l31000;
+    public long l31001;
+    public long l31002;
+    public long l31003;
+    public long l31004;
+    public long l31005;
+    public long l31006;
+    public long l31007;
+    public long l31008;
+    public long l31009;
+    public long l31010;
+    public long l31011;
+    public long l31012;
+    public long l31013;
+    public long l31014;
+    public long l31015;
+    public long l31016;
+    public long l31017;
+    public long l31018;
+    public long l31019;
+    public long l31020;
+    public long l31021;
+    public long l31022;
+    public long l31023;
+    public long l31024;
+    public long l31025;
+    public long l31026;
+    public long l31027;
+    public long l31028;
+    public long l31029;
+    public long l31030;
+    public long l31031;
+    public long l31032;
+    public long l31033;
+    public long l31034;
+    public long l31035;
+    public long l31036;
+    public long l31037;
+    public long l31038;
+    public long l31039;
+    public long l31040;
+    public long l31041;
+    public long l31042;
+    public long l31043;
+    public long l31044;
+    public long l31045;
+    public long l31046;
+    public long l31047;
+    public long l31048;
+    public long l31049;
+    public long l31050;
+    public long l31051;
+    public long l31052;
+    public long l31053;
+    public long l31054;
+    public long l31055;
+    public long l31056;
+    public long l31057;
+    public long l31058;
+    public long l31059;
+    public long l31060;
+    public long l31061;
+    public long l31062;
+    public long l31063;
+    public long l31064;
+    public long l31065;
+    public long l31066;
+    public long l31067;
+    public long l31068;
+    public long l31069;
+    public long l31070;
+    public long l31071;
+    public long l31072;
+    public long l31073;
+    public long l31074;
+    public long l31075;
+    public long l31076;
+    public long l31077;
+    public long l31078;
+    public long l31079;
+    public long l31080;
+    public long l31081;
+    public long l31082;
+    public long l31083;
+    public long l31084;
+    public long l31085;
+    public long l31086;
+    public long l31087;
+    public long l31088;
+    public long l31089;
+    public long l31090;
+    public long l31091;
+    public long l31092;
+    public long l31093;
+    public long l31094;
+    public long l31095;
+    public long l31096;
+    public long l31097;
+    public long l31098;
+    public long l31099;
+    public long l31100;
+    public long l31101;
+    public long l31102;
+    public long l31103;
+    public long l31104;
+    public long l31105;
+    public long l31106;
+    public long l31107;
+    public long l31108;
+    public long l31109;
+    public long l31110;
+    public long l31111;
+    public long l31112;
+    public long l31113;
+    public long l31114;
+    public long l31115;
+    public long l31116;
+    public long l31117;
+    public long l31118;
+    public long l31119;
+    public long l31120;
+    public long l31121;
+    public long l31122;
+    public long l31123;
+    public long l31124;
+    public long l31125;
+    public long l31126;
+    public long l31127;
+    public long l31128;
+    public long l31129;
+    public long l31130;
+    public long l31131;
+    public long l31132;
+    public long l31133;
+    public long l31134;
+    public long l31135;
+    public long l31136;
+    public long l31137;
+    public long l31138;
+    public long l31139;
+    public long l31140;
+    public long l31141;
+    public long l31142;
+    public long l31143;
+    public long l31144;
+    public long l31145;
+    public long l31146;
+    public long l31147;
+    public long l31148;
+    public long l31149;
+    public long l31150;
+    public long l31151;
+    public long l31152;
+    public long l31153;
+    public long l31154;
+    public long l31155;
+    public long l31156;
+    public long l31157;
+    public long l31158;
+    public long l31159;
+    public long l31160;
+    public long l31161;
+    public long l31162;
+    public long l31163;
+    public long l31164;
+    public long l31165;
+    public long l31166;
+    public long l31167;
+    public long l31168;
+    public long l31169;
+    public long l31170;
+    public long l31171;
+    public long l31172;
+    public long l31173;
+    public long l31174;
+    public long l31175;
+    public long l31176;
+    public long l31177;
+    public long l31178;
+    public long l31179;
+    public long l31180;
+    public long l31181;
+    public long l31182;
+    public long l31183;
+    public long l31184;
+    public long l31185;
+    public long l31186;
+    public long l31187;
+    public long l31188;
+    public long l31189;
+    public long l31190;
+    public long l31191;
+    public long l31192;
+    public long l31193;
+    public long l31194;
+    public long l31195;
+    public long l31196;
+    public long l31197;
+    public long l31198;
+    public long l31199;
+    public long l31200;
+    public long l31201;
+    public long l31202;
+    public long l31203;
+    public long l31204;
+    public long l31205;
+    public long l31206;
+    public long l31207;
+    public long l31208;
+    public long l31209;
+    public long l31210;
+    public long l31211;
+    public long l31212;
+    public long l31213;
+    public long l31214;
+    public long l31215;
+    public long l31216;
+    public long l31217;
+    public long l31218;
+    public long l31219;
+    public long l31220;
+    public long l31221;
+    public long l31222;
+    public long l31223;
+    public long l31224;
+    public long l31225;
+    public long l31226;
+    public long l31227;
+    public long l31228;
+    public long l31229;
+    public long l31230;
+    public long l31231;
+    public long l31232;
+    public long l31233;
+    public long l31234;
+    public long l31235;
+    public long l31236;
+    public long l31237;
+    public long l31238;
+    public long l31239;
+    public long l31240;
+    public long l31241;
+    public long l31242;
+    public long l31243;
+    public long l31244;
+    public long l31245;
+    public long l31246;
+    public long l31247;
+    public long l31248;
+    public long l31249;
+    public long l31250;
+    public long l31251;
+    public long l31252;
+    public long l31253;
+    public long l31254;
+    public long l31255;
+    public long l31256;
+    public long l31257;
+    public long l31258;
+    public long l31259;
+    public long l31260;
+    public long l31261;
+    public long l31262;
+    public long l31263;
+    public long l31264;
+    public long l31265;
+    public long l31266;
+    public long l31267;
+    public long l31268;
+    public long l31269;
+    public long l31270;
+    public long l31271;
+    public long l31272;
+    public long l31273;
+    public long l31274;
+    public long l31275;
+    public long l31276;
+    public long l31277;
+    public long l31278;
+    public long l31279;
+    public long l31280;
+    public long l31281;
+    public long l31282;
+    public long l31283;
+    public long l31284;
+    public long l31285;
+    public long l31286;
+    public long l31287;
+    public long l31288;
+    public long l31289;
+    public long l31290;
+    public long l31291;
+    public long l31292;
+    public long l31293;
+    public long l31294;
+    public long l31295;
+    public long l31296;
+    public long l31297;
+    public long l31298;
+    public long l31299;
+    public long l31300;
+    public long l31301;
+    public long l31302;
+    public long l31303;
+    public long l31304;
+    public long l31305;
+    public long l31306;
+    public long l31307;
+    public long l31308;
+    public long l31309;
+    public long l31310;
+    public long l31311;
+    public long l31312;
+    public long l31313;
+    public long l31314;
+    public long l31315;
+    public long l31316;
+    public long l31317;
+    public long l31318;
+    public long l31319;
+    public long l31320;
+    public long l31321;
+    public long l31322;
+    public long l31323;
+    public long l31324;
+    public long l31325;
+    public long l31326;
+    public long l31327;
+    public long l31328;
+    public long l31329;
+    public long l31330;
+    public long l31331;
+    public long l31332;
+    public long l31333;
+    public long l31334;
+    public long l31335;
+    public long l31336;
+    public long l31337;
+    public long l31338;
+    public long l31339;
+    public long l31340;
+    public long l31341;
+    public long l31342;
+    public long l31343;
+    public long l31344;
+    public long l31345;
+    public long l31346;
+    public long l31347;
+    public long l31348;
+    public long l31349;
+    public long l31350;
+    public long l31351;
+    public long l31352;
+    public long l31353;
+    public long l31354;
+    public long l31355;
+    public long l31356;
+    public long l31357;
+    public long l31358;
+    public long l31359;
+    public long l31360;
+    public long l31361;
+    public long l31362;
+    public long l31363;
+    public long l31364;
+    public long l31365;
+    public long l31366;
+    public long l31367;
+    public long l31368;
+    public long l31369;
+    public long l31370;
+    public long l31371;
+    public long l31372;
+    public long l31373;
+    public long l31374;
+    public long l31375;
+    public long l31376;
+    public long l31377;
+    public long l31378;
+    public long l31379;
+    public long l31380;
+    public long l31381;
+    public long l31382;
+    public long l31383;
+    public long l31384;
+    public long l31385;
+    public long l31386;
+    public long l31387;
+    public long l31388;
+    public long l31389;
+    public long l31390;
+    public long l31391;
+    public long l31392;
+    public long l31393;
+    public long l31394;
+    public long l31395;
+    public long l31396;
+    public long l31397;
+    public long l31398;
+    public long l31399;
+    public long l31400;
+    public long l31401;
+    public long l31402;
+    public long l31403;
+    public long l31404;
+    public long l31405;
+    public long l31406;
+    public long l31407;
+    public long l31408;
+    public long l31409;
+    public long l31410;
+    public long l31411;
+    public long l31412;
+    public long l31413;
+    public long l31414;
+    public long l31415;
+    public long l31416;
+    public long l31417;
+    public long l31418;
+    public long l31419;
+    public long l31420;
+    public long l31421;
+    public long l31422;
+    public long l31423;
+    public long l31424;
+    public long l31425;
+    public long l31426;
+    public long l31427;
+    public long l31428;
+    public long l31429;
+    public long l31430;
+    public long l31431;
+    public long l31432;
+    public long l31433;
+    public long l31434;
+    public long l31435;
+    public long l31436;
+    public long l31437;
+    public long l31438;
+    public long l31439;
+    public long l31440;
+    public long l31441;
+    public long l31442;
+    public long l31443;
+    public long l31444;
+    public long l31445;
+    public long l31446;
+    public long l31447;
+    public long l31448;
+    public long l31449;
+    public long l31450;
+    public long l31451;
+    public long l31452;
+    public long l31453;
+    public long l31454;
+    public long l31455;
+    public long l31456;
+    public long l31457;
+    public long l31458;
+    public long l31459;
+    public long l31460;
+    public long l31461;
+    public long l31462;
+    public long l31463;
+    public long l31464;
+    public long l31465;
+    public long l31466;
+    public long l31467;
+    public long l31468;
+    public long l31469;
+    public long l31470;
+    public long l31471;
+    public long l31472;
+    public long l31473;
+    public long l31474;
+    public long l31475;
+    public long l31476;
+    public long l31477;
+    public long l31478;
+    public long l31479;
+    public long l31480;
+    public long l31481;
+    public long l31482;
+    public long l31483;
+    public long l31484;
+    public long l31485;
+    public long l31486;
+    public long l31487;
+    public long l31488;
+    public long l31489;
+    public long l31490;
+    public long l31491;
+    public long l31492;
+    public long l31493;
+    public long l31494;
+    public long l31495;
+    public long l31496;
+    public long l31497;
+    public long l31498;
+    public long l31499;
+    public long l31500;
+    public long l31501;
+    public long l31502;
+    public long l31503;
+    public long l31504;
+    public long l31505;
+    public long l31506;
+    public long l31507;
+    public long l31508;
+    public long l31509;
+    public long l31510;
+    public long l31511;
+    public long l31512;
+    public long l31513;
+    public long l31514;
+    public long l31515;
+    public long l31516;
+    public long l31517;
+    public long l31518;
+    public long l31519;
+    public long l31520;
+    public long l31521;
+    public long l31522;
+    public long l31523;
+    public long l31524;
+    public long l31525;
+    public long l31526;
+    public long l31527;
+    public long l31528;
+    public long l31529;
+    public long l31530;
+    public long l31531;
+    public long l31532;
+    public long l31533;
+    public long l31534;
+    public long l31535;
+    public long l31536;
+    public long l31537;
+    public long l31538;
+    public long l31539;
+    public long l31540;
+    public long l31541;
+    public long l31542;
+    public long l31543;
+    public long l31544;
+    public long l31545;
+    public long l31546;
+    public long l31547;
+    public long l31548;
+    public long l31549;
+    public long l31550;
+    public long l31551;
+    public long l31552;
+    public long l31553;
+    public long l31554;
+    public long l31555;
+    public long l31556;
+    public long l31557;
+    public long l31558;
+    public long l31559;
+    public long l31560;
+    public long l31561;
+    public long l31562;
+    public long l31563;
+    public long l31564;
+    public long l31565;
+    public long l31566;
+    public long l31567;
+    public long l31568;
+    public long l31569;
+    public long l31570;
+    public long l31571;
+    public long l31572;
+    public long l31573;
+    public long l31574;
+    public long l31575;
+    public long l31576;
+    public long l31577;
+    public long l31578;
+    public long l31579;
+    public long l31580;
+    public long l31581;
+    public long l31582;
+    public long l31583;
+    public long l31584;
+    public long l31585;
+    public long l31586;
+    public long l31587;
+    public long l31588;
+    public long l31589;
+    public long l31590;
+    public long l31591;
+    public long l31592;
+    public long l31593;
+    public long l31594;
+    public long l31595;
+    public long l31596;
+    public long l31597;
+    public long l31598;
+    public long l31599;
+    public long l31600;
+    public long l31601;
+    public long l31602;
+    public long l31603;
+    public long l31604;
+    public long l31605;
+    public long l31606;
+    public long l31607;
+    public long l31608;
+    public long l31609;
+    public long l31610;
+    public long l31611;
+    public long l31612;
+    public long l31613;
+    public long l31614;
+    public long l31615;
+    public long l31616;
+    public long l31617;
+    public long l31618;
+    public long l31619;
+    public long l31620;
+    public long l31621;
+    public long l31622;
+    public long l31623;
+    public long l31624;
+    public long l31625;
+    public long l31626;
+    public long l31627;
+    public long l31628;
+    public long l31629;
+    public long l31630;
+    public long l31631;
+    public long l31632;
+    public long l31633;
+    public long l31634;
+    public long l31635;
+    public long l31636;
+    public long l31637;
+    public long l31638;
+    public long l31639;
+    public long l31640;
+    public long l31641;
+    public long l31642;
+    public long l31643;
+    public long l31644;
+    public long l31645;
+    public long l31646;
+    public long l31647;
+    public long l31648;
+    public long l31649;
+    public long l31650;
+    public long l31651;
+    public long l31652;
+    public long l31653;
+    public long l31654;
+    public long l31655;
+    public long l31656;
+    public long l31657;
+    public long l31658;
+    public long l31659;
+    public long l31660;
+    public long l31661;
+    public long l31662;
+    public long l31663;
+    public long l31664;
+    public long l31665;
+    public long l31666;
+    public long l31667;
+    public long l31668;
+    public long l31669;
+    public long l31670;
+    public long l31671;
+    public long l31672;
+    public long l31673;
+    public long l31674;
+    public long l31675;
+    public long l31676;
+    public long l31677;
+    public long l31678;
+    public long l31679;
+    public long l31680;
+    public long l31681;
+    public long l31682;
+    public long l31683;
+    public long l31684;
+    public long l31685;
+    public long l31686;
+    public long l31687;
+    public long l31688;
+    public long l31689;
+    public long l31690;
+    public long l31691;
+    public long l31692;
+    public long l31693;
+    public long l31694;
+    public long l31695;
+    public long l31696;
+    public long l31697;
+    public long l31698;
+    public long l31699;
+    public long l31700;
+    public long l31701;
+    public long l31702;
+    public long l31703;
+    public long l31704;
+    public long l31705;
+    public long l31706;
+    public long l31707;
+    public long l31708;
+    public long l31709;
+    public long l31710;
+    public long l31711;
+    public long l31712;
+    public long l31713;
+    public long l31714;
+    public long l31715;
+    public long l31716;
+    public long l31717;
+    public long l31718;
+    public long l31719;
+    public long l31720;
+    public long l31721;
+    public long l31722;
+    public long l31723;
+    public long l31724;
+    public long l31725;
+    public long l31726;
+    public long l31727;
+    public long l31728;
+    public long l31729;
+    public long l31730;
+    public long l31731;
+    public long l31732;
+    public long l31733;
+    public long l31734;
+    public long l31735;
+    public long l31736;
+    public long l31737;
+    public long l31738;
+    public long l31739;
+    public long l31740;
+    public long l31741;
+    public long l31742;
+    public long l31743;
+    public long l31744;
+    public long l31745;
+    public long l31746;
+    public long l31747;
+    public long l31748;
+    public long l31749;
+    public long l31750;
+    public long l31751;
+    public long l31752;
+    public long l31753;
+    public long l31754;
+    public long l31755;
+    public long l31756;
+    public long l31757;
+    public long l31758;
+    public long l31759;
+    public long l31760;
+    public long l31761;
+    public long l31762;
+    public long l31763;
+    public long l31764;
+    public long l31765;
+    public long l31766;
+    public long l31767;
+    public long l31768;
+    public long l31769;
+    public long l31770;
+    public long l31771;
+    public long l31772;
+    public long l31773;
+    public long l31774;
+    public long l31775;
+    public long l31776;
+    public long l31777;
+    public long l31778;
+    public long l31779;
+    public long l31780;
+    public long l31781;
+    public long l31782;
+    public long l31783;
+    public long l31784;
+    public long l31785;
+    public long l31786;
+    public long l31787;
+    public long l31788;
+    public long l31789;
+    public long l31790;
+    public long l31791;
+    public long l31792;
+    public long l31793;
+    public long l31794;
+    public long l31795;
+    public long l31796;
+    public long l31797;
+    public long l31798;
+    public long l31799;
+    public long l31800;
+    public long l31801;
+    public long l31802;
+    public long l31803;
+    public long l31804;
+    public long l31805;
+    public long l31806;
+    public long l31807;
+    public long l31808;
+    public long l31809;
+    public long l31810;
+    public long l31811;
+    public long l31812;
+    public long l31813;
+    public long l31814;
+    public long l31815;
+    public long l31816;
+    public long l31817;
+    public long l31818;
+    public long l31819;
+    public long l31820;
+    public long l31821;
+    public long l31822;
+    public long l31823;
+    public long l31824;
+    public long l31825;
+    public long l31826;
+    public long l31827;
+    public long l31828;
+    public long l31829;
+    public long l31830;
+    public long l31831;
+    public long l31832;
+    public long l31833;
+    public long l31834;
+    public long l31835;
+    public long l31836;
+    public long l31837;
+    public long l31838;
+    public long l31839;
+    public long l31840;
+    public long l31841;
+    public long l31842;
+    public long l31843;
+    public long l31844;
+    public long l31845;
+    public long l31846;
+    public long l31847;
+    public long l31848;
+    public long l31849;
+    public long l31850;
+    public long l31851;
+    public long l31852;
+    public long l31853;
+    public long l31854;
+    public long l31855;
+    public long l31856;
+    public long l31857;
+    public long l31858;
+    public long l31859;
+    public long l31860;
+    public long l31861;
+    public long l31862;
+    public long l31863;
+    public long l31864;
+    public long l31865;
+    public long l31866;
+    public long l31867;
+    public long l31868;
+    public long l31869;
+    public long l31870;
+    public long l31871;
+    public long l31872;
+    public long l31873;
+    public long l31874;
+    public long l31875;
+    public long l31876;
+    public long l31877;
+    public long l31878;
+    public long l31879;
+    public long l31880;
+    public long l31881;
+    public long l31882;
+    public long l31883;
+    public long l31884;
+    public long l31885;
+    public long l31886;
+    public long l31887;
+    public long l31888;
+    public long l31889;
+    public long l31890;
+    public long l31891;
+    public long l31892;
+    public long l31893;
+    public long l31894;
+    public long l31895;
+    public long l31896;
+    public long l31897;
+    public long l31898;
+    public long l31899;
+    public long l31900;
+    public long l31901;
+    public long l31902;
+    public long l31903;
+    public long l31904;
+    public long l31905;
+    public long l31906;
+    public long l31907;
+    public long l31908;
+    public long l31909;
+    public long l31910;
+    public long l31911;
+    public long l31912;
+    public long l31913;
+    public long l31914;
+    public long l31915;
+    public long l31916;
+    public long l31917;
+    public long l31918;
+    public long l31919;
+    public long l31920;
+    public long l31921;
+    public long l31922;
+    public long l31923;
+    public long l31924;
+    public long l31925;
+    public long l31926;
+    public long l31927;
+    public long l31928;
+    public long l31929;
+    public long l31930;
+    public long l31931;
+    public long l31932;
+    public long l31933;
+    public long l31934;
+    public long l31935;
+    public long l31936;
+    public long l31937;
+    public long l31938;
+    public long l31939;
+    public long l31940;
+    public long l31941;
+    public long l31942;
+    public long l31943;
+    public long l31944;
+    public long l31945;
+    public long l31946;
+    public long l31947;
+    public long l31948;
+    public long l31949;
+    public long l31950;
+    public long l31951;
+    public long l31952;
+    public long l31953;
+    public long l31954;
+    public long l31955;
+    public long l31956;
+    public long l31957;
+    public long l31958;
+    public long l31959;
+    public long l31960;
+    public long l31961;
+    public long l31962;
+    public long l31963;
+    public long l31964;
+    public long l31965;
+    public long l31966;
+    public long l31967;
+    public long l31968;
+    public long l31969;
+    public long l31970;
+    public long l31971;
+    public long l31972;
+    public long l31973;
+    public long l31974;
+    public long l31975;
+    public long l31976;
+    public long l31977;
+    public long l31978;
+    public long l31979;
+    public long l31980;
+    public long l31981;
+    public long l31982;
+    public long l31983;
+    public long l31984;
+    public long l31985;
+    public long l31986;
+    public long l31987;
+    public long l31988;
+    public long l31989;
+    public long l31990;
+    public long l31991;
+    public long l31992;
+    public long l31993;
+    public long l31994;
+    public long l31995;
+    public long l31996;
+    public long l31997;
+    public long l31998;
+    public long l31999;
+    public long l32000;
+    public long l32001;
+    public long l32002;
+    public long l32003;
+    public long l32004;
+    public long l32005;
+    public long l32006;
+    public long l32007;
+    public long l32008;
+    public long l32009;
+    public long l32010;
+    public long l32011;
+    public long l32012;
+    public long l32013;
+    public long l32014;
+    public long l32015;
+    public long l32016;
+    public long l32017;
+    public long l32018;
+    public long l32019;
+    public long l32020;
+    public long l32021;
+    public long l32022;
+    public long l32023;
+    public long l32024;
+    public long l32025;
+    public long l32026;
+    public long l32027;
+    public long l32028;
+    public long l32029;
+    public long l32030;
+    public long l32031;
+    public long l32032;
+    public long l32033;
+    public long l32034;
+    public long l32035;
+    public long l32036;
+    public long l32037;
+    public long l32038;
+    public long l32039;
+    public long l32040;
+    public long l32041;
+    public long l32042;
+    public long l32043;
+    public long l32044;
+    public long l32045;
+    public long l32046;
+    public long l32047;
+    public long l32048;
+    public long l32049;
+    public long l32050;
+    public long l32051;
+    public long l32052;
+    public long l32053;
+    public long l32054;
+    public long l32055;
+    public long l32056;
+    public long l32057;
+    public long l32058;
+    public long l32059;
+    public long l32060;
+    public long l32061;
+    public long l32062;
+    public long l32063;
+    public long l32064;
+    public long l32065;
+    public long l32066;
+    public long l32067;
+    public long l32068;
+    public long l32069;
+    public long l32070;
+    public long l32071;
+    public long l32072;
+    public long l32073;
+    public long l32074;
+    public long l32075;
+    public long l32076;
+    public long l32077;
+    public long l32078;
+    public long l32079;
+    public long l32080;
+    public long l32081;
+    public long l32082;
+    public long l32083;
+    public long l32084;
+    public long l32085;
+    public long l32086;
+    public long l32087;
+    public long l32088;
+    public long l32089;
+    public long l32090;
+    public long l32091;
+    public long l32092;
+    public long l32093;
+    public long l32094;
+    public long l32095;
+    public long l32096;
+    public long l32097;
+    public long l32098;
+    public long l32099;
+    public long l32100;
+    public long l32101;
+    public long l32102;
+    public long l32103;
+    public long l32104;
+    public long l32105;
+    public long l32106;
+    public long l32107;
+    public long l32108;
+    public long l32109;
+    public long l32110;
+    public long l32111;
+    public long l32112;
+    public long l32113;
+    public long l32114;
+    public long l32115;
+    public long l32116;
+    public long l32117;
+    public long l32118;
+    public long l32119;
+    public long l32120;
+    public long l32121;
+    public long l32122;
+    public long l32123;
+    public long l32124;
+    public long l32125;
+    public long l32126;
+    public long l32127;
+    public long l32128;
+    public long l32129;
+    public long l32130;
+    public long l32131;
+    public long l32132;
+    public long l32133;
+    public long l32134;
+    public long l32135;
+    public long l32136;
+    public long l32137;
+    public long l32138;
+    public long l32139;
+    public long l32140;
+    public long l32141;
+    public long l32142;
+    public long l32143;
+    public long l32144;
+    public long l32145;
+    public long l32146;
+    public long l32147;
+    public long l32148;
+    public long l32149;
+    public long l32150;
+    public long l32151;
+    public long l32152;
+    public long l32153;
+    public long l32154;
+    public long l32155;
+    public long l32156;
+    public long l32157;
+    public long l32158;
+    public long l32159;
+    public long l32160;
+    public long l32161;
+    public long l32162;
+    public long l32163;
+    public long l32164;
+    public long l32165;
+    public long l32166;
+    public long l32167;
+    public long l32168;
+    public long l32169;
+    public long l32170;
+    public long l32171;
+    public long l32172;
+    public long l32173;
+    public long l32174;
+    public long l32175;
+    public long l32176;
+    public long l32177;
+    public long l32178;
+    public long l32179;
+    public long l32180;
+    public long l32181;
+    public long l32182;
+    public long l32183;
+    public long l32184;
+    public long l32185;
+    public long l32186;
+    public long l32187;
+    public long l32188;
+    public long l32189;
+    public long l32190;
+    public long l32191;
+    public long l32192;
+    public long l32193;
+    public long l32194;
+    public long l32195;
+    public long l32196;
+    public long l32197;
+    public long l32198;
+    public long l32199;
+    public long l32200;
+    public long l32201;
+    public long l32202;
+    public long l32203;
+    public long l32204;
+    public long l32205;
+    public long l32206;
+    public long l32207;
+    public long l32208;
+    public long l32209;
+    public long l32210;
+    public long l32211;
+    public long l32212;
+    public long l32213;
+    public long l32214;
+    public long l32215;
+    public long l32216;
+    public long l32217;
+    public long l32218;
+    public long l32219;
+    public long l32220;
+    public long l32221;
+    public long l32222;
+    public long l32223;
+    public long l32224;
+    public long l32225;
+    public long l32226;
+    public long l32227;
+    public long l32228;
+    public long l32229;
+    public long l32230;
+    public long l32231;
+    public long l32232;
+    public long l32233;
+    public long l32234;
+    public long l32235;
+    public long l32236;
+    public long l32237;
+    public long l32238;
+    public long l32239;
+    public long l32240;
+    public long l32241;
+    public long l32242;
+    public long l32243;
+    public long l32244;
+    public long l32245;
+    public long l32246;
+    public long l32247;
+    public long l32248;
+    public long l32249;
+    public long l32250;
+    public long l32251;
+    public long l32252;
+    public long l32253;
+    public long l32254;
+    public long l32255;
+    public long l32256;
+    public long l32257;
+    public long l32258;
+    public long l32259;
+    public long l32260;
+    public long l32261;
+    public long l32262;
+    public long l32263;
+    public long l32264;
+    public long l32265;
+    public long l32266;
+    public long l32267;
+    public long l32268;
+    public long l32269;
+    public long l32270;
+    public long l32271;
+    public long l32272;
+    public long l32273;
+    public long l32274;
+    public long l32275;
+    public long l32276;
+    public long l32277;
+    public long l32278;
+    public long l32279;
+    public long l32280;
+    public long l32281;
+    public long l32282;
+    public long l32283;
+    public long l32284;
+    public long l32285;
+    public long l32286;
+    public long l32287;
+    public long l32288;
+    public long l32289;
+    public long l32290;
+    public long l32291;
+    public long l32292;
+    public long l32293;
+    public long l32294;
+    public long l32295;
+    public long l32296;
+    public long l32297;
+    public long l32298;
+    public long l32299;
+    public long l32300;
+    public long l32301;
+    public long l32302;
+    public long l32303;
+    public long l32304;
+    public long l32305;
+    public long l32306;
+    public long l32307;
+    public long l32308;
+    public long l32309;
+    public long l32310;
+    public long l32311;
+    public long l32312;
+    public long l32313;
+    public long l32314;
+    public long l32315;
+    public long l32316;
+    public long l32317;
+    public long l32318;
+    public long l32319;
+    public long l32320;
+    public long l32321;
+    public long l32322;
+    public long l32323;
+    public long l32324;
+    public long l32325;
+    public long l32326;
+    public long l32327;
+    public long l32328;
+    public long l32329;
+    public long l32330;
+    public long l32331;
+    public long l32332;
+    public long l32333;
+    public long l32334;
+    public long l32335;
+    public long l32336;
+    public long l32337;
+    public long l32338;
+    public long l32339;
+    public long l32340;
+    public long l32341;
+    public long l32342;
+    public long l32343;
+    public long l32344;
+    public long l32345;
+    public long l32346;
+    public long l32347;
+    public long l32348;
+    public long l32349;
+    public long l32350;
+    public long l32351;
+    public long l32352;
+    public long l32353;
+    public long l32354;
+    public long l32355;
+    public long l32356;
+    public long l32357;
+    public long l32358;
+    public long l32359;
+    public long l32360;
+    public long l32361;
+    public long l32362;
+    public long l32363;
+    public long l32364;
+    public long l32365;
+    public long l32366;
+    public long l32367;
+    public long l32368;
+    public long l32369;
+    public long l32370;
+    public long l32371;
+    public long l32372;
+    public long l32373;
+    public long l32374;
+    public long l32375;
+    public long l32376;
+    public long l32377;
+    public long l32378;
+    public long l32379;
+    public long l32380;
+    public long l32381;
+    public long l32382;
+    public long l32383;
+    public long l32384;
+    public long l32385;
+    public long l32386;
+    public long l32387;
+    public long l32388;
+    public long l32389;
+    public long l32390;
+    public long l32391;
+    public long l32392;
+    public long l32393;
+    public long l32394;
+    public long l32395;
+    public long l32396;
+    public long l32397;
+    public long l32398;
+    public long l32399;
+    public long l32400;
+    public long l32401;
+    public long l32402;
+    public long l32403;
+    public long l32404;
+    public long l32405;
+    public long l32406;
+    public long l32407;
+    public long l32408;
+    public long l32409;
+    public long l32410;
+    public long l32411;
+    public long l32412;
+    public long l32413;
+    public long l32414;
+    public long l32415;
+    public long l32416;
+    public long l32417;
+    public long l32418;
+    public long l32419;
+    public long l32420;
+    public long l32421;
+    public long l32422;
+    public long l32423;
+    public long l32424;
+    public long l32425;
+    public long l32426;
+    public long l32427;
+    public long l32428;
+    public long l32429;
+    public long l32430;
+    public long l32431;
+    public long l32432;
+    public long l32433;
+    public long l32434;
+    public long l32435;
+    public long l32436;
+    public long l32437;
+    public long l32438;
+    public long l32439;
+    public long l32440;
+    public long l32441;
+    public long l32442;
+    public long l32443;
+    public long l32444;
+    public long l32445;
+    public long l32446;
+    public long l32447;
+    public long l32448;
+    public long l32449;
+    public long l32450;
+    public long l32451;
+    public long l32452;
+    public long l32453;
+    public long l32454;
+    public long l32455;
+    public long l32456;
+    public long l32457;
+    public long l32458;
+    public long l32459;
+    public long l32460;
+    public long l32461;
+    public long l32462;
+    public long l32463;
+    public long l32464;
+    public long l32465;
+    public long l32466;
+    public long l32467;
+    public long l32468;
+    public long l32469;
+    public long l32470;
+    public long l32471;
+    public long l32472;
+    public long l32473;
+    public long l32474;
+    public long l32475;
+    public long l32476;
+    public long l32477;
+    public long l32478;
+    public long l32479;
+    public long l32480;
+    public long l32481;
+    public long l32482;
+    public long l32483;
+    public long l32484;
+    public long l32485;
+    public long l32486;
+    public long l32487;
+    public long l32488;
+    public long l32489;
+    public long l32490;
+    public long l32491;
+    public long l32492;
+    public long l32493;
+    public long l32494;
+    public long l32495;
+    public long l32496;
+    public long l32497;
+    public long l32498;
+    public long l32499;
+    public long l32500;
+    public long l32501;
+    public long l32502;
+    public long l32503;
+    public long l32504;
+    public long l32505;
+    public long l32506;
+    public long l32507;
+    public long l32508;
+    public long l32509;
+    public long l32510;
+    public long l32511;
+    public long l32512;
+    public long l32513;
+    public long l32514;
+    public long l32515;
+    public long l32516;
+    public long l32517;
+    public long l32518;
+    public long l32519;
+    public long l32520;
+    public long l32521;
+    public long l32522;
+    public long l32523;
+    public long l32524;
+    public long l32525;
+    public long l32526;
+    public long l32527;
+    public long l32528;
+    public long l32529;
+    public long l32530;
+    public long l32531;
+    public long l32532;
+    public long l32533;
+    public long l32534;
+    public long l32535;
+    public long l32536;
+    public long l32537;
+    public long l32538;
+    public long l32539;
+    public long l32540;
+    public long l32541;
+    public long l32542;
+    public long l32543;
+    public long l32544;
+    public long l32545;
+    public long l32546;
+    public long l32547;
+    public long l32548;
+    public long l32549;
+    public long l32550;
+    public long l32551;
+    public long l32552;
+    public long l32553;
+    public long l32554;
+    public long l32555;
+    public long l32556;
+    public long l32557;
+    public long l32558;
+    public long l32559;
+    public long l32560;
+    public long l32561;
+    public long l32562;
+    public long l32563;
+    public long l32564;
+    public long l32565;
+    public long l32566;
+    public long l32567;
+    public long l32568;
+    public long l32569;
+    public long l32570;
+    public long l32571;
+    public long l32572;
+    public long l32573;
+    public long l32574;
+    public long l32575;
+    public long l32576;
+    public long l32577;
+    public long l32578;
+    public long l32579;
+    public long l32580;
+    public long l32581;
+    public long l32582;
+    public long l32583;
+    public long l32584;
+    public long l32585;
+    public long l32586;
+    public long l32587;
+    public long l32588;
+    public long l32589;
+    public long l32590;
+    public long l32591;
+    public long l32592;
+    public long l32593;
+    public long l32594;
+    public long l32595;
+    public long l32596;
+    public long l32597;
+    public long l32598;
+    public long l32599;
+    public long l32600;
+    public long l32601;
+    public long l32602;
+    public long l32603;
+    public long l32604;
+    public long l32605;
+    public long l32606;
+    public long l32607;
+    public long l32608;
+    public long l32609;
+    public long l32610;
+    public long l32611;
+    public long l32612;
+    public long l32613;
+    public long l32614;
+    public long l32615;
+    public long l32616;
+    public long l32617;
+    public long l32618;
+    public long l32619;
+    public long l32620;
+    public long l32621;
+    public long l32622;
+    public long l32623;
+    public long l32624;
+    public long l32625;
+    public long l32626;
+    public long l32627;
+    public long l32628;
+    public long l32629;
+    public long l32630;
+    public long l32631;
+    public long l32632;
+    public long l32633;
+    public long l32634;
+    public long l32635;
+    public long l32636;
+    public long l32637;
+    public long l32638;
+    public long l32639;
+    public long l32640;
+    public long l32641;
+    public long l32642;
+    public long l32643;
+    public long l32644;
+    public long l32645;
+    public long l32646;
+    public long l32647;
+    public long l32648;
+    public long l32649;
+    public long l32650;
+    public long l32651;
+    public long l32652;
+    public long l32653;
+    public long l32654;
+    public long l32655;
+    public long l32656;
+    public long l32657;
+    public long l32658;
+    public long l32659;
+    public long l32660;
+    public long l32661;
+    public long l32662;
+    public long l32663;
+    public long l32664;
+    public long l32665;
+    public long l32666;
+    public long l32667;
+    public long l32668;
+    public long l32669;
+    public long l32670;
+    public long l32671;
+    public long l32672;
+    public long l32673;
+    public long l32674;
+    public long l32675;
+    public long l32676;
+    public long l32677;
+    public long l32678;
+    public long l32679;
+    public long l32680;
+    public long l32681;
+    public long l32682;
+    public long l32683;
+    public long l32684;
+    public long l32685;
+    public long l32686;
+    public long l32687;
+    public long l32688;
+    public long l32689;
+    public long l32690;
+    public long l32691;
+    public long l32692;
+    public long l32693;
+    public long l32694;
+    public long l32695;
+    public long l32696;
+    public long l32697;
+    public long l32698;
+    public long l32699;
+    public long l32700;
+    public long l32701;
+    public long l32702;
+    public long l32703;
+    public long l32704;
+    public long l32705;
+    public long l32706;
+    public long l32707;
+    public long l32708;
+    public long l32709;
+    public long l32710;
+    public long l32711;
+    public long l32712;
+    public long l32713;
+    public long l32714;
+    public long l32715;
+    public long l32716;
+    public long l32717;
+    public long l32718;
+    public long l32719;
+    public long l32720;
+    public long l32721;
+    public long l32722;
+    public long l32723;
+    public long l32724;
+    public long l32725;
+    public long l32726;
+    public long l32727;
+    public long l32728;
+    public long l32729;
+    public long l32730;
+    public long l32731;
+    public long l32732;
+    public long l32733;
+    public long l32734;
+    public long l32735;
+    public long l32736;
+    public long l32737;
+    public long l32738;
+    public long l32739;
+    public long l32740;
+    public long l32741;
+    public long l32742;
+    public long l32743;
+    public long l32744;
+    public long l32745;
+    public long l32746;
+    public long l32747;
+    public long l32748;
+    public long l32749;
+    public long l32750;
+    public long l32751;
+    public long l32752;
+    public long l32753;
+    public long l32754;
+    public long l32755;
+    public long l32756;
+    public long l32757;
+    public long l32758;
+    public long l32759;
+    public long l32760;
+    public long l32761;
+    public long l32762;
+    public long l32763;
+    public long l32764;
+    public long l32765;
+    public long l32766;
+    public long l32767;
+    public long l32768;
+    public long l32769;
+    public long l32770;
+    public long l32771;
+    public long l32772;
+    public long l32773;
+    public long l32774;
+    public long l32775;
+    public long l32776;
+    public long l32777;
+    public long l32778;
+    public long l32779;
+    public long l32780;
+    public long l32781;
+    public long l32782;
+    public long l32783;
+    public long l32784;
+    public long l32785;
+    public long l32786;
+    public long l32787;
+    public long l32788;
+    public long l32789;
+    public long l32790;
+    public long l32791;
+    public long l32792;
+    public long l32793;
+    public long l32794;
+    public long l32795;
+    public long l32796;
+    public long l32797;
+    public long l32798;
+    public long l32799;
+    public long l32800;
+    public long l32801;
+    public long l32802;
+    public long l32803;
+    public long l32804;
+    public long l32805;
+    public long l32806;
+    public long l32807;
+    public long l32808;
+    public long l32809;
+    public long l32810;
+    public long l32811;
+    public long l32812;
+    public long l32813;
+    public long l32814;
+    public long l32815;
+    public long l32816;
+    public long l32817;
+    public long l32818;
+    public long l32819;
+    public long l32820;
+    public long l32821;
+    public long l32822;
+    public long l32823;
+    public long l32824;
+    public long l32825;
+    public long l32826;
+    public long l32827;
+    public long l32828;
+    public long l32829;
+    public long l32830;
+    public long l32831;
+    public long l32832;
+    public long l32833;
+    public long l32834;
+    public long l32835;
+    public long l32836;
+    public long l32837;
+    public long l32838;
+    public long l32839;
+    public long l32840;
+    public long l32841;
+    public long l32842;
+    public long l32843;
+    public long l32844;
+    public long l32845;
+    public long l32846;
+    public long l32847;
+    public long l32848;
+    public long l32849;
+    public long l32850;
+    public long l32851;
+    public long l32852;
+    public long l32853;
+    public long l32854;
+    public long l32855;
+    public long l32856;
+    public long l32857;
+    public long l32858;
+    public long l32859;
+    public long l32860;
+    public long l32861;
+    public long l32862;
+    public long l32863;
+    public long l32864;
+    public long l32865;
+    public long l32866;
+    public long l32867;
+    public long l32868;
+    public long l32869;
+    public long l32870;
+    public long l32871;
+    public long l32872;
+    public long l32873;
+    public long l32874;
+    public long l32875;
+    public long l32876;
+    public long l32877;
+    public long l32878;
+    public long l32879;
+    public long l32880;
+    public long l32881;
+    public long l32882;
+    public long l32883;
+    public long l32884;
+    public long l32885;
+    public long l32886;
+    public long l32887;
+    public long l32888;
+    public long l32889;
+    public long l32890;
+    public long l32891;
+    public long l32892;
+    public long l32893;
+    public long l32894;
+    public long l32895;
+    public long l32896;
+    public long l32897;
+    public long l32898;
+    public long l32899;
+    public long l32900;
+    public long l32901;
+    public long l32902;
+    public long l32903;
+    public long l32904;
+    public long l32905;
+    public long l32906;
+    public long l32907;
+    public long l32908;
+    public long l32909;
+    public long l32910;
+    public long l32911;
+    public long l32912;
+    public long l32913;
+    public long l32914;
+    public long l32915;
+    public long l32916;
+    public long l32917;
+    public long l32918;
+    public long l32919;
+    public long l32920;
+    public long l32921;
+    public long l32922;
+    public long l32923;
+    public long l32924;
+    public long l32925;
+    public long l32926;
+    public long l32927;
+    public long l32928;
+    public long l32929;
+    public long l32930;
+    public long l32931;
+    public long l32932;
+    public long l32933;
+    public long l32934;
+    public long l32935;
+    public long l32936;
+    public long l32937;
+    public long l32938;
+    public long l32939;
+    public long l32940;
+    public long l32941;
+    public long l32942;
+    public long l32943;
+    public long l32944;
+    public long l32945;
+    public long l32946;
+    public long l32947;
+    public long l32948;
+    public long l32949;
+    public long l32950;
+    public long l32951;
+    public long l32952;
+    public long l32953;
+    public long l32954;
+    public long l32955;
+    public long l32956;
+    public long l32957;
+    public long l32958;
+    public long l32959;
+    public long l32960;
+    public long l32961;
+    public long l32962;
+    public long l32963;
+    public long l32964;
+    public long l32965;
+    public long l32966;
+    public long l32967;
+    public long l32968;
+    public long l32969;
+    public long l32970;
+    public long l32971;
+    public long l32972;
+    public long l32973;
+    public long l32974;
+    public long l32975;
+    public long l32976;
+    public long l32977;
+    public long l32978;
+    public long l32979;
+    public long l32980;
+    public long l32981;
+    public long l32982;
+    public long l32983;
+    public long l32984;
+    public long l32985;
+    public long l32986;
+    public long l32987;
+    public long l32988;
+    public long l32989;
+    public long l32990;
+    public long l32991;
+    public long l32992;
+    public long l32993;
+    public long l32994;
+    public long l32995;
+    public long l32996;
+    public long l32997;
+    public long l32998;
+    public long l32999;
+    public long l33000;
+    public long l33001;
+    public long l33002;
+    public long l33003;
+    public long l33004;
+    public long l33005;
+    public long l33006;
+    public long l33007;
+    public long l33008;
+    public long l33009;
+    public long l33010;
+    public long l33011;
+    public long l33012;
+    public long l33013;
+    public long l33014;
+    public long l33015;
+    public long l33016;
+    public long l33017;
+    public long l33018;
+    public long l33019;
+    public long l33020;
+    public long l33021;
+    public long l33022;
+    public long l33023;
+    public long l33024;
+    public long l33025;
+    public long l33026;
+    public long l33027;
+    public long l33028;
+    public long l33029;
+    public long l33030;
+    public long l33031;
+    public long l33032;
+    public long l33033;
+    public long l33034;
+    public long l33035;
+    public long l33036;
+    public long l33037;
+    public long l33038;
+    public long l33039;
+    public long l33040;
+    public long l33041;
+    public long l33042;
+    public long l33043;
+    public long l33044;
+    public long l33045;
+    public long l33046;
+    public long l33047;
+    public long l33048;
+    public long l33049;
+    public long l33050;
+    public long l33051;
+    public long l33052;
+    public long l33053;
+    public long l33054;
+    public long l33055;
+    public long l33056;
+    public long l33057;
+    public long l33058;
+    public long l33059;
+    public long l33060;
+    public long l33061;
+    public long l33062;
+    public long l33063;
+    public long l33064;
+    public long l33065;
+    public long l33066;
+    public long l33067;
+    public long l33068;
+    public long l33069;
+    public long l33070;
+    public long l33071;
+    public long l33072;
+    public long l33073;
+    public long l33074;
+    public long l33075;
+    public long l33076;
+    public long l33077;
+    public long l33078;
+    public long l33079;
+    public long l33080;
+    public long l33081;
+    public long l33082;
+    public long l33083;
+    public long l33084;
+    public long l33085;
+    public long l33086;
+    public long l33087;
+    public long l33088;
+    public long l33089;
+    public long l33090;
+    public long l33091;
+    public long l33092;
+    public long l33093;
+    public long l33094;
+    public long l33095;
+    public long l33096;
+    public long l33097;
+    public long l33098;
+    public long l33099;
+    public long l33100;
+    public long l33101;
+    public long l33102;
+    public long l33103;
+    public long l33104;
+    public long l33105;
+    public long l33106;
+    public long l33107;
+    public long l33108;
+    public long l33109;
+    public long l33110;
+    public long l33111;
+    public long l33112;
+    public long l33113;
+    public long l33114;
+    public long l33115;
+    public long l33116;
+    public long l33117;
+    public long l33118;
+    public long l33119;
+    public long l33120;
+    public long l33121;
+    public long l33122;
+    public long l33123;
+    public long l33124;
+    public long l33125;
+    public long l33126;
+    public long l33127;
+    public long l33128;
+    public long l33129;
+    public long l33130;
+    public long l33131;
+    public long l33132;
+    public long l33133;
+    public long l33134;
+    public long l33135;
+    public long l33136;
+    public long l33137;
+    public long l33138;
+    public long l33139;
+    public long l33140;
+    public long l33141;
+    public long l33142;
+    public long l33143;
+    public long l33144;
+    public long l33145;
+    public long l33146;
+    public long l33147;
+    public long l33148;
+    public long l33149;
+    public long l33150;
+    public long l33151;
+    public long l33152;
+    public long l33153;
+    public long l33154;
+    public long l33155;
+    public long l33156;
+    public long l33157;
+    public long l33158;
+    public long l33159;
+    public long l33160;
+    public long l33161;
+    public long l33162;
+    public long l33163;
+    public long l33164;
+    public long l33165;
+    public long l33166;
+    public long l33167;
+    public long l33168;
+    public long l33169;
+    public long l33170;
+    public long l33171;
+    public long l33172;
+    public long l33173;
+    public long l33174;
+    public long l33175;
+    public long l33176;
+    public long l33177;
+    public long l33178;
+    public long l33179;
+    public long l33180;
+    public long l33181;
+    public long l33182;
+    public long l33183;
+    public long l33184;
+    public long l33185;
+    public long l33186;
+    public long l33187;
+    public long l33188;
+    public long l33189;
+    public long l33190;
+    public long l33191;
+    public long l33192;
+    public long l33193;
+    public long l33194;
+    public long l33195;
+    public long l33196;
+    public long l33197;
+    public long l33198;
+    public long l33199;
+    public long l33200;
+    public long l33201;
+    public long l33202;
+    public long l33203;
+    public long l33204;
+    public long l33205;
+    public long l33206;
+    public long l33207;
+    public long l33208;
+    public long l33209;
+    public long l33210;
+    public long l33211;
+    public long l33212;
+    public long l33213;
+    public long l33214;
+    public long l33215;
+    public long l33216;
+    public long l33217;
+    public long l33218;
+    public long l33219;
+    public long l33220;
+    public long l33221;
+    public long l33222;
+    public long l33223;
+    public long l33224;
+    public long l33225;
+    public long l33226;
+    public long l33227;
+    public long l33228;
+    public long l33229;
+    public long l33230;
+    public long l33231;
+    public long l33232;
+    public long l33233;
+    public long l33234;
+    public long l33235;
+    public long l33236;
+    public long l33237;
+    public long l33238;
+    public long l33239;
+    public long l33240;
+    public long l33241;
+    public long l33242;
+    public long l33243;
+    public long l33244;
+    public long l33245;
+    public long l33246;
+    public long l33247;
+    public long l33248;
+    public long l33249;
+    public long l33250;
+    public long l33251;
+    public long l33252;
+    public long l33253;
+    public long l33254;
+    public long l33255;
+    public long l33256;
+    public long l33257;
+    public long l33258;
+    public long l33259;
+    public long l33260;
+    public long l33261;
+    public long l33262;
+    public long l33263;
+    public long l33264;
+    public long l33265;
+    public long l33266;
+    public long l33267;
+    public long l33268;
+    public long l33269;
+    public long l33270;
+    public long l33271;
+    public long l33272;
+    public long l33273;
+    public long l33274;
+    public long l33275;
+    public long l33276;
+    public long l33277;
+    public long l33278;
+    public long l33279;
+    public long l33280;
+    public long l33281;
+    public long l33282;
+    public long l33283;
+    public long l33284;
+    public long l33285;
+    public long l33286;
+    public long l33287;
+    public long l33288;
+    public long l33289;
+    public long l33290;
+    public long l33291;
+    public long l33292;
+    public long l33293;
+    public long l33294;
+    public long l33295;
+    public long l33296;
+    public long l33297;
+    public long l33298;
+    public long l33299;
+    public long l33300;
+    public long l33301;
+    public long l33302;
+    public long l33303;
+    public long l33304;
+    public long l33305;
+    public long l33306;
+    public long l33307;
+    public long l33308;
+    public long l33309;
+    public long l33310;
+    public long l33311;
+    public long l33312;
+    public long l33313;
+    public long l33314;
+    public long l33315;
+    public long l33316;
+    public long l33317;
+    public long l33318;
+    public long l33319;
+    public long l33320;
+    public long l33321;
+    public long l33322;
+    public long l33323;
+    public long l33324;
+    public long l33325;
+    public long l33326;
+    public long l33327;
+    public long l33328;
+    public long l33329;
+    public long l33330;
+    public long l33331;
+    public long l33332;
+    public long l33333;
+    public long l33334;
+    public long l33335;
+    public long l33336;
+    public long l33337;
+    public long l33338;
+    public long l33339;
+    public long l33340;
+    public long l33341;
+    public long l33342;
+    public long l33343;
+    public long l33344;
+    public long l33345;
+    public long l33346;
+    public long l33347;
+    public long l33348;
+    public long l33349;
+    public long l33350;
+    public long l33351;
+    public long l33352;
+    public long l33353;
+    public long l33354;
+    public long l33355;
+    public long l33356;
+    public long l33357;
+    public long l33358;
+    public long l33359;
+    public long l33360;
+    public long l33361;
+    public long l33362;
+    public long l33363;
+    public long l33364;
+    public long l33365;
+    public long l33366;
+    public long l33367;
+    public long l33368;
+    public long l33369;
+    public long l33370;
+    public long l33371;
+    public long l33372;
+    public long l33373;
+    public long l33374;
+    public long l33375;
+    public long l33376;
+    public long l33377;
+    public long l33378;
+    public long l33379;
+    public long l33380;
+    public long l33381;
+    public long l33382;
+    public long l33383;
+    public long l33384;
+    public long l33385;
+    public long l33386;
+    public long l33387;
+    public long l33388;
+    public long l33389;
+    public long l33390;
+    public long l33391;
+    public long l33392;
+    public long l33393;
+    public long l33394;
+    public long l33395;
+    public long l33396;
+    public long l33397;
+    public long l33398;
+    public long l33399;
+    public long l33400;
+    public long l33401;
+    public long l33402;
+    public long l33403;
+    public long l33404;
+    public long l33405;
+    public long l33406;
+    public long l33407;
+    public long l33408;
+    public long l33409;
+    public long l33410;
+    public long l33411;
+    public long l33412;
+    public long l33413;
+    public long l33414;
+    public long l33415;
+    public long l33416;
+    public long l33417;
+    public long l33418;
+    public long l33419;
+    public long l33420;
+    public long l33421;
+    public long l33422;
+    public long l33423;
+    public long l33424;
+    public long l33425;
+    public long l33426;
+    public long l33427;
+    public long l33428;
+    public long l33429;
+    public long l33430;
+    public long l33431;
+    public long l33432;
+    public long l33433;
+    public long l33434;
+    public long l33435;
+    public long l33436;
+    public long l33437;
+    public long l33438;
+    public long l33439;
+    public long l33440;
+    public long l33441;
+    public long l33442;
+    public long l33443;
+    public long l33444;
+    public long l33445;
+    public long l33446;
+    public long l33447;
+    public long l33448;
+    public long l33449;
+    public long l33450;
+    public long l33451;
+    public long l33452;
+    public long l33453;
+    public long l33454;
+    public long l33455;
+    public long l33456;
+    public long l33457;
+    public long l33458;
+    public long l33459;
+    public long l33460;
+    public long l33461;
+    public long l33462;
+    public long l33463;
+    public long l33464;
+    public long l33465;
+    public long l33466;
+    public long l33467;
+    public long l33468;
+    public long l33469;
+    public long l33470;
+    public long l33471;
+    public long l33472;
+    public long l33473;
+    public long l33474;
+    public long l33475;
+    public long l33476;
+    public long l33477;
+    public long l33478;
+    public long l33479;
+    public long l33480;
+    public long l33481;
+    public long l33482;
+    public long l33483;
+    public long l33484;
+    public long l33485;
+    public long l33486;
+    public long l33487;
+    public long l33488;
+    public long l33489;
+    public long l33490;
+    public long l33491;
+    public long l33492;
+    public long l33493;
+    public long l33494;
+    public long l33495;
+    public long l33496;
+    public long l33497;
+    public long l33498;
+    public long l33499;
+    public long l33500;
+    public long l33501;
+    public long l33502;
+    public long l33503;
+    public long l33504;
+    public long l33505;
+    public long l33506;
+    public long l33507;
+    public long l33508;
+    public long l33509;
+    public long l33510;
+    public long l33511;
+    public long l33512;
+    public long l33513;
+    public long l33514;
+    public long l33515;
+    public long l33516;
+    public long l33517;
+    public long l33518;
+    public long l33519;
+    public long l33520;
+    public long l33521;
+    public long l33522;
+    public long l33523;
+    public long l33524;
+    public long l33525;
+    public long l33526;
+    public long l33527;
+    public long l33528;
+    public long l33529;
+    public long l33530;
+    public long l33531;
+    public long l33532;
+    public long l33533;
+    public long l33534;
+    public long l33535;
+    public long l33536;
+    public long l33537;
+    public long l33538;
+    public long l33539;
+    public long l33540;
+    public long l33541;
+    public long l33542;
+    public long l33543;
+    public long l33544;
+    public long l33545;
+    public long l33546;
+    public long l33547;
+    public long l33548;
+    public long l33549;
+    public long l33550;
+    public long l33551;
+    public long l33552;
+    public long l33553;
+    public long l33554;
+    public long l33555;
+    public long l33556;
+    public long l33557;
+    public long l33558;
+    public long l33559;
+    public long l33560;
+    public long l33561;
+    public long l33562;
+    public long l33563;
+    public long l33564;
+    public long l33565;
+    public long l33566;
+    public long l33567;
+    public long l33568;
+    public long l33569;
+    public long l33570;
+    public long l33571;
+    public long l33572;
+    public long l33573;
+    public long l33574;
+    public long l33575;
+    public long l33576;
+    public long l33577;
+    public long l33578;
+    public long l33579;
+    public long l33580;
+    public long l33581;
+    public long l33582;
+    public long l33583;
+    public long l33584;
+    public long l33585;
+    public long l33586;
+    public long l33587;
+    public long l33588;
+    public long l33589;
+    public long l33590;
+    public long l33591;
+    public long l33592;
+    public long l33593;
+    public long l33594;
+    public long l33595;
+    public long l33596;
+    public long l33597;
+    public long l33598;
+    public long l33599;
+    public long l33600;
+    public long l33601;
+    public long l33602;
+    public long l33603;
+    public long l33604;
+    public long l33605;
+    public long l33606;
+    public long l33607;
+    public long l33608;
+    public long l33609;
+    public long l33610;
+    public long l33611;
+    public long l33612;
+    public long l33613;
+    public long l33614;
+    public long l33615;
+    public long l33616;
+    public long l33617;
+    public long l33618;
+    public long l33619;
+    public long l33620;
+    public long l33621;
+    public long l33622;
+    public long l33623;
+    public long l33624;
+    public long l33625;
+    public long l33626;
+    public long l33627;
+    public long l33628;
+    public long l33629;
+    public long l33630;
+    public long l33631;
+    public long l33632;
+    public long l33633;
+    public long l33634;
+    public long l33635;
+    public long l33636;
+    public long l33637;
+    public long l33638;
+    public long l33639;
+    public long l33640;
+    public long l33641;
+    public long l33642;
+    public long l33643;
+    public long l33644;
+    public long l33645;
+    public long l33646;
+    public long l33647;
+    public long l33648;
+    public long l33649;
+    public long l33650;
+    public long l33651;
+    public long l33652;
+    public long l33653;
+    public long l33654;
+    public long l33655;
+    public long l33656;
+    public long l33657;
+    public long l33658;
+    public long l33659;
+    public long l33660;
+    public long l33661;
+    public long l33662;
+    public long l33663;
+    public long l33664;
+    public long l33665;
+    public long l33666;
+    public long l33667;
+    public long l33668;
+    public long l33669;
+    public long l33670;
+    public long l33671;
+    public long l33672;
+    public long l33673;
+    public long l33674;
+    public long l33675;
+    public long l33676;
+    public long l33677;
+    public long l33678;
+    public long l33679;
+    public long l33680;
+    public long l33681;
+    public long l33682;
+    public long l33683;
+    public long l33684;
+    public long l33685;
+    public long l33686;
+    public long l33687;
+    public long l33688;
+    public long l33689;
+    public long l33690;
+    public long l33691;
+    public long l33692;
+    public long l33693;
+    public long l33694;
+    public long l33695;
+    public long l33696;
+    public long l33697;
+    public long l33698;
+    public long l33699;
+    public long l33700;
+    public long l33701;
+    public long l33702;
+    public long l33703;
+    public long l33704;
+    public long l33705;
+    public long l33706;
+    public long l33707;
+    public long l33708;
+    public long l33709;
+    public long l33710;
+    public long l33711;
+    public long l33712;
+    public long l33713;
+    public long l33714;
+    public long l33715;
+    public long l33716;
+    public long l33717;
+    public long l33718;
+    public long l33719;
+    public long l33720;
+    public long l33721;
+    public long l33722;
+    public long l33723;
+    public long l33724;
+    public long l33725;
+    public long l33726;
+    public long l33727;
+    public long l33728;
+    public long l33729;
+    public long l33730;
+    public long l33731;
+    public long l33732;
+    public long l33733;
+    public long l33734;
+    public long l33735;
+    public long l33736;
+    public long l33737;
+    public long l33738;
+    public long l33739;
+    public long l33740;
+    public long l33741;
+    public long l33742;
+    public long l33743;
+    public long l33744;
+    public long l33745;
+    public long l33746;
+    public long l33747;
+    public long l33748;
+    public long l33749;
+    public long l33750;
+    public long l33751;
+    public long l33752;
+    public long l33753;
+    public long l33754;
+    public long l33755;
+    public long l33756;
+    public long l33757;
+    public long l33758;
+    public long l33759;
+    public long l33760;
+    public long l33761;
+    public long l33762;
+    public long l33763;
+    public long l33764;
+    public long l33765;
+    public long l33766;
+    public long l33767;
+    public long l33768;
+    public long l33769;
+    public long l33770;
+    public long l33771;
+    public long l33772;
+    public long l33773;
+    public long l33774;
+    public long l33775;
+    public long l33776;
+    public long l33777;
+    public long l33778;
+    public long l33779;
+    public long l33780;
+    public long l33781;
+    public long l33782;
+    public long l33783;
+    public long l33784;
+    public long l33785;
+    public long l33786;
+    public long l33787;
+    public long l33788;
+    public long l33789;
+    public long l33790;
+    public long l33791;
+    public long l33792;
+    public long l33793;
+    public long l33794;
+    public long l33795;
+    public long l33796;
+    public long l33797;
+    public long l33798;
+    public long l33799;
+    public long l33800;
+    public long l33801;
+    public long l33802;
+    public long l33803;
+    public long l33804;
+    public long l33805;
+    public long l33806;
+    public long l33807;
+    public long l33808;
+    public long l33809;
+    public long l33810;
+    public long l33811;
+    public long l33812;
+    public long l33813;
+    public long l33814;
+    public long l33815;
+    public long l33816;
+    public long l33817;
+    public long l33818;
+    public long l33819;
+    public long l33820;
+    public long l33821;
+    public long l33822;
+    public long l33823;
+    public long l33824;
+    public long l33825;
+    public long l33826;
+    public long l33827;
+    public long l33828;
+    public long l33829;
+    public long l33830;
+    public long l33831;
+    public long l33832;
+    public long l33833;
+    public long l33834;
+    public long l33835;
+    public long l33836;
+    public long l33837;
+    public long l33838;
+    public long l33839;
+    public long l33840;
+    public long l33841;
+    public long l33842;
+    public long l33843;
+    public long l33844;
+    public long l33845;
+    public long l33846;
+    public long l33847;
+    public long l33848;
+    public long l33849;
+    public long l33850;
+    public long l33851;
+    public long l33852;
+    public long l33853;
+    public long l33854;
+    public long l33855;
+    public long l33856;
+    public long l33857;
+    public long l33858;
+    public long l33859;
+    public long l33860;
+    public long l33861;
+    public long l33862;
+    public long l33863;
+    public long l33864;
+    public long l33865;
+    public long l33866;
+    public long l33867;
+    public long l33868;
+    public long l33869;
+    public long l33870;
+    public long l33871;
+    public long l33872;
+    public long l33873;
+    public long l33874;
+    public long l33875;
+    public long l33876;
+    public long l33877;
+    public long l33878;
+    public long l33879;
+    public long l33880;
+    public long l33881;
+    public long l33882;
+    public long l33883;
+    public long l33884;
+    public long l33885;
+    public long l33886;
+    public long l33887;
+    public long l33888;
+    public long l33889;
+    public long l33890;
+    public long l33891;
+    public long l33892;
+    public long l33893;
+    public long l33894;
+    public long l33895;
+    public long l33896;
+    public long l33897;
+    public long l33898;
+    public long l33899;
+    public long l33900;
+    public long l33901;
+    public long l33902;
+    public long l33903;
+    public long l33904;
+    public long l33905;
+    public long l33906;
+    public long l33907;
+    public long l33908;
+    public long l33909;
+    public long l33910;
+    public long l33911;
+    public long l33912;
+    public long l33913;
+    public long l33914;
+    public long l33915;
+    public long l33916;
+    public long l33917;
+    public long l33918;
+    public long l33919;
+    public long l33920;
+    public long l33921;
+    public long l33922;
+    public long l33923;
+    public long l33924;
+    public long l33925;
+    public long l33926;
+    public long l33927;
+    public long l33928;
+    public long l33929;
+    public long l33930;
+    public long l33931;
+    public long l33932;
+    public long l33933;
+    public long l33934;
+    public long l33935;
+    public long l33936;
+    public long l33937;
+    public long l33938;
+    public long l33939;
+    public long l33940;
+    public long l33941;
+    public long l33942;
+    public long l33943;
+    public long l33944;
+    public long l33945;
+    public long l33946;
+    public long l33947;
+    public long l33948;
+    public long l33949;
+    public long l33950;
+    public long l33951;
+    public long l33952;
+    public long l33953;
+    public long l33954;
+    public long l33955;
+    public long l33956;
+    public long l33957;
+    public long l33958;
+    public long l33959;
+    public long l33960;
+    public long l33961;
+    public long l33962;
+    public long l33963;
+    public long l33964;
+    public long l33965;
+    public long l33966;
+    public long l33967;
+    public long l33968;
+    public long l33969;
+    public long l33970;
+    public long l33971;
+    public long l33972;
+    public long l33973;
+    public long l33974;
+    public long l33975;
+    public long l33976;
+    public long l33977;
+    public long l33978;
+    public long l33979;
+    public long l33980;
+    public long l33981;
+    public long l33982;
+    public long l33983;
+    public long l33984;
+    public long l33985;
+    public long l33986;
+    public long l33987;
+    public long l33988;
+    public long l33989;
+    public long l33990;
+    public long l33991;
+    public long l33992;
+    public long l33993;
+    public long l33994;
+    public long l33995;
+    public long l33996;
+    public long l33997;
+    public long l33998;
+    public long l33999;
+    public long l34000;
+    public long l34001;
+    public long l34002;
+    public long l34003;
+    public long l34004;
+    public long l34005;
+    public long l34006;
+    public long l34007;
+    public long l34008;
+    public long l34009;
+    public long l34010;
+    public long l34011;
+    public long l34012;
+    public long l34013;
+    public long l34014;
+    public long l34015;
+    public long l34016;
+    public long l34017;
+    public long l34018;
+    public long l34019;
+    public long l34020;
+    public long l34021;
+    public long l34022;
+    public long l34023;
+    public long l34024;
+    public long l34025;
+    public long l34026;
+    public long l34027;
+    public long l34028;
+    public long l34029;
+    public long l34030;
+    public long l34031;
+    public long l34032;
+    public long l34033;
+    public long l34034;
+    public long l34035;
+    public long l34036;
+    public long l34037;
+    public long l34038;
+    public long l34039;
+    public long l34040;
+    public long l34041;
+    public long l34042;
+    public long l34043;
+    public long l34044;
+    public long l34045;
+    public long l34046;
+    public long l34047;
+    public long l34048;
+    public long l34049;
+    public long l34050;
+    public long l34051;
+    public long l34052;
+    public long l34053;
+    public long l34054;
+    public long l34055;
+    public long l34056;
+    public long l34057;
+    public long l34058;
+    public long l34059;
+    public long l34060;
+    public long l34061;
+    public long l34062;
+    public long l34063;
+    public long l34064;
+    public long l34065;
+    public long l34066;
+    public long l34067;
+    public long l34068;
+    public long l34069;
+    public long l34070;
+    public long l34071;
+    public long l34072;
+    public long l34073;
+    public long l34074;
+    public long l34075;
+    public long l34076;
+    public long l34077;
+    public long l34078;
+    public long l34079;
+    public long l34080;
+    public long l34081;
+    public long l34082;
+    public long l34083;
+    public long l34084;
+    public long l34085;
+    public long l34086;
+    public long l34087;
+    public long l34088;
+    public long l34089;
+    public long l34090;
+    public long l34091;
+    public long l34092;
+    public long l34093;
+    public long l34094;
+    public long l34095;
+    public long l34096;
+    public long l34097;
+    public long l34098;
+    public long l34099;
+    public long l34100;
+    public long l34101;
+    public long l34102;
+    public long l34103;
+    public long l34104;
+    public long l34105;
+    public long l34106;
+    public long l34107;
+    public long l34108;
+    public long l34109;
+    public long l34110;
+    public long l34111;
+    public long l34112;
+    public long l34113;
+    public long l34114;
+    public long l34115;
+    public long l34116;
+    public long l34117;
+    public long l34118;
+    public long l34119;
+    public long l34120;
+    public long l34121;
+    public long l34122;
+    public long l34123;
+    public long l34124;
+    public long l34125;
+    public long l34126;
+    public long l34127;
+    public long l34128;
+    public long l34129;
+    public long l34130;
+    public long l34131;
+    public long l34132;
+    public long l34133;
+    public long l34134;
+    public long l34135;
+    public long l34136;
+    public long l34137;
+    public long l34138;
+    public long l34139;
+    public long l34140;
+    public long l34141;
+    public long l34142;
+    public long l34143;
+    public long l34144;
+    public long l34145;
+    public long l34146;
+    public long l34147;
+    public long l34148;
+    public long l34149;
+    public long l34150;
+    public long l34151;
+    public long l34152;
+    public long l34153;
+    public long l34154;
+    public long l34155;
+    public long l34156;
+    public long l34157;
+    public long l34158;
+    public long l34159;
+    public long l34160;
+    public long l34161;
+    public long l34162;
+    public long l34163;
+    public long l34164;
+    public long l34165;
+    public long l34166;
+    public long l34167;
+    public long l34168;
+    public long l34169;
+    public long l34170;
+    public long l34171;
+    public long l34172;
+    public long l34173;
+    public long l34174;
+    public long l34175;
+    public long l34176;
+    public long l34177;
+    public long l34178;
+    public long l34179;
+    public long l34180;
+    public long l34181;
+    public long l34182;
+    public long l34183;
+    public long l34184;
+    public long l34185;
+    public long l34186;
+    public long l34187;
+    public long l34188;
+    public long l34189;
+    public long l34190;
+    public long l34191;
+    public long l34192;
+    public long l34193;
+    public long l34194;
+    public long l34195;
+    public long l34196;
+    public long l34197;
+    public long l34198;
+    public long l34199;
+    public long l34200;
+    public long l34201;
+    public long l34202;
+    public long l34203;
+    public long l34204;
+    public long l34205;
+    public long l34206;
+    public long l34207;
+    public long l34208;
+    public long l34209;
+    public long l34210;
+    public long l34211;
+    public long l34212;
+    public long l34213;
+    public long l34214;
+    public long l34215;
+    public long l34216;
+    public long l34217;
+    public long l34218;
+    public long l34219;
+    public long l34220;
+    public long l34221;
+    public long l34222;
+    public long l34223;
+    public long l34224;
+    public long l34225;
+    public long l34226;
+    public long l34227;
+    public long l34228;
+    public long l34229;
+    public long l34230;
+    public long l34231;
+    public long l34232;
+    public long l34233;
+    public long l34234;
+    public long l34235;
+    public long l34236;
+    public long l34237;
+    public long l34238;
+    public long l34239;
+    public long l34240;
+    public long l34241;
+    public long l34242;
+    public long l34243;
+    public long l34244;
+    public long l34245;
+    public long l34246;
+    public long l34247;
+    public long l34248;
+    public long l34249;
+    public long l34250;
+    public long l34251;
+    public long l34252;
+    public long l34253;
+    public long l34254;
+    public long l34255;
+    public long l34256;
+    public long l34257;
+    public long l34258;
+    public long l34259;
+    public long l34260;
+    public long l34261;
+    public long l34262;
+    public long l34263;
+    public long l34264;
+    public long l34265;
+    public long l34266;
+    public long l34267;
+    public long l34268;
+    public long l34269;
+    public long l34270;
+    public long l34271;
+    public long l34272;
+    public long l34273;
+    public long l34274;
+    public long l34275;
+    public long l34276;
+    public long l34277;
+    public long l34278;
+    public long l34279;
+    public long l34280;
+    public long l34281;
+    public long l34282;
+    public long l34283;
+    public long l34284;
+    public long l34285;
+    public long l34286;
+    public long l34287;
+    public long l34288;
+    public long l34289;
+    public long l34290;
+    public long l34291;
+    public long l34292;
+    public long l34293;
+    public long l34294;
+    public long l34295;
+    public long l34296;
+    public long l34297;
+    public long l34298;
+    public long l34299;
+    public long l34300;
+    public long l34301;
+    public long l34302;
+    public long l34303;
+    public long l34304;
+    public long l34305;
+    public long l34306;
+    public long l34307;
+    public long l34308;
+    public long l34309;
+    public long l34310;
+    public long l34311;
+    public long l34312;
+    public long l34313;
+    public long l34314;
+    public long l34315;
+    public long l34316;
+    public long l34317;
+    public long l34318;
+    public long l34319;
+    public long l34320;
+    public long l34321;
+    public long l34322;
+    public long l34323;
+    public long l34324;
+    public long l34325;
+    public long l34326;
+    public long l34327;
+    public long l34328;
+    public long l34329;
+    public long l34330;
+    public long l34331;
+    public long l34332;
+    public long l34333;
+    public long l34334;
+    public long l34335;
+    public long l34336;
+    public long l34337;
+    public long l34338;
+    public long l34339;
+    public long l34340;
+    public long l34341;
+    public long l34342;
+    public long l34343;
+    public long l34344;
+    public long l34345;
+    public long l34346;
+    public long l34347;
+    public long l34348;
+    public long l34349;
+    public long l34350;
+    public long l34351;
+    public long l34352;
+    public long l34353;
+    public long l34354;
+    public long l34355;
+    public long l34356;
+    public long l34357;
+    public long l34358;
+    public long l34359;
+    public long l34360;
+    public long l34361;
+    public long l34362;
+    public long l34363;
+    public long l34364;
+    public long l34365;
+    public long l34366;
+    public long l34367;
+    public long l34368;
+    public long l34369;
+    public long l34370;
+    public long l34371;
+    public long l34372;
+    public long l34373;
+    public long l34374;
+    public long l34375;
+    public long l34376;
+    public long l34377;
+    public long l34378;
+    public long l34379;
+    public long l34380;
+    public long l34381;
+    public long l34382;
+    public long l34383;
+    public long l34384;
+    public long l34385;
+    public long l34386;
+    public long l34387;
+    public long l34388;
+    public long l34389;
+    public long l34390;
+    public long l34391;
+    public long l34392;
+    public long l34393;
+    public long l34394;
+    public long l34395;
+    public long l34396;
+    public long l34397;
+    public long l34398;
+    public long l34399;
+    public long l34400;
+    public long l34401;
+    public long l34402;
+    public long l34403;
+    public long l34404;
+    public long l34405;
+    public long l34406;
+    public long l34407;
+    public long l34408;
+    public long l34409;
+    public long l34410;
+    public long l34411;
+    public long l34412;
+    public long l34413;
+    public long l34414;
+    public long l34415;
+    public long l34416;
+    public long l34417;
+    public long l34418;
+    public long l34419;
+    public long l34420;
+    public long l34421;
+    public long l34422;
+    public long l34423;
+    public long l34424;
+    public long l34425;
+    public long l34426;
+    public long l34427;
+    public long l34428;
+    public long l34429;
+    public long l34430;
+    public long l34431;
+    public long l34432;
+    public long l34433;
+    public long l34434;
+    public long l34435;
+    public long l34436;
+    public long l34437;
+    public long l34438;
+    public long l34439;
+    public long l34440;
+    public long l34441;
+    public long l34442;
+    public long l34443;
+    public long l34444;
+    public long l34445;
+    public long l34446;
+    public long l34447;
+    public long l34448;
+    public long l34449;
+    public long l34450;
+    public long l34451;
+    public long l34452;
+    public long l34453;
+    public long l34454;
+    public long l34455;
+    public long l34456;
+    public long l34457;
+    public long l34458;
+    public long l34459;
+    public long l34460;
+    public long l34461;
+    public long l34462;
+    public long l34463;
+    public long l34464;
+    public long l34465;
+    public long l34466;
+    public long l34467;
+    public long l34468;
+    public long l34469;
+    public long l34470;
+    public long l34471;
+    public long l34472;
+    public long l34473;
+    public long l34474;
+    public long l34475;
+    public long l34476;
+    public long l34477;
+    public long l34478;
+    public long l34479;
+    public long l34480;
+    public long l34481;
+    public long l34482;
+    public long l34483;
+    public long l34484;
+    public long l34485;
+    public long l34486;
+    public long l34487;
+    public long l34488;
+    public long l34489;
+    public long l34490;
+    public long l34491;
+    public long l34492;
+    public long l34493;
+    public long l34494;
+    public long l34495;
+    public long l34496;
+    public long l34497;
+    public long l34498;
+    public long l34499;
+    public long l34500;
+    public long l34501;
+    public long l34502;
+    public long l34503;
+    public long l34504;
+    public long l34505;
+    public long l34506;
+    public long l34507;
+    public long l34508;
+    public long l34509;
+    public long l34510;
+    public long l34511;
+    public long l34512;
+    public long l34513;
+    public long l34514;
+    public long l34515;
+    public long l34516;
+    public long l34517;
+    public long l34518;
+    public long l34519;
+    public long l34520;
+    public long l34521;
+    public long l34522;
+    public long l34523;
+    public long l34524;
+    public long l34525;
+    public long l34526;
+    public long l34527;
+    public long l34528;
+    public long l34529;
+    public long l34530;
+    public long l34531;
+    public long l34532;
+    public long l34533;
+    public long l34534;
+    public long l34535;
+    public long l34536;
+    public long l34537;
+    public long l34538;
+    public long l34539;
+    public long l34540;
+    public long l34541;
+    public long l34542;
+    public long l34543;
+    public long l34544;
+    public long l34545;
+    public long l34546;
+    public long l34547;
+    public long l34548;
+    public long l34549;
+    public long l34550;
+    public long l34551;
+    public long l34552;
+    public long l34553;
+    public long l34554;
+    public long l34555;
+    public long l34556;
+    public long l34557;
+    public long l34558;
+    public long l34559;
+    public long l34560;
+    public long l34561;
+    public long l34562;
+    public long l34563;
+    public long l34564;
+    public long l34565;
+    public long l34566;
+    public long l34567;
+    public long l34568;
+    public long l34569;
+    public long l34570;
+    public long l34571;
+    public long l34572;
+    public long l34573;
+    public long l34574;
+    public long l34575;
+    public long l34576;
+    public long l34577;
+    public long l34578;
+    public long l34579;
+    public long l34580;
+    public long l34581;
+    public long l34582;
+    public long l34583;
+    public long l34584;
+    public long l34585;
+    public long l34586;
+    public long l34587;
+    public long l34588;
+    public long l34589;
+    public long l34590;
+    public long l34591;
+    public long l34592;
+    public long l34593;
+    public long l34594;
+    public long l34595;
+    public long l34596;
+    public long l34597;
+    public long l34598;
+    public long l34599;
+    public long l34600;
+    public long l34601;
+    public long l34602;
+    public long l34603;
+    public long l34604;
+    public long l34605;
+    public long l34606;
+    public long l34607;
+    public long l34608;
+    public long l34609;
+    public long l34610;
+    public long l34611;
+    public long l34612;
+    public long l34613;
+    public long l34614;
+    public long l34615;
+    public long l34616;
+    public long l34617;
+    public long l34618;
+    public long l34619;
+    public long l34620;
+    public long l34621;
+    public long l34622;
+    public long l34623;
+    public long l34624;
+    public long l34625;
+    public long l34626;
+    public long l34627;
+    public long l34628;
+    public long l34629;
+    public long l34630;
+    public long l34631;
+    public long l34632;
+    public long l34633;
+    public long l34634;
+    public long l34635;
+    public long l34636;
+    public long l34637;
+    public long l34638;
+    public long l34639;
+    public long l34640;
+    public long l34641;
+    public long l34642;
+    public long l34643;
+    public long l34644;
+    public long l34645;
+    public long l34646;
+    public long l34647;
+    public long l34648;
+    public long l34649;
+    public long l34650;
+    public long l34651;
+    public long l34652;
+    public long l34653;
+    public long l34654;
+    public long l34655;
+    public long l34656;
+    public long l34657;
+    public long l34658;
+    public long l34659;
+    public long l34660;
+    public long l34661;
+    public long l34662;
+    public long l34663;
+    public long l34664;
+    public long l34665;
+    public long l34666;
+    public long l34667;
+    public long l34668;
+    public long l34669;
+    public long l34670;
+    public long l34671;
+    public long l34672;
+    public long l34673;
+    public long l34674;
+    public long l34675;
+    public long l34676;
+    public long l34677;
+    public long l34678;
+    public long l34679;
+    public long l34680;
+    public long l34681;
+    public long l34682;
+    public long l34683;
+    public long l34684;
+    public long l34685;
+    public long l34686;
+    public long l34687;
+    public long l34688;
+    public long l34689;
+    public long l34690;
+    public long l34691;
+    public long l34692;
+    public long l34693;
+    public long l34694;
+    public long l34695;
+    public long l34696;
+    public long l34697;
+    public long l34698;
+    public long l34699;
+    public long l34700;
+    public long l34701;
+    public long l34702;
+    public long l34703;
+    public long l34704;
+    public long l34705;
+    public long l34706;
+    public long l34707;
+    public long l34708;
+    public long l34709;
+    public long l34710;
+    public long l34711;
+    public long l34712;
+    public long l34713;
+    public long l34714;
+    public long l34715;
+    public long l34716;
+    public long l34717;
+    public long l34718;
+    public long l34719;
+    public long l34720;
+    public long l34721;
+    public long l34722;
+    public long l34723;
+    public long l34724;
+    public long l34725;
+    public long l34726;
+    public long l34727;
+    public long l34728;
+    public long l34729;
+    public long l34730;
+    public long l34731;
+    public long l34732;
+    public long l34733;
+    public long l34734;
+    public long l34735;
+    public long l34736;
+    public long l34737;
+    public long l34738;
+    public long l34739;
+    public long l34740;
+    public long l34741;
+    public long l34742;
+    public long l34743;
+    public long l34744;
+    public long l34745;
+    public long l34746;
+    public long l34747;
+    public long l34748;
+    public long l34749;
+    public long l34750;
+    public long l34751;
+    public long l34752;
+    public long l34753;
+    public long l34754;
+    public long l34755;
+    public long l34756;
+    public long l34757;
+    public long l34758;
+    public long l34759;
+    public long l34760;
+    public long l34761;
+    public long l34762;
+    public long l34763;
+    public long l34764;
+    public long l34765;
+    public long l34766;
+    public long l34767;
+    public long l34768;
+    public long l34769;
+    public long l34770;
+    public long l34771;
+    public long l34772;
+    public long l34773;
+    public long l34774;
+    public long l34775;
+    public long l34776;
+    public long l34777;
+    public long l34778;
+    public long l34779;
+    public long l34780;
+    public long l34781;
+    public long l34782;
+    public long l34783;
+    public long l34784;
+    public long l34785;
+    public long l34786;
+    public long l34787;
+    public long l34788;
+    public long l34789;
+    public long l34790;
+    public long l34791;
+    public long l34792;
+    public long l34793;
+    public long l34794;
+    public long l34795;
+    public long l34796;
+    public long l34797;
+    public long l34798;
+    public long l34799;
+    public long l34800;
+    public long l34801;
+    public long l34802;
+    public long l34803;
+    public long l34804;
+    public long l34805;
+    public long l34806;
+    public long l34807;
+    public long l34808;
+    public long l34809;
+    public long l34810;
+    public long l34811;
+    public long l34812;
+    public long l34813;
+    public long l34814;
+    public long l34815;
+    public long l34816;
+    public long l34817;
+    public long l34818;
+    public long l34819;
+    public long l34820;
+    public long l34821;
+    public long l34822;
+    public long l34823;
+    public long l34824;
+    public long l34825;
+    public long l34826;
+    public long l34827;
+    public long l34828;
+    public long l34829;
+    public long l34830;
+    public long l34831;
+    public long l34832;
+    public long l34833;
+    public long l34834;
+    public long l34835;
+    public long l34836;
+    public long l34837;
+    public long l34838;
+    public long l34839;
+    public long l34840;
+    public long l34841;
+    public long l34842;
+    public long l34843;
+    public long l34844;
+    public long l34845;
+    public long l34846;
+    public long l34847;
+    public long l34848;
+    public long l34849;
+    public long l34850;
+    public long l34851;
+    public long l34852;
+    public long l34853;
+    public long l34854;
+    public long l34855;
+    public long l34856;
+    public long l34857;
+    public long l34858;
+    public long l34859;
+    public long l34860;
+    public long l34861;
+    public long l34862;
+    public long l34863;
+    public long l34864;
+    public long l34865;
+    public long l34866;
+    public long l34867;
+    public long l34868;
+    public long l34869;
+    public long l34870;
+    public long l34871;
+    public long l34872;
+    public long l34873;
+    public long l34874;
+    public long l34875;
+    public long l34876;
+    public long l34877;
+    public long l34878;
+    public long l34879;
+    public long l34880;
+    public long l34881;
+    public long l34882;
+    public long l34883;
+    public long l34884;
+    public long l34885;
+    public long l34886;
+    public long l34887;
+    public long l34888;
+    public long l34889;
+    public long l34890;
+    public long l34891;
+    public long l34892;
+    public long l34893;
+    public long l34894;
+    public long l34895;
+    public long l34896;
+    public long l34897;
+    public long l34898;
+    public long l34899;
+    public long l34900;
+    public long l34901;
+    public long l34902;
+    public long l34903;
+    public long l34904;
+    public long l34905;
+    public long l34906;
+    public long l34907;
+    public long l34908;
+    public long l34909;
+    public long l34910;
+    public long l34911;
+    public long l34912;
+    public long l34913;
+    public long l34914;
+    public long l34915;
+    public long l34916;
+    public long l34917;
+    public long l34918;
+    public long l34919;
+    public long l34920;
+    public long l34921;
+    public long l34922;
+    public long l34923;
+    public long l34924;
+    public long l34925;
+    public long l34926;
+    public long l34927;
+    public long l34928;
+    public long l34929;
+    public long l34930;
+    public long l34931;
+    public long l34932;
+    public long l34933;
+    public long l34934;
+    public long l34935;
+    public long l34936;
+    public long l34937;
+    public long l34938;
+    public long l34939;
+    public long l34940;
+    public long l34941;
+    public long l34942;
+    public long l34943;
+    public long l34944;
+    public long l34945;
+    public long l34946;
+    public long l34947;
+    public long l34948;
+    public long l34949;
+    public long l34950;
+    public long l34951;
+    public long l34952;
+    public long l34953;
+    public long l34954;
+    public long l34955;
+    public long l34956;
+    public long l34957;
+    public long l34958;
+    public long l34959;
+    public long l34960;
+    public long l34961;
+    public long l34962;
+    public long l34963;
+    public long l34964;
+    public long l34965;
+    public long l34966;
+    public long l34967;
+    public long l34968;
+    public long l34969;
+    public long l34970;
+    public long l34971;
+    public long l34972;
+    public long l34973;
+    public long l34974;
+    public long l34975;
+    public long l34976;
+    public long l34977;
+    public long l34978;
+    public long l34979;
+    public long l34980;
+    public long l34981;
+    public long l34982;
+    public long l34983;
+    public long l34984;
+    public long l34985;
+    public long l34986;
+    public long l34987;
+    public long l34988;
+    public long l34989;
+    public long l34990;
+    public long l34991;
+    public long l34992;
+    public long l34993;
+    public long l34994;
+    public long l34995;
+    public long l34996;
+    public long l34997;
+    public long l34998;
+    public long l34999;
+    public long l35000;
+    public long l35001;
+    public long l35002;
+    public long l35003;
+    public long l35004;
+    public long l35005;
+    public long l35006;
+    public long l35007;
+    public long l35008;
+    public long l35009;
+    public long l35010;
+    public long l35011;
+    public long l35012;
+    public long l35013;
+    public long l35014;
+    public long l35015;
+    public long l35016;
+    public long l35017;
+    public long l35018;
+    public long l35019;
+    public long l35020;
+    public long l35021;
+    public long l35022;
+    public long l35023;
+    public long l35024;
+    public long l35025;
+    public long l35026;
+    public long l35027;
+    public long l35028;
+    public long l35029;
+    public long l35030;
+    public long l35031;
+    public long l35032;
+    public long l35033;
+    public long l35034;
+    public long l35035;
+    public long l35036;
+    public long l35037;
+    public long l35038;
+    public long l35039;
+    public long l35040;
+    public long l35041;
+    public long l35042;
+    public long l35043;
+    public long l35044;
+    public long l35045;
+    public long l35046;
+    public long l35047;
+    public long l35048;
+    public long l35049;
+    public long l35050;
+    public long l35051;
+    public long l35052;
+    public long l35053;
+    public long l35054;
+    public long l35055;
+    public long l35056;
+    public long l35057;
+    public long l35058;
+    public long l35059;
+    public long l35060;
+    public long l35061;
+    public long l35062;
+    public long l35063;
+    public long l35064;
+    public long l35065;
+    public long l35066;
+    public long l35067;
+    public long l35068;
+    public long l35069;
+    public long l35070;
+    public long l35071;
+    public long l35072;
+    public long l35073;
+    public long l35074;
+    public long l35075;
+    public long l35076;
+    public long l35077;
+    public long l35078;
+    public long l35079;
+    public long l35080;
+    public long l35081;
+    public long l35082;
+    public long l35083;
+    public long l35084;
+    public long l35085;
+    public long l35086;
+    public long l35087;
+    public long l35088;
+    public long l35089;
+    public long l35090;
+    public long l35091;
+    public long l35092;
+    public long l35093;
+    public long l35094;
+    public long l35095;
+    public long l35096;
+    public long l35097;
+    public long l35098;
+    public long l35099;
+    public long l35100;
+    public long l35101;
+    public long l35102;
+    public long l35103;
+    public long l35104;
+    public long l35105;
+    public long l35106;
+    public long l35107;
+    public long l35108;
+    public long l35109;
+    public long l35110;
+    public long l35111;
+    public long l35112;
+    public long l35113;
+    public long l35114;
+    public long l35115;
+    public long l35116;
+    public long l35117;
+    public long l35118;
+    public long l35119;
+    public long l35120;
+    public long l35121;
+    public long l35122;
+    public long l35123;
+    public long l35124;
+    public long l35125;
+    public long l35126;
+    public long l35127;
+    public long l35128;
+    public long l35129;
+    public long l35130;
+    public long l35131;
+    public long l35132;
+    public long l35133;
+    public long l35134;
+    public long l35135;
+    public long l35136;
+    public long l35137;
+    public long l35138;
+    public long l35139;
+    public long l35140;
+    public long l35141;
+    public long l35142;
+    public long l35143;
+    public long l35144;
+    public long l35145;
+    public long l35146;
+    public long l35147;
+    public long l35148;
+    public long l35149;
+    public long l35150;
+    public long l35151;
+    public long l35152;
+    public long l35153;
+    public long l35154;
+    public long l35155;
+    public long l35156;
+    public long l35157;
+    public long l35158;
+    public long l35159;
+    public long l35160;
+    public long l35161;
+    public long l35162;
+    public long l35163;
+    public long l35164;
+    public long l35165;
+    public long l35166;
+    public long l35167;
+    public long l35168;
+    public long l35169;
+    public long l35170;
+    public long l35171;
+    public long l35172;
+    public long l35173;
+    public long l35174;
+    public long l35175;
+    public long l35176;
+    public long l35177;
+    public long l35178;
+    public long l35179;
+    public long l35180;
+    public long l35181;
+    public long l35182;
+    public long l35183;
+    public long l35184;
+    public long l35185;
+    public long l35186;
+    public long l35187;
+    public long l35188;
+    public long l35189;
+    public long l35190;
+    public long l35191;
+    public long l35192;
+    public long l35193;
+    public long l35194;
+    public long l35195;
+    public long l35196;
+    public long l35197;
+    public long l35198;
+    public long l35199;
+    public long l35200;
+    public long l35201;
+    public long l35202;
+    public long l35203;
+    public long l35204;
+    public long l35205;
+    public long l35206;
+    public long l35207;
+    public long l35208;
+    public long l35209;
+    public long l35210;
+    public long l35211;
+    public long l35212;
+    public long l35213;
+    public long l35214;
+    public long l35215;
+    public long l35216;
+    public long l35217;
+    public long l35218;
+    public long l35219;
+    public long l35220;
+    public long l35221;
+    public long l35222;
+    public long l35223;
+    public long l35224;
+    public long l35225;
+    public long l35226;
+    public long l35227;
+    public long l35228;
+    public long l35229;
+    public long l35230;
+    public long l35231;
+    public long l35232;
+    public long l35233;
+    public long l35234;
+    public long l35235;
+    public long l35236;
+    public long l35237;
+    public long l35238;
+    public long l35239;
+    public long l35240;
+    public long l35241;
+    public long l35242;
+    public long l35243;
+    public long l35244;
+    public long l35245;
+    public long l35246;
+    public long l35247;
+    public long l35248;
+    public long l35249;
+    public long l35250;
+    public long l35251;
+    public long l35252;
+    public long l35253;
+    public long l35254;
+    public long l35255;
+    public long l35256;
+    public long l35257;
+    public long l35258;
+    public long l35259;
+    public long l35260;
+    public long l35261;
+    public long l35262;
+    public long l35263;
+    public long l35264;
+    public long l35265;
+    public long l35266;
+    public long l35267;
+    public long l35268;
+    public long l35269;
+    public long l35270;
+    public long l35271;
+    public long l35272;
+    public long l35273;
+    public long l35274;
+    public long l35275;
+    public long l35276;
+    public long l35277;
+    public long l35278;
+    public long l35279;
+    public long l35280;
+    public long l35281;
+    public long l35282;
+    public long l35283;
+    public long l35284;
+    public long l35285;
+    public long l35286;
+    public long l35287;
+    public long l35288;
+    public long l35289;
+    public long l35290;
+    public long l35291;
+    public long l35292;
+    public long l35293;
+    public long l35294;
+    public long l35295;
+    public long l35296;
+    public long l35297;
+    public long l35298;
+    public long l35299;
+    public long l35300;
+    public long l35301;
+    public long l35302;
+    public long l35303;
+    public long l35304;
+    public long l35305;
+    public long l35306;
+    public long l35307;
+    public long l35308;
+    public long l35309;
+    public long l35310;
+    public long l35311;
+    public long l35312;
+    public long l35313;
+    public long l35314;
+    public long l35315;
+    public long l35316;
+    public long l35317;
+    public long l35318;
+    public long l35319;
+    public long l35320;
+    public long l35321;
+    public long l35322;
+    public long l35323;
+    public long l35324;
+    public long l35325;
+    public long l35326;
+    public long l35327;
+    public long l35328;
+    public long l35329;
+    public long l35330;
+    public long l35331;
+    public long l35332;
+    public long l35333;
+    public long l35334;
+    public long l35335;
+    public long l35336;
+    public long l35337;
+    public long l35338;
+    public long l35339;
+    public long l35340;
+    public long l35341;
+    public long l35342;
+    public long l35343;
+    public long l35344;
+    public long l35345;
+    public long l35346;
+    public long l35347;
+    public long l35348;
+    public long l35349;
+    public long l35350;
+    public long l35351;
+    public long l35352;
+    public long l35353;
+    public long l35354;
+    public long l35355;
+    public long l35356;
+    public long l35357;
+    public long l35358;
+    public long l35359;
+    public long l35360;
+    public long l35361;
+    public long l35362;
+    public long l35363;
+    public long l35364;
+    public long l35365;
+    public long l35366;
+    public long l35367;
+    public long l35368;
+    public long l35369;
+    public long l35370;
+    public long l35371;
+    public long l35372;
+    public long l35373;
+    public long l35374;
+    public long l35375;
+    public long l35376;
+    public long l35377;
+    public long l35378;
+    public long l35379;
+    public long l35380;
+    public long l35381;
+    public long l35382;
+    public long l35383;
+    public long l35384;
+    public long l35385;
+    public long l35386;
+    public long l35387;
+    public long l35388;
+    public long l35389;
+    public long l35390;
+    public long l35391;
+    public long l35392;
+    public long l35393;
+    public long l35394;
+    public long l35395;
+    public long l35396;
+    public long l35397;
+    public long l35398;
+    public long l35399;
+    public long l35400;
+    public long l35401;
+    public long l35402;
+    public long l35403;
+    public long l35404;
+    public long l35405;
+    public long l35406;
+    public long l35407;
+    public long l35408;
+    public long l35409;
+    public long l35410;
+    public long l35411;
+    public long l35412;
+    public long l35413;
+    public long l35414;
+    public long l35415;
+    public long l35416;
+    public long l35417;
+    public long l35418;
+    public long l35419;
+    public long l35420;
+    public long l35421;
+    public long l35422;
+    public long l35423;
+    public long l35424;
+    public long l35425;
+    public long l35426;
+    public long l35427;
+    public long l35428;
+    public long l35429;
+    public long l35430;
+    public long l35431;
+    public long l35432;
+    public long l35433;
+    public long l35434;
+    public long l35435;
+    public long l35436;
+    public long l35437;
+    public long l35438;
+    public long l35439;
+    public long l35440;
+    public long l35441;
+    public long l35442;
+    public long l35443;
+    public long l35444;
+    public long l35445;
+    public long l35446;
+    public long l35447;
+    public long l35448;
+    public long l35449;
+    public long l35450;
+    public long l35451;
+    public long l35452;
+    public long l35453;
+    public long l35454;
+    public long l35455;
+    public long l35456;
+    public long l35457;
+    public long l35458;
+    public long l35459;
+    public long l35460;
+    public long l35461;
+    public long l35462;
+    public long l35463;
+    public long l35464;
+    public long l35465;
+    public long l35466;
+    public long l35467;
+    public long l35468;
+    public long l35469;
+    public long l35470;
+    public long l35471;
+    public long l35472;
+    public long l35473;
+    public long l35474;
+    public long l35475;
+    public long l35476;
+    public long l35477;
+    public long l35478;
+    public long l35479;
+    public long l35480;
+    public long l35481;
+    public long l35482;
+    public long l35483;
+    public long l35484;
+    public long l35485;
+    public long l35486;
+    public long l35487;
+    public long l35488;
+    public long l35489;
+    public long l35490;
+    public long l35491;
+    public long l35492;
+    public long l35493;
+    public long l35494;
+    public long l35495;
+    public long l35496;
+    public long l35497;
+    public long l35498;
+    public long l35499;
+    public long l35500;
+    public long l35501;
+    public long l35502;
+    public long l35503;
+    public long l35504;
+    public long l35505;
+    public long l35506;
+    public long l35507;
+    public long l35508;
+    public long l35509;
+    public long l35510;
+    public long l35511;
+    public long l35512;
+    public long l35513;
+    public long l35514;
+    public long l35515;
+    public long l35516;
+    public long l35517;
+    public long l35518;
+    public long l35519;
+    public long l35520;
+    public long l35521;
+    public long l35522;
+    public long l35523;
+    public long l35524;
+    public long l35525;
+    public long l35526;
+    public long l35527;
+    public long l35528;
+    public long l35529;
+    public long l35530;
+    public long l35531;
+    public long l35532;
+    public long l35533;
+    public long l35534;
+    public long l35535;
+    public long l35536;
+    public long l35537;
+    public long l35538;
+    public long l35539;
+    public long l35540;
+    public long l35541;
+    public long l35542;
+    public long l35543;
+    public long l35544;
+    public long l35545;
+    public long l35546;
+    public long l35547;
+    public long l35548;
+    public long l35549;
+    public long l35550;
+    public long l35551;
+    public long l35552;
+    public long l35553;
+    public long l35554;
+    public long l35555;
+    public long l35556;
+    public long l35557;
+    public long l35558;
+    public long l35559;
+    public long l35560;
+    public long l35561;
+    public long l35562;
+    public long l35563;
+    public long l35564;
+    public long l35565;
+    public long l35566;
+    public long l35567;
+    public long l35568;
+    public long l35569;
+    public long l35570;
+    public long l35571;
+    public long l35572;
+    public long l35573;
+    public long l35574;
+    public long l35575;
+    public long l35576;
+    public long l35577;
+    public long l35578;
+    public long l35579;
+    public long l35580;
+    public long l35581;
+    public long l35582;
+    public long l35583;
+    public long l35584;
+    public long l35585;
+    public long l35586;
+    public long l35587;
+    public long l35588;
+    public long l35589;
+    public long l35590;
+    public long l35591;
+    public long l35592;
+    public long l35593;
+    public long l35594;
+    public long l35595;
+    public long l35596;
+    public long l35597;
+    public long l35598;
+    public long l35599;
+    public long l35600;
+    public long l35601;
+    public long l35602;
+    public long l35603;
+    public long l35604;
+    public long l35605;
+    public long l35606;
+    public long l35607;
+    public long l35608;
+    public long l35609;
+    public long l35610;
+    public long l35611;
+    public long l35612;
+    public long l35613;
+    public long l35614;
+    public long l35615;
+    public long l35616;
+    public long l35617;
+    public long l35618;
+    public long l35619;
+    public long l35620;
+    public long l35621;
+    public long l35622;
+    public long l35623;
+    public long l35624;
+    public long l35625;
+    public long l35626;
+    public long l35627;
+    public long l35628;
+    public long l35629;
+    public long l35630;
+    public long l35631;
+    public long l35632;
+    public long l35633;
+    public long l35634;
+    public long l35635;
+    public long l35636;
+    public long l35637;
+    public long l35638;
+    public long l35639;
+    public long l35640;
+    public long l35641;
+    public long l35642;
+    public long l35643;
+    public long l35644;
+    public long l35645;
+    public long l35646;
+    public long l35647;
+    public long l35648;
+    public long l35649;
+    public long l35650;
+    public long l35651;
+    public long l35652;
+    public long l35653;
+    public long l35654;
+    public long l35655;
+    public long l35656;
+    public long l35657;
+    public long l35658;
+    public long l35659;
+    public long l35660;
+    public long l35661;
+    public long l35662;
+    public long l35663;
+    public long l35664;
+    public long l35665;
+    public long l35666;
+    public long l35667;
+    public long l35668;
+    public long l35669;
+    public long l35670;
+    public long l35671;
+    public long l35672;
+    public long l35673;
+    public long l35674;
+    public long l35675;
+    public long l35676;
+    public long l35677;
+    public long l35678;
+    public long l35679;
+    public long l35680;
+    public long l35681;
+    public long l35682;
+    public long l35683;
+    public long l35684;
+    public long l35685;
+    public long l35686;
+    public long l35687;
+    public long l35688;
+    public long l35689;
+    public long l35690;
+    public long l35691;
+    public long l35692;
+    public long l35693;
+    public long l35694;
+    public long l35695;
+    public long l35696;
+    public long l35697;
+    public long l35698;
+    public long l35699;
+    public long l35700;
+    public long l35701;
+    public long l35702;
+    public long l35703;
+    public long l35704;
+    public long l35705;
+    public long l35706;
+    public long l35707;
+    public long l35708;
+    public long l35709;
+    public long l35710;
+    public long l35711;
+    public long l35712;
+    public long l35713;
+    public long l35714;
+    public long l35715;
+    public long l35716;
+    public long l35717;
+    public long l35718;
+    public long l35719;
+    public long l35720;
+    public long l35721;
+    public long l35722;
+    public long l35723;
+    public long l35724;
+    public long l35725;
+    public long l35726;
+    public long l35727;
+    public long l35728;
+    public long l35729;
+    public long l35730;
+    public long l35731;
+    public long l35732;
+    public long l35733;
+    public long l35734;
+    public long l35735;
+    public long l35736;
+    public long l35737;
+    public long l35738;
+    public long l35739;
+    public long l35740;
+    public long l35741;
+    public long l35742;
+    public long l35743;
+    public long l35744;
+    public long l35745;
+    public long l35746;
+    public long l35747;
+    public long l35748;
+    public long l35749;
+    public long l35750;
+    public long l35751;
+    public long l35752;
+    public long l35753;
+    public long l35754;
+    public long l35755;
+    public long l35756;
+    public long l35757;
+    public long l35758;
+    public long l35759;
+    public long l35760;
+    public long l35761;
+    public long l35762;
+    public long l35763;
+    public long l35764;
+    public long l35765;
+    public long l35766;
+    public long l35767;
+    public long l35768;
+    public long l35769;
+    public long l35770;
+    public long l35771;
+    public long l35772;
+    public long l35773;
+    public long l35774;
+    public long l35775;
+    public long l35776;
+    public long l35777;
+    public long l35778;
+    public long l35779;
+    public long l35780;
+    public long l35781;
+    public long l35782;
+    public long l35783;
+    public long l35784;
+    public long l35785;
+    public long l35786;
+    public long l35787;
+    public long l35788;
+    public long l35789;
+    public long l35790;
+    public long l35791;
+    public long l35792;
+    public long l35793;
+    public long l35794;
+    public long l35795;
+    public long l35796;
+    public long l35797;
+    public long l35798;
+    public long l35799;
+    public long l35800;
+    public long l35801;
+    public long l35802;
+    public long l35803;
+    public long l35804;
+    public long l35805;
+    public long l35806;
+    public long l35807;
+    public long l35808;
+    public long l35809;
+    public long l35810;
+    public long l35811;
+    public long l35812;
+    public long l35813;
+    public long l35814;
+    public long l35815;
+    public long l35816;
+    public long l35817;
+    public long l35818;
+    public long l35819;
+    public long l35820;
+    public long l35821;
+    public long l35822;
+    public long l35823;
+    public long l35824;
+    public long l35825;
+    public long l35826;
+    public long l35827;
+    public long l35828;
+    public long l35829;
+    public long l35830;
+    public long l35831;
+    public long l35832;
+    public long l35833;
+    public long l35834;
+    public long l35835;
+    public long l35836;
+    public long l35837;
+    public long l35838;
+    public long l35839;
+    public long l35840;
+    public long l35841;
+    public long l35842;
+    public long l35843;
+    public long l35844;
+    public long l35845;
+    public long l35846;
+    public long l35847;
+    public long l35848;
+    public long l35849;
+    public long l35850;
+    public long l35851;
+    public long l35852;
+    public long l35853;
+    public long l35854;
+    public long l35855;
+    public long l35856;
+    public long l35857;
+    public long l35858;
+    public long l35859;
+    public long l35860;
+    public long l35861;
+    public long l35862;
+    public long l35863;
+    public long l35864;
+    public long l35865;
+    public long l35866;
+    public long l35867;
+    public long l35868;
+    public long l35869;
+    public long l35870;
+    public long l35871;
+    public long l35872;
+    public long l35873;
+    public long l35874;
+    public long l35875;
+    public long l35876;
+    public long l35877;
+    public long l35878;
+    public long l35879;
+    public long l35880;
+    public long l35881;
+    public long l35882;
+    public long l35883;
+    public long l35884;
+    public long l35885;
+    public long l35886;
+    public long l35887;
+    public long l35888;
+    public long l35889;
+    public long l35890;
+    public long l35891;
+    public long l35892;
+    public long l35893;
+    public long l35894;
+    public long l35895;
+    public long l35896;
+    public long l35897;
+    public long l35898;
+    public long l35899;
+    public long l35900;
+    public long l35901;
+    public long l35902;
+    public long l35903;
+    public long l35904;
+    public long l35905;
+    public long l35906;
+    public long l35907;
+    public long l35908;
+    public long l35909;
+    public long l35910;
+    public long l35911;
+    public long l35912;
+    public long l35913;
+    public long l35914;
+    public long l35915;
+    public long l35916;
+    public long l35917;
+    public long l35918;
+    public long l35919;
+    public long l35920;
+    public long l35921;
+    public long l35922;
+    public long l35923;
+    public long l35924;
+    public long l35925;
+    public long l35926;
+    public long l35927;
+    public long l35928;
+    public long l35929;
+    public long l35930;
+    public long l35931;
+    public long l35932;
+    public long l35933;
+    public long l35934;
+    public long l35935;
+    public long l35936;
+    public long l35937;
+    public long l35938;
+    public long l35939;
+    public long l35940;
+    public long l35941;
+    public long l35942;
+    public long l35943;
+    public long l35944;
+    public long l35945;
+    public long l35946;
+    public long l35947;
+    public long l35948;
+    public long l35949;
+    public long l35950;
+    public long l35951;
+    public long l35952;
+    public long l35953;
+    public long l35954;
+    public long l35955;
+    public long l35956;
+    public long l35957;
+    public long l35958;
+    public long l35959;
+    public long l35960;
+    public long l35961;
+    public long l35962;
+    public long l35963;
+    public long l35964;
+    public long l35965;
+    public long l35966;
+    public long l35967;
+    public long l35968;
+    public long l35969;
+    public long l35970;
+    public long l35971;
+    public long l35972;
+    public long l35973;
+    public long l35974;
+    public long l35975;
+    public long l35976;
+    public long l35977;
+    public long l35978;
+    public long l35979;
+    public long l35980;
+    public long l35981;
+    public long l35982;
+    public long l35983;
+    public long l35984;
+    public long l35985;
+    public long l35986;
+    public long l35987;
+    public long l35988;
+    public long l35989;
+    public long l35990;
+    public long l35991;
+    public long l35992;
+    public long l35993;
+    public long l35994;
+    public long l35995;
+    public long l35996;
+    public long l35997;
+    public long l35998;
+    public long l35999;
+    public long l36000;
+    public long l36001;
+    public long l36002;
+    public long l36003;
+    public long l36004;
+    public long l36005;
+    public long l36006;
+    public long l36007;
+    public long l36008;
+    public long l36009;
+    public long l36010;
+    public long l36011;
+    public long l36012;
+    public long l36013;
+    public long l36014;
+    public long l36015;
+    public long l36016;
+    public long l36017;
+    public long l36018;
+    public long l36019;
+    public long l36020;
+    public long l36021;
+    public long l36022;
+    public long l36023;
+    public long l36024;
+    public long l36025;
+    public long l36026;
+    public long l36027;
+    public long l36028;
+    public long l36029;
+    public long l36030;
+    public long l36031;
+    public long l36032;
+    public long l36033;
+    public long l36034;
+    public long l36035;
+    public long l36036;
+    public long l36037;
+    public long l36038;
+    public long l36039;
+    public long l36040;
+    public long l36041;
+    public long l36042;
+    public long l36043;
+    public long l36044;
+    public long l36045;
+    public long l36046;
+    public long l36047;
+    public long l36048;
+    public long l36049;
+    public long l36050;
+    public long l36051;
+    public long l36052;
+    public long l36053;
+    public long l36054;
+    public long l36055;
+    public long l36056;
+    public long l36057;
+    public long l36058;
+    public long l36059;
+    public long l36060;
+    public long l36061;
+    public long l36062;
+    public long l36063;
+    public long l36064;
+    public long l36065;
+    public long l36066;
+    public long l36067;
+    public long l36068;
+    public long l36069;
+    public long l36070;
+    public long l36071;
+    public long l36072;
+    public long l36073;
+    public long l36074;
+    public long l36075;
+    public long l36076;
+    public long l36077;
+    public long l36078;
+    public long l36079;
+    public long l36080;
+    public long l36081;
+    public long l36082;
+    public long l36083;
+    public long l36084;
+    public long l36085;
+    public long l36086;
+    public long l36087;
+    public long l36088;
+    public long l36089;
+    public long l36090;
+    public long l36091;
+    public long l36092;
+    public long l36093;
+    public long l36094;
+    public long l36095;
+    public long l36096;
+    public long l36097;
+    public long l36098;
+    public long l36099;
+    public long l36100;
+    public long l36101;
+    public long l36102;
+    public long l36103;
+    public long l36104;
+    public long l36105;
+    public long l36106;
+    public long l36107;
+    public long l36108;
+    public long l36109;
+    public long l36110;
+    public long l36111;
+    public long l36112;
+    public long l36113;
+    public long l36114;
+    public long l36115;
+    public long l36116;
+    public long l36117;
+    public long l36118;
+    public long l36119;
+    public long l36120;
+    public long l36121;
+    public long l36122;
+    public long l36123;
+    public long l36124;
+    public long l36125;
+    public long l36126;
+    public long l36127;
+    public long l36128;
+    public long l36129;
+    public long l36130;
+    public long l36131;
+    public long l36132;
+    public long l36133;
+    public long l36134;
+    public long l36135;
+    public long l36136;
+    public long l36137;
+    public long l36138;
+    public long l36139;
+    public long l36140;
+    public long l36141;
+    public long l36142;
+    public long l36143;
+    public long l36144;
+    public long l36145;
+    public long l36146;
+    public long l36147;
+    public long l36148;
+    public long l36149;
+    public long l36150;
+    public long l36151;
+    public long l36152;
+    public long l36153;
+    public long l36154;
+    public long l36155;
+    public long l36156;
+    public long l36157;
+    public long l36158;
+    public long l36159;
+    public long l36160;
+    public long l36161;
+    public long l36162;
+    public long l36163;
+    public long l36164;
+    public long l36165;
+    public long l36166;
+    public long l36167;
+    public long l36168;
+    public long l36169;
+    public long l36170;
+    public long l36171;
+    public long l36172;
+    public long l36173;
+    public long l36174;
+    public long l36175;
+    public long l36176;
+    public long l36177;
+    public long l36178;
+    public long l36179;
+    public long l36180;
+    public long l36181;
+    public long l36182;
+    public long l36183;
+    public long l36184;
+    public long l36185;
+    public long l36186;
+    public long l36187;
+    public long l36188;
+    public long l36189;
+    public long l36190;
+    public long l36191;
+    public long l36192;
+    public long l36193;
+    public long l36194;
+    public long l36195;
+    public long l36196;
+    public long l36197;
+    public long l36198;
+    public long l36199;
+    public long l36200;
+    public long l36201;
+    public long l36202;
+    public long l36203;
+    public long l36204;
+    public long l36205;
+    public long l36206;
+    public long l36207;
+    public long l36208;
+    public long l36209;
+    public long l36210;
+    public long l36211;
+    public long l36212;
+    public long l36213;
+    public long l36214;
+    public long l36215;
+    public long l36216;
+    public long l36217;
+    public long l36218;
+    public long l36219;
+    public long l36220;
+    public long l36221;
+    public long l36222;
+    public long l36223;
+    public long l36224;
+    public long l36225;
+    public long l36226;
+    public long l36227;
+    public long l36228;
+    public long l36229;
+    public long l36230;
+    public long l36231;
+    public long l36232;
+    public long l36233;
+    public long l36234;
+    public long l36235;
+    public long l36236;
+    public long l36237;
+    public long l36238;
+    public long l36239;
+    public long l36240;
+    public long l36241;
+    public long l36242;
+    public long l36243;
+    public long l36244;
+    public long l36245;
+    public long l36246;
+    public long l36247;
+    public long l36248;
+    public long l36249;
+    public long l36250;
+    public long l36251;
+    public long l36252;
+    public long l36253;
+    public long l36254;
+    public long l36255;
+    public long l36256;
+    public long l36257;
+    public long l36258;
+    public long l36259;
+    public long l36260;
+    public long l36261;
+    public long l36262;
+    public long l36263;
+    public long l36264;
+    public long l36265;
+    public long l36266;
+    public long l36267;
+    public long l36268;
+    public long l36269;
+    public long l36270;
+    public long l36271;
+    public long l36272;
+    public long l36273;
+    public long l36274;
+    public long l36275;
+    public long l36276;
+    public long l36277;
+    public long l36278;
+    public long l36279;
+    public long l36280;
+    public long l36281;
+    public long l36282;
+    public long l36283;
+    public long l36284;
+    public long l36285;
+    public long l36286;
+    public long l36287;
+    public long l36288;
+    public long l36289;
+    public long l36290;
+    public long l36291;
+    public long l36292;
+    public long l36293;
+    public long l36294;
+    public long l36295;
+    public long l36296;
+    public long l36297;
+    public long l36298;
+    public long l36299;
+    public long l36300;
+    public long l36301;
+    public long l36302;
+    public long l36303;
+    public long l36304;
+    public long l36305;
+    public long l36306;
+    public long l36307;
+    public long l36308;
+    public long l36309;
+    public long l36310;
+    public long l36311;
+    public long l36312;
+    public long l36313;
+    public long l36314;
+    public long l36315;
+    public long l36316;
+    public long l36317;
+    public long l36318;
+    public long l36319;
+    public long l36320;
+    public long l36321;
+    public long l36322;
+    public long l36323;
+    public long l36324;
+    public long l36325;
+    public long l36326;
+    public long l36327;
+    public long l36328;
+    public long l36329;
+    public long l36330;
+    public long l36331;
+    public long l36332;
+    public long l36333;
+    public long l36334;
+    public long l36335;
+    public long l36336;
+    public long l36337;
+    public long l36338;
+    public long l36339;
+    public long l36340;
+    public long l36341;
+    public long l36342;
+    public long l36343;
+    public long l36344;
+    public long l36345;
+    public long l36346;
+    public long l36347;
+    public long l36348;
+    public long l36349;
+    public long l36350;
+    public long l36351;
+    public long l36352;
+    public long l36353;
+    public long l36354;
+    public long l36355;
+    public long l36356;
+    public long l36357;
+    public long l36358;
+    public long l36359;
+    public long l36360;
+    public long l36361;
+    public long l36362;
+    public long l36363;
+    public long l36364;
+    public long l36365;
+    public long l36366;
+    public long l36367;
+    public long l36368;
+    public long l36369;
+    public long l36370;
+    public long l36371;
+    public long l36372;
+    public long l36373;
+    public long l36374;
+    public long l36375;
+    public long l36376;
+    public long l36377;
+    public long l36378;
+    public long l36379;
+    public long l36380;
+    public long l36381;
+    public long l36382;
+    public long l36383;
+    public long l36384;
+    public long l36385;
+    public long l36386;
+    public long l36387;
+    public long l36388;
+    public long l36389;
+    public long l36390;
+    public long l36391;
+    public long l36392;
+    public long l36393;
+    public long l36394;
+    public long l36395;
+    public long l36396;
+    public long l36397;
+    public long l36398;
+    public long l36399;
+    public long l36400;
+    public long l36401;
+    public long l36402;
+    public long l36403;
+    public long l36404;
+    public long l36405;
+    public long l36406;
+    public long l36407;
+    public long l36408;
+    public long l36409;
+    public long l36410;
+    public long l36411;
+    public long l36412;
+    public long l36413;
+    public long l36414;
+    public long l36415;
+    public long l36416;
+    public long l36417;
+    public long l36418;
+    public long l36419;
+    public long l36420;
+    public long l36421;
+    public long l36422;
+    public long l36423;
+    public long l36424;
+    public long l36425;
+    public long l36426;
+    public long l36427;
+    public long l36428;
+    public long l36429;
+    public long l36430;
+    public long l36431;
+    public long l36432;
+    public long l36433;
+    public long l36434;
+    public long l36435;
+    public long l36436;
+    public long l36437;
+    public long l36438;
+    public long l36439;
+    public long l36440;
+    public long l36441;
+    public long l36442;
+    public long l36443;
+    public long l36444;
+    public long l36445;
+    public long l36446;
+    public long l36447;
+    public long l36448;
+    public long l36449;
+    public long l36450;
+    public long l36451;
+    public long l36452;
+    public long l36453;
+    public long l36454;
+    public long l36455;
+    public long l36456;
+    public long l36457;
+    public long l36458;
+    public long l36459;
+    public long l36460;
+    public long l36461;
+    public long l36462;
+    public long l36463;
+    public long l36464;
+    public long l36465;
+    public long l36466;
+    public long l36467;
+    public long l36468;
+    public long l36469;
+    public long l36470;
+    public long l36471;
+    public long l36472;
+    public long l36473;
+    public long l36474;
+    public long l36475;
+    public long l36476;
+    public long l36477;
+    public long l36478;
+    public long l36479;
+    public long l36480;
+    public long l36481;
+    public long l36482;
+    public long l36483;
+    public long l36484;
+    public long l36485;
+    public long l36486;
+    public long l36487;
+    public long l36488;
+    public long l36489;
+    public long l36490;
+    public long l36491;
+    public long l36492;
+    public long l36493;
+    public long l36494;
+    public long l36495;
+    public long l36496;
+    public long l36497;
+    public long l36498;
+    public long l36499;
+    public long l36500;
+    public long l36501;
+    public long l36502;
+    public long l36503;
+    public long l36504;
+    public long l36505;
+    public long l36506;
+    public long l36507;
+    public long l36508;
+    public long l36509;
+    public long l36510;
+    public long l36511;
+    public long l36512;
+    public long l36513;
+    public long l36514;
+    public long l36515;
+    public long l36516;
+    public long l36517;
+    public long l36518;
+    public long l36519;
+    public long l36520;
+    public long l36521;
+    public long l36522;
+    public long l36523;
+    public long l36524;
+    public long l36525;
+    public long l36526;
+    public long l36527;
+    public long l36528;
+    public long l36529;
+    public long l36530;
+    public long l36531;
+    public long l36532;
+    public long l36533;
+    public long l36534;
+    public long l36535;
+    public long l36536;
+    public long l36537;
+    public long l36538;
+    public long l36539;
+    public long l36540;
+    public long l36541;
+    public long l36542;
+    public long l36543;
+    public long l36544;
+    public long l36545;
+    public long l36546;
+    public long l36547;
+    public long l36548;
+    public long l36549;
+    public long l36550;
+    public long l36551;
+    public long l36552;
+    public long l36553;
+    public long l36554;
+    public long l36555;
+    public long l36556;
+    public long l36557;
+    public long l36558;
+    public long l36559;
+    public long l36560;
+    public long l36561;
+    public long l36562;
+    public long l36563;
+    public long l36564;
+    public long l36565;
+    public long l36566;
+    public long l36567;
+    public long l36568;
+    public long l36569;
+    public long l36570;
+    public long l36571;
+    public long l36572;
+    public long l36573;
+    public long l36574;
+    public long l36575;
+    public long l36576;
+    public long l36577;
+    public long l36578;
+    public long l36579;
+    public long l36580;
+    public long l36581;
+    public long l36582;
+    public long l36583;
+    public long l36584;
+    public long l36585;
+    public long l36586;
+    public long l36587;
+    public long l36588;
+    public long l36589;
+    public long l36590;
+    public long l36591;
+    public long l36592;
+    public long l36593;
+    public long l36594;
+    public long l36595;
+    public long l36596;
+    public long l36597;
+    public long l36598;
+    public long l36599;
+    public long l36600;
+    public long l36601;
+    public long l36602;
+    public long l36603;
+    public long l36604;
+    public long l36605;
+    public long l36606;
+    public long l36607;
+    public long l36608;
+    public long l36609;
+    public long l36610;
+    public long l36611;
+    public long l36612;
+    public long l36613;
+    public long l36614;
+    public long l36615;
+    public long l36616;
+    public long l36617;
+    public long l36618;
+    public long l36619;
+    public long l36620;
+    public long l36621;
+    public long l36622;
+    public long l36623;
+    public long l36624;
+    public long l36625;
+    public long l36626;
+    public long l36627;
+    public long l36628;
+    public long l36629;
+    public long l36630;
+    public long l36631;
+    public long l36632;
+    public long l36633;
+    public long l36634;
+    public long l36635;
+    public long l36636;
+    public long l36637;
+    public long l36638;
+    public long l36639;
+    public long l36640;
+    public long l36641;
+    public long l36642;
+    public long l36643;
+    public long l36644;
+    public long l36645;
+    public long l36646;
+    public long l36647;
+    public long l36648;
+    public long l36649;
+    public long l36650;
+    public long l36651;
+    public long l36652;
+    public long l36653;
+    public long l36654;
+    public long l36655;
+    public long l36656;
+    public long l36657;
+    public long l36658;
+    public long l36659;
+    public long l36660;
+    public long l36661;
+    public long l36662;
+    public long l36663;
+    public long l36664;
+    public long l36665;
+    public long l36666;
+    public long l36667;
+    public long l36668;
+    public long l36669;
+    public long l36670;
+    public long l36671;
+    public long l36672;
+    public long l36673;
+    public long l36674;
+    public long l36675;
+    public long l36676;
+    public long l36677;
+    public long l36678;
+    public long l36679;
+    public long l36680;
+    public long l36681;
+    public long l36682;
+    public long l36683;
+    public long l36684;
+    public long l36685;
+    public long l36686;
+    public long l36687;
+    public long l36688;
+    public long l36689;
+    public long l36690;
+    public long l36691;
+    public long l36692;
+    public long l36693;
+    public long l36694;
+    public long l36695;
+    public long l36696;
+    public long l36697;
+    public long l36698;
+    public long l36699;
+    public long l36700;
+    public long l36701;
+    public long l36702;
+    public long l36703;
+    public long l36704;
+    public long l36705;
+    public long l36706;
+    public long l36707;
+    public long l36708;
+    public long l36709;
+    public long l36710;
+    public long l36711;
+    public long l36712;
+    public long l36713;
+    public long l36714;
+    public long l36715;
+    public long l36716;
+    public long l36717;
+    public long l36718;
+    public long l36719;
+    public long l36720;
+    public long l36721;
+    public long l36722;
+    public long l36723;
+    public long l36724;
+    public long l36725;
+    public long l36726;
+    public long l36727;
+    public long l36728;
+    public long l36729;
+    public long l36730;
+    public long l36731;
+    public long l36732;
+    public long l36733;
+    public long l36734;
+    public long l36735;
+    public long l36736;
+    public long l36737;
+    public long l36738;
+    public long l36739;
+    public long l36740;
+    public long l36741;
+    public long l36742;
+    public long l36743;
+    public long l36744;
+    public long l36745;
+    public long l36746;
+    public long l36747;
+    public long l36748;
+    public long l36749;
+    public long l36750;
+    public long l36751;
+    public long l36752;
+    public long l36753;
+    public long l36754;
+    public long l36755;
+    public long l36756;
+    public long l36757;
+    public long l36758;
+    public long l36759;
+    public long l36760;
+    public long l36761;
+    public long l36762;
+    public long l36763;
+    public long l36764;
+    public long l36765;
+    public long l36766;
+    public long l36767;
+    public long l36768;
+    public long l36769;
+    public long l36770;
+    public long l36771;
+    public long l36772;
+    public long l36773;
+    public long l36774;
+    public long l36775;
+    public long l36776;
+    public long l36777;
+    public long l36778;
+    public long l36779;
+    public long l36780;
+    public long l36781;
+    public long l36782;
+    public long l36783;
+    public long l36784;
+    public long l36785;
+    public long l36786;
+    public long l36787;
+    public long l36788;
+    public long l36789;
+    public long l36790;
+    public long l36791;
+    public long l36792;
+    public long l36793;
+    public long l36794;
+    public long l36795;
+    public long l36796;
+    public long l36797;
+    public long l36798;
+    public long l36799;
+    public long l36800;
+    public long l36801;
+    public long l36802;
+    public long l36803;
+    public long l36804;
+    public long l36805;
+    public long l36806;
+    public long l36807;
+    public long l36808;
+    public long l36809;
+    public long l36810;
+    public long l36811;
+    public long l36812;
+    public long l36813;
+    public long l36814;
+    public long l36815;
+    public long l36816;
+    public long l36817;
+    public long l36818;
+    public long l36819;
+    public long l36820;
+    public long l36821;
+    public long l36822;
+    public long l36823;
+    public long l36824;
+    public long l36825;
+    public long l36826;
+    public long l36827;
+    public long l36828;
+    public long l36829;
+    public long l36830;
+    public long l36831;
+    public long l36832;
+    public long l36833;
+    public long l36834;
+    public long l36835;
+    public long l36836;
+    public long l36837;
+    public long l36838;
+    public long l36839;
+    public long l36840;
+    public long l36841;
+    public long l36842;
+    public long l36843;
+    public long l36844;
+    public long l36845;
+    public long l36846;
+    public long l36847;
+    public long l36848;
+    public long l36849;
+    public long l36850;
+    public long l36851;
+    public long l36852;
+    public long l36853;
+    public long l36854;
+    public long l36855;
+    public long l36856;
+    public long l36857;
+    public long l36858;
+    public long l36859;
+    public long l36860;
+    public long l36861;
+    public long l36862;
+    public long l36863;
+    public long l36864;
+    public long l36865;
+    public long l36866;
+    public long l36867;
+    public long l36868;
+    public long l36869;
+    public long l36870;
+    public long l36871;
+    public long l36872;
+    public long l36873;
+    public long l36874;
+    public long l36875;
+    public long l36876;
+    public long l36877;
+    public long l36878;
+    public long l36879;
+    public long l36880;
+    public long l36881;
+    public long l36882;
+    public long l36883;
+    public long l36884;
+    public long l36885;
+    public long l36886;
+    public long l36887;
+    public long l36888;
+    public long l36889;
+    public long l36890;
+    public long l36891;
+    public long l36892;
+    public long l36893;
+    public long l36894;
+    public long l36895;
+    public long l36896;
+    public long l36897;
+    public long l36898;
+    public long l36899;
+    public long l36900;
+    public long l36901;
+    public long l36902;
+    public long l36903;
+    public long l36904;
+    public long l36905;
+    public long l36906;
+    public long l36907;
+    public long l36908;
+    public long l36909;
+    public long l36910;
+    public long l36911;
+    public long l36912;
+    public long l36913;
+    public long l36914;
+    public long l36915;
+    public long l36916;
+    public long l36917;
+    public long l36918;
+    public long l36919;
+    public long l36920;
+    public long l36921;
+    public long l36922;
+    public long l36923;
+    public long l36924;
+    public long l36925;
+    public long l36926;
+    public long l36927;
+    public long l36928;
+    public long l36929;
+    public long l36930;
+    public long l36931;
+    public long l36932;
+    public long l36933;
+    public long l36934;
+    public long l36935;
+    public long l36936;
+    public long l36937;
+    public long l36938;
+    public long l36939;
+    public long l36940;
+    public long l36941;
+    public long l36942;
+    public long l36943;
+    public long l36944;
+    public long l36945;
+    public long l36946;
+    public long l36947;
+    public long l36948;
+    public long l36949;
+    public long l36950;
+    public long l36951;
+    public long l36952;
+    public long l36953;
+    public long l36954;
+    public long l36955;
+    public long l36956;
+    public long l36957;
+    public long l36958;
+    public long l36959;
+    public long l36960;
+    public long l36961;
+    public long l36962;
+    public long l36963;
+    public long l36964;
+    public long l36965;
+    public long l36966;
+    public long l36967;
+    public long l36968;
+    public long l36969;
+    public long l36970;
+    public long l36971;
+    public long l36972;
+    public long l36973;
+    public long l36974;
+    public long l36975;
+    public long l36976;
+    public long l36977;
+    public long l36978;
+    public long l36979;
+    public long l36980;
+    public long l36981;
+    public long l36982;
+    public long l36983;
+    public long l36984;
+    public long l36985;
+    public long l36986;
+    public long l36987;
+    public long l36988;
+    public long l36989;
+    public long l36990;
+    public long l36991;
+    public long l36992;
+    public long l36993;
+    public long l36994;
+    public long l36995;
+    public long l36996;
+    public long l36997;
+    public long l36998;
+    public long l36999;
+    public long l37000;
+    public long l37001;
+    public long l37002;
+    public long l37003;
+    public long l37004;
+    public long l37005;
+    public long l37006;
+    public long l37007;
+    public long l37008;
+    public long l37009;
+    public long l37010;
+    public long l37011;
+    public long l37012;
+    public long l37013;
+    public long l37014;
+    public long l37015;
+    public long l37016;
+    public long l37017;
+    public long l37018;
+    public long l37019;
+    public long l37020;
+    public long l37021;
+    public long l37022;
+    public long l37023;
+    public long l37024;
+    public long l37025;
+    public long l37026;
+    public long l37027;
+    public long l37028;
+    public long l37029;
+    public long l37030;
+    public long l37031;
+    public long l37032;
+    public long l37033;
+    public long l37034;
+    public long l37035;
+    public long l37036;
+    public long l37037;
+    public long l37038;
+    public long l37039;
+    public long l37040;
+    public long l37041;
+    public long l37042;
+    public long l37043;
+    public long l37044;
+    public long l37045;
+    public long l37046;
+    public long l37047;
+    public long l37048;
+    public long l37049;
+    public long l37050;
+    public long l37051;
+    public long l37052;
+    public long l37053;
+    public long l37054;
+    public long l37055;
+    public long l37056;
+    public long l37057;
+    public long l37058;
+    public long l37059;
+    public long l37060;
+    public long l37061;
+    public long l37062;
+    public long l37063;
+    public long l37064;
+    public long l37065;
+    public long l37066;
+    public long l37067;
+    public long l37068;
+    public long l37069;
+    public long l37070;
+    public long l37071;
+    public long l37072;
+    public long l37073;
+    public long l37074;
+    public long l37075;
+    public long l37076;
+    public long l37077;
+    public long l37078;
+    public long l37079;
+    public long l37080;
+    public long l37081;
+    public long l37082;
+    public long l37083;
+    public long l37084;
+    public long l37085;
+    public long l37086;
+    public long l37087;
+    public long l37088;
+    public long l37089;
+    public long l37090;
+    public long l37091;
+    public long l37092;
+    public long l37093;
+    public long l37094;
+    public long l37095;
+    public long l37096;
+    public long l37097;
+    public long l37098;
+    public long l37099;
+    public long l37100;
+    public long l37101;
+    public long l37102;
+    public long l37103;
+    public long l37104;
+    public long l37105;
+    public long l37106;
+    public long l37107;
+    public long l37108;
+    public long l37109;
+    public long l37110;
+    public long l37111;
+    public long l37112;
+    public long l37113;
+    public long l37114;
+    public long l37115;
+    public long l37116;
+    public long l37117;
+    public long l37118;
+    public long l37119;
+    public long l37120;
+    public long l37121;
+    public long l37122;
+    public long l37123;
+    public long l37124;
+    public long l37125;
+    public long l37126;
+    public long l37127;
+    public long l37128;
+    public long l37129;
+    public long l37130;
+    public long l37131;
+    public long l37132;
+    public long l37133;
+    public long l37134;
+    public long l37135;
+    public long l37136;
+    public long l37137;
+    public long l37138;
+    public long l37139;
+    public long l37140;
+    public long l37141;
+    public long l37142;
+    public long l37143;
+    public long l37144;
+    public long l37145;
+    public long l37146;
+    public long l37147;
+    public long l37148;
+    public long l37149;
+    public long l37150;
+    public long l37151;
+    public long l37152;
+    public long l37153;
+    public long l37154;
+    public long l37155;
+    public long l37156;
+    public long l37157;
+    public long l37158;
+    public long l37159;
+    public long l37160;
+    public long l37161;
+    public long l37162;
+    public long l37163;
+    public long l37164;
+    public long l37165;
+    public long l37166;
+    public long l37167;
+    public long l37168;
+    public long l37169;
+    public long l37170;
+    public long l37171;
+    public long l37172;
+    public long l37173;
+    public long l37174;
+    public long l37175;
+    public long l37176;
+    public long l37177;
+    public long l37178;
+    public long l37179;
+    public long l37180;
+    public long l37181;
+    public long l37182;
+    public long l37183;
+    public long l37184;
+    public long l37185;
+    public long l37186;
+    public long l37187;
+    public long l37188;
+    public long l37189;
+    public long l37190;
+    public long l37191;
+    public long l37192;
+    public long l37193;
+    public long l37194;
+    public long l37195;
+    public long l37196;
+    public long l37197;
+    public long l37198;
+    public long l37199;
+    public long l37200;
+    public long l37201;
+    public long l37202;
+    public long l37203;
+    public long l37204;
+    public long l37205;
+    public long l37206;
+    public long l37207;
+    public long l37208;
+    public long l37209;
+    public long l37210;
+    public long l37211;
+    public long l37212;
+    public long l37213;
+    public long l37214;
+    public long l37215;
+    public long l37216;
+    public long l37217;
+    public long l37218;
+    public long l37219;
+    public long l37220;
+    public long l37221;
+    public long l37222;
+    public long l37223;
+    public long l37224;
+    public long l37225;
+    public long l37226;
+    public long l37227;
+    public long l37228;
+    public long l37229;
+    public long l37230;
+    public long l37231;
+    public long l37232;
+    public long l37233;
+    public long l37234;
+    public long l37235;
+    public long l37236;
+    public long l37237;
+    public long l37238;
+    public long l37239;
+    public long l37240;
+    public long l37241;
+    public long l37242;
+    public long l37243;
+    public long l37244;
+    public long l37245;
+    public long l37246;
+    public long l37247;
+    public long l37248;
+    public long l37249;
+    public long l37250;
+    public long l37251;
+    public long l37252;
+    public long l37253;
+    public long l37254;
+    public long l37255;
+    public long l37256;
+    public long l37257;
+    public long l37258;
+    public long l37259;
+    public long l37260;
+    public long l37261;
+    public long l37262;
+    public long l37263;
+    public long l37264;
+    public long l37265;
+    public long l37266;
+    public long l37267;
+    public long l37268;
+    public long l37269;
+    public long l37270;
+    public long l37271;
+    public long l37272;
+    public long l37273;
+    public long l37274;
+    public long l37275;
+    public long l37276;
+    public long l37277;
+    public long l37278;
+    public long l37279;
+    public long l37280;
+    public long l37281;
+    public long l37282;
+    public long l37283;
+    public long l37284;
+    public long l37285;
+    public long l37286;
+    public long l37287;
+    public long l37288;
+    public long l37289;
+    public long l37290;
+    public long l37291;
+    public long l37292;
+    public long l37293;
+    public long l37294;
+    public long l37295;
+    public long l37296;
+    public long l37297;
+    public long l37298;
+    public long l37299;
+    public long l37300;
+    public long l37301;
+    public long l37302;
+    public long l37303;
+    public long l37304;
+    public long l37305;
+    public long l37306;
+    public long l37307;
+    public long l37308;
+    public long l37309;
+    public long l37310;
+    public long l37311;
+    public long l37312;
+    public long l37313;
+    public long l37314;
+    public long l37315;
+    public long l37316;
+    public long l37317;
+    public long l37318;
+    public long l37319;
+    public long l37320;
+    public long l37321;
+    public long l37322;
+    public long l37323;
+    public long l37324;
+    public long l37325;
+    public long l37326;
+    public long l37327;
+    public long l37328;
+    public long l37329;
+    public long l37330;
+    public long l37331;
+    public long l37332;
+    public long l37333;
+    public long l37334;
+    public long l37335;
+    public long l37336;
+    public long l37337;
+    public long l37338;
+    public long l37339;
+    public long l37340;
+    public long l37341;
+    public long l37342;
+    public long l37343;
+    public long l37344;
+    public long l37345;
+    public long l37346;
+    public long l37347;
+    public long l37348;
+    public long l37349;
+    public long l37350;
+    public long l37351;
+    public long l37352;
+    public long l37353;
+    public long l37354;
+    public long l37355;
+    public long l37356;
+    public long l37357;
+    public long l37358;
+    public long l37359;
+    public long l37360;
+    public long l37361;
+    public long l37362;
+    public long l37363;
+    public long l37364;
+    public long l37365;
+    public long l37366;
+    public long l37367;
+    public long l37368;
+    public long l37369;
+    public long l37370;
+    public long l37371;
+    public long l37372;
+    public long l37373;
+    public long l37374;
+    public long l37375;
+    public long l37376;
+    public long l37377;
+    public long l37378;
+    public long l37379;
+    public long l37380;
+    public long l37381;
+    public long l37382;
+    public long l37383;
+    public long l37384;
+    public long l37385;
+    public long l37386;
+    public long l37387;
+    public long l37388;
+    public long l37389;
+    public long l37390;
+    public long l37391;
+    public long l37392;
+    public long l37393;
+    public long l37394;
+    public long l37395;
+    public long l37396;
+    public long l37397;
+    public long l37398;
+    public long l37399;
+    public long l37400;
+    public long l37401;
+    public long l37402;
+    public long l37403;
+    public long l37404;
+    public long l37405;
+    public long l37406;
+    public long l37407;
+    public long l37408;
+    public long l37409;
+    public long l37410;
+    public long l37411;
+    public long l37412;
+    public long l37413;
+    public long l37414;
+    public long l37415;
+    public long l37416;
+    public long l37417;
+    public long l37418;
+    public long l37419;
+    public long l37420;
+    public long l37421;
+    public long l37422;
+    public long l37423;
+    public long l37424;
+    public long l37425;
+    public long l37426;
+    public long l37427;
+    public long l37428;
+    public long l37429;
+    public long l37430;
+    public long l37431;
+    public long l37432;
+    public long l37433;
+    public long l37434;
+    public long l37435;
+    public long l37436;
+    public long l37437;
+    public long l37438;
+    public long l37439;
+    public long l37440;
+    public long l37441;
+    public long l37442;
+    public long l37443;
+    public long l37444;
+    public long l37445;
+    public long l37446;
+    public long l37447;
+    public long l37448;
+    public long l37449;
+    public long l37450;
+    public long l37451;
+    public long l37452;
+    public long l37453;
+    public long l37454;
+    public long l37455;
+    public long l37456;
+    public long l37457;
+    public long l37458;
+    public long l37459;
+    public long l37460;
+    public long l37461;
+    public long l37462;
+    public long l37463;
+    public long l37464;
+    public long l37465;
+    public long l37466;
+    public long l37467;
+    public long l37468;
+    public long l37469;
+    public long l37470;
+    public long l37471;
+    public long l37472;
+    public long l37473;
+    public long l37474;
+    public long l37475;
+    public long l37476;
+    public long l37477;
+    public long l37478;
+    public long l37479;
+    public long l37480;
+    public long l37481;
+    public long l37482;
+    public long l37483;
+    public long l37484;
+    public long l37485;
+    public long l37486;
+    public long l37487;
+    public long l37488;
+    public long l37489;
+    public long l37490;
+    public long l37491;
+    public long l37492;
+    public long l37493;
+    public long l37494;
+    public long l37495;
+    public long l37496;
+    public long l37497;
+    public long l37498;
+    public long l37499;
+    public long l37500;
+    public long l37501;
+    public long l37502;
+    public long l37503;
+    public long l37504;
+    public long l37505;
+    public long l37506;
+    public long l37507;
+    public long l37508;
+    public long l37509;
+    public long l37510;
+    public long l37511;
+    public long l37512;
+    public long l37513;
+    public long l37514;
+    public long l37515;
+    public long l37516;
+    public long l37517;
+    public long l37518;
+    public long l37519;
+    public long l37520;
+    public long l37521;
+    public long l37522;
+    public long l37523;
+    public long l37524;
+    public long l37525;
+    public long l37526;
+    public long l37527;
+    public long l37528;
+    public long l37529;
+    public long l37530;
+    public long l37531;
+    public long l37532;
+    public long l37533;
+    public long l37534;
+    public long l37535;
+    public long l37536;
+    public long l37537;
+    public long l37538;
+    public long l37539;
+    public long l37540;
+    public long l37541;
+    public long l37542;
+    public long l37543;
+    public long l37544;
+    public long l37545;
+    public long l37546;
+    public long l37547;
+    public long l37548;
+    public long l37549;
+    public long l37550;
+    public long l37551;
+    public long l37552;
+    public long l37553;
+    public long l37554;
+    public long l37555;
+    public long l37556;
+    public long l37557;
+    public long l37558;
+    public long l37559;
+    public long l37560;
+    public long l37561;
+    public long l37562;
+    public long l37563;
+    public long l37564;
+    public long l37565;
+    public long l37566;
+    public long l37567;
+    public long l37568;
+    public long l37569;
+    public long l37570;
+    public long l37571;
+    public long l37572;
+    public long l37573;
+    public long l37574;
+    public long l37575;
+    public long l37576;
+    public long l37577;
+    public long l37578;
+    public long l37579;
+    public long l37580;
+    public long l37581;
+    public long l37582;
+    public long l37583;
+    public long l37584;
+    public long l37585;
+    public long l37586;
+    public long l37587;
+    public long l37588;
+    public long l37589;
+    public long l37590;
+    public long l37591;
+    public long l37592;
+    public long l37593;
+    public long l37594;
+    public long l37595;
+    public long l37596;
+    public long l37597;
+    public long l37598;
+    public long l37599;
+    public long l37600;
+    public long l37601;
+    public long l37602;
+    public long l37603;
+    public long l37604;
+    public long l37605;
+    public long l37606;
+    public long l37607;
+    public long l37608;
+    public long l37609;
+    public long l37610;
+    public long l37611;
+    public long l37612;
+    public long l37613;
+    public long l37614;
+    public long l37615;
+    public long l37616;
+    public long l37617;
+    public long l37618;
+    public long l37619;
+    public long l37620;
+    public long l37621;
+    public long l37622;
+    public long l37623;
+    public long l37624;
+    public long l37625;
+    public long l37626;
+    public long l37627;
+    public long l37628;
+    public long l37629;
+    public long l37630;
+    public long l37631;
+    public long l37632;
+    public long l37633;
+    public long l37634;
+    public long l37635;
+    public long l37636;
+    public long l37637;
+    public long l37638;
+    public long l37639;
+    public long l37640;
+    public long l37641;
+    public long l37642;
+    public long l37643;
+    public long l37644;
+    public long l37645;
+    public long l37646;
+    public long l37647;
+    public long l37648;
+    public long l37649;
+    public long l37650;
+    public long l37651;
+    public long l37652;
+    public long l37653;
+    public long l37654;
+    public long l37655;
+    public long l37656;
+    public long l37657;
+    public long l37658;
+    public long l37659;
+    public long l37660;
+    public long l37661;
+    public long l37662;
+    public long l37663;
+    public long l37664;
+    public long l37665;
+    public long l37666;
+    public long l37667;
+    public long l37668;
+    public long l37669;
+    public long l37670;
+    public long l37671;
+    public long l37672;
+    public long l37673;
+    public long l37674;
+    public long l37675;
+    public long l37676;
+    public long l37677;
+    public long l37678;
+    public long l37679;
+    public long l37680;
+    public long l37681;
+    public long l37682;
+    public long l37683;
+    public long l37684;
+    public long l37685;
+    public long l37686;
+    public long l37687;
+    public long l37688;
+    public long l37689;
+    public long l37690;
+    public long l37691;
+    public long l37692;
+    public long l37693;
+    public long l37694;
+    public long l37695;
+    public long l37696;
+    public long l37697;
+    public long l37698;
+    public long l37699;
+    public long l37700;
+    public long l37701;
+    public long l37702;
+    public long l37703;
+    public long l37704;
+    public long l37705;
+    public long l37706;
+    public long l37707;
+    public long l37708;
+    public long l37709;
+    public long l37710;
+    public long l37711;
+    public long l37712;
+    public long l37713;
+    public long l37714;
+    public long l37715;
+    public long l37716;
+    public long l37717;
+    public long l37718;
+    public long l37719;
+    public long l37720;
+    public long l37721;
+    public long l37722;
+    public long l37723;
+    public long l37724;
+    public long l37725;
+    public long l37726;
+    public long l37727;
+    public long l37728;
+    public long l37729;
+    public long l37730;
+    public long l37731;
+    public long l37732;
+    public long l37733;
+    public long l37734;
+    public long l37735;
+    public long l37736;
+    public long l37737;
+    public long l37738;
+    public long l37739;
+    public long l37740;
+    public long l37741;
+    public long l37742;
+    public long l37743;
+    public long l37744;
+    public long l37745;
+    public long l37746;
+    public long l37747;
+    public long l37748;
+    public long l37749;
+    public long l37750;
+    public long l37751;
+    public long l37752;
+    public long l37753;
+    public long l37754;
+    public long l37755;
+    public long l37756;
+    public long l37757;
+    public long l37758;
+    public long l37759;
+    public long l37760;
+    public long l37761;
+    public long l37762;
+    public long l37763;
+    public long l37764;
+    public long l37765;
+    public long l37766;
+    public long l37767;
+    public long l37768;
+    public long l37769;
+    public long l37770;
+    public long l37771;
+    public long l37772;
+    public long l37773;
+    public long l37774;
+    public long l37775;
+    public long l37776;
+    public long l37777;
+    public long l37778;
+    public long l37779;
+    public long l37780;
+    public long l37781;
+    public long l37782;
+    public long l37783;
+    public long l37784;
+    public long l37785;
+    public long l37786;
+    public long l37787;
+    public long l37788;
+    public long l37789;
+    public long l37790;
+    public long l37791;
+    public long l37792;
+    public long l37793;
+    public long l37794;
+    public long l37795;
+    public long l37796;
+    public long l37797;
+    public long l37798;
+    public long l37799;
+    public long l37800;
+    public long l37801;
+    public long l37802;
+    public long l37803;
+    public long l37804;
+    public long l37805;
+    public long l37806;
+    public long l37807;
+    public long l37808;
+    public long l37809;
+    public long l37810;
+    public long l37811;
+    public long l37812;
+    public long l37813;
+    public long l37814;
+    public long l37815;
+    public long l37816;
+    public long l37817;
+    public long l37818;
+    public long l37819;
+    public long l37820;
+    public long l37821;
+    public long l37822;
+    public long l37823;
+    public long l37824;
+    public long l37825;
+    public long l37826;
+    public long l37827;
+    public long l37828;
+    public long l37829;
+    public long l37830;
+    public long l37831;
+    public long l37832;
+    public long l37833;
+    public long l37834;
+    public long l37835;
+    public long l37836;
+    public long l37837;
+    public long l37838;
+    public long l37839;
+    public long l37840;
+    public long l37841;
+    public long l37842;
+    public long l37843;
+    public long l37844;
+    public long l37845;
+    public long l37846;
+    public long l37847;
+    public long l37848;
+    public long l37849;
+    public long l37850;
+    public long l37851;
+    public long l37852;
+    public long l37853;
+    public long l37854;
+    public long l37855;
+    public long l37856;
+    public long l37857;
+    public long l37858;
+    public long l37859;
+    public long l37860;
+    public long l37861;
+    public long l37862;
+    public long l37863;
+    public long l37864;
+    public long l37865;
+    public long l37866;
+    public long l37867;
+    public long l37868;
+    public long l37869;
+    public long l37870;
+    public long l37871;
+    public long l37872;
+    public long l37873;
+    public long l37874;
+    public long l37875;
+    public long l37876;
+    public long l37877;
+    public long l37878;
+    public long l37879;
+    public long l37880;
+    public long l37881;
+    public long l37882;
+    public long l37883;
+    public long l37884;
+    public long l37885;
+    public long l37886;
+    public long l37887;
+    public long l37888;
+    public long l37889;
+    public long l37890;
+    public long l37891;
+    public long l37892;
+    public long l37893;
+    public long l37894;
+    public long l37895;
+    public long l37896;
+    public long l37897;
+    public long l37898;
+    public long l37899;
+    public long l37900;
+    public long l37901;
+    public long l37902;
+    public long l37903;
+    public long l37904;
+    public long l37905;
+    public long l37906;
+    public long l37907;
+    public long l37908;
+    public long l37909;
+    public long l37910;
+    public long l37911;
+    public long l37912;
+    public long l37913;
+    public long l37914;
+    public long l37915;
+    public long l37916;
+    public long l37917;
+    public long l37918;
+    public long l37919;
+    public long l37920;
+    public long l37921;
+    public long l37922;
+    public long l37923;
+    public long l37924;
+    public long l37925;
+    public long l37926;
+    public long l37927;
+    public long l37928;
+    public long l37929;
+    public long l37930;
+    public long l37931;
+    public long l37932;
+    public long l37933;
+    public long l37934;
+    public long l37935;
+    public long l37936;
+    public long l37937;
+    public long l37938;
+    public long l37939;
+    public long l37940;
+    public long l37941;
+    public long l37942;
+    public long l37943;
+    public long l37944;
+    public long l37945;
+    public long l37946;
+    public long l37947;
+    public long l37948;
+    public long l37949;
+    public long l37950;
+    public long l37951;
+    public long l37952;
+    public long l37953;
+    public long l37954;
+    public long l37955;
+    public long l37956;
+    public long l37957;
+    public long l37958;
+    public long l37959;
+    public long l37960;
+    public long l37961;
+    public long l37962;
+    public long l37963;
+    public long l37964;
+    public long l37965;
+    public long l37966;
+    public long l37967;
+    public long l37968;
+    public long l37969;
+    public long l37970;
+    public long l37971;
+    public long l37972;
+    public long l37973;
+    public long l37974;
+    public long l37975;
+    public long l37976;
+    public long l37977;
+    public long l37978;
+    public long l37979;
+    public long l37980;
+    public long l37981;
+    public long l37982;
+    public long l37983;
+    public long l37984;
+    public long l37985;
+    public long l37986;
+    public long l37987;
+    public long l37988;
+    public long l37989;
+    public long l37990;
+    public long l37991;
+    public long l37992;
+    public long l37993;
+    public long l37994;
+    public long l37995;
+    public long l37996;
+    public long l37997;
+    public long l37998;
+    public long l37999;
+    public long l38000;
+    public long l38001;
+    public long l38002;
+    public long l38003;
+    public long l38004;
+    public long l38005;
+    public long l38006;
+    public long l38007;
+    public long l38008;
+    public long l38009;
+    public long l38010;
+    public long l38011;
+    public long l38012;
+    public long l38013;
+    public long l38014;
+    public long l38015;
+    public long l38016;
+    public long l38017;
+    public long l38018;
+    public long l38019;
+    public long l38020;
+    public long l38021;
+    public long l38022;
+    public long l38023;
+    public long l38024;
+    public long l38025;
+    public long l38026;
+    public long l38027;
+    public long l38028;
+    public long l38029;
+    public long l38030;
+    public long l38031;
+    public long l38032;
+    public long l38033;
+    public long l38034;
+    public long l38035;
+    public long l38036;
+    public long l38037;
+    public long l38038;
+    public long l38039;
+    public long l38040;
+    public long l38041;
+    public long l38042;
+    public long l38043;
+    public long l38044;
+    public long l38045;
+    public long l38046;
+    public long l38047;
+    public long l38048;
+    public long l38049;
+    public long l38050;
+    public long l38051;
+    public long l38052;
+    public long l38053;
+    public long l38054;
+    public long l38055;
+    public long l38056;
+    public long l38057;
+    public long l38058;
+    public long l38059;
+    public long l38060;
+    public long l38061;
+    public long l38062;
+    public long l38063;
+    public long l38064;
+    public long l38065;
+    public long l38066;
+    public long l38067;
+    public long l38068;
+    public long l38069;
+    public long l38070;
+    public long l38071;
+    public long l38072;
+    public long l38073;
+    public long l38074;
+    public long l38075;
+    public long l38076;
+    public long l38077;
+    public long l38078;
+    public long l38079;
+    public long l38080;
+    public long l38081;
+    public long l38082;
+    public long l38083;
+    public long l38084;
+    public long l38085;
+    public long l38086;
+    public long l38087;
+    public long l38088;
+    public long l38089;
+    public long l38090;
+    public long l38091;
+    public long l38092;
+    public long l38093;
+    public long l38094;
+    public long l38095;
+    public long l38096;
+    public long l38097;
+    public long l38098;
+    public long l38099;
+    public long l38100;
+    public long l38101;
+    public long l38102;
+    public long l38103;
+    public long l38104;
+    public long l38105;
+    public long l38106;
+    public long l38107;
+    public long l38108;
+    public long l38109;
+    public long l38110;
+    public long l38111;
+    public long l38112;
+    public long l38113;
+    public long l38114;
+    public long l38115;
+    public long l38116;
+    public long l38117;
+    public long l38118;
+    public long l38119;
+    public long l38120;
+    public long l38121;
+    public long l38122;
+    public long l38123;
+    public long l38124;
+    public long l38125;
+    public long l38126;
+    public long l38127;
+    public long l38128;
+    public long l38129;
+    public long l38130;
+    public long l38131;
+    public long l38132;
+    public long l38133;
+    public long l38134;
+    public long l38135;
+    public long l38136;
+    public long l38137;
+    public long l38138;
+    public long l38139;
+    public long l38140;
+    public long l38141;
+    public long l38142;
+    public long l38143;
+    public long l38144;
+    public long l38145;
+    public long l38146;
+    public long l38147;
+    public long l38148;
+    public long l38149;
+    public long l38150;
+    public long l38151;
+    public long l38152;
+    public long l38153;
+    public long l38154;
+    public long l38155;
+    public long l38156;
+    public long l38157;
+    public long l38158;
+    public long l38159;
+    public long l38160;
+    public long l38161;
+    public long l38162;
+    public long l38163;
+    public long l38164;
+    public long l38165;
+    public long l38166;
+    public long l38167;
+    public long l38168;
+    public long l38169;
+    public long l38170;
+    public long l38171;
+    public long l38172;
+    public long l38173;
+    public long l38174;
+    public long l38175;
+    public long l38176;
+    public long l38177;
+    public long l38178;
+    public long l38179;
+    public long l38180;
+    public long l38181;
+    public long l38182;
+    public long l38183;
+    public long l38184;
+    public long l38185;
+    public long l38186;
+    public long l38187;
+    public long l38188;
+    public long l38189;
+    public long l38190;
+    public long l38191;
+    public long l38192;
+    public long l38193;
+    public long l38194;
+    public long l38195;
+    public long l38196;
+    public long l38197;
+    public long l38198;
+    public long l38199;
+    public long l38200;
+    public long l38201;
+    public long l38202;
+    public long l38203;
+    public long l38204;
+    public long l38205;
+    public long l38206;
+    public long l38207;
+    public long l38208;
+    public long l38209;
+    public long l38210;
+    public long l38211;
+    public long l38212;
+    public long l38213;
+    public long l38214;
+    public long l38215;
+    public long l38216;
+    public long l38217;
+    public long l38218;
+    public long l38219;
+    public long l38220;
+    public long l38221;
+    public long l38222;
+    public long l38223;
+    public long l38224;
+    public long l38225;
+    public long l38226;
+    public long l38227;
+    public long l38228;
+    public long l38229;
+    public long l38230;
+    public long l38231;
+    public long l38232;
+    public long l38233;
+    public long l38234;
+    public long l38235;
+    public long l38236;
+    public long l38237;
+    public long l38238;
+    public long l38239;
+    public long l38240;
+    public long l38241;
+    public long l38242;
+    public long l38243;
+    public long l38244;
+    public long l38245;
+    public long l38246;
+    public long l38247;
+    public long l38248;
+    public long l38249;
+    public long l38250;
+    public long l38251;
+    public long l38252;
+    public long l38253;
+    public long l38254;
+    public long l38255;
+    public long l38256;
+    public long l38257;
+    public long l38258;
+    public long l38259;
+    public long l38260;
+    public long l38261;
+    public long l38262;
+    public long l38263;
+    public long l38264;
+    public long l38265;
+    public long l38266;
+    public long l38267;
+    public long l38268;
+    public long l38269;
+    public long l38270;
+    public long l38271;
+    public long l38272;
+    public long l38273;
+    public long l38274;
+    public long l38275;
+    public long l38276;
+    public long l38277;
+    public long l38278;
+    public long l38279;
+    public long l38280;
+    public long l38281;
+    public long l38282;
+    public long l38283;
+    public long l38284;
+    public long l38285;
+    public long l38286;
+    public long l38287;
+    public long l38288;
+    public long l38289;
+    public long l38290;
+    public long l38291;
+    public long l38292;
+    public long l38293;
+    public long l38294;
+    public long l38295;
+    public long l38296;
+    public long l38297;
+    public long l38298;
+    public long l38299;
+    public long l38300;
+    public long l38301;
+    public long l38302;
+    public long l38303;
+    public long l38304;
+    public long l38305;
+    public long l38306;
+    public long l38307;
+    public long l38308;
+    public long l38309;
+    public long l38310;
+    public long l38311;
+    public long l38312;
+    public long l38313;
+    public long l38314;
+    public long l38315;
+    public long l38316;
+    public long l38317;
+    public long l38318;
+    public long l38319;
+    public long l38320;
+    public long l38321;
+    public long l38322;
+    public long l38323;
+    public long l38324;
+    public long l38325;
+    public long l38326;
+    public long l38327;
+    public long l38328;
+    public long l38329;
+    public long l38330;
+    public long l38331;
+    public long l38332;
+    public long l38333;
+    public long l38334;
+    public long l38335;
+    public long l38336;
+    public long l38337;
+    public long l38338;
+    public long l38339;
+    public long l38340;
+    public long l38341;
+    public long l38342;
+    public long l38343;
+    public long l38344;
+    public long l38345;
+    public long l38346;
+    public long l38347;
+    public long l38348;
+    public long l38349;
+    public long l38350;
+    public long l38351;
+    public long l38352;
+    public long l38353;
+    public long l38354;
+    public long l38355;
+    public long l38356;
+    public long l38357;
+    public long l38358;
+    public long l38359;
+    public long l38360;
+    public long l38361;
+    public long l38362;
+    public long l38363;
+    public long l38364;
+    public long l38365;
+    public long l38366;
+    public long l38367;
+    public long l38368;
+    public long l38369;
+    public long l38370;
+    public long l38371;
+    public long l38372;
+    public long l38373;
+    public long l38374;
+    public long l38375;
+    public long l38376;
+    public long l38377;
+    public long l38378;
+    public long l38379;
+    public long l38380;
+    public long l38381;
+    public long l38382;
+    public long l38383;
+    public long l38384;
+    public long l38385;
+    public long l38386;
+    public long l38387;
+    public long l38388;
+    public long l38389;
+    public long l38390;
+    public long l38391;
+    public long l38392;
+    public long l38393;
+    public long l38394;
+    public long l38395;
+    public long l38396;
+    public long l38397;
+    public long l38398;
+    public long l38399;
+    public long l38400;
+    public long l38401;
+    public long l38402;
+    public long l38403;
+    public long l38404;
+    public long l38405;
+    public long l38406;
+    public long l38407;
+    public long l38408;
+    public long l38409;
+    public long l38410;
+    public long l38411;
+    public long l38412;
+    public long l38413;
+    public long l38414;
+    public long l38415;
+    public long l38416;
+    public long l38417;
+    public long l38418;
+    public long l38419;
+    public long l38420;
+    public long l38421;
+    public long l38422;
+    public long l38423;
+    public long l38424;
+    public long l38425;
+    public long l38426;
+    public long l38427;
+    public long l38428;
+    public long l38429;
+    public long l38430;
+    public long l38431;
+    public long l38432;
+    public long l38433;
+    public long l38434;
+    public long l38435;
+    public long l38436;
+    public long l38437;
+    public long l38438;
+    public long l38439;
+    public long l38440;
+    public long l38441;
+    public long l38442;
+    public long l38443;
+    public long l38444;
+    public long l38445;
+    public long l38446;
+    public long l38447;
+    public long l38448;
+    public long l38449;
+    public long l38450;
+    public long l38451;
+    public long l38452;
+    public long l38453;
+    public long l38454;
+    public long l38455;
+    public long l38456;
+    public long l38457;
+    public long l38458;
+    public long l38459;
+    public long l38460;
+    public long l38461;
+    public long l38462;
+    public long l38463;
+    public long l38464;
+    public long l38465;
+    public long l38466;
+    public long l38467;
+    public long l38468;
+    public long l38469;
+    public long l38470;
+    public long l38471;
+    public long l38472;
+    public long l38473;
+    public long l38474;
+    public long l38475;
+    public long l38476;
+    public long l38477;
+    public long l38478;
+    public long l38479;
+    public long l38480;
+    public long l38481;
+    public long l38482;
+    public long l38483;
+    public long l38484;
+    public long l38485;
+    public long l38486;
+    public long l38487;
+    public long l38488;
+    public long l38489;
+    public long l38490;
+    public long l38491;
+    public long l38492;
+    public long l38493;
+    public long l38494;
+    public long l38495;
+    public long l38496;
+    public long l38497;
+    public long l38498;
+    public long l38499;
+    public long l38500;
+    public long l38501;
+    public long l38502;
+    public long l38503;
+    public long l38504;
+    public long l38505;
+    public long l38506;
+    public long l38507;
+    public long l38508;
+    public long l38509;
+    public long l38510;
+    public long l38511;
+    public long l38512;
+    public long l38513;
+    public long l38514;
+    public long l38515;
+    public long l38516;
+    public long l38517;
+    public long l38518;
+    public long l38519;
+    public long l38520;
+    public long l38521;
+    public long l38522;
+    public long l38523;
+    public long l38524;
+    public long l38525;
+    public long l38526;
+    public long l38527;
+    public long l38528;
+    public long l38529;
+    public long l38530;
+    public long l38531;
+    public long l38532;
+    public long l38533;
+    public long l38534;
+    public long l38535;
+    public long l38536;
+    public long l38537;
+    public long l38538;
+    public long l38539;
+    public long l38540;
+    public long l38541;
+    public long l38542;
+    public long l38543;
+    public long l38544;
+    public long l38545;
+    public long l38546;
+    public long l38547;
+    public long l38548;
+    public long l38549;
+    public long l38550;
+    public long l38551;
+    public long l38552;
+    public long l38553;
+    public long l38554;
+    public long l38555;
+    public long l38556;
+    public long l38557;
+    public long l38558;
+    public long l38559;
+    public long l38560;
+    public long l38561;
+    public long l38562;
+    public long l38563;
+    public long l38564;
+    public long l38565;
+    public long l38566;
+    public long l38567;
+    public long l38568;
+    public long l38569;
+    public long l38570;
+    public long l38571;
+    public long l38572;
+    public long l38573;
+    public long l38574;
+    public long l38575;
+    public long l38576;
+    public long l38577;
+    public long l38578;
+    public long l38579;
+    public long l38580;
+    public long l38581;
+    public long l38582;
+    public long l38583;
+    public long l38584;
+    public long l38585;
+    public long l38586;
+    public long l38587;
+    public long l38588;
+    public long l38589;
+    public long l38590;
+    public long l38591;
+    public long l38592;
+    public long l38593;
+    public long l38594;
+    public long l38595;
+    public long l38596;
+    public long l38597;
+    public long l38598;
+    public long l38599;
+    public long l38600;
+    public long l38601;
+    public long l38602;
+    public long l38603;
+    public long l38604;
+    public long l38605;
+    public long l38606;
+    public long l38607;
+    public long l38608;
+    public long l38609;
+    public long l38610;
+    public long l38611;
+    public long l38612;
+    public long l38613;
+    public long l38614;
+    public long l38615;
+    public long l38616;
+    public long l38617;
+    public long l38618;
+    public long l38619;
+    public long l38620;
+    public long l38621;
+    public long l38622;
+    public long l38623;
+    public long l38624;
+    public long l38625;
+    public long l38626;
+    public long l38627;
+    public long l38628;
+    public long l38629;
+    public long l38630;
+    public long l38631;
+    public long l38632;
+    public long l38633;
+    public long l38634;
+    public long l38635;
+    public long l38636;
+    public long l38637;
+    public long l38638;
+    public long l38639;
+    public long l38640;
+    public long l38641;
+    public long l38642;
+    public long l38643;
+    public long l38644;
+    public long l38645;
+    public long l38646;
+    public long l38647;
+    public long l38648;
+    public long l38649;
+    public long l38650;
+    public long l38651;
+    public long l38652;
+    public long l38653;
+    public long l38654;
+    public long l38655;
+    public long l38656;
+    public long l38657;
+    public long l38658;
+    public long l38659;
+    public long l38660;
+    public long l38661;
+    public long l38662;
+    public long l38663;
+    public long l38664;
+    public long l38665;
+    public long l38666;
+    public long l38667;
+    public long l38668;
+    public long l38669;
+    public long l38670;
+    public long l38671;
+    public long l38672;
+    public long l38673;
+    public long l38674;
+    public long l38675;
+    public long l38676;
+    public long l38677;
+    public long l38678;
+    public long l38679;
+    public long l38680;
+    public long l38681;
+    public long l38682;
+    public long l38683;
+    public long l38684;
+    public long l38685;
+    public long l38686;
+    public long l38687;
+    public long l38688;
+    public long l38689;
+    public long l38690;
+    public long l38691;
+    public long l38692;
+    public long l38693;
+    public long l38694;
+    public long l38695;
+    public long l38696;
+    public long l38697;
+    public long l38698;
+    public long l38699;
+    public long l38700;
+    public long l38701;
+    public long l38702;
+    public long l38703;
+    public long l38704;
+    public long l38705;
+    public long l38706;
+    public long l38707;
+    public long l38708;
+    public long l38709;
+    public long l38710;
+    public long l38711;
+    public long l38712;
+    public long l38713;
+    public long l38714;
+    public long l38715;
+    public long l38716;
+    public long l38717;
+    public long l38718;
+    public long l38719;
+    public long l38720;
+    public long l38721;
+    public long l38722;
+    public long l38723;
+    public long l38724;
+    public long l38725;
+    public long l38726;
+    public long l38727;
+    public long l38728;
+    public long l38729;
+    public long l38730;
+    public long l38731;
+    public long l38732;
+    public long l38733;
+    public long l38734;
+    public long l38735;
+    public long l38736;
+    public long l38737;
+    public long l38738;
+    public long l38739;
+    public long l38740;
+    public long l38741;
+    public long l38742;
+    public long l38743;
+    public long l38744;
+    public long l38745;
+    public long l38746;
+    public long l38747;
+    public long l38748;
+    public long l38749;
+    public long l38750;
+    public long l38751;
+    public long l38752;
+    public long l38753;
+    public long l38754;
+    public long l38755;
+    public long l38756;
+    public long l38757;
+    public long l38758;
+    public long l38759;
+    public long l38760;
+    public long l38761;
+    public long l38762;
+    public long l38763;
+    public long l38764;
+    public long l38765;
+    public long l38766;
+    public long l38767;
+    public long l38768;
+    public long l38769;
+    public long l38770;
+    public long l38771;
+    public long l38772;
+    public long l38773;
+    public long l38774;
+    public long l38775;
+    public long l38776;
+    public long l38777;
+    public long l38778;
+    public long l38779;
+    public long l38780;
+    public long l38781;
+    public long l38782;
+    public long l38783;
+    public long l38784;
+    public long l38785;
+    public long l38786;
+    public long l38787;
+    public long l38788;
+    public long l38789;
+    public long l38790;
+    public long l38791;
+    public long l38792;
+    public long l38793;
+    public long l38794;
+    public long l38795;
+    public long l38796;
+    public long l38797;
+    public long l38798;
+    public long l38799;
+    public long l38800;
+    public long l38801;
+    public long l38802;
+    public long l38803;
+    public long l38804;
+    public long l38805;
+    public long l38806;
+    public long l38807;
+    public long l38808;
+    public long l38809;
+    public long l38810;
+    public long l38811;
+    public long l38812;
+    public long l38813;
+    public long l38814;
+    public long l38815;
+    public long l38816;
+    public long l38817;
+    public long l38818;
+    public long l38819;
+    public long l38820;
+    public long l38821;
+    public long l38822;
+    public long l38823;
+    public long l38824;
+    public long l38825;
+    public long l38826;
+    public long l38827;
+    public long l38828;
+    public long l38829;
+    public long l38830;
+    public long l38831;
+    public long l38832;
+    public long l38833;
+    public long l38834;
+    public long l38835;
+    public long l38836;
+    public long l38837;
+    public long l38838;
+    public long l38839;
+    public long l38840;
+    public long l38841;
+    public long l38842;
+    public long l38843;
+    public long l38844;
+    public long l38845;
+    public long l38846;
+    public long l38847;
+    public long l38848;
+    public long l38849;
+    public long l38850;
+    public long l38851;
+    public long l38852;
+    public long l38853;
+    public long l38854;
+    public long l38855;
+    public long l38856;
+    public long l38857;
+    public long l38858;
+    public long l38859;
+    public long l38860;
+    public long l38861;
+    public long l38862;
+    public long l38863;
+    public long l38864;
+    public long l38865;
+    public long l38866;
+    public long l38867;
+    public long l38868;
+    public long l38869;
+    public long l38870;
+    public long l38871;
+    public long l38872;
+    public long l38873;
+    public long l38874;
+    public long l38875;
+    public long l38876;
+    public long l38877;
+    public long l38878;
+    public long l38879;
+    public long l38880;
+    public long l38881;
+    public long l38882;
+    public long l38883;
+    public long l38884;
+    public long l38885;
+    public long l38886;
+    public long l38887;
+    public long l38888;
+    public long l38889;
+    public long l38890;
+    public long l38891;
+    public long l38892;
+    public long l38893;
+    public long l38894;
+    public long l38895;
+    public long l38896;
+    public long l38897;
+    public long l38898;
+    public long l38899;
+    public long l38900;
+    public long l38901;
+    public long l38902;
+    public long l38903;
+    public long l38904;
+    public long l38905;
+    public long l38906;
+    public long l38907;
+    public long l38908;
+    public long l38909;
+    public long l38910;
+    public long l38911;
+    public long l38912;
+    public long l38913;
+    public long l38914;
+    public long l38915;
+    public long l38916;
+    public long l38917;
+    public long l38918;
+    public long l38919;
+    public long l38920;
+    public long l38921;
+    public long l38922;
+    public long l38923;
+    public long l38924;
+    public long l38925;
+    public long l38926;
+    public long l38927;
+    public long l38928;
+    public long l38929;
+    public long l38930;
+    public long l38931;
+    public long l38932;
+    public long l38933;
+    public long l38934;
+    public long l38935;
+    public long l38936;
+    public long l38937;
+    public long l38938;
+    public long l38939;
+    public long l38940;
+    public long l38941;
+    public long l38942;
+    public long l38943;
+    public long l38944;
+    public long l38945;
+    public long l38946;
+    public long l38947;
+    public long l38948;
+    public long l38949;
+    public long l38950;
+    public long l38951;
+    public long l38952;
+    public long l38953;
+    public long l38954;
+    public long l38955;
+    public long l38956;
+    public long l38957;
+    public long l38958;
+    public long l38959;
+    public long l38960;
+    public long l38961;
+    public long l38962;
+    public long l38963;
+    public long l38964;
+    public long l38965;
+    public long l38966;
+    public long l38967;
+    public long l38968;
+    public long l38969;
+    public long l38970;
+    public long l38971;
+    public long l38972;
+    public long l38973;
+    public long l38974;
+    public long l38975;
+    public long l38976;
+    public long l38977;
+    public long l38978;
+    public long l38979;
+    public long l38980;
+    public long l38981;
+    public long l38982;
+    public long l38983;
+    public long l38984;
+    public long l38985;
+    public long l38986;
+    public long l38987;
+    public long l38988;
+    public long l38989;
+    public long l38990;
+    public long l38991;
+    public long l38992;
+    public long l38993;
+    public long l38994;
+    public long l38995;
+    public long l38996;
+    public long l38997;
+    public long l38998;
+    public long l38999;
+    public long l39000;
+    public long l39001;
+    public long l39002;
+    public long l39003;
+    public long l39004;
+    public long l39005;
+    public long l39006;
+    public long l39007;
+    public long l39008;
+    public long l39009;
+    public long l39010;
+    public long l39011;
+    public long l39012;
+    public long l39013;
+    public long l39014;
+    public long l39015;
+    public long l39016;
+    public long l39017;
+    public long l39018;
+    public long l39019;
+    public long l39020;
+    public long l39021;
+    public long l39022;
+    public long l39023;
+    public long l39024;
+    public long l39025;
+    public long l39026;
+    public long l39027;
+    public long l39028;
+    public long l39029;
+    public long l39030;
+    public long l39031;
+    public long l39032;
+    public long l39033;
+    public long l39034;
+    public long l39035;
+    public long l39036;
+    public long l39037;
+    public long l39038;
+    public long l39039;
+    public long l39040;
+    public long l39041;
+    public long l39042;
+    public long l39043;
+    public long l39044;
+    public long l39045;
+    public long l39046;
+    public long l39047;
+    public long l39048;
+    public long l39049;
+    public long l39050;
+    public long l39051;
+    public long l39052;
+    public long l39053;
+    public long l39054;
+    public long l39055;
+    public long l39056;
+    public long l39057;
+    public long l39058;
+    public long l39059;
+    public long l39060;
+    public long l39061;
+    public long l39062;
+    public long l39063;
+    public long l39064;
+    public long l39065;
+    public long l39066;
+    public long l39067;
+    public long l39068;
+    public long l39069;
+    public long l39070;
+    public long l39071;
+    public long l39072;
+    public long l39073;
+    public long l39074;
+    public long l39075;
+    public long l39076;
+    public long l39077;
+    public long l39078;
+    public long l39079;
+    public long l39080;
+    public long l39081;
+    public long l39082;
+    public long l39083;
+    public long l39084;
+    public long l39085;
+    public long l39086;
+    public long l39087;
+    public long l39088;
+    public long l39089;
+    public long l39090;
+    public long l39091;
+    public long l39092;
+    public long l39093;
+    public long l39094;
+    public long l39095;
+    public long l39096;
+    public long l39097;
+    public long l39098;
+    public long l39099;
+    public long l39100;
+    public long l39101;
+    public long l39102;
+    public long l39103;
+    public long l39104;
+    public long l39105;
+    public long l39106;
+    public long l39107;
+    public long l39108;
+    public long l39109;
+    public long l39110;
+    public long l39111;
+    public long l39112;
+    public long l39113;
+    public long l39114;
+    public long l39115;
+    public long l39116;
+    public long l39117;
+    public long l39118;
+    public long l39119;
+    public long l39120;
+    public long l39121;
+    public long l39122;
+    public long l39123;
+    public long l39124;
+    public long l39125;
+    public long l39126;
+    public long l39127;
+    public long l39128;
+    public long l39129;
+    public long l39130;
+    public long l39131;
+    public long l39132;
+    public long l39133;
+    public long l39134;
+    public long l39135;
+    public long l39136;
+    public long l39137;
+    public long l39138;
+    public long l39139;
+    public long l39140;
+    public long l39141;
+    public long l39142;
+    public long l39143;
+    public long l39144;
+    public long l39145;
+    public long l39146;
+    public long l39147;
+    public long l39148;
+    public long l39149;
+    public long l39150;
+    public long l39151;
+    public long l39152;
+    public long l39153;
+    public long l39154;
+    public long l39155;
+    public long l39156;
+    public long l39157;
+    public long l39158;
+    public long l39159;
+    public long l39160;
+    public long l39161;
+    public long l39162;
+    public long l39163;
+    public long l39164;
+    public long l39165;
+    public long l39166;
+    public long l39167;
+    public long l39168;
+    public long l39169;
+    public long l39170;
+    public long l39171;
+    public long l39172;
+    public long l39173;
+    public long l39174;
+    public long l39175;
+    public long l39176;
+    public long l39177;
+    public long l39178;
+    public long l39179;
+    public long l39180;
+    public long l39181;
+    public long l39182;
+    public long l39183;
+    public long l39184;
+    public long l39185;
+    public long l39186;
+    public long l39187;
+    public long l39188;
+    public long l39189;
+    public long l39190;
+    public long l39191;
+    public long l39192;
+    public long l39193;
+    public long l39194;
+    public long l39195;
+    public long l39196;
+    public long l39197;
+    public long l39198;
+    public long l39199;
+    public long l39200;
+    public long l39201;
+    public long l39202;
+    public long l39203;
+    public long l39204;
+    public long l39205;
+    public long l39206;
+    public long l39207;
+    public long l39208;
+    public long l39209;
+    public long l39210;
+    public long l39211;
+    public long l39212;
+    public long l39213;
+    public long l39214;
+    public long l39215;
+    public long l39216;
+    public long l39217;
+    public long l39218;
+    public long l39219;
+    public long l39220;
+    public long l39221;
+    public long l39222;
+    public long l39223;
+    public long l39224;
+    public long l39225;
+    public long l39226;
+    public long l39227;
+    public long l39228;
+    public long l39229;
+    public long l39230;
+    public long l39231;
+    public long l39232;
+    public long l39233;
+    public long l39234;
+    public long l39235;
+    public long l39236;
+    public long l39237;
+    public long l39238;
+    public long l39239;
+    public long l39240;
+    public long l39241;
+    public long l39242;
+    public long l39243;
+    public long l39244;
+    public long l39245;
+    public long l39246;
+    public long l39247;
+    public long l39248;
+    public long l39249;
+    public long l39250;
+    public long l39251;
+    public long l39252;
+    public long l39253;
+    public long l39254;
+    public long l39255;
+    public long l39256;
+    public long l39257;
+    public long l39258;
+    public long l39259;
+    public long l39260;
+    public long l39261;
+    public long l39262;
+    public long l39263;
+    public long l39264;
+    public long l39265;
+    public long l39266;
+    public long l39267;
+    public long l39268;
+    public long l39269;
+    public long l39270;
+    public long l39271;
+    public long l39272;
+    public long l39273;
+    public long l39274;
+    public long l39275;
+    public long l39276;
+    public long l39277;
+    public long l39278;
+    public long l39279;
+    public long l39280;
+    public long l39281;
+    public long l39282;
+    public long l39283;
+    public long l39284;
+    public long l39285;
+    public long l39286;
+    public long l39287;
+    public long l39288;
+    public long l39289;
+    public long l39290;
+    public long l39291;
+    public long l39292;
+    public long l39293;
+    public long l39294;
+    public long l39295;
+    public long l39296;
+    public long l39297;
+    public long l39298;
+    public long l39299;
+    public long l39300;
+    public long l39301;
+    public long l39302;
+    public long l39303;
+    public long l39304;
+    public long l39305;
+    public long l39306;
+    public long l39307;
+    public long l39308;
+    public long l39309;
+    public long l39310;
+    public long l39311;
+    public long l39312;
+    public long l39313;
+    public long l39314;
+    public long l39315;
+    public long l39316;
+    public long l39317;
+    public long l39318;
+    public long l39319;
+    public long l39320;
+    public long l39321;
+    public long l39322;
+    public long l39323;
+    public long l39324;
+    public long l39325;
+    public long l39326;
+    public long l39327;
+    public long l39328;
+    public long l39329;
+    public long l39330;
+    public long l39331;
+    public long l39332;
+    public long l39333;
+    public long l39334;
+    public long l39335;
+    public long l39336;
+    public long l39337;
+    public long l39338;
+    public long l39339;
+    public long l39340;
+    public long l39341;
+    public long l39342;
+    public long l39343;
+    public long l39344;
+    public long l39345;
+    public long l39346;
+    public long l39347;
+    public long l39348;
+    public long l39349;
+    public long l39350;
+    public long l39351;
+    public long l39352;
+    public long l39353;
+    public long l39354;
+    public long l39355;
+    public long l39356;
+    public long l39357;
+    public long l39358;
+    public long l39359;
+    public long l39360;
+    public long l39361;
+    public long l39362;
+    public long l39363;
+    public long l39364;
+    public long l39365;
+    public long l39366;
+    public long l39367;
+    public long l39368;
+    public long l39369;
+    public long l39370;
+    public long l39371;
+    public long l39372;
+    public long l39373;
+    public long l39374;
+    public long l39375;
+    public long l39376;
+    public long l39377;
+    public long l39378;
+    public long l39379;
+    public long l39380;
+    public long l39381;
+    public long l39382;
+    public long l39383;
+    public long l39384;
+    public long l39385;
+    public long l39386;
+    public long l39387;
+    public long l39388;
+    public long l39389;
+    public long l39390;
+    public long l39391;
+    public long l39392;
+    public long l39393;
+    public long l39394;
+    public long l39395;
+    public long l39396;
+    public long l39397;
+    public long l39398;
+    public long l39399;
+    public long l39400;
+    public long l39401;
+    public long l39402;
+    public long l39403;
+    public long l39404;
+    public long l39405;
+    public long l39406;
+    public long l39407;
+    public long l39408;
+    public long l39409;
+    public long l39410;
+    public long l39411;
+    public long l39412;
+    public long l39413;
+    public long l39414;
+    public long l39415;
+    public long l39416;
+    public long l39417;
+    public long l39418;
+    public long l39419;
+    public long l39420;
+    public long l39421;
+    public long l39422;
+    public long l39423;
+    public long l39424;
+    public long l39425;
+    public long l39426;
+    public long l39427;
+    public long l39428;
+    public long l39429;
+    public long l39430;
+    public long l39431;
+    public long l39432;
+    public long l39433;
+    public long l39434;
+    public long l39435;
+    public long l39436;
+    public long l39437;
+    public long l39438;
+    public long l39439;
+    public long l39440;
+    public long l39441;
+    public long l39442;
+    public long l39443;
+    public long l39444;
+    public long l39445;
+    public long l39446;
+    public long l39447;
+    public long l39448;
+    public long l39449;
+    public long l39450;
+    public long l39451;
+    public long l39452;
+    public long l39453;
+    public long l39454;
+    public long l39455;
+    public long l39456;
+    public long l39457;
+    public long l39458;
+    public long l39459;
+    public long l39460;
+    public long l39461;
+    public long l39462;
+    public long l39463;
+    public long l39464;
+    public long l39465;
+    public long l39466;
+    public long l39467;
+    public long l39468;
+    public long l39469;
+    public long l39470;
+    public long l39471;
+    public long l39472;
+    public long l39473;
+    public long l39474;
+    public long l39475;
+    public long l39476;
+    public long l39477;
+    public long l39478;
+    public long l39479;
+    public long l39480;
+    public long l39481;
+    public long l39482;
+    public long l39483;
+    public long l39484;
+    public long l39485;
+    public long l39486;
+    public long l39487;
+    public long l39488;
+    public long l39489;
+    public long l39490;
+    public long l39491;
+    public long l39492;
+    public long l39493;
+    public long l39494;
+    public long l39495;
+    public long l39496;
+    public long l39497;
+    public long l39498;
+    public long l39499;
+    public long l39500;
+    public long l39501;
+    public long l39502;
+    public long l39503;
+    public long l39504;
+    public long l39505;
+    public long l39506;
+    public long l39507;
+    public long l39508;
+    public long l39509;
+    public long l39510;
+    public long l39511;
+    public long l39512;
+    public long l39513;
+    public long l39514;
+    public long l39515;
+    public long l39516;
+    public long l39517;
+    public long l39518;
+    public long l39519;
+    public long l39520;
+    public long l39521;
+    public long l39522;
+    public long l39523;
+    public long l39524;
+    public long l39525;
+    public long l39526;
+    public long l39527;
+    public long l39528;
+    public long l39529;
+    public long l39530;
+    public long l39531;
+    public long l39532;
+    public long l39533;
+    public long l39534;
+    public long l39535;
+    public long l39536;
+    public long l39537;
+    public long l39538;
+    public long l39539;
+    public long l39540;
+    public long l39541;
+    public long l39542;
+    public long l39543;
+    public long l39544;
+    public long l39545;
+    public long l39546;
+    public long l39547;
+    public long l39548;
+    public long l39549;
+    public long l39550;
+    public long l39551;
+    public long l39552;
+    public long l39553;
+    public long l39554;
+    public long l39555;
+    public long l39556;
+    public long l39557;
+    public long l39558;
+    public long l39559;
+    public long l39560;
+    public long l39561;
+    public long l39562;
+    public long l39563;
+    public long l39564;
+    public long l39565;
+    public long l39566;
+    public long l39567;
+    public long l39568;
+    public long l39569;
+    public long l39570;
+    public long l39571;
+    public long l39572;
+    public long l39573;
+    public long l39574;
+    public long l39575;
+    public long l39576;
+    public long l39577;
+    public long l39578;
+    public long l39579;
+    public long l39580;
+    public long l39581;
+    public long l39582;
+    public long l39583;
+    public long l39584;
+    public long l39585;
+    public long l39586;
+    public long l39587;
+    public long l39588;
+    public long l39589;
+    public long l39590;
+    public long l39591;
+    public long l39592;
+    public long l39593;
+    public long l39594;
+    public long l39595;
+    public long l39596;
+    public long l39597;
+    public long l39598;
+    public long l39599;
+    public long l39600;
+    public long l39601;
+    public long l39602;
+    public long l39603;
+    public long l39604;
+    public long l39605;
+    public long l39606;
+    public long l39607;
+    public long l39608;
+    public long l39609;
+    public long l39610;
+    public long l39611;
+    public long l39612;
+    public long l39613;
+    public long l39614;
+    public long l39615;
+    public long l39616;
+    public long l39617;
+    public long l39618;
+    public long l39619;
+    public long l39620;
+    public long l39621;
+    public long l39622;
+    public long l39623;
+    public long l39624;
+    public long l39625;
+    public long l39626;
+    public long l39627;
+    public long l39628;
+    public long l39629;
+    public long l39630;
+    public long l39631;
+    public long l39632;
+    public long l39633;
+    public long l39634;
+    public long l39635;
+    public long l39636;
+    public long l39637;
+    public long l39638;
+    public long l39639;
+    public long l39640;
+    public long l39641;
+    public long l39642;
+    public long l39643;
+    public long l39644;
+    public long l39645;
+    public long l39646;
+    public long l39647;
+    public long l39648;
+    public long l39649;
+    public long l39650;
+    public long l39651;
+    public long l39652;
+    public long l39653;
+    public long l39654;
+    public long l39655;
+    public long l39656;
+    public long l39657;
+    public long l39658;
+    public long l39659;
+    public long l39660;
+    public long l39661;
+    public long l39662;
+    public long l39663;
+    public long l39664;
+    public long l39665;
+    public long l39666;
+    public long l39667;
+    public long l39668;
+    public long l39669;
+    public long l39670;
+    public long l39671;
+    public long l39672;
+    public long l39673;
+    public long l39674;
+    public long l39675;
+    public long l39676;
+    public long l39677;
+    public long l39678;
+    public long l39679;
+    public long l39680;
+    public long l39681;
+    public long l39682;
+    public long l39683;
+    public long l39684;
+    public long l39685;
+    public long l39686;
+    public long l39687;
+    public long l39688;
+    public long l39689;
+    public long l39690;
+    public long l39691;
+    public long l39692;
+    public long l39693;
+    public long l39694;
+    public long l39695;
+    public long l39696;
+    public long l39697;
+    public long l39698;
+    public long l39699;
+    public long l39700;
+    public long l39701;
+    public long l39702;
+    public long l39703;
+    public long l39704;
+    public long l39705;
+    public long l39706;
+    public long l39707;
+    public long l39708;
+    public long l39709;
+    public long l39710;
+    public long l39711;
+    public long l39712;
+    public long l39713;
+    public long l39714;
+    public long l39715;
+    public long l39716;
+    public long l39717;
+    public long l39718;
+    public long l39719;
+    public long l39720;
+    public long l39721;
+    public long l39722;
+    public long l39723;
+    public long l39724;
+    public long l39725;
+    public long l39726;
+    public long l39727;
+    public long l39728;
+    public long l39729;
+    public long l39730;
+    public long l39731;
+    public long l39732;
+    public long l39733;
+    public long l39734;
+    public long l39735;
+    public long l39736;
+    public long l39737;
+    public long l39738;
+    public long l39739;
+    public long l39740;
+    public long l39741;
+    public long l39742;
+    public long l39743;
+    public long l39744;
+    public long l39745;
+    public long l39746;
+    public long l39747;
+    public long l39748;
+    public long l39749;
+    public long l39750;
+    public long l39751;
+    public long l39752;
+    public long l39753;
+    public long l39754;
+    public long l39755;
+    public long l39756;
+    public long l39757;
+    public long l39758;
+    public long l39759;
+    public long l39760;
+    public long l39761;
+    public long l39762;
+    public long l39763;
+    public long l39764;
+    public long l39765;
+    public long l39766;
+    public long l39767;
+    public long l39768;
+    public long l39769;
+    public long l39770;
+    public long l39771;
+    public long l39772;
+    public long l39773;
+    public long l39774;
+    public long l39775;
+    public long l39776;
+    public long l39777;
+    public long l39778;
+    public long l39779;
+    public long l39780;
+    public long l39781;
+    public long l39782;
+    public long l39783;
+    public long l39784;
+    public long l39785;
+    public long l39786;
+    public long l39787;
+    public long l39788;
+    public long l39789;
+    public long l39790;
+    public long l39791;
+    public long l39792;
+    public long l39793;
+    public long l39794;
+    public long l39795;
+    public long l39796;
+    public long l39797;
+    public long l39798;
+    public long l39799;
+    public long l39800;
+    public long l39801;
+    public long l39802;
+    public long l39803;
+    public long l39804;
+    public long l39805;
+    public long l39806;
+    public long l39807;
+    public long l39808;
+    public long l39809;
+    public long l39810;
+    public long l39811;
+    public long l39812;
+    public long l39813;
+    public long l39814;
+    public long l39815;
+    public long l39816;
+    public long l39817;
+    public long l39818;
+    public long l39819;
+    public long l39820;
+    public long l39821;
+    public long l39822;
+    public long l39823;
+    public long l39824;
+    public long l39825;
+    public long l39826;
+    public long l39827;
+    public long l39828;
+    public long l39829;
+    public long l39830;
+    public long l39831;
+    public long l39832;
+    public long l39833;
+    public long l39834;
+    public long l39835;
+    public long l39836;
+    public long l39837;
+    public long l39838;
+    public long l39839;
+    public long l39840;
+    public long l39841;
+    public long l39842;
+    public long l39843;
+    public long l39844;
+    public long l39845;
+    public long l39846;
+    public long l39847;
+    public long l39848;
+    public long l39849;
+    public long l39850;
+    public long l39851;
+    public long l39852;
+    public long l39853;
+    public long l39854;
+    public long l39855;
+    public long l39856;
+    public long l39857;
+    public long l39858;
+    public long l39859;
+    public long l39860;
+    public long l39861;
+    public long l39862;
+    public long l39863;
+    public long l39864;
+    public long l39865;
+    public long l39866;
+    public long l39867;
+    public long l39868;
+    public long l39869;
+    public long l39870;
+    public long l39871;
+    public long l39872;
+    public long l39873;
+    public long l39874;
+    public long l39875;
+    public long l39876;
+    public long l39877;
+    public long l39878;
+    public long l39879;
+    public long l39880;
+    public long l39881;
+    public long l39882;
+    public long l39883;
+    public long l39884;
+    public long l39885;
+    public long l39886;
+    public long l39887;
+    public long l39888;
+    public long l39889;
+    public long l39890;
+    public long l39891;
+    public long l39892;
+    public long l39893;
+    public long l39894;
+    public long l39895;
+    public long l39896;
+    public long l39897;
+    public long l39898;
+    public long l39899;
+    public long l39900;
+    public long l39901;
+    public long l39902;
+    public long l39903;
+    public long l39904;
+    public long l39905;
+    public long l39906;
+    public long l39907;
+    public long l39908;
+    public long l39909;
+    public long l39910;
+    public long l39911;
+    public long l39912;
+    public long l39913;
+    public long l39914;
+    public long l39915;
+    public long l39916;
+    public long l39917;
+    public long l39918;
+    public long l39919;
+    public long l39920;
+    public long l39921;
+    public long l39922;
+    public long l39923;
+    public long l39924;
+    public long l39925;
+    public long l39926;
+    public long l39927;
+    public long l39928;
+    public long l39929;
+    public long l39930;
+    public long l39931;
+    public long l39932;
+    public long l39933;
+    public long l39934;
+    public long l39935;
+    public long l39936;
+    public long l39937;
+    public long l39938;
+    public long l39939;
+    public long l39940;
+    public long l39941;
+    public long l39942;
+    public long l39943;
+    public long l39944;
+    public long l39945;
+    public long l39946;
+    public long l39947;
+    public long l39948;
+    public long l39949;
+    public long l39950;
+    public long l39951;
+    public long l39952;
+    public long l39953;
+    public long l39954;
+    public long l39955;
+    public long l39956;
+    public long l39957;
+    public long l39958;
+    public long l39959;
+    public long l39960;
+    public long l39961;
+    public long l39962;
+    public long l39963;
+    public long l39964;
+    public long l39965;
+    public long l39966;
+    public long l39967;
+    public long l39968;
+    public long l39969;
+    public long l39970;
+    public long l39971;
+    public long l39972;
+    public long l39973;
+    public long l39974;
+    public long l39975;
+    public long l39976;
+    public long l39977;
+    public long l39978;
+    public long l39979;
+    public long l39980;
+    public long l39981;
+    public long l39982;
+    public long l39983;
+    public long l39984;
+    public long l39985;
+    public long l39986;
+    public long l39987;
+    public long l39988;
+    public long l39989;
+    public long l39990;
+    public long l39991;
+    public long l39992;
+    public long l39993;
+    public long l39994;
+    public long l39995;
+    public long l39996;
+    public long l39997;
+    public long l39998;
+    public long l39999;
+    public long l40000;
+    public long l40001;
+    public long l40002;
+    public long l40003;
+    public long l40004;
+    public long l40005;
+    public long l40006;
+    public long l40007;
+    public long l40008;
+    public long l40009;
+    public long l40010;
+    public long l40011;
+    public long l40012;
+    public long l40013;
+    public long l40014;
+    public long l40015;
+    public long l40016;
+    public long l40017;
+    public long l40018;
+    public long l40019;
+    public long l40020;
+    public long l40021;
+    public long l40022;
+    public long l40023;
+    public long l40024;
+    public long l40025;
+    public long l40026;
+    public long l40027;
+    public long l40028;
+    public long l40029;
+    public long l40030;
+    public long l40031;
+    public long l40032;
+    public long l40033;
+    public long l40034;
+    public long l40035;
+    public long l40036;
+    public long l40037;
+    public long l40038;
+    public long l40039;
+    public long l40040;
+    public long l40041;
+    public long l40042;
+    public long l40043;
+    public long l40044;
+    public long l40045;
+    public long l40046;
+    public long l40047;
+    public long l40048;
+    public long l40049;
+    public long l40050;
+    public long l40051;
+    public long l40052;
+    public long l40053;
+    public long l40054;
+    public long l40055;
+    public long l40056;
+    public long l40057;
+    public long l40058;
+    public long l40059;
+    public long l40060;
+    public long l40061;
+    public long l40062;
+    public long l40063;
+    public long l40064;
+    public long l40065;
+    public long l40066;
+    public long l40067;
+    public long l40068;
+    public long l40069;
+    public long l40070;
+    public long l40071;
+    public long l40072;
+    public long l40073;
+    public long l40074;
+    public long l40075;
+    public long l40076;
+    public long l40077;
+    public long l40078;
+    public long l40079;
+    public long l40080;
+    public long l40081;
+    public long l40082;
+    public long l40083;
+    public long l40084;
+    public long l40085;
+    public long l40086;
+    public long l40087;
+    public long l40088;
+    public long l40089;
+    public long l40090;
+    public long l40091;
+    public long l40092;
+    public long l40093;
+    public long l40094;
+    public long l40095;
+    public long l40096;
+    public long l40097;
+    public long l40098;
+    public long l40099;
+    public long l40100;
+    public long l40101;
+    public long l40102;
+    public long l40103;
+    public long l40104;
+    public long l40105;
+    public long l40106;
+    public long l40107;
+    public long l40108;
+    public long l40109;
+    public long l40110;
+    public long l40111;
+    public long l40112;
+    public long l40113;
+    public long l40114;
+    public long l40115;
+    public long l40116;
+    public long l40117;
+    public long l40118;
+    public long l40119;
+    public long l40120;
+    public long l40121;
+    public long l40122;
+    public long l40123;
+    public long l40124;
+    public long l40125;
+    public long l40126;
+    public long l40127;
+    public long l40128;
+    public long l40129;
+    public long l40130;
+    public long l40131;
+    public long l40132;
+    public long l40133;
+    public long l40134;
+    public long l40135;
+    public long l40136;
+    public long l40137;
+    public long l40138;
+    public long l40139;
+    public long l40140;
+    public long l40141;
+    public long l40142;
+    public long l40143;
+    public long l40144;
+    public long l40145;
+    public long l40146;
+    public long l40147;
+    public long l40148;
+    public long l40149;
+    public long l40150;
+    public long l40151;
+    public long l40152;
+    public long l40153;
+    public long l40154;
+    public long l40155;
+    public long l40156;
+    public long l40157;
+    public long l40158;
+    public long l40159;
+    public long l40160;
+    public long l40161;
+    public long l40162;
+    public long l40163;
+    public long l40164;
+    public long l40165;
+    public long l40166;
+    public long l40167;
+    public long l40168;
+    public long l40169;
+    public long l40170;
+    public long l40171;
+    public long l40172;
+    public long l40173;
+    public long l40174;
+    public long l40175;
+    public long l40176;
+    public long l40177;
+    public long l40178;
+    public long l40179;
+    public long l40180;
+    public long l40181;
+    public long l40182;
+    public long l40183;
+    public long l40184;
+    public long l40185;
+    public long l40186;
+    public long l40187;
+    public long l40188;
+    public long l40189;
+    public long l40190;
+    public long l40191;
+    public long l40192;
+    public long l40193;
+    public long l40194;
+    public long l40195;
+    public long l40196;
+    public long l40197;
+    public long l40198;
+    public long l40199;
+    public long l40200;
+    public long l40201;
+    public long l40202;
+    public long l40203;
+    public long l40204;
+    public long l40205;
+    public long l40206;
+    public long l40207;
+    public long l40208;
+    public long l40209;
+    public long l40210;
+    public long l40211;
+    public long l40212;
+    public long l40213;
+    public long l40214;
+    public long l40215;
+    public long l40216;
+    public long l40217;
+    public long l40218;
+    public long l40219;
+    public long l40220;
+    public long l40221;
+    public long l40222;
+    public long l40223;
+    public long l40224;
+    public long l40225;
+    public long l40226;
+    public long l40227;
+    public long l40228;
+    public long l40229;
+    public long l40230;
+    public long l40231;
+    public long l40232;
+    public long l40233;
+    public long l40234;
+    public long l40235;
+    public long l40236;
+    public long l40237;
+    public long l40238;
+    public long l40239;
+    public long l40240;
+    public long l40241;
+    public long l40242;
+    public long l40243;
+    public long l40244;
+    public long l40245;
+    public long l40246;
+    public long l40247;
+    public long l40248;
+    public long l40249;
+    public long l40250;
+    public long l40251;
+    public long l40252;
+    public long l40253;
+    public long l40254;
+    public long l40255;
+    public long l40256;
+    public long l40257;
+    public long l40258;
+    public long l40259;
+    public long l40260;
+    public long l40261;
+    public long l40262;
+    public long l40263;
+    public long l40264;
+    public long l40265;
+    public long l40266;
+    public long l40267;
+    public long l40268;
+    public long l40269;
+    public long l40270;
+    public long l40271;
+    public long l40272;
+    public long l40273;
+    public long l40274;
+    public long l40275;
+    public long l40276;
+    public long l40277;
+    public long l40278;
+    public long l40279;
+    public long l40280;
+    public long l40281;
+    public long l40282;
+    public long l40283;
+    public long l40284;
+    public long l40285;
+    public long l40286;
+    public long l40287;
+    public long l40288;
+    public long l40289;
+    public long l40290;
+    public long l40291;
+    public long l40292;
+    public long l40293;
+    public long l40294;
+    public long l40295;
+    public long l40296;
+    public long l40297;
+    public long l40298;
+    public long l40299;
+    public long l40300;
+    public long l40301;
+    public long l40302;
+    public long l40303;
+    public long l40304;
+    public long l40305;
+    public long l40306;
+    public long l40307;
+    public long l40308;
+    public long l40309;
+    public long l40310;
+    public long l40311;
+    public long l40312;
+    public long l40313;
+    public long l40314;
+    public long l40315;
+    public long l40316;
+    public long l40317;
+    public long l40318;
+    public long l40319;
+    public long l40320;
+    public long l40321;
+    public long l40322;
+    public long l40323;
+    public long l40324;
+    public long l40325;
+    public long l40326;
+    public long l40327;
+    public long l40328;
+    public long l40329;
+    public long l40330;
+    public long l40331;
+    public long l40332;
+    public long l40333;
+    public long l40334;
+    public long l40335;
+    public long l40336;
+    public long l40337;
+    public long l40338;
+    public long l40339;
+    public long l40340;
+    public long l40341;
+    public long l40342;
+    public long l40343;
+    public long l40344;
+    public long l40345;
+    public long l40346;
+    public long l40347;
+    public long l40348;
+    public long l40349;
+    public long l40350;
+    public long l40351;
+    public long l40352;
+    public long l40353;
+    public long l40354;
+    public long l40355;
+    public long l40356;
+    public long l40357;
+    public long l40358;
+    public long l40359;
+    public long l40360;
+    public long l40361;
+    public long l40362;
+    public long l40363;
+    public long l40364;
+    public long l40365;
+    public long l40366;
+    public long l40367;
+    public long l40368;
+    public long l40369;
+    public long l40370;
+    public long l40371;
+    public long l40372;
+    public long l40373;
+    public long l40374;
+    public long l40375;
+    public long l40376;
+    public long l40377;
+    public long l40378;
+    public long l40379;
+    public long l40380;
+    public long l40381;
+    public long l40382;
+    public long l40383;
+    public long l40384;
+    public long l40385;
+    public long l40386;
+    public long l40387;
+    public long l40388;
+    public long l40389;
+    public long l40390;
+    public long l40391;
+    public long l40392;
+    public long l40393;
+    public long l40394;
+    public long l40395;
+    public long l40396;
+    public long l40397;
+    public long l40398;
+    public long l40399;
+    public long l40400;
+    public long l40401;
+    public long l40402;
+    public long l40403;
+    public long l40404;
+    public long l40405;
+    public long l40406;
+    public long l40407;
+    public long l40408;
+    public long l40409;
+    public long l40410;
+    public long l40411;
+    public long l40412;
+    public long l40413;
+    public long l40414;
+    public long l40415;
+    public long l40416;
+    public long l40417;
+    public long l40418;
+    public long l40419;
+    public long l40420;
+    public long l40421;
+    public long l40422;
+    public long l40423;
+    public long l40424;
+    public long l40425;
+    public long l40426;
+    public long l40427;
+    public long l40428;
+    public long l40429;
+    public long l40430;
+    public long l40431;
+    public long l40432;
+    public long l40433;
+    public long l40434;
+    public long l40435;
+    public long l40436;
+    public long l40437;
+    public long l40438;
+    public long l40439;
+    public long l40440;
+    public long l40441;
+    public long l40442;
+    public long l40443;
+    public long l40444;
+    public long l40445;
+    public long l40446;
+    public long l40447;
+    public long l40448;
+    public long l40449;
+    public long l40450;
+    public long l40451;
+    public long l40452;
+    public long l40453;
+    public long l40454;
+    public long l40455;
+    public long l40456;
+    public long l40457;
+    public long l40458;
+    public long l40459;
+    public long l40460;
+    public long l40461;
+    public long l40462;
+    public long l40463;
+    public long l40464;
+    public long l40465;
+    public long l40466;
+    public long l40467;
+    public long l40468;
+    public long l40469;
+    public long l40470;
+    public long l40471;
+    public long l40472;
+    public long l40473;
+    public long l40474;
+    public long l40475;
+    public long l40476;
+    public long l40477;
+    public long l40478;
+    public long l40479;
+    public long l40480;
+    public long l40481;
+    public long l40482;
+    public long l40483;
+    public long l40484;
+    public long l40485;
+    public long l40486;
+    public long l40487;
+    public long l40488;
+    public long l40489;
+    public long l40490;
+    public long l40491;
+    public long l40492;
+    public long l40493;
+    public long l40494;
+    public long l40495;
+    public long l40496;
+    public long l40497;
+    public long l40498;
+    public long l40499;
+    public long l40500;
+    public long l40501;
+    public long l40502;
+    public long l40503;
+    public long l40504;
+    public long l40505;
+    public long l40506;
+    public long l40507;
+    public long l40508;
+    public long l40509;
+    public long l40510;
+    public long l40511;
+    public long l40512;
+    public long l40513;
+    public long l40514;
+    public long l40515;
+    public long l40516;
+    public long l40517;
+    public long l40518;
+    public long l40519;
+    public long l40520;
+    public long l40521;
+    public long l40522;
+    public long l40523;
+    public long l40524;
+    public long l40525;
+    public long l40526;
+    public long l40527;
+    public long l40528;
+    public long l40529;
+    public long l40530;
+    public long l40531;
+    public long l40532;
+    public long l40533;
+    public long l40534;
+    public long l40535;
+    public long l40536;
+    public long l40537;
+    public long l40538;
+    public long l40539;
+    public long l40540;
+    public long l40541;
+    public long l40542;
+    public long l40543;
+    public long l40544;
+    public long l40545;
+    public long l40546;
+    public long l40547;
+    public long l40548;
+    public long l40549;
+    public long l40550;
+    public long l40551;
+    public long l40552;
+    public long l40553;
+    public long l40554;
+    public long l40555;
+    public long l40556;
+    public long l40557;
+    public long l40558;
+    public long l40559;
+    public long l40560;
+    public long l40561;
+    public long l40562;
+    public long l40563;
+    public long l40564;
+    public long l40565;
+    public long l40566;
+    public long l40567;
+    public long l40568;
+    public long l40569;
+    public long l40570;
+    public long l40571;
+    public long l40572;
+    public long l40573;
+    public long l40574;
+    public long l40575;
+    public long l40576;
+    public long l40577;
+    public long l40578;
+    public long l40579;
+    public long l40580;
+    public long l40581;
+    public long l40582;
+    public long l40583;
+    public long l40584;
+    public long l40585;
+    public long l40586;
+    public long l40587;
+    public long l40588;
+    public long l40589;
+    public long l40590;
+    public long l40591;
+    public long l40592;
+    public long l40593;
+    public long l40594;
+    public long l40595;
+    public long l40596;
+    public long l40597;
+    public long l40598;
+    public long l40599;
+    public long l40600;
+    public long l40601;
+    public long l40602;
+    public long l40603;
+    public long l40604;
+    public long l40605;
+    public long l40606;
+    public long l40607;
+    public long l40608;
+    public long l40609;
+    public long l40610;
+    public long l40611;
+    public long l40612;
+    public long l40613;
+    public long l40614;
+    public long l40615;
+    public long l40616;
+    public long l40617;
+    public long l40618;
+    public long l40619;
+    public long l40620;
+    public long l40621;
+    public long l40622;
+    public long l40623;
+    public long l40624;
+    public long l40625;
+    public long l40626;
+    public long l40627;
+    public long l40628;
+    public long l40629;
+    public long l40630;
+    public long l40631;
+    public long l40632;
+    public long l40633;
+    public long l40634;
+    public long l40635;
+    public long l40636;
+    public long l40637;
+    public long l40638;
+    public long l40639;
+    public long l40640;
+    public long l40641;
+    public long l40642;
+    public long l40643;
+    public long l40644;
+    public long l40645;
+    public long l40646;
+    public long l40647;
+    public long l40648;
+    public long l40649;
+    public long l40650;
+    public long l40651;
+    public long l40652;
+    public long l40653;
+    public long l40654;
+    public long l40655;
+    public long l40656;
+    public long l40657;
+    public long l40658;
+    public long l40659;
+    public long l40660;
+    public long l40661;
+    public long l40662;
+    public long l40663;
+    public long l40664;
+    public long l40665;
+    public long l40666;
+    public long l40667;
+    public long l40668;
+    public long l40669;
+    public long l40670;
+    public long l40671;
+    public long l40672;
+    public long l40673;
+    public long l40674;
+    public long l40675;
+    public long l40676;
+    public long l40677;
+    public long l40678;
+    public long l40679;
+    public long l40680;
+    public long l40681;
+    public long l40682;
+    public long l40683;
+    public long l40684;
+    public long l40685;
+    public long l40686;
+    public long l40687;
+    public long l40688;
+    public long l40689;
+    public long l40690;
+    public long l40691;
+    public long l40692;
+    public long l40693;
+    public long l40694;
+    public long l40695;
+    public long l40696;
+    public long l40697;
+    public long l40698;
+    public long l40699;
+    public long l40700;
+    public long l40701;
+    public long l40702;
+    public long l40703;
+    public long l40704;
+    public long l40705;
+    public long l40706;
+    public long l40707;
+    public long l40708;
+    public long l40709;
+    public long l40710;
+    public long l40711;
+    public long l40712;
+    public long l40713;
+    public long l40714;
+    public long l40715;
+    public long l40716;
+    public long l40717;
+    public long l40718;
+    public long l40719;
+    public long l40720;
+    public long l40721;
+    public long l40722;
+    public long l40723;
+    public long l40724;
+    public long l40725;
+    public long l40726;
+    public long l40727;
+    public long l40728;
+    public long l40729;
+    public long l40730;
+    public long l40731;
+    public long l40732;
+    public long l40733;
+    public long l40734;
+    public long l40735;
+    public long l40736;
+    public long l40737;
+    public long l40738;
+    public long l40739;
+    public long l40740;
+    public long l40741;
+    public long l40742;
+    public long l40743;
+    public long l40744;
+    public long l40745;
+    public long l40746;
+    public long l40747;
+    public long l40748;
+    public long l40749;
+    public long l40750;
+    public long l40751;
+    public long l40752;
+    public long l40753;
+    public long l40754;
+    public long l40755;
+    public long l40756;
+    public long l40757;
+    public long l40758;
+    public long l40759;
+    public long l40760;
+    public long l40761;
+    public long l40762;
+    public long l40763;
+    public long l40764;
+    public long l40765;
+    public long l40766;
+    public long l40767;
+    public long l40768;
+    public long l40769;
+    public long l40770;
+    public long l40771;
+    public long l40772;
+    public long l40773;
+    public long l40774;
+    public long l40775;
+    public long l40776;
+    public long l40777;
+    public long l40778;
+    public long l40779;
+    public long l40780;
+    public long l40781;
+    public long l40782;
+    public long l40783;
+    public long l40784;
+    public long l40785;
+    public long l40786;
+    public long l40787;
+    public long l40788;
+    public long l40789;
+    public long l40790;
+    public long l40791;
+    public long l40792;
+    public long l40793;
+    public long l40794;
+    public long l40795;
+    public long l40796;
+    public long l40797;
+    public long l40798;
+    public long l40799;
+    public long l40800;
+    public long l40801;
+    public long l40802;
+    public long l40803;
+    public long l40804;
+    public long l40805;
+    public long l40806;
+    public long l40807;
+    public long l40808;
+    public long l40809;
+    public long l40810;
+    public long l40811;
+    public long l40812;
+    public long l40813;
+    public long l40814;
+    public long l40815;
+    public long l40816;
+    public long l40817;
+    public long l40818;
+    public long l40819;
+    public long l40820;
+    public long l40821;
+    public long l40822;
+    public long l40823;
+    public long l40824;
+    public long l40825;
+    public long l40826;
+    public long l40827;
+    public long l40828;
+    public long l40829;
+    public long l40830;
+    public long l40831;
+    public long l40832;
+    public long l40833;
+    public long l40834;
+    public long l40835;
+    public long l40836;
+    public long l40837;
+    public long l40838;
+    public long l40839;
+    public long l40840;
+    public long l40841;
+    public long l40842;
+    public long l40843;
+    public long l40844;
+    public long l40845;
+    public long l40846;
+    public long l40847;
+    public long l40848;
+    public long l40849;
+    public long l40850;
+    public long l40851;
+    public long l40852;
+    public long l40853;
+    public long l40854;
+    public long l40855;
+    public long l40856;
+    public long l40857;
+    public long l40858;
+    public long l40859;
+    public long l40860;
+    public long l40861;
+    public long l40862;
+    public long l40863;
+    public long l40864;
+    public long l40865;
+    public long l40866;
+    public long l40867;
+    public long l40868;
+    public long l40869;
+    public long l40870;
+    public long l40871;
+    public long l40872;
+    public long l40873;
+    public long l40874;
+    public long l40875;
+    public long l40876;
+    public long l40877;
+    public long l40878;
+    public long l40879;
+    public long l40880;
+    public long l40881;
+    public long l40882;
+    public long l40883;
+    public long l40884;
+    public long l40885;
+    public long l40886;
+    public long l40887;
+    public long l40888;
+    public long l40889;
+    public long l40890;
+    public long l40891;
+    public long l40892;
+    public long l40893;
+    public long l40894;
+    public long l40895;
+    public long l40896;
+    public long l40897;
+    public long l40898;
+    public long l40899;
+    public long l40900;
+    public long l40901;
+    public long l40902;
+    public long l40903;
+    public long l40904;
+    public long l40905;
+    public long l40906;
+    public long l40907;
+    public long l40908;
+    public long l40909;
+    public long l40910;
+    public long l40911;
+    public long l40912;
+    public long l40913;
+    public long l40914;
+    public long l40915;
+    public long l40916;
+    public long l40917;
+    public long l40918;
+    public long l40919;
+    public long l40920;
+    public long l40921;
+    public long l40922;
+    public long l40923;
+    public long l40924;
+    public long l40925;
+    public long l40926;
+    public long l40927;
+    public long l40928;
+    public long l40929;
+    public long l40930;
+    public long l40931;
+    public long l40932;
+    public long l40933;
+    public long l40934;
+    public long l40935;
+    public long l40936;
+    public long l40937;
+    public long l40938;
+    public long l40939;
+    public long l40940;
+    public long l40941;
+    public long l40942;
+    public long l40943;
+    public long l40944;
+    public long l40945;
+    public long l40946;
+    public long l40947;
+    public long l40948;
+    public long l40949;
+    public long l40950;
+    public long l40951;
+    public long l40952;
+    public long l40953;
+    public long l40954;
+    public long l40955;
+    public long l40956;
+    public long l40957;
+    public long l40958;
+    public long l40959;
+    public long l40960;
+    public long l40961;
+    public long l40962;
+    public long l40963;
+    public long l40964;
+    public long l40965;
+    public long l40966;
+    public long l40967;
+    public long l40968;
+    public long l40969;
+    public long l40970;
+    public long l40971;
+    public long l40972;
+    public long l40973;
+    public long l40974;
+    public long l40975;
+    public long l40976;
+    public long l40977;
+    public long l40978;
+    public long l40979;
+    public long l40980;
+    public long l40981;
+    public long l40982;
+    public long l40983;
+    public long l40984;
+    public long l40985;
+    public long l40986;
+    public long l40987;
+    public long l40988;
+    public long l40989;
+    public long l40990;
+    public long l40991;
+    public long l40992;
+    public long l40993;
+    public long l40994;
+    public long l40995;
+    public long l40996;
+    public long l40997;
+    public long l40998;
+    public long l40999;
+    public long l41000;
+    public long l41001;
+    public long l41002;
+    public long l41003;
+    public long l41004;
+    public long l41005;
+    public long l41006;
+    public long l41007;
+    public long l41008;
+    public long l41009;
+    public long l41010;
+    public long l41011;
+    public long l41012;
+    public long l41013;
+    public long l41014;
+    public long l41015;
+    public long l41016;
+    public long l41017;
+    public long l41018;
+    public long l41019;
+    public long l41020;
+    public long l41021;
+    public long l41022;
+    public long l41023;
+    public long l41024;
+    public long l41025;
+    public long l41026;
+    public long l41027;
+    public long l41028;
+    public long l41029;
+    public long l41030;
+    public long l41031;
+    public long l41032;
+    public long l41033;
+    public long l41034;
+    public long l41035;
+    public long l41036;
+    public long l41037;
+    public long l41038;
+    public long l41039;
+    public long l41040;
+    public long l41041;
+    public long l41042;
+    public long l41043;
+    public long l41044;
+    public long l41045;
+    public long l41046;
+    public long l41047;
+    public long l41048;
+    public long l41049;
+    public long l41050;
+    public long l41051;
+    public long l41052;
+    public long l41053;
+    public long l41054;
+    public long l41055;
+    public long l41056;
+    public long l41057;
+    public long l41058;
+    public long l41059;
+    public long l41060;
+    public long l41061;
+    public long l41062;
+    public long l41063;
+    public long l41064;
+    public long l41065;
+    public long l41066;
+    public long l41067;
+    public long l41068;
+    public long l41069;
+    public long l41070;
+    public long l41071;
+    public long l41072;
+    public long l41073;
+    public long l41074;
+    public long l41075;
+    public long l41076;
+    public long l41077;
+    public long l41078;
+    public long l41079;
+    public long l41080;
+    public long l41081;
+    public long l41082;
+    public long l41083;
+    public long l41084;
+    public long l41085;
+    public long l41086;
+    public long l41087;
+    public long l41088;
+    public long l41089;
+    public long l41090;
+    public long l41091;
+    public long l41092;
+    public long l41093;
+    public long l41094;
+    public long l41095;
+    public long l41096;
+    public long l41097;
+    public long l41098;
+    public long l41099;
+    public long l41100;
+    public long l41101;
+    public long l41102;
+    public long l41103;
+    public long l41104;
+    public long l41105;
+    public long l41106;
+    public long l41107;
+    public long l41108;
+    public long l41109;
+    public long l41110;
+    public long l41111;
+    public long l41112;
+    public long l41113;
+    public long l41114;
+    public long l41115;
+    public long l41116;
+    public long l41117;
+    public long l41118;
+    public long l41119;
+    public long l41120;
+    public long l41121;
+    public long l41122;
+    public long l41123;
+    public long l41124;
+    public long l41125;
+    public long l41126;
+    public long l41127;
+    public long l41128;
+    public long l41129;
+    public long l41130;
+    public long l41131;
+    public long l41132;
+    public long l41133;
+    public long l41134;
+    public long l41135;
+    public long l41136;
+    public long l41137;
+    public long l41138;
+    public long l41139;
+    public long l41140;
+    public long l41141;
+    public long l41142;
+    public long l41143;
+    public long l41144;
+    public long l41145;
+    public long l41146;
+    public long l41147;
+    public long l41148;
+    public long l41149;
+    public long l41150;
+    public long l41151;
+    public long l41152;
+    public long l41153;
+    public long l41154;
+    public long l41155;
+    public long l41156;
+    public long l41157;
+    public long l41158;
+    public long l41159;
+    public long l41160;
+    public long l41161;
+    public long l41162;
+    public long l41163;
+    public long l41164;
+    public long l41165;
+    public long l41166;
+    public long l41167;
+    public long l41168;
+    public long l41169;
+    public long l41170;
+    public long l41171;
+    public long l41172;
+    public long l41173;
+    public long l41174;
+    public long l41175;
+    public long l41176;
+    public long l41177;
+    public long l41178;
+    public long l41179;
+    public long l41180;
+    public long l41181;
+    public long l41182;
+    public long l41183;
+    public long l41184;
+    public long l41185;
+    public long l41186;
+    public long l41187;
+    public long l41188;
+    public long l41189;
+    public long l41190;
+    public long l41191;
+    public long l41192;
+    public long l41193;
+    public long l41194;
+    public long l41195;
+    public long l41196;
+    public long l41197;
+    public long l41198;
+    public long l41199;
+    public long l41200;
+    public long l41201;
+    public long l41202;
+    public long l41203;
+    public long l41204;
+    public long l41205;
+    public long l41206;
+    public long l41207;
+    public long l41208;
+    public long l41209;
+    public long l41210;
+    public long l41211;
+    public long l41212;
+    public long l41213;
+    public long l41214;
+    public long l41215;
+    public long l41216;
+    public long l41217;
+    public long l41218;
+    public long l41219;
+    public long l41220;
+    public long l41221;
+    public long l41222;
+    public long l41223;
+    public long l41224;
+    public long l41225;
+    public long l41226;
+    public long l41227;
+    public long l41228;
+    public long l41229;
+    public long l41230;
+    public long l41231;
+    public long l41232;
+    public long l41233;
+    public long l41234;
+    public long l41235;
+    public long l41236;
+    public long l41237;
+    public long l41238;
+    public long l41239;
+    public long l41240;
+    public long l41241;
+    public long l41242;
+    public long l41243;
+    public long l41244;
+    public long l41245;
+    public long l41246;
+    public long l41247;
+    public long l41248;
+    public long l41249;
+    public long l41250;
+    public long l41251;
+    public long l41252;
+    public long l41253;
+    public long l41254;
+    public long l41255;
+    public long l41256;
+    public long l41257;
+    public long l41258;
+    public long l41259;
+    public long l41260;
+    public long l41261;
+    public long l41262;
+    public long l41263;
+    public long l41264;
+    public long l41265;
+    public long l41266;
+    public long l41267;
+    public long l41268;
+    public long l41269;
+    public long l41270;
+    public long l41271;
+    public long l41272;
+    public long l41273;
+    public long l41274;
+    public long l41275;
+    public long l41276;
+    public long l41277;
+    public long l41278;
+    public long l41279;
+    public long l41280;
+    public long l41281;
+    public long l41282;
+    public long l41283;
+    public long l41284;
+    public long l41285;
+    public long l41286;
+    public long l41287;
+    public long l41288;
+    public long l41289;
+    public long l41290;
+    public long l41291;
+    public long l41292;
+    public long l41293;
+    public long l41294;
+    public long l41295;
+    public long l41296;
+    public long l41297;
+    public long l41298;
+    public long l41299;
+    public long l41300;
+    public long l41301;
+    public long l41302;
+    public long l41303;
+    public long l41304;
+    public long l41305;
+    public long l41306;
+    public long l41307;
+    public long l41308;
+    public long l41309;
+    public long l41310;
+    public long l41311;
+    public long l41312;
+    public long l41313;
+    public long l41314;
+    public long l41315;
+    public long l41316;
+    public long l41317;
+    public long l41318;
+    public long l41319;
+    public long l41320;
+    public long l41321;
+    public long l41322;
+    public long l41323;
+    public long l41324;
+    public long l41325;
+    public long l41326;
+    public long l41327;
+    public long l41328;
+    public long l41329;
+    public long l41330;
+    public long l41331;
+    public long l41332;
+    public long l41333;
+    public long l41334;
+    public long l41335;
+    public long l41336;
+    public long l41337;
+    public long l41338;
+    public long l41339;
+    public long l41340;
+    public long l41341;
+    public long l41342;
+    public long l41343;
+    public long l41344;
+    public long l41345;
+    public long l41346;
+    public long l41347;
+    public long l41348;
+    public long l41349;
+    public long l41350;
+    public long l41351;
+    public long l41352;
+    public long l41353;
+    public long l41354;
+    public long l41355;
+    public long l41356;
+    public long l41357;
+    public long l41358;
+    public long l41359;
+    public long l41360;
+    public long l41361;
+    public long l41362;
+    public long l41363;
+    public long l41364;
+    public long l41365;
+    public long l41366;
+    public long l41367;
+    public long l41368;
+    public long l41369;
+    public long l41370;
+    public long l41371;
+    public long l41372;
+    public long l41373;
+    public long l41374;
+    public long l41375;
+    public long l41376;
+    public long l41377;
+    public long l41378;
+    public long l41379;
+    public long l41380;
+    public long l41381;
+    public long l41382;
+    public long l41383;
+    public long l41384;
+    public long l41385;
+    public long l41386;
+    public long l41387;
+    public long l41388;
+    public long l41389;
+    public long l41390;
+    public long l41391;
+    public long l41392;
+    public long l41393;
+    public long l41394;
+    public long l41395;
+    public long l41396;
+    public long l41397;
+    public long l41398;
+    public long l41399;
+    public long l41400;
+    public long l41401;
+    public long l41402;
+    public long l41403;
+    public long l41404;
+    public long l41405;
+    public long l41406;
+    public long l41407;
+    public long l41408;
+    public long l41409;
+    public long l41410;
+    public long l41411;
+    public long l41412;
+    public long l41413;
+    public long l41414;
+    public long l41415;
+    public long l41416;
+    public long l41417;
+    public long l41418;
+    public long l41419;
+    public long l41420;
+    public long l41421;
+    public long l41422;
+    public long l41423;
+    public long l41424;
+    public long l41425;
+    public long l41426;
+    public long l41427;
+    public long l41428;
+    public long l41429;
+    public long l41430;
+    public long l41431;
+    public long l41432;
+    public long l41433;
+    public long l41434;
+    public long l41435;
+    public long l41436;
+    public long l41437;
+    public long l41438;
+    public long l41439;
+    public long l41440;
+    public long l41441;
+    public long l41442;
+    public long l41443;
+    public long l41444;
+    public long l41445;
+    public long l41446;
+    public long l41447;
+    public long l41448;
+    public long l41449;
+    public long l41450;
+    public long l41451;
+    public long l41452;
+    public long l41453;
+    public long l41454;
+    public long l41455;
+    public long l41456;
+    public long l41457;
+    public long l41458;
+    public long l41459;
+    public long l41460;
+    public long l41461;
+    public long l41462;
+    public long l41463;
+    public long l41464;
+    public long l41465;
+    public long l41466;
+    public long l41467;
+    public long l41468;
+    public long l41469;
+    public long l41470;
+    public long l41471;
+    public long l41472;
+    public long l41473;
+    public long l41474;
+    public long l41475;
+    public long l41476;
+    public long l41477;
+    public long l41478;
+    public long l41479;
+    public long l41480;
+    public long l41481;
+    public long l41482;
+    public long l41483;
+    public long l41484;
+    public long l41485;
+    public long l41486;
+    public long l41487;
+    public long l41488;
+    public long l41489;
+    public long l41490;
+    public long l41491;
+    public long l41492;
+    public long l41493;
+    public long l41494;
+    public long l41495;
+    public long l41496;
+    public long l41497;
+    public long l41498;
+    public long l41499;
+    public long l41500;
+    public long l41501;
+    public long l41502;
+    public long l41503;
+    public long l41504;
+    public long l41505;
+    public long l41506;
+    public long l41507;
+    public long l41508;
+    public long l41509;
+    public long l41510;
+    public long l41511;
+    public long l41512;
+    public long l41513;
+    public long l41514;
+    public long l41515;
+    public long l41516;
+    public long l41517;
+    public long l41518;
+    public long l41519;
+    public long l41520;
+    public long l41521;
+    public long l41522;
+    public long l41523;
+    public long l41524;
+    public long l41525;
+    public long l41526;
+    public long l41527;
+    public long l41528;
+    public long l41529;
+    public long l41530;
+    public long l41531;
+    public long l41532;
+    public long l41533;
+    public long l41534;
+    public long l41535;
+    public long l41536;
+    public long l41537;
+    public long l41538;
+    public long l41539;
+    public long l41540;
+    public long l41541;
+    public long l41542;
+    public long l41543;
+    public long l41544;
+    public long l41545;
+    public long l41546;
+    public long l41547;
+    public long l41548;
+    public long l41549;
+    public long l41550;
+    public long l41551;
+    public long l41552;
+    public long l41553;
+    public long l41554;
+    public long l41555;
+    public long l41556;
+    public long l41557;
+    public long l41558;
+    public long l41559;
+    public long l41560;
+    public long l41561;
+    public long l41562;
+    public long l41563;
+    public long l41564;
+    public long l41565;
+    public long l41566;
+    public long l41567;
+    public long l41568;
+    public long l41569;
+    public long l41570;
+    public long l41571;
+    public long l41572;
+    public long l41573;
+    public long l41574;
+    public long l41575;
+    public long l41576;
+    public long l41577;
+    public long l41578;
+    public long l41579;
+    public long l41580;
+    public long l41581;
+    public long l41582;
+    public long l41583;
+    public long l41584;
+    public long l41585;
+    public long l41586;
+    public long l41587;
+    public long l41588;
+    public long l41589;
+    public long l41590;
+    public long l41591;
+    public long l41592;
+    public long l41593;
+    public long l41594;
+    public long l41595;
+    public long l41596;
+    public long l41597;
+    public long l41598;
+    public long l41599;
+    public long l41600;
+    public long l41601;
+    public long l41602;
+    public long l41603;
+    public long l41604;
+    public long l41605;
+    public long l41606;
+    public long l41607;
+    public long l41608;
+    public long l41609;
+    public long l41610;
+    public long l41611;
+    public long l41612;
+    public long l41613;
+    public long l41614;
+    public long l41615;
+    public long l41616;
+    public long l41617;
+    public long l41618;
+    public long l41619;
+    public long l41620;
+    public long l41621;
+    public long l41622;
+    public long l41623;
+    public long l41624;
+    public long l41625;
+    public long l41626;
+    public long l41627;
+    public long l41628;
+    public long l41629;
+    public long l41630;
+    public long l41631;
+    public long l41632;
+    public long l41633;
+    public long l41634;
+    public long l41635;
+    public long l41636;
+    public long l41637;
+    public long l41638;
+    public long l41639;
+    public long l41640;
+    public long l41641;
+    public long l41642;
+    public long l41643;
+    public long l41644;
+    public long l41645;
+    public long l41646;
+    public long l41647;
+    public long l41648;
+    public long l41649;
+    public long l41650;
+    public long l41651;
+    public long l41652;
+    public long l41653;
+    public long l41654;
+    public long l41655;
+    public long l41656;
+    public long l41657;
+    public long l41658;
+    public long l41659;
+    public long l41660;
+    public long l41661;
+    public long l41662;
+    public long l41663;
+    public long l41664;
+    public long l41665;
+    public long l41666;
+    public long l41667;
+    public long l41668;
+    public long l41669;
+    public long l41670;
+    public long l41671;
+    public long l41672;
+    public long l41673;
+    public long l41674;
+    public long l41675;
+    public long l41676;
+    public long l41677;
+    public long l41678;
+    public long l41679;
+    public long l41680;
+    public long l41681;
+    public long l41682;
+    public long l41683;
+    public long l41684;
+    public long l41685;
+    public long l41686;
+    public long l41687;
+    public long l41688;
+    public long l41689;
+    public long l41690;
+    public long l41691;
+    public long l41692;
+    public long l41693;
+    public long l41694;
+    public long l41695;
+    public long l41696;
+    public long l41697;
+    public long l41698;
+    public long l41699;
+    public long l41700;
+    public long l41701;
+    public long l41702;
+    public long l41703;
+    public long l41704;
+    public long l41705;
+    public long l41706;
+    public long l41707;
+    public long l41708;
+    public long l41709;
+    public long l41710;
+    public long l41711;
+    public long l41712;
+    public long l41713;
+    public long l41714;
+    public long l41715;
+    public long l41716;
+    public long l41717;
+    public long l41718;
+    public long l41719;
+    public long l41720;
+    public long l41721;
+    public long l41722;
+    public long l41723;
+    public long l41724;
+    public long l41725;
+    public long l41726;
+    public long l41727;
+    public long l41728;
+    public long l41729;
+    public long l41730;
+    public long l41731;
+    public long l41732;
+    public long l41733;
+    public long l41734;
+    public long l41735;
+    public long l41736;
+    public long l41737;
+    public long l41738;
+    public long l41739;
+    public long l41740;
+    public long l41741;
+    public long l41742;
+    public long l41743;
+    public long l41744;
+    public long l41745;
+    public long l41746;
+    public long l41747;
+    public long l41748;
+    public long l41749;
+    public long l41750;
+    public long l41751;
+    public long l41752;
+    public long l41753;
+    public long l41754;
+    public long l41755;
+    public long l41756;
+    public long l41757;
+    public long l41758;
+    public long l41759;
+    public long l41760;
+    public long l41761;
+    public long l41762;
+    public long l41763;
+    public long l41764;
+    public long l41765;
+    public long l41766;
+    public long l41767;
+    public long l41768;
+    public long l41769;
+    public long l41770;
+    public long l41771;
+    public long l41772;
+    public long l41773;
+    public long l41774;
+    public long l41775;
+    public long l41776;
+    public long l41777;
+    public long l41778;
+    public long l41779;
+    public long l41780;
+    public long l41781;
+    public long l41782;
+    public long l41783;
+    public long l41784;
+    public long l41785;
+    public long l41786;
+    public long l41787;
+    public long l41788;
+    public long l41789;
+    public long l41790;
+    public long l41791;
+    public long l41792;
+    public long l41793;
+    public long l41794;
+    public long l41795;
+    public long l41796;
+    public long l41797;
+    public long l41798;
+    public long l41799;
+    public long l41800;
+    public long l41801;
+    public long l41802;
+    public long l41803;
+    public long l41804;
+    public long l41805;
+    public long l41806;
+    public long l41807;
+    public long l41808;
+    public long l41809;
+    public long l41810;
+    public long l41811;
+    public long l41812;
+    public long l41813;
+    public long l41814;
+    public long l41815;
+    public long l41816;
+    public long l41817;
+    public long l41818;
+    public long l41819;
+    public long l41820;
+    public long l41821;
+    public long l41822;
+    public long l41823;
+    public long l41824;
+    public long l41825;
+    public long l41826;
+    public long l41827;
+    public long l41828;
+    public long l41829;
+    public long l41830;
+    public long l41831;
+    public long l41832;
+    public long l41833;
+    public long l41834;
+    public long l41835;
+    public long l41836;
+    public long l41837;
+    public long l41838;
+    public long l41839;
+    public long l41840;
+    public long l41841;
+    public long l41842;
+    public long l41843;
+    public long l41844;
+    public long l41845;
+    public long l41846;
+    public long l41847;
+    public long l41848;
+    public long l41849;
+    public long l41850;
+    public long l41851;
+    public long l41852;
+    public long l41853;
+    public long l41854;
+    public long l41855;
+    public long l41856;
+    public long l41857;
+    public long l41858;
+    public long l41859;
+    public long l41860;
+    public long l41861;
+    public long l41862;
+    public long l41863;
+    public long l41864;
+    public long l41865;
+    public long l41866;
+    public long l41867;
+    public long l41868;
+    public long l41869;
+    public long l41870;
+    public long l41871;
+    public long l41872;
+    public long l41873;
+    public long l41874;
+    public long l41875;
+    public long l41876;
+    public long l41877;
+    public long l41878;
+    public long l41879;
+    public long l41880;
+    public long l41881;
+    public long l41882;
+    public long l41883;
+    public long l41884;
+    public long l41885;
+    public long l41886;
+    public long l41887;
+    public long l41888;
+    public long l41889;
+    public long l41890;
+    public long l41891;
+    public long l41892;
+    public long l41893;
+    public long l41894;
+    public long l41895;
+    public long l41896;
+    public long l41897;
+    public long l41898;
+    public long l41899;
+    public long l41900;
+    public long l41901;
+    public long l41902;
+    public long l41903;
+    public long l41904;
+    public long l41905;
+    public long l41906;
+    public long l41907;
+    public long l41908;
+    public long l41909;
+    public long l41910;
+    public long l41911;
+    public long l41912;
+    public long l41913;
+    public long l41914;
+    public long l41915;
+    public long l41916;
+    public long l41917;
+    public long l41918;
+    public long l41919;
+    public long l41920;
+    public long l41921;
+    public long l41922;
+    public long l41923;
+    public long l41924;
+    public long l41925;
+    public long l41926;
+    public long l41927;
+    public long l41928;
+    public long l41929;
+    public long l41930;
+    public long l41931;
+    public long l41932;
+    public long l41933;
+    public long l41934;
+    public long l41935;
+    public long l41936;
+    public long l41937;
+    public long l41938;
+    public long l41939;
+    public long l41940;
+    public long l41941;
+    public long l41942;
+    public long l41943;
+    public long l41944;
+    public long l41945;
+    public long l41946;
+    public long l41947;
+    public long l41948;
+    public long l41949;
+    public long l41950;
+    public long l41951;
+    public long l41952;
+    public long l41953;
+    public long l41954;
+    public long l41955;
+    public long l41956;
+    public long l41957;
+    public long l41958;
+    public long l41959;
+    public long l41960;
+    public long l41961;
+    public long l41962;
+    public long l41963;
+    public long l41964;
+    public long l41965;
+    public long l41966;
+    public long l41967;
+    public long l41968;
+    public long l41969;
+    public long l41970;
+    public long l41971;
+    public long l41972;
+    public long l41973;
+    public long l41974;
+    public long l41975;
+    public long l41976;
+    public long l41977;
+    public long l41978;
+    public long l41979;
+    public long l41980;
+    public long l41981;
+    public long l41982;
+    public long l41983;
+    public long l41984;
+    public long l41985;
+    public long l41986;
+    public long l41987;
+    public long l41988;
+    public long l41989;
+    public long l41990;
+    public long l41991;
+    public long l41992;
+    public long l41993;
+    public long l41994;
+    public long l41995;
+    public long l41996;
+    public long l41997;
+    public long l41998;
+    public long l41999;
+    public long l42000;
+    public long l42001;
+    public long l42002;
+    public long l42003;
+    public long l42004;
+    public long l42005;
+    public long l42006;
+    public long l42007;
+    public long l42008;
+    public long l42009;
+    public long l42010;
+    public long l42011;
+    public long l42012;
+    public long l42013;
+    public long l42014;
+    public long l42015;
+    public long l42016;
+    public long l42017;
+    public long l42018;
+    public long l42019;
+    public long l42020;
+    public long l42021;
+    public long l42022;
+    public long l42023;
+    public long l42024;
+    public long l42025;
+    public long l42026;
+    public long l42027;
+    public long l42028;
+    public long l42029;
+    public long l42030;
+    public long l42031;
+    public long l42032;
+    public long l42033;
+    public long l42034;
+    public long l42035;
+    public long l42036;
+    public long l42037;
+    public long l42038;
+    public long l42039;
+    public long l42040;
+    public long l42041;
+    public long l42042;
+    public long l42043;
+    public long l42044;
+    public long l42045;
+    public long l42046;
+    public long l42047;
+    public long l42048;
+    public long l42049;
+    public long l42050;
+    public long l42051;
+    public long l42052;
+    public long l42053;
+    public long l42054;
+    public long l42055;
+    public long l42056;
+    public long l42057;
+    public long l42058;
+    public long l42059;
+    public long l42060;
+    public long l42061;
+    public long l42062;
+    public long l42063;
+    public long l42064;
+    public long l42065;
+    public long l42066;
+    public long l42067;
+    public long l42068;
+    public long l42069;
+    public long l42070;
+    public long l42071;
+    public long l42072;
+    public long l42073;
+    public long l42074;
+    public long l42075;
+    public long l42076;
+    public long l42077;
+    public long l42078;
+    public long l42079;
+    public long l42080;
+    public long l42081;
+    public long l42082;
+    public long l42083;
+    public long l42084;
+    public long l42085;
+    public long l42086;
+    public long l42087;
+    public long l42088;
+    public long l42089;
+    public long l42090;
+    public long l42091;
+    public long l42092;
+    public long l42093;
+    public long l42094;
+    public long l42095;
+    public long l42096;
+    public long l42097;
+    public long l42098;
+    public long l42099;
+    public long l42100;
+    public long l42101;
+    public long l42102;
+    public long l42103;
+    public long l42104;
+    public long l42105;
+    public long l42106;
+    public long l42107;
+    public long l42108;
+    public long l42109;
+    public long l42110;
+    public long l42111;
+    public long l42112;
+    public long l42113;
+    public long l42114;
+    public long l42115;
+    public long l42116;
+    public long l42117;
+    public long l42118;
+    public long l42119;
+    public long l42120;
+    public long l42121;
+    public long l42122;
+    public long l42123;
+    public long l42124;
+    public long l42125;
+    public long l42126;
+    public long l42127;
+    public long l42128;
+    public long l42129;
+    public long l42130;
+    public long l42131;
+    public long l42132;
+    public long l42133;
+    public long l42134;
+    public long l42135;
+    public long l42136;
+    public long l42137;
+    public long l42138;
+    public long l42139;
+    public long l42140;
+    public long l42141;
+    public long l42142;
+    public long l42143;
+    public long l42144;
+    public long l42145;
+    public long l42146;
+    public long l42147;
+    public long l42148;
+    public long l42149;
+    public long l42150;
+    public long l42151;
+    public long l42152;
+    public long l42153;
+    public long l42154;
+    public long l42155;
+    public long l42156;
+    public long l42157;
+    public long l42158;
+    public long l42159;
+    public long l42160;
+    public long l42161;
+    public long l42162;
+    public long l42163;
+    public long l42164;
+    public long l42165;
+    public long l42166;
+    public long l42167;
+    public long l42168;
+    public long l42169;
+    public long l42170;
+    public long l42171;
+    public long l42172;
+    public long l42173;
+    public long l42174;
+    public long l42175;
+    public long l42176;
+    public long l42177;
+    public long l42178;
+    public long l42179;
+    public long l42180;
+    public long l42181;
+    public long l42182;
+    public long l42183;
+    public long l42184;
+    public long l42185;
+    public long l42186;
+    public long l42187;
+    public long l42188;
+    public long l42189;
+    public long l42190;
+    public long l42191;
+    public long l42192;
+    public long l42193;
+    public long l42194;
+    public long l42195;
+    public long l42196;
+    public long l42197;
+    public long l42198;
+    public long l42199;
+    public long l42200;
+    public long l42201;
+    public long l42202;
+    public long l42203;
+    public long l42204;
+    public long l42205;
+    public long l42206;
+    public long l42207;
+    public long l42208;
+    public long l42209;
+    public long l42210;
+    public long l42211;
+    public long l42212;
+    public long l42213;
+    public long l42214;
+    public long l42215;
+    public long l42216;
+    public long l42217;
+    public long l42218;
+    public long l42219;
+    public long l42220;
+    public long l42221;
+    public long l42222;
+    public long l42223;
+    public long l42224;
+    public long l42225;
+    public long l42226;
+    public long l42227;
+    public long l42228;
+    public long l42229;
+    public long l42230;
+    public long l42231;
+    public long l42232;
+    public long l42233;
+    public long l42234;
+    public long l42235;
+    public long l42236;
+    public long l42237;
+    public long l42238;
+    public long l42239;
+    public long l42240;
+    public long l42241;
+    public long l42242;
+    public long l42243;
+    public long l42244;
+    public long l42245;
+    public long l42246;
+    public long l42247;
+    public long l42248;
+    public long l42249;
+    public long l42250;
+    public long l42251;
+    public long l42252;
+    public long l42253;
+    public long l42254;
+    public long l42255;
+    public long l42256;
+    public long l42257;
+    public long l42258;
+    public long l42259;
+    public long l42260;
+    public long l42261;
+    public long l42262;
+    public long l42263;
+    public long l42264;
+    public long l42265;
+    public long l42266;
+    public long l42267;
+    public long l42268;
+    public long l42269;
+    public long l42270;
+    public long l42271;
+    public long l42272;
+    public long l42273;
+    public long l42274;
+    public long l42275;
+    public long l42276;
+    public long l42277;
+    public long l42278;
+    public long l42279;
+    public long l42280;
+    public long l42281;
+    public long l42282;
+    public long l42283;
+    public long l42284;
+    public long l42285;
+    public long l42286;
+    public long l42287;
+    public long l42288;
+    public long l42289;
+    public long l42290;
+    public long l42291;
+    public long l42292;
+    public long l42293;
+    public long l42294;
+    public long l42295;
+    public long l42296;
+    public long l42297;
+    public long l42298;
+    public long l42299;
+    public long l42300;
+    public long l42301;
+    public long l42302;
+    public long l42303;
+    public long l42304;
+    public long l42305;
+    public long l42306;
+    public long l42307;
+    public long l42308;
+    public long l42309;
+    public long l42310;
+    public long l42311;
+    public long l42312;
+    public long l42313;
+    public long l42314;
+    public long l42315;
+    public long l42316;
+    public long l42317;
+    public long l42318;
+    public long l42319;
+    public long l42320;
+    public long l42321;
+    public long l42322;
+    public long l42323;
+    public long l42324;
+    public long l42325;
+    public long l42326;
+    public long l42327;
+    public long l42328;
+    public long l42329;
+    public long l42330;
+    public long l42331;
+    public long l42332;
+    public long l42333;
+    public long l42334;
+    public long l42335;
+    public long l42336;
+    public long l42337;
+    public long l42338;
+    public long l42339;
+    public long l42340;
+    public long l42341;
+    public long l42342;
+    public long l42343;
+    public long l42344;
+    public long l42345;
+    public long l42346;
+    public long l42347;
+    public long l42348;
+    public long l42349;
+    public long l42350;
+    public long l42351;
+    public long l42352;
+    public long l42353;
+    public long l42354;
+    public long l42355;
+    public long l42356;
+    public long l42357;
+    public long l42358;
+    public long l42359;
+    public long l42360;
+    public long l42361;
+    public long l42362;
+    public long l42363;
+    public long l42364;
+    public long l42365;
+    public long l42366;
+    public long l42367;
+    public long l42368;
+    public long l42369;
+    public long l42370;
+    public long l42371;
+    public long l42372;
+    public long l42373;
+    public long l42374;
+    public long l42375;
+    public long l42376;
+    public long l42377;
+    public long l42378;
+    public long l42379;
+    public long l42380;
+    public long l42381;
+    public long l42382;
+    public long l42383;
+    public long l42384;
+    public long l42385;
+    public long l42386;
+    public long l42387;
+    public long l42388;
+    public long l42389;
+    public long l42390;
+    public long l42391;
+    public long l42392;
+    public long l42393;
+    public long l42394;
+    public long l42395;
+    public long l42396;
+    public long l42397;
+    public long l42398;
+    public long l42399;
+    public long l42400;
+    public long l42401;
+    public long l42402;
+    public long l42403;
+    public long l42404;
+    public long l42405;
+    public long l42406;
+    public long l42407;
+    public long l42408;
+    public long l42409;
+    public long l42410;
+    public long l42411;
+    public long l42412;
+    public long l42413;
+    public long l42414;
+    public long l42415;
+    public long l42416;
+    public long l42417;
+    public long l42418;
+    public long l42419;
+    public long l42420;
+    public long l42421;
+    public long l42422;
+    public long l42423;
+    public long l42424;
+    public long l42425;
+    public long l42426;
+    public long l42427;
+    public long l42428;
+    public long l42429;
+    public long l42430;
+    public long l42431;
+    public long l42432;
+    public long l42433;
+    public long l42434;
+    public long l42435;
+    public long l42436;
+    public long l42437;
+    public long l42438;
+    public long l42439;
+    public long l42440;
+    public long l42441;
+    public long l42442;
+    public long l42443;
+    public long l42444;
+    public long l42445;
+    public long l42446;
+    public long l42447;
+    public long l42448;
+    public long l42449;
+    public long l42450;
+    public long l42451;
+    public long l42452;
+    public long l42453;
+    public long l42454;
+    public long l42455;
+    public long l42456;
+    public long l42457;
+    public long l42458;
+    public long l42459;
+    public long l42460;
+    public long l42461;
+    public long l42462;
+    public long l42463;
+    public long l42464;
+    public long l42465;
+    public long l42466;
+    public long l42467;
+    public long l42468;
+    public long l42469;
+    public long l42470;
+    public long l42471;
+    public long l42472;
+    public long l42473;
+    public long l42474;
+    public long l42475;
+    public long l42476;
+    public long l42477;
+    public long l42478;
+    public long l42479;
+    public long l42480;
+    public long l42481;
+    public long l42482;
+    public long l42483;
+    public long l42484;
+    public long l42485;
+    public long l42486;
+    public long l42487;
+    public long l42488;
+    public long l42489;
+    public long l42490;
+    public long l42491;
+    public long l42492;
+    public long l42493;
+    public long l42494;
+    public long l42495;
+    public long l42496;
+    public long l42497;
+    public long l42498;
+    public long l42499;
+    public long l42500;
+    public long l42501;
+    public long l42502;
+    public long l42503;
+    public long l42504;
+    public long l42505;
+    public long l42506;
+    public long l42507;
+    public long l42508;
+    public long l42509;
+    public long l42510;
+    public long l42511;
+    public long l42512;
+    public long l42513;
+    public long l42514;
+    public long l42515;
+    public long l42516;
+    public long l42517;
+    public long l42518;
+    public long l42519;
+    public long l42520;
+    public long l42521;
+    public long l42522;
+    public long l42523;
+    public long l42524;
+    public long l42525;
+    public long l42526;
+    public long l42527;
+    public long l42528;
+    public long l42529;
+    public long l42530;
+    public long l42531;
+    public long l42532;
+    public long l42533;
+    public long l42534;
+    public long l42535;
+    public long l42536;
+    public long l42537;
+    public long l42538;
+    public long l42539;
+    public long l42540;
+    public long l42541;
+    public long l42542;
+    public long l42543;
+    public long l42544;
+    public long l42545;
+    public long l42546;
+    public long l42547;
+    public long l42548;
+    public long l42549;
+    public long l42550;
+    public long l42551;
+    public long l42552;
+    public long l42553;
+    public long l42554;
+    public long l42555;
+    public long l42556;
+    public long l42557;
+    public long l42558;
+    public long l42559;
+    public long l42560;
+    public long l42561;
+    public long l42562;
+    public long l42563;
+    public long l42564;
+    public long l42565;
+    public long l42566;
+    public long l42567;
+    public long l42568;
+    public long l42569;
+    public long l42570;
+    public long l42571;
+    public long l42572;
+    public long l42573;
+    public long l42574;
+    public long l42575;
+    public long l42576;
+    public long l42577;
+    public long l42578;
+    public long l42579;
+    public long l42580;
+    public long l42581;
+    public long l42582;
+    public long l42583;
+    public long l42584;
+    public long l42585;
+    public long l42586;
+    public long l42587;
+    public long l42588;
+    public long l42589;
+    public long l42590;
+    public long l42591;
+    public long l42592;
+    public long l42593;
+    public long l42594;
+    public long l42595;
+    public long l42596;
+    public long l42597;
+    public long l42598;
+    public long l42599;
+    public long l42600;
+    public long l42601;
+    public long l42602;
+    public long l42603;
+    public long l42604;
+    public long l42605;
+    public long l42606;
+    public long l42607;
+    public long l42608;
+    public long l42609;
+    public long l42610;
+    public long l42611;
+    public long l42612;
+    public long l42613;
+    public long l42614;
+    public long l42615;
+    public long l42616;
+    public long l42617;
+    public long l42618;
+    public long l42619;
+    public long l42620;
+    public long l42621;
+    public long l42622;
+    public long l42623;
+    public long l42624;
+    public long l42625;
+    public long l42626;
+    public long l42627;
+    public long l42628;
+    public long l42629;
+    public long l42630;
+    public long l42631;
+    public long l42632;
+    public long l42633;
+    public long l42634;
+    public long l42635;
+    public long l42636;
+    public long l42637;
+    public long l42638;
+    public long l42639;
+    public long l42640;
+    public long l42641;
+    public long l42642;
+    public long l42643;
+    public long l42644;
+    public long l42645;
+    public long l42646;
+    public long l42647;
+    public long l42648;
+    public long l42649;
+    public long l42650;
+    public long l42651;
+    public long l42652;
+    public long l42653;
+    public long l42654;
+    public long l42655;
+    public long l42656;
+    public long l42657;
+    public long l42658;
+    public long l42659;
+    public long l42660;
+    public long l42661;
+    public long l42662;
+    public long l42663;
+    public long l42664;
+    public long l42665;
+    public long l42666;
+    public long l42667;
+    public long l42668;
+    public long l42669;
+    public long l42670;
+    public long l42671;
+    public long l42672;
+    public long l42673;
+    public long l42674;
+    public long l42675;
+    public long l42676;
+    public long l42677;
+    public long l42678;
+    public long l42679;
+    public long l42680;
+    public long l42681;
+    public long l42682;
+    public long l42683;
+    public long l42684;
+    public long l42685;
+    public long l42686;
+    public long l42687;
+    public long l42688;
+    public long l42689;
+    public long l42690;
+    public long l42691;
+    public long l42692;
+    public long l42693;
+    public long l42694;
+    public long l42695;
+    public long l42696;
+    public long l42697;
+    public long l42698;
+    public long l42699;
+    public long l42700;
+    public long l42701;
+    public long l42702;
+    public long l42703;
+    public long l42704;
+    public long l42705;
+    public long l42706;
+    public long l42707;
+    public long l42708;
+    public long l42709;
+    public long l42710;
+    public long l42711;
+    public long l42712;
+    public long l42713;
+    public long l42714;
+    public long l42715;
+    public long l42716;
+    public long l42717;
+    public long l42718;
+    public long l42719;
+    public long l42720;
+    public long l42721;
+    public long l42722;
+    public long l42723;
+    public long l42724;
+    public long l42725;
+    public long l42726;
+    public long l42727;
+    public long l42728;
+    public long l42729;
+    public long l42730;
+    public long l42731;
+    public long l42732;
+    public long l42733;
+    public long l42734;
+    public long l42735;
+    public long l42736;
+    public long l42737;
+    public long l42738;
+    public long l42739;
+    public long l42740;
+    public long l42741;
+    public long l42742;
+    public long l42743;
+    public long l42744;
+    public long l42745;
+    public long l42746;
+    public long l42747;
+    public long l42748;
+    public long l42749;
+    public long l42750;
+    public long l42751;
+    public long l42752;
+    public long l42753;
+    public long l42754;
+    public long l42755;
+    public long l42756;
+    public long l42757;
+    public long l42758;
+    public long l42759;
+    public long l42760;
+    public long l42761;
+    public long l42762;
+    public long l42763;
+    public long l42764;
+    public long l42765;
+    public long l42766;
+    public long l42767;
+    public long l42768;
+    public long l42769;
+    public long l42770;
+    public long l42771;
+    public long l42772;
+    public long l42773;
+    public long l42774;
+    public long l42775;
+    public long l42776;
+    public long l42777;
+    public long l42778;
+    public long l42779;
+    public long l42780;
+    public long l42781;
+    public long l42782;
+    public long l42783;
+    public long l42784;
+    public long l42785;
+    public long l42786;
+    public long l42787;
+    public long l42788;
+    public long l42789;
+    public long l42790;
+    public long l42791;
+    public long l42792;
+    public long l42793;
+    public long l42794;
+    public long l42795;
+    public long l42796;
+    public long l42797;
+    public long l42798;
+    public long l42799;
+    public long l42800;
+    public long l42801;
+    public long l42802;
+    public long l42803;
+    public long l42804;
+    public long l42805;
+    public long l42806;
+    public long l42807;
+    public long l42808;
+    public long l42809;
+    public long l42810;
+    public long l42811;
+    public long l42812;
+    public long l42813;
+    public long l42814;
+    public long l42815;
+    public long l42816;
+    public long l42817;
+    public long l42818;
+    public long l42819;
+    public long l42820;
+    public long l42821;
+    public long l42822;
+    public long l42823;
+    public long l42824;
+    public long l42825;
+    public long l42826;
+    public long l42827;
+    public long l42828;
+    public long l42829;
+    public long l42830;
+    public long l42831;
+    public long l42832;
+    public long l42833;
+    public long l42834;
+    public long l42835;
+    public long l42836;
+    public long l42837;
+    public long l42838;
+    public long l42839;
+    public long l42840;
+    public long l42841;
+    public long l42842;
+    public long l42843;
+    public long l42844;
+    public long l42845;
+    public long l42846;
+    public long l42847;
+    public long l42848;
+    public long l42849;
+    public long l42850;
+    public long l42851;
+    public long l42852;
+    public long l42853;
+    public long l42854;
+    public long l42855;
+    public long l42856;
+    public long l42857;
+    public long l42858;
+    public long l42859;
+    public long l42860;
+    public long l42861;
+    public long l42862;
+    public long l42863;
+    public long l42864;
+    public long l42865;
+    public long l42866;
+    public long l42867;
+    public long l42868;
+    public long l42869;
+    public long l42870;
+    public long l42871;
+    public long l42872;
+    public long l42873;
+    public long l42874;
+    public long l42875;
+    public long l42876;
+    public long l42877;
+    public long l42878;
+    public long l42879;
+    public long l42880;
+    public long l42881;
+    public long l42882;
+    public long l42883;
+    public long l42884;
+    public long l42885;
+    public long l42886;
+    public long l42887;
+    public long l42888;
+    public long l42889;
+    public long l42890;
+    public long l42891;
+    public long l42892;
+    public long l42893;
+    public long l42894;
+    public long l42895;
+    public long l42896;
+    public long l42897;
+    public long l42898;
+    public long l42899;
+    public long l42900;
+    public long l42901;
+    public long l42902;
+    public long l42903;
+    public long l42904;
+    public long l42905;
+    public long l42906;
+    public long l42907;
+    public long l42908;
+    public long l42909;
+    public long l42910;
+    public long l42911;
+    public long l42912;
+    public long l42913;
+    public long l42914;
+    public long l42915;
+    public long l42916;
+    public long l42917;
+    public long l42918;
+    public long l42919;
+    public long l42920;
+    public long l42921;
+    public long l42922;
+    public long l42923;
+    public long l42924;
+    public long l42925;
+    public long l42926;
+    public long l42927;
+    public long l42928;
+    public long l42929;
+    public long l42930;
+    public long l42931;
+    public long l42932;
+    public long l42933;
+    public long l42934;
+    public long l42935;
+    public long l42936;
+    public long l42937;
+    public long l42938;
+    public long l42939;
+    public long l42940;
+    public long l42941;
+    public long l42942;
+    public long l42943;
+    public long l42944;
+    public long l42945;
+    public long l42946;
+    public long l42947;
+    public long l42948;
+    public long l42949;
+    public long l42950;
+    public long l42951;
+    public long l42952;
+    public long l42953;
+    public long l42954;
+    public long l42955;
+    public long l42956;
+    public long l42957;
+    public long l42958;
+    public long l42959;
+    public long l42960;
+    public long l42961;
+    public long l42962;
+    public long l42963;
+    public long l42964;
+    public long l42965;
+    public long l42966;
+    public long l42967;
+    public long l42968;
+    public long l42969;
+    public long l42970;
+    public long l42971;
+    public long l42972;
+    public long l42973;
+    public long l42974;
+    public long l42975;
+    public long l42976;
+    public long l42977;
+    public long l42978;
+    public long l42979;
+    public long l42980;
+    public long l42981;
+    public long l42982;
+    public long l42983;
+    public long l42984;
+    public long l42985;
+    public long l42986;
+    public long l42987;
+    public long l42988;
+    public long l42989;
+    public long l42990;
+    public long l42991;
+    public long l42992;
+    public long l42993;
+    public long l42994;
+    public long l42995;
+    public long l42996;
+    public long l42997;
+    public long l42998;
+    public long l42999;
+    public long l43000;
+    public long l43001;
+    public long l43002;
+    public long l43003;
+    public long l43004;
+    public long l43005;
+    public long l43006;
+    public long l43007;
+    public long l43008;
+    public long l43009;
+    public long l43010;
+    public long l43011;
+    public long l43012;
+    public long l43013;
+    public long l43014;
+    public long l43015;
+    public long l43016;
+    public long l43017;
+    public long l43018;
+    public long l43019;
+    public long l43020;
+    public long l43021;
+    public long l43022;
+    public long l43023;
+    public long l43024;
+    public long l43025;
+    public long l43026;
+    public long l43027;
+    public long l43028;
+    public long l43029;
+    public long l43030;
+    public long l43031;
+    public long l43032;
+    public long l43033;
+    public long l43034;
+    public long l43035;
+    public long l43036;
+    public long l43037;
+    public long l43038;
+    public long l43039;
+    public long l43040;
+    public long l43041;
+    public long l43042;
+    public long l43043;
+    public long l43044;
+    public long l43045;
+    public long l43046;
+    public long l43047;
+    public long l43048;
+    public long l43049;
+    public long l43050;
+    public long l43051;
+    public long l43052;
+    public long l43053;
+    public long l43054;
+    public long l43055;
+    public long l43056;
+    public long l43057;
+    public long l43058;
+    public long l43059;
+    public long l43060;
+    public long l43061;
+    public long l43062;
+    public long l43063;
+    public long l43064;
+    public long l43065;
+    public long l43066;
+    public long l43067;
+    public long l43068;
+    public long l43069;
+    public long l43070;
+    public long l43071;
+    public long l43072;
+    public long l43073;
+    public long l43074;
+    public long l43075;
+    public long l43076;
+    public long l43077;
+    public long l43078;
+    public long l43079;
+    public long l43080;
+    public long l43081;
+    public long l43082;
+    public long l43083;
+    public long l43084;
+    public long l43085;
+    public long l43086;
+    public long l43087;
+    public long l43088;
+    public long l43089;
+    public long l43090;
+    public long l43091;
+    public long l43092;
+    public long l43093;
+    public long l43094;
+    public long l43095;
+    public long l43096;
+    public long l43097;
+    public long l43098;
+    public long l43099;
+    public long l43100;
+    public long l43101;
+    public long l43102;
+    public long l43103;
+    public long l43104;
+    public long l43105;
+    public long l43106;
+    public long l43107;
+    public long l43108;
+    public long l43109;
+    public long l43110;
+    public long l43111;
+    public long l43112;
+    public long l43113;
+    public long l43114;
+    public long l43115;
+    public long l43116;
+    public long l43117;
+    public long l43118;
+    public long l43119;
+    public long l43120;
+    public long l43121;
+    public long l43122;
+    public long l43123;
+    public long l43124;
+    public long l43125;
+    public long l43126;
+    public long l43127;
+    public long l43128;
+    public long l43129;
+    public long l43130;
+    public long l43131;
+    public long l43132;
+    public long l43133;
+    public long l43134;
+    public long l43135;
+    public long l43136;
+    public long l43137;
+    public long l43138;
+    public long l43139;
+    public long l43140;
+    public long l43141;
+    public long l43142;
+    public long l43143;
+    public long l43144;
+    public long l43145;
+    public long l43146;
+    public long l43147;
+    public long l43148;
+    public long l43149;
+    public long l43150;
+    public long l43151;
+    public long l43152;
+    public long l43153;
+    public long l43154;
+    public long l43155;
+    public long l43156;
+    public long l43157;
+    public long l43158;
+    public long l43159;
+    public long l43160;
+    public long l43161;
+    public long l43162;
+    public long l43163;
+    public long l43164;
+    public long l43165;
+    public long l43166;
+    public long l43167;
+    public long l43168;
+    public long l43169;
+    public long l43170;
+    public long l43171;
+    public long l43172;
+    public long l43173;
+    public long l43174;
+    public long l43175;
+    public long l43176;
+    public long l43177;
+    public long l43178;
+    public long l43179;
+    public long l43180;
+    public long l43181;
+    public long l43182;
+    public long l43183;
+    public long l43184;
+    public long l43185;
+    public long l43186;
+    public long l43187;
+    public long l43188;
+    public long l43189;
+    public long l43190;
+    public long l43191;
+    public long l43192;
+    public long l43193;
+    public long l43194;
+    public long l43195;
+    public long l43196;
+    public long l43197;
+    public long l43198;
+    public long l43199;
+    public long l43200;
+    public long l43201;
+    public long l43202;
+    public long l43203;
+    public long l43204;
+    public long l43205;
+    public long l43206;
+    public long l43207;
+    public long l43208;
+    public long l43209;
+    public long l43210;
+    public long l43211;
+    public long l43212;
+    public long l43213;
+    public long l43214;
+    public long l43215;
+    public long l43216;
+    public long l43217;
+    public long l43218;
+    public long l43219;
+    public long l43220;
+    public long l43221;
+    public long l43222;
+    public long l43223;
+    public long l43224;
+    public long l43225;
+    public long l43226;
+    public long l43227;
+    public long l43228;
+    public long l43229;
+    public long l43230;
+    public long l43231;
+    public long l43232;
+    public long l43233;
+    public long l43234;
+    public long l43235;
+    public long l43236;
+    public long l43237;
+    public long l43238;
+    public long l43239;
+    public long l43240;
+    public long l43241;
+    public long l43242;
+    public long l43243;
+    public long l43244;
+    public long l43245;
+    public long l43246;
+    public long l43247;
+    public long l43248;
+    public long l43249;
+    public long l43250;
+    public long l43251;
+    public long l43252;
+    public long l43253;
+    public long l43254;
+    public long l43255;
+    public long l43256;
+    public long l43257;
+    public long l43258;
+    public long l43259;
+    public long l43260;
+    public long l43261;
+    public long l43262;
+    public long l43263;
+    public long l43264;
+    public long l43265;
+    public long l43266;
+    public long l43267;
+    public long l43268;
+    public long l43269;
+    public long l43270;
+    public long l43271;
+    public long l43272;
+    public long l43273;
+    public long l43274;
+    public long l43275;
+    public long l43276;
+    public long l43277;
+    public long l43278;
+    public long l43279;
+    public long l43280;
+    public long l43281;
+    public long l43282;
+    public long l43283;
+    public long l43284;
+    public long l43285;
+    public long l43286;
+    public long l43287;
+    public long l43288;
+    public long l43289;
+    public long l43290;
+    public long l43291;
+    public long l43292;
+    public long l43293;
+    public long l43294;
+    public long l43295;
+    public long l43296;
+    public long l43297;
+    public long l43298;
+    public long l43299;
+    public long l43300;
+    public long l43301;
+    public long l43302;
+    public long l43303;
+    public long l43304;
+    public long l43305;
+    public long l43306;
+    public long l43307;
+    public long l43308;
+    public long l43309;
+    public long l43310;
+    public long l43311;
+    public long l43312;
+    public long l43313;
+    public long l43314;
+    public long l43315;
+    public long l43316;
+    public long l43317;
+    public long l43318;
+    public long l43319;
+    public long l43320;
+    public long l43321;
+    public long l43322;
+    public long l43323;
+    public long l43324;
+    public long l43325;
+    public long l43326;
+    public long l43327;
+    public long l43328;
+    public long l43329;
+    public long l43330;
+    public long l43331;
+    public long l43332;
+    public long l43333;
+    public long l43334;
+    public long l43335;
+    public long l43336;
+    public long l43337;
+    public long l43338;
+    public long l43339;
+    public long l43340;
+    public long l43341;
+    public long l43342;
+    public long l43343;
+    public long l43344;
+    public long l43345;
+    public long l43346;
+    public long l43347;
+    public long l43348;
+    public long l43349;
+    public long l43350;
+    public long l43351;
+    public long l43352;
+    public long l43353;
+    public long l43354;
+    public long l43355;
+    public long l43356;
+    public long l43357;
+    public long l43358;
+    public long l43359;
+    public long l43360;
+    public long l43361;
+    public long l43362;
+    public long l43363;
+    public long l43364;
+    public long l43365;
+    public long l43366;
+    public long l43367;
+    public long l43368;
+    public long l43369;
+    public long l43370;
+    public long l43371;
+    public long l43372;
+    public long l43373;
+    public long l43374;
+    public long l43375;
+    public long l43376;
+    public long l43377;
+    public long l43378;
+    public long l43379;
+    public long l43380;
+    public long l43381;
+    public long l43382;
+    public long l43383;
+    public long l43384;
+    public long l43385;
+    public long l43386;
+    public long l43387;
+    public long l43388;
+    public long l43389;
+    public long l43390;
+    public long l43391;
+    public long l43392;
+    public long l43393;
+    public long l43394;
+    public long l43395;
+    public long l43396;
+    public long l43397;
+    public long l43398;
+    public long l43399;
+    public long l43400;
+    public long l43401;
+    public long l43402;
+    public long l43403;
+    public long l43404;
+    public long l43405;
+    public long l43406;
+    public long l43407;
+    public long l43408;
+    public long l43409;
+    public long l43410;
+    public long l43411;
+    public long l43412;
+    public long l43413;
+    public long l43414;
+    public long l43415;
+    public long l43416;
+    public long l43417;
+    public long l43418;
+    public long l43419;
+    public long l43420;
+    public long l43421;
+    public long l43422;
+    public long l43423;
+    public long l43424;
+    public long l43425;
+    public long l43426;
+    public long l43427;
+    public long l43428;
+    public long l43429;
+    public long l43430;
+    public long l43431;
+    public long l43432;
+    public long l43433;
+    public long l43434;
+    public long l43435;
+    public long l43436;
+    public long l43437;
+    public long l43438;
+    public long l43439;
+    public long l43440;
+    public long l43441;
+    public long l43442;
+    public long l43443;
+    public long l43444;
+    public long l43445;
+    public long l43446;
+    public long l43447;
+    public long l43448;
+    public long l43449;
+    public long l43450;
+    public long l43451;
+    public long l43452;
+    public long l43453;
+    public long l43454;
+    public long l43455;
+    public long l43456;
+    public long l43457;
+    public long l43458;
+    public long l43459;
+    public long l43460;
+    public long l43461;
+    public long l43462;
+    public long l43463;
+    public long l43464;
+    public long l43465;
+    public long l43466;
+    public long l43467;
+    public long l43468;
+    public long l43469;
+    public long l43470;
+    public long l43471;
+    public long l43472;
+    public long l43473;
+    public long l43474;
+    public long l43475;
+    public long l43476;
+    public long l43477;
+    public long l43478;
+    public long l43479;
+    public long l43480;
+    public long l43481;
+    public long l43482;
+    public long l43483;
+    public long l43484;
+    public long l43485;
+    public long l43486;
+    public long l43487;
+    public long l43488;
+    public long l43489;
+    public long l43490;
+    public long l43491;
+    public long l43492;
+    public long l43493;
+    public long l43494;
+    public long l43495;
+    public long l43496;
+    public long l43497;
+    public long l43498;
+    public long l43499;
+    public long l43500;
+    public long l43501;
+    public long l43502;
+    public long l43503;
+    public long l43504;
+    public long l43505;
+    public long l43506;
+    public long l43507;
+    public long l43508;
+    public long l43509;
+    public long l43510;
+    public long l43511;
+    public long l43512;
+    public long l43513;
+    public long l43514;
+    public long l43515;
+    public long l43516;
+    public long l43517;
+    public long l43518;
+    public long l43519;
+    public long l43520;
+    public long l43521;
+    public long l43522;
+    public long l43523;
+    public long l43524;
+    public long l43525;
+    public long l43526;
+    public long l43527;
+    public long l43528;
+    public long l43529;
+    public long l43530;
+    public long l43531;
+    public long l43532;
+    public long l43533;
+    public long l43534;
+    public long l43535;
+    public long l43536;
+    public long l43537;
+    public long l43538;
+    public long l43539;
+    public long l43540;
+    public long l43541;
+    public long l43542;
+    public long l43543;
+    public long l43544;
+    public long l43545;
+    public long l43546;
+    public long l43547;
+    public long l43548;
+    public long l43549;
+    public long l43550;
+    public long l43551;
+    public long l43552;
+    public long l43553;
+    public long l43554;
+    public long l43555;
+    public long l43556;
+    public long l43557;
+    public long l43558;
+    public long l43559;
+    public long l43560;
+    public long l43561;
+    public long l43562;
+    public long l43563;
+    public long l43564;
+    public long l43565;
+    public long l43566;
+    public long l43567;
+    public long l43568;
+    public long l43569;
+    public long l43570;
+    public long l43571;
+    public long l43572;
+    public long l43573;
+    public long l43574;
+    public long l43575;
+    public long l43576;
+    public long l43577;
+    public long l43578;
+    public long l43579;
+    public long l43580;
+    public long l43581;
+    public long l43582;
+    public long l43583;
+    public long l43584;
+    public long l43585;
+    public long l43586;
+    public long l43587;
+    public long l43588;
+    public long l43589;
+    public long l43590;
+    public long l43591;
+    public long l43592;
+    public long l43593;
+    public long l43594;
+    public long l43595;
+    public long l43596;
+    public long l43597;
+    public long l43598;
+    public long l43599;
+    public long l43600;
+    public long l43601;
+    public long l43602;
+    public long l43603;
+    public long l43604;
+    public long l43605;
+    public long l43606;
+    public long l43607;
+    public long l43608;
+    public long l43609;
+    public long l43610;
+    public long l43611;
+    public long l43612;
+    public long l43613;
+    public long l43614;
+    public long l43615;
+    public long l43616;
+    public long l43617;
+    public long l43618;
+    public long l43619;
+    public long l43620;
+    public long l43621;
+    public long l43622;
+    public long l43623;
+    public long l43624;
+    public long l43625;
+    public long l43626;
+    public long l43627;
+    public long l43628;
+    public long l43629;
+    public long l43630;
+    public long l43631;
+    public long l43632;
+    public long l43633;
+    public long l43634;
+    public long l43635;
+    public long l43636;
+    public long l43637;
+    public long l43638;
+    public long l43639;
+    public long l43640;
+    public long l43641;
+    public long l43642;
+    public long l43643;
+    public long l43644;
+    public long l43645;
+    public long l43646;
+    public long l43647;
+    public long l43648;
+    public long l43649;
+    public long l43650;
+    public long l43651;
+    public long l43652;
+    public long l43653;
+    public long l43654;
+    public long l43655;
+    public long l43656;
+    public long l43657;
+    public long l43658;
+    public long l43659;
+    public long l43660;
+    public long l43661;
+    public long l43662;
+    public long l43663;
+    public long l43664;
+    public long l43665;
+    public long l43666;
+    public long l43667;
+    public long l43668;
+    public long l43669;
+    public long l43670;
+    public long l43671;
+    public long l43672;
+    public long l43673;
+    public long l43674;
+    public long l43675;
+    public long l43676;
+    public long l43677;
+    public long l43678;
+    public long l43679;
+    public long l43680;
+    public long l43681;
+    public long l43682;
+    public long l43683;
+    public long l43684;
+    public long l43685;
+    public long l43686;
+    public long l43687;
+    public long l43688;
+    public long l43689;
+    public long l43690;
+    public long l43691;
+    public long l43692;
+    public long l43693;
+    public long l43694;
+    public long l43695;
+    public long l43696;
+    public long l43697;
+    public long l43698;
+    public long l43699;
+    public long l43700;
+    public long l43701;
+    public long l43702;
+    public long l43703;
+    public long l43704;
+    public long l43705;
+    public long l43706;
+    public long l43707;
+    public long l43708;
+    public long l43709;
+    public long l43710;
+    public long l43711;
+    public long l43712;
+    public long l43713;
+    public long l43714;
+    public long l43715;
+    public long l43716;
+    public long l43717;
+    public long l43718;
+    public long l43719;
+    public long l43720;
+    public long l43721;
+    public long l43722;
+    public long l43723;
+    public long l43724;
+    public long l43725;
+    public long l43726;
+    public long l43727;
+    public long l43728;
+    public long l43729;
+    public long l43730;
+    public long l43731;
+    public long l43732;
+    public long l43733;
+    public long l43734;
+    public long l43735;
+    public long l43736;
+    public long l43737;
+    public long l43738;
+    public long l43739;
+    public long l43740;
+    public long l43741;
+    public long l43742;
+    public long l43743;
+    public long l43744;
+    public long l43745;
+    public long l43746;
+    public long l43747;
+    public long l43748;
+    public long l43749;
+    public long l43750;
+    public long l43751;
+    public long l43752;
+    public long l43753;
+    public long l43754;
+    public long l43755;
+    public long l43756;
+    public long l43757;
+    public long l43758;
+    public long l43759;
+    public long l43760;
+    public long l43761;
+    public long l43762;
+    public long l43763;
+    public long l43764;
+    public long l43765;
+    public long l43766;
+    public long l43767;
+    public long l43768;
+    public long l43769;
+    public long l43770;
+    public long l43771;
+    public long l43772;
+    public long l43773;
+    public long l43774;
+    public long l43775;
+    public long l43776;
+    public long l43777;
+    public long l43778;
+    public long l43779;
+    public long l43780;
+    public long l43781;
+    public long l43782;
+    public long l43783;
+    public long l43784;
+    public long l43785;
+    public long l43786;
+    public long l43787;
+    public long l43788;
+    public long l43789;
+    public long l43790;
+    public long l43791;
+    public long l43792;
+    public long l43793;
+    public long l43794;
+    public long l43795;
+    public long l43796;
+    public long l43797;
+    public long l43798;
+    public long l43799;
+    public long l43800;
+    public long l43801;
+    public long l43802;
+    public long l43803;
+    public long l43804;
+    public long l43805;
+    public long l43806;
+    public long l43807;
+    public long l43808;
+    public long l43809;
+    public long l43810;
+    public long l43811;
+    public long l43812;
+    public long l43813;
+    public long l43814;
+    public long l43815;
+    public long l43816;
+    public long l43817;
+    public long l43818;
+    public long l43819;
+    public long l43820;
+    public long l43821;
+    public long l43822;
+    public long l43823;
+    public long l43824;
+    public long l43825;
+    public long l43826;
+    public long l43827;
+    public long l43828;
+    public long l43829;
+    public long l43830;
+    public long l43831;
+    public long l43832;
+    public long l43833;
+    public long l43834;
+    public long l43835;
+    public long l43836;
+    public long l43837;
+    public long l43838;
+    public long l43839;
+    public long l43840;
+    public long l43841;
+    public long l43842;
+    public long l43843;
+    public long l43844;
+    public long l43845;
+    public long l43846;
+    public long l43847;
+    public long l43848;
+    public long l43849;
+    public long l43850;
+    public long l43851;
+    public long l43852;
+    public long l43853;
+    public long l43854;
+    public long l43855;
+    public long l43856;
+    public long l43857;
+    public long l43858;
+    public long l43859;
+    public long l43860;
+    public long l43861;
+    public long l43862;
+    public long l43863;
+    public long l43864;
+    public long l43865;
+    public long l43866;
+    public long l43867;
+    public long l43868;
+    public long l43869;
+    public long l43870;
+    public long l43871;
+    public long l43872;
+    public long l43873;
+    public long l43874;
+    public long l43875;
+    public long l43876;
+    public long l43877;
+    public long l43878;
+    public long l43879;
+    public long l43880;
+    public long l43881;
+    public long l43882;
+    public long l43883;
+    public long l43884;
+    public long l43885;
+    public long l43886;
+    public long l43887;
+    public long l43888;
+    public long l43889;
+    public long l43890;
+    public long l43891;
+    public long l43892;
+    public long l43893;
+    public long l43894;
+    public long l43895;
+    public long l43896;
+    public long l43897;
+    public long l43898;
+    public long l43899;
+    public long l43900;
+    public long l43901;
+    public long l43902;
+    public long l43903;
+    public long l43904;
+    public long l43905;
+    public long l43906;
+    public long l43907;
+    public long l43908;
+    public long l43909;
+    public long l43910;
+    public long l43911;
+    public long l43912;
+    public long l43913;
+    public long l43914;
+    public long l43915;
+    public long l43916;
+    public long l43917;
+    public long l43918;
+    public long l43919;
+    public long l43920;
+    public long l43921;
+    public long l43922;
+    public long l43923;
+    public long l43924;
+    public long l43925;
+    public long l43926;
+    public long l43927;
+    public long l43928;
+    public long l43929;
+    public long l43930;
+    public long l43931;
+    public long l43932;
+    public long l43933;
+    public long l43934;
+    public long l43935;
+    public long l43936;
+    public long l43937;
+    public long l43938;
+    public long l43939;
+    public long l43940;
+    public long l43941;
+    public long l43942;
+    public long l43943;
+    public long l43944;
+    public long l43945;
+    public long l43946;
+    public long l43947;
+    public long l43948;
+    public long l43949;
+    public long l43950;
+    public long l43951;
+    public long l43952;
+    public long l43953;
+    public long l43954;
+    public long l43955;
+    public long l43956;
+    public long l43957;
+    public long l43958;
+    public long l43959;
+    public long l43960;
+    public long l43961;
+    public long l43962;
+    public long l43963;
+    public long l43964;
+    public long l43965;
+    public long l43966;
+    public long l43967;
+    public long l43968;
+    public long l43969;
+    public long l43970;
+    public long l43971;
+    public long l43972;
+    public long l43973;
+    public long l43974;
+    public long l43975;
+    public long l43976;
+    public long l43977;
+    public long l43978;
+    public long l43979;
+    public long l43980;
+    public long l43981;
+    public long l43982;
+    public long l43983;
+    public long l43984;
+    public long l43985;
+    public long l43986;
+    public long l43987;
+    public long l43988;
+    public long l43989;
+    public long l43990;
+    public long l43991;
+    public long l43992;
+    public long l43993;
+    public long l43994;
+    public long l43995;
+    public long l43996;
+    public long l43997;
+    public long l43998;
+    public long l43999;
+    public long l44000;
+    public long l44001;
+    public long l44002;
+    public long l44003;
+    public long l44004;
+    public long l44005;
+    public long l44006;
+    public long l44007;
+    public long l44008;
+    public long l44009;
+    public long l44010;
+    public long l44011;
+    public long l44012;
+    public long l44013;
+    public long l44014;
+    public long l44015;
+    public long l44016;
+    public long l44017;
+    public long l44018;
+    public long l44019;
+    public long l44020;
+    public long l44021;
+    public long l44022;
+    public long l44023;
+    public long l44024;
+    public long l44025;
+    public long l44026;
+    public long l44027;
+    public long l44028;
+    public long l44029;
+    public long l44030;
+    public long l44031;
+    public long l44032;
+    public long l44033;
+    public long l44034;
+    public long l44035;
+    public long l44036;
+    public long l44037;
+    public long l44038;
+    public long l44039;
+    public long l44040;
+    public long l44041;
+    public long l44042;
+    public long l44043;
+    public long l44044;
+    public long l44045;
+    public long l44046;
+    public long l44047;
+    public long l44048;
+    public long l44049;
+    public long l44050;
+    public long l44051;
+    public long l44052;
+    public long l44053;
+    public long l44054;
+    public long l44055;
+    public long l44056;
+    public long l44057;
+    public long l44058;
+    public long l44059;
+    public long l44060;
+    public long l44061;
+    public long l44062;
+    public long l44063;
+    public long l44064;
+    public long l44065;
+    public long l44066;
+    public long l44067;
+    public long l44068;
+    public long l44069;
+    public long l44070;
+    public long l44071;
+    public long l44072;
+    public long l44073;
+    public long l44074;
+    public long l44075;
+    public long l44076;
+    public long l44077;
+    public long l44078;
+    public long l44079;
+    public long l44080;
+    public long l44081;
+    public long l44082;
+    public long l44083;
+    public long l44084;
+    public long l44085;
+    public long l44086;
+    public long l44087;
+    public long l44088;
+    public long l44089;
+    public long l44090;
+    public long l44091;
+    public long l44092;
+    public long l44093;
+    public long l44094;
+    public long l44095;
+    public long l44096;
+    public long l44097;
+    public long l44098;
+    public long l44099;
+    public long l44100;
+    public long l44101;
+    public long l44102;
+    public long l44103;
+    public long l44104;
+    public long l44105;
+    public long l44106;
+    public long l44107;
+    public long l44108;
+    public long l44109;
+    public long l44110;
+    public long l44111;
+    public long l44112;
+    public long l44113;
+    public long l44114;
+    public long l44115;
+    public long l44116;
+    public long l44117;
+    public long l44118;
+    public long l44119;
+    public long l44120;
+    public long l44121;
+    public long l44122;
+    public long l44123;
+    public long l44124;
+    public long l44125;
+    public long l44126;
+    public long l44127;
+    public long l44128;
+    public long l44129;
+    public long l44130;
+    public long l44131;
+    public long l44132;
+    public long l44133;
+    public long l44134;
+    public long l44135;
+    public long l44136;
+    public long l44137;
+    public long l44138;
+    public long l44139;
+    public long l44140;
+    public long l44141;
+    public long l44142;
+    public long l44143;
+    public long l44144;
+    public long l44145;
+    public long l44146;
+    public long l44147;
+    public long l44148;
+    public long l44149;
+    public long l44150;
+    public long l44151;
+    public long l44152;
+    public long l44153;
+    public long l44154;
+    public long l44155;
+    public long l44156;
+    public long l44157;
+    public long l44158;
+    public long l44159;
+    public long l44160;
+    public long l44161;
+    public long l44162;
+    public long l44163;
+    public long l44164;
+    public long l44165;
+    public long l44166;
+    public long l44167;
+    public long l44168;
+    public long l44169;
+    public long l44170;
+    public long l44171;
+    public long l44172;
+    public long l44173;
+    public long l44174;
+    public long l44175;
+    public long l44176;
+    public long l44177;
+    public long l44178;
+    public long l44179;
+    public long l44180;
+    public long l44181;
+    public long l44182;
+    public long l44183;
+    public long l44184;
+    public long l44185;
+    public long l44186;
+    public long l44187;
+    public long l44188;
+    public long l44189;
+    public long l44190;
+    public long l44191;
+    public long l44192;
+    public long l44193;
+    public long l44194;
+    public long l44195;
+    public long l44196;
+    public long l44197;
+    public long l44198;
+    public long l44199;
+    public long l44200;
+    public long l44201;
+    public long l44202;
+    public long l44203;
+    public long l44204;
+    public long l44205;
+    public long l44206;
+    public long l44207;
+    public long l44208;
+    public long l44209;
+    public long l44210;
+    public long l44211;
+    public long l44212;
+    public long l44213;
+    public long l44214;
+    public long l44215;
+    public long l44216;
+    public long l44217;
+    public long l44218;
+    public long l44219;
+    public long l44220;
+    public long l44221;
+    public long l44222;
+    public long l44223;
+    public long l44224;
+    public long l44225;
+    public long l44226;
+    public long l44227;
+    public long l44228;
+    public long l44229;
+    public long l44230;
+    public long l44231;
+    public long l44232;
+    public long l44233;
+    public long l44234;
+    public long l44235;
+    public long l44236;
+    public long l44237;
+    public long l44238;
+    public long l44239;
+    public long l44240;
+    public long l44241;
+    public long l44242;
+    public long l44243;
+    public long l44244;
+    public long l44245;
+    public long l44246;
+    public long l44247;
+    public long l44248;
+    public long l44249;
+    public long l44250;
+    public long l44251;
+    public long l44252;
+    public long l44253;
+    public long l44254;
+    public long l44255;
+    public long l44256;
+    public long l44257;
+    public long l44258;
+    public long l44259;
+    public long l44260;
+    public long l44261;
+    public long l44262;
+    public long l44263;
+    public long l44264;
+    public long l44265;
+    public long l44266;
+    public long l44267;
+    public long l44268;
+    public long l44269;
+    public long l44270;
+    public long l44271;
+    public long l44272;
+    public long l44273;
+    public long l44274;
+    public long l44275;
+    public long l44276;
+    public long l44277;
+    public long l44278;
+    public long l44279;
+    public long l44280;
+    public long l44281;
+    public long l44282;
+    public long l44283;
+    public long l44284;
+    public long l44285;
+    public long l44286;
+    public long l44287;
+    public long l44288;
+    public long l44289;
+    public long l44290;
+    public long l44291;
+    public long l44292;
+    public long l44293;
+    public long l44294;
+    public long l44295;
+    public long l44296;
+    public long l44297;
+    public long l44298;
+    public long l44299;
+    public long l44300;
+    public long l44301;
+    public long l44302;
+    public long l44303;
+    public long l44304;
+    public long l44305;
+    public long l44306;
+    public long l44307;
+    public long l44308;
+    public long l44309;
+    public long l44310;
+    public long l44311;
+    public long l44312;
+    public long l44313;
+    public long l44314;
+    public long l44315;
+    public long l44316;
+    public long l44317;
+    public long l44318;
+    public long l44319;
+    public long l44320;
+    public long l44321;
+    public long l44322;
+    public long l44323;
+    public long l44324;
+    public long l44325;
+    public long l44326;
+    public long l44327;
+    public long l44328;
+    public long l44329;
+    public long l44330;
+    public long l44331;
+    public long l44332;
+    public long l44333;
+    public long l44334;
+    public long l44335;
+    public long l44336;
+    public long l44337;
+    public long l44338;
+    public long l44339;
+    public long l44340;
+    public long l44341;
+    public long l44342;
+    public long l44343;
+    public long l44344;
+    public long l44345;
+    public long l44346;
+    public long l44347;
+    public long l44348;
+    public long l44349;
+    public long l44350;
+    public long l44351;
+    public long l44352;
+    public long l44353;
+    public long l44354;
+    public long l44355;
+    public long l44356;
+    public long l44357;
+    public long l44358;
+    public long l44359;
+    public long l44360;
+    public long l44361;
+    public long l44362;
+    public long l44363;
+    public long l44364;
+    public long l44365;
+    public long l44366;
+    public long l44367;
+    public long l44368;
+    public long l44369;
+    public long l44370;
+    public long l44371;
+    public long l44372;
+    public long l44373;
+    public long l44374;
+    public long l44375;
+    public long l44376;
+    public long l44377;
+    public long l44378;
+    public long l44379;
+    public long l44380;
+    public long l44381;
+    public long l44382;
+    public long l44383;
+    public long l44384;
+    public long l44385;
+    public long l44386;
+    public long l44387;
+    public long l44388;
+    public long l44389;
+    public long l44390;
+    public long l44391;
+    public long l44392;
+    public long l44393;
+    public long l44394;
+    public long l44395;
+    public long l44396;
+    public long l44397;
+    public long l44398;
+    public long l44399;
+    public long l44400;
+    public long l44401;
+    public long l44402;
+    public long l44403;
+    public long l44404;
+    public long l44405;
+    public long l44406;
+    public long l44407;
+    public long l44408;
+    public long l44409;
+    public long l44410;
+    public long l44411;
+    public long l44412;
+    public long l44413;
+    public long l44414;
+    public long l44415;
+    public long l44416;
+    public long l44417;
+    public long l44418;
+    public long l44419;
+    public long l44420;
+    public long l44421;
+    public long l44422;
+    public long l44423;
+    public long l44424;
+    public long l44425;
+    public long l44426;
+    public long l44427;
+    public long l44428;
+    public long l44429;
+    public long l44430;
+    public long l44431;
+    public long l44432;
+    public long l44433;
+    public long l44434;
+    public long l44435;
+    public long l44436;
+    public long l44437;
+    public long l44438;
+    public long l44439;
+    public long l44440;
+    public long l44441;
+    public long l44442;
+    public long l44443;
+    public long l44444;
+    public long l44445;
+    public long l44446;
+    public long l44447;
+    public long l44448;
+    public long l44449;
+    public long l44450;
+    public long l44451;
+    public long l44452;
+    public long l44453;
+    public long l44454;
+    public long l44455;
+    public long l44456;
+    public long l44457;
+    public long l44458;
+    public long l44459;
+    public long l44460;
+    public long l44461;
+    public long l44462;
+    public long l44463;
+    public long l44464;
+    public long l44465;
+    public long l44466;
+    public long l44467;
+    public long l44468;
+    public long l44469;
+    public long l44470;
+    public long l44471;
+    public long l44472;
+    public long l44473;
+    public long l44474;
+    public long l44475;
+    public long l44476;
+    public long l44477;
+    public long l44478;
+    public long l44479;
+    public long l44480;
+    public long l44481;
+    public long l44482;
+    public long l44483;
+    public long l44484;
+    public long l44485;
+    public long l44486;
+    public long l44487;
+    public long l44488;
+    public long l44489;
+    public long l44490;
+    public long l44491;
+    public long l44492;
+    public long l44493;
+    public long l44494;
+    public long l44495;
+    public long l44496;
+    public long l44497;
+    public long l44498;
+    public long l44499;
+    public long l44500;
+    public long l44501;
+    public long l44502;
+    public long l44503;
+    public long l44504;
+    public long l44505;
+    public long l44506;
+    public long l44507;
+    public long l44508;
+    public long l44509;
+    public long l44510;
+    public long l44511;
+    public long l44512;
+    public long l44513;
+    public long l44514;
+    public long l44515;
+    public long l44516;
+    public long l44517;
+    public long l44518;
+    public long l44519;
+    public long l44520;
+    public long l44521;
+    public long l44522;
+    public long l44523;
+    public long l44524;
+    public long l44525;
+    public long l44526;
+    public long l44527;
+    public long l44528;
+    public long l44529;
+    public long l44530;
+    public long l44531;
+    public long l44532;
+    public long l44533;
+    public long l44534;
+    public long l44535;
+    public long l44536;
+    public long l44537;
+    public long l44538;
+    public long l44539;
+    public long l44540;
+    public long l44541;
+    public long l44542;
+    public long l44543;
+    public long l44544;
+    public long l44545;
+    public long l44546;
+    public long l44547;
+    public long l44548;
+    public long l44549;
+    public long l44550;
+    public long l44551;
+    public long l44552;
+    public long l44553;
+    public long l44554;
+    public long l44555;
+    public long l44556;
+    public long l44557;
+    public long l44558;
+    public long l44559;
+    public long l44560;
+    public long l44561;
+    public long l44562;
+    public long l44563;
+    public long l44564;
+    public long l44565;
+    public long l44566;
+    public long l44567;
+    public long l44568;
+    public long l44569;
+    public long l44570;
+    public long l44571;
+    public long l44572;
+    public long l44573;
+    public long l44574;
+    public long l44575;
+    public long l44576;
+    public long l44577;
+    public long l44578;
+    public long l44579;
+    public long l44580;
+    public long l44581;
+    public long l44582;
+    public long l44583;
+    public long l44584;
+    public long l44585;
+    public long l44586;
+    public long l44587;
+    public long l44588;
+    public long l44589;
+    public long l44590;
+    public long l44591;
+    public long l44592;
+    public long l44593;
+    public long l44594;
+    public long l44595;
+    public long l44596;
+    public long l44597;
+    public long l44598;
+    public long l44599;
+    public long l44600;
+    public long l44601;
+    public long l44602;
+    public long l44603;
+    public long l44604;
+    public long l44605;
+    public long l44606;
+    public long l44607;
+    public long l44608;
+    public long l44609;
+    public long l44610;
+    public long l44611;
+    public long l44612;
+    public long l44613;
+    public long l44614;
+    public long l44615;
+    public long l44616;
+    public long l44617;
+    public long l44618;
+    public long l44619;
+    public long l44620;
+    public long l44621;
+    public long l44622;
+    public long l44623;
+    public long l44624;
+    public long l44625;
+    public long l44626;
+    public long l44627;
+    public long l44628;
+    public long l44629;
+    public long l44630;
+    public long l44631;
+    public long l44632;
+    public long l44633;
+    public long l44634;
+    public long l44635;
+    public long l44636;
+    public long l44637;
+    public long l44638;
+    public long l44639;
+    public long l44640;
+    public long l44641;
+    public long l44642;
+    public long l44643;
+    public long l44644;
+    public long l44645;
+    public long l44646;
+    public long l44647;
+    public long l44648;
+    public long l44649;
+    public long l44650;
+    public long l44651;
+    public long l44652;
+    public long l44653;
+    public long l44654;
+    public long l44655;
+    public long l44656;
+    public long l44657;
+    public long l44658;
+    public long l44659;
+    public long l44660;
+    public long l44661;
+    public long l44662;
+    public long l44663;
+    public long l44664;
+    public long l44665;
+    public long l44666;
+    public long l44667;
+    public long l44668;
+    public long l44669;
+    public long l44670;
+    public long l44671;
+    public long l44672;
+    public long l44673;
+    public long l44674;
+    public long l44675;
+    public long l44676;
+    public long l44677;
+    public long l44678;
+    public long l44679;
+    public long l44680;
+    public long l44681;
+    public long l44682;
+    public long l44683;
+    public long l44684;
+    public long l44685;
+    public long l44686;
+    public long l44687;
+    public long l44688;
+    public long l44689;
+    public long l44690;
+    public long l44691;
+    public long l44692;
+    public long l44693;
+    public long l44694;
+    public long l44695;
+    public long l44696;
+    public long l44697;
+    public long l44698;
+    public long l44699;
+    public long l44700;
+    public long l44701;
+    public long l44702;
+    public long l44703;
+    public long l44704;
+    public long l44705;
+    public long l44706;
+    public long l44707;
+    public long l44708;
+    public long l44709;
+    public long l44710;
+    public long l44711;
+    public long l44712;
+    public long l44713;
+    public long l44714;
+    public long l44715;
+    public long l44716;
+    public long l44717;
+    public long l44718;
+    public long l44719;
+    public long l44720;
+    public long l44721;
+    public long l44722;
+    public long l44723;
+    public long l44724;
+    public long l44725;
+    public long l44726;
+    public long l44727;
+    public long l44728;
+    public long l44729;
+    public long l44730;
+    public long l44731;
+    public long l44732;
+    public long l44733;
+    public long l44734;
+    public long l44735;
+    public long l44736;
+    public long l44737;
+    public long l44738;
+    public long l44739;
+    public long l44740;
+    public long l44741;
+    public long l44742;
+    public long l44743;
+    public long l44744;
+    public long l44745;
+    public long l44746;
+    public long l44747;
+    public long l44748;
+    public long l44749;
+    public long l44750;
+    public long l44751;
+    public long l44752;
+    public long l44753;
+    public long l44754;
+    public long l44755;
+    public long l44756;
+    public long l44757;
+    public long l44758;
+    public long l44759;
+    public long l44760;
+    public long l44761;
+    public long l44762;
+    public long l44763;
+    public long l44764;
+    public long l44765;
+    public long l44766;
+    public long l44767;
+    public long l44768;
+    public long l44769;
+    public long l44770;
+    public long l44771;
+    public long l44772;
+    public long l44773;
+    public long l44774;
+    public long l44775;
+    public long l44776;
+    public long l44777;
+    public long l44778;
+    public long l44779;
+    public long l44780;
+    public long l44781;
+    public long l44782;
+    public long l44783;
+    public long l44784;
+    public long l44785;
+    public long l44786;
+    public long l44787;
+    public long l44788;
+    public long l44789;
+    public long l44790;
+    public long l44791;
+    public long l44792;
+    public long l44793;
+    public long l44794;
+    public long l44795;
+    public long l44796;
+    public long l44797;
+    public long l44798;
+    public long l44799;
+    public long l44800;
+    public long l44801;
+    public long l44802;
+    public long l44803;
+    public long l44804;
+    public long l44805;
+    public long l44806;
+    public long l44807;
+    public long l44808;
+    public long l44809;
+    public long l44810;
+    public long l44811;
+    public long l44812;
+    public long l44813;
+    public long l44814;
+    public long l44815;
+    public long l44816;
+    public long l44817;
+    public long l44818;
+    public long l44819;
+    public long l44820;
+    public long l44821;
+    public long l44822;
+    public long l44823;
+    public long l44824;
+    public long l44825;
+    public long l44826;
+    public long l44827;
+    public long l44828;
+    public long l44829;
+    public long l44830;
+    public long l44831;
+    public long l44832;
+    public long l44833;
+    public long l44834;
+    public long l44835;
+    public long l44836;
+    public long l44837;
+    public long l44838;
+    public long l44839;
+    public long l44840;
+    public long l44841;
+    public long l44842;
+    public long l44843;
+    public long l44844;
+    public long l44845;
+    public long l44846;
+    public long l44847;
+    public long l44848;
+    public long l44849;
+    public long l44850;
+    public long l44851;
+    public long l44852;
+    public long l44853;
+    public long l44854;
+    public long l44855;
+    public long l44856;
+    public long l44857;
+    public long l44858;
+    public long l44859;
+    public long l44860;
+    public long l44861;
+    public long l44862;
+    public long l44863;
+    public long l44864;
+    public long l44865;
+    public long l44866;
+    public long l44867;
+    public long l44868;
+    public long l44869;
+    public long l44870;
+    public long l44871;
+    public long l44872;
+    public long l44873;
+    public long l44874;
+    public long l44875;
+    public long l44876;
+    public long l44877;
+    public long l44878;
+    public long l44879;
+    public long l44880;
+    public long l44881;
+    public long l44882;
+    public long l44883;
+    public long l44884;
+    public long l44885;
+    public long l44886;
+    public long l44887;
+    public long l44888;
+    public long l44889;
+    public long l44890;
+    public long l44891;
+    public long l44892;
+    public long l44893;
+    public long l44894;
+    public long l44895;
+    public long l44896;
+    public long l44897;
+    public long l44898;
+    public long l44899;
+    public long l44900;
+    public long l44901;
+    public long l44902;
+    public long l44903;
+    public long l44904;
+    public long l44905;
+    public long l44906;
+    public long l44907;
+    public long l44908;
+    public long l44909;
+    public long l44910;
+    public long l44911;
+    public long l44912;
+    public long l44913;
+    public long l44914;
+    public long l44915;
+    public long l44916;
+    public long l44917;
+    public long l44918;
+    public long l44919;
+    public long l44920;
+    public long l44921;
+    public long l44922;
+    public long l44923;
+    public long l44924;
+    public long l44925;
+    public long l44926;
+    public long l44927;
+    public long l44928;
+    public long l44929;
+    public long l44930;
+    public long l44931;
+    public long l44932;
+    public long l44933;
+    public long l44934;
+    public long l44935;
+    public long l44936;
+    public long l44937;
+    public long l44938;
+    public long l44939;
+    public long l44940;
+    public long l44941;
+    public long l44942;
+    public long l44943;
+    public long l44944;
+    public long l44945;
+    public long l44946;
+    public long l44947;
+    public long l44948;
+    public long l44949;
+    public long l44950;
+    public long l44951;
+    public long l44952;
+    public long l44953;
+    public long l44954;
+    public long l44955;
+    public long l44956;
+    public long l44957;
+    public long l44958;
+    public long l44959;
+    public long l44960;
+    public long l44961;
+    public long l44962;
+    public long l44963;
+    public long l44964;
+    public long l44965;
+    public long l44966;
+    public long l44967;
+    public long l44968;
+    public long l44969;
+    public long l44970;
+    public long l44971;
+    public long l44972;
+    public long l44973;
+    public long l44974;
+    public long l44975;
+    public long l44976;
+    public long l44977;
+    public long l44978;
+    public long l44979;
+    public long l44980;
+    public long l44981;
+    public long l44982;
+    public long l44983;
+    public long l44984;
+    public long l44985;
+    public long l44986;
+    public long l44987;
+    public long l44988;
+    public long l44989;
+    public long l44990;
+    public long l44991;
+    public long l44992;
+    public long l44993;
+    public long l44994;
+    public long l44995;
+    public long l44996;
+    public long l44997;
+    public long l44998;
+    public long l44999;
+    public long l45000;
+    public long l45001;
+    public long l45002;
+    public long l45003;
+    public long l45004;
+    public long l45005;
+    public long l45006;
+    public long l45007;
+    public long l45008;
+    public long l45009;
+    public long l45010;
+    public long l45011;
+    public long l45012;
+    public long l45013;
+    public long l45014;
+    public long l45015;
+    public long l45016;
+    public long l45017;
+    public long l45018;
+    public long l45019;
+    public long l45020;
+    public long l45021;
+    public long l45022;
+    public long l45023;
+    public long l45024;
+    public long l45025;
+    public long l45026;
+    public long l45027;
+    public long l45028;
+    public long l45029;
+    public long l45030;
+    public long l45031;
+    public long l45032;
+    public long l45033;
+    public long l45034;
+    public long l45035;
+    public long l45036;
+    public long l45037;
+    public long l45038;
+    public long l45039;
+    public long l45040;
+    public long l45041;
+    public long l45042;
+    public long l45043;
+    public long l45044;
+    public long l45045;
+    public long l45046;
+    public long l45047;
+    public long l45048;
+    public long l45049;
+    public long l45050;
+    public long l45051;
+    public long l45052;
+    public long l45053;
+    public long l45054;
+    public long l45055;
+    public long l45056;
+    public long l45057;
+    public long l45058;
+    public long l45059;
+    public long l45060;
+    public long l45061;
+    public long l45062;
+    public long l45063;
+    public long l45064;
+    public long l45065;
+    public long l45066;
+    public long l45067;
+    public long l45068;
+    public long l45069;
+    public long l45070;
+    public long l45071;
+    public long l45072;
+    public long l45073;
+    public long l45074;
+    public long l45075;
+    public long l45076;
+    public long l45077;
+    public long l45078;
+    public long l45079;
+    public long l45080;
+    public long l45081;
+    public long l45082;
+    public long l45083;
+    public long l45084;
+    public long l45085;
+    public long l45086;
+    public long l45087;
+    public long l45088;
+    public long l45089;
+    public long l45090;
+    public long l45091;
+    public long l45092;
+    public long l45093;
+    public long l45094;
+    public long l45095;
+    public long l45096;
+    public long l45097;
+    public long l45098;
+    public long l45099;
+    public long l45100;
+    public long l45101;
+    public long l45102;
+    public long l45103;
+    public long l45104;
+    public long l45105;
+    public long l45106;
+    public long l45107;
+    public long l45108;
+    public long l45109;
+    public long l45110;
+    public long l45111;
+    public long l45112;
+    public long l45113;
+    public long l45114;
+    public long l45115;
+    public long l45116;
+    public long l45117;
+    public long l45118;
+    public long l45119;
+    public long l45120;
+    public long l45121;
+    public long l45122;
+    public long l45123;
+    public long l45124;
+    public long l45125;
+    public long l45126;
+    public long l45127;
+    public long l45128;
+    public long l45129;
+    public long l45130;
+    public long l45131;
+    public long l45132;
+    public long l45133;
+    public long l45134;
+    public long l45135;
+    public long l45136;
+    public long l45137;
+    public long l45138;
+    public long l45139;
+    public long l45140;
+    public long l45141;
+    public long l45142;
+    public long l45143;
+    public long l45144;
+    public long l45145;
+    public long l45146;
+    public long l45147;
+    public long l45148;
+    public long l45149;
+    public long l45150;
+    public long l45151;
+    public long l45152;
+    public long l45153;
+    public long l45154;
+    public long l45155;
+    public long l45156;
+    public long l45157;
+    public long l45158;
+    public long l45159;
+    public long l45160;
+    public long l45161;
+    public long l45162;
+    public long l45163;
+    public long l45164;
+    public long l45165;
+    public long l45166;
+    public long l45167;
+    public long l45168;
+    public long l45169;
+    public long l45170;
+    public long l45171;
+    public long l45172;
+    public long l45173;
+    public long l45174;
+    public long l45175;
+    public long l45176;
+    public long l45177;
+    public long l45178;
+    public long l45179;
+    public long l45180;
+    public long l45181;
+    public long l45182;
+    public long l45183;
+    public long l45184;
+    public long l45185;
+    public long l45186;
+    public long l45187;
+    public long l45188;
+    public long l45189;
+    public long l45190;
+    public long l45191;
+    public long l45192;
+    public long l45193;
+    public long l45194;
+    public long l45195;
+    public long l45196;
+    public long l45197;
+    public long l45198;
+    public long l45199;
+    public long l45200;
+    public long l45201;
+    public long l45202;
+    public long l45203;
+    public long l45204;
+    public long l45205;
+    public long l45206;
+    public long l45207;
+    public long l45208;
+    public long l45209;
+    public long l45210;
+    public long l45211;
+    public long l45212;
+    public long l45213;
+    public long l45214;
+    public long l45215;
+    public long l45216;
+    public long l45217;
+    public long l45218;
+    public long l45219;
+    public long l45220;
+    public long l45221;
+    public long l45222;
+    public long l45223;
+    public long l45224;
+    public long l45225;
+    public long l45226;
+    public long l45227;
+    public long l45228;
+    public long l45229;
+    public long l45230;
+    public long l45231;
+    public long l45232;
+    public long l45233;
+    public long l45234;
+    public long l45235;
+    public long l45236;
+    public long l45237;
+    public long l45238;
+    public long l45239;
+    public long l45240;
+    public long l45241;
+    public long l45242;
+    public long l45243;
+    public long l45244;
+    public long l45245;
+    public long l45246;
+    public long l45247;
+    public long l45248;
+    public long l45249;
+    public long l45250;
+    public long l45251;
+    public long l45252;
+    public long l45253;
+    public long l45254;
+    public long l45255;
+    public long l45256;
+    public long l45257;
+    public long l45258;
+    public long l45259;
+    public long l45260;
+    public long l45261;
+    public long l45262;
+    public long l45263;
+    public long l45264;
+    public long l45265;
+    public long l45266;
+    public long l45267;
+    public long l45268;
+    public long l45269;
+    public long l45270;
+    public long l45271;
+    public long l45272;
+    public long l45273;
+    public long l45274;
+    public long l45275;
+    public long l45276;
+    public long l45277;
+    public long l45278;
+    public long l45279;
+    public long l45280;
+    public long l45281;
+    public long l45282;
+    public long l45283;
+    public long l45284;
+    public long l45285;
+    public long l45286;
+    public long l45287;
+    public long l45288;
+    public long l45289;
+    public long l45290;
+    public long l45291;
+    public long l45292;
+    public long l45293;
+    public long l45294;
+    public long l45295;
+    public long l45296;
+    public long l45297;
+    public long l45298;
+    public long l45299;
+    public long l45300;
+    public long l45301;
+    public long l45302;
+    public long l45303;
+    public long l45304;
+    public long l45305;
+    public long l45306;
+    public long l45307;
+    public long l45308;
+    public long l45309;
+    public long l45310;
+    public long l45311;
+    public long l45312;
+    public long l45313;
+    public long l45314;
+    public long l45315;
+    public long l45316;
+    public long l45317;
+    public long l45318;
+    public long l45319;
+    public long l45320;
+    public long l45321;
+    public long l45322;
+    public long l45323;
+    public long l45324;
+    public long l45325;
+    public long l45326;
+    public long l45327;
+    public long l45328;
+    public long l45329;
+    public long l45330;
+    public long l45331;
+    public long l45332;
+    public long l45333;
+    public long l45334;
+    public long l45335;
+    public long l45336;
+    public long l45337;
+    public long l45338;
+    public long l45339;
+    public long l45340;
+    public long l45341;
+    public long l45342;
+    public long l45343;
+    public long l45344;
+    public long l45345;
+    public long l45346;
+    public long l45347;
+    public long l45348;
+    public long l45349;
+    public long l45350;
+    public long l45351;
+    public long l45352;
+    public long l45353;
+    public long l45354;
+    public long l45355;
+    public long l45356;
+    public long l45357;
+    public long l45358;
+    public long l45359;
+    public long l45360;
+    public long l45361;
+    public long l45362;
+    public long l45363;
+    public long l45364;
+    public long l45365;
+    public long l45366;
+    public long l45367;
+    public long l45368;
+    public long l45369;
+    public long l45370;
+    public long l45371;
+    public long l45372;
+    public long l45373;
+    public long l45374;
+    public long l45375;
+    public long l45376;
+    public long l45377;
+    public long l45378;
+    public long l45379;
+    public long l45380;
+    public long l45381;
+    public long l45382;
+    public long l45383;
+    public long l45384;
+    public long l45385;
+    public long l45386;
+    public long l45387;
+    public long l45388;
+    public long l45389;
+    public long l45390;
+    public long l45391;
+    public long l45392;
+    public long l45393;
+    public long l45394;
+    public long l45395;
+    public long l45396;
+    public long l45397;
+    public long l45398;
+    public long l45399;
+    public long l45400;
+    public long l45401;
+    public long l45402;
+    public long l45403;
+    public long l45404;
+    public long l45405;
+    public long l45406;
+    public long l45407;
+    public long l45408;
+    public long l45409;
+    public long l45410;
+    public long l45411;
+    public long l45412;
+    public long l45413;
+    public long l45414;
+    public long l45415;
+    public long l45416;
+    public long l45417;
+    public long l45418;
+    public long l45419;
+    public long l45420;
+    public long l45421;
+    public long l45422;
+    public long l45423;
+    public long l45424;
+    public long l45425;
+    public long l45426;
+    public long l45427;
+    public long l45428;
+    public long l45429;
+    public long l45430;
+    public long l45431;
+    public long l45432;
+    public long l45433;
+    public long l45434;
+    public long l45435;
+    public long l45436;
+    public long l45437;
+    public long l45438;
+    public long l45439;
+    public long l45440;
+    public long l45441;
+    public long l45442;
+    public long l45443;
+    public long l45444;
+    public long l45445;
+    public long l45446;
+    public long l45447;
+    public long l45448;
+    public long l45449;
+    public long l45450;
+    public long l45451;
+    public long l45452;
+    public long l45453;
+    public long l45454;
+    public long l45455;
+    public long l45456;
+    public long l45457;
+    public long l45458;
+    public long l45459;
+    public long l45460;
+    public long l45461;
+    public long l45462;
+    public long l45463;
+    public long l45464;
+    public long l45465;
+    public long l45466;
+    public long l45467;
+    public long l45468;
+    public long l45469;
+    public long l45470;
+    public long l45471;
+    public long l45472;
+    public long l45473;
+    public long l45474;
+    public long l45475;
+    public long l45476;
+    public long l45477;
+    public long l45478;
+    public long l45479;
+    public long l45480;
+    public long l45481;
+    public long l45482;
+    public long l45483;
+    public long l45484;
+    public long l45485;
+    public long l45486;
+    public long l45487;
+    public long l45488;
+    public long l45489;
+    public long l45490;
+    public long l45491;
+    public long l45492;
+    public long l45493;
+    public long l45494;
+    public long l45495;
+    public long l45496;
+    public long l45497;
+    public long l45498;
+    public long l45499;
+    public long l45500;
+    public long l45501;
+    public long l45502;
+    public long l45503;
+    public long l45504;
+    public long l45505;
+    public long l45506;
+    public long l45507;
+    public long l45508;
+    public long l45509;
+    public long l45510;
+    public long l45511;
+    public long l45512;
+    public long l45513;
+    public long l45514;
+    public long l45515;
+    public long l45516;
+    public long l45517;
+    public long l45518;
+    public long l45519;
+    public long l45520;
+    public long l45521;
+    public long l45522;
+    public long l45523;
+    public long l45524;
+    public long l45525;
+    public long l45526;
+    public long l45527;
+    public long l45528;
+    public long l45529;
+    public long l45530;
+    public long l45531;
+    public long l45532;
+    public long l45533;
+    public long l45534;
+    public long l45535;
+    public long l45536;
+    public long l45537;
+    public long l45538;
+    public long l45539;
+    public long l45540;
+    public long l45541;
+    public long l45542;
+    public long l45543;
+    public long l45544;
+    public long l45545;
+    public long l45546;
+    public long l45547;
+    public long l45548;
+    public long l45549;
+    public long l45550;
+    public long l45551;
+    public long l45552;
+    public long l45553;
+    public long l45554;
+    public long l45555;
+    public long l45556;
+    public long l45557;
+    public long l45558;
+    public long l45559;
+    public long l45560;
+    public long l45561;
+    public long l45562;
+    public long l45563;
+    public long l45564;
+    public long l45565;
+    public long l45566;
+    public long l45567;
+    public long l45568;
+    public long l45569;
+    public long l45570;
+    public long l45571;
+    public long l45572;
+    public long l45573;
+    public long l45574;
+    public long l45575;
+    public long l45576;
+    public long l45577;
+    public long l45578;
+    public long l45579;
+    public long l45580;
+    public long l45581;
+    public long l45582;
+    public long l45583;
+    public long l45584;
+    public long l45585;
+    public long l45586;
+    public long l45587;
+    public long l45588;
+    public long l45589;
+    public long l45590;
+    public long l45591;
+    public long l45592;
+    public long l45593;
+    public long l45594;
+    public long l45595;
+    public long l45596;
+    public long l45597;
+    public long l45598;
+    public long l45599;
+    public long l45600;
+    public long l45601;
+    public long l45602;
+    public long l45603;
+    public long l45604;
+    public long l45605;
+    public long l45606;
+    public long l45607;
+    public long l45608;
+    public long l45609;
+    public long l45610;
+    public long l45611;
+    public long l45612;
+    public long l45613;
+    public long l45614;
+    public long l45615;
+    public long l45616;
+    public long l45617;
+    public long l45618;
+    public long l45619;
+    public long l45620;
+    public long l45621;
+    public long l45622;
+    public long l45623;
+    public long l45624;
+    public long l45625;
+    public long l45626;
+    public long l45627;
+    public long l45628;
+    public long l45629;
+    public long l45630;
+    public long l45631;
+    public long l45632;
+    public long l45633;
+    public long l45634;
+    public long l45635;
+    public long l45636;
+    public long l45637;
+    public long l45638;
+    public long l45639;
+    public long l45640;
+    public long l45641;
+    public long l45642;
+    public long l45643;
+    public long l45644;
+    public long l45645;
+    public long l45646;
+    public long l45647;
+    public long l45648;
+    public long l45649;
+    public long l45650;
+    public long l45651;
+    public long l45652;
+    public long l45653;
+    public long l45654;
+    public long l45655;
+    public long l45656;
+    public long l45657;
+    public long l45658;
+    public long l45659;
+    public long l45660;
+    public long l45661;
+    public long l45662;
+    public long l45663;
+    public long l45664;
+    public long l45665;
+    public long l45666;
+    public long l45667;
+    public long l45668;
+    public long l45669;
+    public long l45670;
+    public long l45671;
+    public long l45672;
+    public long l45673;
+    public long l45674;
+    public long l45675;
+    public long l45676;
+    public long l45677;
+    public long l45678;
+    public long l45679;
+    public long l45680;
+    public long l45681;
+    public long l45682;
+    public long l45683;
+    public long l45684;
+    public long l45685;
+    public long l45686;
+    public long l45687;
+    public long l45688;
+    public long l45689;
+    public long l45690;
+    public long l45691;
+    public long l45692;
+    public long l45693;
+    public long l45694;
+    public long l45695;
+    public long l45696;
+    public long l45697;
+    public long l45698;
+    public long l45699;
+    public long l45700;
+    public long l45701;
+    public long l45702;
+    public long l45703;
+    public long l45704;
+    public long l45705;
+    public long l45706;
+    public long l45707;
+    public long l45708;
+    public long l45709;
+    public long l45710;
+    public long l45711;
+    public long l45712;
+    public long l45713;
+    public long l45714;
+    public long l45715;
+    public long l45716;
+    public long l45717;
+    public long l45718;
+    public long l45719;
+    public long l45720;
+    public long l45721;
+    public long l45722;
+    public long l45723;
+    public long l45724;
+    public long l45725;
+    public long l45726;
+    public long l45727;
+    public long l45728;
+    public long l45729;
+    public long l45730;
+    public long l45731;
+    public long l45732;
+    public long l45733;
+    public long l45734;
+    public long l45735;
+    public long l45736;
+    public long l45737;
+    public long l45738;
+    public long l45739;
+    public long l45740;
+    public long l45741;
+    public long l45742;
+    public long l45743;
+    public long l45744;
+    public long l45745;
+    public long l45746;
+    public long l45747;
+    public long l45748;
+    public long l45749;
+    public long l45750;
+    public long l45751;
+    public long l45752;
+    public long l45753;
+    public long l45754;
+    public long l45755;
+    public long l45756;
+    public long l45757;
+    public long l45758;
+    public long l45759;
+    public long l45760;
+    public long l45761;
+    public long l45762;
+    public long l45763;
+    public long l45764;
+    public long l45765;
+    public long l45766;
+    public long l45767;
+    public long l45768;
+    public long l45769;
+    public long l45770;
+    public long l45771;
+    public long l45772;
+    public long l45773;
+    public long l45774;
+    public long l45775;
+    public long l45776;
+    public long l45777;
+    public long l45778;
+    public long l45779;
+    public long l45780;
+    public long l45781;
+    public long l45782;
+    public long l45783;
+    public long l45784;
+    public long l45785;
+    public long l45786;
+    public long l45787;
+    public long l45788;
+    public long l45789;
+    public long l45790;
+    public long l45791;
+    public long l45792;
+    public long l45793;
+    public long l45794;
+    public long l45795;
+    public long l45796;
+    public long l45797;
+    public long l45798;
+    public long l45799;
+    public long l45800;
+    public long l45801;
+    public long l45802;
+    public long l45803;
+    public long l45804;
+    public long l45805;
+    public long l45806;
+    public long l45807;
+    public long l45808;
+    public long l45809;
+    public long l45810;
+    public long l45811;
+    public long l45812;
+    public long l45813;
+    public long l45814;
+    public long l45815;
+    public long l45816;
+    public long l45817;
+    public long l45818;
+    public long l45819;
+    public long l45820;
+    public long l45821;
+    public long l45822;
+    public long l45823;
+    public long l45824;
+    public long l45825;
+    public long l45826;
+    public long l45827;
+    public long l45828;
+    public long l45829;
+    public long l45830;
+    public long l45831;
+    public long l45832;
+    public long l45833;
+    public long l45834;
+    public long l45835;
+    public long l45836;
+    public long l45837;
+    public long l45838;
+    public long l45839;
+    public long l45840;
+    public long l45841;
+    public long l45842;
+    public long l45843;
+    public long l45844;
+    public long l45845;
+    public long l45846;
+    public long l45847;
+    public long l45848;
+    public long l45849;
+    public long l45850;
+    public long l45851;
+    public long l45852;
+    public long l45853;
+    public long l45854;
+    public long l45855;
+    public long l45856;
+    public long l45857;
+    public long l45858;
+    public long l45859;
+    public long l45860;
+    public long l45861;
+    public long l45862;
+    public long l45863;
+    public long l45864;
+    public long l45865;
+    public long l45866;
+    public long l45867;
+    public long l45868;
+    public long l45869;
+    public long l45870;
+    public long l45871;
+    public long l45872;
+    public long l45873;
+    public long l45874;
+    public long l45875;
+    public long l45876;
+    public long l45877;
+    public long l45878;
+    public long l45879;
+    public long l45880;
+    public long l45881;
+    public long l45882;
+    public long l45883;
+    public long l45884;
+    public long l45885;
+    public long l45886;
+    public long l45887;
+    public long l45888;
+    public long l45889;
+    public long l45890;
+    public long l45891;
+    public long l45892;
+    public long l45893;
+    public long l45894;
+    public long l45895;
+    public long l45896;
+    public long l45897;
+    public long l45898;
+    public long l45899;
+    public long l45900;
+    public long l45901;
+    public long l45902;
+    public long l45903;
+    public long l45904;
+    public long l45905;
+    public long l45906;
+    public long l45907;
+    public long l45908;
+    public long l45909;
+    public long l45910;
+    public long l45911;
+    public long l45912;
+    public long l45913;
+    public long l45914;
+    public long l45915;
+    public long l45916;
+    public long l45917;
+    public long l45918;
+    public long l45919;
+    public long l45920;
+    public long l45921;
+    public long l45922;
+    public long l45923;
+    public long l45924;
+    public long l45925;
+    public long l45926;
+    public long l45927;
+    public long l45928;
+    public long l45929;
+    public long l45930;
+    public long l45931;
+    public long l45932;
+    public long l45933;
+    public long l45934;
+    public long l45935;
+    public long l45936;
+    public long l45937;
+    public long l45938;
+    public long l45939;
+    public long l45940;
+    public long l45941;
+    public long l45942;
+    public long l45943;
+    public long l45944;
+    public long l45945;
+    public long l45946;
+    public long l45947;
+    public long l45948;
+    public long l45949;
+    public long l45950;
+    public long l45951;
+    public long l45952;
+    public long l45953;
+    public long l45954;
+    public long l45955;
+    public long l45956;
+    public long l45957;
+    public long l45958;
+    public long l45959;
+    public long l45960;
+    public long l45961;
+    public long l45962;
+    public long l45963;
+    public long l45964;
+    public long l45965;
+    public long l45966;
+    public long l45967;
+    public long l45968;
+    public long l45969;
+    public long l45970;
+    public long l45971;
+    public long l45972;
+    public long l45973;
+    public long l45974;
+    public long l45975;
+    public long l45976;
+    public long l45977;
+    public long l45978;
+    public long l45979;
+    public long l45980;
+    public long l45981;
+    public long l45982;
+    public long l45983;
+    public long l45984;
+    public long l45985;
+    public long l45986;
+    public long l45987;
+    public long l45988;
+    public long l45989;
+    public long l45990;
+    public long l45991;
+    public long l45992;
+    public long l45993;
+    public long l45994;
+    public long l45995;
+    public long l45996;
+    public long l45997;
+    public long l45998;
+    public long l45999;
+    public long l46000;
+    public long l46001;
+    public long l46002;
+    public long l46003;
+    public long l46004;
+    public long l46005;
+    public long l46006;
+    public long l46007;
+    public long l46008;
+    public long l46009;
+    public long l46010;
+    public long l46011;
+    public long l46012;
+    public long l46013;
+    public long l46014;
+    public long l46015;
+    public long l46016;
+    public long l46017;
+    public long l46018;
+    public long l46019;
+    public long l46020;
+    public long l46021;
+    public long l46022;
+    public long l46023;
+    public long l46024;
+    public long l46025;
+    public long l46026;
+    public long l46027;
+    public long l46028;
+    public long l46029;
+    public long l46030;
+    public long l46031;
+    public long l46032;
+    public long l46033;
+    public long l46034;
+    public long l46035;
+    public long l46036;
+    public long l46037;
+    public long l46038;
+    public long l46039;
+    public long l46040;
+    public long l46041;
+    public long l46042;
+    public long l46043;
+    public long l46044;
+    public long l46045;
+    public long l46046;
+    public long l46047;
+    public long l46048;
+    public long l46049;
+    public long l46050;
+    public long l46051;
+    public long l46052;
+    public long l46053;
+    public long l46054;
+    public long l46055;
+    public long l46056;
+    public long l46057;
+    public long l46058;
+    public long l46059;
+    public long l46060;
+    public long l46061;
+    public long l46062;
+    public long l46063;
+    public long l46064;
+    public long l46065;
+    public long l46066;
+    public long l46067;
+    public long l46068;
+    public long l46069;
+    public long l46070;
+    public long l46071;
+    public long l46072;
+    public long l46073;
+    public long l46074;
+    public long l46075;
+    public long l46076;
+    public long l46077;
+    public long l46078;
+    public long l46079;
+    public long l46080;
+    public long l46081;
+    public long l46082;
+    public long l46083;
+    public long l46084;
+    public long l46085;
+    public long l46086;
+    public long l46087;
+    public long l46088;
+    public long l46089;
+    public long l46090;
+    public long l46091;
+    public long l46092;
+    public long l46093;
+    public long l46094;
+    public long l46095;
+    public long l46096;
+    public long l46097;
+    public long l46098;
+    public long l46099;
+    public long l46100;
+    public long l46101;
+    public long l46102;
+    public long l46103;
+    public long l46104;
+    public long l46105;
+    public long l46106;
+    public long l46107;
+    public long l46108;
+    public long l46109;
+    public long l46110;
+    public long l46111;
+    public long l46112;
+    public long l46113;
+    public long l46114;
+    public long l46115;
+    public long l46116;
+    public long l46117;
+    public long l46118;
+    public long l46119;
+    public long l46120;
+    public long l46121;
+    public long l46122;
+    public long l46123;
+    public long l46124;
+    public long l46125;
+    public long l46126;
+    public long l46127;
+    public long l46128;
+    public long l46129;
+    public long l46130;
+    public long l46131;
+    public long l46132;
+    public long l46133;
+    public long l46134;
+    public long l46135;
+    public long l46136;
+    public long l46137;
+    public long l46138;
+    public long l46139;
+    public long l46140;
+    public long l46141;
+    public long l46142;
+    public long l46143;
+    public long l46144;
+    public long l46145;
+    public long l46146;
+    public long l46147;
+    public long l46148;
+    public long l46149;
+    public long l46150;
+    public long l46151;
+    public long l46152;
+    public long l46153;
+    public long l46154;
+    public long l46155;
+    public long l46156;
+    public long l46157;
+    public long l46158;
+    public long l46159;
+    public long l46160;
+    public long l46161;
+    public long l46162;
+    public long l46163;
+    public long l46164;
+    public long l46165;
+    public long l46166;
+    public long l46167;
+    public long l46168;
+    public long l46169;
+    public long l46170;
+    public long l46171;
+    public long l46172;
+    public long l46173;
+    public long l46174;
+    public long l46175;
+    public long l46176;
+    public long l46177;
+    public long l46178;
+    public long l46179;
+    public long l46180;
+    public long l46181;
+    public long l46182;
+    public long l46183;
+    public long l46184;
+    public long l46185;
+    public long l46186;
+    public long l46187;
+    public long l46188;
+    public long l46189;
+    public long l46190;
+    public long l46191;
+    public long l46192;
+    public long l46193;
+    public long l46194;
+    public long l46195;
+    public long l46196;
+    public long l46197;
+    public long l46198;
+    public long l46199;
+    public long l46200;
+    public long l46201;
+    public long l46202;
+    public long l46203;
+    public long l46204;
+    public long l46205;
+    public long l46206;
+    public long l46207;
+    public long l46208;
+    public long l46209;
+    public long l46210;
+    public long l46211;
+    public long l46212;
+    public long l46213;
+    public long l46214;
+    public long l46215;
+    public long l46216;
+    public long l46217;
+    public long l46218;
+    public long l46219;
+    public long l46220;
+    public long l46221;
+    public long l46222;
+    public long l46223;
+    public long l46224;
+    public long l46225;
+    public long l46226;
+    public long l46227;
+    public long l46228;
+    public long l46229;
+    public long l46230;
+    public long l46231;
+    public long l46232;
+    public long l46233;
+    public long l46234;
+    public long l46235;
+    public long l46236;
+    public long l46237;
+    public long l46238;
+    public long l46239;
+    public long l46240;
+    public long l46241;
+    public long l46242;
+    public long l46243;
+    public long l46244;
+    public long l46245;
+    public long l46246;
+    public long l46247;
+    public long l46248;
+    public long l46249;
+    public long l46250;
+    public long l46251;
+    public long l46252;
+    public long l46253;
+    public long l46254;
+    public long l46255;
+    public long l46256;
+    public long l46257;
+    public long l46258;
+    public long l46259;
+    public long l46260;
+    public long l46261;
+    public long l46262;
+    public long l46263;
+    public long l46264;
+    public long l46265;
+    public long l46266;
+    public long l46267;
+    public long l46268;
+    public long l46269;
+    public long l46270;
+    public long l46271;
+    public long l46272;
+    public long l46273;
+    public long l46274;
+    public long l46275;
+    public long l46276;
+    public long l46277;
+    public long l46278;
+    public long l46279;
+    public long l46280;
+    public long l46281;
+    public long l46282;
+    public long l46283;
+    public long l46284;
+    public long l46285;
+    public long l46286;
+    public long l46287;
+    public long l46288;
+    public long l46289;
+    public long l46290;
+    public long l46291;
+    public long l46292;
+    public long l46293;
+    public long l46294;
+    public long l46295;
+    public long l46296;
+    public long l46297;
+    public long l46298;
+    public long l46299;
+    public long l46300;
+    public long l46301;
+    public long l46302;
+    public long l46303;
+    public long l46304;
+    public long l46305;
+    public long l46306;
+    public long l46307;
+    public long l46308;
+    public long l46309;
+    public long l46310;
+    public long l46311;
+    public long l46312;
+    public long l46313;
+    public long l46314;
+    public long l46315;
+    public long l46316;
+    public long l46317;
+    public long l46318;
+    public long l46319;
+    public long l46320;
+    public long l46321;
+    public long l46322;
+    public long l46323;
+    public long l46324;
+    public long l46325;
+    public long l46326;
+    public long l46327;
+    public long l46328;
+    public long l46329;
+    public long l46330;
+    public long l46331;
+    public long l46332;
+    public long l46333;
+    public long l46334;
+    public long l46335;
+    public long l46336;
+    public long l46337;
+    public long l46338;
+    public long l46339;
+    public long l46340;
+    public long l46341;
+    public long l46342;
+    public long l46343;
+    public long l46344;
+    public long l46345;
+    public long l46346;
+    public long l46347;
+    public long l46348;
+    public long l46349;
+    public long l46350;
+    public long l46351;
+    public long l46352;
+    public long l46353;
+    public long l46354;
+    public long l46355;
+    public long l46356;
+    public long l46357;
+    public long l46358;
+    public long l46359;
+    public long l46360;
+    public long l46361;
+    public long l46362;
+    public long l46363;
+    public long l46364;
+    public long l46365;
+    public long l46366;
+    public long l46367;
+    public long l46368;
+    public long l46369;
+    public long l46370;
+    public long l46371;
+    public long l46372;
+    public long l46373;
+    public long l46374;
+    public long l46375;
+    public long l46376;
+    public long l46377;
+    public long l46378;
+    public long l46379;
+    public long l46380;
+    public long l46381;
+    public long l46382;
+    public long l46383;
+    public long l46384;
+    public long l46385;
+    public long l46386;
+    public long l46387;
+    public long l46388;
+    public long l46389;
+    public long l46390;
+    public long l46391;
+    public long l46392;
+    public long l46393;
+    public long l46394;
+    public long l46395;
+    public long l46396;
+    public long l46397;
+    public long l46398;
+    public long l46399;
+    public long l46400;
+    public long l46401;
+    public long l46402;
+    public long l46403;
+    public long l46404;
+    public long l46405;
+    public long l46406;
+    public long l46407;
+    public long l46408;
+    public long l46409;
+    public long l46410;
+    public long l46411;
+    public long l46412;
+    public long l46413;
+    public long l46414;
+    public long l46415;
+    public long l46416;
+    public long l46417;
+    public long l46418;
+    public long l46419;
+    public long l46420;
+    public long l46421;
+    public long l46422;
+    public long l46423;
+    public long l46424;
+    public long l46425;
+    public long l46426;
+    public long l46427;
+    public long l46428;
+    public long l46429;
+    public long l46430;
+    public long l46431;
+    public long l46432;
+    public long l46433;
+    public long l46434;
+    public long l46435;
+    public long l46436;
+    public long l46437;
+    public long l46438;
+    public long l46439;
+    public long l46440;
+    public long l46441;
+    public long l46442;
+    public long l46443;
+    public long l46444;
+    public long l46445;
+    public long l46446;
+    public long l46447;
+    public long l46448;
+    public long l46449;
+    public long l46450;
+    public long l46451;
+    public long l46452;
+    public long l46453;
+    public long l46454;
+    public long l46455;
+    public long l46456;
+    public long l46457;
+    public long l46458;
+    public long l46459;
+    public long l46460;
+    public long l46461;
+    public long l46462;
+    public long l46463;
+    public long l46464;
+    public long l46465;
+    public long l46466;
+    public long l46467;
+    public long l46468;
+    public long l46469;
+    public long l46470;
+    public long l46471;
+    public long l46472;
+    public long l46473;
+    public long l46474;
+    public long l46475;
+    public long l46476;
+    public long l46477;
+    public long l46478;
+    public long l46479;
+    public long l46480;
+    public long l46481;
+    public long l46482;
+    public long l46483;
+    public long l46484;
+    public long l46485;
+    public long l46486;
+    public long l46487;
+    public long l46488;
+    public long l46489;
+    public long l46490;
+    public long l46491;
+    public long l46492;
+    public long l46493;
+    public long l46494;
+    public long l46495;
+    public long l46496;
+    public long l46497;
+    public long l46498;
+    public long l46499;
+    public long l46500;
+    public long l46501;
+    public long l46502;
+    public long l46503;
+    public long l46504;
+    public long l46505;
+    public long l46506;
+    public long l46507;
+    public long l46508;
+    public long l46509;
+    public long l46510;
+    public long l46511;
+    public long l46512;
+    public long l46513;
+    public long l46514;
+    public long l46515;
+    public long l46516;
+    public long l46517;
+    public long l46518;
+    public long l46519;
+    public long l46520;
+    public long l46521;
+    public long l46522;
+    public long l46523;
+    public long l46524;
+    public long l46525;
+    public long l46526;
+    public long l46527;
+    public long l46528;
+    public long l46529;
+    public long l46530;
+    public long l46531;
+    public long l46532;
+    public long l46533;
+    public long l46534;
+    public long l46535;
+    public long l46536;
+    public long l46537;
+    public long l46538;
+    public long l46539;
+    public long l46540;
+    public long l46541;
+    public long l46542;
+    public long l46543;
+    public long l46544;
+    public long l46545;
+    public long l46546;
+    public long l46547;
+    public long l46548;
+    public long l46549;
+    public long l46550;
+    public long l46551;
+    public long l46552;
+    public long l46553;
+    public long l46554;
+    public long l46555;
+    public long l46556;
+    public long l46557;
+    public long l46558;
+    public long l46559;
+    public long l46560;
+    public long l46561;
+    public long l46562;
+    public long l46563;
+    public long l46564;
+    public long l46565;
+    public long l46566;
+    public long l46567;
+    public long l46568;
+    public long l46569;
+    public long l46570;
+    public long l46571;
+    public long l46572;
+    public long l46573;
+    public long l46574;
+    public long l46575;
+    public long l46576;
+    public long l46577;
+    public long l46578;
+    public long l46579;
+    public long l46580;
+    public long l46581;
+    public long l46582;
+    public long l46583;
+    public long l46584;
+    public long l46585;
+    public long l46586;
+    public long l46587;
+    public long l46588;
+    public long l46589;
+    public long l46590;
+    public long l46591;
+    public long l46592;
+    public long l46593;
+    public long l46594;
+    public long l46595;
+    public long l46596;
+    public long l46597;
+    public long l46598;
+    public long l46599;
+    public long l46600;
+    public long l46601;
+    public long l46602;
+    public long l46603;
+    public long l46604;
+    public long l46605;
+    public long l46606;
+    public long l46607;
+    public long l46608;
+    public long l46609;
+    public long l46610;
+    public long l46611;
+    public long l46612;
+    public long l46613;
+    public long l46614;
+    public long l46615;
+    public long l46616;
+    public long l46617;
+    public long l46618;
+    public long l46619;
+    public long l46620;
+    public long l46621;
+    public long l46622;
+    public long l46623;
+    public long l46624;
+    public long l46625;
+    public long l46626;
+    public long l46627;
+    public long l46628;
+    public long l46629;
+    public long l46630;
+    public long l46631;
+    public long l46632;
+    public long l46633;
+    public long l46634;
+    public long l46635;
+    public long l46636;
+    public long l46637;
+    public long l46638;
+    public long l46639;
+    public long l46640;
+    public long l46641;
+    public long l46642;
+    public long l46643;
+    public long l46644;
+    public long l46645;
+    public long l46646;
+    public long l46647;
+    public long l46648;
+    public long l46649;
+    public long l46650;
+    public long l46651;
+    public long l46652;
+    public long l46653;
+    public long l46654;
+    public long l46655;
+    public long l46656;
+    public long l46657;
+    public long l46658;
+    public long l46659;
+    public long l46660;
+    public long l46661;
+    public long l46662;
+    public long l46663;
+    public long l46664;
+    public long l46665;
+    public long l46666;
+    public long l46667;
+    public long l46668;
+    public long l46669;
+    public long l46670;
+    public long l46671;
+    public long l46672;
+    public long l46673;
+    public long l46674;
+    public long l46675;
+    public long l46676;
+    public long l46677;
+    public long l46678;
+    public long l46679;
+    public long l46680;
+    public long l46681;
+    public long l46682;
+    public long l46683;
+    public long l46684;
+    public long l46685;
+    public long l46686;
+    public long l46687;
+    public long l46688;
+    public long l46689;
+    public long l46690;
+    public long l46691;
+    public long l46692;
+    public long l46693;
+    public long l46694;
+    public long l46695;
+    public long l46696;
+    public long l46697;
+    public long l46698;
+    public long l46699;
+    public long l46700;
+    public long l46701;
+    public long l46702;
+    public long l46703;
+    public long l46704;
+    public long l46705;
+    public long l46706;
+    public long l46707;
+    public long l46708;
+    public long l46709;
+    public long l46710;
+    public long l46711;
+    public long l46712;
+    public long l46713;
+    public long l46714;
+    public long l46715;
+    public long l46716;
+    public long l46717;
+    public long l46718;
+    public long l46719;
+    public long l46720;
+    public long l46721;
+    public long l46722;
+    public long l46723;
+    public long l46724;
+    public long l46725;
+    public long l46726;
+    public long l46727;
+    public long l46728;
+    public long l46729;
+    public long l46730;
+    public long l46731;
+    public long l46732;
+    public long l46733;
+    public long l46734;
+    public long l46735;
+    public long l46736;
+    public long l46737;
+    public long l46738;
+    public long l46739;
+    public long l46740;
+    public long l46741;
+    public long l46742;
+    public long l46743;
+    public long l46744;
+    public long l46745;
+    public long l46746;
+    public long l46747;
+    public long l46748;
+    public long l46749;
+    public long l46750;
+    public long l46751;
+    public long l46752;
+    public long l46753;
+    public long l46754;
+    public long l46755;
+    public long l46756;
+    public long l46757;
+    public long l46758;
+    public long l46759;
+    public long l46760;
+    public long l46761;
+    public long l46762;
+    public long l46763;
+    public long l46764;
+    public long l46765;
+    public long l46766;
+    public long l46767;
+    public long l46768;
+    public long l46769;
+    public long l46770;
+    public long l46771;
+    public long l46772;
+    public long l46773;
+    public long l46774;
+    public long l46775;
+    public long l46776;
+    public long l46777;
+    public long l46778;
+    public long l46779;
+    public long l46780;
+    public long l46781;
+    public long l46782;
+    public long l46783;
+    public long l46784;
+    public long l46785;
+    public long l46786;
+    public long l46787;
+    public long l46788;
+    public long l46789;
+    public long l46790;
+    public long l46791;
+    public long l46792;
+    public long l46793;
+    public long l46794;
+    public long l46795;
+    public long l46796;
+    public long l46797;
+    public long l46798;
+    public long l46799;
+    public long l46800;
+    public long l46801;
+    public long l46802;
+    public long l46803;
+    public long l46804;
+    public long l46805;
+    public long l46806;
+    public long l46807;
+    public long l46808;
+    public long l46809;
+    public long l46810;
+    public long l46811;
+    public long l46812;
+    public long l46813;
+    public long l46814;
+    public long l46815;
+    public long l46816;
+    public long l46817;
+    public long l46818;
+    public long l46819;
+    public long l46820;
+    public long l46821;
+    public long l46822;
+    public long l46823;
+    public long l46824;
+    public long l46825;
+    public long l46826;
+    public long l46827;
+    public long l46828;
+    public long l46829;
+    public long l46830;
+    public long l46831;
+    public long l46832;
+    public long l46833;
+    public long l46834;
+    public long l46835;
+    public long l46836;
+    public long l46837;
+    public long l46838;
+    public long l46839;
+    public long l46840;
+    public long l46841;
+    public long l46842;
+    public long l46843;
+    public long l46844;
+    public long l46845;
+    public long l46846;
+    public long l46847;
+    public long l46848;
+    public long l46849;
+    public long l46850;
+    public long l46851;
+    public long l46852;
+    public long l46853;
+    public long l46854;
+    public long l46855;
+    public long l46856;
+    public long l46857;
+    public long l46858;
+    public long l46859;
+    public long l46860;
+    public long l46861;
+    public long l46862;
+    public long l46863;
+    public long l46864;
+    public long l46865;
+    public long l46866;
+    public long l46867;
+    public long l46868;
+    public long l46869;
+    public long l46870;
+    public long l46871;
+    public long l46872;
+    public long l46873;
+    public long l46874;
+    public long l46875;
+    public long l46876;
+    public long l46877;
+    public long l46878;
+    public long l46879;
+    public long l46880;
+    public long l46881;
+    public long l46882;
+    public long l46883;
+    public long l46884;
+    public long l46885;
+    public long l46886;
+    public long l46887;
+    public long l46888;
+    public long l46889;
+    public long l46890;
+    public long l46891;
+    public long l46892;
+    public long l46893;
+    public long l46894;
+    public long l46895;
+    public long l46896;
+    public long l46897;
+    public long l46898;
+    public long l46899;
+    public long l46900;
+    public long l46901;
+    public long l46902;
+    public long l46903;
+    public long l46904;
+    public long l46905;
+    public long l46906;
+    public long l46907;
+    public long l46908;
+    public long l46909;
+    public long l46910;
+    public long l46911;
+    public long l46912;
+    public long l46913;
+    public long l46914;
+    public long l46915;
+    public long l46916;
+    public long l46917;
+    public long l46918;
+    public long l46919;
+    public long l46920;
+    public long l46921;
+    public long l46922;
+    public long l46923;
+    public long l46924;
+    public long l46925;
+    public long l46926;
+    public long l46927;
+    public long l46928;
+    public long l46929;
+    public long l46930;
+    public long l46931;
+    public long l46932;
+    public long l46933;
+    public long l46934;
+    public long l46935;
+    public long l46936;
+    public long l46937;
+    public long l46938;
+    public long l46939;
+    public long l46940;
+    public long l46941;
+    public long l46942;
+    public long l46943;
+    public long l46944;
+    public long l46945;
+    public long l46946;
+    public long l46947;
+    public long l46948;
+    public long l46949;
+    public long l46950;
+    public long l46951;
+    public long l46952;
+    public long l46953;
+    public long l46954;
+    public long l46955;
+    public long l46956;
+    public long l46957;
+    public long l46958;
+    public long l46959;
+    public long l46960;
+    public long l46961;
+    public long l46962;
+    public long l46963;
+    public long l46964;
+    public long l46965;
+    public long l46966;
+    public long l46967;
+    public long l46968;
+    public long l46969;
+    public long l46970;
+    public long l46971;
+    public long l46972;
+    public long l46973;
+    public long l46974;
+    public long l46975;
+    public long l46976;
+    public long l46977;
+    public long l46978;
+    public long l46979;
+    public long l46980;
+    public long l46981;
+    public long l46982;
+    public long l46983;
+    public long l46984;
+    public long l46985;
+    public long l46986;
+    public long l46987;
+    public long l46988;
+    public long l46989;
+    public long l46990;
+    public long l46991;
+    public long l46992;
+    public long l46993;
+    public long l46994;
+    public long l46995;
+    public long l46996;
+    public long l46997;
+    public long l46998;
+    public long l46999;
+    public long l47000;
+    public long l47001;
+    public long l47002;
+    public long l47003;
+    public long l47004;
+    public long l47005;
+    public long l47006;
+    public long l47007;
+    public long l47008;
+    public long l47009;
+    public long l47010;
+    public long l47011;
+    public long l47012;
+    public long l47013;
+    public long l47014;
+    public long l47015;
+    public long l47016;
+    public long l47017;
+    public long l47018;
+    public long l47019;
+    public long l47020;
+    public long l47021;
+    public long l47022;
+    public long l47023;
+    public long l47024;
+    public long l47025;
+    public long l47026;
+    public long l47027;
+    public long l47028;
+    public long l47029;
+    public long l47030;
+    public long l47031;
+    public long l47032;
+    public long l47033;
+    public long l47034;
+    public long l47035;
+    public long l47036;
+    public long l47037;
+    public long l47038;
+    public long l47039;
+    public long l47040;
+    public long l47041;
+    public long l47042;
+    public long l47043;
+    public long l47044;
+    public long l47045;
+    public long l47046;
+    public long l47047;
+    public long l47048;
+    public long l47049;
+    public long l47050;
+    public long l47051;
+    public long l47052;
+    public long l47053;
+    public long l47054;
+    public long l47055;
+    public long l47056;
+    public long l47057;
+    public long l47058;
+    public long l47059;
+    public long l47060;
+    public long l47061;
+    public long l47062;
+    public long l47063;
+    public long l47064;
+    public long l47065;
+    public long l47066;
+    public long l47067;
+    public long l47068;
+    public long l47069;
+    public long l47070;
+    public long l47071;
+    public long l47072;
+    public long l47073;
+    public long l47074;
+    public long l47075;
+    public long l47076;
+    public long l47077;
+    public long l47078;
+    public long l47079;
+    public long l47080;
+    public long l47081;
+    public long l47082;
+    public long l47083;
+    public long l47084;
+    public long l47085;
+    public long l47086;
+    public long l47087;
+    public long l47088;
+    public long l47089;
+    public long l47090;
+    public long l47091;
+    public long l47092;
+    public long l47093;
+    public long l47094;
+    public long l47095;
+    public long l47096;
+    public long l47097;
+    public long l47098;
+    public long l47099;
+    public long l47100;
+    public long l47101;
+    public long l47102;
+    public long l47103;
+    public long l47104;
+    public long l47105;
+    public long l47106;
+    public long l47107;
+    public long l47108;
+    public long l47109;
+    public long l47110;
+    public long l47111;
+    public long l47112;
+    public long l47113;
+    public long l47114;
+    public long l47115;
+    public long l47116;
+    public long l47117;
+    public long l47118;
+    public long l47119;
+    public long l47120;
+    public long l47121;
+    public long l47122;
+    public long l47123;
+    public long l47124;
+    public long l47125;
+    public long l47126;
+    public long l47127;
+    public long l47128;
+    public long l47129;
+    public long l47130;
+    public long l47131;
+    public long l47132;
+    public long l47133;
+    public long l47134;
+    public long l47135;
+    public long l47136;
+    public long l47137;
+    public long l47138;
+    public long l47139;
+    public long l47140;
+    public long l47141;
+    public long l47142;
+    public long l47143;
+    public long l47144;
+    public long l47145;
+    public long l47146;
+    public long l47147;
+    public long l47148;
+    public long l47149;
+    public long l47150;
+    public long l47151;
+    public long l47152;
+    public long l47153;
+    public long l47154;
+    public long l47155;
+    public long l47156;
+    public long l47157;
+    public long l47158;
+    public long l47159;
+    public long l47160;
+    public long l47161;
+    public long l47162;
+    public long l47163;
+    public long l47164;
+    public long l47165;
+    public long l47166;
+    public long l47167;
+    public long l47168;
+    public long l47169;
+    public long l47170;
+    public long l47171;
+    public long l47172;
+    public long l47173;
+    public long l47174;
+    public long l47175;
+    public long l47176;
+    public long l47177;
+    public long l47178;
+    public long l47179;
+    public long l47180;
+    public long l47181;
+    public long l47182;
+    public long l47183;
+    public long l47184;
+    public long l47185;
+    public long l47186;
+    public long l47187;
+    public long l47188;
+    public long l47189;
+    public long l47190;
+    public long l47191;
+    public long l47192;
+    public long l47193;
+    public long l47194;
+    public long l47195;
+    public long l47196;
+    public long l47197;
+    public long l47198;
+    public long l47199;
+    public long l47200;
+    public long l47201;
+    public long l47202;
+    public long l47203;
+    public long l47204;
+    public long l47205;
+    public long l47206;
+    public long l47207;
+    public long l47208;
+    public long l47209;
+    public long l47210;
+    public long l47211;
+    public long l47212;
+    public long l47213;
+    public long l47214;
+    public long l47215;
+    public long l47216;
+    public long l47217;
+    public long l47218;
+    public long l47219;
+    public long l47220;
+    public long l47221;
+    public long l47222;
+    public long l47223;
+    public long l47224;
+    public long l47225;
+    public long l47226;
+    public long l47227;
+    public long l47228;
+    public long l47229;
+    public long l47230;
+    public long l47231;
+    public long l47232;
+    public long l47233;
+    public long l47234;
+    public long l47235;
+    public long l47236;
+    public long l47237;
+    public long l47238;
+    public long l47239;
+    public long l47240;
+    public long l47241;
+    public long l47242;
+    public long l47243;
+    public long l47244;
+    public long l47245;
+    public long l47246;
+    public long l47247;
+    public long l47248;
+    public long l47249;
+    public long l47250;
+    public long l47251;
+    public long l47252;
+    public long l47253;
+    public long l47254;
+    public long l47255;
+    public long l47256;
+    public long l47257;
+    public long l47258;
+    public long l47259;
+    public long l47260;
+    public long l47261;
+    public long l47262;
+    public long l47263;
+    public long l47264;
+    public long l47265;
+    public long l47266;
+    public long l47267;
+    public long l47268;
+    public long l47269;
+    public long l47270;
+    public long l47271;
+    public long l47272;
+    public long l47273;
+    public long l47274;
+    public long l47275;
+    public long l47276;
+    public long l47277;
+    public long l47278;
+    public long l47279;
+    public long l47280;
+    public long l47281;
+    public long l47282;
+    public long l47283;
+    public long l47284;
+    public long l47285;
+    public long l47286;
+    public long l47287;
+    public long l47288;
+    public long l47289;
+    public long l47290;
+    public long l47291;
+    public long l47292;
+    public long l47293;
+    public long l47294;
+    public long l47295;
+    public long l47296;
+    public long l47297;
+    public long l47298;
+    public long l47299;
+    public long l47300;
+    public long l47301;
+    public long l47302;
+    public long l47303;
+    public long l47304;
+    public long l47305;
+    public long l47306;
+    public long l47307;
+    public long l47308;
+    public long l47309;
+    public long l47310;
+    public long l47311;
+    public long l47312;
+    public long l47313;
+    public long l47314;
+    public long l47315;
+    public long l47316;
+    public long l47317;
+    public long l47318;
+    public long l47319;
+    public long l47320;
+    public long l47321;
+    public long l47322;
+    public long l47323;
+    public long l47324;
+    public long l47325;
+    public long l47326;
+    public long l47327;
+    public long l47328;
+    public long l47329;
+    public long l47330;
+    public long l47331;
+    public long l47332;
+    public long l47333;
+    public long l47334;
+    public long l47335;
+    public long l47336;
+    public long l47337;
+    public long l47338;
+    public long l47339;
+    public long l47340;
+    public long l47341;
+    public long l47342;
+    public long l47343;
+    public long l47344;
+    public long l47345;
+    public long l47346;
+    public long l47347;
+    public long l47348;
+    public long l47349;
+    public long l47350;
+    public long l47351;
+    public long l47352;
+    public long l47353;
+    public long l47354;
+    public long l47355;
+    public long l47356;
+    public long l47357;
+    public long l47358;
+    public long l47359;
+    public long l47360;
+    public long l47361;
+    public long l47362;
+    public long l47363;
+    public long l47364;
+    public long l47365;
+    public long l47366;
+    public long l47367;
+    public long l47368;
+    public long l47369;
+    public long l47370;
+    public long l47371;
+    public long l47372;
+    public long l47373;
+    public long l47374;
+    public long l47375;
+    public long l47376;
+    public long l47377;
+    public long l47378;
+    public long l47379;
+    public long l47380;
+    public long l47381;
+    public long l47382;
+    public long l47383;
+    public long l47384;
+    public long l47385;
+    public long l47386;
+    public long l47387;
+    public long l47388;
+    public long l47389;
+    public long l47390;
+    public long l47391;
+    public long l47392;
+    public long l47393;
+    public long l47394;
+    public long l47395;
+    public long l47396;
+    public long l47397;
+    public long l47398;
+    public long l47399;
+    public long l47400;
+    public long l47401;
+    public long l47402;
+    public long l47403;
+    public long l47404;
+    public long l47405;
+    public long l47406;
+    public long l47407;
+    public long l47408;
+    public long l47409;
+    public long l47410;
+    public long l47411;
+    public long l47412;
+    public long l47413;
+    public long l47414;
+    public long l47415;
+    public long l47416;
+    public long l47417;
+    public long l47418;
+    public long l47419;
+    public long l47420;
+    public long l47421;
+    public long l47422;
+    public long l47423;
+    public long l47424;
+    public long l47425;
+    public long l47426;
+    public long l47427;
+    public long l47428;
+    public long l47429;
+    public long l47430;
+    public long l47431;
+    public long l47432;
+    public long l47433;
+    public long l47434;
+    public long l47435;
+    public long l47436;
+    public long l47437;
+    public long l47438;
+    public long l47439;
+    public long l47440;
+    public long l47441;
+    public long l47442;
+    public long l47443;
+    public long l47444;
+    public long l47445;
+    public long l47446;
+    public long l47447;
+    public long l47448;
+    public long l47449;
+    public long l47450;
+    public long l47451;
+    public long l47452;
+    public long l47453;
+    public long l47454;
+    public long l47455;
+    public long l47456;
+    public long l47457;
+    public long l47458;
+    public long l47459;
+    public long l47460;
+    public long l47461;
+    public long l47462;
+    public long l47463;
+    public long l47464;
+    public long l47465;
+    public long l47466;
+    public long l47467;
+    public long l47468;
+    public long l47469;
+    public long l47470;
+    public long l47471;
+    public long l47472;
+    public long l47473;
+    public long l47474;
+    public long l47475;
+    public long l47476;
+    public long l47477;
+    public long l47478;
+    public long l47479;
+    public long l47480;
+    public long l47481;
+    public long l47482;
+    public long l47483;
+    public long l47484;
+    public long l47485;
+    public long l47486;
+    public long l47487;
+    public long l47488;
+    public long l47489;
+    public long l47490;
+    public long l47491;
+    public long l47492;
+    public long l47493;
+    public long l47494;
+    public long l47495;
+    public long l47496;
+    public long l47497;
+    public long l47498;
+    public long l47499;
+    public long l47500;
+    public long l47501;
+    public long l47502;
+    public long l47503;
+    public long l47504;
+    public long l47505;
+    public long l47506;
+    public long l47507;
+    public long l47508;
+    public long l47509;
+    public long l47510;
+    public long l47511;
+    public long l47512;
+    public long l47513;
+    public long l47514;
+    public long l47515;
+    public long l47516;
+    public long l47517;
+    public long l47518;
+    public long l47519;
+    public long l47520;
+    public long l47521;
+    public long l47522;
+    public long l47523;
+    public long l47524;
+    public long l47525;
+    public long l47526;
+    public long l47527;
+    public long l47528;
+    public long l47529;
+    public long l47530;
+    public long l47531;
+    public long l47532;
+    public long l47533;
+    public long l47534;
+    public long l47535;
+    public long l47536;
+    public long l47537;
+    public long l47538;
+    public long l47539;
+    public long l47540;
+    public long l47541;
+    public long l47542;
+    public long l47543;
+    public long l47544;
+    public long l47545;
+    public long l47546;
+    public long l47547;
+    public long l47548;
+    public long l47549;
+    public long l47550;
+    public long l47551;
+    public long l47552;
+    public long l47553;
+    public long l47554;
+    public long l47555;
+    public long l47556;
+    public long l47557;
+    public long l47558;
+    public long l47559;
+    public long l47560;
+    public long l47561;
+    public long l47562;
+    public long l47563;
+    public long l47564;
+    public long l47565;
+    public long l47566;
+    public long l47567;
+    public long l47568;
+    public long l47569;
+    public long l47570;
+    public long l47571;
+    public long l47572;
+    public long l47573;
+    public long l47574;
+    public long l47575;
+    public long l47576;
+    public long l47577;
+    public long l47578;
+    public long l47579;
+    public long l47580;
+    public long l47581;
+    public long l47582;
+    public long l47583;
+    public long l47584;
+    public long l47585;
+    public long l47586;
+    public long l47587;
+    public long l47588;
+    public long l47589;
+    public long l47590;
+    public long l47591;
+    public long l47592;
+    public long l47593;
+    public long l47594;
+    public long l47595;
+    public long l47596;
+    public long l47597;
+    public long l47598;
+    public long l47599;
+    public long l47600;
+    public long l47601;
+    public long l47602;
+    public long l47603;
+    public long l47604;
+    public long l47605;
+    public long l47606;
+    public long l47607;
+    public long l47608;
+    public long l47609;
+    public long l47610;
+    public long l47611;
+    public long l47612;
+    public long l47613;
+    public long l47614;
+    public long l47615;
+    public long l47616;
+    public long l47617;
+    public long l47618;
+    public long l47619;
+    public long l47620;
+    public long l47621;
+    public long l47622;
+    public long l47623;
+    public long l47624;
+    public long l47625;
+    public long l47626;
+    public long l47627;
+    public long l47628;
+    public long l47629;
+    public long l47630;
+    public long l47631;
+    public long l47632;
+    public long l47633;
+    public long l47634;
+    public long l47635;
+    public long l47636;
+    public long l47637;
+    public long l47638;
+    public long l47639;
+    public long l47640;
+    public long l47641;
+    public long l47642;
+    public long l47643;
+    public long l47644;
+    public long l47645;
+    public long l47646;
+    public long l47647;
+    public long l47648;
+    public long l47649;
+    public long l47650;
+    public long l47651;
+    public long l47652;
+    public long l47653;
+    public long l47654;
+    public long l47655;
+    public long l47656;
+    public long l47657;
+    public long l47658;
+    public long l47659;
+    public long l47660;
+    public long l47661;
+    public long l47662;
+    public long l47663;
+    public long l47664;
+    public long l47665;
+    public long l47666;
+    public long l47667;
+    public long l47668;
+    public long l47669;
+    public long l47670;
+    public long l47671;
+    public long l47672;
+    public long l47673;
+    public long l47674;
+    public long l47675;
+    public long l47676;
+    public long l47677;
+    public long l47678;
+    public long l47679;
+    public long l47680;
+    public long l47681;
+    public long l47682;
+    public long l47683;
+    public long l47684;
+    public long l47685;
+    public long l47686;
+    public long l47687;
+    public long l47688;
+    public long l47689;
+    public long l47690;
+    public long l47691;
+    public long l47692;
+    public long l47693;
+    public long l47694;
+    public long l47695;
+    public long l47696;
+    public long l47697;
+    public long l47698;
+    public long l47699;
+    public long l47700;
+    public long l47701;
+    public long l47702;
+    public long l47703;
+    public long l47704;
+    public long l47705;
+    public long l47706;
+    public long l47707;
+    public long l47708;
+    public long l47709;
+    public long l47710;
+    public long l47711;
+    public long l47712;
+    public long l47713;
+    public long l47714;
+    public long l47715;
+    public long l47716;
+    public long l47717;
+    public long l47718;
+    public long l47719;
+    public long l47720;
+    public long l47721;
+    public long l47722;
+    public long l47723;
+    public long l47724;
+    public long l47725;
+    public long l47726;
+    public long l47727;
+    public long l47728;
+    public long l47729;
+    public long l47730;
+    public long l47731;
+    public long l47732;
+    public long l47733;
+    public long l47734;
+    public long l47735;
+    public long l47736;
+    public long l47737;
+    public long l47738;
+    public long l47739;
+    public long l47740;
+    public long l47741;
+    public long l47742;
+    public long l47743;
+    public long l47744;
+    public long l47745;
+    public long l47746;
+    public long l47747;
+    public long l47748;
+    public long l47749;
+    public long l47750;
+    public long l47751;
+    public long l47752;
+    public long l47753;
+    public long l47754;
+    public long l47755;
+    public long l47756;
+    public long l47757;
+    public long l47758;
+    public long l47759;
+    public long l47760;
+    public long l47761;
+    public long l47762;
+    public long l47763;
+    public long l47764;
+    public long l47765;
+    public long l47766;
+    public long l47767;
+    public long l47768;
+    public long l47769;
+    public long l47770;
+    public long l47771;
+    public long l47772;
+    public long l47773;
+    public long l47774;
+    public long l47775;
+    public long l47776;
+    public long l47777;
+    public long l47778;
+    public long l47779;
+    public long l47780;
+    public long l47781;
+    public long l47782;
+    public long l47783;
+    public long l47784;
+    public long l47785;
+    public long l47786;
+    public long l47787;
+    public long l47788;
+    public long l47789;
+    public long l47790;
+    public long l47791;
+    public long l47792;
+    public long l47793;
+    public long l47794;
+    public long l47795;
+    public long l47796;
+    public long l47797;
+    public long l47798;
+    public long l47799;
+    public long l47800;
+    public long l47801;
+    public long l47802;
+    public long l47803;
+    public long l47804;
+    public long l47805;
+    public long l47806;
+    public long l47807;
+    public long l47808;
+    public long l47809;
+    public long l47810;
+    public long l47811;
+    public long l47812;
+    public long l47813;
+    public long l47814;
+    public long l47815;
+    public long l47816;
+    public long l47817;
+    public long l47818;
+    public long l47819;
+    public long l47820;
+    public long l47821;
+    public long l47822;
+    public long l47823;
+    public long l47824;
+    public long l47825;
+    public long l47826;
+    public long l47827;
+    public long l47828;
+    public long l47829;
+    public long l47830;
+    public long l47831;
+    public long l47832;
+    public long l47833;
+    public long l47834;
+    public long l47835;
+    public long l47836;
+    public long l47837;
+    public long l47838;
+    public long l47839;
+    public long l47840;
+    public long l47841;
+    public long l47842;
+    public long l47843;
+    public long l47844;
+    public long l47845;
+    public long l47846;
+    public long l47847;
+    public long l47848;
+    public long l47849;
+    public long l47850;
+    public long l47851;
+    public long l47852;
+    public long l47853;
+    public long l47854;
+    public long l47855;
+    public long l47856;
+    public long l47857;
+    public long l47858;
+    public long l47859;
+    public long l47860;
+    public long l47861;
+    public long l47862;
+    public long l47863;
+    public long l47864;
+    public long l47865;
+    public long l47866;
+    public long l47867;
+    public long l47868;
+    public long l47869;
+    public long l47870;
+    public long l47871;
+    public long l47872;
+    public long l47873;
+    public long l47874;
+    public long l47875;
+    public long l47876;
+    public long l47877;
+    public long l47878;
+    public long l47879;
+    public long l47880;
+    public long l47881;
+    public long l47882;
+    public long l47883;
+    public long l47884;
+    public long l47885;
+    public long l47886;
+    public long l47887;
+    public long l47888;
+    public long l47889;
+    public long l47890;
+    public long l47891;
+    public long l47892;
+    public long l47893;
+    public long l47894;
+    public long l47895;
+    public long l47896;
+    public long l47897;
+    public long l47898;
+    public long l47899;
+    public long l47900;
+    public long l47901;
+    public long l47902;
+    public long l47903;
+    public long l47904;
+    public long l47905;
+    public long l47906;
+    public long l47907;
+    public long l47908;
+    public long l47909;
+    public long l47910;
+    public long l47911;
+    public long l47912;
+    public long l47913;
+    public long l47914;
+    public long l47915;
+    public long l47916;
+    public long l47917;
+    public long l47918;
+    public long l47919;
+    public long l47920;
+    public long l47921;
+    public long l47922;
+    public long l47923;
+    public long l47924;
+    public long l47925;
+    public long l47926;
+    public long l47927;
+    public long l47928;
+    public long l47929;
+    public long l47930;
+    public long l47931;
+    public long l47932;
+    public long l47933;
+    public long l47934;
+    public long l47935;
+    public long l47936;
+    public long l47937;
+    public long l47938;
+    public long l47939;
+    public long l47940;
+    public long l47941;
+    public long l47942;
+    public long l47943;
+    public long l47944;
+    public long l47945;
+    public long l47946;
+    public long l47947;
+    public long l47948;
+    public long l47949;
+    public long l47950;
+    public long l47951;
+    public long l47952;
+    public long l47953;
+    public long l47954;
+    public long l47955;
+    public long l47956;
+    public long l47957;
+    public long l47958;
+    public long l47959;
+    public long l47960;
+    public long l47961;
+    public long l47962;
+    public long l47963;
+    public long l47964;
+    public long l47965;
+    public long l47966;
+    public long l47967;
+    public long l47968;
+    public long l47969;
+    public long l47970;
+    public long l47971;
+    public long l47972;
+    public long l47973;
+    public long l47974;
+    public long l47975;
+    public long l47976;
+    public long l47977;
+    public long l47978;
+    public long l47979;
+    public long l47980;
+    public long l47981;
+    public long l47982;
+    public long l47983;
+    public long l47984;
+    public long l47985;
+    public long l47986;
+    public long l47987;
+    public long l47988;
+    public long l47989;
+    public long l47990;
+    public long l47991;
+    public long l47992;
+    public long l47993;
+    public long l47994;
+    public long l47995;
+    public long l47996;
+    public long l47997;
+    public long l47998;
+    public long l47999;
+    public long l48000;
+    public long l48001;
+    public long l48002;
+    public long l48003;
+    public long l48004;
+    public long l48005;
+    public long l48006;
+    public long l48007;
+    public long l48008;
+    public long l48009;
+    public long l48010;
+    public long l48011;
+    public long l48012;
+    public long l48013;
+    public long l48014;
+    public long l48015;
+    public long l48016;
+    public long l48017;
+    public long l48018;
+    public long l48019;
+    public long l48020;
+    public long l48021;
+    public long l48022;
+    public long l48023;
+    public long l48024;
+    public long l48025;
+    public long l48026;
+    public long l48027;
+    public long l48028;
+    public long l48029;
+    public long l48030;
+    public long l48031;
+    public long l48032;
+    public long l48033;
+    public long l48034;
+    public long l48035;
+    public long l48036;
+    public long l48037;
+    public long l48038;
+    public long l48039;
+    public long l48040;
+    public long l48041;
+    public long l48042;
+    public long l48043;
+    public long l48044;
+    public long l48045;
+    public long l48046;
+    public long l48047;
+    public long l48048;
+    public long l48049;
+    public long l48050;
+    public long l48051;
+    public long l48052;
+    public long l48053;
+    public long l48054;
+    public long l48055;
+    public long l48056;
+    public long l48057;
+    public long l48058;
+    public long l48059;
+    public long l48060;
+    public long l48061;
+    public long l48062;
+    public long l48063;
+    public long l48064;
+    public long l48065;
+    public long l48066;
+    public long l48067;
+    public long l48068;
+    public long l48069;
+    public long l48070;
+    public long l48071;
+    public long l48072;
+    public long l48073;
+    public long l48074;
+    public long l48075;
+    public long l48076;
+    public long l48077;
+    public long l48078;
+    public long l48079;
+    public long l48080;
+    public long l48081;
+    public long l48082;
+    public long l48083;
+    public long l48084;
+    public long l48085;
+    public long l48086;
+    public long l48087;
+    public long l48088;
+    public long l48089;
+    public long l48090;
+    public long l48091;
+    public long l48092;
+    public long l48093;
+    public long l48094;
+    public long l48095;
+    public long l48096;
+    public long l48097;
+    public long l48098;
+    public long l48099;
+    public long l48100;
+    public long l48101;
+    public long l48102;
+    public long l48103;
+    public long l48104;
+    public long l48105;
+    public long l48106;
+    public long l48107;
+    public long l48108;
+    public long l48109;
+    public long l48110;
+    public long l48111;
+    public long l48112;
+    public long l48113;
+    public long l48114;
+    public long l48115;
+    public long l48116;
+    public long l48117;
+    public long l48118;
+    public long l48119;
+    public long l48120;
+    public long l48121;
+    public long l48122;
+    public long l48123;
+    public long l48124;
+    public long l48125;
+    public long l48126;
+    public long l48127;
+    public long l48128;
+    public long l48129;
+    public long l48130;
+    public long l48131;
+    public long l48132;
+    public long l48133;
+    public long l48134;
+    public long l48135;
+    public long l48136;
+    public long l48137;
+    public long l48138;
+    public long l48139;
+    public long l48140;
+    public long l48141;
+    public long l48142;
+    public long l48143;
+    public long l48144;
+    public long l48145;
+    public long l48146;
+    public long l48147;
+    public long l48148;
+    public long l48149;
+    public long l48150;
+    public long l48151;
+    public long l48152;
+    public long l48153;
+    public long l48154;
+    public long l48155;
+    public long l48156;
+    public long l48157;
+    public long l48158;
+    public long l48159;
+    public long l48160;
+    public long l48161;
+    public long l48162;
+    public long l48163;
+    public long l48164;
+    public long l48165;
+    public long l48166;
+    public long l48167;
+    public long l48168;
+    public long l48169;
+    public long l48170;
+    public long l48171;
+    public long l48172;
+    public long l48173;
+    public long l48174;
+    public long l48175;
+    public long l48176;
+    public long l48177;
+    public long l48178;
+    public long l48179;
+    public long l48180;
+    public long l48181;
+    public long l48182;
+    public long l48183;
+    public long l48184;
+    public long l48185;
+    public long l48186;
+    public long l48187;
+    public long l48188;
+    public long l48189;
+    public long l48190;
+    public long l48191;
+    public long l48192;
+    public long l48193;
+    public long l48194;
+    public long l48195;
+    public long l48196;
+    public long l48197;
+    public long l48198;
+    public long l48199;
+    public long l48200;
+    public long l48201;
+    public long l48202;
+    public long l48203;
+    public long l48204;
+    public long l48205;
+    public long l48206;
+    public long l48207;
+    public long l48208;
+    public long l48209;
+    public long l48210;
+    public long l48211;
+    public long l48212;
+    public long l48213;
+    public long l48214;
+    public long l48215;
+    public long l48216;
+    public long l48217;
+    public long l48218;
+    public long l48219;
+    public long l48220;
+    public long l48221;
+    public long l48222;
+    public long l48223;
+    public long l48224;
+    public long l48225;
+    public long l48226;
+    public long l48227;
+    public long l48228;
+    public long l48229;
+    public long l48230;
+    public long l48231;
+    public long l48232;
+    public long l48233;
+    public long l48234;
+    public long l48235;
+    public long l48236;
+    public long l48237;
+    public long l48238;
+    public long l48239;
+    public long l48240;
+    public long l48241;
+    public long l48242;
+    public long l48243;
+    public long l48244;
+    public long l48245;
+    public long l48246;
+    public long l48247;
+    public long l48248;
+    public long l48249;
+    public long l48250;
+    public long l48251;
+    public long l48252;
+    public long l48253;
+    public long l48254;
+    public long l48255;
+    public long l48256;
+    public long l48257;
+    public long l48258;
+    public long l48259;
+    public long l48260;
+    public long l48261;
+    public long l48262;
+    public long l48263;
+    public long l48264;
+    public long l48265;
+    public long l48266;
+    public long l48267;
+    public long l48268;
+    public long l48269;
+    public long l48270;
+    public long l48271;
+    public long l48272;
+    public long l48273;
+    public long l48274;
+    public long l48275;
+    public long l48276;
+    public long l48277;
+    public long l48278;
+    public long l48279;
+    public long l48280;
+    public long l48281;
+    public long l48282;
+    public long l48283;
+    public long l48284;
+    public long l48285;
+    public long l48286;
+    public long l48287;
+    public long l48288;
+    public long l48289;
+    public long l48290;
+    public long l48291;
+    public long l48292;
+    public long l48293;
+    public long l48294;
+    public long l48295;
+    public long l48296;
+    public long l48297;
+    public long l48298;
+    public long l48299;
+    public long l48300;
+    public long l48301;
+    public long l48302;
+    public long l48303;
+    public long l48304;
+    public long l48305;
+    public long l48306;
+    public long l48307;
+    public long l48308;
+    public long l48309;
+    public long l48310;
+    public long l48311;
+    public long l48312;
+    public long l48313;
+    public long l48314;
+    public long l48315;
+    public long l48316;
+    public long l48317;
+    public long l48318;
+    public long l48319;
+    public long l48320;
+    public long l48321;
+    public long l48322;
+    public long l48323;
+    public long l48324;
+    public long l48325;
+    public long l48326;
+    public long l48327;
+    public long l48328;
+    public long l48329;
+    public long l48330;
+    public long l48331;
+    public long l48332;
+    public long l48333;
+    public long l48334;
+    public long l48335;
+    public long l48336;
+    public long l48337;
+    public long l48338;
+    public long l48339;
+    public long l48340;
+    public long l48341;
+    public long l48342;
+    public long l48343;
+    public long l48344;
+    public long l48345;
+    public long l48346;
+    public long l48347;
+    public long l48348;
+    public long l48349;
+    public long l48350;
+    public long l48351;
+    public long l48352;
+    public long l48353;
+    public long l48354;
+    public long l48355;
+    public long l48356;
+    public long l48357;
+    public long l48358;
+    public long l48359;
+    public long l48360;
+    public long l48361;
+    public long l48362;
+    public long l48363;
+    public long l48364;
+    public long l48365;
+    public long l48366;
+    public long l48367;
+    public long l48368;
+    public long l48369;
+    public long l48370;
+    public long l48371;
+    public long l48372;
+    public long l48373;
+    public long l48374;
+    public long l48375;
+    public long l48376;
+    public long l48377;
+    public long l48378;
+    public long l48379;
+    public long l48380;
+    public long l48381;
+    public long l48382;
+    public long l48383;
+    public long l48384;
+    public long l48385;
+    public long l48386;
+    public long l48387;
+    public long l48388;
+    public long l48389;
+    public long l48390;
+    public long l48391;
+    public long l48392;
+    public long l48393;
+    public long l48394;
+    public long l48395;
+    public long l48396;
+    public long l48397;
+    public long l48398;
+    public long l48399;
+    public long l48400;
+    public long l48401;
+    public long l48402;
+    public long l48403;
+    public long l48404;
+    public long l48405;
+    public long l48406;
+    public long l48407;
+    public long l48408;
+    public long l48409;
+    public long l48410;
+    public long l48411;
+    public long l48412;
+    public long l48413;
+    public long l48414;
+    public long l48415;
+    public long l48416;
+    public long l48417;
+    public long l48418;
+    public long l48419;
+    public long l48420;
+    public long l48421;
+    public long l48422;
+    public long l48423;
+    public long l48424;
+    public long l48425;
+    public long l48426;
+    public long l48427;
+    public long l48428;
+    public long l48429;
+    public long l48430;
+    public long l48431;
+    public long l48432;
+    public long l48433;
+    public long l48434;
+    public long l48435;
+    public long l48436;
+    public long l48437;
+    public long l48438;
+    public long l48439;
+    public long l48440;
+    public long l48441;
+    public long l48442;
+    public long l48443;
+    public long l48444;
+    public long l48445;
+    public long l48446;
+    public long l48447;
+    public long l48448;
+    public long l48449;
+    public long l48450;
+    public long l48451;
+    public long l48452;
+    public long l48453;
+    public long l48454;
+    public long l48455;
+    public long l48456;
+    public long l48457;
+    public long l48458;
+    public long l48459;
+    public long l48460;
+    public long l48461;
+    public long l48462;
+    public long l48463;
+    public long l48464;
+    public long l48465;
+    public long l48466;
+    public long l48467;
+    public long l48468;
+    public long l48469;
+    public long l48470;
+    public long l48471;
+    public long l48472;
+    public long l48473;
+    public long l48474;
+    public long l48475;
+    public long l48476;
+    public long l48477;
+    public long l48478;
+    public long l48479;
+    public long l48480;
+    public long l48481;
+    public long l48482;
+    public long l48483;
+    public long l48484;
+    public long l48485;
+    public long l48486;
+    public long l48487;
+    public long l48488;
+    public long l48489;
+    public long l48490;
+    public long l48491;
+    public long l48492;
+    public long l48493;
+    public long l48494;
+    public long l48495;
+    public long l48496;
+    public long l48497;
+    public long l48498;
+    public long l48499;
+    public long l48500;
+    public long l48501;
+    public long l48502;
+    public long l48503;
+    public long l48504;
+    public long l48505;
+    public long l48506;
+    public long l48507;
+    public long l48508;
+    public long l48509;
+    public long l48510;
+    public long l48511;
+    public long l48512;
+    public long l48513;
+    public long l48514;
+    public long l48515;
+    public long l48516;
+    public long l48517;
+    public long l48518;
+    public long l48519;
+    public long l48520;
+    public long l48521;
+    public long l48522;
+    public long l48523;
+    public long l48524;
+    public long l48525;
+    public long l48526;
+    public long l48527;
+    public long l48528;
+    public long l48529;
+    public long l48530;
+    public long l48531;
+    public long l48532;
+    public long l48533;
+    public long l48534;
+    public long l48535;
+    public long l48536;
+    public long l48537;
+    public long l48538;
+    public long l48539;
+    public long l48540;
+    public long l48541;
+    public long l48542;
+    public long l48543;
+    public long l48544;
+    public long l48545;
+    public long l48546;
+    public long l48547;
+    public long l48548;
+    public long l48549;
+    public long l48550;
+    public long l48551;
+    public long l48552;
+    public long l48553;
+    public long l48554;
+    public long l48555;
+    public long l48556;
+    public long l48557;
+    public long l48558;
+    public long l48559;
+    public long l48560;
+    public long l48561;
+    public long l48562;
+    public long l48563;
+    public long l48564;
+    public long l48565;
+    public long l48566;
+    public long l48567;
+    public long l48568;
+    public long l48569;
+    public long l48570;
+    public long l48571;
+    public long l48572;
+    public long l48573;
+    public long l48574;
+    public long l48575;
+    public long l48576;
+    public long l48577;
+    public long l48578;
+    public long l48579;
+    public long l48580;
+    public long l48581;
+    public long l48582;
+    public long l48583;
+    public long l48584;
+    public long l48585;
+    public long l48586;
+    public long l48587;
+    public long l48588;
+    public long l48589;
+    public long l48590;
+    public long l48591;
+    public long l48592;
+    public long l48593;
+    public long l48594;
+    public long l48595;
+    public long l48596;
+    public long l48597;
+    public long l48598;
+    public long l48599;
+    public long l48600;
+    public long l48601;
+    public long l48602;
+    public long l48603;
+    public long l48604;
+    public long l48605;
+    public long l48606;
+    public long l48607;
+    public long l48608;
+    public long l48609;
+    public long l48610;
+    public long l48611;
+    public long l48612;
+    public long l48613;
+    public long l48614;
+    public long l48615;
+    public long l48616;
+    public long l48617;
+    public long l48618;
+    public long l48619;
+    public long l48620;
+    public long l48621;
+    public long l48622;
+    public long l48623;
+    public long l48624;
+    public long l48625;
+    public long l48626;
+    public long l48627;
+    public long l48628;
+    public long l48629;
+    public long l48630;
+    public long l48631;
+    public long l48632;
+    public long l48633;
+    public long l48634;
+    public long l48635;
+    public long l48636;
+    public long l48637;
+    public long l48638;
+    public long l48639;
+    public long l48640;
+    public long l48641;
+    public long l48642;
+    public long l48643;
+    public long l48644;
+    public long l48645;
+    public long l48646;
+    public long l48647;
+    public long l48648;
+    public long l48649;
+    public long l48650;
+    public long l48651;
+    public long l48652;
+    public long l48653;
+    public long l48654;
+    public long l48655;
+    public long l48656;
+    public long l48657;
+    public long l48658;
+    public long l48659;
+    public long l48660;
+    public long l48661;
+    public long l48662;
+    public long l48663;
+    public long l48664;
+    public long l48665;
+    public long l48666;
+    public long l48667;
+    public long l48668;
+    public long l48669;
+    public long l48670;
+    public long l48671;
+    public long l48672;
+    public long l48673;
+    public long l48674;
+    public long l48675;
+    public long l48676;
+    public long l48677;
+    public long l48678;
+    public long l48679;
+    public long l48680;
+    public long l48681;
+    public long l48682;
+    public long l48683;
+    public long l48684;
+    public long l48685;
+    public long l48686;
+    public long l48687;
+    public long l48688;
+    public long l48689;
+    public long l48690;
+    public long l48691;
+    public long l48692;
+    public long l48693;
+    public long l48694;
+    public long l48695;
+    public long l48696;
+    public long l48697;
+    public long l48698;
+    public long l48699;
+    public long l48700;
+    public long l48701;
+    public long l48702;
+    public long l48703;
+    public long l48704;
+    public long l48705;
+    public long l48706;
+    public long l48707;
+    public long l48708;
+    public long l48709;
+    public long l48710;
+    public long l48711;
+    public long l48712;
+    public long l48713;
+    public long l48714;
+    public long l48715;
+    public long l48716;
+    public long l48717;
+    public long l48718;
+    public long l48719;
+    public long l48720;
+    public long l48721;
+    public long l48722;
+    public long l48723;
+    public long l48724;
+    public long l48725;
+    public long l48726;
+    public long l48727;
+    public long l48728;
+    public long l48729;
+    public long l48730;
+    public long l48731;
+    public long l48732;
+    public long l48733;
+    public long l48734;
+    public long l48735;
+    public long l48736;
+    public long l48737;
+    public long l48738;
+    public long l48739;
+    public long l48740;
+    public long l48741;
+    public long l48742;
+    public long l48743;
+    public long l48744;
+    public long l48745;
+    public long l48746;
+    public long l48747;
+    public long l48748;
+    public long l48749;
+    public long l48750;
+    public long l48751;
+    public long l48752;
+    public long l48753;
+    public long l48754;
+    public long l48755;
+    public long l48756;
+    public long l48757;
+    public long l48758;
+    public long l48759;
+    public long l48760;
+    public long l48761;
+    public long l48762;
+    public long l48763;
+    public long l48764;
+    public long l48765;
+    public long l48766;
+    public long l48767;
+    public long l48768;
+    public long l48769;
+    public long l48770;
+    public long l48771;
+    public long l48772;
+    public long l48773;
+    public long l48774;
+    public long l48775;
+    public long l48776;
+    public long l48777;
+    public long l48778;
+    public long l48779;
+    public long l48780;
+    public long l48781;
+    public long l48782;
+    public long l48783;
+    public long l48784;
+    public long l48785;
+    public long l48786;
+    public long l48787;
+    public long l48788;
+    public long l48789;
+    public long l48790;
+    public long l48791;
+    public long l48792;
+    public long l48793;
+    public long l48794;
+    public long l48795;
+    public long l48796;
+    public long l48797;
+    public long l48798;
+    public long l48799;
+    public long l48800;
+    public long l48801;
+    public long l48802;
+    public long l48803;
+    public long l48804;
+    public long l48805;
+    public long l48806;
+    public long l48807;
+    public long l48808;
+    public long l48809;
+    public long l48810;
+    public long l48811;
+    public long l48812;
+    public long l48813;
+    public long l48814;
+    public long l48815;
+    public long l48816;
+    public long l48817;
+    public long l48818;
+    public long l48819;
+    public long l48820;
+    public long l48821;
+    public long l48822;
+    public long l48823;
+    public long l48824;
+    public long l48825;
+    public long l48826;
+    public long l48827;
+    public long l48828;
+    public long l48829;
+    public long l48830;
+    public long l48831;
+    public long l48832;
+    public long l48833;
+    public long l48834;
+    public long l48835;
+    public long l48836;
+    public long l48837;
+    public long l48838;
+    public long l48839;
+    public long l48840;
+    public long l48841;
+    public long l48842;
+    public long l48843;
+    public long l48844;
+    public long l48845;
+    public long l48846;
+    public long l48847;
+    public long l48848;
+    public long l48849;
+    public long l48850;
+    public long l48851;
+    public long l48852;
+    public long l48853;
+    public long l48854;
+    public long l48855;
+    public long l48856;
+    public long l48857;
+    public long l48858;
+    public long l48859;
+    public long l48860;
+    public long l48861;
+    public long l48862;
+    public long l48863;
+    public long l48864;
+    public long l48865;
+    public long l48866;
+    public long l48867;
+    public long l48868;
+    public long l48869;
+    public long l48870;
+    public long l48871;
+    public long l48872;
+    public long l48873;
+    public long l48874;
+    public long l48875;
+    public long l48876;
+    public long l48877;
+    public long l48878;
+    public long l48879;
+    public long l48880;
+    public long l48881;
+    public long l48882;
+    public long l48883;
+    public long l48884;
+    public long l48885;
+    public long l48886;
+    public long l48887;
+    public long l48888;
+    public long l48889;
+    public long l48890;
+    public long l48891;
+    public long l48892;
+    public long l48893;
+    public long l48894;
+    public long l48895;
+    public long l48896;
+    public long l48897;
+    public long l48898;
+    public long l48899;
+    public long l48900;
+    public long l48901;
+    public long l48902;
+    public long l48903;
+    public long l48904;
+    public long l48905;
+    public long l48906;
+    public long l48907;
+    public long l48908;
+    public long l48909;
+    public long l48910;
+    public long l48911;
+    public long l48912;
+    public long l48913;
+    public long l48914;
+    public long l48915;
+    public long l48916;
+    public long l48917;
+    public long l48918;
+    public long l48919;
+    public long l48920;
+    public long l48921;
+    public long l48922;
+    public long l48923;
+    public long l48924;
+    public long l48925;
+    public long l48926;
+    public long l48927;
+    public long l48928;
+    public long l48929;
+    public long l48930;
+    public long l48931;
+    public long l48932;
+    public long l48933;
+    public long l48934;
+    public long l48935;
+    public long l48936;
+    public long l48937;
+    public long l48938;
+    public long l48939;
+    public long l48940;
+    public long l48941;
+    public long l48942;
+    public long l48943;
+    public long l48944;
+    public long l48945;
+    public long l48946;
+    public long l48947;
+    public long l48948;
+    public long l48949;
+    public long l48950;
+    public long l48951;
+    public long l48952;
+    public long l48953;
+    public long l48954;
+    public long l48955;
+    public long l48956;
+    public long l48957;
+    public long l48958;
+    public long l48959;
+    public long l48960;
+    public long l48961;
+    public long l48962;
+    public long l48963;
+    public long l48964;
+    public long l48965;
+    public long l48966;
+    public long l48967;
+    public long l48968;
+    public long l48969;
+    public long l48970;
+    public long l48971;
+    public long l48972;
+    public long l48973;
+    public long l48974;
+    public long l48975;
+    public long l48976;
+    public long l48977;
+    public long l48978;
+    public long l48979;
+    public long l48980;
+    public long l48981;
+    public long l48982;
+    public long l48983;
+    public long l48984;
+    public long l48985;
+    public long l48986;
+    public long l48987;
+    public long l48988;
+    public long l48989;
+    public long l48990;
+    public long l48991;
+    public long l48992;
+    public long l48993;
+    public long l48994;
+    public long l48995;
+    public long l48996;
+    public long l48997;
+    public long l48998;
+    public long l48999;
+    public long l49000;
+    public long l49001;
+    public long l49002;
+    public long l49003;
+    public long l49004;
+    public long l49005;
+    public long l49006;
+    public long l49007;
+    public long l49008;
+    public long l49009;
+    public long l49010;
+    public long l49011;
+    public long l49012;
+    public long l49013;
+    public long l49014;
+    public long l49015;
+    public long l49016;
+    public long l49017;
+    public long l49018;
+    public long l49019;
+    public long l49020;
+    public long l49021;
+    public long l49022;
+    public long l49023;
+    public long l49024;
+    public long l49025;
+    public long l49026;
+    public long l49027;
+    public long l49028;
+    public long l49029;
+    public long l49030;
+    public long l49031;
+    public long l49032;
+    public long l49033;
+    public long l49034;
+    public long l49035;
+    public long l49036;
+    public long l49037;
+    public long l49038;
+    public long l49039;
+    public long l49040;
+    public long l49041;
+    public long l49042;
+    public long l49043;
+    public long l49044;
+    public long l49045;
+    public long l49046;
+    public long l49047;
+    public long l49048;
+    public long l49049;
+    public long l49050;
+    public long l49051;
+    public long l49052;
+    public long l49053;
+    public long l49054;
+    public long l49055;
+    public long l49056;
+    public long l49057;
+    public long l49058;
+    public long l49059;
+    public long l49060;
+    public long l49061;
+    public long l49062;
+    public long l49063;
+    public long l49064;
+    public long l49065;
+    public long l49066;
+    public long l49067;
+    public long l49068;
+    public long l49069;
+    public long l49070;
+    public long l49071;
+    public long l49072;
+    public long l49073;
+    public long l49074;
+    public long l49075;
+    public long l49076;
+    public long l49077;
+    public long l49078;
+    public long l49079;
+    public long l49080;
+    public long l49081;
+    public long l49082;
+    public long l49083;
+    public long l49084;
+    public long l49085;
+    public long l49086;
+    public long l49087;
+    public long l49088;
+    public long l49089;
+    public long l49090;
+    public long l49091;
+    public long l49092;
+    public long l49093;
+    public long l49094;
+    public long l49095;
+    public long l49096;
+    public long l49097;
+    public long l49098;
+    public long l49099;
+    public long l49100;
+    public long l49101;
+    public long l49102;
+    public long l49103;
+    public long l49104;
+    public long l49105;
+    public long l49106;
+    public long l49107;
+    public long l49108;
+    public long l49109;
+    public long l49110;
+    public long l49111;
+    public long l49112;
+    public long l49113;
+    public long l49114;
+    public long l49115;
+    public long l49116;
+    public long l49117;
+    public long l49118;
+    public long l49119;
+    public long l49120;
+    public long l49121;
+    public long l49122;
+    public long l49123;
+    public long l49124;
+    public long l49125;
+    public long l49126;
+    public long l49127;
+    public long l49128;
+    public long l49129;
+    public long l49130;
+    public long l49131;
+    public long l49132;
+    public long l49133;
+    public long l49134;
+    public long l49135;
+    public long l49136;
+    public long l49137;
+    public long l49138;
+    public long l49139;
+    public long l49140;
+    public long l49141;
+    public long l49142;
+    public long l49143;
+    public long l49144;
+    public long l49145;
+    public long l49146;
+    public long l49147;
+    public long l49148;
+    public long l49149;
+    public long l49150;
+    public long l49151;
+    public long l49152;
+    public long l49153;
+    public long l49154;
+    public long l49155;
+    public long l49156;
+    public long l49157;
+    public long l49158;
+    public long l49159;
+    public long l49160;
+    public long l49161;
+    public long l49162;
+    public long l49163;
+    public long l49164;
+    public long l49165;
+    public long l49166;
+    public long l49167;
+    public long l49168;
+    public long l49169;
+    public long l49170;
+    public long l49171;
+    public long l49172;
+    public long l49173;
+    public long l49174;
+    public long l49175;
+    public long l49176;
+    public long l49177;
+    public long l49178;
+    public long l49179;
+    public long l49180;
+    public long l49181;
+    public long l49182;
+    public long l49183;
+    public long l49184;
+    public long l49185;
+    public long l49186;
+    public long l49187;
+    public long l49188;
+    public long l49189;
+    public long l49190;
+    public long l49191;
+    public long l49192;
+    public long l49193;
+    public long l49194;
+    public long l49195;
+    public long l49196;
+    public long l49197;
+    public long l49198;
+    public long l49199;
+    public long l49200;
+    public long l49201;
+    public long l49202;
+    public long l49203;
+    public long l49204;
+    public long l49205;
+    public long l49206;
+    public long l49207;
+    public long l49208;
+    public long l49209;
+    public long l49210;
+    public long l49211;
+    public long l49212;
+    public long l49213;
+    public long l49214;
+    public long l49215;
+    public long l49216;
+    public long l49217;
+    public long l49218;
+    public long l49219;
+    public long l49220;
+    public long l49221;
+    public long l49222;
+    public long l49223;
+    public long l49224;
+    public long l49225;
+    public long l49226;
+    public long l49227;
+    public long l49228;
+    public long l49229;
+    public long l49230;
+    public long l49231;
+    public long l49232;
+    public long l49233;
+    public long l49234;
+    public long l49235;
+    public long l49236;
+    public long l49237;
+    public long l49238;
+    public long l49239;
+    public long l49240;
+    public long l49241;
+    public long l49242;
+    public long l49243;
+    public long l49244;
+    public long l49245;
+    public long l49246;
+    public long l49247;
+    public long l49248;
+    public long l49249;
+    public long l49250;
+    public long l49251;
+    public long l49252;
+    public long l49253;
+    public long l49254;
+    public long l49255;
+    public long l49256;
+    public long l49257;
+    public long l49258;
+    public long l49259;
+    public long l49260;
+    public long l49261;
+    public long l49262;
+    public long l49263;
+    public long l49264;
+    public long l49265;
+    public long l49266;
+    public long l49267;
+    public long l49268;
+    public long l49269;
+    public long l49270;
+    public long l49271;
+    public long l49272;
+    public long l49273;
+    public long l49274;
+    public long l49275;
+    public long l49276;
+    public long l49277;
+    public long l49278;
+    public long l49279;
+    public long l49280;
+    public long l49281;
+    public long l49282;
+    public long l49283;
+    public long l49284;
+    public long l49285;
+    public long l49286;
+    public long l49287;
+    public long l49288;
+    public long l49289;
+    public long l49290;
+    public long l49291;
+    public long l49292;
+    public long l49293;
+    public long l49294;
+    public long l49295;
+    public long l49296;
+    public long l49297;
+    public long l49298;
+    public long l49299;
+    public long l49300;
+    public long l49301;
+    public long l49302;
+    public long l49303;
+    public long l49304;
+    public long l49305;
+    public long l49306;
+    public long l49307;
+    public long l49308;
+    public long l49309;
+    public long l49310;
+    public long l49311;
+    public long l49312;
+    public long l49313;
+    public long l49314;
+    public long l49315;
+    public long l49316;
+    public long l49317;
+    public long l49318;
+    public long l49319;
+    public long l49320;
+    public long l49321;
+    public long l49322;
+    public long l49323;
+    public long l49324;
+    public long l49325;
+    public long l49326;
+    public long l49327;
+    public long l49328;
+    public long l49329;
+    public long l49330;
+    public long l49331;
+    public long l49332;
+    public long l49333;
+    public long l49334;
+    public long l49335;
+    public long l49336;
+    public long l49337;
+    public long l49338;
+    public long l49339;
+    public long l49340;
+    public long l49341;
+    public long l49342;
+    public long l49343;
+    public long l49344;
+    public long l49345;
+    public long l49346;
+    public long l49347;
+    public long l49348;
+    public long l49349;
+    public long l49350;
+    public long l49351;
+    public long l49352;
+    public long l49353;
+    public long l49354;
+    public long l49355;
+    public long l49356;
+    public long l49357;
+    public long l49358;
+    public long l49359;
+    public long l49360;
+    public long l49361;
+    public long l49362;
+    public long l49363;
+    public long l49364;
+    public long l49365;
+    public long l49366;
+    public long l49367;
+    public long l49368;
+    public long l49369;
+    public long l49370;
+    public long l49371;
+    public long l49372;
+    public long l49373;
+    public long l49374;
+    public long l49375;
+    public long l49376;
+    public long l49377;
+    public long l49378;
+    public long l49379;
+    public long l49380;
+    public long l49381;
+    public long l49382;
+    public long l49383;
+    public long l49384;
+    public long l49385;
+    public long l49386;
+    public long l49387;
+    public long l49388;
+    public long l49389;
+    public long l49390;
+    public long l49391;
+    public long l49392;
+    public long l49393;
+    public long l49394;
+    public long l49395;
+    public long l49396;
+    public long l49397;
+    public long l49398;
+    public long l49399;
+    public long l49400;
+    public long l49401;
+    public long l49402;
+    public long l49403;
+    public long l49404;
+    public long l49405;
+    public long l49406;
+    public long l49407;
+    public long l49408;
+    public long l49409;
+    public long l49410;
+    public long l49411;
+    public long l49412;
+    public long l49413;
+    public long l49414;
+    public long l49415;
+    public long l49416;
+    public long l49417;
+    public long l49418;
+    public long l49419;
+    public long l49420;
+    public long l49421;
+    public long l49422;
+    public long l49423;
+    public long l49424;
+    public long l49425;
+    public long l49426;
+    public long l49427;
+    public long l49428;
+    public long l49429;
+    public long l49430;
+    public long l49431;
+    public long l49432;
+    public long l49433;
+    public long l49434;
+    public long l49435;
+    public long l49436;
+    public long l49437;
+    public long l49438;
+    public long l49439;
+    public long l49440;
+    public long l49441;
+    public long l49442;
+    public long l49443;
+    public long l49444;
+    public long l49445;
+    public long l49446;
+    public long l49447;
+    public long l49448;
+    public long l49449;
+    public long l49450;
+    public long l49451;
+    public long l49452;
+    public long l49453;
+    public long l49454;
+    public long l49455;
+    public long l49456;
+    public long l49457;
+    public long l49458;
+    public long l49459;
+    public long l49460;
+    public long l49461;
+    public long l49462;
+    public long l49463;
+    public long l49464;
+    public long l49465;
+    public long l49466;
+    public long l49467;
+    public long l49468;
+    public long l49469;
+    public long l49470;
+    public long l49471;
+    public long l49472;
+    public long l49473;
+    public long l49474;
+    public long l49475;
+    public long l49476;
+    public long l49477;
+    public long l49478;
+    public long l49479;
+    public long l49480;
+    public long l49481;
+    public long l49482;
+    public long l49483;
+    public long l49484;
+    public long l49485;
+    public long l49486;
+    public long l49487;
+    public long l49488;
+    public long l49489;
+    public long l49490;
+    public long l49491;
+    public long l49492;
+    public long l49493;
+    public long l49494;
+    public long l49495;
+    public long l49496;
+    public long l49497;
+    public long l49498;
+    public long l49499;
+    public long l49500;
+    public long l49501;
+    public long l49502;
+    public long l49503;
+    public long l49504;
+    public long l49505;
+    public long l49506;
+    public long l49507;
+    public long l49508;
+    public long l49509;
+    public long l49510;
+    public long l49511;
+    public long l49512;
+    public long l49513;
+    public long l49514;
+    public long l49515;
+    public long l49516;
+    public long l49517;
+    public long l49518;
+    public long l49519;
+    public long l49520;
+    public long l49521;
+    public long l49522;
+    public long l49523;
+    public long l49524;
+    public long l49525;
+    public long l49526;
+    public long l49527;
+    public long l49528;
+    public long l49529;
+    public long l49530;
+    public long l49531;
+    public long l49532;
+    public long l49533;
+    public long l49534;
+    public long l49535;
+    public long l49536;
+    public long l49537;
+    public long l49538;
+    public long l49539;
+    public long l49540;
+    public long l49541;
+    public long l49542;
+    public long l49543;
+    public long l49544;
+    public long l49545;
+    public long l49546;
+    public long l49547;
+    public long l49548;
+    public long l49549;
+    public long l49550;
+    public long l49551;
+    public long l49552;
+    public long l49553;
+    public long l49554;
+    public long l49555;
+    public long l49556;
+    public long l49557;
+    public long l49558;
+    public long l49559;
+    public long l49560;
+    public long l49561;
+    public long l49562;
+    public long l49563;
+    public long l49564;
+    public long l49565;
+    public long l49566;
+    public long l49567;
+    public long l49568;
+    public long l49569;
+    public long l49570;
+    public long l49571;
+    public long l49572;
+    public long l49573;
+    public long l49574;
+    public long l49575;
+    public long l49576;
+    public long l49577;
+    public long l49578;
+    public long l49579;
+    public long l49580;
+    public long l49581;
+    public long l49582;
+    public long l49583;
+    public long l49584;
+    public long l49585;
+    public long l49586;
+    public long l49587;
+    public long l49588;
+    public long l49589;
+    public long l49590;
+    public long l49591;
+    public long l49592;
+    public long l49593;
+    public long l49594;
+    public long l49595;
+    public long l49596;
+    public long l49597;
+    public long l49598;
+    public long l49599;
+    public long l49600;
+    public long l49601;
+    public long l49602;
+    public long l49603;
+    public long l49604;
+    public long l49605;
+    public long l49606;
+    public long l49607;
+    public long l49608;
+    public long l49609;
+    public long l49610;
+    public long l49611;
+    public long l49612;
+    public long l49613;
+    public long l49614;
+    public long l49615;
+    public long l49616;
+    public long l49617;
+    public long l49618;
+    public long l49619;
+    public long l49620;
+    public long l49621;
+    public long l49622;
+    public long l49623;
+    public long l49624;
+    public long l49625;
+    public long l49626;
+    public long l49627;
+    public long l49628;
+    public long l49629;
+    public long l49630;
+    public long l49631;
+    public long l49632;
+    public long l49633;
+    public long l49634;
+    public long l49635;
+    public long l49636;
+    public long l49637;
+    public long l49638;
+    public long l49639;
+    public long l49640;
+    public long l49641;
+    public long l49642;
+    public long l49643;
+    public long l49644;
+    public long l49645;
+    public long l49646;
+    public long l49647;
+    public long l49648;
+    public long l49649;
+    public long l49650;
+    public long l49651;
+    public long l49652;
+    public long l49653;
+    public long l49654;
+    public long l49655;
+    public long l49656;
+    public long l49657;
+    public long l49658;
+    public long l49659;
+    public long l49660;
+    public long l49661;
+    public long l49662;
+    public long l49663;
+    public long l49664;
+    public long l49665;
+    public long l49666;
+    public long l49667;
+    public long l49668;
+    public long l49669;
+    public long l49670;
+    public long l49671;
+    public long l49672;
+    public long l49673;
+    public long l49674;
+    public long l49675;
+    public long l49676;
+    public long l49677;
+    public long l49678;
+    public long l49679;
+    public long l49680;
+    public long l49681;
+    public long l49682;
+    public long l49683;
+    public long l49684;
+    public long l49685;
+    public long l49686;
+    public long l49687;
+    public long l49688;
+    public long l49689;
+    public long l49690;
+    public long l49691;
+    public long l49692;
+    public long l49693;
+    public long l49694;
+    public long l49695;
+    public long l49696;
+    public long l49697;
+    public long l49698;
+    public long l49699;
+    public long l49700;
+    public long l49701;
+    public long l49702;
+    public long l49703;
+    public long l49704;
+    public long l49705;
+    public long l49706;
+    public long l49707;
+    public long l49708;
+    public long l49709;
+    public long l49710;
+    public long l49711;
+    public long l49712;
+    public long l49713;
+    public long l49714;
+    public long l49715;
+    public long l49716;
+    public long l49717;
+    public long l49718;
+    public long l49719;
+    public long l49720;
+    public long l49721;
+    public long l49722;
+    public long l49723;
+    public long l49724;
+    public long l49725;
+    public long l49726;
+    public long l49727;
+    public long l49728;
+    public long l49729;
+    public long l49730;
+    public long l49731;
+    public long l49732;
+    public long l49733;
+    public long l49734;
+    public long l49735;
+    public long l49736;
+    public long l49737;
+    public long l49738;
+    public long l49739;
+    public long l49740;
+    public long l49741;
+    public long l49742;
+    public long l49743;
+    public long l49744;
+    public long l49745;
+    public long l49746;
+    public long l49747;
+    public long l49748;
+    public long l49749;
+    public long l49750;
+    public long l49751;
+    public long l49752;
+    public long l49753;
+    public long l49754;
+    public long l49755;
+    public long l49756;
+    public long l49757;
+    public long l49758;
+    public long l49759;
+    public long l49760;
+    public long l49761;
+    public long l49762;
+    public long l49763;
+    public long l49764;
+    public long l49765;
+    public long l49766;
+    public long l49767;
+    public long l49768;
+    public long l49769;
+    public long l49770;
+    public long l49771;
+    public long l49772;
+    public long l49773;
+    public long l49774;
+    public long l49775;
+    public long l49776;
+    public long l49777;
+    public long l49778;
+    public long l49779;
+    public long l49780;
+    public long l49781;
+    public long l49782;
+    public long l49783;
+    public long l49784;
+    public long l49785;
+    public long l49786;
+    public long l49787;
+    public long l49788;
+    public long l49789;
+    public long l49790;
+    public long l49791;
+    public long l49792;
+    public long l49793;
+    public long l49794;
+    public long l49795;
+    public long l49796;
+    public long l49797;
+    public long l49798;
+    public long l49799;
+    public long l49800;
+    public long l49801;
+    public long l49802;
+    public long l49803;
+    public long l49804;
+    public long l49805;
+    public long l49806;
+    public long l49807;
+    public long l49808;
+    public long l49809;
+    public long l49810;
+    public long l49811;
+    public long l49812;
+    public long l49813;
+    public long l49814;
+    public long l49815;
+    public long l49816;
+    public long l49817;
+    public long l49818;
+    public long l49819;
+    public long l49820;
+    public long l49821;
+    public long l49822;
+    public long l49823;
+    public long l49824;
+    public long l49825;
+    public long l49826;
+    public long l49827;
+    public long l49828;
+    public long l49829;
+    public long l49830;
+    public long l49831;
+    public long l49832;
+    public long l49833;
+    public long l49834;
+    public long l49835;
+    public long l49836;
+    public long l49837;
+    public long l49838;
+    public long l49839;
+    public long l49840;
+    public long l49841;
+    public long l49842;
+    public long l49843;
+    public long l49844;
+    public long l49845;
+    public long l49846;
+    public long l49847;
+    public long l49848;
+    public long l49849;
+    public long l49850;
+    public long l49851;
+    public long l49852;
+    public long l49853;
+    public long l49854;
+    public long l49855;
+    public long l49856;
+    public long l49857;
+    public long l49858;
+    public long l49859;
+    public long l49860;
+    public long l49861;
+    public long l49862;
+    public long l49863;
+    public long l49864;
+    public long l49865;
+    public long l49866;
+    public long l49867;
+    public long l49868;
+    public long l49869;
+    public long l49870;
+    public long l49871;
+    public long l49872;
+    public long l49873;
+    public long l49874;
+    public long l49875;
+    public long l49876;
+    public long l49877;
+    public long l49878;
+    public long l49879;
+    public long l49880;
+    public long l49881;
+    public long l49882;
+    public long l49883;
+    public long l49884;
+    public long l49885;
+    public long l49886;
+    public long l49887;
+    public long l49888;
+    public long l49889;
+    public long l49890;
+    public long l49891;
+    public long l49892;
+    public long l49893;
+    public long l49894;
+    public long l49895;
+    public long l49896;
+    public long l49897;
+    public long l49898;
+    public long l49899;
+    public long l49900;
+    public long l49901;
+    public long l49902;
+    public long l49903;
+    public long l49904;
+    public long l49905;
+    public long l49906;
+    public long l49907;
+    public long l49908;
+    public long l49909;
+    public long l49910;
+    public long l49911;
+    public long l49912;
+    public long l49913;
+    public long l49914;
+    public long l49915;
+    public long l49916;
+    public long l49917;
+    public long l49918;
+    public long l49919;
+    public long l49920;
+    public long l49921;
+    public long l49922;
+    public long l49923;
+    public long l49924;
+    public long l49925;
+    public long l49926;
+    public long l49927;
+    public long l49928;
+    public long l49929;
+    public long l49930;
+    public long l49931;
+    public long l49932;
+    public long l49933;
+    public long l49934;
+    public long l49935;
+    public long l49936;
+    public long l49937;
+    public long l49938;
+    public long l49939;
+    public long l49940;
+    public long l49941;
+    public long l49942;
+    public long l49943;
+    public long l49944;
+    public long l49945;
+    public long l49946;
+    public long l49947;
+    public long l49948;
+    public long l49949;
+    public long l49950;
+    public long l49951;
+    public long l49952;
+    public long l49953;
+    public long l49954;
+    public long l49955;
+    public long l49956;
+    public long l49957;
+    public long l49958;
+    public long l49959;
+    public long l49960;
+    public long l49961;
+    public long l49962;
+    public long l49963;
+    public long l49964;
+    public long l49965;
+    public long l49966;
+    public long l49967;
+    public long l49968;
+    public long l49969;
+    public long l49970;
+    public long l49971;
+    public long l49972;
+    public long l49973;
+    public long l49974;
+    public long l49975;
+    public long l49976;
+    public long l49977;
+    public long l49978;
+    public long l49979;
+    public long l49980;
+    public long l49981;
+    public long l49982;
+    public long l49983;
+    public long l49984;
+    public long l49985;
+    public long l49986;
+    public long l49987;
+    public long l49988;
+    public long l49989;
+    public long l49990;
+    public long l49991;
+    public long l49992;
+    public long l49993;
+    public long l49994;
+    public long l49995;
+    public long l49996;
+    public long l49997;
+    public long l49998;
+    public long l49999;
+    public long l50000;
+    public long l50001;
+    public long l50002;
+    public long l50003;
+    public long l50004;
+    public long l50005;
+    public long l50006;
+    public long l50007;
+    public long l50008;
+    public long l50009;
+    public long l50010;
+    public long l50011;
+    public long l50012;
+    public long l50013;
+    public long l50014;
+    public long l50015;
+    public long l50016;
+    public long l50017;
+    public long l50018;
+    public long l50019;
+    public long l50020;
+    public long l50021;
+    public long l50022;
+    public long l50023;
+    public long l50024;
+    public long l50025;
+    public long l50026;
+    public long l50027;
+    public long l50028;
+    public long l50029;
+    public long l50030;
+    public long l50031;
+    public long l50032;
+    public long l50033;
+    public long l50034;
+    public long l50035;
+    public long l50036;
+    public long l50037;
+    public long l50038;
+    public long l50039;
+    public long l50040;
+    public long l50041;
+    public long l50042;
+    public long l50043;
+    public long l50044;
+    public long l50045;
+    public long l50046;
+    public long l50047;
+    public long l50048;
+    public long l50049;
+    public long l50050;
+    public long l50051;
+    public long l50052;
+    public long l50053;
+    public long l50054;
+    public long l50055;
+    public long l50056;
+    public long l50057;
+    public long l50058;
+    public long l50059;
+    public long l50060;
+    public long l50061;
+    public long l50062;
+    public long l50063;
+    public long l50064;
+    public long l50065;
+    public long l50066;
+    public long l50067;
+    public long l50068;
+    public long l50069;
+    public long l50070;
+    public long l50071;
+    public long l50072;
+    public long l50073;
+    public long l50074;
+    public long l50075;
+    public long l50076;
+    public long l50077;
+    public long l50078;
+    public long l50079;
+    public long l50080;
+    public long l50081;
+    public long l50082;
+    public long l50083;
+    public long l50084;
+    public long l50085;
+    public long l50086;
+    public long l50087;
+    public long l50088;
+    public long l50089;
+    public long l50090;
+    public long l50091;
+    public long l50092;
+    public long l50093;
+    public long l50094;
+    public long l50095;
+    public long l50096;
+    public long l50097;
+    public long l50098;
+    public long l50099;
+    public long l50100;
+    public long l50101;
+    public long l50102;
+    public long l50103;
+    public long l50104;
+    public long l50105;
+    public long l50106;
+    public long l50107;
+    public long l50108;
+    public long l50109;
+    public long l50110;
+    public long l50111;
+    public long l50112;
+    public long l50113;
+    public long l50114;
+    public long l50115;
+    public long l50116;
+    public long l50117;
+    public long l50118;
+    public long l50119;
+    public long l50120;
+    public long l50121;
+    public long l50122;
+    public long l50123;
+    public long l50124;
+    public long l50125;
+    public long l50126;
+    public long l50127;
+    public long l50128;
+    public long l50129;
+    public long l50130;
+    public long l50131;
+    public long l50132;
+    public long l50133;
+    public long l50134;
+    public long l50135;
+    public long l50136;
+    public long l50137;
+    public long l50138;
+    public long l50139;
+    public long l50140;
+    public long l50141;
+    public long l50142;
+    public long l50143;
+    public long l50144;
+    public long l50145;
+    public long l50146;
+    public long l50147;
+    public long l50148;
+    public long l50149;
+    public long l50150;
+    public long l50151;
+    public long l50152;
+    public long l50153;
+    public long l50154;
+    public long l50155;
+    public long l50156;
+    public long l50157;
+    public long l50158;
+    public long l50159;
+    public long l50160;
+    public long l50161;
+    public long l50162;
+    public long l50163;
+    public long l50164;
+    public long l50165;
+    public long l50166;
+    public long l50167;
+    public long l50168;
+    public long l50169;
+    public long l50170;
+    public long l50171;
+    public long l50172;
+    public long l50173;
+    public long l50174;
+    public long l50175;
+    public long l50176;
+    public long l50177;
+    public long l50178;
+    public long l50179;
+    public long l50180;
+    public long l50181;
+    public long l50182;
+    public long l50183;
+    public long l50184;
+    public long l50185;
+    public long l50186;
+    public long l50187;
+    public long l50188;
+    public long l50189;
+    public long l50190;
+    public long l50191;
+    public long l50192;
+    public long l50193;
+    public long l50194;
+    public long l50195;
+    public long l50196;
+    public long l50197;
+    public long l50198;
+    public long l50199;
+    public long l50200;
+    public long l50201;
+    public long l50202;
+    public long l50203;
+    public long l50204;
+    public long l50205;
+    public long l50206;
+    public long l50207;
+    public long l50208;
+    public long l50209;
+    public long l50210;
+    public long l50211;
+    public long l50212;
+    public long l50213;
+    public long l50214;
+    public long l50215;
+    public long l50216;
+    public long l50217;
+    public long l50218;
+    public long l50219;
+    public long l50220;
+    public long l50221;
+    public long l50222;
+    public long l50223;
+    public long l50224;
+    public long l50225;
+    public long l50226;
+    public long l50227;
+    public long l50228;
+    public long l50229;
+    public long l50230;
+    public long l50231;
+    public long l50232;
+    public long l50233;
+    public long l50234;
+    public long l50235;
+    public long l50236;
+    public long l50237;
+    public long l50238;
+    public long l50239;
+    public long l50240;
+    public long l50241;
+    public long l50242;
+    public long l50243;
+    public long l50244;
+    public long l50245;
+    public long l50246;
+    public long l50247;
+    public long l50248;
+    public long l50249;
+    public long l50250;
+    public long l50251;
+    public long l50252;
+    public long l50253;
+    public long l50254;
+    public long l50255;
+    public long l50256;
+    public long l50257;
+    public long l50258;
+    public long l50259;
+    public long l50260;
+    public long l50261;
+    public long l50262;
+    public long l50263;
+    public long l50264;
+    public long l50265;
+    public long l50266;
+    public long l50267;
+    public long l50268;
+    public long l50269;
+    public long l50270;
+    public long l50271;
+    public long l50272;
+    public long l50273;
+    public long l50274;
+    public long l50275;
+    public long l50276;
+    public long l50277;
+    public long l50278;
+    public long l50279;
+    public long l50280;
+    public long l50281;
+    public long l50282;
+    public long l50283;
+    public long l50284;
+    public long l50285;
+    public long l50286;
+    public long l50287;
+    public long l50288;
+    public long l50289;
+    public long l50290;
+    public long l50291;
+    public long l50292;
+    public long l50293;
+    public long l50294;
+    public long l50295;
+    public long l50296;
+    public long l50297;
+    public long l50298;
+    public long l50299;
+    public long l50300;
+    public long l50301;
+    public long l50302;
+    public long l50303;
+    public long l50304;
+    public long l50305;
+    public long l50306;
+    public long l50307;
+    public long l50308;
+    public long l50309;
+    public long l50310;
+    public long l50311;
+    public long l50312;
+    public long l50313;
+    public long l50314;
+    public long l50315;
+    public long l50316;
+    public long l50317;
+    public long l50318;
+    public long l50319;
+    public long l50320;
+    public long l50321;
+    public long l50322;
+    public long l50323;
+    public long l50324;
+    public long l50325;
+    public long l50326;
+    public long l50327;
+    public long l50328;
+    public long l50329;
+    public long l50330;
+    public long l50331;
+    public long l50332;
+    public long l50333;
+    public long l50334;
+    public long l50335;
+    public long l50336;
+    public long l50337;
+    public long l50338;
+    public long l50339;
+    public long l50340;
+    public long l50341;
+    public long l50342;
+    public long l50343;
+    public long l50344;
+    public long l50345;
+    public long l50346;
+    public long l50347;
+    public long l50348;
+    public long l50349;
+    public long l50350;
+    public long l50351;
+    public long l50352;
+    public long l50353;
+    public long l50354;
+    public long l50355;
+    public long l50356;
+    public long l50357;
+    public long l50358;
+    public long l50359;
+    public long l50360;
+    public long l50361;
+    public long l50362;
+    public long l50363;
+    public long l50364;
+    public long l50365;
+    public long l50366;
+    public long l50367;
+    public long l50368;
+    public long l50369;
+    public long l50370;
+    public long l50371;
+    public long l50372;
+    public long l50373;
+    public long l50374;
+    public long l50375;
+    public long l50376;
+    public long l50377;
+    public long l50378;
+    public long l50379;
+    public long l50380;
+    public long l50381;
+    public long l50382;
+    public long l50383;
+    public long l50384;
+    public long l50385;
+    public long l50386;
+    public long l50387;
+    public long l50388;
+    public long l50389;
+    public long l50390;
+    public long l50391;
+    public long l50392;
+    public long l50393;
+    public long l50394;
+    public long l50395;
+    public long l50396;
+    public long l50397;
+    public long l50398;
+    public long l50399;
+    public long l50400;
+    public long l50401;
+    public long l50402;
+    public long l50403;
+    public long l50404;
+    public long l50405;
+    public long l50406;
+    public long l50407;
+    public long l50408;
+    public long l50409;
+    public long l50410;
+    public long l50411;
+    public long l50412;
+    public long l50413;
+    public long l50414;
+    public long l50415;
+    public long l50416;
+    public long l50417;
+    public long l50418;
+    public long l50419;
+    public long l50420;
+    public long l50421;
+    public long l50422;
+    public long l50423;
+    public long l50424;
+    public long l50425;
+    public long l50426;
+    public long l50427;
+    public long l50428;
+    public long l50429;
+    public long l50430;
+    public long l50431;
+    public long l50432;
+    public long l50433;
+    public long l50434;
+    public long l50435;
+    public long l50436;
+    public long l50437;
+    public long l50438;
+    public long l50439;
+    public long l50440;
+    public long l50441;
+    public long l50442;
+    public long l50443;
+    public long l50444;
+    public long l50445;
+    public long l50446;
+    public long l50447;
+    public long l50448;
+    public long l50449;
+    public long l50450;
+    public long l50451;
+    public long l50452;
+    public long l50453;
+    public long l50454;
+    public long l50455;
+    public long l50456;
+    public long l50457;
+    public long l50458;
+    public long l50459;
+    public long l50460;
+    public long l50461;
+    public long l50462;
+    public long l50463;
+    public long l50464;
+    public long l50465;
+    public long l50466;
+    public long l50467;
+    public long l50468;
+    public long l50469;
+    public long l50470;
+    public long l50471;
+    public long l50472;
+    public long l50473;
+    public long l50474;
+    public long l50475;
+    public long l50476;
+    public long l50477;
+    public long l50478;
+    public long l50479;
+    public long l50480;
+    public long l50481;
+    public long l50482;
+    public long l50483;
+    public long l50484;
+    public long l50485;
+    public long l50486;
+    public long l50487;
+    public long l50488;
+    public long l50489;
+    public long l50490;
+    public long l50491;
+    public long l50492;
+    public long l50493;
+    public long l50494;
+    public long l50495;
+    public long l50496;
+    public long l50497;
+    public long l50498;
+    public long l50499;
+    public long l50500;
+    public long l50501;
+    public long l50502;
+    public long l50503;
+    public long l50504;
+    public long l50505;
+    public long l50506;
+    public long l50507;
+    public long l50508;
+    public long l50509;
+    public long l50510;
+    public long l50511;
+    public long l50512;
+    public long l50513;
+    public long l50514;
+    public long l50515;
+    public long l50516;
+    public long l50517;
+    public long l50518;
+    public long l50519;
+    public long l50520;
+    public long l50521;
+    public long l50522;
+    public long l50523;
+    public long l50524;
+    public long l50525;
+    public long l50526;
+    public long l50527;
+    public long l50528;
+    public long l50529;
+    public long l50530;
+    public long l50531;
+    public long l50532;
+    public long l50533;
+    public long l50534;
+    public long l50535;
+    public long l50536;
+    public long l50537;
+    public long l50538;
+    public long l50539;
+    public long l50540;
+    public long l50541;
+    public long l50542;
+    public long l50543;
+    public long l50544;
+    public long l50545;
+    public long l50546;
+    public long l50547;
+    public long l50548;
+    public long l50549;
+    public long l50550;
+    public long l50551;
+    public long l50552;
+    public long l50553;
+    public long l50554;
+    public long l50555;
+    public long l50556;
+    public long l50557;
+    public long l50558;
+    public long l50559;
+    public long l50560;
+    public long l50561;
+    public long l50562;
+    public long l50563;
+    public long l50564;
+    public long l50565;
+    public long l50566;
+    public long l50567;
+    public long l50568;
+    public long l50569;
+    public long l50570;
+    public long l50571;
+    public long l50572;
+    public long l50573;
+    public long l50574;
+    public long l50575;
+    public long l50576;
+    public long l50577;
+    public long l50578;
+    public long l50579;
+    public long l50580;
+    public long l50581;
+    public long l50582;
+    public long l50583;
+    public long l50584;
+    public long l50585;
+    public long l50586;
+    public long l50587;
+    public long l50588;
+    public long l50589;
+    public long l50590;
+    public long l50591;
+    public long l50592;
+    public long l50593;
+    public long l50594;
+    public long l50595;
+    public long l50596;
+    public long l50597;
+    public long l50598;
+    public long l50599;
+    public long l50600;
+    public long l50601;
+    public long l50602;
+    public long l50603;
+    public long l50604;
+    public long l50605;
+    public long l50606;
+    public long l50607;
+    public long l50608;
+    public long l50609;
+    public long l50610;
+    public long l50611;
+    public long l50612;
+    public long l50613;
+    public long l50614;
+    public long l50615;
+    public long l50616;
+    public long l50617;
+    public long l50618;
+    public long l50619;
+    public long l50620;
+    public long l50621;
+    public long l50622;
+    public long l50623;
+    public long l50624;
+    public long l50625;
+    public long l50626;
+    public long l50627;
+    public long l50628;
+    public long l50629;
+    public long l50630;
+    public long l50631;
+    public long l50632;
+    public long l50633;
+    public long l50634;
+    public long l50635;
+    public long l50636;
+    public long l50637;
+    public long l50638;
+    public long l50639;
+    public long l50640;
+    public long l50641;
+    public long l50642;
+    public long l50643;
+    public long l50644;
+    public long l50645;
+    public long l50646;
+    public long l50647;
+    public long l50648;
+    public long l50649;
+    public long l50650;
+    public long l50651;
+    public long l50652;
+    public long l50653;
+    public long l50654;
+    public long l50655;
+    public long l50656;
+    public long l50657;
+    public long l50658;
+    public long l50659;
+    public long l50660;
+    public long l50661;
+    public long l50662;
+    public long l50663;
+    public long l50664;
+    public long l50665;
+    public long l50666;
+    public long l50667;
+    public long l50668;
+    public long l50669;
+    public long l50670;
+    public long l50671;
+    public long l50672;
+    public long l50673;
+    public long l50674;
+    public long l50675;
+    public long l50676;
+    public long l50677;
+    public long l50678;
+    public long l50679;
+    public long l50680;
+    public long l50681;
+    public long l50682;
+    public long l50683;
+    public long l50684;
+    public long l50685;
+    public long l50686;
+    public long l50687;
+    public long l50688;
+    public long l50689;
+    public long l50690;
+    public long l50691;
+    public long l50692;
+    public long l50693;
+    public long l50694;
+    public long l50695;
+    public long l50696;
+    public long l50697;
+    public long l50698;
+    public long l50699;
+    public long l50700;
+    public long l50701;
+    public long l50702;
+    public long l50703;
+    public long l50704;
+    public long l50705;
+    public long l50706;
+    public long l50707;
+    public long l50708;
+    public long l50709;
+    public long l50710;
+    public long l50711;
+    public long l50712;
+    public long l50713;
+    public long l50714;
+    public long l50715;
+    public long l50716;
+    public long l50717;
+    public long l50718;
+    public long l50719;
+    public long l50720;
+    public long l50721;
+    public long l50722;
+    public long l50723;
+    public long l50724;
+    public long l50725;
+    public long l50726;
+    public long l50727;
+    public long l50728;
+    public long l50729;
+    public long l50730;
+    public long l50731;
+    public long l50732;
+    public long l50733;
+    public long l50734;
+    public long l50735;
+    public long l50736;
+    public long l50737;
+    public long l50738;
+    public long l50739;
+    public long l50740;
+    public long l50741;
+    public long l50742;
+    public long l50743;
+    public long l50744;
+    public long l50745;
+    public long l50746;
+    public long l50747;
+    public long l50748;
+    public long l50749;
+    public long l50750;
+    public long l50751;
+    public long l50752;
+    public long l50753;
+    public long l50754;
+    public long l50755;
+    public long l50756;
+    public long l50757;
+    public long l50758;
+    public long l50759;
+    public long l50760;
+    public long l50761;
+    public long l50762;
+    public long l50763;
+    public long l50764;
+    public long l50765;
+    public long l50766;
+    public long l50767;
+    public long l50768;
+    public long l50769;
+    public long l50770;
+    public long l50771;
+    public long l50772;
+    public long l50773;
+    public long l50774;
+    public long l50775;
+    public long l50776;
+    public long l50777;
+    public long l50778;
+    public long l50779;
+    public long l50780;
+    public long l50781;
+    public long l50782;
+    public long l50783;
+    public long l50784;
+    public long l50785;
+    public long l50786;
+    public long l50787;
+    public long l50788;
+    public long l50789;
+    public long l50790;
+    public long l50791;
+    public long l50792;
+    public long l50793;
+    public long l50794;
+    public long l50795;
+    public long l50796;
+    public long l50797;
+    public long l50798;
+    public long l50799;
+    public long l50800;
+    public long l50801;
+    public long l50802;
+    public long l50803;
+    public long l50804;
+    public long l50805;
+    public long l50806;
+    public long l50807;
+    public long l50808;
+    public long l50809;
+    public long l50810;
+    public long l50811;
+    public long l50812;
+    public long l50813;
+    public long l50814;
+    public long l50815;
+    public long l50816;
+    public long l50817;
+    public long l50818;
+    public long l50819;
+    public long l50820;
+    public long l50821;
+    public long l50822;
+    public long l50823;
+    public long l50824;
+    public long l50825;
+    public long l50826;
+    public long l50827;
+    public long l50828;
+    public long l50829;
+    public long l50830;
+    public long l50831;
+    public long l50832;
+    public long l50833;
+    public long l50834;
+    public long l50835;
+    public long l50836;
+    public long l50837;
+    public long l50838;
+    public long l50839;
+    public long l50840;
+    public long l50841;
+    public long l50842;
+    public long l50843;
+    public long l50844;
+    public long l50845;
+    public long l50846;
+    public long l50847;
+    public long l50848;
+    public long l50849;
+    public long l50850;
+    public long l50851;
+    public long l50852;
+    public long l50853;
+    public long l50854;
+    public long l50855;
+    public long l50856;
+    public long l50857;
+    public long l50858;
+    public long l50859;
+    public long l50860;
+    public long l50861;
+    public long l50862;
+    public long l50863;
+    public long l50864;
+    public long l50865;
+    public long l50866;
+    public long l50867;
+    public long l50868;
+    public long l50869;
+    public long l50870;
+    public long l50871;
+    public long l50872;
+    public long l50873;
+    public long l50874;
+    public long l50875;
+    public long l50876;
+    public long l50877;
+    public long l50878;
+    public long l50879;
+    public long l50880;
+    public long l50881;
+    public long l50882;
+    public long l50883;
+    public long l50884;
+    public long l50885;
+    public long l50886;
+    public long l50887;
+    public long l50888;
+    public long l50889;
+    public long l50890;
+    public long l50891;
+    public long l50892;
+    public long l50893;
+    public long l50894;
+    public long l50895;
+    public long l50896;
+    public long l50897;
+    public long l50898;
+    public long l50899;
+    public long l50900;
+    public long l50901;
+    public long l50902;
+    public long l50903;
+    public long l50904;
+    public long l50905;
+    public long l50906;
+    public long l50907;
+    public long l50908;
+    public long l50909;
+    public long l50910;
+    public long l50911;
+    public long l50912;
+    public long l50913;
+    public long l50914;
+    public long l50915;
+    public long l50916;
+    public long l50917;
+    public long l50918;
+    public long l50919;
+    public long l50920;
+    public long l50921;
+    public long l50922;
+    public long l50923;
+    public long l50924;
+    public long l50925;
+    public long l50926;
+    public long l50927;
+    public long l50928;
+    public long l50929;
+    public long l50930;
+    public long l50931;
+    public long l50932;
+    public long l50933;
+    public long l50934;
+    public long l50935;
+    public long l50936;
+    public long l50937;
+    public long l50938;
+    public long l50939;
+    public long l50940;
+    public long l50941;
+    public long l50942;
+    public long l50943;
+    public long l50944;
+    public long l50945;
+    public long l50946;
+    public long l50947;
+    public long l50948;
+    public long l50949;
+    public long l50950;
+    public long l50951;
+    public long l50952;
+    public long l50953;
+    public long l50954;
+    public long l50955;
+    public long l50956;
+    public long l50957;
+    public long l50958;
+    public long l50959;
+    public long l50960;
+    public long l50961;
+    public long l50962;
+    public long l50963;
+    public long l50964;
+    public long l50965;
+    public long l50966;
+    public long l50967;
+    public long l50968;
+    public long l50969;
+    public long l50970;
+    public long l50971;
+    public long l50972;
+    public long l50973;
+    public long l50974;
+    public long l50975;
+    public long l50976;
+    public long l50977;
+    public long l50978;
+    public long l50979;
+    public long l50980;
+    public long l50981;
+    public long l50982;
+    public long l50983;
+    public long l50984;
+    public long l50985;
+    public long l50986;
+    public long l50987;
+    public long l50988;
+    public long l50989;
+    public long l50990;
+    public long l50991;
+    public long l50992;
+    public long l50993;
+    public long l50994;
+    public long l50995;
+    public long l50996;
+    public long l50997;
+    public long l50998;
+    public long l50999;
+    public long l51000;
+    public long l51001;
+    public long l51002;
+    public long l51003;
+    public long l51004;
+    public long l51005;
+    public long l51006;
+    public long l51007;
+    public long l51008;
+    public long l51009;
+    public long l51010;
+    public long l51011;
+    public long l51012;
+    public long l51013;
+    public long l51014;
+    public long l51015;
+    public long l51016;
+    public long l51017;
+    public long l51018;
+    public long l51019;
+    public long l51020;
+    public long l51021;
+    public long l51022;
+    public long l51023;
+    public long l51024;
+    public long l51025;
+    public long l51026;
+    public long l51027;
+    public long l51028;
+    public long l51029;
+    public long l51030;
+    public long l51031;
+    public long l51032;
+    public long l51033;
+    public long l51034;
+    public long l51035;
+    public long l51036;
+    public long l51037;
+    public long l51038;
+    public long l51039;
+    public long l51040;
+    public long l51041;
+    public long l51042;
+    public long l51043;
+    public long l51044;
+    public long l51045;
+    public long l51046;
+    public long l51047;
+    public long l51048;
+    public long l51049;
+    public long l51050;
+    public long l51051;
+    public long l51052;
+    public long l51053;
+    public long l51054;
+    public long l51055;
+    public long l51056;
+    public long l51057;
+    public long l51058;
+    public long l51059;
+    public long l51060;
+    public long l51061;
+    public long l51062;
+    public long l51063;
+    public long l51064;
+    public long l51065;
+    public long l51066;
+    public long l51067;
+    public long l51068;
+    public long l51069;
+    public long l51070;
+    public long l51071;
+    public long l51072;
+    public long l51073;
+    public long l51074;
+    public long l51075;
+    public long l51076;
+    public long l51077;
+    public long l51078;
+    public long l51079;
+    public long l51080;
+    public long l51081;
+    public long l51082;
+    public long l51083;
+    public long l51084;
+    public long l51085;
+    public long l51086;
+    public long l51087;
+    public long l51088;
+    public long l51089;
+    public long l51090;
+    public long l51091;
+    public long l51092;
+    public long l51093;
+    public long l51094;
+    public long l51095;
+    public long l51096;
+    public long l51097;
+    public long l51098;
+    public long l51099;
+    public long l51100;
+    public long l51101;
+    public long l51102;
+    public long l51103;
+    public long l51104;
+    public long l51105;
+    public long l51106;
+    public long l51107;
+    public long l51108;
+    public long l51109;
+    public long l51110;
+    public long l51111;
+    public long l51112;
+    public long l51113;
+    public long l51114;
+    public long l51115;
+    public long l51116;
+    public long l51117;
+    public long l51118;
+    public long l51119;
+    public long l51120;
+    public long l51121;
+    public long l51122;
+    public long l51123;
+    public long l51124;
+    public long l51125;
+    public long l51126;
+    public long l51127;
+    public long l51128;
+    public long l51129;
+    public long l51130;
+    public long l51131;
+    public long l51132;
+    public long l51133;
+    public long l51134;
+    public long l51135;
+    public long l51136;
+    public long l51137;
+    public long l51138;
+    public long l51139;
+    public long l51140;
+    public long l51141;
+    public long l51142;
+    public long l51143;
+    public long l51144;
+    public long l51145;
+    public long l51146;
+    public long l51147;
+    public long l51148;
+    public long l51149;
+    public long l51150;
+    public long l51151;
+    public long l51152;
+    public long l51153;
+    public long l51154;
+    public long l51155;
+    public long l51156;
+    public long l51157;
+    public long l51158;
+    public long l51159;
+    public long l51160;
+    public long l51161;
+    public long l51162;
+    public long l51163;
+    public long l51164;
+    public long l51165;
+    public long l51166;
+    public long l51167;
+    public long l51168;
+    public long l51169;
+    public long l51170;
+    public long l51171;
+    public long l51172;
+    public long l51173;
+    public long l51174;
+    public long l51175;
+    public long l51176;
+    public long l51177;
+    public long l51178;
+    public long l51179;
+    public long l51180;
+    public long l51181;
+    public long l51182;
+    public long l51183;
+    public long l51184;
+    public long l51185;
+    public long l51186;
+    public long l51187;
+    public long l51188;
+    public long l51189;
+    public long l51190;
+    public long l51191;
+    public long l51192;
+    public long l51193;
+    public long l51194;
+    public long l51195;
+    public long l51196;
+    public long l51197;
+    public long l51198;
+    public long l51199;
+    public long l51200;
+    public long l51201;
+    public long l51202;
+    public long l51203;
+    public long l51204;
+    public long l51205;
+    public long l51206;
+    public long l51207;
+    public long l51208;
+    public long l51209;
+    public long l51210;
+    public long l51211;
+    public long l51212;
+    public long l51213;
+    public long l51214;
+    public long l51215;
+    public long l51216;
+    public long l51217;
+    public long l51218;
+    public long l51219;
+    public long l51220;
+    public long l51221;
+    public long l51222;
+    public long l51223;
+    public long l51224;
+    public long l51225;
+    public long l51226;
+    public long l51227;
+    public long l51228;
+    public long l51229;
+    public long l51230;
+    public long l51231;
+    public long l51232;
+    public long l51233;
+    public long l51234;
+    public long l51235;
+    public long l51236;
+    public long l51237;
+    public long l51238;
+    public long l51239;
+    public long l51240;
+    public long l51241;
+    public long l51242;
+    public long l51243;
+    public long l51244;
+    public long l51245;
+    public long l51246;
+    public long l51247;
+    public long l51248;
+    public long l51249;
+    public long l51250;
+    public long l51251;
+    public long l51252;
+    public long l51253;
+    public long l51254;
+    public long l51255;
+    public long l51256;
+    public long l51257;
+    public long l51258;
+    public long l51259;
+    public long l51260;
+    public long l51261;
+    public long l51262;
+    public long l51263;
+    public long l51264;
+    public long l51265;
+    public long l51266;
+    public long l51267;
+    public long l51268;
+    public long l51269;
+    public long l51270;
+    public long l51271;
+    public long l51272;
+    public long l51273;
+    public long l51274;
+    public long l51275;
+    public long l51276;
+    public long l51277;
+    public long l51278;
+    public long l51279;
+    public long l51280;
+    public long l51281;
+    public long l51282;
+    public long l51283;
+    public long l51284;
+    public long l51285;
+    public long l51286;
+    public long l51287;
+    public long l51288;
+    public long l51289;
+    public long l51290;
+    public long l51291;
+    public long l51292;
+    public long l51293;
+    public long l51294;
+    public long l51295;
+    public long l51296;
+    public long l51297;
+    public long l51298;
+    public long l51299;
+    public long l51300;
+    public long l51301;
+    public long l51302;
+    public long l51303;
+    public long l51304;
+    public long l51305;
+    public long l51306;
+    public long l51307;
+    public long l51308;
+    public long l51309;
+    public long l51310;
+    public long l51311;
+    public long l51312;
+    public long l51313;
+    public long l51314;
+    public long l51315;
+    public long l51316;
+    public long l51317;
+    public long l51318;
+    public long l51319;
+    public long l51320;
+    public long l51321;
+    public long l51322;
+    public long l51323;
+    public long l51324;
+    public long l51325;
+    public long l51326;
+    public long l51327;
+    public long l51328;
+    public long l51329;
+    public long l51330;
+    public long l51331;
+    public long l51332;
+    public long l51333;
+    public long l51334;
+    public long l51335;
+    public long l51336;
+    public long l51337;
+    public long l51338;
+    public long l51339;
+    public long l51340;
+    public long l51341;
+    public long l51342;
+    public long l51343;
+    public long l51344;
+    public long l51345;
+    public long l51346;
+    public long l51347;
+    public long l51348;
+    public long l51349;
+    public long l51350;
+    public long l51351;
+    public long l51352;
+    public long l51353;
+    public long l51354;
+    public long l51355;
+    public long l51356;
+    public long l51357;
+    public long l51358;
+    public long l51359;
+    public long l51360;
+    public long l51361;
+    public long l51362;
+    public long l51363;
+    public long l51364;
+    public long l51365;
+    public long l51366;
+    public long l51367;
+    public long l51368;
+    public long l51369;
+    public long l51370;
+    public long l51371;
+    public long l51372;
+    public long l51373;
+    public long l51374;
+    public long l51375;
+    public long l51376;
+    public long l51377;
+    public long l51378;
+    public long l51379;
+    public long l51380;
+    public long l51381;
+    public long l51382;
+    public long l51383;
+    public long l51384;
+    public long l51385;
+    public long l51386;
+    public long l51387;
+    public long l51388;
+    public long l51389;
+    public long l51390;
+    public long l51391;
+    public long l51392;
+    public long l51393;
+    public long l51394;
+    public long l51395;
+    public long l51396;
+    public long l51397;
+    public long l51398;
+    public long l51399;
+    public long l51400;
+    public long l51401;
+    public long l51402;
+    public long l51403;
+    public long l51404;
+    public long l51405;
+    public long l51406;
+    public long l51407;
+    public long l51408;
+    public long l51409;
+    public long l51410;
+    public long l51411;
+    public long l51412;
+    public long l51413;
+    public long l51414;
+    public long l51415;
+    public long l51416;
+    public long l51417;
+    public long l51418;
+    public long l51419;
+    public long l51420;
+    public long l51421;
+    public long l51422;
+    public long l51423;
+    public long l51424;
+    public long l51425;
+    public long l51426;
+    public long l51427;
+    public long l51428;
+    public long l51429;
+    public long l51430;
+    public long l51431;
+    public long l51432;
+    public long l51433;
+    public long l51434;
+    public long l51435;
+    public long l51436;
+    public long l51437;
+    public long l51438;
+    public long l51439;
+    public long l51440;
+    public long l51441;
+    public long l51442;
+    public long l51443;
+    public long l51444;
+    public long l51445;
+    public long l51446;
+    public long l51447;
+    public long l51448;
+    public long l51449;
+    public long l51450;
+    public long l51451;
+    public long l51452;
+    public long l51453;
+    public long l51454;
+    public long l51455;
+    public long l51456;
+    public long l51457;
+    public long l51458;
+    public long l51459;
+    public long l51460;
+    public long l51461;
+    public long l51462;
+    public long l51463;
+    public long l51464;
+    public long l51465;
+    public long l51466;
+    public long l51467;
+    public long l51468;
+    public long l51469;
+    public long l51470;
+    public long l51471;
+    public long l51472;
+    public long l51473;
+    public long l51474;
+    public long l51475;
+    public long l51476;
+    public long l51477;
+    public long l51478;
+    public long l51479;
+    public long l51480;
+    public long l51481;
+    public long l51482;
+    public long l51483;
+    public long l51484;
+    public long l51485;
+    public long l51486;
+    public long l51487;
+    public long l51488;
+    public long l51489;
+    public long l51490;
+    public long l51491;
+    public long l51492;
+    public long l51493;
+    public long l51494;
+    public long l51495;
+    public long l51496;
+    public long l51497;
+    public long l51498;
+    public long l51499;
+    public long l51500;
+    public long l51501;
+    public long l51502;
+    public long l51503;
+    public long l51504;
+    public long l51505;
+    public long l51506;
+    public long l51507;
+    public long l51508;
+    public long l51509;
+    public long l51510;
+    public long l51511;
+    public long l51512;
+    public long l51513;
+    public long l51514;
+    public long l51515;
+    public long l51516;
+    public long l51517;
+    public long l51518;
+    public long l51519;
+    public long l51520;
+    public long l51521;
+    public long l51522;
+    public long l51523;
+    public long l51524;
+    public long l51525;
+    public long l51526;
+    public long l51527;
+    public long l51528;
+    public long l51529;
+    public long l51530;
+    public long l51531;
+    public long l51532;
+    public long l51533;
+    public long l51534;
+    public long l51535;
+    public long l51536;
+    public long l51537;
+    public long l51538;
+    public long l51539;
+    public long l51540;
+    public long l51541;
+    public long l51542;
+    public long l51543;
+    public long l51544;
+    public long l51545;
+    public long l51546;
+    public long l51547;
+    public long l51548;
+    public long l51549;
+    public long l51550;
+    public long l51551;
+    public long l51552;
+    public long l51553;
+    public long l51554;
+    public long l51555;
+    public long l51556;
+    public long l51557;
+    public long l51558;
+    public long l51559;
+    public long l51560;
+    public long l51561;
+    public long l51562;
+    public long l51563;
+    public long l51564;
+    public long l51565;
+    public long l51566;
+    public long l51567;
+    public long l51568;
+    public long l51569;
+    public long l51570;
+    public long l51571;
+    public long l51572;
+    public long l51573;
+    public long l51574;
+    public long l51575;
+    public long l51576;
+    public long l51577;
+    public long l51578;
+    public long l51579;
+    public long l51580;
+    public long l51581;
+    public long l51582;
+    public long l51583;
+    public long l51584;
+    public long l51585;
+    public long l51586;
+    public long l51587;
+    public long l51588;
+    public long l51589;
+    public long l51590;
+    public long l51591;
+    public long l51592;
+    public long l51593;
+    public long l51594;
+    public long l51595;
+    public long l51596;
+    public long l51597;
+    public long l51598;
+    public long l51599;
+    public long l51600;
+    public long l51601;
+    public long l51602;
+    public long l51603;
+    public long l51604;
+    public long l51605;
+    public long l51606;
+    public long l51607;
+    public long l51608;
+    public long l51609;
+    public long l51610;
+    public long l51611;
+    public long l51612;
+    public long l51613;
+    public long l51614;
+    public long l51615;
+    public long l51616;
+    public long l51617;
+    public long l51618;
+    public long l51619;
+    public long l51620;
+    public long l51621;
+    public long l51622;
+    public long l51623;
+    public long l51624;
+    public long l51625;
+    public long l51626;
+    public long l51627;
+    public long l51628;
+    public long l51629;
+    public long l51630;
+    public long l51631;
+    public long l51632;
+    public long l51633;
+    public long l51634;
+    public long l51635;
+    public long l51636;
+    public long l51637;
+    public long l51638;
+    public long l51639;
+    public long l51640;
+    public long l51641;
+    public long l51642;
+    public long l51643;
+    public long l51644;
+    public long l51645;
+    public long l51646;
+    public long l51647;
+    public long l51648;
+    public long l51649;
+    public long l51650;
+    public long l51651;
+    public long l51652;
+    public long l51653;
+    public long l51654;
+    public long l51655;
+    public long l51656;
+    public long l51657;
+    public long l51658;
+    public long l51659;
+    public long l51660;
+    public long l51661;
+    public long l51662;
+    public long l51663;
+    public long l51664;
+    public long l51665;
+    public long l51666;
+    public long l51667;
+    public long l51668;
+    public long l51669;
+    public long l51670;
+    public long l51671;
+    public long l51672;
+    public long l51673;
+    public long l51674;
+    public long l51675;
+    public long l51676;
+    public long l51677;
+    public long l51678;
+    public long l51679;
+    public long l51680;
+    public long l51681;
+    public long l51682;
+    public long l51683;
+    public long l51684;
+    public long l51685;
+    public long l51686;
+    public long l51687;
+    public long l51688;
+    public long l51689;
+    public long l51690;
+    public long l51691;
+    public long l51692;
+    public long l51693;
+    public long l51694;
+    public long l51695;
+    public long l51696;
+    public long l51697;
+    public long l51698;
+    public long l51699;
+    public long l51700;
+    public long l51701;
+    public long l51702;
+    public long l51703;
+    public long l51704;
+    public long l51705;
+    public long l51706;
+    public long l51707;
+    public long l51708;
+    public long l51709;
+    public long l51710;
+    public long l51711;
+    public long l51712;
+    public long l51713;
+    public long l51714;
+    public long l51715;
+    public long l51716;
+    public long l51717;
+    public long l51718;
+    public long l51719;
+    public long l51720;
+    public long l51721;
+    public long l51722;
+    public long l51723;
+    public long l51724;
+    public long l51725;
+    public long l51726;
+    public long l51727;
+    public long l51728;
+    public long l51729;
+    public long l51730;
+    public long l51731;
+    public long l51732;
+    public long l51733;
+    public long l51734;
+    public long l51735;
+    public long l51736;
+    public long l51737;
+    public long l51738;
+    public long l51739;
+    public long l51740;
+    public long l51741;
+    public long l51742;
+    public long l51743;
+    public long l51744;
+    public long l51745;
+    public long l51746;
+    public long l51747;
+    public long l51748;
+    public long l51749;
+    public long l51750;
+    public long l51751;
+    public long l51752;
+    public long l51753;
+    public long l51754;
+    public long l51755;
+    public long l51756;
+    public long l51757;
+    public long l51758;
+    public long l51759;
+    public long l51760;
+    public long l51761;
+    public long l51762;
+    public long l51763;
+    public long l51764;
+    public long l51765;
+    public long l51766;
+    public long l51767;
+    public long l51768;
+    public long l51769;
+    public long l51770;
+    public long l51771;
+    public long l51772;
+    public long l51773;
+    public long l51774;
+    public long l51775;
+    public long l51776;
+    public long l51777;
+    public long l51778;
+    public long l51779;
+    public long l51780;
+    public long l51781;
+    public long l51782;
+    public long l51783;
+    public long l51784;
+    public long l51785;
+    public long l51786;
+    public long l51787;
+    public long l51788;
+    public long l51789;
+    public long l51790;
+    public long l51791;
+    public long l51792;
+    public long l51793;
+    public long l51794;
+    public long l51795;
+    public long l51796;
+    public long l51797;
+    public long l51798;
+    public long l51799;
+    public long l51800;
+    public long l51801;
+    public long l51802;
+    public long l51803;
+    public long l51804;
+    public long l51805;
+    public long l51806;
+    public long l51807;
+    public long l51808;
+    public long l51809;
+    public long l51810;
+    public long l51811;
+    public long l51812;
+    public long l51813;
+    public long l51814;
+    public long l51815;
+    public long l51816;
+    public long l51817;
+    public long l51818;
+    public long l51819;
+    public long l51820;
+    public long l51821;
+    public long l51822;
+    public long l51823;
+    public long l51824;
+    public long l51825;
+    public long l51826;
+    public long l51827;
+    public long l51828;
+    public long l51829;
+    public long l51830;
+    public long l51831;
+    public long l51832;
+    public long l51833;
+    public long l51834;
+    public long l51835;
+    public long l51836;
+    public long l51837;
+    public long l51838;
+    public long l51839;
+    public long l51840;
+    public long l51841;
+    public long l51842;
+    public long l51843;
+    public long l51844;
+    public long l51845;
+    public long l51846;
+    public long l51847;
+    public long l51848;
+    public long l51849;
+    public long l51850;
+    public long l51851;
+    public long l51852;
+    public long l51853;
+    public long l51854;
+    public long l51855;
+    public long l51856;
+    public long l51857;
+    public long l51858;
+    public long l51859;
+    public long l51860;
+    public long l51861;
+    public long l51862;
+    public long l51863;
+    public long l51864;
+    public long l51865;
+    public long l51866;
+    public long l51867;
+    public long l51868;
+    public long l51869;
+    public long l51870;
+    public long l51871;
+    public long l51872;
+    public long l51873;
+    public long l51874;
+    public long l51875;
+    public long l51876;
+    public long l51877;
+    public long l51878;
+    public long l51879;
+    public long l51880;
+    public long l51881;
+    public long l51882;
+    public long l51883;
+    public long l51884;
+    public long l51885;
+    public long l51886;
+    public long l51887;
+    public long l51888;
+    public long l51889;
+    public long l51890;
+    public long l51891;
+    public long l51892;
+    public long l51893;
+    public long l51894;
+    public long l51895;
+    public long l51896;
+    public long l51897;
+    public long l51898;
+    public long l51899;
+    public long l51900;
+    public long l51901;
+    public long l51902;
+    public long l51903;
+    public long l51904;
+    public long l51905;
+    public long l51906;
+    public long l51907;
+    public long l51908;
+    public long l51909;
+    public long l51910;
+    public long l51911;
+    public long l51912;
+    public long l51913;
+    public long l51914;
+    public long l51915;
+    public long l51916;
+    public long l51917;
+    public long l51918;
+    public long l51919;
+    public long l51920;
+    public long l51921;
+    public long l51922;
+    public long l51923;
+    public long l51924;
+    public long l51925;
+    public long l51926;
+    public long l51927;
+    public long l51928;
+    public long l51929;
+    public long l51930;
+    public long l51931;
+    public long l51932;
+    public long l51933;
+    public long l51934;
+    public long l51935;
+    public long l51936;
+    public long l51937;
+    public long l51938;
+    public long l51939;
+    public long l51940;
+    public long l51941;
+    public long l51942;
+    public long l51943;
+    public long l51944;
+    public long l51945;
+    public long l51946;
+    public long l51947;
+    public long l51948;
+    public long l51949;
+    public long l51950;
+    public long l51951;
+    public long l51952;
+    public long l51953;
+    public long l51954;
+    public long l51955;
+    public long l51956;
+    public long l51957;
+    public long l51958;
+    public long l51959;
+    public long l51960;
+    public long l51961;
+    public long l51962;
+    public long l51963;
+    public long l51964;
+    public long l51965;
+    public long l51966;
+    public long l51967;
+    public long l51968;
+    public long l51969;
+    public long l51970;
+    public long l51971;
+    public long l51972;
+    public long l51973;
+    public long l51974;
+    public long l51975;
+    public long l51976;
+    public long l51977;
+    public long l51978;
+    public long l51979;
+    public long l51980;
+    public long l51981;
+    public long l51982;
+    public long l51983;
+    public long l51984;
+    public long l51985;
+    public long l51986;
+    public long l51987;
+    public long l51988;
+    public long l51989;
+    public long l51990;
+    public long l51991;
+    public long l51992;
+    public long l51993;
+    public long l51994;
+    public long l51995;
+    public long l51996;
+    public long l51997;
+    public long l51998;
+    public long l51999;
+    public long l52000;
+    public long l52001;
+    public long l52002;
+    public long l52003;
+    public long l52004;
+    public long l52005;
+    public long l52006;
+    public long l52007;
+    public long l52008;
+    public long l52009;
+    public long l52010;
+    public long l52011;
+    public long l52012;
+    public long l52013;
+    public long l52014;
+    public long l52015;
+    public long l52016;
+    public long l52017;
+    public long l52018;
+    public long l52019;
+    public long l52020;
+    public long l52021;
+    public long l52022;
+    public long l52023;
+    public long l52024;
+    public long l52025;
+    public long l52026;
+    public long l52027;
+    public long l52028;
+    public long l52029;
+    public long l52030;
+    public long l52031;
+    public long l52032;
+    public long l52033;
+    public long l52034;
+    public long l52035;
+    public long l52036;
+    public long l52037;
+    public long l52038;
+    public long l52039;
+    public long l52040;
+    public long l52041;
+    public long l52042;
+    public long l52043;
+    public long l52044;
+    public long l52045;
+    public long l52046;
+    public long l52047;
+    public long l52048;
+    public long l52049;
+    public long l52050;
+    public long l52051;
+    public long l52052;
+    public long l52053;
+    public long l52054;
+    public long l52055;
+    public long l52056;
+    public long l52057;
+    public long l52058;
+    public long l52059;
+    public long l52060;
+    public long l52061;
+    public long l52062;
+    public long l52063;
+    public long l52064;
+    public long l52065;
+    public long l52066;
+    public long l52067;
+    public long l52068;
+    public long l52069;
+    public long l52070;
+    public long l52071;
+    public long l52072;
+    public long l52073;
+    public long l52074;
+    public long l52075;
+    public long l52076;
+    public long l52077;
+    public long l52078;
+    public long l52079;
+    public long l52080;
+    public long l52081;
+    public long l52082;
+    public long l52083;
+    public long l52084;
+    public long l52085;
+    public long l52086;
+    public long l52087;
+    public long l52088;
+    public long l52089;
+    public long l52090;
+    public long l52091;
+    public long l52092;
+    public long l52093;
+    public long l52094;
+    public long l52095;
+    public long l52096;
+    public long l52097;
+    public long l52098;
+    public long l52099;
+    public long l52100;
+    public long l52101;
+    public long l52102;
+    public long l52103;
+    public long l52104;
+    public long l52105;
+    public long l52106;
+    public long l52107;
+    public long l52108;
+    public long l52109;
+    public long l52110;
+    public long l52111;
+    public long l52112;
+    public long l52113;
+    public long l52114;
+    public long l52115;
+    public long l52116;
+    public long l52117;
+    public long l52118;
+    public long l52119;
+    public long l52120;
+    public long l52121;
+    public long l52122;
+    public long l52123;
+    public long l52124;
+    public long l52125;
+    public long l52126;
+    public long l52127;
+    public long l52128;
+    public long l52129;
+    public long l52130;
+    public long l52131;
+    public long l52132;
+    public long l52133;
+    public long l52134;
+    public long l52135;
+    public long l52136;
+    public long l52137;
+    public long l52138;
+    public long l52139;
+    public long l52140;
+    public long l52141;
+    public long l52142;
+    public long l52143;
+    public long l52144;
+    public long l52145;
+    public long l52146;
+    public long l52147;
+    public long l52148;
+    public long l52149;
+    public long l52150;
+    public long l52151;
+    public long l52152;
+    public long l52153;
+    public long l52154;
+    public long l52155;
+    public long l52156;
+    public long l52157;
+    public long l52158;
+    public long l52159;
+    public long l52160;
+    public long l52161;
+    public long l52162;
+    public long l52163;
+    public long l52164;
+    public long l52165;
+    public long l52166;
+    public long l52167;
+    public long l52168;
+    public long l52169;
+    public long l52170;
+    public long l52171;
+    public long l52172;
+    public long l52173;
+    public long l52174;
+    public long l52175;
+    public long l52176;
+    public long l52177;
+    public long l52178;
+    public long l52179;
+    public long l52180;
+    public long l52181;
+    public long l52182;
+    public long l52183;
+    public long l52184;
+    public long l52185;
+    public long l52186;
+    public long l52187;
+    public long l52188;
+    public long l52189;
+    public long l52190;
+    public long l52191;
+    public long l52192;
+    public long l52193;
+    public long l52194;
+    public long l52195;
+    public long l52196;
+    public long l52197;
+    public long l52198;
+    public long l52199;
+    public long l52200;
+    public long l52201;
+    public long l52202;
+    public long l52203;
+    public long l52204;
+    public long l52205;
+    public long l52206;
+    public long l52207;
+    public long l52208;
+    public long l52209;
+    public long l52210;
+    public long l52211;
+    public long l52212;
+    public long l52213;
+    public long l52214;
+    public long l52215;
+    public long l52216;
+    public long l52217;
+    public long l52218;
+    public long l52219;
+    public long l52220;
+    public long l52221;
+    public long l52222;
+    public long l52223;
+    public long l52224;
+    public long l52225;
+    public long l52226;
+    public long l52227;
+    public long l52228;
+    public long l52229;
+    public long l52230;
+    public long l52231;
+    public long l52232;
+    public long l52233;
+    public long l52234;
+    public long l52235;
+    public long l52236;
+    public long l52237;
+    public long l52238;
+    public long l52239;
+    public long l52240;
+    public long l52241;
+    public long l52242;
+    public long l52243;
+    public long l52244;
+    public long l52245;
+    public long l52246;
+    public long l52247;
+    public long l52248;
+    public long l52249;
+    public long l52250;
+    public long l52251;
+    public long l52252;
+    public long l52253;
+    public long l52254;
+    public long l52255;
+    public long l52256;
+    public long l52257;
+    public long l52258;
+    public long l52259;
+    public long l52260;
+    public long l52261;
+    public long l52262;
+    public long l52263;
+    public long l52264;
+    public long l52265;
+    public long l52266;
+    public long l52267;
+    public long l52268;
+    public long l52269;
+    public long l52270;
+    public long l52271;
+    public long l52272;
+    public long l52273;
+    public long l52274;
+    public long l52275;
+    public long l52276;
+    public long l52277;
+    public long l52278;
+    public long l52279;
+    public long l52280;
+    public long l52281;
+    public long l52282;
+    public long l52283;
+    public long l52284;
+    public long l52285;
+    public long l52286;
+    public long l52287;
+    public long l52288;
+    public long l52289;
+    public long l52290;
+    public long l52291;
+    public long l52292;
+    public long l52293;
+    public long l52294;
+    public long l52295;
+    public long l52296;
+    public long l52297;
+    public long l52298;
+    public long l52299;
+    public long l52300;
+    public long l52301;
+    public long l52302;
+    public long l52303;
+    public long l52304;
+    public long l52305;
+    public long l52306;
+    public long l52307;
+    public long l52308;
+    public long l52309;
+    public long l52310;
+    public long l52311;
+    public long l52312;
+    public long l52313;
+    public long l52314;
+    public long l52315;
+    public long l52316;
+    public long l52317;
+    public long l52318;
+    public long l52319;
+    public long l52320;
+    public long l52321;
+    public long l52322;
+    public long l52323;
+    public long l52324;
+    public long l52325;
+    public long l52326;
+    public long l52327;
+    public long l52328;
+    public long l52329;
+    public long l52330;
+    public long l52331;
+    public long l52332;
+    public long l52333;
+    public long l52334;
+    public long l52335;
+    public long l52336;
+    public long l52337;
+    public long l52338;
+    public long l52339;
+    public long l52340;
+    public long l52341;
+    public long l52342;
+    public long l52343;
+    public long l52344;
+    public long l52345;
+    public long l52346;
+    public long l52347;
+    public long l52348;
+    public long l52349;
+    public long l52350;
+    public long l52351;
+    public long l52352;
+    public long l52353;
+    public long l52354;
+    public long l52355;
+    public long l52356;
+    public long l52357;
+    public long l52358;
+    public long l52359;
+    public long l52360;
+    public long l52361;
+    public long l52362;
+    public long l52363;
+    public long l52364;
+    public long l52365;
+    public long l52366;
+    public long l52367;
+    public long l52368;
+    public long l52369;
+    public long l52370;
+    public long l52371;
+    public long l52372;
+    public long l52373;
+    public long l52374;
+    public long l52375;
+    public long l52376;
+    public long l52377;
+    public long l52378;
+    public long l52379;
+    public long l52380;
+    public long l52381;
+    public long l52382;
+    public long l52383;
+    public long l52384;
+    public long l52385;
+    public long l52386;
+    public long l52387;
+    public long l52388;
+    public long l52389;
+    public long l52390;
+    public long l52391;
+    public long l52392;
+    public long l52393;
+    public long l52394;
+    public long l52395;
+    public long l52396;
+    public long l52397;
+    public long l52398;
+    public long l52399;
+    public long l52400;
+    public long l52401;
+    public long l52402;
+    public long l52403;
+    public long l52404;
+    public long l52405;
+    public long l52406;
+    public long l52407;
+    public long l52408;
+    public long l52409;
+    public long l52410;
+    public long l52411;
+    public long l52412;
+    public long l52413;
+    public long l52414;
+    public long l52415;
+    public long l52416;
+    public long l52417;
+    public long l52418;
+    public long l52419;
+    public long l52420;
+    public long l52421;
+    public long l52422;
+    public long l52423;
+    public long l52424;
+    public long l52425;
+    public long l52426;
+    public long l52427;
+    public long l52428;
+    public long l52429;
+    public long l52430;
+    public long l52431;
+    public long l52432;
+    public long l52433;
+    public long l52434;
+    public long l52435;
+    public long l52436;
+    public long l52437;
+    public long l52438;
+    public long l52439;
+    public long l52440;
+    public long l52441;
+    public long l52442;
+    public long l52443;
+    public long l52444;
+    public long l52445;
+    public long l52446;
+    public long l52447;
+    public long l52448;
+    public long l52449;
+    public long l52450;
+    public long l52451;
+    public long l52452;
+    public long l52453;
+    public long l52454;
+    public long l52455;
+    public long l52456;
+    public long l52457;
+    public long l52458;
+    public long l52459;
+    public long l52460;
+    public long l52461;
+    public long l52462;
+    public long l52463;
+    public long l52464;
+    public long l52465;
+    public long l52466;
+    public long l52467;
+    public long l52468;
+    public long l52469;
+    public long l52470;
+    public long l52471;
+    public long l52472;
+    public long l52473;
+    public long l52474;
+    public long l52475;
+    public long l52476;
+    public long l52477;
+    public long l52478;
+    public long l52479;
+    public long l52480;
+    public long l52481;
+    public long l52482;
+    public long l52483;
+    public long l52484;
+    public long l52485;
+    public long l52486;
+    public long l52487;
+    public long l52488;
+    public long l52489;
+    public long l52490;
+    public long l52491;
+    public long l52492;
+    public long l52493;
+    public long l52494;
+    public long l52495;
+    public long l52496;
+    public long l52497;
+    public long l52498;
+    public long l52499;
+    public long l52500;
+    public long l52501;
+    public long l52502;
+    public long l52503;
+    public long l52504;
+    public long l52505;
+    public long l52506;
+    public long l52507;
+    public long l52508;
+    public long l52509;
+    public long l52510;
+    public long l52511;
+    public long l52512;
+    public long l52513;
+    public long l52514;
+    public long l52515;
+    public long l52516;
+    public long l52517;
+    public long l52518;
+    public long l52519;
+    public long l52520;
+    public long l52521;
+    public long l52522;
+    public long l52523;
+    public long l52524;
+    public long l52525;
+    public long l52526;
+    public long l52527;
+    public long l52528;
+    public long l52529;
+    public long l52530;
+    public long l52531;
+    public long l52532;
+    public long l52533;
+    public long l52534;
+    public long l52535;
+    public long l52536;
+    public long l52537;
+    public long l52538;
+    public long l52539;
+    public long l52540;
+    public long l52541;
+    public long l52542;
+    public long l52543;
+    public long l52544;
+    public long l52545;
+    public long l52546;
+    public long l52547;
+    public long l52548;
+    public long l52549;
+    public long l52550;
+    public long l52551;
+    public long l52552;
+    public long l52553;
+    public long l52554;
+    public long l52555;
+    public long l52556;
+    public long l52557;
+    public long l52558;
+    public long l52559;
+    public long l52560;
+    public long l52561;
+    public long l52562;
+    public long l52563;
+    public long l52564;
+    public long l52565;
+    public long l52566;
+    public long l52567;
+    public long l52568;
+    public long l52569;
+    public long l52570;
+    public long l52571;
+    public long l52572;
+    public long l52573;
+    public long l52574;
+    public long l52575;
+    public long l52576;
+    public long l52577;
+    public long l52578;
+    public long l52579;
+    public long l52580;
+    public long l52581;
+    public long l52582;
+    public long l52583;
+    public long l52584;
+    public long l52585;
+    public long l52586;
+    public long l52587;
+    public long l52588;
+    public long l52589;
+    public long l52590;
+    public long l52591;
+    public long l52592;
+    public long l52593;
+    public long l52594;
+    public long l52595;
+    public long l52596;
+    public long l52597;
+    public long l52598;
+    public long l52599;
+    public long l52600;
+    public long l52601;
+    public long l52602;
+    public long l52603;
+    public long l52604;
+    public long l52605;
+    public long l52606;
+    public long l52607;
+    public long l52608;
+    public long l52609;
+    public long l52610;
+    public long l52611;
+    public long l52612;
+    public long l52613;
+    public long l52614;
+    public long l52615;
+    public long l52616;
+    public long l52617;
+    public long l52618;
+    public long l52619;
+    public long l52620;
+    public long l52621;
+    public long l52622;
+    public long l52623;
+    public long l52624;
+    public long l52625;
+    public long l52626;
+    public long l52627;
+    public long l52628;
+    public long l52629;
+    public long l52630;
+    public long l52631;
+    public long l52632;
+    public long l52633;
+    public long l52634;
+    public long l52635;
+    public long l52636;
+    public long l52637;
+    public long l52638;
+    public long l52639;
+    public long l52640;
+    public long l52641;
+    public long l52642;
+    public long l52643;
+    public long l52644;
+    public long l52645;
+    public long l52646;
+    public long l52647;
+    public long l52648;
+    public long l52649;
+    public long l52650;
+    public long l52651;
+    public long l52652;
+    public long l52653;
+    public long l52654;
+    public long l52655;
+    public long l52656;
+    public long l52657;
+    public long l52658;
+    public long l52659;
+    public long l52660;
+    public long l52661;
+    public long l52662;
+    public long l52663;
+    public long l52664;
+    public long l52665;
+    public long l52666;
+    public long l52667;
+    public long l52668;
+    public long l52669;
+    public long l52670;
+    public long l52671;
+    public long l52672;
+    public long l52673;
+    public long l52674;
+    public long l52675;
+    public long l52676;
+    public long l52677;
+    public long l52678;
+    public long l52679;
+    public long l52680;
+    public long l52681;
+    public long l52682;
+    public long l52683;
+    public long l52684;
+    public long l52685;
+    public long l52686;
+    public long l52687;
+    public long l52688;
+    public long l52689;
+    public long l52690;
+    public long l52691;
+    public long l52692;
+    public long l52693;
+    public long l52694;
+    public long l52695;
+    public long l52696;
+    public long l52697;
+    public long l52698;
+    public long l52699;
+    public long l52700;
+    public long l52701;
+    public long l52702;
+    public long l52703;
+    public long l52704;
+    public long l52705;
+    public long l52706;
+    public long l52707;
+    public long l52708;
+    public long l52709;
+    public long l52710;
+    public long l52711;
+    public long l52712;
+    public long l52713;
+    public long l52714;
+    public long l52715;
+    public long l52716;
+    public long l52717;
+    public long l52718;
+    public long l52719;
+    public long l52720;
+    public long l52721;
+    public long l52722;
+    public long l52723;
+    public long l52724;
+    public long l52725;
+    public long l52726;
+    public long l52727;
+    public long l52728;
+    public long l52729;
+    public long l52730;
+    public long l52731;
+    public long l52732;
+    public long l52733;
+    public long l52734;
+    public long l52735;
+    public long l52736;
+    public long l52737;
+    public long l52738;
+    public long l52739;
+    public long l52740;
+    public long l52741;
+    public long l52742;
+    public long l52743;
+    public long l52744;
+    public long l52745;
+    public long l52746;
+    public long l52747;
+    public long l52748;
+    public long l52749;
+    public long l52750;
+    public long l52751;
+    public long l52752;
+    public long l52753;
+    public long l52754;
+    public long l52755;
+    public long l52756;
+    public long l52757;
+    public long l52758;
+    public long l52759;
+    public long l52760;
+    public long l52761;
+    public long l52762;
+    public long l52763;
+    public long l52764;
+    public long l52765;
+    public long l52766;
+    public long l52767;
+    public long l52768;
+    public long l52769;
+    public long l52770;
+    public long l52771;
+    public long l52772;
+    public long l52773;
+    public long l52774;
+    public long l52775;
+    public long l52776;
+    public long l52777;
+    public long l52778;
+    public long l52779;
+    public long l52780;
+    public long l52781;
+    public long l52782;
+    public long l52783;
+    public long l52784;
+    public long l52785;
+    public long l52786;
+    public long l52787;
+    public long l52788;
+    public long l52789;
+    public long l52790;
+    public long l52791;
+    public long l52792;
+    public long l52793;
+    public long l52794;
+    public long l52795;
+    public long l52796;
+    public long l52797;
+    public long l52798;
+    public long l52799;
+    public long l52800;
+    public long l52801;
+    public long l52802;
+    public long l52803;
+    public long l52804;
+    public long l52805;
+    public long l52806;
+    public long l52807;
+    public long l52808;
+    public long l52809;
+    public long l52810;
+    public long l52811;
+    public long l52812;
+    public long l52813;
+    public long l52814;
+    public long l52815;
+    public long l52816;
+    public long l52817;
+    public long l52818;
+    public long l52819;
+    public long l52820;
+    public long l52821;
+    public long l52822;
+    public long l52823;
+    public long l52824;
+    public long l52825;
+    public long l52826;
+    public long l52827;
+    public long l52828;
+    public long l52829;
+    public long l52830;
+    public long l52831;
+    public long l52832;
+    public long l52833;
+    public long l52834;
+    public long l52835;
+    public long l52836;
+    public long l52837;
+    public long l52838;
+    public long l52839;
+    public long l52840;
+    public long l52841;
+    public long l52842;
+    public long l52843;
+    public long l52844;
+    public long l52845;
+    public long l52846;
+    public long l52847;
+    public long l52848;
+    public long l52849;
+    public long l52850;
+    public long l52851;
+    public long l52852;
+    public long l52853;
+    public long l52854;
+    public long l52855;
+    public long l52856;
+    public long l52857;
+    public long l52858;
+    public long l52859;
+    public long l52860;
+    public long l52861;
+    public long l52862;
+    public long l52863;
+    public long l52864;
+    public long l52865;
+    public long l52866;
+    public long l52867;
+    public long l52868;
+    public long l52869;
+    public long l52870;
+    public long l52871;
+    public long l52872;
+    public long l52873;
+    public long l52874;
+    public long l52875;
+    public long l52876;
+    public long l52877;
+    public long l52878;
+    public long l52879;
+    public long l52880;
+    public long l52881;
+    public long l52882;
+    public long l52883;
+    public long l52884;
+    public long l52885;
+    public long l52886;
+    public long l52887;
+    public long l52888;
+    public long l52889;
+    public long l52890;
+    public long l52891;
+    public long l52892;
+    public long l52893;
+    public long l52894;
+    public long l52895;
+    public long l52896;
+    public long l52897;
+    public long l52898;
+    public long l52899;
+    public long l52900;
+    public long l52901;
+    public long l52902;
+    public long l52903;
+    public long l52904;
+    public long l52905;
+    public long l52906;
+    public long l52907;
+    public long l52908;
+    public long l52909;
+    public long l52910;
+    public long l52911;
+    public long l52912;
+    public long l52913;
+    public long l52914;
+    public long l52915;
+    public long l52916;
+    public long l52917;
+    public long l52918;
+    public long l52919;
+    public long l52920;
+    public long l52921;
+    public long l52922;
+    public long l52923;
+    public long l52924;
+    public long l52925;
+    public long l52926;
+    public long l52927;
+    public long l52928;
+    public long l52929;
+    public long l52930;
+    public long l52931;
+    public long l52932;
+    public long l52933;
+    public long l52934;
+    public long l52935;
+    public long l52936;
+    public long l52937;
+    public long l52938;
+    public long l52939;
+    public long l52940;
+    public long l52941;
+    public long l52942;
+    public long l52943;
+    public long l52944;
+    public long l52945;
+    public long l52946;
+    public long l52947;
+    public long l52948;
+    public long l52949;
+    public long l52950;
+    public long l52951;
+    public long l52952;
+    public long l52953;
+    public long l52954;
+    public long l52955;
+    public long l52956;
+    public long l52957;
+    public long l52958;
+    public long l52959;
+    public long l52960;
+    public long l52961;
+    public long l52962;
+    public long l52963;
+    public long l52964;
+    public long l52965;
+    public long l52966;
+    public long l52967;
+    public long l52968;
+    public long l52969;
+    public long l52970;
+    public long l52971;
+    public long l52972;
+    public long l52973;
+    public long l52974;
+    public long l52975;
+    public long l52976;
+    public long l52977;
+    public long l52978;
+    public long l52979;
+    public long l52980;
+    public long l52981;
+    public long l52982;
+    public long l52983;
+    public long l52984;
+    public long l52985;
+    public long l52986;
+    public long l52987;
+    public long l52988;
+    public long l52989;
+    public long l52990;
+    public long l52991;
+    public long l52992;
+    public long l52993;
+    public long l52994;
+    public long l52995;
+    public long l52996;
+    public long l52997;
+    public long l52998;
+    public long l52999;
+    public long l53000;
+    public long l53001;
+    public long l53002;
+    public long l53003;
+    public long l53004;
+    public long l53005;
+    public long l53006;
+    public long l53007;
+    public long l53008;
+    public long l53009;
+    public long l53010;
+    public long l53011;
+    public long l53012;
+    public long l53013;
+    public long l53014;
+    public long l53015;
+    public long l53016;
+    public long l53017;
+    public long l53018;
+    public long l53019;
+    public long l53020;
+    public long l53021;
+    public long l53022;
+    public long l53023;
+    public long l53024;
+    public long l53025;
+    public long l53026;
+    public long l53027;
+    public long l53028;
+    public long l53029;
+    public long l53030;
+    public long l53031;
+    public long l53032;
+    public long l53033;
+    public long l53034;
+    public long l53035;
+    public long l53036;
+    public long l53037;
+    public long l53038;
+    public long l53039;
+    public long l53040;
+    public long l53041;
+    public long l53042;
+    public long l53043;
+    public long l53044;
+    public long l53045;
+    public long l53046;
+    public long l53047;
+    public long l53048;
+    public long l53049;
+    public long l53050;
+    public long l53051;
+    public long l53052;
+    public long l53053;
+    public long l53054;
+    public long l53055;
+    public long l53056;
+    public long l53057;
+    public long l53058;
+    public long l53059;
+    public long l53060;
+    public long l53061;
+    public long l53062;
+    public long l53063;
+    public long l53064;
+    public long l53065;
+    public long l53066;
+    public long l53067;
+    public long l53068;
+    public long l53069;
+    public long l53070;
+    public long l53071;
+    public long l53072;
+    public long l53073;
+    public long l53074;
+    public long l53075;
+    public long l53076;
+    public long l53077;
+    public long l53078;
+    public long l53079;
+    public long l53080;
+    public long l53081;
+    public long l53082;
+    public long l53083;
+    public long l53084;
+    public long l53085;
+    public long l53086;
+    public long l53087;
+    public long l53088;
+    public long l53089;
+    public long l53090;
+    public long l53091;
+    public long l53092;
+    public long l53093;
+    public long l53094;
+    public long l53095;
+    public long l53096;
+    public long l53097;
+    public long l53098;
+    public long l53099;
+    public long l53100;
+    public long l53101;
+    public long l53102;
+    public long l53103;
+    public long l53104;
+    public long l53105;
+    public long l53106;
+    public long l53107;
+    public long l53108;
+    public long l53109;
+    public long l53110;
+    public long l53111;
+    public long l53112;
+    public long l53113;
+    public long l53114;
+    public long l53115;
+    public long l53116;
+    public long l53117;
+    public long l53118;
+    public long l53119;
+    public long l53120;
+    public long l53121;
+    public long l53122;
+    public long l53123;
+    public long l53124;
+    public long l53125;
+    public long l53126;
+    public long l53127;
+    public long l53128;
+    public long l53129;
+    public long l53130;
+    public long l53131;
+    public long l53132;
+    public long l53133;
+    public long l53134;
+    public long l53135;
+    public long l53136;
+    public long l53137;
+    public long l53138;
+    public long l53139;
+    public long l53140;
+    public long l53141;
+    public long l53142;
+    public long l53143;
+    public long l53144;
+    public long l53145;
+    public long l53146;
+    public long l53147;
+    public long l53148;
+    public long l53149;
+    public long l53150;
+    public long l53151;
+    public long l53152;
+    public long l53153;
+    public long l53154;
+    public long l53155;
+    public long l53156;
+    public long l53157;
+    public long l53158;
+    public long l53159;
+    public long l53160;
+    public long l53161;
+    public long l53162;
+    public long l53163;
+    public long l53164;
+    public long l53165;
+    public long l53166;
+    public long l53167;
+    public long l53168;
+    public long l53169;
+    public long l53170;
+    public long l53171;
+    public long l53172;
+    public long l53173;
+    public long l53174;
+    public long l53175;
+    public long l53176;
+    public long l53177;
+    public long l53178;
+    public long l53179;
+    public long l53180;
+    public long l53181;
+    public long l53182;
+    public long l53183;
+    public long l53184;
+    public long l53185;
+    public long l53186;
+    public long l53187;
+    public long l53188;
+    public long l53189;
+    public long l53190;
+    public long l53191;
+    public long l53192;
+    public long l53193;
+    public long l53194;
+    public long l53195;
+    public long l53196;
+    public long l53197;
+    public long l53198;
+    public long l53199;
+    public long l53200;
+    public long l53201;
+    public long l53202;
+    public long l53203;
+    public long l53204;
+    public long l53205;
+    public long l53206;
+    public long l53207;
+    public long l53208;
+    public long l53209;
+    public long l53210;
+    public long l53211;
+    public long l53212;
+    public long l53213;
+    public long l53214;
+    public long l53215;
+    public long l53216;
+    public long l53217;
+    public long l53218;
+    public long l53219;
+    public long l53220;
+    public long l53221;
+    public long l53222;
+    public long l53223;
+    public long l53224;
+    public long l53225;
+    public long l53226;
+    public long l53227;
+    public long l53228;
+    public long l53229;
+    public long l53230;
+    public long l53231;
+    public long l53232;
+    public long l53233;
+    public long l53234;
+    public long l53235;
+    public long l53236;
+    public long l53237;
+    public long l53238;
+    public long l53239;
+    public long l53240;
+    public long l53241;
+    public long l53242;
+    public long l53243;
+    public long l53244;
+    public long l53245;
+    public long l53246;
+    public long l53247;
+    public long l53248;
+    public long l53249;
+    public long l53250;
+    public long l53251;
+    public long l53252;
+    public long l53253;
+    public long l53254;
+    public long l53255;
+    public long l53256;
+    public long l53257;
+    public long l53258;
+    public long l53259;
+    public long l53260;
+    public long l53261;
+    public long l53262;
+    public long l53263;
+    public long l53264;
+    public long l53265;
+    public long l53266;
+    public long l53267;
+    public long l53268;
+    public long l53269;
+    public long l53270;
+    public long l53271;
+    public long l53272;
+    public long l53273;
+    public long l53274;
+    public long l53275;
+    public long l53276;
+    public long l53277;
+    public long l53278;
+    public long l53279;
+    public long l53280;
+    public long l53281;
+    public long l53282;
+    public long l53283;
+    public long l53284;
+    public long l53285;
+    public long l53286;
+    public long l53287;
+    public long l53288;
+    public long l53289;
+    public long l53290;
+    public long l53291;
+    public long l53292;
+    public long l53293;
+    public long l53294;
+    public long l53295;
+    public long l53296;
+    public long l53297;
+    public long l53298;
+    public long l53299;
+    public long l53300;
+    public long l53301;
+    public long l53302;
+    public long l53303;
+    public long l53304;
+    public long l53305;
+    public long l53306;
+    public long l53307;
+    public long l53308;
+    public long l53309;
+    public long l53310;
+    public long l53311;
+    public long l53312;
+    public long l53313;
+    public long l53314;
+    public long l53315;
+    public long l53316;
+    public long l53317;
+    public long l53318;
+    public long l53319;
+    public long l53320;
+    public long l53321;
+    public long l53322;
+    public long l53323;
+    public long l53324;
+    public long l53325;
+    public long l53326;
+    public long l53327;
+    public long l53328;
+    public long l53329;
+    public long l53330;
+    public long l53331;
+    public long l53332;
+    public long l53333;
+    public long l53334;
+    public long l53335;
+    public long l53336;
+    public long l53337;
+    public long l53338;
+    public long l53339;
+    public long l53340;
+    public long l53341;
+    public long l53342;
+    public long l53343;
+    public long l53344;
+    public long l53345;
+    public long l53346;
+    public long l53347;
+    public long l53348;
+    public long l53349;
+    public long l53350;
+    public long l53351;
+    public long l53352;
+    public long l53353;
+    public long l53354;
+    public long l53355;
+    public long l53356;
+    public long l53357;
+    public long l53358;
+    public long l53359;
+    public long l53360;
+    public long l53361;
+    public long l53362;
+    public long l53363;
+    public long l53364;
+    public long l53365;
+    public long l53366;
+    public long l53367;
+    public long l53368;
+    public long l53369;
+    public long l53370;
+    public long l53371;
+    public long l53372;
+    public long l53373;
+    public long l53374;
+    public long l53375;
+    public long l53376;
+    public long l53377;
+    public long l53378;
+    public long l53379;
+    public long l53380;
+    public long l53381;
+    public long l53382;
+    public long l53383;
+    public long l53384;
+    public long l53385;
+    public long l53386;
+    public long l53387;
+    public long l53388;
+    public long l53389;
+    public long l53390;
+    public long l53391;
+    public long l53392;
+    public long l53393;
+    public long l53394;
+    public long l53395;
+    public long l53396;
+    public long l53397;
+    public long l53398;
+    public long l53399;
+    public long l53400;
+    public long l53401;
+    public long l53402;
+    public long l53403;
+    public long l53404;
+    public long l53405;
+    public long l53406;
+    public long l53407;
+    public long l53408;
+    public long l53409;
+    public long l53410;
+    public long l53411;
+    public long l53412;
+    public long l53413;
+    public long l53414;
+    public long l53415;
+    public long l53416;
+    public long l53417;
+    public long l53418;
+    public long l53419;
+    public long l53420;
+    public long l53421;
+    public long l53422;
+    public long l53423;
+    public long l53424;
+    public long l53425;
+    public long l53426;
+    public long l53427;
+    public long l53428;
+    public long l53429;
+    public long l53430;
+    public long l53431;
+    public long l53432;
+    public long l53433;
+    public long l53434;
+    public long l53435;
+    public long l53436;
+    public long l53437;
+    public long l53438;
+    public long l53439;
+    public long l53440;
+    public long l53441;
+    public long l53442;
+    public long l53443;
+    public long l53444;
+    public long l53445;
+    public long l53446;
+    public long l53447;
+    public long l53448;
+    public long l53449;
+    public long l53450;
+    public long l53451;
+    public long l53452;
+    public long l53453;
+    public long l53454;
+    public long l53455;
+    public long l53456;
+    public long l53457;
+    public long l53458;
+    public long l53459;
+    public long l53460;
+    public long l53461;
+    public long l53462;
+    public long l53463;
+    public long l53464;
+    public long l53465;
+    public long l53466;
+    public long l53467;
+    public long l53468;
+    public long l53469;
+    public long l53470;
+    public long l53471;
+    public long l53472;
+    public long l53473;
+    public long l53474;
+    public long l53475;
+    public long l53476;
+    public long l53477;
+    public long l53478;
+    public long l53479;
+    public long l53480;
+    public long l53481;
+    public long l53482;
+    public long l53483;
+    public long l53484;
+    public long l53485;
+    public long l53486;
+    public long l53487;
+    public long l53488;
+    public long l53489;
+    public long l53490;
+    public long l53491;
+    public long l53492;
+    public long l53493;
+    public long l53494;
+    public long l53495;
+    public long l53496;
+    public long l53497;
+    public long l53498;
+    public long l53499;
+    public long l53500;
+    public long l53501;
+    public long l53502;
+    public long l53503;
+    public long l53504;
+    public long l53505;
+    public long l53506;
+    public long l53507;
+    public long l53508;
+    public long l53509;
+    public long l53510;
+    public long l53511;
+    public long l53512;
+    public long l53513;
+    public long l53514;
+    public long l53515;
+    public long l53516;
+    public long l53517;
+    public long l53518;
+    public long l53519;
+    public long l53520;
+    public long l53521;
+    public long l53522;
+    public long l53523;
+    public long l53524;
+    public long l53525;
+    public long l53526;
+    public long l53527;
+    public long l53528;
+    public long l53529;
+    public long l53530;
+    public long l53531;
+    public long l53532;
+    public long l53533;
+    public long l53534;
+    public long l53535;
+    public long l53536;
+    public long l53537;
+    public long l53538;
+    public long l53539;
+    public long l53540;
+    public long l53541;
+    public long l53542;
+    public long l53543;
+    public long l53544;
+    public long l53545;
+    public long l53546;
+    public long l53547;
+    public long l53548;
+    public long l53549;
+    public long l53550;
+    public long l53551;
+    public long l53552;
+    public long l53553;
+    public long l53554;
+    public long l53555;
+    public long l53556;
+    public long l53557;
+    public long l53558;
+    public long l53559;
+    public long l53560;
+    public long l53561;
+    public long l53562;
+    public long l53563;
+    public long l53564;
+    public long l53565;
+    public long l53566;
+    public long l53567;
+    public long l53568;
+    public long l53569;
+    public long l53570;
+    public long l53571;
+    public long l53572;
+    public long l53573;
+    public long l53574;
+    public long l53575;
+    public long l53576;
+    public long l53577;
+    public long l53578;
+    public long l53579;
+    public long l53580;
+    public long l53581;
+    public long l53582;
+    public long l53583;
+    public long l53584;
+    public long l53585;
+    public long l53586;
+    public long l53587;
+    public long l53588;
+    public long l53589;
+    public long l53590;
+    public long l53591;
+    public long l53592;
+    public long l53593;
+    public long l53594;
+    public long l53595;
+    public long l53596;
+    public long l53597;
+    public long l53598;
+    public long l53599;
+    public long l53600;
+    public long l53601;
+    public long l53602;
+    public long l53603;
+    public long l53604;
+    public long l53605;
+    public long l53606;
+    public long l53607;
+    public long l53608;
+    public long l53609;
+    public long l53610;
+    public long l53611;
+    public long l53612;
+    public long l53613;
+    public long l53614;
+    public long l53615;
+    public long l53616;
+    public long l53617;
+    public long l53618;
+    public long l53619;
+    public long l53620;
+    public long l53621;
+    public long l53622;
+    public long l53623;
+    public long l53624;
+    public long l53625;
+    public long l53626;
+    public long l53627;
+    public long l53628;
+    public long l53629;
+    public long l53630;
+    public long l53631;
+    public long l53632;
+    public long l53633;
+    public long l53634;
+    public long l53635;
+    public long l53636;
+    public long l53637;
+    public long l53638;
+    public long l53639;
+    public long l53640;
+    public long l53641;
+    public long l53642;
+    public long l53643;
+    public long l53644;
+    public long l53645;
+    public long l53646;
+    public long l53647;
+    public long l53648;
+    public long l53649;
+    public long l53650;
+    public long l53651;
+    public long l53652;
+    public long l53653;
+    public long l53654;
+    public long l53655;
+    public long l53656;
+    public long l53657;
+    public long l53658;
+    public long l53659;
+    public long l53660;
+    public long l53661;
+    public long l53662;
+    public long l53663;
+    public long l53664;
+    public long l53665;
+    public long l53666;
+    public long l53667;
+    public long l53668;
+    public long l53669;
+    public long l53670;
+    public long l53671;
+    public long l53672;
+    public long l53673;
+    public long l53674;
+    public long l53675;
+    public long l53676;
+    public long l53677;
+    public long l53678;
+    public long l53679;
+    public long l53680;
+    public long l53681;
+    public long l53682;
+    public long l53683;
+    public long l53684;
+    public long l53685;
+    public long l53686;
+    public long l53687;
+    public long l53688;
+    public long l53689;
+    public long l53690;
+    public long l53691;
+    public long l53692;
+    public long l53693;
+    public long l53694;
+    public long l53695;
+    public long l53696;
+    public long l53697;
+    public long l53698;
+    public long l53699;
+    public long l53700;
+    public long l53701;
+    public long l53702;
+    public long l53703;
+    public long l53704;
+    public long l53705;
+    public long l53706;
+    public long l53707;
+    public long l53708;
+    public long l53709;
+    public long l53710;
+    public long l53711;
+    public long l53712;
+    public long l53713;
+    public long l53714;
+    public long l53715;
+    public long l53716;
+    public long l53717;
+    public long l53718;
+    public long l53719;
+    public long l53720;
+    public long l53721;
+    public long l53722;
+    public long l53723;
+    public long l53724;
+    public long l53725;
+    public long l53726;
+    public long l53727;
+    public long l53728;
+    public long l53729;
+    public long l53730;
+    public long l53731;
+    public long l53732;
+    public long l53733;
+    public long l53734;
+    public long l53735;
+    public long l53736;
+    public long l53737;
+    public long l53738;
+    public long l53739;
+    public long l53740;
+    public long l53741;
+    public long l53742;
+    public long l53743;
+    public long l53744;
+    public long l53745;
+    public long l53746;
+    public long l53747;
+    public long l53748;
+    public long l53749;
+    public long l53750;
+    public long l53751;
+    public long l53752;
+    public long l53753;
+    public long l53754;
+    public long l53755;
+    public long l53756;
+    public long l53757;
+    public long l53758;
+    public long l53759;
+    public long l53760;
+    public long l53761;
+    public long l53762;
+    public long l53763;
+    public long l53764;
+    public long l53765;
+    public long l53766;
+    public long l53767;
+    public long l53768;
+    public long l53769;
+    public long l53770;
+    public long l53771;
+    public long l53772;
+    public long l53773;
+    public long l53774;
+    public long l53775;
+    public long l53776;
+    public long l53777;
+    public long l53778;
+    public long l53779;
+    public long l53780;
+    public long l53781;
+    public long l53782;
+    public long l53783;
+    public long l53784;
+    public long l53785;
+    public long l53786;
+    public long l53787;
+    public long l53788;
+    public long l53789;
+    public long l53790;
+    public long l53791;
+    public long l53792;
+    public long l53793;
+    public long l53794;
+    public long l53795;
+    public long l53796;
+    public long l53797;
+    public long l53798;
+    public long l53799;
+    public long l53800;
+    public long l53801;
+    public long l53802;
+    public long l53803;
+    public long l53804;
+    public long l53805;
+    public long l53806;
+    public long l53807;
+    public long l53808;
+    public long l53809;
+    public long l53810;
+    public long l53811;
+    public long l53812;
+    public long l53813;
+    public long l53814;
+    public long l53815;
+    public long l53816;
+    public long l53817;
+    public long l53818;
+    public long l53819;
+    public long l53820;
+    public long l53821;
+    public long l53822;
+    public long l53823;
+    public long l53824;
+    public long l53825;
+    public long l53826;
+    public long l53827;
+    public long l53828;
+    public long l53829;
+    public long l53830;
+    public long l53831;
+    public long l53832;
+    public long l53833;
+    public long l53834;
+    public long l53835;
+    public long l53836;
+    public long l53837;
+    public long l53838;
+    public long l53839;
+    public long l53840;
+    public long l53841;
+    public long l53842;
+    public long l53843;
+    public long l53844;
+    public long l53845;
+    public long l53846;
+    public long l53847;
+    public long l53848;
+    public long l53849;
+    public long l53850;
+    public long l53851;
+    public long l53852;
+    public long l53853;
+    public long l53854;
+    public long l53855;
+    public long l53856;
+    public long l53857;
+    public long l53858;
+    public long l53859;
+    public long l53860;
+    public long l53861;
+    public long l53862;
+    public long l53863;
+    public long l53864;
+    public long l53865;
+    public long l53866;
+    public long l53867;
+    public long l53868;
+    public long l53869;
+    public long l53870;
+    public long l53871;
+    public long l53872;
+    public long l53873;
+    public long l53874;
+    public long l53875;
+    public long l53876;
+    public long l53877;
+    public long l53878;
+    public long l53879;
+    public long l53880;
+    public long l53881;
+    public long l53882;
+    public long l53883;
+    public long l53884;
+    public long l53885;
+    public long l53886;
+    public long l53887;
+    public long l53888;
+    public long l53889;
+    public long l53890;
+    public long l53891;
+    public long l53892;
+    public long l53893;
+    public long l53894;
+    public long l53895;
+    public long l53896;
+    public long l53897;
+    public long l53898;
+    public long l53899;
+    public long l53900;
+    public long l53901;
+    public long l53902;
+    public long l53903;
+    public long l53904;
+    public long l53905;
+    public long l53906;
+    public long l53907;
+    public long l53908;
+    public long l53909;
+    public long l53910;
+    public long l53911;
+    public long l53912;
+    public long l53913;
+    public long l53914;
+    public long l53915;
+    public long l53916;
+    public long l53917;
+    public long l53918;
+    public long l53919;
+    public long l53920;
+    public long l53921;
+    public long l53922;
+    public long l53923;
+    public long l53924;
+    public long l53925;
+    public long l53926;
+    public long l53927;
+    public long l53928;
+    public long l53929;
+    public long l53930;
+    public long l53931;
+    public long l53932;
+    public long l53933;
+    public long l53934;
+    public long l53935;
+    public long l53936;
+    public long l53937;
+    public long l53938;
+    public long l53939;
+    public long l53940;
+    public long l53941;
+    public long l53942;
+    public long l53943;
+    public long l53944;
+    public long l53945;
+    public long l53946;
+    public long l53947;
+    public long l53948;
+    public long l53949;
+    public long l53950;
+    public long l53951;
+    public long l53952;
+    public long l53953;
+    public long l53954;
+    public long l53955;
+    public long l53956;
+    public long l53957;
+    public long l53958;
+    public long l53959;
+    public long l53960;
+    public long l53961;
+    public long l53962;
+    public long l53963;
+    public long l53964;
+    public long l53965;
+    public long l53966;
+    public long l53967;
+    public long l53968;
+    public long l53969;
+    public long l53970;
+    public long l53971;
+    public long l53972;
+    public long l53973;
+    public long l53974;
+    public long l53975;
+    public long l53976;
+    public long l53977;
+    public long l53978;
+    public long l53979;
+    public long l53980;
+    public long l53981;
+    public long l53982;
+    public long l53983;
+    public long l53984;
+    public long l53985;
+    public long l53986;
+    public long l53987;
+    public long l53988;
+    public long l53989;
+    public long l53990;
+    public long l53991;
+    public long l53992;
+    public long l53993;
+    public long l53994;
+    public long l53995;
+    public long l53996;
+    public long l53997;
+    public long l53998;
+    public long l53999;
+    public long l54000;
+    public long l54001;
+    public long l54002;
+    public long l54003;
+    public long l54004;
+    public long l54005;
+    public long l54006;
+    public long l54007;
+    public long l54008;
+    public long l54009;
+    public long l54010;
+    public long l54011;
+    public long l54012;
+    public long l54013;
+    public long l54014;
+    public long l54015;
+    public long l54016;
+    public long l54017;
+    public long l54018;
+    public long l54019;
+    public long l54020;
+    public long l54021;
+    public long l54022;
+    public long l54023;
+    public long l54024;
+    public long l54025;
+    public long l54026;
+    public long l54027;
+    public long l54028;
+    public long l54029;
+    public long l54030;
+    public long l54031;
+    public long l54032;
+    public long l54033;
+    public long l54034;
+    public long l54035;
+    public long l54036;
+    public long l54037;
+    public long l54038;
+    public long l54039;
+    public long l54040;
+    public long l54041;
+    public long l54042;
+    public long l54043;
+    public long l54044;
+    public long l54045;
+    public long l54046;
+    public long l54047;
+    public long l54048;
+    public long l54049;
+    public long l54050;
+    public long l54051;
+    public long l54052;
+    public long l54053;
+    public long l54054;
+    public long l54055;
+    public long l54056;
+    public long l54057;
+    public long l54058;
+    public long l54059;
+    public long l54060;
+    public long l54061;
+    public long l54062;
+    public long l54063;
+    public long l54064;
+    public long l54065;
+    public long l54066;
+    public long l54067;
+    public long l54068;
+    public long l54069;
+    public long l54070;
+    public long l54071;
+    public long l54072;
+    public long l54073;
+    public long l54074;
+    public long l54075;
+    public long l54076;
+    public long l54077;
+    public long l54078;
+    public long l54079;
+    public long l54080;
+    public long l54081;
+    public long l54082;
+    public long l54083;
+    public long l54084;
+    public long l54085;
+    public long l54086;
+    public long l54087;
+    public long l54088;
+    public long l54089;
+    public long l54090;
+    public long l54091;
+    public long l54092;
+    public long l54093;
+    public long l54094;
+    public long l54095;
+    public long l54096;
+    public long l54097;
+    public long l54098;
+    public long l54099;
+    public long l54100;
+    public long l54101;
+    public long l54102;
+    public long l54103;
+    public long l54104;
+    public long l54105;
+    public long l54106;
+    public long l54107;
+    public long l54108;
+    public long l54109;
+    public long l54110;
+    public long l54111;
+    public long l54112;
+    public long l54113;
+    public long l54114;
+    public long l54115;
+    public long l54116;
+    public long l54117;
+    public long l54118;
+    public long l54119;
+    public long l54120;
+    public long l54121;
+    public long l54122;
+    public long l54123;
+    public long l54124;
+    public long l54125;
+    public long l54126;
+    public long l54127;
+    public long l54128;
+    public long l54129;
+    public long l54130;
+    public long l54131;
+    public long l54132;
+    public long l54133;
+    public long l54134;
+    public long l54135;
+    public long l54136;
+    public long l54137;
+    public long l54138;
+    public long l54139;
+    public long l54140;
+    public long l54141;
+    public long l54142;
+    public long l54143;
+    public long l54144;
+    public long l54145;
+    public long l54146;
+    public long l54147;
+    public long l54148;
+    public long l54149;
+    public long l54150;
+    public long l54151;
+    public long l54152;
+    public long l54153;
+    public long l54154;
+    public long l54155;
+    public long l54156;
+    public long l54157;
+    public long l54158;
+    public long l54159;
+    public long l54160;
+    public long l54161;
+    public long l54162;
+    public long l54163;
+    public long l54164;
+    public long l54165;
+    public long l54166;
+    public long l54167;
+    public long l54168;
+    public long l54169;
+    public long l54170;
+    public long l54171;
+    public long l54172;
+    public long l54173;
+    public long l54174;
+    public long l54175;
+    public long l54176;
+    public long l54177;
+    public long l54178;
+    public long l54179;
+    public long l54180;
+    public long l54181;
+    public long l54182;
+    public long l54183;
+    public long l54184;
+    public long l54185;
+    public long l54186;
+    public long l54187;
+    public long l54188;
+    public long l54189;
+    public long l54190;
+    public long l54191;
+    public long l54192;
+    public long l54193;
+    public long l54194;
+    public long l54195;
+    public long l54196;
+    public long l54197;
+    public long l54198;
+    public long l54199;
+    public long l54200;
+    public long l54201;
+    public long l54202;
+    public long l54203;
+    public long l54204;
+    public long l54205;
+    public long l54206;
+    public long l54207;
+    public long l54208;
+    public long l54209;
+    public long l54210;
+    public long l54211;
+    public long l54212;
+    public long l54213;
+    public long l54214;
+    public long l54215;
+    public long l54216;
+    public long l54217;
+    public long l54218;
+    public long l54219;
+    public long l54220;
+    public long l54221;
+    public long l54222;
+    public long l54223;
+    public long l54224;
+    public long l54225;
+    public long l54226;
+    public long l54227;
+    public long l54228;
+    public long l54229;
+    public long l54230;
+    public long l54231;
+    public long l54232;
+    public long l54233;
+    public long l54234;
+    public long l54235;
+    public long l54236;
+    public long l54237;
+    public long l54238;
+    public long l54239;
+    public long l54240;
+    public long l54241;
+    public long l54242;
+    public long l54243;
+    public long l54244;
+    public long l54245;
+    public long l54246;
+    public long l54247;
+    public long l54248;
+    public long l54249;
+    public long l54250;
+    public long l54251;
+    public long l54252;
+    public long l54253;
+    public long l54254;
+    public long l54255;
+    public long l54256;
+    public long l54257;
+    public long l54258;
+    public long l54259;
+    public long l54260;
+    public long l54261;
+    public long l54262;
+    public long l54263;
+    public long l54264;
+    public long l54265;
+    public long l54266;
+    public long l54267;
+    public long l54268;
+    public long l54269;
+    public long l54270;
+    public long l54271;
+    public long l54272;
+    public long l54273;
+    public long l54274;
+    public long l54275;
+    public long l54276;
+    public long l54277;
+    public long l54278;
+    public long l54279;
+    public long l54280;
+    public long l54281;
+    public long l54282;
+    public long l54283;
+    public long l54284;
+    public long l54285;
+    public long l54286;
+    public long l54287;
+    public long l54288;
+    public long l54289;
+    public long l54290;
+    public long l54291;
+    public long l54292;
+    public long l54293;
+    public long l54294;
+    public long l54295;
+    public long l54296;
+    public long l54297;
+    public long l54298;
+    public long l54299;
+    public long l54300;
+    public long l54301;
+    public long l54302;
+    public long l54303;
+    public long l54304;
+    public long l54305;
+    public long l54306;
+    public long l54307;
+    public long l54308;
+    public long l54309;
+    public long l54310;
+    public long l54311;
+    public long l54312;
+    public long l54313;
+    public long l54314;
+    public long l54315;
+    public long l54316;
+    public long l54317;
+    public long l54318;
+    public long l54319;
+    public long l54320;
+    public long l54321;
+    public long l54322;
+    public long l54323;
+    public long l54324;
+    public long l54325;
+    public long l54326;
+    public long l54327;
+    public long l54328;
+    public long l54329;
+    public long l54330;
+    public long l54331;
+    public long l54332;
+    public long l54333;
+    public long l54334;
+    public long l54335;
+    public long l54336;
+    public long l54337;
+    public long l54338;
+    public long l54339;
+    public long l54340;
+    public long l54341;
+    public long l54342;
+    public long l54343;
+    public long l54344;
+    public long l54345;
+    public long l54346;
+    public long l54347;
+    public long l54348;
+    public long l54349;
+    public long l54350;
+    public long l54351;
+    public long l54352;
+    public long l54353;
+    public long l54354;
+    public long l54355;
+    public long l54356;
+    public long l54357;
+    public long l54358;
+    public long l54359;
+    public long l54360;
+    public long l54361;
+    public long l54362;
+    public long l54363;
+    public long l54364;
+    public long l54365;
+    public long l54366;
+    public long l54367;
+    public long l54368;
+    public long l54369;
+    public long l54370;
+    public long l54371;
+    public long l54372;
+    public long l54373;
+    public long l54374;
+    public long l54375;
+    public long l54376;
+    public long l54377;
+    public long l54378;
+    public long l54379;
+    public long l54380;
+    public long l54381;
+    public long l54382;
+    public long l54383;
+    public long l54384;
+    public long l54385;
+    public long l54386;
+    public long l54387;
+    public long l54388;
+    public long l54389;
+    public long l54390;
+    public long l54391;
+    public long l54392;
+    public long l54393;
+    public long l54394;
+    public long l54395;
+    public long l54396;
+    public long l54397;
+    public long l54398;
+    public long l54399;
+    public long l54400;
+    public long l54401;
+    public long l54402;
+    public long l54403;
+    public long l54404;
+    public long l54405;
+    public long l54406;
+    public long l54407;
+    public long l54408;
+    public long l54409;
+    public long l54410;
+    public long l54411;
+    public long l54412;
+    public long l54413;
+    public long l54414;
+    public long l54415;
+    public long l54416;
+    public long l54417;
+    public long l54418;
+    public long l54419;
+    public long l54420;
+    public long l54421;
+    public long l54422;
+    public long l54423;
+    public long l54424;
+    public long l54425;
+    public long l54426;
+    public long l54427;
+    public long l54428;
+    public long l54429;
+    public long l54430;
+    public long l54431;
+    public long l54432;
+    public long l54433;
+    public long l54434;
+    public long l54435;
+    public long l54436;
+    public long l54437;
+    public long l54438;
+    public long l54439;
+    public long l54440;
+    public long l54441;
+    public long l54442;
+    public long l54443;
+    public long l54444;
+    public long l54445;
+    public long l54446;
+    public long l54447;
+    public long l54448;
+    public long l54449;
+    public long l54450;
+    public long l54451;
+    public long l54452;
+    public long l54453;
+    public long l54454;
+    public long l54455;
+    public long l54456;
+    public long l54457;
+    public long l54458;
+    public long l54459;
+    public long l54460;
+    public long l54461;
+    public long l54462;
+    public long l54463;
+    public long l54464;
+    public long l54465;
+    public long l54466;
+    public long l54467;
+    public long l54468;
+    public long l54469;
+    public long l54470;
+    public long l54471;
+    public long l54472;
+    public long l54473;
+    public long l54474;
+    public long l54475;
+    public long l54476;
+    public long l54477;
+    public long l54478;
+    public long l54479;
+    public long l54480;
+    public long l54481;
+    public long l54482;
+    public long l54483;
+    public long l54484;
+    public long l54485;
+    public long l54486;
+    public long l54487;
+    public long l54488;
+    public long l54489;
+    public long l54490;
+    public long l54491;
+    public long l54492;
+    public long l54493;
+    public long l54494;
+    public long l54495;
+    public long l54496;
+    public long l54497;
+    public long l54498;
+    public long l54499;
+    public long l54500;
+    public long l54501;
+    public long l54502;
+    public long l54503;
+    public long l54504;
+    public long l54505;
+    public long l54506;
+    public long l54507;
+    public long l54508;
+    public long l54509;
+    public long l54510;
+    public long l54511;
+    public long l54512;
+    public long l54513;
+    public long l54514;
+    public long l54515;
+    public long l54516;
+    public long l54517;
+    public long l54518;
+    public long l54519;
+    public long l54520;
+    public long l54521;
+    public long l54522;
+    public long l54523;
+    public long l54524;
+    public long l54525;
+    public long l54526;
+    public long l54527;
+    public long l54528;
+    public long l54529;
+    public long l54530;
+    public long l54531;
+    public long l54532;
+    public long l54533;
+    public long l54534;
+    public long l54535;
+    public long l54536;
+    public long l54537;
+    public long l54538;
+    public long l54539;
+    public long l54540;
+    public long l54541;
+    public long l54542;
+    public long l54543;
+    public long l54544;
+    public long l54545;
+    public long l54546;
+    public long l54547;
+    public long l54548;
+    public long l54549;
+    public long l54550;
+    public long l54551;
+    public long l54552;
+    public long l54553;
+    public long l54554;
+    public long l54555;
+    public long l54556;
+    public long l54557;
+    public long l54558;
+    public long l54559;
+    public long l54560;
+    public long l54561;
+    public long l54562;
+    public long l54563;
+    public long l54564;
+    public long l54565;
+    public long l54566;
+    public long l54567;
+    public long l54568;
+    public long l54569;
+    public long l54570;
+    public long l54571;
+    public long l54572;
+    public long l54573;
+    public long l54574;
+    public long l54575;
+    public long l54576;
+    public long l54577;
+    public long l54578;
+    public long l54579;
+    public long l54580;
+    public long l54581;
+    public long l54582;
+    public long l54583;
+    public long l54584;
+    public long l54585;
+    public long l54586;
+    public long l54587;
+    public long l54588;
+    public long l54589;
+    public long l54590;
+    public long l54591;
+    public long l54592;
+    public long l54593;
+    public long l54594;
+    public long l54595;
+    public long l54596;
+    public long l54597;
+    public long l54598;
+    public long l54599;
+    public long l54600;
+    public long l54601;
+    public long l54602;
+    public long l54603;
+    public long l54604;
+    public long l54605;
+    public long l54606;
+    public long l54607;
+    public long l54608;
+    public long l54609;
+    public long l54610;
+    public long l54611;
+    public long l54612;
+    public long l54613;
+    public long l54614;
+    public long l54615;
+    public long l54616;
+    public long l54617;
+    public long l54618;
+    public long l54619;
+    public long l54620;
+    public long l54621;
+    public long l54622;
+    public long l54623;
+    public long l54624;
+    public long l54625;
+    public long l54626;
+    public long l54627;
+    public long l54628;
+    public long l54629;
+    public long l54630;
+    public long l54631;
+    public long l54632;
+    public long l54633;
+    public long l54634;
+    public long l54635;
+    public long l54636;
+    public long l54637;
+    public long l54638;
+    public long l54639;
+    public long l54640;
+    public long l54641;
+    public long l54642;
+    public long l54643;
+    public long l54644;
+    public long l54645;
+    public long l54646;
+    public long l54647;
+    public long l54648;
+    public long l54649;
+    public long l54650;
+    public long l54651;
+    public long l54652;
+    public long l54653;
+    public long l54654;
+    public long l54655;
+    public long l54656;
+    public long l54657;
+    public long l54658;
+    public long l54659;
+    public long l54660;
+    public long l54661;
+    public long l54662;
+    public long l54663;
+    public long l54664;
+    public long l54665;
+    public long l54666;
+    public long l54667;
+    public long l54668;
+    public long l54669;
+    public long l54670;
+    public long l54671;
+    public long l54672;
+    public long l54673;
+    public long l54674;
+    public long l54675;
+    public long l54676;
+    public long l54677;
+    public long l54678;
+    public long l54679;
+    public long l54680;
+    public long l54681;
+    public long l54682;
+    public long l54683;
+    public long l54684;
+    public long l54685;
+    public long l54686;
+    public long l54687;
+    public long l54688;
+    public long l54689;
+    public long l54690;
+    public long l54691;
+    public long l54692;
+    public long l54693;
+    public long l54694;
+    public long l54695;
+    public long l54696;
+    public long l54697;
+    public long l54698;
+    public long l54699;
+    public long l54700;
+    public long l54701;
+    public long l54702;
+    public long l54703;
+    public long l54704;
+    public long l54705;
+    public long l54706;
+    public long l54707;
+    public long l54708;
+    public long l54709;
+    public long l54710;
+    public long l54711;
+    public long l54712;
+    public long l54713;
+    public long l54714;
+    public long l54715;
+    public long l54716;
+    public long l54717;
+    public long l54718;
+    public long l54719;
+    public long l54720;
+    public long l54721;
+    public long l54722;
+    public long l54723;
+    public long l54724;
+    public long l54725;
+    public long l54726;
+    public long l54727;
+    public long l54728;
+    public long l54729;
+    public long l54730;
+    public long l54731;
+    public long l54732;
+    public long l54733;
+    public long l54734;
+    public long l54735;
+    public long l54736;
+    public long l54737;
+    public long l54738;
+    public long l54739;
+    public long l54740;
+    public long l54741;
+    public long l54742;
+    public long l54743;
+    public long l54744;
+    public long l54745;
+    public long l54746;
+    public long l54747;
+    public long l54748;
+    public long l54749;
+    public long l54750;
+    public long l54751;
+    public long l54752;
+    public long l54753;
+    public long l54754;
+    public long l54755;
+    public long l54756;
+    public long l54757;
+    public long l54758;
+    public long l54759;
+    public long l54760;
+    public long l54761;
+    public long l54762;
+    public long l54763;
+    public long l54764;
+    public long l54765;
+    public long l54766;
+    public long l54767;
+    public long l54768;
+    public long l54769;
+    public long l54770;
+    public long l54771;
+    public long l54772;
+    public long l54773;
+    public long l54774;
+    public long l54775;
+    public long l54776;
+    public long l54777;
+    public long l54778;
+    public long l54779;
+    public long l54780;
+    public long l54781;
+    public long l54782;
+    public long l54783;
+    public long l54784;
+    public long l54785;
+    public long l54786;
+    public long l54787;
+    public long l54788;
+    public long l54789;
+    public long l54790;
+    public long l54791;
+    public long l54792;
+    public long l54793;
+    public long l54794;
+    public long l54795;
+    public long l54796;
+    public long l54797;
+    public long l54798;
+    public long l54799;
+    public long l54800;
+    public long l54801;
+    public long l54802;
+    public long l54803;
+    public long l54804;
+    public long l54805;
+    public long l54806;
+    public long l54807;
+    public long l54808;
+    public long l54809;
+    public long l54810;
+    public long l54811;
+    public long l54812;
+    public long l54813;
+    public long l54814;
+    public long l54815;
+    public long l54816;
+    public long l54817;
+    public long l54818;
+    public long l54819;
+    public long l54820;
+    public long l54821;
+    public long l54822;
+    public long l54823;
+    public long l54824;
+    public long l54825;
+    public long l54826;
+    public long l54827;
+    public long l54828;
+    public long l54829;
+    public long l54830;
+    public long l54831;
+    public long l54832;
+    public long l54833;
+    public long l54834;
+    public long l54835;
+    public long l54836;
+    public long l54837;
+    public long l54838;
+    public long l54839;
+    public long l54840;
+    public long l54841;
+    public long l54842;
+    public long l54843;
+    public long l54844;
+    public long l54845;
+    public long l54846;
+    public long l54847;
+    public long l54848;
+    public long l54849;
+    public long l54850;
+    public long l54851;
+    public long l54852;
+    public long l54853;
+    public long l54854;
+    public long l54855;
+    public long l54856;
+    public long l54857;
+    public long l54858;
+    public long l54859;
+    public long l54860;
+    public long l54861;
+    public long l54862;
+    public long l54863;
+    public long l54864;
+    public long l54865;
+    public long l54866;
+    public long l54867;
+    public long l54868;
+    public long l54869;
+    public long l54870;
+    public long l54871;
+    public long l54872;
+    public long l54873;
+    public long l54874;
+    public long l54875;
+    public long l54876;
+    public long l54877;
+    public long l54878;
+    public long l54879;
+    public long l54880;
+    public long l54881;
+    public long l54882;
+    public long l54883;
+    public long l54884;
+    public long l54885;
+    public long l54886;
+    public long l54887;
+    public long l54888;
+    public long l54889;
+    public long l54890;
+    public long l54891;
+    public long l54892;
+    public long l54893;
+    public long l54894;
+    public long l54895;
+    public long l54896;
+    public long l54897;
+    public long l54898;
+    public long l54899;
+    public long l54900;
+    public long l54901;
+    public long l54902;
+    public long l54903;
+    public long l54904;
+    public long l54905;
+    public long l54906;
+    public long l54907;
+    public long l54908;
+    public long l54909;
+    public long l54910;
+    public long l54911;
+    public long l54912;
+    public long l54913;
+    public long l54914;
+    public long l54915;
+    public long l54916;
+    public long l54917;
+    public long l54918;
+    public long l54919;
+    public long l54920;
+    public long l54921;
+    public long l54922;
+    public long l54923;
+    public long l54924;
+    public long l54925;
+    public long l54926;
+    public long l54927;
+    public long l54928;
+    public long l54929;
+    public long l54930;
+    public long l54931;
+    public long l54932;
+    public long l54933;
+    public long l54934;
+    public long l54935;
+    public long l54936;
+    public long l54937;
+    public long l54938;
+    public long l54939;
+    public long l54940;
+    public long l54941;
+    public long l54942;
+    public long l54943;
+    public long l54944;
+    public long l54945;
+    public long l54946;
+    public long l54947;
+    public long l54948;
+    public long l54949;
+    public long l54950;
+    public long l54951;
+    public long l54952;
+    public long l54953;
+    public long l54954;
+    public long l54955;
+    public long l54956;
+    public long l54957;
+    public long l54958;
+    public long l54959;
+    public long l54960;
+    public long l54961;
+    public long l54962;
+    public long l54963;
+    public long l54964;
+    public long l54965;
+    public long l54966;
+    public long l54967;
+    public long l54968;
+    public long l54969;
+    public long l54970;
+    public long l54971;
+    public long l54972;
+    public long l54973;
+    public long l54974;
+    public long l54975;
+    public long l54976;
+    public long l54977;
+    public long l54978;
+    public long l54979;
+    public long l54980;
+    public long l54981;
+    public long l54982;
+    public long l54983;
+    public long l54984;
+    public long l54985;
+    public long l54986;
+    public long l54987;
+    public long l54988;
+    public long l54989;
+    public long l54990;
+    public long l54991;
+    public long l54992;
+    public long l54993;
+    public long l54994;
+    public long l54995;
+    public long l54996;
+    public long l54997;
+    public long l54998;
+    public long l54999;
+    public long l55000;
+    public long l55001;
+    public long l55002;
+    public long l55003;
+    public long l55004;
+    public long l55005;
+    public long l55006;
+    public long l55007;
+    public long l55008;
+    public long l55009;
+    public long l55010;
+    public long l55011;
+    public long l55012;
+    public long l55013;
+    public long l55014;
+    public long l55015;
+    public long l55016;
+    public long l55017;
+    public long l55018;
+    public long l55019;
+    public long l55020;
+    public long l55021;
+    public long l55022;
+    public long l55023;
+    public long l55024;
+    public long l55025;
+    public long l55026;
+    public long l55027;
+    public long l55028;
+    public long l55029;
+    public long l55030;
+    public long l55031;
+    public long l55032;
+    public long l55033;
+    public long l55034;
+    public long l55035;
+    public long l55036;
+    public long l55037;
+    public long l55038;
+    public long l55039;
+    public long l55040;
+    public long l55041;
+    public long l55042;
+    public long l55043;
+    public long l55044;
+    public long l55045;
+    public long l55046;
+    public long l55047;
+    public long l55048;
+    public long l55049;
+    public long l55050;
+    public long l55051;
+    public long l55052;
+    public long l55053;
+    public long l55054;
+    public long l55055;
+    public long l55056;
+    public long l55057;
+    public long l55058;
+    public long l55059;
+    public long l55060;
+    public long l55061;
+    public long l55062;
+    public long l55063;
+    public long l55064;
+    public long l55065;
+    public long l55066;
+    public long l55067;
+    public long l55068;
+    public long l55069;
+    public long l55070;
+    public long l55071;
+    public long l55072;
+    public long l55073;
+    public long l55074;
+    public long l55075;
+    public long l55076;
+    public long l55077;
+    public long l55078;
+    public long l55079;
+    public long l55080;
+    public long l55081;
+    public long l55082;
+    public long l55083;
+    public long l55084;
+    public long l55085;
+    public long l55086;
+    public long l55087;
+    public long l55088;
+    public long l55089;
+    public long l55090;
+    public long l55091;
+    public long l55092;
+    public long l55093;
+    public long l55094;
+    public long l55095;
+    public long l55096;
+    public long l55097;
+    public long l55098;
+    public long l55099;
+    public long l55100;
+    public long l55101;
+    public long l55102;
+    public long l55103;
+    public long l55104;
+    public long l55105;
+    public long l55106;
+    public long l55107;
+    public long l55108;
+    public long l55109;
+    public long l55110;
+    public long l55111;
+    public long l55112;
+    public long l55113;
+    public long l55114;
+    public long l55115;
+    public long l55116;
+    public long l55117;
+    public long l55118;
+    public long l55119;
+    public long l55120;
+    public long l55121;
+    public long l55122;
+    public long l55123;
+    public long l55124;
+    public long l55125;
+    public long l55126;
+    public long l55127;
+    public long l55128;
+    public long l55129;
+    public long l55130;
+    public long l55131;
+    public long l55132;
+    public long l55133;
+    public long l55134;
+    public long l55135;
+    public long l55136;
+    public long l55137;
+    public long l55138;
+    public long l55139;
+    public long l55140;
+    public long l55141;
+    public long l55142;
+    public long l55143;
+    public long l55144;
+    public long l55145;
+    public long l55146;
+    public long l55147;
+    public long l55148;
+    public long l55149;
+    public long l55150;
+    public long l55151;
+    public long l55152;
+    public long l55153;
+    public long l55154;
+    public long l55155;
+    public long l55156;
+    public long l55157;
+    public long l55158;
+    public long l55159;
+    public long l55160;
+    public long l55161;
+    public long l55162;
+    public long l55163;
+    public long l55164;
+    public long l55165;
+    public long l55166;
+    public long l55167;
+    public long l55168;
+    public long l55169;
+    public long l55170;
+    public long l55171;
+    public long l55172;
+    public long l55173;
+    public long l55174;
+    public long l55175;
+    public long l55176;
+    public long l55177;
+    public long l55178;
+    public long l55179;
+    public long l55180;
+    public long l55181;
+    public long l55182;
+    public long l55183;
+    public long l55184;
+    public long l55185;
+    public long l55186;
+    public long l55187;
+    public long l55188;
+    public long l55189;
+    public long l55190;
+    public long l55191;
+    public long l55192;
+    public long l55193;
+    public long l55194;
+    public long l55195;
+    public long l55196;
+    public long l55197;
+    public long l55198;
+    public long l55199;
+    public long l55200;
+    public long l55201;
+    public long l55202;
+    public long l55203;
+    public long l55204;
+    public long l55205;
+    public long l55206;
+    public long l55207;
+    public long l55208;
+    public long l55209;
+    public long l55210;
+    public long l55211;
+    public long l55212;
+    public long l55213;
+    public long l55214;
+    public long l55215;
+    public long l55216;
+    public long l55217;
+    public long l55218;
+    public long l55219;
+    public long l55220;
+    public long l55221;
+    public long l55222;
+    public long l55223;
+    public long l55224;
+    public long l55225;
+    public long l55226;
+    public long l55227;
+    public long l55228;
+    public long l55229;
+    public long l55230;
+    public long l55231;
+    public long l55232;
+    public long l55233;
+    public long l55234;
+    public long l55235;
+    public long l55236;
+    public long l55237;
+    public long l55238;
+    public long l55239;
+    public long l55240;
+    public long l55241;
+    public long l55242;
+    public long l55243;
+    public long l55244;
+    public long l55245;
+    public long l55246;
+    public long l55247;
+    public long l55248;
+    public long l55249;
+    public long l55250;
+    public long l55251;
+    public long l55252;
+    public long l55253;
+    public long l55254;
+    public long l55255;
+    public long l55256;
+    public long l55257;
+    public long l55258;
+    public long l55259;
+    public long l55260;
+    public long l55261;
+    public long l55262;
+    public long l55263;
+    public long l55264;
+    public long l55265;
+    public long l55266;
+    public long l55267;
+    public long l55268;
+    public long l55269;
+    public long l55270;
+    public long l55271;
+    public long l55272;
+    public long l55273;
+    public long l55274;
+    public long l55275;
+    public long l55276;
+    public long l55277;
+    public long l55278;
+    public long l55279;
+    public long l55280;
+    public long l55281;
+    public long l55282;
+    public long l55283;
+    public long l55284;
+    public long l55285;
+    public long l55286;
+    public long l55287;
+    public long l55288;
+    public long l55289;
+    public long l55290;
+    public long l55291;
+    public long l55292;
+    public long l55293;
+    public long l55294;
+    public long l55295;
+    public long l55296;
+    public long l55297;
+    public long l55298;
+    public long l55299;
+    public long l55300;
+    public long l55301;
+    public long l55302;
+    public long l55303;
+    public long l55304;
+    public long l55305;
+    public long l55306;
+    public long l55307;
+    public long l55308;
+    public long l55309;
+    public long l55310;
+    public long l55311;
+    public long l55312;
+    public long l55313;
+    public long l55314;
+    public long l55315;
+    public long l55316;
+    public long l55317;
+    public long l55318;
+    public long l55319;
+    public long l55320;
+    public long l55321;
+    public long l55322;
+    public long l55323;
+    public long l55324;
+    public long l55325;
+    public long l55326;
+    public long l55327;
+    public long l55328;
+    public long l55329;
+    public long l55330;
+    public long l55331;
+    public long l55332;
+    public long l55333;
+    public long l55334;
+    public long l55335;
+    public long l55336;
+    public long l55337;
+    public long l55338;
+    public long l55339;
+    public long l55340;
+    public long l55341;
+    public long l55342;
+    public long l55343;
+    public long l55344;
+    public long l55345;
+    public long l55346;
+    public long l55347;
+    public long l55348;
+    public long l55349;
+    public long l55350;
+    public long l55351;
+    public long l55352;
+    public long l55353;
+    public long l55354;
+    public long l55355;
+    public long l55356;
+    public long l55357;
+    public long l55358;
+    public long l55359;
+    public long l55360;
+    public long l55361;
+    public long l55362;
+    public long l55363;
+    public long l55364;
+    public long l55365;
+    public long l55366;
+    public long l55367;
+    public long l55368;
+    public long l55369;
+    public long l55370;
+    public long l55371;
+    public long l55372;
+    public long l55373;
+    public long l55374;
+    public long l55375;
+    public long l55376;
+    public long l55377;
+    public long l55378;
+    public long l55379;
+    public long l55380;
+    public long l55381;
+    public long l55382;
+    public long l55383;
+    public long l55384;
+    public long l55385;
+    public long l55386;
+    public long l55387;
+    public long l55388;
+    public long l55389;
+    public long l55390;
+    public long l55391;
+    public long l55392;
+    public long l55393;
+    public long l55394;
+    public long l55395;
+    public long l55396;
+    public long l55397;
+    public long l55398;
+    public long l55399;
+    public long l55400;
+    public long l55401;
+    public long l55402;
+    public long l55403;
+    public long l55404;
+    public long l55405;
+    public long l55406;
+    public long l55407;
+    public long l55408;
+    public long l55409;
+    public long l55410;
+    public long l55411;
+    public long l55412;
+    public long l55413;
+    public long l55414;
+    public long l55415;
+    public long l55416;
+    public long l55417;
+    public long l55418;
+    public long l55419;
+    public long l55420;
+    public long l55421;
+    public long l55422;
+    public long l55423;
+    public long l55424;
+    public long l55425;
+    public long l55426;
+    public long l55427;
+    public long l55428;
+    public long l55429;
+    public long l55430;
+    public long l55431;
+    public long l55432;
+    public long l55433;
+    public long l55434;
+    public long l55435;
+    public long l55436;
+    public long l55437;
+    public long l55438;
+    public long l55439;
+    public long l55440;
+    public long l55441;
+    public long l55442;
+    public long l55443;
+    public long l55444;
+    public long l55445;
+    public long l55446;
+    public long l55447;
+    public long l55448;
+    public long l55449;
+    public long l55450;
+    public long l55451;
+    public long l55452;
+    public long l55453;
+    public long l55454;
+    public long l55455;
+    public long l55456;
+    public long l55457;
+    public long l55458;
+    public long l55459;
+    public long l55460;
+    public long l55461;
+    public long l55462;
+    public long l55463;
+    public long l55464;
+    public long l55465;
+    public long l55466;
+    public long l55467;
+    public long l55468;
+    public long l55469;
+    public long l55470;
+    public long l55471;
+    public long l55472;
+    public long l55473;
+    public long l55474;
+    public long l55475;
+    public long l55476;
+    public long l55477;
+    public long l55478;
+    public long l55479;
+    public long l55480;
+    public long l55481;
+    public long l55482;
+    public long l55483;
+    public long l55484;
+    public long l55485;
+    public long l55486;
+    public long l55487;
+    public long l55488;
+    public long l55489;
+    public long l55490;
+    public long l55491;
+    public long l55492;
+    public long l55493;
+    public long l55494;
+    public long l55495;
+    public long l55496;
+    public long l55497;
+    public long l55498;
+    public long l55499;
+    public long l55500;
+    public long l55501;
+    public long l55502;
+    public long l55503;
+    public long l55504;
+    public long l55505;
+    public long l55506;
+    public long l55507;
+    public long l55508;
+    public long l55509;
+    public long l55510;
+    public long l55511;
+    public long l55512;
+    public long l55513;
+    public long l55514;
+    public long l55515;
+    public long l55516;
+    public long l55517;
+    public long l55518;
+    public long l55519;
+    public long l55520;
+    public long l55521;
+    public long l55522;
+    public long l55523;
+    public long l55524;
+    public long l55525;
+    public long l55526;
+    public long l55527;
+    public long l55528;
+    public long l55529;
+    public long l55530;
+    public long l55531;
+    public long l55532;
+    public long l55533;
+    public long l55534;
+    public long l55535;
+    public long l55536;
+    public long l55537;
+    public long l55538;
+    public long l55539;
+    public long l55540;
+    public long l55541;
+    public long l55542;
+    public long l55543;
+    public long l55544;
+    public long l55545;
+    public long l55546;
+    public long l55547;
+    public long l55548;
+    public long l55549;
+    public long l55550;
+    public long l55551;
+    public long l55552;
+    public long l55553;
+    public long l55554;
+    public long l55555;
+    public long l55556;
+    public long l55557;
+    public long l55558;
+    public long l55559;
+    public long l55560;
+    public long l55561;
+    public long l55562;
+    public long l55563;
+    public long l55564;
+    public long l55565;
+    public long l55566;
+    public long l55567;
+    public long l55568;
+    public long l55569;
+    public long l55570;
+    public long l55571;
+    public long l55572;
+    public long l55573;
+    public long l55574;
+    public long l55575;
+    public long l55576;
+    public long l55577;
+    public long l55578;
+    public long l55579;
+    public long l55580;
+    public long l55581;
+    public long l55582;
+    public long l55583;
+    public long l55584;
+    public long l55585;
+    public long l55586;
+    public long l55587;
+    public long l55588;
+    public long l55589;
+    public long l55590;
+    public long l55591;
+    public long l55592;
+    public long l55593;
+    public long l55594;
+    public long l55595;
+    public long l55596;
+    public long l55597;
+    public long l55598;
+    public long l55599;
+    public long l55600;
+    public long l55601;
+    public long l55602;
+    public long l55603;
+    public long l55604;
+    public long l55605;
+    public long l55606;
+    public long l55607;
+    public long l55608;
+    public long l55609;
+    public long l55610;
+    public long l55611;
+    public long l55612;
+    public long l55613;
+    public long l55614;
+    public long l55615;
+    public long l55616;
+    public long l55617;
+    public long l55618;
+    public long l55619;
+    public long l55620;
+    public long l55621;
+    public long l55622;
+    public long l55623;
+    public long l55624;
+    public long l55625;
+    public long l55626;
+    public long l55627;
+    public long l55628;
+    public long l55629;
+    public long l55630;
+    public long l55631;
+    public long l55632;
+    public long l55633;
+    public long l55634;
+    public long l55635;
+    public long l55636;
+    public long l55637;
+    public long l55638;
+    public long l55639;
+    public long l55640;
+    public long l55641;
+    public long l55642;
+    public long l55643;
+    public long l55644;
+    public long l55645;
+    public long l55646;
+    public long l55647;
+    public long l55648;
+    public long l55649;
+    public long l55650;
+    public long l55651;
+    public long l55652;
+    public long l55653;
+    public long l55654;
+    public long l55655;
+    public long l55656;
+    public long l55657;
+    public long l55658;
+    public long l55659;
+    public long l55660;
+    public long l55661;
+    public long l55662;
+    public long l55663;
+    public long l55664;
+    public long l55665;
+    public long l55666;
+    public long l55667;
+    public long l55668;
+    public long l55669;
+    public long l55670;
+    public long l55671;
+    public long l55672;
+    public long l55673;
+    public long l55674;
+    public long l55675;
+    public long l55676;
+    public long l55677;
+    public long l55678;
+    public long l55679;
+    public long l55680;
+    public long l55681;
+    public long l55682;
+    public long l55683;
+    public long l55684;
+    public long l55685;
+    public long l55686;
+    public long l55687;
+    public long l55688;
+    public long l55689;
+    public long l55690;
+    public long l55691;
+    public long l55692;
+    public long l55693;
+    public long l55694;
+    public long l55695;
+    public long l55696;
+    public long l55697;
+    public long l55698;
+    public long l55699;
+    public long l55700;
+    public long l55701;
+    public long l55702;
+    public long l55703;
+    public long l55704;
+    public long l55705;
+    public long l55706;
+    public long l55707;
+    public long l55708;
+    public long l55709;
+    public long l55710;
+    public long l55711;
+    public long l55712;
+    public long l55713;
+    public long l55714;
+    public long l55715;
+    public long l55716;
+    public long l55717;
+    public long l55718;
+    public long l55719;
+    public long l55720;
+    public long l55721;
+    public long l55722;
+    public long l55723;
+    public long l55724;
+    public long l55725;
+    public long l55726;
+    public long l55727;
+    public long l55728;
+    public long l55729;
+    public long l55730;
+    public long l55731;
+    public long l55732;
+    public long l55733;
+    public long l55734;
+    public long l55735;
+    public long l55736;
+    public long l55737;
+    public long l55738;
+    public long l55739;
+    public long l55740;
+    public long l55741;
+    public long l55742;
+    public long l55743;
+    public long l55744;
+    public long l55745;
+    public long l55746;
+    public long l55747;
+    public long l55748;
+    public long l55749;
+    public long l55750;
+    public long l55751;
+    public long l55752;
+    public long l55753;
+    public long l55754;
+    public long l55755;
+    public long l55756;
+    public long l55757;
+    public long l55758;
+    public long l55759;
+    public long l55760;
+    public long l55761;
+    public long l55762;
+    public long l55763;
+    public long l55764;
+    public long l55765;
+    public long l55766;
+    public long l55767;
+    public long l55768;
+    public long l55769;
+    public long l55770;
+    public long l55771;
+    public long l55772;
+    public long l55773;
+    public long l55774;
+    public long l55775;
+    public long l55776;
+    public long l55777;
+    public long l55778;
+    public long l55779;
+    public long l55780;
+    public long l55781;
+    public long l55782;
+    public long l55783;
+    public long l55784;
+    public long l55785;
+    public long l55786;
+    public long l55787;
+    public long l55788;
+    public long l55789;
+    public long l55790;
+    public long l55791;
+    public long l55792;
+    public long l55793;
+    public long l55794;
+    public long l55795;
+    public long l55796;
+    public long l55797;
+    public long l55798;
+    public long l55799;
+    public long l55800;
+    public long l55801;
+    public long l55802;
+    public long l55803;
+    public long l55804;
+    public long l55805;
+    public long l55806;
+    public long l55807;
+    public long l55808;
+    public long l55809;
+    public long l55810;
+    public long l55811;
+    public long l55812;
+    public long l55813;
+    public long l55814;
+    public long l55815;
+    public long l55816;
+    public long l55817;
+    public long l55818;
+    public long l55819;
+    public long l55820;
+    public long l55821;
+    public long l55822;
+    public long l55823;
+    public long l55824;
+    public long l55825;
+    public long l55826;
+    public long l55827;
+    public long l55828;
+    public long l55829;
+    public long l55830;
+    public long l55831;
+    public long l55832;
+    public long l55833;
+    public long l55834;
+    public long l55835;
+    public long l55836;
+    public long l55837;
+    public long l55838;
+    public long l55839;
+    public long l55840;
+    public long l55841;
+    public long l55842;
+    public long l55843;
+    public long l55844;
+    public long l55845;
+    public long l55846;
+    public long l55847;
+    public long l55848;
+    public long l55849;
+    public long l55850;
+    public long l55851;
+    public long l55852;
+    public long l55853;
+    public long l55854;
+    public long l55855;
+    public long l55856;
+    public long l55857;
+    public long l55858;
+    public long l55859;
+    public long l55860;
+    public long l55861;
+    public long l55862;
+    public long l55863;
+    public long l55864;
+    public long l55865;
+    public long l55866;
+    public long l55867;
+    public long l55868;
+    public long l55869;
+    public long l55870;
+    public long l55871;
+    public long l55872;
+    public long l55873;
+    public long l55874;
+    public long l55875;
+    public long l55876;
+    public long l55877;
+    public long l55878;
+    public long l55879;
+    public long l55880;
+    public long l55881;
+    public long l55882;
+    public long l55883;
+    public long l55884;
+    public long l55885;
+    public long l55886;
+    public long l55887;
+    public long l55888;
+    public long l55889;
+    public long l55890;
+    public long l55891;
+    public long l55892;
+    public long l55893;
+    public long l55894;
+    public long l55895;
+    public long l55896;
+    public long l55897;
+    public long l55898;
+    public long l55899;
+    public long l55900;
+    public long l55901;
+    public long l55902;
+    public long l55903;
+    public long l55904;
+    public long l55905;
+    public long l55906;
+    public long l55907;
+    public long l55908;
+    public long l55909;
+    public long l55910;
+    public long l55911;
+    public long l55912;
+    public long l55913;
+    public long l55914;
+    public long l55915;
+    public long l55916;
+    public long l55917;
+    public long l55918;
+    public long l55919;
+    public long l55920;
+    public long l55921;
+    public long l55922;
+    public long l55923;
+    public long l55924;
+    public long l55925;
+    public long l55926;
+    public long l55927;
+    public long l55928;
+    public long l55929;
+    public long l55930;
+    public long l55931;
+    public long l55932;
+    public long l55933;
+    public long l55934;
+    public long l55935;
+    public long l55936;
+    public long l55937;
+    public long l55938;
+    public long l55939;
+    public long l55940;
+    public long l55941;
+    public long l55942;
+    public long l55943;
+    public long l55944;
+    public long l55945;
+    public long l55946;
+    public long l55947;
+    public long l55948;
+    public long l55949;
+    public long l55950;
+    public long l55951;
+    public long l55952;
+    public long l55953;
+    public long l55954;
+    public long l55955;
+    public long l55956;
+    public long l55957;
+    public long l55958;
+    public long l55959;
+    public long l55960;
+    public long l55961;
+    public long l55962;
+    public long l55963;
+    public long l55964;
+    public long l55965;
+    public long l55966;
+    public long l55967;
+    public long l55968;
+    public long l55969;
+    public long l55970;
+    public long l55971;
+    public long l55972;
+    public long l55973;
+    public long l55974;
+    public long l55975;
+    public long l55976;
+    public long l55977;
+    public long l55978;
+    public long l55979;
+    public long l55980;
+    public long l55981;
+    public long l55982;
+    public long l55983;
+    public long l55984;
+    public long l55985;
+    public long l55986;
+    public long l55987;
+    public long l55988;
+    public long l55989;
+    public long l55990;
+    public long l55991;
+    public long l55992;
+    public long l55993;
+    public long l55994;
+    public long l55995;
+    public long l55996;
+    public long l55997;
+    public long l55998;
+    public long l55999;
+    public long l56000;
+    public long l56001;
+    public long l56002;
+    public long l56003;
+    public long l56004;
+    public long l56005;
+    public long l56006;
+    public long l56007;
+    public long l56008;
+    public long l56009;
+    public long l56010;
+    public long l56011;
+    public long l56012;
+    public long l56013;
+    public long l56014;
+    public long l56015;
+    public long l56016;
+    public long l56017;
+    public long l56018;
+    public long l56019;
+    public long l56020;
+    public long l56021;
+    public long l56022;
+    public long l56023;
+    public long l56024;
+    public long l56025;
+    public long l56026;
+    public long l56027;
+    public long l56028;
+    public long l56029;
+    public long l56030;
+    public long l56031;
+    public long l56032;
+    public long l56033;
+    public long l56034;
+    public long l56035;
+    public long l56036;
+    public long l56037;
+    public long l56038;
+    public long l56039;
+    public long l56040;
+    public long l56041;
+    public long l56042;
+    public long l56043;
+    public long l56044;
+    public long l56045;
+    public long l56046;
+    public long l56047;
+    public long l56048;
+    public long l56049;
+    public long l56050;
+    public long l56051;
+    public long l56052;
+    public long l56053;
+    public long l56054;
+    public long l56055;
+    public long l56056;
+    public long l56057;
+    public long l56058;
+    public long l56059;
+    public long l56060;
+    public long l56061;
+    public long l56062;
+    public long l56063;
+    public long l56064;
+    public long l56065;
+    public long l56066;
+    public long l56067;
+    public long l56068;
+    public long l56069;
+    public long l56070;
+    public long l56071;
+    public long l56072;
+    public long l56073;
+    public long l56074;
+    public long l56075;
+    public long l56076;
+    public long l56077;
+    public long l56078;
+    public long l56079;
+    public long l56080;
+    public long l56081;
+    public long l56082;
+    public long l56083;
+    public long l56084;
+    public long l56085;
+    public long l56086;
+    public long l56087;
+    public long l56088;
+    public long l56089;
+    public long l56090;
+    public long l56091;
+    public long l56092;
+    public long l56093;
+    public long l56094;
+    public long l56095;
+    public long l56096;
+    public long l56097;
+    public long l56098;
+    public long l56099;
+    public long l56100;
+    public long l56101;
+    public long l56102;
+    public long l56103;
+    public long l56104;
+    public long l56105;
+    public long l56106;
+    public long l56107;
+    public long l56108;
+    public long l56109;
+    public long l56110;
+    public long l56111;
+    public long l56112;
+    public long l56113;
+    public long l56114;
+    public long l56115;
+    public long l56116;
+    public long l56117;
+    public long l56118;
+    public long l56119;
+    public long l56120;
+    public long l56121;
+    public long l56122;
+    public long l56123;
+    public long l56124;
+    public long l56125;
+    public long l56126;
+    public long l56127;
+    public long l56128;
+    public long l56129;
+    public long l56130;
+    public long l56131;
+    public long l56132;
+    public long l56133;
+    public long l56134;
+    public long l56135;
+    public long l56136;
+    public long l56137;
+    public long l56138;
+    public long l56139;
+    public long l56140;
+    public long l56141;
+    public long l56142;
+    public long l56143;
+    public long l56144;
+    public long l56145;
+    public long l56146;
+    public long l56147;
+    public long l56148;
+    public long l56149;
+    public long l56150;
+    public long l56151;
+    public long l56152;
+    public long l56153;
+    public long l56154;
+    public long l56155;
+    public long l56156;
+    public long l56157;
+    public long l56158;
+    public long l56159;
+    public long l56160;
+    public long l56161;
+    public long l56162;
+    public long l56163;
+    public long l56164;
+    public long l56165;
+    public long l56166;
+    public long l56167;
+    public long l56168;
+    public long l56169;
+    public long l56170;
+    public long l56171;
+    public long l56172;
+    public long l56173;
+    public long l56174;
+    public long l56175;
+    public long l56176;
+    public long l56177;
+    public long l56178;
+    public long l56179;
+    public long l56180;
+    public long l56181;
+    public long l56182;
+    public long l56183;
+    public long l56184;
+    public long l56185;
+    public long l56186;
+    public long l56187;
+    public long l56188;
+    public long l56189;
+    public long l56190;
+    public long l56191;
+    public long l56192;
+    public long l56193;
+    public long l56194;
+    public long l56195;
+    public long l56196;
+    public long l56197;
+    public long l56198;
+    public long l56199;
+    public long l56200;
+    public long l56201;
+    public long l56202;
+    public long l56203;
+    public long l56204;
+    public long l56205;
+    public long l56206;
+    public long l56207;
+    public long l56208;
+    public long l56209;
+    public long l56210;
+    public long l56211;
+    public long l56212;
+    public long l56213;
+    public long l56214;
+    public long l56215;
+    public long l56216;
+    public long l56217;
+    public long l56218;
+    public long l56219;
+    public long l56220;
+    public long l56221;
+    public long l56222;
+    public long l56223;
+    public long l56224;
+    public long l56225;
+    public long l56226;
+    public long l56227;
+    public long l56228;
+    public long l56229;
+    public long l56230;
+    public long l56231;
+    public long l56232;
+    public long l56233;
+    public long l56234;
+    public long l56235;
+    public long l56236;
+    public long l56237;
+    public long l56238;
+    public long l56239;
+    public long l56240;
+    public long l56241;
+    public long l56242;
+    public long l56243;
+    public long l56244;
+    public long l56245;
+    public long l56246;
+    public long l56247;
+    public long l56248;
+    public long l56249;
+    public long l56250;
+    public long l56251;
+    public long l56252;
+    public long l56253;
+    public long l56254;
+    public long l56255;
+    public long l56256;
+    public long l56257;
+    public long l56258;
+    public long l56259;
+    public long l56260;
+    public long l56261;
+    public long l56262;
+    public long l56263;
+    public long l56264;
+    public long l56265;
+    public long l56266;
+    public long l56267;
+    public long l56268;
+    public long l56269;
+    public long l56270;
+    public long l56271;
+    public long l56272;
+    public long l56273;
+    public long l56274;
+    public long l56275;
+    public long l56276;
+    public long l56277;
+    public long l56278;
+    public long l56279;
+    public long l56280;
+    public long l56281;
+    public long l56282;
+    public long l56283;
+    public long l56284;
+    public long l56285;
+    public long l56286;
+    public long l56287;
+    public long l56288;
+    public long l56289;
+    public long l56290;
+    public long l56291;
+    public long l56292;
+    public long l56293;
+    public long l56294;
+    public long l56295;
+    public long l56296;
+    public long l56297;
+    public long l56298;
+    public long l56299;
+    public long l56300;
+    public long l56301;
+    public long l56302;
+    public long l56303;
+    public long l56304;
+    public long l56305;
+    public long l56306;
+    public long l56307;
+    public long l56308;
+    public long l56309;
+    public long l56310;
+    public long l56311;
+    public long l56312;
+    public long l56313;
+    public long l56314;
+    public long l56315;
+    public long l56316;
+    public long l56317;
+    public long l56318;
+    public long l56319;
+    public long l56320;
+    public long l56321;
+    public long l56322;
+    public long l56323;
+    public long l56324;
+    public long l56325;
+    public long l56326;
+    public long l56327;
+    public long l56328;
+    public long l56329;
+    public long l56330;
+    public long l56331;
+    public long l56332;
+    public long l56333;
+    public long l56334;
+    public long l56335;
+    public long l56336;
+    public long l56337;
+    public long l56338;
+    public long l56339;
+    public long l56340;
+    public long l56341;
+    public long l56342;
+    public long l56343;
+    public long l56344;
+    public long l56345;
+    public long l56346;
+    public long l56347;
+    public long l56348;
+    public long l56349;
+    public long l56350;
+    public long l56351;
+    public long l56352;
+    public long l56353;
+    public long l56354;
+    public long l56355;
+    public long l56356;
+    public long l56357;
+    public long l56358;
+    public long l56359;
+    public long l56360;
+    public long l56361;
+    public long l56362;
+    public long l56363;
+    public long l56364;
+    public long l56365;
+    public long l56366;
+    public long l56367;
+    public long l56368;
+    public long l56369;
+    public long l56370;
+    public long l56371;
+    public long l56372;
+    public long l56373;
+    public long l56374;
+    public long l56375;
+    public long l56376;
+    public long l56377;
+    public long l56378;
+    public long l56379;
+    public long l56380;
+    public long l56381;
+    public long l56382;
+    public long l56383;
+    public long l56384;
+    public long l56385;
+    public long l56386;
+    public long l56387;
+    public long l56388;
+    public long l56389;
+    public long l56390;
+    public long l56391;
+    public long l56392;
+    public long l56393;
+    public long l56394;
+    public long l56395;
+    public long l56396;
+    public long l56397;
+    public long l56398;
+    public long l56399;
+    public long l56400;
+    public long l56401;
+    public long l56402;
+    public long l56403;
+    public long l56404;
+    public long l56405;
+    public long l56406;
+    public long l56407;
+    public long l56408;
+    public long l56409;
+    public long l56410;
+    public long l56411;
+    public long l56412;
+    public long l56413;
+    public long l56414;
+    public long l56415;
+    public long l56416;
+    public long l56417;
+    public long l56418;
+    public long l56419;
+    public long l56420;
+    public long l56421;
+    public long l56422;
+    public long l56423;
+    public long l56424;
+    public long l56425;
+    public long l56426;
+    public long l56427;
+    public long l56428;
+    public long l56429;
+    public long l56430;
+    public long l56431;
+    public long l56432;
+    public long l56433;
+    public long l56434;
+    public long l56435;
+    public long l56436;
+    public long l56437;
+    public long l56438;
+    public long l56439;
+    public long l56440;
+    public long l56441;
+    public long l56442;
+    public long l56443;
+    public long l56444;
+    public long l56445;
+    public long l56446;
+    public long l56447;
+    public long l56448;
+    public long l56449;
+    public long l56450;
+    public long l56451;
+    public long l56452;
+    public long l56453;
+    public long l56454;
+    public long l56455;
+    public long l56456;
+    public long l56457;
+    public long l56458;
+    public long l56459;
+    public long l56460;
+    public long l56461;
+    public long l56462;
+    public long l56463;
+    public long l56464;
+    public long l56465;
+    public long l56466;
+    public long l56467;
+    public long l56468;
+    public long l56469;
+    public long l56470;
+    public long l56471;
+    public long l56472;
+    public long l56473;
+    public long l56474;
+    public long l56475;
+    public long l56476;
+    public long l56477;
+    public long l56478;
+    public long l56479;
+    public long l56480;
+    public long l56481;
+    public long l56482;
+    public long l56483;
+    public long l56484;
+    public long l56485;
+    public long l56486;
+    public long l56487;
+    public long l56488;
+    public long l56489;
+    public long l56490;
+    public long l56491;
+    public long l56492;
+    public long l56493;
+    public long l56494;
+    public long l56495;
+    public long l56496;
+    public long l56497;
+    public long l56498;
+    public long l56499;
+    public long l56500;
+    public long l56501;
+    public long l56502;
+    public long l56503;
+    public long l56504;
+    public long l56505;
+    public long l56506;
+    public long l56507;
+    public long l56508;
+    public long l56509;
+    public long l56510;
+    public long l56511;
+    public long l56512;
+    public long l56513;
+    public long l56514;
+    public long l56515;
+    public long l56516;
+    public long l56517;
+    public long l56518;
+    public long l56519;
+    public long l56520;
+    public long l56521;
+    public long l56522;
+    public long l56523;
+    public long l56524;
+    public long l56525;
+    public long l56526;
+    public long l56527;
+    public long l56528;
+    public long l56529;
+    public long l56530;
+    public long l56531;
+    public long l56532;
+    public long l56533;
+    public long l56534;
+    public long l56535;
+    public long l56536;
+    public long l56537;
+    public long l56538;
+    public long l56539;
+    public long l56540;
+    public long l56541;
+    public long l56542;
+    public long l56543;
+    public long l56544;
+    public long l56545;
+    public long l56546;
+    public long l56547;
+    public long l56548;
+    public long l56549;
+    public long l56550;
+    public long l56551;
+    public long l56552;
+    public long l56553;
+    public long l56554;
+    public long l56555;
+    public long l56556;
+    public long l56557;
+    public long l56558;
+    public long l56559;
+    public long l56560;
+    public long l56561;
+    public long l56562;
+    public long l56563;
+    public long l56564;
+    public long l56565;
+    public long l56566;
+    public long l56567;
+    public long l56568;
+    public long l56569;
+    public long l56570;
+    public long l56571;
+    public long l56572;
+    public long l56573;
+    public long l56574;
+    public long l56575;
+    public long l56576;
+    public long l56577;
+    public long l56578;
+    public long l56579;
+    public long l56580;
+    public long l56581;
+    public long l56582;
+    public long l56583;
+    public long l56584;
+    public long l56585;
+    public long l56586;
+    public long l56587;
+    public long l56588;
+    public long l56589;
+    public long l56590;
+    public long l56591;
+    public long l56592;
+    public long l56593;
+    public long l56594;
+    public long l56595;
+    public long l56596;
+    public long l56597;
+    public long l56598;
+    public long l56599;
+    public long l56600;
+    public long l56601;
+    public long l56602;
+    public long l56603;
+    public long l56604;
+    public long l56605;
+    public long l56606;
+    public long l56607;
+    public long l56608;
+    public long l56609;
+    public long l56610;
+    public long l56611;
+    public long l56612;
+    public long l56613;
+    public long l56614;
+    public long l56615;
+    public long l56616;
+    public long l56617;
+    public long l56618;
+    public long l56619;
+    public long l56620;
+    public long l56621;
+    public long l56622;
+    public long l56623;
+    public long l56624;
+    public long l56625;
+    public long l56626;
+    public long l56627;
+    public long l56628;
+    public long l56629;
+    public long l56630;
+    public long l56631;
+    public long l56632;
+    public long l56633;
+    public long l56634;
+    public long l56635;
+    public long l56636;
+    public long l56637;
+    public long l56638;
+    public long l56639;
+    public long l56640;
+    public long l56641;
+    public long l56642;
+    public long l56643;
+    public long l56644;
+    public long l56645;
+    public long l56646;
+    public long l56647;
+    public long l56648;
+    public long l56649;
+    public long l56650;
+    public long l56651;
+    public long l56652;
+    public long l56653;
+    public long l56654;
+    public long l56655;
+    public long l56656;
+    public long l56657;
+    public long l56658;
+    public long l56659;
+    public long l56660;
+    public long l56661;
+    public long l56662;
+    public long l56663;
+    public long l56664;
+    public long l56665;
+    public long l56666;
+    public long l56667;
+    public long l56668;
+    public long l56669;
+    public long l56670;
+    public long l56671;
+    public long l56672;
+    public long l56673;
+    public long l56674;
+    public long l56675;
+    public long l56676;
+    public long l56677;
+    public long l56678;
+    public long l56679;
+    public long l56680;
+    public long l56681;
+    public long l56682;
+    public long l56683;
+    public long l56684;
+    public long l56685;
+    public long l56686;
+    public long l56687;
+    public long l56688;
+    public long l56689;
+    public long l56690;
+    public long l56691;
+    public long l56692;
+    public long l56693;
+    public long l56694;
+    public long l56695;
+    public long l56696;
+    public long l56697;
+    public long l56698;
+    public long l56699;
+    public long l56700;
+    public long l56701;
+    public long l56702;
+    public long l56703;
+    public long l56704;
+    public long l56705;
+    public long l56706;
+    public long l56707;
+    public long l56708;
+    public long l56709;
+    public long l56710;
+    public long l56711;
+    public long l56712;
+    public long l56713;
+    public long l56714;
+    public long l56715;
+    public long l56716;
+    public long l56717;
+    public long l56718;
+    public long l56719;
+    public long l56720;
+    public long l56721;
+    public long l56722;
+    public long l56723;
+    public long l56724;
+    public long l56725;
+    public long l56726;
+    public long l56727;
+    public long l56728;
+    public long l56729;
+    public long l56730;
+    public long l56731;
+    public long l56732;
+    public long l56733;
+    public long l56734;
+    public long l56735;
+    public long l56736;
+    public long l56737;
+    public long l56738;
+    public long l56739;
+    public long l56740;
+    public long l56741;
+    public long l56742;
+    public long l56743;
+    public long l56744;
+    public long l56745;
+    public long l56746;
+    public long l56747;
+    public long l56748;
+    public long l56749;
+    public long l56750;
+    public long l56751;
+    public long l56752;
+    public long l56753;
+    public long l56754;
+    public long l56755;
+    public long l56756;
+    public long l56757;
+    public long l56758;
+    public long l56759;
+    public long l56760;
+    public long l56761;
+    public long l56762;
+    public long l56763;
+    public long l56764;
+    public long l56765;
+    public long l56766;
+    public long l56767;
+    public long l56768;
+    public long l56769;
+    public long l56770;
+    public long l56771;
+    public long l56772;
+    public long l56773;
+    public long l56774;
+    public long l56775;
+    public long l56776;
+    public long l56777;
+    public long l56778;
+    public long l56779;
+    public long l56780;
+    public long l56781;
+    public long l56782;
+    public long l56783;
+    public long l56784;
+    public long l56785;
+    public long l56786;
+    public long l56787;
+    public long l56788;
+    public long l56789;
+    public long l56790;
+    public long l56791;
+    public long l56792;
+    public long l56793;
+    public long l56794;
+    public long l56795;
+    public long l56796;
+    public long l56797;
+    public long l56798;
+    public long l56799;
+    public long l56800;
+    public long l56801;
+    public long l56802;
+    public long l56803;
+    public long l56804;
+    public long l56805;
+    public long l56806;
+    public long l56807;
+    public long l56808;
+    public long l56809;
+    public long l56810;
+    public long l56811;
+    public long l56812;
+    public long l56813;
+    public long l56814;
+    public long l56815;
+    public long l56816;
+    public long l56817;
+    public long l56818;
+    public long l56819;
+    public long l56820;
+    public long l56821;
+    public long l56822;
+    public long l56823;
+    public long l56824;
+    public long l56825;
+    public long l56826;
+    public long l56827;
+    public long l56828;
+    public long l56829;
+    public long l56830;
+    public long l56831;
+    public long l56832;
+    public long l56833;
+    public long l56834;
+    public long l56835;
+    public long l56836;
+    public long l56837;
+    public long l56838;
+    public long l56839;
+    public long l56840;
+    public long l56841;
+    public long l56842;
+    public long l56843;
+    public long l56844;
+    public long l56845;
+    public long l56846;
+    public long l56847;
+    public long l56848;
+    public long l56849;
+    public long l56850;
+    public long l56851;
+    public long l56852;
+    public long l56853;
+    public long l56854;
+    public long l56855;
+    public long l56856;
+    public long l56857;
+    public long l56858;
+    public long l56859;
+    public long l56860;
+    public long l56861;
+    public long l56862;
+    public long l56863;
+    public long l56864;
+    public long l56865;
+    public long l56866;
+    public long l56867;
+    public long l56868;
+    public long l56869;
+    public long l56870;
+    public long l56871;
+    public long l56872;
+    public long l56873;
+    public long l56874;
+    public long l56875;
+    public long l56876;
+    public long l56877;
+    public long l56878;
+    public long l56879;
+    public long l56880;
+    public long l56881;
+    public long l56882;
+    public long l56883;
+    public long l56884;
+    public long l56885;
+    public long l56886;
+    public long l56887;
+    public long l56888;
+    public long l56889;
+    public long l56890;
+    public long l56891;
+    public long l56892;
+    public long l56893;
+    public long l56894;
+    public long l56895;
+    public long l56896;
+    public long l56897;
+    public long l56898;
+    public long l56899;
+    public long l56900;
+    public long l56901;
+    public long l56902;
+    public long l56903;
+    public long l56904;
+    public long l56905;
+    public long l56906;
+    public long l56907;
+    public long l56908;
+    public long l56909;
+    public long l56910;
+    public long l56911;
+    public long l56912;
+    public long l56913;
+    public long l56914;
+    public long l56915;
+    public long l56916;
+    public long l56917;
+    public long l56918;
+    public long l56919;
+    public long l56920;
+    public long l56921;
+    public long l56922;
+    public long l56923;
+    public long l56924;
+    public long l56925;
+    public long l56926;
+    public long l56927;
+    public long l56928;
+    public long l56929;
+    public long l56930;
+    public long l56931;
+    public long l56932;
+    public long l56933;
+    public long l56934;
+    public long l56935;
+    public long l56936;
+    public long l56937;
+    public long l56938;
+    public long l56939;
+    public long l56940;
+    public long l56941;
+    public long l56942;
+    public long l56943;
+    public long l56944;
+    public long l56945;
+    public long l56946;
+    public long l56947;
+    public long l56948;
+    public long l56949;
+    public long l56950;
+    public long l56951;
+    public long l56952;
+    public long l56953;
+    public long l56954;
+    public long l56955;
+    public long l56956;
+    public long l56957;
+    public long l56958;
+    public long l56959;
+    public long l56960;
+    public long l56961;
+    public long l56962;
+    public long l56963;
+    public long l56964;
+    public long l56965;
+    public long l56966;
+    public long l56967;
+    public long l56968;
+    public long l56969;
+    public long l56970;
+    public long l56971;
+    public long l56972;
+    public long l56973;
+    public long l56974;
+    public long l56975;
+    public long l56976;
+    public long l56977;
+    public long l56978;
+    public long l56979;
+    public long l56980;
+    public long l56981;
+    public long l56982;
+    public long l56983;
+    public long l56984;
+    public long l56985;
+    public long l56986;
+    public long l56987;
+    public long l56988;
+    public long l56989;
+    public long l56990;
+    public long l56991;
+    public long l56992;
+    public long l56993;
+    public long l56994;
+    public long l56995;
+    public long l56996;
+    public long l56997;
+    public long l56998;
+    public long l56999;
+    public long l57000;
+    public long l57001;
+    public long l57002;
+    public long l57003;
+    public long l57004;
+    public long l57005;
+    public long l57006;
+    public long l57007;
+    public long l57008;
+    public long l57009;
+    public long l57010;
+    public long l57011;
+    public long l57012;
+    public long l57013;
+    public long l57014;
+    public long l57015;
+    public long l57016;
+    public long l57017;
+    public long l57018;
+    public long l57019;
+    public long l57020;
+    public long l57021;
+    public long l57022;
+    public long l57023;
+    public long l57024;
+    public long l57025;
+    public long l57026;
+    public long l57027;
+    public long l57028;
+    public long l57029;
+    public long l57030;
+    public long l57031;
+    public long l57032;
+    public long l57033;
+    public long l57034;
+    public long l57035;
+    public long l57036;
+    public long l57037;
+    public long l57038;
+    public long l57039;
+    public long l57040;
+    public long l57041;
+    public long l57042;
+    public long l57043;
+    public long l57044;
+    public long l57045;
+    public long l57046;
+    public long l57047;
+    public long l57048;
+    public long l57049;
+    public long l57050;
+    public long l57051;
+    public long l57052;
+    public long l57053;
+    public long l57054;
+    public long l57055;
+    public long l57056;
+    public long l57057;
+    public long l57058;
+    public long l57059;
+    public long l57060;
+    public long l57061;
+    public long l57062;
+    public long l57063;
+    public long l57064;
+    public long l57065;
+    public long l57066;
+    public long l57067;
+    public long l57068;
+    public long l57069;
+    public long l57070;
+    public long l57071;
+    public long l57072;
+    public long l57073;
+    public long l57074;
+    public long l57075;
+    public long l57076;
+    public long l57077;
+    public long l57078;
+    public long l57079;
+    public long l57080;
+    public long l57081;
+    public long l57082;
+    public long l57083;
+    public long l57084;
+    public long l57085;
+    public long l57086;
+    public long l57087;
+    public long l57088;
+    public long l57089;
+    public long l57090;
+    public long l57091;
+    public long l57092;
+    public long l57093;
+    public long l57094;
+    public long l57095;
+    public long l57096;
+    public long l57097;
+    public long l57098;
+    public long l57099;
+    public long l57100;
+    public long l57101;
+    public long l57102;
+    public long l57103;
+    public long l57104;
+    public long l57105;
+    public long l57106;
+    public long l57107;
+    public long l57108;
+    public long l57109;
+    public long l57110;
+    public long l57111;
+    public long l57112;
+    public long l57113;
+    public long l57114;
+    public long l57115;
+    public long l57116;
+    public long l57117;
+    public long l57118;
+    public long l57119;
+    public long l57120;
+    public long l57121;
+    public long l57122;
+    public long l57123;
+    public long l57124;
+    public long l57125;
+    public long l57126;
+    public long l57127;
+    public long l57128;
+    public long l57129;
+    public long l57130;
+    public long l57131;
+    public long l57132;
+    public long l57133;
+    public long l57134;
+    public long l57135;
+    public long l57136;
+    public long l57137;
+    public long l57138;
+    public long l57139;
+    public long l57140;
+    public long l57141;
+    public long l57142;
+    public long l57143;
+    public long l57144;
+    public long l57145;
+    public long l57146;
+    public long l57147;
+    public long l57148;
+    public long l57149;
+    public long l57150;
+    public long l57151;
+    public long l57152;
+    public long l57153;
+    public long l57154;
+    public long l57155;
+    public long l57156;
+    public long l57157;
+    public long l57158;
+    public long l57159;
+    public long l57160;
+    public long l57161;
+    public long l57162;
+    public long l57163;
+    public long l57164;
+    public long l57165;
+    public long l57166;
+    public long l57167;
+    public long l57168;
+    public long l57169;
+    public long l57170;
+    public long l57171;
+    public long l57172;
+    public long l57173;
+    public long l57174;
+    public long l57175;
+    public long l57176;
+    public long l57177;
+    public long l57178;
+    public long l57179;
+    public long l57180;
+    public long l57181;
+    public long l57182;
+    public long l57183;
+    public long l57184;
+    public long l57185;
+    public long l57186;
+    public long l57187;
+    public long l57188;
+    public long l57189;
+    public long l57190;
+    public long l57191;
+    public long l57192;
+    public long l57193;
+    public long l57194;
+    public long l57195;
+    public long l57196;
+    public long l57197;
+    public long l57198;
+    public long l57199;
+    public long l57200;
+    public long l57201;
+    public long l57202;
+    public long l57203;
+    public long l57204;
+    public long l57205;
+    public long l57206;
+    public long l57207;
+    public long l57208;
+    public long l57209;
+    public long l57210;
+    public long l57211;
+    public long l57212;
+    public long l57213;
+    public long l57214;
+    public long l57215;
+    public long l57216;
+    public long l57217;
+    public long l57218;
+    public long l57219;
+    public long l57220;
+    public long l57221;
+    public long l57222;
+    public long l57223;
+    public long l57224;
+    public long l57225;
+    public long l57226;
+    public long l57227;
+    public long l57228;
+    public long l57229;
+    public long l57230;
+    public long l57231;
+    public long l57232;
+    public long l57233;
+    public long l57234;
+    public long l57235;
+    public long l57236;
+    public long l57237;
+    public long l57238;
+    public long l57239;
+    public long l57240;
+    public long l57241;
+    public long l57242;
+    public long l57243;
+    public long l57244;
+    public long l57245;
+    public long l57246;
+    public long l57247;
+    public long l57248;
+    public long l57249;
+    public long l57250;
+    public long l57251;
+    public long l57252;
+    public long l57253;
+    public long l57254;
+    public long l57255;
+    public long l57256;
+    public long l57257;
+    public long l57258;
+    public long l57259;
+    public long l57260;
+    public long l57261;
+    public long l57262;
+    public long l57263;
+    public long l57264;
+    public long l57265;
+    public long l57266;
+    public long l57267;
+    public long l57268;
+    public long l57269;
+    public long l57270;
+    public long l57271;
+    public long l57272;
+    public long l57273;
+    public long l57274;
+    public long l57275;
+    public long l57276;
+    public long l57277;
+    public long l57278;
+    public long l57279;
+    public long l57280;
+    public long l57281;
+    public long l57282;
+    public long l57283;
+    public long l57284;
+    public long l57285;
+    public long l57286;
+    public long l57287;
+    public long l57288;
+    public long l57289;
+    public long l57290;
+    public long l57291;
+    public long l57292;
+    public long l57293;
+    public long l57294;
+    public long l57295;
+    public long l57296;
+    public long l57297;
+    public long l57298;
+    public long l57299;
+    public long l57300;
+    public long l57301;
+    public long l57302;
+    public long l57303;
+    public long l57304;
+    public long l57305;
+    public long l57306;
+    public long l57307;
+    public long l57308;
+    public long l57309;
+    public long l57310;
+    public long l57311;
+    public long l57312;
+    public long l57313;
+    public long l57314;
+    public long l57315;
+    public long l57316;
+    public long l57317;
+    public long l57318;
+    public long l57319;
+    public long l57320;
+    public long l57321;
+    public long l57322;
+    public long l57323;
+    public long l57324;
+    public long l57325;
+    public long l57326;
+    public long l57327;
+    public long l57328;
+    public long l57329;
+    public long l57330;
+    public long l57331;
+    public long l57332;
+    public long l57333;
+    public long l57334;
+    public long l57335;
+    public long l57336;
+    public long l57337;
+    public long l57338;
+    public long l57339;
+    public long l57340;
+    public long l57341;
+    public long l57342;
+    public long l57343;
+    public long l57344;
+    public long l57345;
+    public long l57346;
+    public long l57347;
+    public long l57348;
+    public long l57349;
+    public long l57350;
+    public long l57351;
+    public long l57352;
+    public long l57353;
+    public long l57354;
+    public long l57355;
+    public long l57356;
+    public long l57357;
+    public long l57358;
+    public long l57359;
+    public long l57360;
+    public long l57361;
+    public long l57362;
+    public long l57363;
+    public long l57364;
+    public long l57365;
+    public long l57366;
+    public long l57367;
+    public long l57368;
+    public long l57369;
+    public long l57370;
+    public long l57371;
+    public long l57372;
+    public long l57373;
+    public long l57374;
+    public long l57375;
+    public long l57376;
+    public long l57377;
+    public long l57378;
+    public long l57379;
+    public long l57380;
+    public long l57381;
+    public long l57382;
+    public long l57383;
+    public long l57384;
+    public long l57385;
+    public long l57386;
+    public long l57387;
+    public long l57388;
+    public long l57389;
+    public long l57390;
+    public long l57391;
+    public long l57392;
+    public long l57393;
+    public long l57394;
+    public long l57395;
+    public long l57396;
+    public long l57397;
+    public long l57398;
+    public long l57399;
+    public long l57400;
+    public long l57401;
+    public long l57402;
+    public long l57403;
+    public long l57404;
+    public long l57405;
+    public long l57406;
+    public long l57407;
+    public long l57408;
+    public long l57409;
+    public long l57410;
+    public long l57411;
+    public long l57412;
+    public long l57413;
+    public long l57414;
+    public long l57415;
+    public long l57416;
+    public long l57417;
+    public long l57418;
+    public long l57419;
+    public long l57420;
+    public long l57421;
+    public long l57422;
+    public long l57423;
+    public long l57424;
+    public long l57425;
+    public long l57426;
+    public long l57427;
+    public long l57428;
+    public long l57429;
+    public long l57430;
+    public long l57431;
+    public long l57432;
+    public long l57433;
+    public long l57434;
+    public long l57435;
+    public long l57436;
+    public long l57437;
+    public long l57438;
+    public long l57439;
+    public long l57440;
+    public long l57441;
+    public long l57442;
+    public long l57443;
+    public long l57444;
+    public long l57445;
+    public long l57446;
+    public long l57447;
+    public long l57448;
+    public long l57449;
+    public long l57450;
+    public long l57451;
+    public long l57452;
+    public long l57453;
+    public long l57454;
+    public long l57455;
+    public long l57456;
+    public long l57457;
+    public long l57458;
+    public long l57459;
+    public long l57460;
+    public long l57461;
+    public long l57462;
+    public long l57463;
+    public long l57464;
+    public long l57465;
+    public long l57466;
+    public long l57467;
+    public long l57468;
+    public long l57469;
+    public long l57470;
+    public long l57471;
+    public long l57472;
+    public long l57473;
+    public long l57474;
+    public long l57475;
+    public long l57476;
+    public long l57477;
+    public long l57478;
+    public long l57479;
+    public long l57480;
+    public long l57481;
+    public long l57482;
+    public long l57483;
+    public long l57484;
+    public long l57485;
+    public long l57486;
+    public long l57487;
+    public long l57488;
+    public long l57489;
+    public long l57490;
+    public long l57491;
+    public long l57492;
+    public long l57493;
+    public long l57494;
+    public long l57495;
+    public long l57496;
+    public long l57497;
+    public long l57498;
+    public long l57499;
+    public long l57500;
+    public long l57501;
+    public long l57502;
+    public long l57503;
+    public long l57504;
+    public long l57505;
+    public long l57506;
+    public long l57507;
+    public long l57508;
+    public long l57509;
+    public long l57510;
+    public long l57511;
+    public long l57512;
+    public long l57513;
+    public long l57514;
+    public long l57515;
+    public long l57516;
+    public long l57517;
+    public long l57518;
+    public long l57519;
+    public long l57520;
+    public long l57521;
+    public long l57522;
+    public long l57523;
+    public long l57524;
+    public long l57525;
+    public long l57526;
+    public long l57527;
+    public long l57528;
+    public long l57529;
+    public long l57530;
+    public long l57531;
+    public long l57532;
+    public long l57533;
+    public long l57534;
+    public long l57535;
+    public long l57536;
+    public long l57537;
+    public long l57538;
+    public long l57539;
+    public long l57540;
+    public long l57541;
+    public long l57542;
+    public long l57543;
+    public long l57544;
+    public long l57545;
+    public long l57546;
+    public long l57547;
+    public long l57548;
+    public long l57549;
+    public long l57550;
+    public long l57551;
+    public long l57552;
+    public long l57553;
+    public long l57554;
+    public long l57555;
+    public long l57556;
+    public long l57557;
+    public long l57558;
+    public long l57559;
+    public long l57560;
+    public long l57561;
+    public long l57562;
+    public long l57563;
+    public long l57564;
+    public long l57565;
+    public long l57566;
+    public long l57567;
+    public long l57568;
+    public long l57569;
+    public long l57570;
+    public long l57571;
+    public long l57572;
+    public long l57573;
+    public long l57574;
+    public long l57575;
+    public long l57576;
+    public long l57577;
+    public long l57578;
+    public long l57579;
+    public long l57580;
+    public long l57581;
+    public long l57582;
+    public long l57583;
+    public long l57584;
+    public long l57585;
+    public long l57586;
+    public long l57587;
+    public long l57588;
+    public long l57589;
+    public long l57590;
+    public long l57591;
+    public long l57592;
+    public long l57593;
+    public long l57594;
+    public long l57595;
+    public long l57596;
+    public long l57597;
+    public long l57598;
+    public long l57599;
+    public long l57600;
+    public long l57601;
+    public long l57602;
+    public long l57603;
+    public long l57604;
+    public long l57605;
+    public long l57606;
+    public long l57607;
+    public long l57608;
+    public long l57609;
+    public long l57610;
+    public long l57611;
+    public long l57612;
+    public long l57613;
+    public long l57614;
+    public long l57615;
+    public long l57616;
+    public long l57617;
+    public long l57618;
+    public long l57619;
+    public long l57620;
+    public long l57621;
+    public long l57622;
+    public long l57623;
+    public long l57624;
+    public long l57625;
+    public long l57626;
+    public long l57627;
+    public long l57628;
+    public long l57629;
+    public long l57630;
+    public long l57631;
+    public long l57632;
+    public long l57633;
+    public long l57634;
+    public long l57635;
+    public long l57636;
+    public long l57637;
+    public long l57638;
+    public long l57639;
+    public long l57640;
+    public long l57641;
+    public long l57642;
+    public long l57643;
+    public long l57644;
+    public long l57645;
+    public long l57646;
+    public long l57647;
+    public long l57648;
+    public long l57649;
+    public long l57650;
+    public long l57651;
+    public long l57652;
+    public long l57653;
+    public long l57654;
+    public long l57655;
+    public long l57656;
+    public long l57657;
+    public long l57658;
+    public long l57659;
+    public long l57660;
+    public long l57661;
+    public long l57662;
+    public long l57663;
+    public long l57664;
+    public long l57665;
+    public long l57666;
+    public long l57667;
+    public long l57668;
+    public long l57669;
+    public long l57670;
+    public long l57671;
+    public long l57672;
+    public long l57673;
+    public long l57674;
+    public long l57675;
+    public long l57676;
+    public long l57677;
+    public long l57678;
+    public long l57679;
+    public long l57680;
+    public long l57681;
+    public long l57682;
+    public long l57683;
+    public long l57684;
+    public long l57685;
+    public long l57686;
+    public long l57687;
+    public long l57688;
+    public long l57689;
+    public long l57690;
+    public long l57691;
+    public long l57692;
+    public long l57693;
+    public long l57694;
+    public long l57695;
+    public long l57696;
+    public long l57697;
+    public long l57698;
+    public long l57699;
+    public long l57700;
+    public long l57701;
+    public long l57702;
+    public long l57703;
+    public long l57704;
+    public long l57705;
+    public long l57706;
+    public long l57707;
+    public long l57708;
+    public long l57709;
+    public long l57710;
+    public long l57711;
+    public long l57712;
+    public long l57713;
+    public long l57714;
+    public long l57715;
+    public long l57716;
+    public long l57717;
+    public long l57718;
+    public long l57719;
+    public long l57720;
+    public long l57721;
+    public long l57722;
+    public long l57723;
+    public long l57724;
+    public long l57725;
+    public long l57726;
+    public long l57727;
+    public long l57728;
+    public long l57729;
+    public long l57730;
+    public long l57731;
+    public long l57732;
+    public long l57733;
+    public long l57734;
+    public long l57735;
+    public long l57736;
+    public long l57737;
+    public long l57738;
+    public long l57739;
+    public long l57740;
+    public long l57741;
+    public long l57742;
+    public long l57743;
+    public long l57744;
+    public long l57745;
+    public long l57746;
+    public long l57747;
+    public long l57748;
+    public long l57749;
+    public long l57750;
+    public long l57751;
+    public long l57752;
+    public long l57753;
+    public long l57754;
+    public long l57755;
+    public long l57756;
+    public long l57757;
+    public long l57758;
+    public long l57759;
+    public long l57760;
+    public long l57761;
+    public long l57762;
+    public long l57763;
+    public long l57764;
+    public long l57765;
+    public long l57766;
+    public long l57767;
+    public long l57768;
+    public long l57769;
+    public long l57770;
+    public long l57771;
+    public long l57772;
+    public long l57773;
+    public long l57774;
+    public long l57775;
+    public long l57776;
+    public long l57777;
+    public long l57778;
+    public long l57779;
+    public long l57780;
+    public long l57781;
+    public long l57782;
+    public long l57783;
+    public long l57784;
+    public long l57785;
+    public long l57786;
+    public long l57787;
+    public long l57788;
+    public long l57789;
+    public long l57790;
+    public long l57791;
+    public long l57792;
+    public long l57793;
+    public long l57794;
+    public long l57795;
+    public long l57796;
+    public long l57797;
+    public long l57798;
+    public long l57799;
+    public long l57800;
+    public long l57801;
+    public long l57802;
+    public long l57803;
+    public long l57804;
+    public long l57805;
+    public long l57806;
+    public long l57807;
+    public long l57808;
+    public long l57809;
+    public long l57810;
+    public long l57811;
+    public long l57812;
+    public long l57813;
+    public long l57814;
+    public long l57815;
+    public long l57816;
+    public long l57817;
+    public long l57818;
+    public long l57819;
+    public long l57820;
+    public long l57821;
+    public long l57822;
+    public long l57823;
+    public long l57824;
+    public long l57825;
+    public long l57826;
+    public long l57827;
+    public long l57828;
+    public long l57829;
+    public long l57830;
+    public long l57831;
+    public long l57832;
+    public long l57833;
+    public long l57834;
+    public long l57835;
+    public long l57836;
+    public long l57837;
+    public long l57838;
+    public long l57839;
+    public long l57840;
+    public long l57841;
+    public long l57842;
+    public long l57843;
+    public long l57844;
+    public long l57845;
+    public long l57846;
+    public long l57847;
+    public long l57848;
+    public long l57849;
+    public long l57850;
+    public long l57851;
+    public long l57852;
+    public long l57853;
+    public long l57854;
+    public long l57855;
+    public long l57856;
+    public long l57857;
+    public long l57858;
+    public long l57859;
+    public long l57860;
+    public long l57861;
+    public long l57862;
+    public long l57863;
+    public long l57864;
+    public long l57865;
+    public long l57866;
+    public long l57867;
+    public long l57868;
+    public long l57869;
+    public long l57870;
+    public long l57871;
+    public long l57872;
+    public long l57873;
+    public long l57874;
+    public long l57875;
+    public long l57876;
+    public long l57877;
+    public long l57878;
+    public long l57879;
+    public long l57880;
+    public long l57881;
+    public long l57882;
+    public long l57883;
+    public long l57884;
+    public long l57885;
+    public long l57886;
+    public long l57887;
+    public long l57888;
+    public long l57889;
+    public long l57890;
+    public long l57891;
+    public long l57892;
+    public long l57893;
+    public long l57894;
+    public long l57895;
+    public long l57896;
+    public long l57897;
+    public long l57898;
+    public long l57899;
+    public long l57900;
+    public long l57901;
+    public long l57902;
+    public long l57903;
+    public long l57904;
+    public long l57905;
+    public long l57906;
+    public long l57907;
+    public long l57908;
+    public long l57909;
+    public long l57910;
+    public long l57911;
+    public long l57912;
+    public long l57913;
+    public long l57914;
+    public long l57915;
+    public long l57916;
+    public long l57917;
+    public long l57918;
+    public long l57919;
+    public long l57920;
+    public long l57921;
+    public long l57922;
+    public long l57923;
+    public long l57924;
+    public long l57925;
+    public long l57926;
+    public long l57927;
+    public long l57928;
+    public long l57929;
+    public long l57930;
+    public long l57931;
+    public long l57932;
+    public long l57933;
+    public long l57934;
+    public long l57935;
+    public long l57936;
+    public long l57937;
+    public long l57938;
+    public long l57939;
+    public long l57940;
+    public long l57941;
+    public long l57942;
+    public long l57943;
+    public long l57944;
+    public long l57945;
+    public long l57946;
+    public long l57947;
+    public long l57948;
+    public long l57949;
+    public long l57950;
+    public long l57951;
+    public long l57952;
+    public long l57953;
+    public long l57954;
+    public long l57955;
+    public long l57956;
+    public long l57957;
+    public long l57958;
+    public long l57959;
+    public long l57960;
+    public long l57961;
+    public long l57962;
+    public long l57963;
+    public long l57964;
+    public long l57965;
+    public long l57966;
+    public long l57967;
+    public long l57968;
+    public long l57969;
+    public long l57970;
+    public long l57971;
+    public long l57972;
+    public long l57973;
+    public long l57974;
+    public long l57975;
+    public long l57976;
+    public long l57977;
+    public long l57978;
+    public long l57979;
+    public long l57980;
+    public long l57981;
+    public long l57982;
+    public long l57983;
+    public long l57984;
+    public long l57985;
+    public long l57986;
+    public long l57987;
+    public long l57988;
+    public long l57989;
+    public long l57990;
+    public long l57991;
+    public long l57992;
+    public long l57993;
+    public long l57994;
+    public long l57995;
+    public long l57996;
+    public long l57997;
+    public long l57998;
+    public long l57999;
+    public long l58000;
+    public long l58001;
+    public long l58002;
+    public long l58003;
+    public long l58004;
+    public long l58005;
+    public long l58006;
+    public long l58007;
+    public long l58008;
+    public long l58009;
+    public long l58010;
+    public long l58011;
+    public long l58012;
+    public long l58013;
+    public long l58014;
+    public long l58015;
+    public long l58016;
+    public long l58017;
+    public long l58018;
+    public long l58019;
+    public long l58020;
+    public long l58021;
+    public long l58022;
+    public long l58023;
+    public long l58024;
+    public long l58025;
+    public long l58026;
+    public long l58027;
+    public long l58028;
+    public long l58029;
+    public long l58030;
+    public long l58031;
+    public long l58032;
+    public long l58033;
+    public long l58034;
+    public long l58035;
+    public long l58036;
+    public long l58037;
+    public long l58038;
+    public long l58039;
+    public long l58040;
+    public long l58041;
+    public long l58042;
+    public long l58043;
+    public long l58044;
+    public long l58045;
+    public long l58046;
+    public long l58047;
+    public long l58048;
+    public long l58049;
+    public long l58050;
+    public long l58051;
+    public long l58052;
+    public long l58053;
+    public long l58054;
+    public long l58055;
+    public long l58056;
+    public long l58057;
+    public long l58058;
+    public long l58059;
+    public long l58060;
+    public long l58061;
+    public long l58062;
+    public long l58063;
+    public long l58064;
+    public long l58065;
+    public long l58066;
+    public long l58067;
+    public long l58068;
+    public long l58069;
+    public long l58070;
+    public long l58071;
+    public long l58072;
+    public long l58073;
+    public long l58074;
+    public long l58075;
+    public long l58076;
+    public long l58077;
+    public long l58078;
+    public long l58079;
+    public long l58080;
+    public long l58081;
+    public long l58082;
+    public long l58083;
+    public long l58084;
+    public long l58085;
+    public long l58086;
+    public long l58087;
+    public long l58088;
+    public long l58089;
+    public long l58090;
+    public long l58091;
+    public long l58092;
+    public long l58093;
+    public long l58094;
+    public long l58095;
+    public long l58096;
+    public long l58097;
+    public long l58098;
+    public long l58099;
+    public long l58100;
+    public long l58101;
+    public long l58102;
+    public long l58103;
+    public long l58104;
+    public long l58105;
+    public long l58106;
+    public long l58107;
+    public long l58108;
+    public long l58109;
+    public long l58110;
+    public long l58111;
+    public long l58112;
+    public long l58113;
+    public long l58114;
+    public long l58115;
+    public long l58116;
+    public long l58117;
+    public long l58118;
+    public long l58119;
+    public long l58120;
+    public long l58121;
+    public long l58122;
+    public long l58123;
+    public long l58124;
+    public long l58125;
+    public long l58126;
+    public long l58127;
+    public long l58128;
+    public long l58129;
+    public long l58130;
+    public long l58131;
+    public long l58132;
+    public long l58133;
+    public long l58134;
+    public long l58135;
+    public long l58136;
+    public long l58137;
+    public long l58138;
+    public long l58139;
+    public long l58140;
+    public long l58141;
+    public long l58142;
+    public long l58143;
+    public long l58144;
+    public long l58145;
+    public long l58146;
+    public long l58147;
+    public long l58148;
+    public long l58149;
+    public long l58150;
+    public long l58151;
+    public long l58152;
+    public long l58153;
+    public long l58154;
+    public long l58155;
+    public long l58156;
+    public long l58157;
+    public long l58158;
+    public long l58159;
+    public long l58160;
+    public long l58161;
+    public long l58162;
+    public long l58163;
+    public long l58164;
+    public long l58165;
+    public long l58166;
+    public long l58167;
+    public long l58168;
+    public long l58169;
+    public long l58170;
+    public long l58171;
+    public long l58172;
+    public long l58173;
+    public long l58174;
+    public long l58175;
+    public long l58176;
+    public long l58177;
+    public long l58178;
+    public long l58179;
+    public long l58180;
+    public long l58181;
+    public long l58182;
+    public long l58183;
+    public long l58184;
+    public long l58185;
+    public long l58186;
+    public long l58187;
+    public long l58188;
+    public long l58189;
+    public long l58190;
+    public long l58191;
+    public long l58192;
+    public long l58193;
+    public long l58194;
+    public long l58195;
+    public long l58196;
+    public long l58197;
+    public long l58198;
+    public long l58199;
+    public long l58200;
+    public long l58201;
+    public long l58202;
+    public long l58203;
+    public long l58204;
+    public long l58205;
+    public long l58206;
+    public long l58207;
+    public long l58208;
+    public long l58209;
+    public long l58210;
+    public long l58211;
+    public long l58212;
+    public long l58213;
+    public long l58214;
+    public long l58215;
+    public long l58216;
+    public long l58217;
+    public long l58218;
+    public long l58219;
+    public long l58220;
+    public long l58221;
+    public long l58222;
+    public long l58223;
+    public long l58224;
+    public long l58225;
+    public long l58226;
+    public long l58227;
+    public long l58228;
+    public long l58229;
+    public long l58230;
+    public long l58231;
+    public long l58232;
+    public long l58233;
+    public long l58234;
+    public long l58235;
+    public long l58236;
+    public long l58237;
+    public long l58238;
+    public long l58239;
+    public long l58240;
+    public long l58241;
+    public long l58242;
+    public long l58243;
+    public long l58244;
+    public long l58245;
+    public long l58246;
+    public long l58247;
+    public long l58248;
+    public long l58249;
+    public long l58250;
+    public long l58251;
+    public long l58252;
+    public long l58253;
+    public long l58254;
+    public long l58255;
+    public long l58256;
+    public long l58257;
+    public long l58258;
+    public long l58259;
+    public long l58260;
+    public long l58261;
+    public long l58262;
+    public long l58263;
+    public long l58264;
+    public long l58265;
+    public long l58266;
+    public long l58267;
+    public long l58268;
+    public long l58269;
+    public long l58270;
+    public long l58271;
+    public long l58272;
+    public long l58273;
+    public long l58274;
+    public long l58275;
+    public long l58276;
+    public long l58277;
+    public long l58278;
+    public long l58279;
+    public long l58280;
+    public long l58281;
+    public long l58282;
+    public long l58283;
+    public long l58284;
+    public long l58285;
+    public long l58286;
+    public long l58287;
+    public long l58288;
+    public long l58289;
+    public long l58290;
+    public long l58291;
+    public long l58292;
+    public long l58293;
+    public long l58294;
+    public long l58295;
+    public long l58296;
+    public long l58297;
+    public long l58298;
+    public long l58299;
+    public long l58300;
+    public long l58301;
+    public long l58302;
+    public long l58303;
+    public long l58304;
+    public long l58305;
+    public long l58306;
+    public long l58307;
+    public long l58308;
+    public long l58309;
+    public long l58310;
+    public long l58311;
+    public long l58312;
+    public long l58313;
+    public long l58314;
+    public long l58315;
+    public long l58316;
+    public long l58317;
+    public long l58318;
+    public long l58319;
+    public long l58320;
+    public long l58321;
+    public long l58322;
+    public long l58323;
+    public long l58324;
+    public long l58325;
+    public long l58326;
+    public long l58327;
+    public long l58328;
+    public long l58329;
+    public long l58330;
+    public long l58331;
+    public long l58332;
+    public long l58333;
+    public long l58334;
+    public long l58335;
+    public long l58336;
+    public long l58337;
+    public long l58338;
+    public long l58339;
+    public long l58340;
+    public long l58341;
+    public long l58342;
+    public long l58343;
+    public long l58344;
+    public long l58345;
+    public long l58346;
+    public long l58347;
+    public long l58348;
+    public long l58349;
+    public long l58350;
+    public long l58351;
+    public long l58352;
+    public long l58353;
+    public long l58354;
+    public long l58355;
+    public long l58356;
+    public long l58357;
+    public long l58358;
+    public long l58359;
+    public long l58360;
+    public long l58361;
+    public long l58362;
+    public long l58363;
+    public long l58364;
+    public long l58365;
+    public long l58366;
+    public long l58367;
+    public long l58368;
+    public long l58369;
+    public long l58370;
+    public long l58371;
+    public long l58372;
+    public long l58373;
+    public long l58374;
+    public long l58375;
+    public long l58376;
+    public long l58377;
+    public long l58378;
+    public long l58379;
+    public long l58380;
+    public long l58381;
+    public long l58382;
+    public long l58383;
+    public long l58384;
+    public long l58385;
+    public long l58386;
+    public long l58387;
+    public long l58388;
+    public long l58389;
+    public long l58390;
+    public long l58391;
+    public long l58392;
+    public long l58393;
+    public long l58394;
+    public long l58395;
+    public long l58396;
+    public long l58397;
+    public long l58398;
+    public long l58399;
+    public long l58400;
+    public long l58401;
+    public long l58402;
+    public long l58403;
+    public long l58404;
+    public long l58405;
+    public long l58406;
+    public long l58407;
+    public long l58408;
+    public long l58409;
+    public long l58410;
+    public long l58411;
+    public long l58412;
+    public long l58413;
+    public long l58414;
+    public long l58415;
+    public long l58416;
+    public long l58417;
+    public long l58418;
+    public long l58419;
+    public long l58420;
+    public long l58421;
+    public long l58422;
+    public long l58423;
+    public long l58424;
+    public long l58425;
+    public long l58426;
+    public long l58427;
+    public long l58428;
+    public long l58429;
+    public long l58430;
+    public long l58431;
+    public long l58432;
+    public long l58433;
+    public long l58434;
+    public long l58435;
+    public long l58436;
+    public long l58437;
+    public long l58438;
+    public long l58439;
+    public long l58440;
+    public long l58441;
+    public long l58442;
+    public long l58443;
+    public long l58444;
+    public long l58445;
+    public long l58446;
+    public long l58447;
+    public long l58448;
+    public long l58449;
+    public long l58450;
+    public long l58451;
+    public long l58452;
+    public long l58453;
+    public long l58454;
+    public long l58455;
+    public long l58456;
+    public long l58457;
+    public long l58458;
+    public long l58459;
+    public long l58460;
+    public long l58461;
+    public long l58462;
+    public long l58463;
+    public long l58464;
+    public long l58465;
+    public long l58466;
+    public long l58467;
+    public long l58468;
+    public long l58469;
+    public long l58470;
+    public long l58471;
+    public long l58472;
+    public long l58473;
+    public long l58474;
+    public long l58475;
+    public long l58476;
+    public long l58477;
+    public long l58478;
+    public long l58479;
+    public long l58480;
+    public long l58481;
+    public long l58482;
+    public long l58483;
+    public long l58484;
+    public long l58485;
+    public long l58486;
+    public long l58487;
+    public long l58488;
+    public long l58489;
+    public long l58490;
+    public long l58491;
+    public long l58492;
+    public long l58493;
+    public long l58494;
+    public long l58495;
+    public long l58496;
+    public long l58497;
+    public long l58498;
+    public long l58499;
+    public long l58500;
+    public long l58501;
+    public long l58502;
+    public long l58503;
+    public long l58504;
+    public long l58505;
+    public long l58506;
+    public long l58507;
+    public long l58508;
+    public long l58509;
+    public long l58510;
+    public long l58511;
+    public long l58512;
+    public long l58513;
+    public long l58514;
+    public long l58515;
+    public long l58516;
+    public long l58517;
+    public long l58518;
+    public long l58519;
+    public long l58520;
+    public long l58521;
+    public long l58522;
+    public long l58523;
+    public long l58524;
+    public long l58525;
+    public long l58526;
+    public long l58527;
+    public long l58528;
+    public long l58529;
+    public long l58530;
+    public long l58531;
+    public long l58532;
+    public long l58533;
+    public long l58534;
+    public long l58535;
+    public long l58536;
+    public long l58537;
+    public long l58538;
+    public long l58539;
+    public long l58540;
+    public long l58541;
+    public long l58542;
+    public long l58543;
+    public long l58544;
+    public long l58545;
+    public long l58546;
+    public long l58547;
+    public long l58548;
+    public long l58549;
+    public long l58550;
+    public long l58551;
+    public long l58552;
+    public long l58553;
+    public long l58554;
+    public long l58555;
+    public long l58556;
+    public long l58557;
+    public long l58558;
+    public long l58559;
+    public long l58560;
+    public long l58561;
+    public long l58562;
+    public long l58563;
+    public long l58564;
+    public long l58565;
+    public long l58566;
+    public long l58567;
+    public long l58568;
+    public long l58569;
+    public long l58570;
+    public long l58571;
+    public long l58572;
+    public long l58573;
+    public long l58574;
+    public long l58575;
+    public long l58576;
+    public long l58577;
+    public long l58578;
+    public long l58579;
+    public long l58580;
+    public long l58581;
+    public long l58582;
+    public long l58583;
+    public long l58584;
+    public long l58585;
+    public long l58586;
+    public long l58587;
+    public long l58588;
+    public long l58589;
+    public long l58590;
+    public long l58591;
+    public long l58592;
+    public long l58593;
+    public long l58594;
+    public long l58595;
+    public long l58596;
+    public long l58597;
+    public long l58598;
+    public long l58599;
+    public long l58600;
+    public long l58601;
+    public long l58602;
+    public long l58603;
+    public long l58604;
+    public long l58605;
+    public long l58606;
+    public long l58607;
+    public long l58608;
+    public long l58609;
+    public long l58610;
+    public long l58611;
+    public long l58612;
+    public long l58613;
+    public long l58614;
+    public long l58615;
+    public long l58616;
+    public long l58617;
+    public long l58618;
+    public long l58619;
+    public long l58620;
+    public long l58621;
+    public long l58622;
+    public long l58623;
+    public long l58624;
+    public long l58625;
+    public long l58626;
+    public long l58627;
+    public long l58628;
+    public long l58629;
+    public long l58630;
+    public long l58631;
+    public long l58632;
+    public long l58633;
+    public long l58634;
+    public long l58635;
+    public long l58636;
+    public long l58637;
+    public long l58638;
+    public long l58639;
+    public long l58640;
+    public long l58641;
+    public long l58642;
+    public long l58643;
+    public long l58644;
+    public long l58645;
+    public long l58646;
+    public long l58647;
+    public long l58648;
+    public long l58649;
+    public long l58650;
+    public long l58651;
+    public long l58652;
+    public long l58653;
+    public long l58654;
+    public long l58655;
+    public long l58656;
+    public long l58657;
+    public long l58658;
+    public long l58659;
+    public long l58660;
+    public long l58661;
+    public long l58662;
+    public long l58663;
+    public long l58664;
+    public long l58665;
+    public long l58666;
+    public long l58667;
+    public long l58668;
+    public long l58669;
+    public long l58670;
+    public long l58671;
+    public long l58672;
+    public long l58673;
+    public long l58674;
+    public long l58675;
+    public long l58676;
+    public long l58677;
+    public long l58678;
+    public long l58679;
+    public long l58680;
+    public long l58681;
+    public long l58682;
+    public long l58683;
+    public long l58684;
+    public long l58685;
+    public long l58686;
+    public long l58687;
+    public long l58688;
+    public long l58689;
+    public long l58690;
+    public long l58691;
+    public long l58692;
+    public long l58693;
+    public long l58694;
+    public long l58695;
+    public long l58696;
+    public long l58697;
+    public long l58698;
+    public long l58699;
+    public long l58700;
+    public long l58701;
+    public long l58702;
+    public long l58703;
+    public long l58704;
+    public long l58705;
+    public long l58706;
+    public long l58707;
+    public long l58708;
+    public long l58709;
+    public long l58710;
+    public long l58711;
+    public long l58712;
+    public long l58713;
+    public long l58714;
+    public long l58715;
+    public long l58716;
+    public long l58717;
+    public long l58718;
+    public long l58719;
+    public long l58720;
+    public long l58721;
+    public long l58722;
+    public long l58723;
+    public long l58724;
+    public long l58725;
+    public long l58726;
+    public long l58727;
+    public long l58728;
+    public long l58729;
+    public long l58730;
+    public long l58731;
+    public long l58732;
+    public long l58733;
+    public long l58734;
+    public long l58735;
+    public long l58736;
+    public long l58737;
+    public long l58738;
+    public long l58739;
+    public long l58740;
+    public long l58741;
+    public long l58742;
+    public long l58743;
+    public long l58744;
+    public long l58745;
+    public long l58746;
+    public long l58747;
+    public long l58748;
+    public long l58749;
+    public long l58750;
+    public long l58751;
+    public long l58752;
+    public long l58753;
+    public long l58754;
+    public long l58755;
+    public long l58756;
+    public long l58757;
+    public long l58758;
+    public long l58759;
+    public long l58760;
+    public long l58761;
+    public long l58762;
+    public long l58763;
+    public long l58764;
+    public long l58765;
+    public long l58766;
+    public long l58767;
+    public long l58768;
+    public long l58769;
+    public long l58770;
+    public long l58771;
+    public long l58772;
+    public long l58773;
+    public long l58774;
+    public long l58775;
+    public long l58776;
+    public long l58777;
+    public long l58778;
+    public long l58779;
+    public long l58780;
+    public long l58781;
+    public long l58782;
+    public long l58783;
+    public long l58784;
+    public long l58785;
+    public long l58786;
+    public long l58787;
+    public long l58788;
+    public long l58789;
+    public long l58790;
+    public long l58791;
+    public long l58792;
+    public long l58793;
+    public long l58794;
+    public long l58795;
+    public long l58796;
+    public long l58797;
+    public long l58798;
+    public long l58799;
+    public long l58800;
+    public long l58801;
+    public long l58802;
+    public long l58803;
+    public long l58804;
+    public long l58805;
+    public long l58806;
+    public long l58807;
+    public long l58808;
+    public long l58809;
+    public long l58810;
+    public long l58811;
+    public long l58812;
+    public long l58813;
+    public long l58814;
+    public long l58815;
+    public long l58816;
+    public long l58817;
+    public long l58818;
+    public long l58819;
+    public long l58820;
+    public long l58821;
+    public long l58822;
+    public long l58823;
+    public long l58824;
+    public long l58825;
+    public long l58826;
+    public long l58827;
+    public long l58828;
+    public long l58829;
+    public long l58830;
+    public long l58831;
+    public long l58832;
+    public long l58833;
+    public long l58834;
+    public long l58835;
+    public long l58836;
+    public long l58837;
+    public long l58838;
+    public long l58839;
+    public long l58840;
+    public long l58841;
+    public long l58842;
+    public long l58843;
+    public long l58844;
+    public long l58845;
+    public long l58846;
+    public long l58847;
+    public long l58848;
+    public long l58849;
+    public long l58850;
+    public long l58851;
+    public long l58852;
+    public long l58853;
+    public long l58854;
+    public long l58855;
+    public long l58856;
+    public long l58857;
+    public long l58858;
+    public long l58859;
+    public long l58860;
+    public long l58861;
+    public long l58862;
+    public long l58863;
+    public long l58864;
+    public long l58865;
+    public long l58866;
+    public long l58867;
+    public long l58868;
+    public long l58869;
+    public long l58870;
+    public long l58871;
+    public long l58872;
+    public long l58873;
+    public long l58874;
+    public long l58875;
+    public long l58876;
+    public long l58877;
+    public long l58878;
+    public long l58879;
+    public long l58880;
+    public long l58881;
+    public long l58882;
+    public long l58883;
+    public long l58884;
+    public long l58885;
+    public long l58886;
+    public long l58887;
+    public long l58888;
+    public long l58889;
+    public long l58890;
+    public long l58891;
+    public long l58892;
+    public long l58893;
+    public long l58894;
+    public long l58895;
+    public long l58896;
+    public long l58897;
+    public long l58898;
+    public long l58899;
+    public long l58900;
+    public long l58901;
+    public long l58902;
+    public long l58903;
+    public long l58904;
+    public long l58905;
+    public long l58906;
+    public long l58907;
+    public long l58908;
+    public long l58909;
+    public long l58910;
+    public long l58911;
+    public long l58912;
+    public long l58913;
+    public long l58914;
+    public long l58915;
+    public long l58916;
+    public long l58917;
+    public long l58918;
+    public long l58919;
+    public long l58920;
+    public long l58921;
+    public long l58922;
+    public long l58923;
+    public long l58924;
+    public long l58925;
+    public long l58926;
+    public long l58927;
+    public long l58928;
+    public long l58929;
+    public long l58930;
+    public long l58931;
+    public long l58932;
+    public long l58933;
+    public long l58934;
+    public long l58935;
+    public long l58936;
+    public long l58937;
+    public long l58938;
+    public long l58939;
+    public long l58940;
+    public long l58941;
+    public long l58942;
+    public long l58943;
+    public long l58944;
+    public long l58945;
+    public long l58946;
+    public long l58947;
+    public long l58948;
+    public long l58949;
+    public long l58950;
+    public long l58951;
+    public long l58952;
+    public long l58953;
+    public long l58954;
+    public long l58955;
+    public long l58956;
+    public long l58957;
+    public long l58958;
+    public long l58959;
+    public long l58960;
+    public long l58961;
+    public long l58962;
+    public long l58963;
+    public long l58964;
+    public long l58965;
+    public long l58966;
+    public long l58967;
+    public long l58968;
+    public long l58969;
+    public long l58970;
+    public long l58971;
+    public long l58972;
+    public long l58973;
+    public long l58974;
+    public long l58975;
+    public long l58976;
+    public long l58977;
+    public long l58978;
+    public long l58979;
+    public long l58980;
+    public long l58981;
+    public long l58982;
+    public long l58983;
+    public long l58984;
+    public long l58985;
+    public long l58986;
+    public long l58987;
+    public long l58988;
+    public long l58989;
+    public long l58990;
+    public long l58991;
+    public long l58992;
+    public long l58993;
+    public long l58994;
+    public long l58995;
+    public long l58996;
+    public long l58997;
+    public long l58998;
+    public long l58999;
+    public long l59000;
+    public long l59001;
+    public long l59002;
+    public long l59003;
+    public long l59004;
+    public long l59005;
+    public long l59006;
+    public long l59007;
+    public long l59008;
+    public long l59009;
+    public long l59010;
+    public long l59011;
+    public long l59012;
+    public long l59013;
+    public long l59014;
+    public long l59015;
+    public long l59016;
+    public long l59017;
+    public long l59018;
+    public long l59019;
+    public long l59020;
+    public long l59021;
+    public long l59022;
+    public long l59023;
+    public long l59024;
+    public long l59025;
+    public long l59026;
+    public long l59027;
+    public long l59028;
+    public long l59029;
+    public long l59030;
+    public long l59031;
+    public long l59032;
+    public long l59033;
+    public long l59034;
+    public long l59035;
+    public long l59036;
+    public long l59037;
+    public long l59038;
+    public long l59039;
+    public long l59040;
+    public long l59041;
+    public long l59042;
+    public long l59043;
+    public long l59044;
+    public long l59045;
+    public long l59046;
+    public long l59047;
+    public long l59048;
+    public long l59049;
+    public long l59050;
+    public long l59051;
+    public long l59052;
+    public long l59053;
+    public long l59054;
+    public long l59055;
+    public long l59056;
+    public long l59057;
+    public long l59058;
+    public long l59059;
+    public long l59060;
+    public long l59061;
+    public long l59062;
+    public long l59063;
+    public long l59064;
+    public long l59065;
+    public long l59066;
+    public long l59067;
+    public long l59068;
+    public long l59069;
+    public long l59070;
+    public long l59071;
+    public long l59072;
+    public long l59073;
+    public long l59074;
+    public long l59075;
+    public long l59076;
+    public long l59077;
+    public long l59078;
+    public long l59079;
+    public long l59080;
+    public long l59081;
+    public long l59082;
+    public long l59083;
+    public long l59084;
+    public long l59085;
+    public long l59086;
+    public long l59087;
+    public long l59088;
+    public long l59089;
+    public long l59090;
+    public long l59091;
+    public long l59092;
+    public long l59093;
+    public long l59094;
+    public long l59095;
+    public long l59096;
+    public long l59097;
+    public long l59098;
+    public long l59099;
+    public long l59100;
+    public long l59101;
+    public long l59102;
+    public long l59103;
+    public long l59104;
+    public long l59105;
+    public long l59106;
+    public long l59107;
+    public long l59108;
+    public long l59109;
+    public long l59110;
+    public long l59111;
+    public long l59112;
+    public long l59113;
+    public long l59114;
+    public long l59115;
+    public long l59116;
+    public long l59117;
+    public long l59118;
+    public long l59119;
+    public long l59120;
+    public long l59121;
+    public long l59122;
+    public long l59123;
+    public long l59124;
+    public long l59125;
+    public long l59126;
+    public long l59127;
+    public long l59128;
+    public long l59129;
+    public long l59130;
+    public long l59131;
+    public long l59132;
+    public long l59133;
+    public long l59134;
+    public long l59135;
+    public long l59136;
+    public long l59137;
+    public long l59138;
+    public long l59139;
+    public long l59140;
+    public long l59141;
+    public long l59142;
+    public long l59143;
+    public long l59144;
+    public long l59145;
+    public long l59146;
+    public long l59147;
+    public long l59148;
+    public long l59149;
+    public long l59150;
+    public long l59151;
+    public long l59152;
+    public long l59153;
+    public long l59154;
+    public long l59155;
+    public long l59156;
+    public long l59157;
+    public long l59158;
+    public long l59159;
+    public long l59160;
+    public long l59161;
+    public long l59162;
+    public long l59163;
+    public long l59164;
+    public long l59165;
+    public long l59166;
+    public long l59167;
+    public long l59168;
+    public long l59169;
+    public long l59170;
+    public long l59171;
+    public long l59172;
+    public long l59173;
+    public long l59174;
+    public long l59175;
+    public long l59176;
+    public long l59177;
+    public long l59178;
+    public long l59179;
+    public long l59180;
+    public long l59181;
+    public long l59182;
+    public long l59183;
+    public long l59184;
+    public long l59185;
+    public long l59186;
+    public long l59187;
+    public long l59188;
+    public long l59189;
+    public long l59190;
+    public long l59191;
+    public long l59192;
+    public long l59193;
+    public long l59194;
+    public long l59195;
+    public long l59196;
+    public long l59197;
+    public long l59198;
+    public long l59199;
+    public long l59200;
+    public long l59201;
+    public long l59202;
+    public long l59203;
+    public long l59204;
+    public long l59205;
+    public long l59206;
+    public long l59207;
+    public long l59208;
+    public long l59209;
+    public long l59210;
+    public long l59211;
+    public long l59212;
+    public long l59213;
+    public long l59214;
+    public long l59215;
+    public long l59216;
+    public long l59217;
+    public long l59218;
+    public long l59219;
+    public long l59220;
+    public long l59221;
+    public long l59222;
+    public long l59223;
+    public long l59224;
+    public long l59225;
+    public long l59226;
+    public long l59227;
+    public long l59228;
+    public long l59229;
+    public long l59230;
+    public long l59231;
+    public long l59232;
+    public long l59233;
+    public long l59234;
+    public long l59235;
+    public long l59236;
+    public long l59237;
+    public long l59238;
+    public long l59239;
+    public long l59240;
+    public long l59241;
+    public long l59242;
+    public long l59243;
+    public long l59244;
+    public long l59245;
+    public long l59246;
+    public long l59247;
+    public long l59248;
+    public long l59249;
+    public long l59250;
+    public long l59251;
+    public long l59252;
+    public long l59253;
+    public long l59254;
+    public long l59255;
+    public long l59256;
+    public long l59257;
+    public long l59258;
+    public long l59259;
+    public long l59260;
+    public long l59261;
+    public long l59262;
+    public long l59263;
+    public long l59264;
+    public long l59265;
+    public long l59266;
+    public long l59267;
+    public long l59268;
+    public long l59269;
+    public long l59270;
+    public long l59271;
+    public long l59272;
+    public long l59273;
+    public long l59274;
+    public long l59275;
+    public long l59276;
+    public long l59277;
+    public long l59278;
+    public long l59279;
+    public long l59280;
+    public long l59281;
+    public long l59282;
+    public long l59283;
+    public long l59284;
+    public long l59285;
+    public long l59286;
+    public long l59287;
+    public long l59288;
+    public long l59289;
+    public long l59290;
+    public long l59291;
+    public long l59292;
+    public long l59293;
+    public long l59294;
+    public long l59295;
+    public long l59296;
+    public long l59297;
+    public long l59298;
+    public long l59299;
+    public long l59300;
+    public long l59301;
+    public long l59302;
+    public long l59303;
+    public long l59304;
+    public long l59305;
+    public long l59306;
+    public long l59307;
+    public long l59308;
+    public long l59309;
+    public long l59310;
+    public long l59311;
+    public long l59312;
+    public long l59313;
+    public long l59314;
+    public long l59315;
+    public long l59316;
+    public long l59317;
+    public long l59318;
+    public long l59319;
+    public long l59320;
+    public long l59321;
+    public long l59322;
+    public long l59323;
+    public long l59324;
+    public long l59325;
+    public long l59326;
+    public long l59327;
+    public long l59328;
+    public long l59329;
+    public long l59330;
+    public long l59331;
+    public long l59332;
+    public long l59333;
+    public long l59334;
+    public long l59335;
+    public long l59336;
+    public long l59337;
+    public long l59338;
+    public long l59339;
+    public long l59340;
+    public long l59341;
+    public long l59342;
+    public long l59343;
+    public long l59344;
+    public long l59345;
+    public long l59346;
+    public long l59347;
+    public long l59348;
+    public long l59349;
+    public long l59350;
+    public long l59351;
+    public long l59352;
+    public long l59353;
+    public long l59354;
+    public long l59355;
+    public long l59356;
+    public long l59357;
+    public long l59358;
+    public long l59359;
+    public long l59360;
+    public long l59361;
+    public long l59362;
+    public long l59363;
+    public long l59364;
+    public long l59365;
+    public long l59366;
+    public long l59367;
+    public long l59368;
+    public long l59369;
+    public long l59370;
+    public long l59371;
+    public long l59372;
+    public long l59373;
+    public long l59374;
+    public long l59375;
+    public long l59376;
+    public long l59377;
+    public long l59378;
+    public long l59379;
+    public long l59380;
+    public long l59381;
+    public long l59382;
+    public long l59383;
+    public long l59384;
+    public long l59385;
+    public long l59386;
+    public long l59387;
+    public long l59388;
+    public long l59389;
+    public long l59390;
+    public long l59391;
+    public long l59392;
+    public long l59393;
+    public long l59394;
+    public long l59395;
+    public long l59396;
+    public long l59397;
+    public long l59398;
+    public long l59399;
+    public long l59400;
+    public long l59401;
+    public long l59402;
+    public long l59403;
+    public long l59404;
+    public long l59405;
+    public long l59406;
+    public long l59407;
+    public long l59408;
+    public long l59409;
+    public long l59410;
+    public long l59411;
+    public long l59412;
+    public long l59413;
+    public long l59414;
+    public long l59415;
+    public long l59416;
+    public long l59417;
+    public long l59418;
+    public long l59419;
+    public long l59420;
+    public long l59421;
+    public long l59422;
+    public long l59423;
+    public long l59424;
+    public long l59425;
+    public long l59426;
+    public long l59427;
+    public long l59428;
+    public long l59429;
+    public long l59430;
+    public long l59431;
+    public long l59432;
+    public long l59433;
+    public long l59434;
+    public long l59435;
+    public long l59436;
+    public long l59437;
+    public long l59438;
+    public long l59439;
+    public long l59440;
+    public long l59441;
+    public long l59442;
+    public long l59443;
+    public long l59444;
+    public long l59445;
+    public long l59446;
+    public long l59447;
+    public long l59448;
+    public long l59449;
+    public long l59450;
+    public long l59451;
+    public long l59452;
+    public long l59453;
+    public long l59454;
+    public long l59455;
+    public long l59456;
+    public long l59457;
+    public long l59458;
+    public long l59459;
+    public long l59460;
+    public long l59461;
+    public long l59462;
+    public long l59463;
+    public long l59464;
+    public long l59465;
+    public long l59466;
+    public long l59467;
+    public long l59468;
+    public long l59469;
+    public long l59470;
+    public long l59471;
+    public long l59472;
+    public long l59473;
+    public long l59474;
+    public long l59475;
+    public long l59476;
+    public long l59477;
+    public long l59478;
+    public long l59479;
+    public long l59480;
+    public long l59481;
+    public long l59482;
+    public long l59483;
+    public long l59484;
+    public long l59485;
+    public long l59486;
+    public long l59487;
+    public long l59488;
+    public long l59489;
+    public long l59490;
+    public long l59491;
+    public long l59492;
+    public long l59493;
+    public long l59494;
+    public long l59495;
+    public long l59496;
+    public long l59497;
+    public long l59498;
+    public long l59499;
+    public long l59500;
+    public long l59501;
+    public long l59502;
+    public long l59503;
+    public long l59504;
+    public long l59505;
+    public long l59506;
+    public long l59507;
+    public long l59508;
+    public long l59509;
+    public long l59510;
+    public long l59511;
+    public long l59512;
+    public long l59513;
+    public long l59514;
+    public long l59515;
+    public long l59516;
+    public long l59517;
+    public long l59518;
+    public long l59519;
+    public long l59520;
+    public long l59521;
+    public long l59522;
+    public long l59523;
+    public long l59524;
+    public long l59525;
+    public long l59526;
+    public long l59527;
+    public long l59528;
+    public long l59529;
+    public long l59530;
+    public long l59531;
+    public long l59532;
+    public long l59533;
+    public long l59534;
+    public long l59535;
+    public long l59536;
+    public long l59537;
+    public long l59538;
+    public long l59539;
+    public long l59540;
+    public long l59541;
+    public long l59542;
+    public long l59543;
+    public long l59544;
+    public long l59545;
+    public long l59546;
+    public long l59547;
+    public long l59548;
+    public long l59549;
+    public long l59550;
+    public long l59551;
+    public long l59552;
+    public long l59553;
+    public long l59554;
+    public long l59555;
+    public long l59556;
+    public long l59557;
+    public long l59558;
+    public long l59559;
+    public long l59560;
+    public long l59561;
+    public long l59562;
+    public long l59563;
+    public long l59564;
+    public long l59565;
+    public long l59566;
+    public long l59567;
+    public long l59568;
+    public long l59569;
+    public long l59570;
+    public long l59571;
+    public long l59572;
+    public long l59573;
+    public long l59574;
+    public long l59575;
+    public long l59576;
+    public long l59577;
+    public long l59578;
+    public long l59579;
+    public long l59580;
+    public long l59581;
+    public long l59582;
+    public long l59583;
+    public long l59584;
+    public long l59585;
+    public long l59586;
+    public long l59587;
+    public long l59588;
+    public long l59589;
+    public long l59590;
+    public long l59591;
+    public long l59592;
+    public long l59593;
+    public long l59594;
+    public long l59595;
+    public long l59596;
+    public long l59597;
+    public long l59598;
+    public long l59599;
+    public long l59600;
+    public long l59601;
+    public long l59602;
+    public long l59603;
+    public long l59604;
+    public long l59605;
+    public long l59606;
+    public long l59607;
+    public long l59608;
+    public long l59609;
+    public long l59610;
+    public long l59611;
+    public long l59612;
+    public long l59613;
+    public long l59614;
+    public long l59615;
+    public long l59616;
+    public long l59617;
+    public long l59618;
+    public long l59619;
+    public long l59620;
+    public long l59621;
+    public long l59622;
+    public long l59623;
+    public long l59624;
+    public long l59625;
+    public long l59626;
+    public long l59627;
+    public long l59628;
+    public long l59629;
+    public long l59630;
+    public long l59631;
+    public long l59632;
+    public long l59633;
+    public long l59634;
+    public long l59635;
+    public long l59636;
+    public long l59637;
+    public long l59638;
+    public long l59639;
+    public long l59640;
+    public long l59641;
+    public long l59642;
+    public long l59643;
+    public long l59644;
+    public long l59645;
+    public long l59646;
+    public long l59647;
+    public long l59648;
+    public long l59649;
+    public long l59650;
+    public long l59651;
+    public long l59652;
+    public long l59653;
+    public long l59654;
+    public long l59655;
+    public long l59656;
+    public long l59657;
+    public long l59658;
+    public long l59659;
+    public long l59660;
+    public long l59661;
+    public long l59662;
+    public long l59663;
+    public long l59664;
+    public long l59665;
+    public long l59666;
+    public long l59667;
+    public long l59668;
+    public long l59669;
+    public long l59670;
+    public long l59671;
+    public long l59672;
+    public long l59673;
+    public long l59674;
+    public long l59675;
+    public long l59676;
+    public long l59677;
+    public long l59678;
+    public long l59679;
+    public long l59680;
+    public long l59681;
+    public long l59682;
+    public long l59683;
+    public long l59684;
+    public long l59685;
+    public long l59686;
+    public long l59687;
+    public long l59688;
+    public long l59689;
+    public long l59690;
+    public long l59691;
+    public long l59692;
+    public long l59693;
+    public long l59694;
+    public long l59695;
+    public long l59696;
+    public long l59697;
+    public long l59698;
+    public long l59699;
+    public long l59700;
+    public long l59701;
+    public long l59702;
+    public long l59703;
+    public long l59704;
+    public long l59705;
+    public long l59706;
+    public long l59707;
+    public long l59708;
+    public long l59709;
+    public long l59710;
+    public long l59711;
+    public long l59712;
+    public long l59713;
+    public long l59714;
+    public long l59715;
+    public long l59716;
+    public long l59717;
+    public long l59718;
+    public long l59719;
+    public long l59720;
+    public long l59721;
+    public long l59722;
+    public long l59723;
+    public long l59724;
+    public long l59725;
+    public long l59726;
+    public long l59727;
+    public long l59728;
+    public long l59729;
+    public long l59730;
+    public long l59731;
+    public long l59732;
+    public long l59733;
+    public long l59734;
+    public long l59735;
+    public long l59736;
+    public long l59737;
+    public long l59738;
+    public long l59739;
+    public long l59740;
+    public long l59741;
+    public long l59742;
+    public long l59743;
+    public long l59744;
+    public long l59745;
+    public long l59746;
+    public long l59747;
+    public long l59748;
+    public long l59749;
+    public long l59750;
+    public long l59751;
+    public long l59752;
+    public long l59753;
+    public long l59754;
+    public long l59755;
+    public long l59756;
+    public long l59757;
+    public long l59758;
+    public long l59759;
+    public long l59760;
+    public long l59761;
+    public long l59762;
+    public long l59763;
+    public long l59764;
+    public long l59765;
+    public long l59766;
+    public long l59767;
+    public long l59768;
+    public long l59769;
+    public long l59770;
+    public long l59771;
+    public long l59772;
+    public long l59773;
+    public long l59774;
+    public long l59775;
+    public long l59776;
+    public long l59777;
+    public long l59778;
+    public long l59779;
+    public long l59780;
+    public long l59781;
+    public long l59782;
+    public long l59783;
+    public long l59784;
+    public long l59785;
+    public long l59786;
+    public long l59787;
+    public long l59788;
+    public long l59789;
+    public long l59790;
+    public long l59791;
+    public long l59792;
+    public long l59793;
+    public long l59794;
+    public long l59795;
+    public long l59796;
+    public long l59797;
+    public long l59798;
+    public long l59799;
+    public long l59800;
+    public long l59801;
+    public long l59802;
+    public long l59803;
+    public long l59804;
+    public long l59805;
+    public long l59806;
+    public long l59807;
+    public long l59808;
+    public long l59809;
+    public long l59810;
+    public long l59811;
+    public long l59812;
+    public long l59813;
+    public long l59814;
+    public long l59815;
+    public long l59816;
+    public long l59817;
+    public long l59818;
+    public long l59819;
+    public long l59820;
+    public long l59821;
+    public long l59822;
+    public long l59823;
+    public long l59824;
+    public long l59825;
+    public long l59826;
+    public long l59827;
+    public long l59828;
+    public long l59829;
+    public long l59830;
+    public long l59831;
+    public long l59832;
+    public long l59833;
+    public long l59834;
+    public long l59835;
+    public long l59836;
+    public long l59837;
+    public long l59838;
+    public long l59839;
+    public long l59840;
+    public long l59841;
+    public long l59842;
+    public long l59843;
+    public long l59844;
+    public long l59845;
+    public long l59846;
+    public long l59847;
+    public long l59848;
+    public long l59849;
+    public long l59850;
+    public long l59851;
+    public long l59852;
+    public long l59853;
+    public long l59854;
+    public long l59855;
+    public long l59856;
+    public long l59857;
+    public long l59858;
+    public long l59859;
+    public long l59860;
+    public long l59861;
+    public long l59862;
+    public long l59863;
+    public long l59864;
+    public long l59865;
+    public long l59866;
+    public long l59867;
+    public long l59868;
+    public long l59869;
+    public long l59870;
+    public long l59871;
+    public long l59872;
+    public long l59873;
+    public long l59874;
+    public long l59875;
+    public long l59876;
+    public long l59877;
+    public long l59878;
+    public long l59879;
+    public long l59880;
+    public long l59881;
+    public long l59882;
+    public long l59883;
+    public long l59884;
+    public long l59885;
+    public long l59886;
+    public long l59887;
+    public long l59888;
+    public long l59889;
+    public long l59890;
+    public long l59891;
+    public long l59892;
+    public long l59893;
+    public long l59894;
+    public long l59895;
+    public long l59896;
+    public long l59897;
+    public long l59898;
+    public long l59899;
+    public long l59900;
+    public long l59901;
+    public long l59902;
+    public long l59903;
+    public long l59904;
+    public long l59905;
+    public long l59906;
+    public long l59907;
+    public long l59908;
+    public long l59909;
+    public long l59910;
+    public long l59911;
+    public long l59912;
+    public long l59913;
+    public long l59914;
+    public long l59915;
+    public long l59916;
+    public long l59917;
+    public long l59918;
+    public long l59919;
+    public long l59920;
+    public long l59921;
+    public long l59922;
+    public long l59923;
+    public long l59924;
+    public long l59925;
+    public long l59926;
+    public long l59927;
+    public long l59928;
+    public long l59929;
+    public long l59930;
+    public long l59931;
+    public long l59932;
+    public long l59933;
+    public long l59934;
+    public long l59935;
+    public long l59936;
+    public long l59937;
+    public long l59938;
+    public long l59939;
+    public long l59940;
+    public long l59941;
+    public long l59942;
+    public long l59943;
+    public long l59944;
+    public long l59945;
+    public long l59946;
+    public long l59947;
+    public long l59948;
+    public long l59949;
+    public long l59950;
+    public long l59951;
+    public long l59952;
+    public long l59953;
+    public long l59954;
+    public long l59955;
+    public long l59956;
+    public long l59957;
+    public long l59958;
+    public long l59959;
+    public long l59960;
+    public long l59961;
+    public long l59962;
+    public long l59963;
+    public long l59964;
+    public long l59965;
+    public long l59966;
+    public long l59967;
+    public long l59968;
+    public long l59969;
+    public long l59970;
+    public long l59971;
+    public long l59972;
+    public long l59973;
+    public long l59974;
+    public long l59975;
+    public long l59976;
+    public long l59977;
+    public long l59978;
+    public long l59979;
+    public long l59980;
+    public long l59981;
+    public long l59982;
+    public long l59983;
+    public long l59984;
+    public long l59985;
+    public long l59986;
+    public long l59987;
+    public long l59988;
+    public long l59989;
+    public long l59990;
+    public long l59991;
+    public long l59992;
+    public long l59993;
+    public long l59994;
+    public long l59995;
+    public long l59996;
+    public long l59997;
+    public long l59998;
+    public long l59999;
+    public long l60000;
+    public long l60001;
+    public long l60002;
+    public long l60003;
+    public long l60004;
+    public long l60005;
+    public long l60006;
+    public long l60007;
+    public long l60008;
+    public long l60009;
+    public long l60010;
+    public long l60011;
+    public long l60012;
+    public long l60013;
+    public long l60014;
+    public long l60015;
+    public long l60016;
+    public long l60017;
+    public long l60018;
+    public long l60019;
+    public long l60020;
+    public long l60021;
+    public long l60022;
+    public long l60023;
+    public long l60024;
+    public long l60025;
+    public long l60026;
+    public long l60027;
+    public long l60028;
+    public long l60029;
+    public long l60030;
+    public long l60031;
+    public long l60032;
+    public long l60033;
+    public long l60034;
+    public long l60035;
+    public long l60036;
+    public long l60037;
+    public long l60038;
+    public long l60039;
+    public long l60040;
+    public long l60041;
+    public long l60042;
+    public long l60043;
+    public long l60044;
+    public long l60045;
+    public long l60046;
+    public long l60047;
+    public long l60048;
+    public long l60049;
+    public long l60050;
+    public long l60051;
+    public long l60052;
+    public long l60053;
+    public long l60054;
+    public long l60055;
+    public long l60056;
+    public long l60057;
+    public long l60058;
+    public long l60059;
+    public long l60060;
+    public long l60061;
+    public long l60062;
+    public long l60063;
+    public long l60064;
+    public long l60065;
+    public long l60066;
+    public long l60067;
+    public long l60068;
+    public long l60069;
+    public long l60070;
+    public long l60071;
+    public long l60072;
+    public long l60073;
+    public long l60074;
+    public long l60075;
+    public long l60076;
+    public long l60077;
+    public long l60078;
+    public long l60079;
+    public long l60080;
+    public long l60081;
+    public long l60082;
+    public long l60083;
+    public long l60084;
+    public long l60085;
+    public long l60086;
+    public long l60087;
+    public long l60088;
+    public long l60089;
+    public long l60090;
+    public long l60091;
+    public long l60092;
+    public long l60093;
+    public long l60094;
+    public long l60095;
+    public long l60096;
+    public long l60097;
+    public long l60098;
+    public long l60099;
+    public long l60100;
+    public long l60101;
+    public long l60102;
+    public long l60103;
+    public long l60104;
+    public long l60105;
+    public long l60106;
+    public long l60107;
+    public long l60108;
+    public long l60109;
+    public long l60110;
+    public long l60111;
+    public long l60112;
+    public long l60113;
+    public long l60114;
+    public long l60115;
+    public long l60116;
+    public long l60117;
+    public long l60118;
+    public long l60119;
+    public long l60120;
+    public long l60121;
+    public long l60122;
+    public long l60123;
+    public long l60124;
+    public long l60125;
+    public long l60126;
+    public long l60127;
+    public long l60128;
+    public long l60129;
+    public long l60130;
+    public long l60131;
+    public long l60132;
+    public long l60133;
+    public long l60134;
+    public long l60135;
+    public long l60136;
+    public long l60137;
+    public long l60138;
+    public long l60139;
+    public long l60140;
+    public long l60141;
+    public long l60142;
+    public long l60143;
+    public long l60144;
+    public long l60145;
+    public long l60146;
+    public long l60147;
+    public long l60148;
+    public long l60149;
+    public long l60150;
+    public long l60151;
+    public long l60152;
+    public long l60153;
+    public long l60154;
+    public long l60155;
+    public long l60156;
+    public long l60157;
+    public long l60158;
+    public long l60159;
+    public long l60160;
+    public long l60161;
+    public long l60162;
+    public long l60163;
+    public long l60164;
+    public long l60165;
+    public long l60166;
+    public long l60167;
+    public long l60168;
+    public long l60169;
+    public long l60170;
+    public long l60171;
+    public long l60172;
+    public long l60173;
+    public long l60174;
+    public long l60175;
+    public long l60176;
+    public long l60177;
+    public long l60178;
+    public long l60179;
+    public long l60180;
+    public long l60181;
+    public long l60182;
+    public long l60183;
+    public long l60184;
+    public long l60185;
+    public long l60186;
+    public long l60187;
+    public long l60188;
+    public long l60189;
+    public long l60190;
+    public long l60191;
+    public long l60192;
+    public long l60193;
+    public long l60194;
+    public long l60195;
+    public long l60196;
+    public long l60197;
+    public long l60198;
+    public long l60199;
+    public long l60200;
+    public long l60201;
+    public long l60202;
+    public long l60203;
+    public long l60204;
+    public long l60205;
+    public long l60206;
+    public long l60207;
+    public long l60208;
+    public long l60209;
+    public long l60210;
+    public long l60211;
+    public long l60212;
+    public long l60213;
+    public long l60214;
+    public long l60215;
+    public long l60216;
+    public long l60217;
+    public long l60218;
+    public long l60219;
+    public long l60220;
+    public long l60221;
+    public long l60222;
+    public long l60223;
+    public long l60224;
+    public long l60225;
+    public long l60226;
+    public long l60227;
+    public long l60228;
+    public long l60229;
+    public long l60230;
+    public long l60231;
+    public long l60232;
+    public long l60233;
+    public long l60234;
+    public long l60235;
+    public long l60236;
+    public long l60237;
+    public long l60238;
+    public long l60239;
+    public long l60240;
+    public long l60241;
+    public long l60242;
+    public long l60243;
+    public long l60244;
+    public long l60245;
+    public long l60246;
+    public long l60247;
+    public long l60248;
+    public long l60249;
+    public long l60250;
+    public long l60251;
+    public long l60252;
+    public long l60253;
+    public long l60254;
+    public long l60255;
+    public long l60256;
+    public long l60257;
+    public long l60258;
+    public long l60259;
+    public long l60260;
+    public long l60261;
+    public long l60262;
+    public long l60263;
+    public long l60264;
+    public long l60265;
+    public long l60266;
+    public long l60267;
+    public long l60268;
+    public long l60269;
+    public long l60270;
+    public long l60271;
+    public long l60272;
+    public long l60273;
+    public long l60274;
+    public long l60275;
+    public long l60276;
+    public long l60277;
+    public long l60278;
+    public long l60279;
+    public long l60280;
+    public long l60281;
+    public long l60282;
+    public long l60283;
+    public long l60284;
+    public long l60285;
+    public long l60286;
+    public long l60287;
+    public long l60288;
+    public long l60289;
+    public long l60290;
+    public long l60291;
+    public long l60292;
+    public long l60293;
+    public long l60294;
+    public long l60295;
+    public long l60296;
+    public long l60297;
+    public long l60298;
+    public long l60299;
+    public long l60300;
+    public long l60301;
+    public long l60302;
+    public long l60303;
+    public long l60304;
+    public long l60305;
+    public long l60306;
+    public long l60307;
+    public long l60308;
+    public long l60309;
+    public long l60310;
+    public long l60311;
+    public long l60312;
+    public long l60313;
+    public long l60314;
+    public long l60315;
+    public long l60316;
+    public long l60317;
+    public long l60318;
+    public long l60319;
+    public long l60320;
+    public long l60321;
+    public long l60322;
+    public long l60323;
+    public long l60324;
+    public long l60325;
+    public long l60326;
+    public long l60327;
+    public long l60328;
+    public long l60329;
+    public long l60330;
+    public long l60331;
+    public long l60332;
+    public long l60333;
+    public long l60334;
+    public long l60335;
+    public long l60336;
+    public long l60337;
+    public long l60338;
+    public long l60339;
+    public long l60340;
+    public long l60341;
+    public long l60342;
+    public long l60343;
+    public long l60344;
+    public long l60345;
+    public long l60346;
+    public long l60347;
+    public long l60348;
+    public long l60349;
+    public long l60350;
+    public long l60351;
+    public long l60352;
+    public long l60353;
+    public long l60354;
+    public long l60355;
+    public long l60356;
+    public long l60357;
+    public long l60358;
+    public long l60359;
+    public long l60360;
+    public long l60361;
+    public long l60362;
+    public long l60363;
+    public long l60364;
+    public long l60365;
+    public long l60366;
+    public long l60367;
+    public long l60368;
+    public long l60369;
+    public long l60370;
+    public long l60371;
+    public long l60372;
+    public long l60373;
+    public long l60374;
+    public long l60375;
+    public long l60376;
+    public long l60377;
+    public long l60378;
+    public long l60379;
+    public long l60380;
+    public long l60381;
+    public long l60382;
+    public long l60383;
+    public long l60384;
+    public long l60385;
+    public long l60386;
+    public long l60387;
+    public long l60388;
+    public long l60389;
+    public long l60390;
+    public long l60391;
+    public long l60392;
+    public long l60393;
+    public long l60394;
+    public long l60395;
+    public long l60396;
+    public long l60397;
+    public long l60398;
+    public long l60399;
+    public long l60400;
+    public long l60401;
+    public long l60402;
+    public long l60403;
+    public long l60404;
+    public long l60405;
+    public long l60406;
+    public long l60407;
+    public long l60408;
+    public long l60409;
+    public long l60410;
+    public long l60411;
+    public long l60412;
+    public long l60413;
+    public long l60414;
+    public long l60415;
+    public long l60416;
+    public long l60417;
+    public long l60418;
+    public long l60419;
+    public long l60420;
+    public long l60421;
+    public long l60422;
+    public long l60423;
+    public long l60424;
+    public long l60425;
+    public long l60426;
+    public long l60427;
+    public long l60428;
+    public long l60429;
+    public long l60430;
+    public long l60431;
+    public long l60432;
+    public long l60433;
+    public long l60434;
+    public long l60435;
+    public long l60436;
+    public long l60437;
+    public long l60438;
+    public long l60439;
+    public long l60440;
+    public long l60441;
+    public long l60442;
+    public long l60443;
+    public long l60444;
+    public long l60445;
+    public long l60446;
+    public long l60447;
+    public long l60448;
+    public long l60449;
+    public long l60450;
+    public long l60451;
+    public long l60452;
+    public long l60453;
+    public long l60454;
+    public long l60455;
+    public long l60456;
+    public long l60457;
+    public long l60458;
+    public long l60459;
+    public long l60460;
+    public long l60461;
+    public long l60462;
+    public long l60463;
+    public long l60464;
+    public long l60465;
+    public long l60466;
+    public long l60467;
+    public long l60468;
+    public long l60469;
+    public long l60470;
+    public long l60471;
+    public long l60472;
+    public long l60473;
+    public long l60474;
+    public long l60475;
+    public long l60476;
+    public long l60477;
+    public long l60478;
+    public long l60479;
+    public long l60480;
+    public long l60481;
+    public long l60482;
+    public long l60483;
+    public long l60484;
+    public long l60485;
+    public long l60486;
+    public long l60487;
+    public long l60488;
+    public long l60489;
+    public long l60490;
+    public long l60491;
+    public long l60492;
+    public long l60493;
+    public long l60494;
+    public long l60495;
+    public long l60496;
+    public long l60497;
+    public long l60498;
+    public long l60499;
+    public long l60500;
+    public long l60501;
+    public long l60502;
+    public long l60503;
+    public long l60504;
+    public long l60505;
+    public long l60506;
+    public long l60507;
+    public long l60508;
+    public long l60509;
+    public long l60510;
+    public long l60511;
+    public long l60512;
+    public long l60513;
+    public long l60514;
+    public long l60515;
+    public long l60516;
+    public long l60517;
+    public long l60518;
+    public long l60519;
+    public long l60520;
+    public long l60521;
+    public long l60522;
+    public long l60523;
+    public long l60524;
+    public long l60525;
+    public long l60526;
+    public long l60527;
+    public long l60528;
+    public long l60529;
+    public long l60530;
+    public long l60531;
+    public long l60532;
+    public long l60533;
+    public long l60534;
+    public long l60535;
+    public long l60536;
+    public long l60537;
+    public long l60538;
+    public long l60539;
+    public long l60540;
+    public long l60541;
+    public long l60542;
+    public long l60543;
+    public long l60544;
+    public long l60545;
+    public long l60546;
+    public long l60547;
+    public long l60548;
+    public long l60549;
+    public long l60550;
+    public long l60551;
+    public long l60552;
+    public long l60553;
+    public long l60554;
+    public long l60555;
+    public long l60556;
+    public long l60557;
+    public long l60558;
+    public long l60559;
+    public long l60560;
+    public long l60561;
+    public long l60562;
+    public long l60563;
+    public long l60564;
+    public long l60565;
+    public long l60566;
+    public long l60567;
+    public long l60568;
+    public long l60569;
+    public long l60570;
+    public long l60571;
+    public long l60572;
+    public long l60573;
+    public long l60574;
+    public long l60575;
+    public long l60576;
+    public long l60577;
+    public long l60578;
+    public long l60579;
+    public long l60580;
+    public long l60581;
+    public long l60582;
+    public long l60583;
+    public long l60584;
+    public long l60585;
+    public long l60586;
+    public long l60587;
+    public long l60588;
+    public long l60589;
+    public long l60590;
+    public long l60591;
+    public long l60592;
+    public long l60593;
+    public long l60594;
+    public long l60595;
+    public long l60596;
+    public long l60597;
+    public long l60598;
+    public long l60599;
+    public long l60600;
+    public long l60601;
+    public long l60602;
+    public long l60603;
+    public long l60604;
+    public long l60605;
+    public long l60606;
+    public long l60607;
+    public long l60608;
+    public long l60609;
+    public long l60610;
+    public long l60611;
+    public long l60612;
+    public long l60613;
+    public long l60614;
+    public long l60615;
+    public long l60616;
+    public long l60617;
+    public long l60618;
+    public long l60619;
+    public long l60620;
+    public long l60621;
+    public long l60622;
+    public long l60623;
+    public long l60624;
+    public long l60625;
+    public long l60626;
+    public long l60627;
+    public long l60628;
+    public long l60629;
+    public long l60630;
+    public long l60631;
+    public long l60632;
+    public long l60633;
+    public long l60634;
+    public long l60635;
+    public long l60636;
+    public long l60637;
+    public long l60638;
+    public long l60639;
+    public long l60640;
+    public long l60641;
+    public long l60642;
+    public long l60643;
+    public long l60644;
+    public long l60645;
+    public long l60646;
+    public long l60647;
+    public long l60648;
+    public long l60649;
+    public long l60650;
+    public long l60651;
+    public long l60652;
+    public long l60653;
+    public long l60654;
+    public long l60655;
+    public long l60656;
+    public long l60657;
+    public long l60658;
+    public long l60659;
+    public long l60660;
+    public long l60661;
+    public long l60662;
+    public long l60663;
+    public long l60664;
+    public long l60665;
+    public long l60666;
+    public long l60667;
+    public long l60668;
+    public long l60669;
+    public long l60670;
+    public long l60671;
+    public long l60672;
+    public long l60673;
+    public long l60674;
+    public long l60675;
+    public long l60676;
+    public long l60677;
+    public long l60678;
+    public long l60679;
+    public long l60680;
+    public long l60681;
+    public long l60682;
+    public long l60683;
+    public long l60684;
+    public long l60685;
+    public long l60686;
+    public long l60687;
+    public long l60688;
+    public long l60689;
+    public long l60690;
+    public long l60691;
+    public long l60692;
+    public long l60693;
+    public long l60694;
+    public long l60695;
+    public long l60696;
+    public long l60697;
+    public long l60698;
+    public long l60699;
+    public long l60700;
+    public long l60701;
+    public long l60702;
+    public long l60703;
+    public long l60704;
+    public long l60705;
+    public long l60706;
+    public long l60707;
+    public long l60708;
+    public long l60709;
+    public long l60710;
+    public long l60711;
+    public long l60712;
+    public long l60713;
+    public long l60714;
+    public long l60715;
+    public long l60716;
+    public long l60717;
+    public long l60718;
+    public long l60719;
+    public long l60720;
+    public long l60721;
+    public long l60722;
+    public long l60723;
+    public long l60724;
+    public long l60725;
+    public long l60726;
+    public long l60727;
+    public long l60728;
+    public long l60729;
+    public long l60730;
+    public long l60731;
+    public long l60732;
+    public long l60733;
+    public long l60734;
+    public long l60735;
+    public long l60736;
+    public long l60737;
+    public long l60738;
+    public long l60739;
+    public long l60740;
+    public long l60741;
+    public long l60742;
+    public long l60743;
+    public long l60744;
+    public long l60745;
+    public long l60746;
+    public long l60747;
+    public long l60748;
+    public long l60749;
+    public long l60750;
+    public long l60751;
+    public long l60752;
+    public long l60753;
+    public long l60754;
+    public long l60755;
+    public long l60756;
+    public long l60757;
+    public long l60758;
+    public long l60759;
+    public long l60760;
+    public long l60761;
+    public long l60762;
+    public long l60763;
+    public long l60764;
+    public long l60765;
+    public long l60766;
+    public long l60767;
+    public long l60768;
+    public long l60769;
+    public long l60770;
+    public long l60771;
+    public long l60772;
+    public long l60773;
+    public long l60774;
+    public long l60775;
+    public long l60776;
+    public long l60777;
+    public long l60778;
+    public long l60779;
+    public long l60780;
+    public long l60781;
+    public long l60782;
+    public long l60783;
+    public long l60784;
+    public long l60785;
+    public long l60786;
+    public long l60787;
+    public long l60788;
+    public long l60789;
+    public long l60790;
+    public long l60791;
+    public long l60792;
+    public long l60793;
+    public long l60794;
+    public long l60795;
+    public long l60796;
+    public long l60797;
+    public long l60798;
+    public long l60799;
+    public long l60800;
+    public long l60801;
+    public long l60802;
+    public long l60803;
+    public long l60804;
+    public long l60805;
+    public long l60806;
+    public long l60807;
+    public long l60808;
+    public long l60809;
+    public long l60810;
+    public long l60811;
+    public long l60812;
+    public long l60813;
+    public long l60814;
+    public long l60815;
+    public long l60816;
+    public long l60817;
+    public long l60818;
+    public long l60819;
+    public long l60820;
+    public long l60821;
+    public long l60822;
+    public long l60823;
+    public long l60824;
+    public long l60825;
+    public long l60826;
+    public long l60827;
+    public long l60828;
+    public long l60829;
+    public long l60830;
+    public long l60831;
+    public long l60832;
+    public long l60833;
+    public long l60834;
+    public long l60835;
+    public long l60836;
+    public long l60837;
+    public long l60838;
+    public long l60839;
+    public long l60840;
+    public long l60841;
+    public long l60842;
+    public long l60843;
+    public long l60844;
+    public long l60845;
+    public long l60846;
+    public long l60847;
+    public long l60848;
+    public long l60849;
+    public long l60850;
+    public long l60851;
+    public long l60852;
+    public long l60853;
+    public long l60854;
+    public long l60855;
+    public long l60856;
+    public long l60857;
+    public long l60858;
+    public long l60859;
+    public long l60860;
+    public long l60861;
+    public long l60862;
+    public long l60863;
+    public long l60864;
+    public long l60865;
+    public long l60866;
+    public long l60867;
+    public long l60868;
+    public long l60869;
+    public long l60870;
+    public long l60871;
+    public long l60872;
+    public long l60873;
+    public long l60874;
+    public long l60875;
+    public long l60876;
+    public long l60877;
+    public long l60878;
+    public long l60879;
+    public long l60880;
+    public long l60881;
+    public long l60882;
+    public long l60883;
+    public long l60884;
+    public long l60885;
+    public long l60886;
+    public long l60887;
+    public long l60888;
+    public long l60889;
+    public long l60890;
+    public long l60891;
+    public long l60892;
+    public long l60893;
+    public long l60894;
+    public long l60895;
+    public long l60896;
+    public long l60897;
+    public long l60898;
+    public long l60899;
+    public long l60900;
+    public long l60901;
+    public long l60902;
+    public long l60903;
+    public long l60904;
+    public long l60905;
+    public long l60906;
+    public long l60907;
+    public long l60908;
+    public long l60909;
+    public long l60910;
+    public long l60911;
+    public long l60912;
+    public long l60913;
+    public long l60914;
+    public long l60915;
+    public long l60916;
+    public long l60917;
+    public long l60918;
+    public long l60919;
+    public long l60920;
+    public long l60921;
+    public long l60922;
+    public long l60923;
+    public long l60924;
+    public long l60925;
+    public long l60926;
+    public long l60927;
+    public long l60928;
+    public long l60929;
+    public long l60930;
+    public long l60931;
+    public long l60932;
+    public long l60933;
+    public long l60934;
+    public long l60935;
+    public long l60936;
+    public long l60937;
+    public long l60938;
+    public long l60939;
+    public long l60940;
+    public long l60941;
+    public long l60942;
+    public long l60943;
+    public long l60944;
+    public long l60945;
+    public long l60946;
+    public long l60947;
+    public long l60948;
+    public long l60949;
+    public long l60950;
+    public long l60951;
+    public long l60952;
+    public long l60953;
+    public long l60954;
+    public long l60955;
+    public long l60956;
+    public long l60957;
+    public long l60958;
+    public long l60959;
+    public long l60960;
+    public long l60961;
+    public long l60962;
+    public long l60963;
+    public long l60964;
+    public long l60965;
+    public long l60966;
+    public long l60967;
+    public long l60968;
+    public long l60969;
+    public long l60970;
+    public long l60971;
+    public long l60972;
+    public long l60973;
+    public long l60974;
+    public long l60975;
+    public long l60976;
+    public long l60977;
+    public long l60978;
+    public long l60979;
+    public long l60980;
+    public long l60981;
+    public long l60982;
+    public long l60983;
+    public long l60984;
+    public long l60985;
+    public long l60986;
+    public long l60987;
+    public long l60988;
+    public long l60989;
+    public long l60990;
+    public long l60991;
+    public long l60992;
+    public long l60993;
+    public long l60994;
+    public long l60995;
+    public long l60996;
+    public long l60997;
+    public long l60998;
+    public long l60999;
+    public long l61000;
+    public long l61001;
+    public long l61002;
+    public long l61003;
+    public long l61004;
+    public long l61005;
+    public long l61006;
+    public long l61007;
+    public long l61008;
+    public long l61009;
+    public long l61010;
+    public long l61011;
+    public long l61012;
+    public long l61013;
+    public long l61014;
+    public long l61015;
+    public long l61016;
+    public long l61017;
+    public long l61018;
+    public long l61019;
+    public long l61020;
+    public long l61021;
+    public long l61022;
+    public long l61023;
+    public long l61024;
+    public long l61025;
+    public long l61026;
+    public long l61027;
+    public long l61028;
+    public long l61029;
+    public long l61030;
+    public long l61031;
+    public long l61032;
+    public long l61033;
+    public long l61034;
+    public long l61035;
+    public long l61036;
+    public long l61037;
+    public long l61038;
+    public long l61039;
+    public long l61040;
+    public long l61041;
+    public long l61042;
+    public long l61043;
+    public long l61044;
+    public long l61045;
+    public long l61046;
+    public long l61047;
+    public long l61048;
+    public long l61049;
+    public long l61050;
+    public long l61051;
+    public long l61052;
+    public long l61053;
+    public long l61054;
+    public long l61055;
+    public long l61056;
+    public long l61057;
+    public long l61058;
+    public long l61059;
+    public long l61060;
+    public long l61061;
+    public long l61062;
+    public long l61063;
+    public long l61064;
+    public long l61065;
+    public long l61066;
+    public long l61067;
+    public long l61068;
+    public long l61069;
+    public long l61070;
+    public long l61071;
+    public long l61072;
+    public long l61073;
+    public long l61074;
+    public long l61075;
+    public long l61076;
+    public long l61077;
+    public long l61078;
+    public long l61079;
+    public long l61080;
+    public long l61081;
+    public long l61082;
+    public long l61083;
+    public long l61084;
+    public long l61085;
+    public long l61086;
+    public long l61087;
+    public long l61088;
+    public long l61089;
+    public long l61090;
+    public long l61091;
+    public long l61092;
+    public long l61093;
+    public long l61094;
+    public long l61095;
+    public long l61096;
+    public long l61097;
+    public long l61098;
+    public long l61099;
+    public long l61100;
+    public long l61101;
+    public long l61102;
+    public long l61103;
+    public long l61104;
+    public long l61105;
+    public long l61106;
+    public long l61107;
+    public long l61108;
+    public long l61109;
+    public long l61110;
+    public long l61111;
+    public long l61112;
+    public long l61113;
+    public long l61114;
+    public long l61115;
+    public long l61116;
+    public long l61117;
+    public long l61118;
+    public long l61119;
+    public long l61120;
+    public long l61121;
+    public long l61122;
+    public long l61123;
+    public long l61124;
+    public long l61125;
+    public long l61126;
+    public long l61127;
+    public long l61128;
+    public long l61129;
+    public long l61130;
+    public long l61131;
+    public long l61132;
+    public long l61133;
+    public long l61134;
+    public long l61135;
+    public long l61136;
+    public long l61137;
+    public long l61138;
+    public long l61139;
+    public long l61140;
+    public long l61141;
+    public long l61142;
+    public long l61143;
+    public long l61144;
+    public long l61145;
+    public long l61146;
+    public long l61147;
+    public long l61148;
+    public long l61149;
+    public long l61150;
+    public long l61151;
+    public long l61152;
+    public long l61153;
+    public long l61154;
+    public long l61155;
+    public long l61156;
+    public long l61157;
+    public long l61158;
+    public long l61159;
+    public long l61160;
+    public long l61161;
+    public long l61162;
+    public long l61163;
+    public long l61164;
+    public long l61165;
+    public long l61166;
+    public long l61167;
+    public long l61168;
+    public long l61169;
+    public long l61170;
+    public long l61171;
+    public long l61172;
+    public long l61173;
+    public long l61174;
+    public long l61175;
+    public long l61176;
+    public long l61177;
+    public long l61178;
+    public long l61179;
+    public long l61180;
+    public long l61181;
+    public long l61182;
+    public long l61183;
+    public long l61184;
+    public long l61185;
+    public long l61186;
+    public long l61187;
+    public long l61188;
+    public long l61189;
+    public long l61190;
+    public long l61191;
+    public long l61192;
+    public long l61193;
+    public long l61194;
+    public long l61195;
+    public long l61196;
+    public long l61197;
+    public long l61198;
+    public long l61199;
+    public long l61200;
+    public long l61201;
+    public long l61202;
+    public long l61203;
+    public long l61204;
+    public long l61205;
+    public long l61206;
+    public long l61207;
+    public long l61208;
+    public long l61209;
+    public long l61210;
+    public long l61211;
+    public long l61212;
+    public long l61213;
+    public long l61214;
+    public long l61215;
+    public long l61216;
+    public long l61217;
+    public long l61218;
+    public long l61219;
+    public long l61220;
+    public long l61221;
+    public long l61222;
+    public long l61223;
+    public long l61224;
+    public long l61225;
+    public long l61226;
+    public long l61227;
+    public long l61228;
+    public long l61229;
+    public long l61230;
+    public long l61231;
+    public long l61232;
+    public long l61233;
+    public long l61234;
+    public long l61235;
+    public long l61236;
+    public long l61237;
+    public long l61238;
+    public long l61239;
+    public long l61240;
+    public long l61241;
+    public long l61242;
+    public long l61243;
+    public long l61244;
+    public long l61245;
+    public long l61246;
+    public long l61247;
+    public long l61248;
+    public long l61249;
+    public long l61250;
+    public long l61251;
+    public long l61252;
+    public long l61253;
+    public long l61254;
+    public long l61255;
+    public long l61256;
+    public long l61257;
+    public long l61258;
+    public long l61259;
+    public long l61260;
+    public long l61261;
+    public long l61262;
+    public long l61263;
+    public long l61264;
+    public long l61265;
+    public long l61266;
+    public long l61267;
+    public long l61268;
+    public long l61269;
+    public long l61270;
+    public long l61271;
+    public long l61272;
+    public long l61273;
+    public long l61274;
+    public long l61275;
+    public long l61276;
+    public long l61277;
+    public long l61278;
+    public long l61279;
+    public long l61280;
+    public long l61281;
+    public long l61282;
+    public long l61283;
+    public long l61284;
+    public long l61285;
+    public long l61286;
+    public long l61287;
+    public long l61288;
+    public long l61289;
+    public long l61290;
+    public long l61291;
+    public long l61292;
+    public long l61293;
+    public long l61294;
+    public long l61295;
+    public long l61296;
+    public long l61297;
+    public long l61298;
+    public long l61299;
+    public long l61300;
+    public long l61301;
+    public long l61302;
+    public long l61303;
+    public long l61304;
+    public long l61305;
+    public long l61306;
+    public long l61307;
+    public long l61308;
+    public long l61309;
+    public long l61310;
+    public long l61311;
+    public long l61312;
+    public long l61313;
+    public long l61314;
+    public long l61315;
+    public long l61316;
+    public long l61317;
+    public long l61318;
+    public long l61319;
+    public long l61320;
+    public long l61321;
+    public long l61322;
+    public long l61323;
+    public long l61324;
+    public long l61325;
+    public long l61326;
+    public long l61327;
+    public long l61328;
+    public long l61329;
+    public long l61330;
+    public long l61331;
+    public long l61332;
+    public long l61333;
+    public long l61334;
+    public long l61335;
+    public long l61336;
+    public long l61337;
+    public long l61338;
+    public long l61339;
+    public long l61340;
+    public long l61341;
+    public long l61342;
+    public long l61343;
+    public long l61344;
+    public long l61345;
+    public long l61346;
+    public long l61347;
+    public long l61348;
+    public long l61349;
+    public long l61350;
+    public long l61351;
+    public long l61352;
+    public long l61353;
+    public long l61354;
+    public long l61355;
+    public long l61356;
+    public long l61357;
+    public long l61358;
+    public long l61359;
+    public long l61360;
+    public long l61361;
+    public long l61362;
+    public long l61363;
+    public long l61364;
+    public long l61365;
+    public long l61366;
+    public long l61367;
+    public long l61368;
+    public long l61369;
+    public long l61370;
+    public long l61371;
+    public long l61372;
+    public long l61373;
+    public long l61374;
+    public long l61375;
+    public long l61376;
+    public long l61377;
+    public long l61378;
+    public long l61379;
+    public long l61380;
+    public long l61381;
+    public long l61382;
+    public long l61383;
+    public long l61384;
+    public long l61385;
+    public long l61386;
+    public long l61387;
+    public long l61388;
+    public long l61389;
+    public long l61390;
+    public long l61391;
+    public long l61392;
+    public long l61393;
+    public long l61394;
+    public long l61395;
+    public long l61396;
+    public long l61397;
+    public long l61398;
+    public long l61399;
+    public long l61400;
+    public long l61401;
+    public long l61402;
+    public long l61403;
+    public long l61404;
+    public long l61405;
+    public long l61406;
+    public long l61407;
+    public long l61408;
+    public long l61409;
+    public long l61410;
+    public long l61411;
+    public long l61412;
+    public long l61413;
+    public long l61414;
+    public long l61415;
+    public long l61416;
+    public long l61417;
+    public long l61418;
+    public long l61419;
+    public long l61420;
+    public long l61421;
+    public long l61422;
+    public long l61423;
+    public long l61424;
+    public long l61425;
+    public long l61426;
+    public long l61427;
+    public long l61428;
+    public long l61429;
+    public long l61430;
+    public long l61431;
+    public long l61432;
+    public long l61433;
+    public long l61434;
+    public long l61435;
+    public long l61436;
+    public long l61437;
+    public long l61438;
+    public long l61439;
+    public long l61440;
+    public long l61441;
+    public long l61442;
+    public long l61443;
+    public long l61444;
+    public long l61445;
+    public long l61446;
+    public long l61447;
+    public long l61448;
+    public long l61449;
+    public long l61450;
+    public long l61451;
+    public long l61452;
+    public long l61453;
+    public long l61454;
+    public long l61455;
+    public long l61456;
+    public long l61457;
+    public long l61458;
+    public long l61459;
+    public long l61460;
+    public long l61461;
+    public long l61462;
+    public long l61463;
+    public long l61464;
+    public long l61465;
+    public long l61466;
+    public long l61467;
+    public long l61468;
+    public long l61469;
+    public long l61470;
+    public long l61471;
+    public long l61472;
+    public long l61473;
+    public long l61474;
+    public long l61475;
+    public long l61476;
+    public long l61477;
+    public long l61478;
+    public long l61479;
+    public long l61480;
+    public long l61481;
+    public long l61482;
+    public long l61483;
+    public long l61484;
+    public long l61485;
+    public long l61486;
+    public long l61487;
+    public long l61488;
+    public long l61489;
+    public long l61490;
+    public long l61491;
+    public long l61492;
+    public long l61493;
+    public long l61494;
+    public long l61495;
+    public long l61496;
+    public long l61497;
+    public long l61498;
+    public long l61499;
+    public long l61500;
+    public long l61501;
+    public long l61502;
+    public long l61503;
+    public long l61504;
+    public long l61505;
+    public long l61506;
+    public long l61507;
+    public long l61508;
+    public long l61509;
+    public long l61510;
+    public long l61511;
+    public long l61512;
+    public long l61513;
+    public long l61514;
+    public long l61515;
+    public long l61516;
+    public long l61517;
+    public long l61518;
+    public long l61519;
+    public long l61520;
+    public long l61521;
+    public long l61522;
+    public long l61523;
+    public long l61524;
+    public long l61525;
+    public long l61526;
+    public long l61527;
+    public long l61528;
+    public long l61529;
+    public long l61530;
+    public long l61531;
+    public long l61532;
+    public long l61533;
+    public long l61534;
+    public long l61535;
+    public long l61536;
+    public long l61537;
+    public long l61538;
+    public long l61539;
+    public long l61540;
+    public long l61541;
+    public long l61542;
+    public long l61543;
+    public long l61544;
+    public long l61545;
+    public long l61546;
+    public long l61547;
+    public long l61548;
+    public long l61549;
+    public long l61550;
+    public long l61551;
+    public long l61552;
+    public long l61553;
+    public long l61554;
+    public long l61555;
+    public long l61556;
+    public long l61557;
+    public long l61558;
+    public long l61559;
+    public long l61560;
+    public long l61561;
+    public long l61562;
+    public long l61563;
+    public long l61564;
+    public long l61565;
+    public long l61566;
+    public long l61567;
+    public long l61568;
+    public long l61569;
+    public long l61570;
+    public long l61571;
+    public long l61572;
+    public long l61573;
+    public long l61574;
+    public long l61575;
+    public long l61576;
+    public long l61577;
+    public long l61578;
+    public long l61579;
+    public long l61580;
+    public long l61581;
+    public long l61582;
+    public long l61583;
+    public long l61584;
+    public long l61585;
+    public long l61586;
+    public long l61587;
+    public long l61588;
+    public long l61589;
+    public long l61590;
+    public long l61591;
+    public long l61592;
+    public long l61593;
+    public long l61594;
+    public long l61595;
+    public long l61596;
+    public long l61597;
+    public long l61598;
+    public long l61599;
+    public long l61600;
+    public long l61601;
+    public long l61602;
+    public long l61603;
+    public long l61604;
+    public long l61605;
+    public long l61606;
+    public long l61607;
+    public long l61608;
+    public long l61609;
+    public long l61610;
+    public long l61611;
+    public long l61612;
+    public long l61613;
+    public long l61614;
+    public long l61615;
+    public long l61616;
+    public long l61617;
+    public long l61618;
+    public long l61619;
+    public long l61620;
+    public long l61621;
+    public long l61622;
+    public long l61623;
+    public long l61624;
+    public long l61625;
+    public long l61626;
+    public long l61627;
+    public long l61628;
+    public long l61629;
+    public long l61630;
+    public long l61631;
+    public long l61632;
+    public long l61633;
+    public long l61634;
+    public long l61635;
+    public long l61636;
+    public long l61637;
+    public long l61638;
+    public long l61639;
+    public long l61640;
+    public long l61641;
+    public long l61642;
+    public long l61643;
+    public long l61644;
+    public long l61645;
+    public long l61646;
+    public long l61647;
+    public long l61648;
+    public long l61649;
+    public long l61650;
+    public long l61651;
+    public long l61652;
+    public long l61653;
+    public long l61654;
+    public long l61655;
+    public long l61656;
+    public long l61657;
+    public long l61658;
+    public long l61659;
+    public long l61660;
+    public long l61661;
+    public long l61662;
+    public long l61663;
+    public long l61664;
+    public long l61665;
+    public long l61666;
+    public long l61667;
+    public long l61668;
+    public long l61669;
+    public long l61670;
+    public long l61671;
+    public long l61672;
+    public long l61673;
+    public long l61674;
+    public long l61675;
+    public long l61676;
+    public long l61677;
+    public long l61678;
+    public long l61679;
+    public long l61680;
+    public long l61681;
+    public long l61682;
+    public long l61683;
+    public long l61684;
+    public long l61685;
+    public long l61686;
+    public long l61687;
+    public long l61688;
+    public long l61689;
+    public long l61690;
+    public long l61691;
+    public long l61692;
+    public long l61693;
+    public long l61694;
+    public long l61695;
+    public long l61696;
+    public long l61697;
+    public long l61698;
+    public long l61699;
+    public long l61700;
+    public long l61701;
+    public long l61702;
+    public long l61703;
+    public long l61704;
+    public long l61705;
+    public long l61706;
+    public long l61707;
+    public long l61708;
+    public long l61709;
+    public long l61710;
+    public long l61711;
+    public long l61712;
+    public long l61713;
+    public long l61714;
+    public long l61715;
+    public long l61716;
+    public long l61717;
+    public long l61718;
+    public long l61719;
+    public long l61720;
+    public long l61721;
+    public long l61722;
+    public long l61723;
+    public long l61724;
+    public long l61725;
+    public long l61726;
+    public long l61727;
+    public long l61728;
+    public long l61729;
+    public long l61730;
+    public long l61731;
+    public long l61732;
+    public long l61733;
+    public long l61734;
+    public long l61735;
+    public long l61736;
+    public long l61737;
+    public long l61738;
+    public long l61739;
+    public long l61740;
+    public long l61741;
+    public long l61742;
+    public long l61743;
+    public long l61744;
+    public long l61745;
+    public long l61746;
+    public long l61747;
+    public long l61748;
+    public long l61749;
+    public long l61750;
+    public long l61751;
+    public long l61752;
+    public long l61753;
+    public long l61754;
+    public long l61755;
+    public long l61756;
+    public long l61757;
+    public long l61758;
+    public long l61759;
+    public long l61760;
+    public long l61761;
+    public long l61762;
+    public long l61763;
+    public long l61764;
+    public long l61765;
+    public long l61766;
+    public long l61767;
+    public long l61768;
+    public long l61769;
+    public long l61770;
+    public long l61771;
+    public long l61772;
+    public long l61773;
+    public long l61774;
+    public long l61775;
+    public long l61776;
+    public long l61777;
+    public long l61778;
+    public long l61779;
+    public long l61780;
+    public long l61781;
+    public long l61782;
+    public long l61783;
+    public long l61784;
+    public long l61785;
+    public long l61786;
+    public long l61787;
+    public long l61788;
+    public long l61789;
+    public long l61790;
+    public long l61791;
+    public long l61792;
+    public long l61793;
+    public long l61794;
+    public long l61795;
+    public long l61796;
+    public long l61797;
+    public long l61798;
+    public long l61799;
+    public long l61800;
+    public long l61801;
+    public long l61802;
+    public long l61803;
+    public long l61804;
+    public long l61805;
+    public long l61806;
+    public long l61807;
+    public long l61808;
+    public long l61809;
+    public long l61810;
+    public long l61811;
+    public long l61812;
+    public long l61813;
+    public long l61814;
+    public long l61815;
+    public long l61816;
+    public long l61817;
+    public long l61818;
+    public long l61819;
+    public long l61820;
+    public long l61821;
+    public long l61822;
+    public long l61823;
+    public long l61824;
+    public long l61825;
+    public long l61826;
+    public long l61827;
+    public long l61828;
+    public long l61829;
+    public long l61830;
+    public long l61831;
+    public long l61832;
+    public long l61833;
+    public long l61834;
+    public long l61835;
+    public long l61836;
+    public long l61837;
+    public long l61838;
+    public long l61839;
+    public long l61840;
+    public long l61841;
+    public long l61842;
+    public long l61843;
+    public long l61844;
+    public long l61845;
+    public long l61846;
+    public long l61847;
+    public long l61848;
+    public long l61849;
+    public long l61850;
+    public long l61851;
+    public long l61852;
+    public long l61853;
+    public long l61854;
+    public long l61855;
+    public long l61856;
+    public long l61857;
+    public long l61858;
+    public long l61859;
+    public long l61860;
+    public long l61861;
+    public long l61862;
+    public long l61863;
+    public long l61864;
+    public long l61865;
+    public long l61866;
+    public long l61867;
+    public long l61868;
+    public long l61869;
+    public long l61870;
+    public long l61871;
+    public long l61872;
+    public long l61873;
+    public long l61874;
+    public long l61875;
+    public long l61876;
+    public long l61877;
+    public long l61878;
+    public long l61879;
+    public long l61880;
+    public long l61881;
+    public long l61882;
+    public long l61883;
+    public long l61884;
+    public long l61885;
+    public long l61886;
+    public long l61887;
+    public long l61888;
+    public long l61889;
+    public long l61890;
+    public long l61891;
+    public long l61892;
+    public long l61893;
+    public long l61894;
+    public long l61895;
+    public long l61896;
+    public long l61897;
+    public long l61898;
+    public long l61899;
+    public long l61900;
+    public long l61901;
+    public long l61902;
+    public long l61903;
+    public long l61904;
+    public long l61905;
+    public long l61906;
+    public long l61907;
+    public long l61908;
+    public long l61909;
+    public long l61910;
+    public long l61911;
+    public long l61912;
+    public long l61913;
+    public long l61914;
+    public long l61915;
+    public long l61916;
+    public long l61917;
+    public long l61918;
+    public long l61919;
+    public long l61920;
+    public long l61921;
+    public long l61922;
+    public long l61923;
+    public long l61924;
+    public long l61925;
+    public long l61926;
+    public long l61927;
+    public long l61928;
+    public long l61929;
+    public long l61930;
+    public long l61931;
+    public long l61932;
+    public long l61933;
+    public long l61934;
+    public long l61935;
+    public long l61936;
+    public long l61937;
+    public long l61938;
+    public long l61939;
+    public long l61940;
+    public long l61941;
+    public long l61942;
+    public long l61943;
+    public long l61944;
+    public long l61945;
+    public long l61946;
+    public long l61947;
+    public long l61948;
+    public long l61949;
+    public long l61950;
+    public long l61951;
+    public long l61952;
+    public long l61953;
+    public long l61954;
+    public long l61955;
+    public long l61956;
+    public long l61957;
+    public long l61958;
+    public long l61959;
+    public long l61960;
+    public long l61961;
+    public long l61962;
+    public long l61963;
+    public long l61964;
+    public long l61965;
+    public long l61966;
+    public long l61967;
+    public long l61968;
+    public long l61969;
+    public long l61970;
+    public long l61971;
+    public long l61972;
+    public long l61973;
+    public long l61974;
+    public long l61975;
+    public long l61976;
+    public long l61977;
+    public long l61978;
+    public long l61979;
+    public long l61980;
+    public long l61981;
+    public long l61982;
+    public long l61983;
+    public long l61984;
+    public long l61985;
+    public long l61986;
+    public long l61987;
+    public long l61988;
+    public long l61989;
+    public long l61990;
+    public long l61991;
+    public long l61992;
+    public long l61993;
+    public long l61994;
+    public long l61995;
+    public long l61996;
+    public long l61997;
+    public long l61998;
+    public long l61999;
+    public long l62000;
+    public long l62001;
+    public long l62002;
+    public long l62003;
+    public long l62004;
+    public long l62005;
+    public long l62006;
+    public long l62007;
+    public long l62008;
+    public long l62009;
+    public long l62010;
+    public long l62011;
+    public long l62012;
+    public long l62013;
+    public long l62014;
+    public long l62015;
+    public long l62016;
+    public long l62017;
+    public long l62018;
+    public long l62019;
+    public long l62020;
+    public long l62021;
+    public long l62022;
+    public long l62023;
+    public long l62024;
+    public long l62025;
+    public long l62026;
+    public long l62027;
+    public long l62028;
+    public long l62029;
+    public long l62030;
+    public long l62031;
+    public long l62032;
+    public long l62033;
+    public long l62034;
+    public long l62035;
+    public long l62036;
+    public long l62037;
+    public long l62038;
+    public long l62039;
+    public long l62040;
+    public long l62041;
+    public long l62042;
+    public long l62043;
+    public long l62044;
+    public long l62045;
+    public long l62046;
+    public long l62047;
+    public long l62048;
+    public long l62049;
+    public long l62050;
+    public long l62051;
+    public long l62052;
+    public long l62053;
+    public long l62054;
+    public long l62055;
+    public long l62056;
+    public long l62057;
+    public long l62058;
+    public long l62059;
+    public long l62060;
+    public long l62061;
+    public long l62062;
+    public long l62063;
+    public long l62064;
+    public long l62065;
+    public long l62066;
+    public long l62067;
+    public long l62068;
+    public long l62069;
+    public long l62070;
+    public long l62071;
+    public long l62072;
+    public long l62073;
+    public long l62074;
+    public long l62075;
+    public long l62076;
+    public long l62077;
+    public long l62078;
+    public long l62079;
+    public long l62080;
+    public long l62081;
+    public long l62082;
+    public long l62083;
+    public long l62084;
+    public long l62085;
+    public long l62086;
+    public long l62087;
+    public long l62088;
+    public long l62089;
+    public long l62090;
+    public long l62091;
+    public long l62092;
+    public long l62093;
+    public long l62094;
+    public long l62095;
+    public long l62096;
+    public long l62097;
+    public long l62098;
+    public long l62099;
+    public long l62100;
+    public long l62101;
+    public long l62102;
+    public long l62103;
+    public long l62104;
+    public long l62105;
+    public long l62106;
+    public long l62107;
+    public long l62108;
+    public long l62109;
+    public long l62110;
+    public long l62111;
+    public long l62112;
+    public long l62113;
+    public long l62114;
+    public long l62115;
+    public long l62116;
+    public long l62117;
+    public long l62118;
+    public long l62119;
+    public long l62120;
+    public long l62121;
+    public long l62122;
+    public long l62123;
+    public long l62124;
+    public long l62125;
+    public long l62126;
+    public long l62127;
+    public long l62128;
+    public long l62129;
+    public long l62130;
+    public long l62131;
+    public long l62132;
+    public long l62133;
+    public long l62134;
+    public long l62135;
+    public long l62136;
+    public long l62137;
+    public long l62138;
+    public long l62139;
+    public long l62140;
+    public long l62141;
+    public long l62142;
+    public long l62143;
+    public long l62144;
+    public long l62145;
+    public long l62146;
+    public long l62147;
+    public long l62148;
+    public long l62149;
+    public long l62150;
+    public long l62151;
+    public long l62152;
+    public long l62153;
+    public long l62154;
+    public long l62155;
+    public long l62156;
+    public long l62157;
+    public long l62158;
+    public long l62159;
+    public long l62160;
+    public long l62161;
+    public long l62162;
+    public long l62163;
+    public long l62164;
+    public long l62165;
+    public long l62166;
+    public long l62167;
+    public long l62168;
+    public long l62169;
+    public long l62170;
+    public long l62171;
+    public long l62172;
+    public long l62173;
+    public long l62174;
+    public long l62175;
+    public long l62176;
+    public long l62177;
+    public long l62178;
+    public long l62179;
+    public long l62180;
+    public long l62181;
+    public long l62182;
+    public long l62183;
+    public long l62184;
+    public long l62185;
+    public long l62186;
+    public long l62187;
+    public long l62188;
+    public long l62189;
+    public long l62190;
+    public long l62191;
+    public long l62192;
+    public long l62193;
+    public long l62194;
+    public long l62195;
+    public long l62196;
+    public long l62197;
+    public long l62198;
+    public long l62199;
+    public long l62200;
+    public long l62201;
+    public long l62202;
+    public long l62203;
+    public long l62204;
+    public long l62205;
+    public long l62206;
+    public long l62207;
+    public long l62208;
+    public long l62209;
+    public long l62210;
+    public long l62211;
+    public long l62212;
+    public long l62213;
+    public long l62214;
+    public long l62215;
+    public long l62216;
+    public long l62217;
+    public long l62218;
+    public long l62219;
+    public long l62220;
+    public long l62221;
+    public long l62222;
+    public long l62223;
+    public long l62224;
+    public long l62225;
+    public long l62226;
+    public long l62227;
+    public long l62228;
+    public long l62229;
+    public long l62230;
+    public long l62231;
+    public long l62232;
+    public long l62233;
+    public long l62234;
+    public long l62235;
+    public long l62236;
+    public long l62237;
+    public long l62238;
+    public long l62239;
+    public long l62240;
+    public long l62241;
+    public long l62242;
+    public long l62243;
+    public long l62244;
+    public long l62245;
+    public long l62246;
+    public long l62247;
+    public long l62248;
+    public long l62249;
+    public long l62250;
+    public long l62251;
+    public long l62252;
+    public long l62253;
+    public long l62254;
+    public long l62255;
+    public long l62256;
+    public long l62257;
+    public long l62258;
+    public long l62259;
+    public long l62260;
+    public long l62261;
+    public long l62262;
+    public long l62263;
+    public long l62264;
+    public long l62265;
+    public long l62266;
+    public long l62267;
+    public long l62268;
+    public long l62269;
+    public long l62270;
+    public long l62271;
+    public long l62272;
+    public long l62273;
+    public long l62274;
+    public long l62275;
+    public long l62276;
+    public long l62277;
+    public long l62278;
+    public long l62279;
+    public long l62280;
+    public long l62281;
+    public long l62282;
+    public long l62283;
+    public long l62284;
+    public long l62285;
+    public long l62286;
+    public long l62287;
+    public long l62288;
+    public long l62289;
+    public long l62290;
+    public long l62291;
+    public long l62292;
+    public long l62293;
+    public long l62294;
+    public long l62295;
+    public long l62296;
+    public long l62297;
+    public long l62298;
+    public long l62299;
+    public long l62300;
+    public long l62301;
+    public long l62302;
+    public long l62303;
+    public long l62304;
+    public long l62305;
+    public long l62306;
+    public long l62307;
+    public long l62308;
+    public long l62309;
+    public long l62310;
+    public long l62311;
+    public long l62312;
+    public long l62313;
+    public long l62314;
+    public long l62315;
+    public long l62316;
+    public long l62317;
+    public long l62318;
+    public long l62319;
+    public long l62320;
+    public long l62321;
+    public long l62322;
+    public long l62323;
+    public long l62324;
+    public long l62325;
+    public long l62326;
+    public long l62327;
+    public long l62328;
+    public long l62329;
+    public long l62330;
+    public long l62331;
+    public long l62332;
+    public long l62333;
+    public long l62334;
+    public long l62335;
+    public long l62336;
+    public long l62337;
+    public long l62338;
+    public long l62339;
+    public long l62340;
+    public long l62341;
+    public long l62342;
+    public long l62343;
+    public long l62344;
+    public long l62345;
+    public long l62346;
+    public long l62347;
+    public long l62348;
+    public long l62349;
+    public long l62350;
+    public long l62351;
+    public long l62352;
+    public long l62353;
+    public long l62354;
+    public long l62355;
+    public long l62356;
+    public long l62357;
+    public long l62358;
+    public long l62359;
+    public long l62360;
+    public long l62361;
+    public long l62362;
+    public long l62363;
+    public long l62364;
+    public long l62365;
+    public long l62366;
+    public long l62367;
+    public long l62368;
+    public long l62369;
+    public long l62370;
+    public long l62371;
+    public long l62372;
+    public long l62373;
+    public long l62374;
+    public long l62375;
+    public long l62376;
+    public long l62377;
+    public long l62378;
+    public long l62379;
+    public long l62380;
+    public long l62381;
+    public long l62382;
+    public long l62383;
+    public long l62384;
+    public long l62385;
+    public long l62386;
+    public long l62387;
+    public long l62388;
+    public long l62389;
+    public long l62390;
+    public long l62391;
+    public long l62392;
+    public long l62393;
+    public long l62394;
+    public long l62395;
+    public long l62396;
+    public long l62397;
+    public long l62398;
+    public long l62399;
+    public long l62400;
+    public long l62401;
+    public long l62402;
+    public long l62403;
+    public long l62404;
+    public long l62405;
+    public long l62406;
+    public long l62407;
+    public long l62408;
+    public long l62409;
+    public long l62410;
+    public long l62411;
+    public long l62412;
+    public long l62413;
+    public long l62414;
+    public long l62415;
+    public long l62416;
+    public long l62417;
+    public long l62418;
+    public long l62419;
+    public long l62420;
+    public long l62421;
+    public long l62422;
+    public long l62423;
+    public long l62424;
+    public long l62425;
+    public long l62426;
+    public long l62427;
+    public long l62428;
+    public long l62429;
+    public long l62430;
+    public long l62431;
+    public long l62432;
+    public long l62433;
+    public long l62434;
+    public long l62435;
+    public long l62436;
+    public long l62437;
+    public long l62438;
+    public long l62439;
+    public long l62440;
+    public long l62441;
+    public long l62442;
+    public long l62443;
+    public long l62444;
+    public long l62445;
+    public long l62446;
+    public long l62447;
+    public long l62448;
+    public long l62449;
+    public long l62450;
+    public long l62451;
+    public long l62452;
+    public long l62453;
+    public long l62454;
+    public long l62455;
+    public long l62456;
+    public long l62457;
+    public long l62458;
+    public long l62459;
+    public long l62460;
+    public long l62461;
+    public long l62462;
+    public long l62463;
+    public long l62464;
+    public long l62465;
+    public long l62466;
+    public long l62467;
+    public long l62468;
+    public long l62469;
+    public long l62470;
+    public long l62471;
+    public long l62472;
+    public long l62473;
+    public long l62474;
+    public long l62475;
+    public long l62476;
+    public long l62477;
+    public long l62478;
+    public long l62479;
+    public long l62480;
+    public long l62481;
+    public long l62482;
+    public long l62483;
+    public long l62484;
+    public long l62485;
+    public long l62486;
+    public long l62487;
+    public long l62488;
+    public long l62489;
+    public long l62490;
+    public long l62491;
+    public long l62492;
+    public long l62493;
+    public long l62494;
+    public long l62495;
+    public long l62496;
+    public long l62497;
+    public long l62498;
+    public long l62499;
+    public long l62500;
+    public long l62501;
+    public long l62502;
+    public long l62503;
+    public long l62504;
+    public long l62505;
+    public long l62506;
+    public long l62507;
+    public long l62508;
+    public long l62509;
+    public long l62510;
+    public long l62511;
+    public long l62512;
+    public long l62513;
+    public long l62514;
+    public long l62515;
+    public long l62516;
+    public long l62517;
+    public long l62518;
+    public long l62519;
+    public long l62520;
+    public long l62521;
+    public long l62522;
+    public long l62523;
+    public long l62524;
+    public long l62525;
+    public long l62526;
+    public long l62527;
+    public long l62528;
+    public long l62529;
+    public long l62530;
+    public long l62531;
+    public long l62532;
+    public long l62533;
+    public long l62534;
+    public long l62535;
+    public long l62536;
+    public long l62537;
+    public long l62538;
+    public long l62539;
+    public long l62540;
+    public long l62541;
+    public long l62542;
+    public long l62543;
+    public long l62544;
+    public long l62545;
+    public long l62546;
+    public long l62547;
+    public long l62548;
+    public long l62549;
+    public long l62550;
+    public long l62551;
+    public long l62552;
+    public long l62553;
+    public long l62554;
+    public long l62555;
+    public long l62556;
+    public long l62557;
+    public long l62558;
+    public long l62559;
+    public long l62560;
+    public long l62561;
+    public long l62562;
+    public long l62563;
+    public long l62564;
+    public long l62565;
+    public long l62566;
+    public long l62567;
+    public long l62568;
+    public long l62569;
+    public long l62570;
+    public long l62571;
+    public long l62572;
+    public long l62573;
+    public long l62574;
+    public long l62575;
+    public long l62576;
+    public long l62577;
+    public long l62578;
+    public long l62579;
+    public long l62580;
+    public long l62581;
+    public long l62582;
+    public long l62583;
+    public long l62584;
+    public long l62585;
+    public long l62586;
+    public long l62587;
+    public long l62588;
+    public long l62589;
+    public long l62590;
+    public long l62591;
+    public long l62592;
+    public long l62593;
+    public long l62594;
+    public long l62595;
+    public long l62596;
+    public long l62597;
+    public long l62598;
+    public long l62599;
+    public long l62600;
+    public long l62601;
+    public long l62602;
+    public long l62603;
+    public long l62604;
+    public long l62605;
+    public long l62606;
+    public long l62607;
+    public long l62608;
+    public long l62609;
+    public long l62610;
+    public long l62611;
+    public long l62612;
+    public long l62613;
+    public long l62614;
+    public long l62615;
+    public long l62616;
+    public long l62617;
+    public long l62618;
+    public long l62619;
+    public long l62620;
+    public long l62621;
+    public long l62622;
+    public long l62623;
+    public long l62624;
+    public long l62625;
+    public long l62626;
+    public long l62627;
+    public long l62628;
+    public long l62629;
+    public long l62630;
+    public long l62631;
+    public long l62632;
+    public long l62633;
+    public long l62634;
+    public long l62635;
+    public long l62636;
+    public long l62637;
+    public long l62638;
+    public long l62639;
+    public long l62640;
+    public long l62641;
+    public long l62642;
+    public long l62643;
+    public long l62644;
+    public long l62645;
+    public long l62646;
+    public long l62647;
+    public long l62648;
+    public long l62649;
+    public long l62650;
+    public long l62651;
+    public long l62652;
+    public long l62653;
+    public long l62654;
+    public long l62655;
+    public long l62656;
+    public long l62657;
+    public long l62658;
+    public long l62659;
+    public long l62660;
+    public long l62661;
+    public long l62662;
+    public long l62663;
+    public long l62664;
+    public long l62665;
+    public long l62666;
+    public long l62667;
+    public long l62668;
+    public long l62669;
+    public long l62670;
+    public long l62671;
+    public long l62672;
+    public long l62673;
+    public long l62674;
+    public long l62675;
+    public long l62676;
+    public long l62677;
+    public long l62678;
+    public long l62679;
+    public long l62680;
+    public long l62681;
+    public long l62682;
+    public long l62683;
+    public long l62684;
+    public long l62685;
+    public long l62686;
+    public long l62687;
+    public long l62688;
+    public long l62689;
+    public long l62690;
+    public long l62691;
+    public long l62692;
+    public long l62693;
+    public long l62694;
+    public long l62695;
+    public long l62696;
+    public long l62697;
+    public long l62698;
+    public long l62699;
+    public long l62700;
+    public long l62701;
+    public long l62702;
+    public long l62703;
+    public long l62704;
+    public long l62705;
+    public long l62706;
+    public long l62707;
+    public long l62708;
+    public long l62709;
+    public long l62710;
+    public long l62711;
+    public long l62712;
+    public long l62713;
+    public long l62714;
+    public long l62715;
+    public long l62716;
+    public long l62717;
+    public long l62718;
+    public long l62719;
+    public long l62720;
+    public long l62721;
+    public long l62722;
+    public long l62723;
+    public long l62724;
+    public long l62725;
+    public long l62726;
+    public long l62727;
+    public long l62728;
+    public long l62729;
+    public long l62730;
+    public long l62731;
+    public long l62732;
+    public long l62733;
+    public long l62734;
+    public long l62735;
+    public long l62736;
+    public long l62737;
+    public long l62738;
+    public long l62739;
+    public long l62740;
+    public long l62741;
+    public long l62742;
+    public long l62743;
+    public long l62744;
+    public long l62745;
+    public long l62746;
+    public long l62747;
+    public long l62748;
+    public long l62749;
+    public long l62750;
+    public long l62751;
+    public long l62752;
+    public long l62753;
+    public long l62754;
+    public long l62755;
+    public long l62756;
+    public long l62757;
+    public long l62758;
+    public long l62759;
+    public long l62760;
+    public long l62761;
+    public long l62762;
+    public long l62763;
+    public long l62764;
+    public long l62765;
+    public long l62766;
+    public long l62767;
+    public long l62768;
+    public long l62769;
+    public long l62770;
+    public long l62771;
+    public long l62772;
+    public long l62773;
+    public long l62774;
+    public long l62775;
+    public long l62776;
+    public long l62777;
+    public long l62778;
+    public long l62779;
+    public long l62780;
+    public long l62781;
+    public long l62782;
+    public long l62783;
+    public long l62784;
+    public long l62785;
+    public long l62786;
+    public long l62787;
+    public long l62788;
+    public long l62789;
+    public long l62790;
+    public long l62791;
+    public long l62792;
+    public long l62793;
+    public long l62794;
+    public long l62795;
+    public long l62796;
+    public long l62797;
+    public long l62798;
+    public long l62799;
+    public long l62800;
+    public long l62801;
+    public long l62802;
+    public long l62803;
+    public long l62804;
+    public long l62805;
+    public long l62806;
+    public long l62807;
+    public long l62808;
+    public long l62809;
+    public long l62810;
+    public long l62811;
+    public long l62812;
+    public long l62813;
+    public long l62814;
+    public long l62815;
+    public long l62816;
+    public long l62817;
+    public long l62818;
+    public long l62819;
+    public long l62820;
+    public long l62821;
+    public long l62822;
+    public long l62823;
+    public long l62824;
+    public long l62825;
+    public long l62826;
+    public long l62827;
+    public long l62828;
+    public long l62829;
+    public long l62830;
+    public long l62831;
+    public long l62832;
+    public long l62833;
+    public long l62834;
+    public long l62835;
+    public long l62836;
+    public long l62837;
+    public long l62838;
+    public long l62839;
+    public long l62840;
+    public long l62841;
+    public long l62842;
+    public long l62843;
+    public long l62844;
+    public long l62845;
+    public long l62846;
+    public long l62847;
+    public long l62848;
+    public long l62849;
+    public long l62850;
+    public long l62851;
+    public long l62852;
+    public long l62853;
+    public long l62854;
+    public long l62855;
+    public long l62856;
+    public long l62857;
+    public long l62858;
+    public long l62859;
+    public long l62860;
+    public long l62861;
+    public long l62862;
+    public long l62863;
+    public long l62864;
+    public long l62865;
+    public long l62866;
+    public long l62867;
+    public long l62868;
+    public long l62869;
+    public long l62870;
+    public long l62871;
+    public long l62872;
+    public long l62873;
+    public long l62874;
+    public long l62875;
+    public long l62876;
+    public long l62877;
+    public long l62878;
+    public long l62879;
+    public long l62880;
+    public long l62881;
+    public long l62882;
+    public long l62883;
+    public long l62884;
+    public long l62885;
+    public long l62886;
+    public long l62887;
+    public long l62888;
+    public long l62889;
+    public long l62890;
+    public long l62891;
+    public long l62892;
+    public long l62893;
+    public long l62894;
+    public long l62895;
+    public long l62896;
+    public long l62897;
+    public long l62898;
+    public long l62899;
+    public long l62900;
+    public long l62901;
+    public long l62902;
+    public long l62903;
+    public long l62904;
+    public long l62905;
+    public long l62906;
+    public long l62907;
+    public long l62908;
+    public long l62909;
+    public long l62910;
+    public long l62911;
+    public long l62912;
+    public long l62913;
+    public long l62914;
+    public long l62915;
+    public long l62916;
+    public long l62917;
+    public long l62918;
+    public long l62919;
+    public long l62920;
+    public long l62921;
+    public long l62922;
+    public long l62923;
+    public long l62924;
+    public long l62925;
+    public long l62926;
+    public long l62927;
+    public long l62928;
+    public long l62929;
+    public long l62930;
+    public long l62931;
+    public long l62932;
+    public long l62933;
+    public long l62934;
+    public long l62935;
+    public long l62936;
+    public long l62937;
+    public long l62938;
+    public long l62939;
+    public long l62940;
+    public long l62941;
+    public long l62942;
+    public long l62943;
+    public long l62944;
+    public long l62945;
+    public long l62946;
+    public long l62947;
+    public long l62948;
+    public long l62949;
+    public long l62950;
+    public long l62951;
+    public long l62952;
+    public long l62953;
+    public long l62954;
+    public long l62955;
+    public long l62956;
+    public long l62957;
+    public long l62958;
+    public long l62959;
+    public long l62960;
+    public long l62961;
+    public long l62962;
+    public long l62963;
+    public long l62964;
+    public long l62965;
+    public long l62966;
+    public long l62967;
+    public long l62968;
+    public long l62969;
+    public long l62970;
+    public long l62971;
+    public long l62972;
+    public long l62973;
+    public long l62974;
+    public long l62975;
+    public long l62976;
+    public long l62977;
+    public long l62978;
+    public long l62979;
+    public long l62980;
+    public long l62981;
+    public long l62982;
+    public long l62983;
+    public long l62984;
+    public long l62985;
+    public long l62986;
+    public long l62987;
+    public long l62988;
+    public long l62989;
+    public long l62990;
+    public long l62991;
+    public long l62992;
+    public long l62993;
+    public long l62994;
+    public long l62995;
+    public long l62996;
+    public long l62997;
+    public long l62998;
+    public long l62999;
+    public long l63000;
+    public long l63001;
+    public long l63002;
+    public long l63003;
+    public long l63004;
+    public long l63005;
+    public long l63006;
+    public long l63007;
+    public long l63008;
+    public long l63009;
+    public long l63010;
+    public long l63011;
+    public long l63012;
+    public long l63013;
+    public long l63014;
+    public long l63015;
+    public long l63016;
+    public long l63017;
+    public long l63018;
+    public long l63019;
+    public long l63020;
+    public long l63021;
+    public long l63022;
+    public long l63023;
+    public long l63024;
+    public long l63025;
+    public long l63026;
+    public long l63027;
+    public long l63028;
+    public long l63029;
+    public long l63030;
+    public long l63031;
+    public long l63032;
+    public long l63033;
+    public long l63034;
+    public long l63035;
+    public long l63036;
+    public long l63037;
+    public long l63038;
+    public long l63039;
+    public long l63040;
+    public long l63041;
+    public long l63042;
+    public long l63043;
+    public long l63044;
+    public long l63045;
+    public long l63046;
+    public long l63047;
+    public long l63048;
+    public long l63049;
+    public long l63050;
+    public long l63051;
+    public long l63052;
+    public long l63053;
+    public long l63054;
+    public long l63055;
+    public long l63056;
+    public long l63057;
+    public long l63058;
+    public long l63059;
+    public long l63060;
+    public long l63061;
+    public long l63062;
+    public long l63063;
+    public long l63064;
+    public long l63065;
+    public long l63066;
+    public long l63067;
+    public long l63068;
+    public long l63069;
+    public long l63070;
+    public long l63071;
+    public long l63072;
+    public long l63073;
+    public long l63074;
+    public long l63075;
+    public long l63076;
+    public long l63077;
+    public long l63078;
+    public long l63079;
+    public long l63080;
+    public long l63081;
+    public long l63082;
+    public long l63083;
+    public long l63084;
+    public long l63085;
+    public long l63086;
+    public long l63087;
+    public long l63088;
+    public long l63089;
+    public long l63090;
+    public long l63091;
+    public long l63092;
+    public long l63093;
+    public long l63094;
+    public long l63095;
+    public long l63096;
+    public long l63097;
+    public long l63098;
+    public long l63099;
+    public long l63100;
+    public long l63101;
+    public long l63102;
+    public long l63103;
+    public long l63104;
+    public long l63105;
+    public long l63106;
+    public long l63107;
+    public long l63108;
+    public long l63109;
+    public long l63110;
+    public long l63111;
+    public long l63112;
+    public long l63113;
+    public long l63114;
+    public long l63115;
+    public long l63116;
+    public long l63117;
+    public long l63118;
+    public long l63119;
+    public long l63120;
+    public long l63121;
+    public long l63122;
+    public long l63123;
+    public long l63124;
+    public long l63125;
+    public long l63126;
+    public long l63127;
+    public long l63128;
+    public long l63129;
+    public long l63130;
+    public long l63131;
+    public long l63132;
+    public long l63133;
+    public long l63134;
+    public long l63135;
+    public long l63136;
+    public long l63137;
+    public long l63138;
+    public long l63139;
+    public long l63140;
+    public long l63141;
+    public long l63142;
+    public long l63143;
+    public long l63144;
+    public long l63145;
+    public long l63146;
+    public long l63147;
+    public long l63148;
+    public long l63149;
+    public long l63150;
+    public long l63151;
+    public long l63152;
+    public long l63153;
+    public long l63154;
+    public long l63155;
+    public long l63156;
+    public long l63157;
+    public long l63158;
+    public long l63159;
+    public long l63160;
+    public long l63161;
+    public long l63162;
+    public long l63163;
+    public long l63164;
+    public long l63165;
+    public long l63166;
+    public long l63167;
+    public long l63168;
+    public long l63169;
+    public long l63170;
+    public long l63171;
+    public long l63172;
+    public long l63173;
+    public long l63174;
+    public long l63175;
+    public long l63176;
+    public long l63177;
+    public long l63178;
+    public long l63179;
+    public long l63180;
+    public long l63181;
+    public long l63182;
+    public long l63183;
+    public long l63184;
+    public long l63185;
+    public long l63186;
+    public long l63187;
+    public long l63188;
+    public long l63189;
+    public long l63190;
+    public long l63191;
+    public long l63192;
+    public long l63193;
+    public long l63194;
+    public long l63195;
+    public long l63196;
+    public long l63197;
+    public long l63198;
+    public long l63199;
+    public long l63200;
+    public long l63201;
+    public long l63202;
+    public long l63203;
+    public long l63204;
+    public long l63205;
+    public long l63206;
+    public long l63207;
+    public long l63208;
+    public long l63209;
+    public long l63210;
+    public long l63211;
+    public long l63212;
+    public long l63213;
+    public long l63214;
+    public long l63215;
+    public long l63216;
+    public long l63217;
+    public long l63218;
+    public long l63219;
+    public long l63220;
+    public long l63221;
+    public long l63222;
+    public long l63223;
+    public long l63224;
+    public long l63225;
+    public long l63226;
+    public long l63227;
+    public long l63228;
+    public long l63229;
+    public long l63230;
+    public long l63231;
+    public long l63232;
+    public long l63233;
+    public long l63234;
+    public long l63235;
+    public long l63236;
+    public long l63237;
+    public long l63238;
+    public long l63239;
+    public long l63240;
+    public long l63241;
+    public long l63242;
+    public long l63243;
+    public long l63244;
+    public long l63245;
+    public long l63246;
+    public long l63247;
+    public long l63248;
+    public long l63249;
+    public long l63250;
+    public long l63251;
+    public long l63252;
+    public long l63253;
+    public long l63254;
+    public long l63255;
+    public long l63256;
+    public long l63257;
+    public long l63258;
+    public long l63259;
+    public long l63260;
+    public long l63261;
+    public long l63262;
+    public long l63263;
+    public long l63264;
+    public long l63265;
+    public long l63266;
+    public long l63267;
+    public long l63268;
+    public long l63269;
+    public long l63270;
+    public long l63271;
+    public long l63272;
+    public long l63273;
+    public long l63274;
+    public long l63275;
+    public long l63276;
+    public long l63277;
+    public long l63278;
+    public long l63279;
+    public long l63280;
+    public long l63281;
+    public long l63282;
+    public long l63283;
+    public long l63284;
+    public long l63285;
+    public long l63286;
+    public long l63287;
+    public long l63288;
+    public long l63289;
+    public long l63290;
+    public long l63291;
+    public long l63292;
+    public long l63293;
+    public long l63294;
+    public long l63295;
+    public long l63296;
+    public long l63297;
+    public long l63298;
+    public long l63299;
+    public long l63300;
+    public long l63301;
+    public long l63302;
+    public long l63303;
+    public long l63304;
+    public long l63305;
+    public long l63306;
+    public long l63307;
+    public long l63308;
+    public long l63309;
+    public long l63310;
+    public long l63311;
+    public long l63312;
+    public long l63313;
+    public long l63314;
+    public long l63315;
+    public long l63316;
+    public long l63317;
+    public long l63318;
+    public long l63319;
+    public long l63320;
+    public long l63321;
+    public long l63322;
+    public long l63323;
+    public long l63324;
+    public long l63325;
+    public long l63326;
+    public long l63327;
+    public long l63328;
+    public long l63329;
+    public long l63330;
+    public long l63331;
+    public long l63332;
+    public long l63333;
+    public long l63334;
+    public long l63335;
+    public long l63336;
+    public long l63337;
+    public long l63338;
+    public long l63339;
+    public long l63340;
+    public long l63341;
+    public long l63342;
+    public long l63343;
+    public long l63344;
+    public long l63345;
+    public long l63346;
+    public long l63347;
+    public long l63348;
+    public long l63349;
+    public long l63350;
+    public long l63351;
+    public long l63352;
+    public long l63353;
+    public long l63354;
+    public long l63355;
+    public long l63356;
+    public long l63357;
+    public long l63358;
+    public long l63359;
+    public long l63360;
+    public long l63361;
+    public long l63362;
+    public long l63363;
+    public long l63364;
+    public long l63365;
+    public long l63366;
+    public long l63367;
+    public long l63368;
+    public long l63369;
+    public long l63370;
+    public long l63371;
+    public long l63372;
+    public long l63373;
+    public long l63374;
+    public long l63375;
+    public long l63376;
+    public long l63377;
+    public long l63378;
+    public long l63379;
+    public long l63380;
+    public long l63381;
+    public long l63382;
+    public long l63383;
+    public long l63384;
+    public long l63385;
+    public long l63386;
+    public long l63387;
+    public long l63388;
+    public long l63389;
+    public long l63390;
+    public long l63391;
+    public long l63392;
+    public long l63393;
+    public long l63394;
+    public long l63395;
+    public long l63396;
+    public long l63397;
+    public long l63398;
+    public long l63399;
+    public long l63400;
+    public long l63401;
+    public long l63402;
+    public long l63403;
+    public long l63404;
+    public long l63405;
+    public long l63406;
+    public long l63407;
+    public long l63408;
+    public long l63409;
+    public long l63410;
+    public long l63411;
+    public long l63412;
+    public long l63413;
+    public long l63414;
+    public long l63415;
+    public long l63416;
+    public long l63417;
+    public long l63418;
+    public long l63419;
+    public long l63420;
+    public long l63421;
+    public long l63422;
+    public long l63423;
+    public long l63424;
+    public long l63425;
+    public long l63426;
+    public long l63427;
+    public long l63428;
+    public long l63429;
+    public long l63430;
+    public long l63431;
+    public long l63432;
+    public long l63433;
+    public long l63434;
+    public long l63435;
+    public long l63436;
+    public long l63437;
+    public long l63438;
+    public long l63439;
+    public long l63440;
+    public long l63441;
+    public long l63442;
+    public long l63443;
+    public long l63444;
+    public long l63445;
+    public long l63446;
+    public long l63447;
+    public long l63448;
+    public long l63449;
+    public long l63450;
+    public long l63451;
+    public long l63452;
+    public long l63453;
+    public long l63454;
+    public long l63455;
+    public long l63456;
+    public long l63457;
+    public long l63458;
+    public long l63459;
+    public long l63460;
+    public long l63461;
+    public long l63462;
+    public long l63463;
+    public long l63464;
+    public long l63465;
+    public long l63466;
+    public long l63467;
+    public long l63468;
+    public long l63469;
+    public long l63470;
+    public long l63471;
+    public long l63472;
+    public long l63473;
+    public long l63474;
+    public long l63475;
+    public long l63476;
+    public long l63477;
+    public long l63478;
+    public long l63479;
+    public long l63480;
+    public long l63481;
+    public long l63482;
+    public long l63483;
+    public long l63484;
+    public long l63485;
+    public long l63486;
+    public long l63487;
+    public long l63488;
+    public long l63489;
+    public long l63490;
+    public long l63491;
+    public long l63492;
+    public long l63493;
+    public long l63494;
+    public long l63495;
+    public long l63496;
+    public long l63497;
+    public long l63498;
+    public long l63499;
+    public long l63500;
+    public long l63501;
+    public long l63502;
+    public long l63503;
+    public long l63504;
+    public long l63505;
+    public long l63506;
+    public long l63507;
+    public long l63508;
+    public long l63509;
+    public long l63510;
+    public long l63511;
+    public long l63512;
+    public long l63513;
+    public long l63514;
+    public long l63515;
+    public long l63516;
+    public long l63517;
+    public long l63518;
+    public long l63519;
+    public long l63520;
+    public long l63521;
+    public long l63522;
+    public long l63523;
+    public long l63524;
+    public long l63525;
+    public long l63526;
+    public long l63527;
+    public long l63528;
+    public long l63529;
+    public long l63530;
+    public long l63531;
+    public long l63532;
+    public long l63533;
+    public long l63534;
+    public long l63535;
+    public long l63536;
+    public long l63537;
+    public long l63538;
+    public long l63539;
+    public long l63540;
+    public long l63541;
+    public long l63542;
+    public long l63543;
+    public long l63544;
+    public long l63545;
+    public long l63546;
+    public long l63547;
+    public long l63548;
+    public long l63549;
+    public long l63550;
+    public long l63551;
+    public long l63552;
+    public long l63553;
+    public long l63554;
+    public long l63555;
+    public long l63556;
+    public long l63557;
+    public long l63558;
+    public long l63559;
+    public long l63560;
+    public long l63561;
+    public long l63562;
+    public long l63563;
+    public long l63564;
+    public long l63565;
+    public long l63566;
+    public long l63567;
+    public long l63568;
+    public long l63569;
+    public long l63570;
+    public long l63571;
+    public long l63572;
+    public long l63573;
+    public long l63574;
+    public long l63575;
+    public long l63576;
+    public long l63577;
+    public long l63578;
+    public long l63579;
+    public long l63580;
+    public long l63581;
+    public long l63582;
+    public long l63583;
+    public long l63584;
+    public long l63585;
+    public long l63586;
+    public long l63587;
+    public long l63588;
+    public long l63589;
+    public long l63590;
+    public long l63591;
+    public long l63592;
+    public long l63593;
+    public long l63594;
+    public long l63595;
+    public long l63596;
+    public long l63597;
+    public long l63598;
+    public long l63599;
+    public long l63600;
+    public long l63601;
+    public long l63602;
+    public long l63603;
+    public long l63604;
+    public long l63605;
+    public long l63606;
+    public long l63607;
+    public long l63608;
+    public long l63609;
+    public long l63610;
+    public long l63611;
+    public long l63612;
+    public long l63613;
+    public long l63614;
+    public long l63615;
+    public long l63616;
+    public long l63617;
+    public long l63618;
+    public long l63619;
+    public long l63620;
+    public long l63621;
+    public long l63622;
+    public long l63623;
+    public long l63624;
+    public long l63625;
+    public long l63626;
+    public long l63627;
+    public long l63628;
+    public long l63629;
+    public long l63630;
+    public long l63631;
+    public long l63632;
+    public long l63633;
+    public long l63634;
+    public long l63635;
+    public long l63636;
+    public long l63637;
+    public long l63638;
+    public long l63639;
+    public long l63640;
+    public long l63641;
+    public long l63642;
+    public long l63643;
+    public long l63644;
+    public long l63645;
+    public long l63646;
+    public long l63647;
+    public long l63648;
+    public long l63649;
+    public long l63650;
+    public long l63651;
+    public long l63652;
+    public long l63653;
+    public long l63654;
+    public long l63655;
+    public long l63656;
+    public long l63657;
+    public long l63658;
+    public long l63659;
+    public long l63660;
+    public long l63661;
+    public long l63662;
+    public long l63663;
+    public long l63664;
+    public long l63665;
+    public long l63666;
+    public long l63667;
+    public long l63668;
+    public long l63669;
+    public long l63670;
+    public long l63671;
+    public long l63672;
+    public long l63673;
+    public long l63674;
+    public long l63675;
+    public long l63676;
+    public long l63677;
+    public long l63678;
+    public long l63679;
+    public long l63680;
+    public long l63681;
+    public long l63682;
+    public long l63683;
+    public long l63684;
+    public long l63685;
+    public long l63686;
+    public long l63687;
+    public long l63688;
+    public long l63689;
+    public long l63690;
+    public long l63691;
+    public long l63692;
+    public long l63693;
+    public long l63694;
+    public long l63695;
+    public long l63696;
+    public long l63697;
+    public long l63698;
+    public long l63699;
+    public long l63700;
+    public long l63701;
+    public long l63702;
+    public long l63703;
+    public long l63704;
+    public long l63705;
+    public long l63706;
+    public long l63707;
+    public long l63708;
+    public long l63709;
+    public long l63710;
+    public long l63711;
+    public long l63712;
+    public long l63713;
+    public long l63714;
+    public long l63715;
+    public long l63716;
+    public long l63717;
+    public long l63718;
+    public long l63719;
+    public long l63720;
+    public long l63721;
+    public long l63722;
+    public long l63723;
+    public long l63724;
+    public long l63725;
+    public long l63726;
+    public long l63727;
+    public long l63728;
+    public long l63729;
+    public long l63730;
+    public long l63731;
+    public long l63732;
+    public long l63733;
+    public long l63734;
+    public long l63735;
+    public long l63736;
+    public long l63737;
+    public long l63738;
+    public long l63739;
+    public long l63740;
+    public long l63741;
+    public long l63742;
+    public long l63743;
+    public long l63744;
+    public long l63745;
+    public long l63746;
+    public long l63747;
+    public long l63748;
+    public long l63749;
+    public long l63750;
+    public long l63751;
+    public long l63752;
+    public long l63753;
+    public long l63754;
+    public long l63755;
+    public long l63756;
+    public long l63757;
+    public long l63758;
+    public long l63759;
+    public long l63760;
+    public long l63761;
+    public long l63762;
+    public long l63763;
+    public long l63764;
+    public long l63765;
+    public long l63766;
+    public long l63767;
+    public long l63768;
+    public long l63769;
+    public long l63770;
+    public long l63771;
+    public long l63772;
+    public long l63773;
+    public long l63774;
+    public long l63775;
+    public long l63776;
+    public long l63777;
+    public long l63778;
+    public long l63779;
+    public long l63780;
+    public long l63781;
+    public long l63782;
+    public long l63783;
+    public long l63784;
+    public long l63785;
+    public long l63786;
+    public long l63787;
+    public long l63788;
+    public long l63789;
+    public long l63790;
+    public long l63791;
+    public long l63792;
+    public long l63793;
+    public long l63794;
+    public long l63795;
+    public long l63796;
+    public long l63797;
+    public long l63798;
+    public long l63799;
+    public long l63800;
+    public long l63801;
+    public long l63802;
+    public long l63803;
+    public long l63804;
+    public long l63805;
+    public long l63806;
+    public long l63807;
+    public long l63808;
+    public long l63809;
+    public long l63810;
+    public long l63811;
+    public long l63812;
+    public long l63813;
+    public long l63814;
+    public long l63815;
+    public long l63816;
+    public long l63817;
+    public long l63818;
+    public long l63819;
+    public long l63820;
+    public long l63821;
+    public long l63822;
+    public long l63823;
+    public long l63824;
+    public long l63825;
+    public long l63826;
+    public long l63827;
+    public long l63828;
+    public long l63829;
+    public long l63830;
+    public long l63831;
+    public long l63832;
+    public long l63833;
+    public long l63834;
+    public long l63835;
+    public long l63836;
+    public long l63837;
+    public long l63838;
+    public long l63839;
+    public long l63840;
+    public long l63841;
+    public long l63842;
+    public long l63843;
+    public long l63844;
+    public long l63845;
+    public long l63846;
+    public long l63847;
+    public long l63848;
+    public long l63849;
+    public long l63850;
+    public long l63851;
+    public long l63852;
+    public long l63853;
+    public long l63854;
+    public long l63855;
+    public long l63856;
+    public long l63857;
+    public long l63858;
+    public long l63859;
+    public long l63860;
+    public long l63861;
+    public long l63862;
+    public long l63863;
+    public long l63864;
+    public long l63865;
+    public long l63866;
+    public long l63867;
+    public long l63868;
+    public long l63869;
+    public long l63870;
+    public long l63871;
+    public long l63872;
+    public long l63873;
+    public long l63874;
+    public long l63875;
+    public long l63876;
+    public long l63877;
+    public long l63878;
+    public long l63879;
+    public long l63880;
+    public long l63881;
+    public long l63882;
+    public long l63883;
+    public long l63884;
+    public long l63885;
+    public long l63886;
+    public long l63887;
+    public long l63888;
+    public long l63889;
+    public long l63890;
+    public long l63891;
+    public long l63892;
+    public long l63893;
+    public long l63894;
+    public long l63895;
+    public long l63896;
+    public long l63897;
+    public long l63898;
+    public long l63899;
+    public long l63900;
+    public long l63901;
+    public long l63902;
+    public long l63903;
+    public long l63904;
+    public long l63905;
+    public long l63906;
+    public long l63907;
+    public long l63908;
+    public long l63909;
+    public long l63910;
+    public long l63911;
+    public long l63912;
+    public long l63913;
+    public long l63914;
+    public long l63915;
+    public long l63916;
+    public long l63917;
+    public long l63918;
+    public long l63919;
+    public long l63920;
+    public long l63921;
+    public long l63922;
+    public long l63923;
+    public long l63924;
+    public long l63925;
+    public long l63926;
+    public long l63927;
+    public long l63928;
+    public long l63929;
+    public long l63930;
+    public long l63931;
+    public long l63932;
+    public long l63933;
+    public long l63934;
+    public long l63935;
+    public long l63936;
+    public long l63937;
+    public long l63938;
+    public long l63939;
+    public long l63940;
+    public long l63941;
+    public long l63942;
+    public long l63943;
+    public long l63944;
+    public long l63945;
+    public long l63946;
+    public long l63947;
+    public long l63948;
+    public long l63949;
+    public long l63950;
+    public long l63951;
+    public long l63952;
+    public long l63953;
+    public long l63954;
+    public long l63955;
+    public long l63956;
+    public long l63957;
+    public long l63958;
+    public long l63959;
+    public long l63960;
+    public long l63961;
+    public long l63962;
+    public long l63963;
+    public long l63964;
+    public long l63965;
+    public long l63966;
+    public long l63967;
+    public long l63968;
+    public long l63969;
+    public long l63970;
+    public long l63971;
+    public long l63972;
+    public long l63973;
+    public long l63974;
+    public long l63975;
+    public long l63976;
+    public long l63977;
+    public long l63978;
+    public long l63979;
+    public long l63980;
+    public long l63981;
+    public long l63982;
+    public long l63983;
+    public long l63984;
+    public long l63985;
+    public long l63986;
+    public long l63987;
+    public long l63988;
+    public long l63989;
+    public long l63990;
+    public long l63991;
+    public long l63992;
+    public long l63993;
+    public long l63994;
+    public long l63995;
+    public long l63996;
+    public long l63997;
+    public long l63998;
+    public long l63999;
+    public long l64000;
+    public long l64001;
+    public long l64002;
+    public long l64003;
+    public long l64004;
+    public long l64005;
+    public long l64006;
+    public long l64007;
+    public long l64008;
+    public long l64009;
+    public long l64010;
+    public long l64011;
+    public long l64012;
+    public long l64013;
+    public long l64014;
+    public long l64015;
+    public long l64016;
+    public long l64017;
+    public long l64018;
+    public long l64019;
+    public long l64020;
+    public long l64021;
+    public long l64022;
+    public long l64023;
+    public long l64024;
+    public long l64025;
+    public long l64026;
+    public long l64027;
+    public long l64028;
+    public long l64029;
+    public long l64030;
+    public long l64031;
+    public long l64032;
+    public long l64033;
+    public long l64034;
+    public long l64035;
+    public long l64036;
+    public long l64037;
+    public long l64038;
+    public long l64039;
+    public long l64040;
+    public long l64041;
+    public long l64042;
+    public long l64043;
+    public long l64044;
+    public long l64045;
+    public long l64046;
+    public long l64047;
+    public long l64048;
+    public long l64049;
+    public long l64050;
+    public long l64051;
+    public long l64052;
+    public long l64053;
+    public long l64054;
+    public long l64055;
+    public long l64056;
+    public long l64057;
+    public long l64058;
+    public long l64059;
+    public long l64060;
+    public long l64061;
+    public long l64062;
+    public long l64063;
+    public long l64064;
+    public long l64065;
+    public long l64066;
+    public long l64067;
+    public long l64068;
+    public long l64069;
+    public long l64070;
+    public long l64071;
+    public long l64072;
+    public long l64073;
+    public long l64074;
+    public long l64075;
+    public long l64076;
+    public long l64077;
+    public long l64078;
+    public long l64079;
+    public long l64080;
+    public long l64081;
+    public long l64082;
+    public long l64083;
+    public long l64084;
+    public long l64085;
+    public long l64086;
+    public long l64087;
+    public long l64088;
+    public long l64089;
+    public long l64090;
+    public long l64091;
+    public long l64092;
+    public long l64093;
+    public long l64094;
+    public long l64095;
+    public long l64096;
+    public long l64097;
+    public long l64098;
+    public long l64099;
+    public long l64100;
+    public long l64101;
+    public long l64102;
+    public long l64103;
+    public long l64104;
+    public long l64105;
+    public long l64106;
+    public long l64107;
+    public long l64108;
+    public long l64109;
+    public long l64110;
+    public long l64111;
+    public long l64112;
+    public long l64113;
+    public long l64114;
+    public long l64115;
+    public long l64116;
+    public long l64117;
+    public long l64118;
+    public long l64119;
+    public long l64120;
+    public long l64121;
+    public long l64122;
+    public long l64123;
+    public long l64124;
+    public long l64125;
+    public long l64126;
+    public long l64127;
+    public long l64128;
+    public long l64129;
+    public long l64130;
+    public long l64131;
+    public long l64132;
+    public long l64133;
+    public long l64134;
+    public long l64135;
+    public long l64136;
+    public long l64137;
+    public long l64138;
+    public long l64139;
+    public long l64140;
+    public long l64141;
+    public long l64142;
+    public long l64143;
+    public long l64144;
+    public long l64145;
+    public long l64146;
+    public long l64147;
+    public long l64148;
+    public long l64149;
+    public long l64150;
+    public long l64151;
+    public long l64152;
+    public long l64153;
+    public long l64154;
+    public long l64155;
+    public long l64156;
+    public long l64157;
+    public long l64158;
+    public long l64159;
+    public long l64160;
+    public long l64161;
+    public long l64162;
+    public long l64163;
+    public long l64164;
+    public long l64165;
+    public long l64166;
+    public long l64167;
+    public long l64168;
+    public long l64169;
+    public long l64170;
+    public long l64171;
+    public long l64172;
+    public long l64173;
+    public long l64174;
+    public long l64175;
+    public long l64176;
+    public long l64177;
+    public long l64178;
+    public long l64179;
+    public long l64180;
+    public long l64181;
+    public long l64182;
+    public long l64183;
+    public long l64184;
+    public long l64185;
+    public long l64186;
+    public long l64187;
+    public long l64188;
+    public long l64189;
+    public long l64190;
+    public long l64191;
+    public long l64192;
+    public long l64193;
+    public long l64194;
+    public long l64195;
+    public long l64196;
+    public long l64197;
+    public long l64198;
+    public long l64199;
+    public long l64200;
+    public long l64201;
+    public long l64202;
+    public long l64203;
+    public long l64204;
+    public long l64205;
+    public long l64206;
+    public long l64207;
+    public long l64208;
+    public long l64209;
+    public long l64210;
+    public long l64211;
+    public long l64212;
+    public long l64213;
+    public long l64214;
+    public long l64215;
+    public long l64216;
+    public long l64217;
+    public long l64218;
+    public long l64219;
+    public long l64220;
+    public long l64221;
+    public long l64222;
+    public long l64223;
+    public long l64224;
+    public long l64225;
+    public long l64226;
+    public long l64227;
+    public long l64228;
+    public long l64229;
+    public long l64230;
+    public long l64231;
+    public long l64232;
+    public long l64233;
+    public long l64234;
+    public long l64235;
+    public long l64236;
+    public long l64237;
+    public long l64238;
+    public long l64239;
+    public long l64240;
+    public long l64241;
+    public long l64242;
+    public long l64243;
+    public long l64244;
+    public long l64245;
+    public long l64246;
+    public long l64247;
+    public long l64248;
+    public long l64249;
+    public long l64250;
+    public long l64251;
+    public long l64252;
+    public long l64253;
+    public long l64254;
+    public long l64255;
+    public long l64256;
+    public long l64257;
+    public long l64258;
+    public long l64259;
+    public long l64260;
+    public long l64261;
+    public long l64262;
+    public long l64263;
+    public long l64264;
+    public long l64265;
+    public long l64266;
+    public long l64267;
+    public long l64268;
+    public long l64269;
+    public long l64270;
+    public long l64271;
+    public long l64272;
+    public long l64273;
+    public long l64274;
+    public long l64275;
+    public long l64276;
+    public long l64277;
+    public long l64278;
+    public long l64279;
+    public long l64280;
+    public long l64281;
+    public long l64282;
+    public long l64283;
+    public long l64284;
+    public long l64285;
+    public long l64286;
+    public long l64287;
+    public long l64288;
+    public long l64289;
+    public long l64290;
+    public long l64291;
+    public long l64292;
+    public long l64293;
+    public long l64294;
+    public long l64295;
+    public long l64296;
+    public long l64297;
+    public long l64298;
+    public long l64299;
+    public long l64300;
+    public long l64301;
+    public long l64302;
+    public long l64303;
+    public long l64304;
+    public long l64305;
+    public long l64306;
+    public long l64307;
+    public long l64308;
+    public long l64309;
+    public long l64310;
+    public long l64311;
+    public long l64312;
+    public long l64313;
+    public long l64314;
+    public long l64315;
+    public long l64316;
+    public long l64317;
+    public long l64318;
+    public long l64319;
+    public long l64320;
+    public long l64321;
+    public long l64322;
+    public long l64323;
+    public long l64324;
+    public long l64325;
+    public long l64326;
+    public long l64327;
+    public long l64328;
+    public long l64329;
+    public long l64330;
+    public long l64331;
+    public long l64332;
+    public long l64333;
+    public long l64334;
+    public long l64335;
+    public long l64336;
+    public long l64337;
+    public long l64338;
+    public long l64339;
+    public long l64340;
+    public long l64341;
+    public long l64342;
+    public long l64343;
+    public long l64344;
+    public long l64345;
+    public long l64346;
+    public long l64347;
+    public long l64348;
+    public long l64349;
+    public long l64350;
+    public long l64351;
+    public long l64352;
+    public long l64353;
+    public long l64354;
+    public long l64355;
+    public long l64356;
+    public long l64357;
+    public long l64358;
+    public long l64359;
+    public long l64360;
+    public long l64361;
+    public long l64362;
+    public long l64363;
+    public long l64364;
+    public long l64365;
+    public long l64366;
+    public long l64367;
+    public long l64368;
+    public long l64369;
+    public long l64370;
+    public long l64371;
+    public long l64372;
+    public long l64373;
+    public long l64374;
+    public long l64375;
+    public long l64376;
+    public long l64377;
+    public long l64378;
+    public long l64379;
+    public long l64380;
+    public long l64381;
+    public long l64382;
+    public long l64383;
+    public long l64384;
+    public long l64385;
+    public long l64386;
+    public long l64387;
+    public long l64388;
+    public long l64389;
+    public long l64390;
+    public long l64391;
+    public long l64392;
+    public long l64393;
+    public long l64394;
+    public long l64395;
+    public long l64396;
+    public long l64397;
+    public long l64398;
+    public long l64399;
+    public long l64400;
+    public long l64401;
+    public long l64402;
+    public long l64403;
+    public long l64404;
+    public long l64405;
+    public long l64406;
+    public long l64407;
+    public long l64408;
+    public long l64409;
+    public long l64410;
+    public long l64411;
+    public long l64412;
+    public long l64413;
+    public long l64414;
+    public long l64415;
+    public long l64416;
+    public long l64417;
+    public long l64418;
+    public long l64419;
+    public long l64420;
+    public long l64421;
+    public long l64422;
+    public long l64423;
+    public long l64424;
+    public long l64425;
+    public long l64426;
+    public long l64427;
+    public long l64428;
+    public long l64429;
+    public long l64430;
+    public long l64431;
+    public long l64432;
+    public long l64433;
+    public long l64434;
+    public long l64435;
+    public long l64436;
+    public long l64437;
+    public long l64438;
+    public long l64439;
+    public long l64440;
+    public long l64441;
+    public long l64442;
+    public long l64443;
+    public long l64444;
+    public long l64445;
+    public long l64446;
+    public long l64447;
+    public long l64448;
+    public long l64449;
+    public long l64450;
+    public long l64451;
+    public long l64452;
+    public long l64453;
+    public long l64454;
+    public long l64455;
+    public long l64456;
+    public long l64457;
+    public long l64458;
+    public long l64459;
+    public long l64460;
+    public long l64461;
+    public long l64462;
+    public long l64463;
+    public long l64464;
+    public long l64465;
+    public long l64466;
+    public long l64467;
+    public long l64468;
+    public long l64469;
+    public long l64470;
+    public long l64471;
+    public long l64472;
+    public long l64473;
+    public long l64474;
+    public long l64475;
+    public long l64476;
+    public long l64477;
+    public long l64478;
+    public long l64479;
+    public long l64480;
+    public long l64481;
+    public long l64482;
+    public long l64483;
+    public long l64484;
+    public long l64485;
+    public long l64486;
+    public long l64487;
+    public long l64488;
+    public long l64489;
+    public long l64490;
+    public long l64491;
+    public long l64492;
+    public long l64493;
+    public long l64494;
+    public long l64495;
+    public long l64496;
+    public long l64497;
+    public long l64498;
+    public long l64499;
+    public long l64500;
+    public long l64501;
+    public long l64502;
+    public long l64503;
+    public long l64504;
+    public long l64505;
+    public long l64506;
+    public long l64507;
+    public long l64508;
+    public long l64509;
+    public long l64510;
+    public long l64511;
+    public long l64512;
+    public long l64513;
+    public long l64514;
+    public long l64515;
+    public long l64516;
+    public long l64517;
+    public long l64518;
+    public long l64519;
+    public long l64520;
+    public long l64521;
+    public long l64522;
+    public long l64523;
+    public long l64524;
+    public long l64525;
+    public long l64526;
+    public long l64527;
+    public long l64528;
+    public long l64529;
+    public long l64530;
+    public long l64531;
+    public long l64532;
+    public long l64533;
+    public long l64534;
+    public long l64535;
+    public long l64536;
+    public long l64537;
+    public long l64538;
+    public long l64539;
+    public long l64540;
+    public long l64541;
+    public long l64542;
+    public long l64543;
+    public long l64544;
+    public long l64545;
+    public long l64546;
+    public long l64547;
+    public long l64548;
+    public long l64549;
+    public long l64550;
+    public long l64551;
+    public long l64552;
+    public long l64553;
+    public long l64554;
+    public long l64555;
+    public long l64556;
+    public long l64557;
+    public long l64558;
+    public long l64559;
+    public long l64560;
+    public long l64561;
+    public long l64562;
+    public long l64563;
+    public long l64564;
+    public long l64565;
+    public long l64566;
+    public long l64567;
+    public long l64568;
+    public long l64569;
+    public long l64570;
+    public long l64571;
+    public long l64572;
+    public long l64573;
+    public long l64574;
+    public long l64575;
+    public long l64576;
+    public long l64577;
+    public long l64578;
+    public long l64579;
+    public long l64580;
+    public long l64581;
+    public long l64582;
+    public long l64583;
+    public long l64584;
+    public long l64585;
+    public long l64586;
+    public long l64587;
+    public long l64588;
+    public long l64589;
+    public long l64590;
+    public long l64591;
+    public long l64592;
+    public long l64593;
+    public long l64594;
+    public long l64595;
+    public long l64596;
+    public long l64597;
+    public long l64598;
+    public long l64599;
+    public long l64600;
+    public long l64601;
+    public long l64602;
+    public long l64603;
+    public long l64604;
+    public long l64605;
+    public long l64606;
+    public long l64607;
+    public long l64608;
+    public long l64609;
+    public long l64610;
+    public long l64611;
+    public long l64612;
+    public long l64613;
+    public long l64614;
+    public long l64615;
+    public long l64616;
+    public long l64617;
+    public long l64618;
+    public long l64619;
+    public long l64620;
+    public long l64621;
+    public long l64622;
+    public long l64623;
+    public long l64624;
+    public long l64625;
+    public long l64626;
+    public long l64627;
+    public long l64628;
+    public long l64629;
+    public long l64630;
+    public long l64631;
+    public long l64632;
+    public long l64633;
+    public long l64634;
+    public long l64635;
+    public long l64636;
+    public long l64637;
+    public long l64638;
+    public long l64639;
+    public long l64640;
+    public long l64641;
+    public long l64642;
+    public long l64643;
+    public long l64644;
+    public long l64645;
+    public long l64646;
+    public long l64647;
+    public long l64648;
+    public long l64649;
+    public long l64650;
+    public long l64651;
+    public long l64652;
+    public long l64653;
+    public long l64654;
+    public long l64655;
+    public long l64656;
+    public long l64657;
+    public long l64658;
+    public long l64659;
+    public long l64660;
+    public long l64661;
+    public long l64662;
+    public long l64663;
+    public long l64664;
+    public long l64665;
+    public long l64666;
+    public long l64667;
+    public long l64668;
+    public long l64669;
+    public long l64670;
+    public long l64671;
+    public long l64672;
+    public long l64673;
+    public long l64674;
+    public long l64675;
+    public long l64676;
+    public long l64677;
+    public long l64678;
+    public long l64679;
+    public long l64680;
+    public long l64681;
+    public long l64682;
+    public long l64683;
+    public long l64684;
+    public long l64685;
+    public long l64686;
+    public long l64687;
+    public long l64688;
+    public long l64689;
+    public long l64690;
+    public long l64691;
+    public long l64692;
+    public long l64693;
+    public long l64694;
+    public long l64695;
+    public long l64696;
+    public long l64697;
+    public long l64698;
+    public long l64699;
+    public long l64700;
+    public long l64701;
+    public long l64702;
+    public long l64703;
+    public long l64704;
+    public long l64705;
+    public long l64706;
+    public long l64707;
+    public long l64708;
+    public long l64709;
+    public long l64710;
+    public long l64711;
+    public long l64712;
+    public long l64713;
+    public long l64714;
+    public long l64715;
+    public long l64716;
+    public long l64717;
+    public long l64718;
+    public long l64719;
+    public long l64720;
+    public long l64721;
+    public long l64722;
+    public long l64723;
+    public long l64724;
+    public long l64725;
+    public long l64726;
+    public long l64727;
+    public long l64728;
+    public long l64729;
+    public long l64730;
+    public long l64731;
+    public long l64732;
+    public long l64733;
+    public long l64734;
+    public long l64735;
+    public long l64736;
+    public long l64737;
+    public long l64738;
+    public long l64739;
+    public long l64740;
+    public long l64741;
+    public long l64742;
+    public long l64743;
+    public long l64744;
+    public long l64745;
+    public long l64746;
+    public long l64747;
+    public long l64748;
+    public long l64749;
+    public long l64750;
+    public long l64751;
+    public long l64752;
+    public long l64753;
+    public long l64754;
+    public long l64755;
+    public long l64756;
+    public long l64757;
+    public long l64758;
+    public long l64759;
+    public long l64760;
+    public long l64761;
+    public long l64762;
+    public long l64763;
+    public long l64764;
+    public long l64765;
+    public long l64766;
+    public long l64767;
+    public long l64768;
+    public long l64769;
+    public long l64770;
+    public long l64771;
+    public long l64772;
+    public long l64773;
+    public long l64774;
+    public long l64775;
+    public long l64776;
+    public long l64777;
+    public long l64778;
+    public long l64779;
+    public long l64780;
+    public long l64781;
+    public long l64782;
+    public long l64783;
+    public long l64784;
+    public long l64785;
+    public long l64786;
+    public long l64787;
+    public long l64788;
+    public long l64789;
+    public long l64790;
+    public long l64791;
+    public long l64792;
+    public long l64793;
+    public long l64794;
+    public long l64795;
+    public long l64796;
+    public long l64797;
+    public long l64798;
+    public long l64799;
+    public long l64800;
+    public long l64801;
+    public long l64802;
+    public long l64803;
+    public long l64804;
+    public long l64805;
+    public long l64806;
+    public long l64807;
+    public long l64808;
+    public long l64809;
+    public long l64810;
+    public long l64811;
+    public long l64812;
+    public long l64813;
+    public long l64814;
+    public long l64815;
+    public long l64816;
+    public long l64817;
+    public long l64818;
+    public long l64819;
+    public long l64820;
+    public long l64821;
+    public long l64822;
+    public long l64823;
+    public long l64824;
+    public long l64825;
+    public long l64826;
+    public long l64827;
+    public long l64828;
+    public long l64829;
+    public long l64830;
+    public long l64831;
+    public long l64832;
+    public long l64833;
+    public long l64834;
+    public long l64835;
+    public long l64836;
+    public long l64837;
+    public long l64838;
+    public long l64839;
+    public long l64840;
+    public long l64841;
+    public long l64842;
+    public long l64843;
+    public long l64844;
+    public long l64845;
+    public long l64846;
+    public long l64847;
+    public long l64848;
+    public long l64849;
+    public long l64850;
+    public long l64851;
+    public long l64852;
+    public long l64853;
+    public long l64854;
+    public long l64855;
+    public long l64856;
+    public long l64857;
+    public long l64858;
+    public long l64859;
+    public long l64860;
+    public long l64861;
+    public long l64862;
+    public long l64863;
+    public long l64864;
+    public long l64865;
+    public long l64866;
+    public long l64867;
+    public long l64868;
+    public long l64869;
+    public long l64870;
+    public long l64871;
+    public long l64872;
+    public long l64873;
+    public long l64874;
+    public long l64875;
+    public long l64876;
+    public long l64877;
+    public long l64878;
+    public long l64879;
+    public long l64880;
+    public long l64881;
+    public long l64882;
+    public long l64883;
+    public long l64884;
+    public long l64885;
+    public long l64886;
+    public long l64887;
+    public long l64888;
+    public long l64889;
+    public long l64890;
+    public long l64891;
+    public long l64892;
+    public long l64893;
+    public long l64894;
+    public long l64895;
+    public long l64896;
+    public long l64897;
+    public long l64898;
+    public long l64899;
+    public long l64900;
+    public long l64901;
+    public long l64902;
+    public long l64903;
+    public long l64904;
+    public long l64905;
+    public long l64906;
+    public long l64907;
+    public long l64908;
+    public long l64909;
+    public long l64910;
+    public long l64911;
+    public long l64912;
+    public long l64913;
+    public long l64914;
+    public long l64915;
+    public long l64916;
+    public long l64917;
+    public long l64918;
+    public long l64919;
+    public long l64920;
+    public long l64921;
+    public long l64922;
+    public long l64923;
+    public long l64924;
+    public long l64925;
+    public long l64926;
+    public long l64927;
+    public long l64928;
+    public long l64929;
+    public long l64930;
+    public long l64931;
+    public long l64932;
+    public long l64933;
+    public long l64934;
+    public long l64935;
+    public long l64936;
+    public long l64937;
+    public long l64938;
+    public long l64939;
+    public long l64940;
+    public long l64941;
+    public long l64942;
+    public long l64943;
+    public long l64944;
+    public long l64945;
+    public long l64946;
+    public long l64947;
+    public long l64948;
+    public long l64949;
+    public long l64950;
+    public long l64951;
+    public long l64952;
+    public long l64953;
+    public long l64954;
+    public long l64955;
+    public long l64956;
+    public long l64957;
+    public long l64958;
+    public long l64959;
+    public long l64960;
+    public long l64961;
+    public long l64962;
+    public long l64963;
+    public long l64964;
+    public long l64965;
+    public long l64966;
+    public long l64967;
+    public long l64968;
+    public long l64969;
+    public long l64970;
+    public long l64971;
+    public long l64972;
+    public long l64973;
+    public long l64974;
+    public long l64975;
+    public long l64976;
+    public long l64977;
+    public long l64978;
+    public long l64979;
+    public long l64980;
+    public long l64981;
+    public long l64982;
+    public long l64983;
+    public long l64984;
+    public long l64985;
+    public long l64986;
+    public long l64987;
+    public long l64988;
+    public long l64989;
+    public long l64990;
+    public long l64991;
+    public long l64992;
+    public long l64993;
+    public long l64994;
+    public long l64995;
+    public long l64996;
+    public long l64997;
+    public long l64998;
+    public long l64999;
+    public long l65000;
+    public long l65001;
+    public long l65002;
+    public long l65003;
+    public long l65004;
+    public long l65005;
+    public long l65006;
+    public long l65007;
+    public long l65008;
+    public long l65009;
+    public long l65010;
+    public long l65011;
+    public long l65012;
+    public long l65013;
+    public long l65014;
+    public long l65015;
+    public long l65016;
+    public long l65017;
+    public long l65018;
+    public long l65019;
+    public long l65020;
+    public long l65021;
+    public long l65022;
+    public long l65023;
+    public long l65024;
+    public long l65025;
+    public long l65026;
+    public long l65027;
+    public long l65028;
+    public long l65029;
+    public long l65030;
+    public long l65031;
+    public long l65032;
+    public long l65033;
+    public long l65034;
+    public long l65035;
+    public long l65036;
+    public long l65037;
+    public long l65038;
+    public long l65039;
+    public long l65040;
+    public long l65041;
+    public long l65042;
+    public long l65043;
+    public long l65044;
+    public long l65045;
+    public long l65046;
+    public long l65047;
+    public long l65048;
+    public long l65049;
+    public long l65050;
+    public long l65051;
+    public long l65052;
+    public long l65053;
+    public long l65054;
+    public long l65055;
+    public long l65056;
+    public long l65057;
+    public long l65058;
+    public long l65059;
+    public long l65060;
+    public long l65061;
+    public long l65062;
+    public long l65063;
+    public long l65064;
+    public long l65065;
+    public long l65066;
+    public long l65067;
+    public long l65068;
+    public long l65069;
+    public long l65070;
+    public long l65071;
+    public long l65072;
+    public long l65073;
+    public long l65074;
+    public long l65075;
+    public long l65076;
+    public long l65077;
+    public long l65078;
+    public long l65079;
+    public long l65080;
+    public long l65081;
+    public long l65082;
+    public long l65083;
+    public long l65084;
+    public long l65085;
+    public long l65086;
+    public long l65087;
+    public long l65088;
+    public long l65089;
+    public long l65090;
+    public long l65091;
+    public long l65092;
+    public long l65093;
+    public long l65094;
+    public long l65095;
+    public long l65096;
+    public long l65097;
+    public long l65098;
+    public long l65099;
+    public long l65100;
+    public long l65101;
+    public long l65102;
+    public long l65103;
+    public long l65104;
+    public long l65105;
+    public long l65106;
+    public long l65107;
+    public long l65108;
+    public long l65109;
+    public long l65110;
+    public long l65111;
+    public long l65112;
+    public long l65113;
+    public long l65114;
+    public long l65115;
+    public long l65116;
+    public long l65117;
+    public long l65118;
+    public long l65119;
+    public long l65120;
+    public long l65121;
+    public long l65122;
+    public long l65123;
+    public long l65124;
+    public long l65125;
+    public long l65126;
+    public long l65127;
+    public long l65128;
+    public long l65129;
+    public long l65130;
+    public long l65131;
+    public long l65132;
+    public long l65133;
+    public long l65134;
+    public long l65135;
+    public long l65136;
+    public long l65137;
+    public long l65138;
+    public long l65139;
+    public long l65140;
+    public long l65141;
+    public long l65142;
+    public long l65143;
+    public long l65144;
+    public long l65145;
+    public long l65146;
+    public long l65147;
+    public long l65148;
+    public long l65149;
+    public long l65150;
+    public long l65151;
+    public long l65152;
+    public long l65153;
+    public long l65154;
+    public long l65155;
+    public long l65156;
+    public long l65157;
+    public long l65158;
+    public long l65159;
+    public long l65160;
+    public long l65161;
+    public long l65162;
+    public long l65163;
+    public long l65164;
+    public long l65165;
+    public long l65166;
+    public long l65167;
+    public long l65168;
+    public long l65169;
+    public long l65170;
+    public long l65171;
+    public long l65172;
+    public long l65173;
+    public long l65174;
+    public long l65175;
+    public long l65176;
+    public long l65177;
+    public long l65178;
+    public long l65179;
+    public long l65180;
+    public long l65181;
+    public long l65182;
+    public long l65183;
+    public long l65184;
+    public long l65185;
+    public long l65186;
+    public long l65187;
+    public long l65188;
+    public long l65189;
+    public long l65190;
+    public long l65191;
+    public long l65192;
+    public long l65193;
+    public long l65194;
+    public long l65195;
+    public long l65196;
+    public long l65197;
+    public long l65198;
+    public long l65199;
+    public long l65200;
+    public long l65201;
+    public long l65202;
+    public long l65203;
+    public long l65204;
+    public long l65205;
+    public long l65206;
+    public long l65207;
+    public long l65208;
+    public long l65209;
+    public long l65210;
+    public long l65211;
+    public long l65212;
+    public long l65213;
+    public long l65214;
+    public long l65215;
+    public long l65216;
+    public long l65217;
+    public long l65218;
+    public long l65219;
+    public long l65220;
+    public long l65221;
+    public long l65222;
+    public long l65223;
+    public long l65224;
+    public long l65225;
+    public long l65226;
+    public long l65227;
+    public long l65228;
+    public long l65229;
+    public long l65230;
+    public long l65231;
+    public long l65232;
+    public long l65233;
+    public long l65234;
+    public long l65235;
+    public long l65236;
+    public long l65237;
+    public long l65238;
+    public long l65239;
+    public long l65240;
+    public long l65241;
+    public long l65242;
+    public long l65243;
+    public long l65244;
+    public long l65245;
+    public long l65246;
+    public long l65247;
+    public long l65248;
+    public long l65249;
+    public long l65250;
+    public long l65251;
+    public long l65252;
+    public long l65253;
+    public long l65254;
+    public long l65255;
+    public long l65256;
+    public long l65257;
+    public long l65258;
+    public long l65259;
+    public long l65260;
+    public long l65261;
+    public long l65262;
+    public long l65263;
+    public long l65264;
+    public long l65265;
+    public long l65266;
+    public long l65267;
+    public long l65268;
+    public long l65269;
+    public long l65270;
+    public long l65271;
+    public long l65272;
+    public long l65273;
+    public long l65274;
+    public long l65275;
+    public long l65276;
+    public long l65277;
+    public long l65278;
+    public long l65279;
+    public long l65280;
+    public long l65281;
+    public long l65282;
+    public long l65283;
+    public long l65284;
+    public long l65285;
+    public long l65286;
+    public long l65287;
+    public long l65288;
+    public long l65289;
+    public long l65290;
+    public long l65291;
+    public long l65292;
+    public long l65293;
+    public long l65294;
+    public long l65295;
+    public long l65296;
+    public long l65297;
+    public long l65298;
+    public long l65299;
+    public long l65300;
+    public long l65301;
+    public long l65302;
+    public long l65303;
+    public long l65304;
+    public long l65305;
+    public long l65306;
+    public long l65307;
+    public long l65308;
+    public long l65309;
+    public long l65310;
+    public long l65311;
+    public long l65312;
+    public long l65313;
+    public long l65314;
+    public long l65315;
+    public long l65316;
+    public long l65317;
+    public long l65318;
+    public long l65319;
+    public long l65320;
+    public long l65321;
+    public long l65322;
+    public long l65323;
+    public long l65324;
+    public long l65325;
+    public long l65326;
+    public long l65327;
+    public long l65328;
+    public long l65329;
+    public long l65330;
+    public long l65331;
+    public long l65332;
+    public long l65333;
+    public long l65334;
+    public long l65335;
+    public long l65336;
+    public long l65337;
+    public long l65338;
+    public long l65339;
+    public long l65340;
+    public long l65341;
+    public long l65342;
+    public long l65343;
+    public long l65344;
+    public long l65345;
+    public long l65346;
+    public long l65347;
+    public long l65348;
+    public long l65349;
+    public long l65350;
+    public long l65351;
+    public long l65352;
+    public long l65353;
+    public long l65354;
+    public long l65355;
+    public long l65356;
+    public long l65357;
+    public long l65358;
+    public long l65359;
+    public long l65360;
+    public long l65361;
+    public long l65362;
+    public long l65363;
+    public long l65364;
+    public long l65365;
+    public long l65366;
+    public long l65367;
+    public long l65368;
+    public long l65369;
+    public long l65370;
+    public long l65371;
+    public long l65372;
+    public long l65373;
+    public long l65374;
+    public long l65375;
+    public long l65376;
+    public long l65377;
+    public long l65378;
+    public long l65379;
+    public long l65380;
+    public long l65381;
+    public long l65382;
+    public long l65383;
+    public long l65384;
+    public long l65385;
+    public long l65386;
+    public long l65387;
+    public long l65388;
+    public long l65389;
+    public long l65390;
+    public long l65391;
+    public long l65392;
+    public long l65393;
+    public long l65394;
+    public long l65395;
+    public long l65396;
+    public long l65397;
+    public long l65398;
+    public long l65399;
+    public long l65400;
+    public long l65401;
+    public long l65402;
+    public long l65403;
+    public long l65404;
+    public long l65405;
+    public long l65406;
+    public long l65407;
+    public long l65408;
+    public long l65409;
+    public long l65410;
+    public long l65411;
+    public long l65412;
+    public long l65413;
+    public long l65414;
+    public long l65415;
+    public long l65416;
+    public long l65417;
+    public long l65418;
+    public long l65419;
+    public long l65420;
+    public long l65421;
+    public long l65422;
+    public long l65423;
+    public long l65424;
+    public long l65425;
+    public long l65426;
+    public long l65427;
+    public long l65428;
+    public long l65429;
+    public long l65430;
+    public long l65431;
+    public long l65432;
+    public long l65433;
+    public long l65434;
+    public long l65435;
+    public long l65436;
+    public long l65437;
+    public long l65438;
+    public long l65439;
+    public long l65440;
+    public long l65441;
+    public long l65442;
+    public long l65443;
+    public long l65444;
+    public long l65445;
+    public long l65446;
+    public long l65447;
+    public long l65448;
+    public long l65449;
+    public long l65450;
+    public long l65451;
+    public long l65452;
+    public long l65453;
+    public long l65454;
+    public long l65455;
+    public long l65456;
+    public long l65457;
+    public long l65458;
+    public long l65459;
+    public long l65460;
+    public long l65461;
+    public long l65462;
+    public long l65463;
+    public long l65464;
+    public long l65465;
+    public long l65466;
+    public long l65467;
+    public long l65468;
+    public long l65469;
+    public long l65470;
+    public long l65471;
+    public long l65472;
+    public long l65473;
+    public long l65474;
+    public long l65475;
+    public long l65476;
+    public long l65477;
+    public long l65478;
+    public long l65479;
+    public long l65480;
+    public long l65481;
+    public long l65482;
+    public long l65483;
+    public long l65484;
+    public long l65485;
+    public long l65486;
+    public long l65487;
+    public long l65488;
+    public long l65489;
+    public long l65490;
+    public long l65491;
+    public long l65492;
+    public long l65493;
+    public long l65494;
+    public long l65495;
+    public long l65496;
+    public long l65497;
+    public long l65498;
+    public long l65499;
+    public long l65500;
+    public long l65501;
+    public long l65502;
+    public long l65503;
+    public long l65504;
+    public long l65505;
+    public long l65506;
+    public long l65507;
+    public long l65508;
+    public long l65509;
+    public long l65510;
+    public long l65511;
+    public long l65512;
+    public long l65513;
+    public long l65514;
+    public long l65515;
+    public long l65516;
+    public long l65517;
+    public long l65518;
+    public long l65519;
+    public long l65520;
+    public long l65521;
+}
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 9b724960f39..96e0e69ab31 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -41,3 +41,8 @@ ae449e9c04c1fe651bd30f0f4d4cc24ba794e0c4 jdk7-b63
 a10eec7a1edf536f39b5828d8623054dbc62c2b7 jdk7-b64
 008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65
 22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66
+a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67
+83b2a9331383f9db7a49350d4cb13b7635f6b861 jdk7-b68
+a4ab0d6ded63bed0fd1e5be55d38090e0ee5efb7 jdk7-b69
+c83f0106b78a85c7e614d27a328675460b2081cf jdk7-b70
+ff94d8ce0daded647bb326630e643d010357afce jdk7-b71
diff --git a/jaxp/THIRD_PARTY_README b/jaxp/THIRD_PARTY_README
index 690890548f2..43058486295 100644
--- a/jaxp/THIRD_PARTY_README
+++ b/jaxp/THIRD_PARTY_README
@@ -32,7 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/jaxp/make/build.properties b/jaxp/make/build.properties
index 6689159753b..b47b03277fb 100644
--- a/jaxp/make/build.properties
+++ b/jaxp/make/build.properties
@@ -30,8 +30,8 @@
 # one of the standard user build.properties files (see build.xml)
 
 # options for the <javac> tasks used to compile the tools
-javac.source = 5
-javac.target = 5
+javac.source = 7
+javac.target = 7
 javac.debug = true
 javac.no.jdk.warnings = -XDignore.symbol.file=true
 # set the following to -version to verify the versions of javac being used
diff --git a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
index e7071fde4f1..513dec48f04 100644
--- a/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
+++ b/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
@@ -1027,6 +1027,9 @@ public abstract class XMLScanner
                     int c = fEntityScanner.peekChar();
                     if (XMLChar.isMarkup(c) || c == ']') {
                         fStringBuffer.append((char)fEntityScanner.scanChar());
+                    } else if (c != -1 && isInvalidLiteral(c)) {
+                        reportFatalError("InvalidCharInSystemID",
+                            new Object[] {Integer.toString(c, 16)});
                     }
                 } while (fEntityScanner.scanLiteral(quote, ident) != quote);
                 fStringBuffer.append(ident);
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index a5dc8fecee0..989ee5fd57b 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -41,3 +41,8 @@ b8a6e883c0a6708f6d818815040525d472262495 jdk7-b63
 aaa25dfd3de68c6f1a1d3ef8c45fd99f76bca6dd jdk7-b64
 aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65
 fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66
+faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67
+845fa487f0f72a9f232ead8315c0087a477a5a31 jdk7-b68
+3e64fdfb92910e164d1f4b21b147719d5c674254 jdk7-b69
+dd3c5f3ec28d5d5e5c0dc3229fdd52d85d04274d jdk7-b70
+03314cf56a7212bbb6c186dbc9f15aca988a48ec jdk7-b71
diff --git a/jaxws/THIRD_PARTY_README b/jaxws/THIRD_PARTY_README
index 690890548f2..43058486295 100644
--- a/jaxws/THIRD_PARTY_README
+++ b/jaxws/THIRD_PARTY_README
@@ -32,7 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/jaxws/make/build.properties b/jaxws/make/build.properties
index 6689159753b..b47b03277fb 100644
--- a/jaxws/make/build.properties
+++ b/jaxws/make/build.properties
@@ -30,8 +30,8 @@
 # one of the standard user build.properties files (see build.xml)
 
 # options for the <javac> tasks used to compile the tools
-javac.source = 5
-javac.target = 5
+javac.source = 7
+javac.target = 7
 javac.debug = true
 javac.no.jdk.warnings = -XDignore.symbol.file=true
 # set the following to -version to verify the versions of javac being used
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java
index c42297a82cc..4a6f908a595 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.codemodel.internal;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java
index 1e9f8c6d201..e5275c57529 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java
@@ -199,8 +199,7 @@ public final class JAnnotationUse extends JAnnotationValue {
       *
       */
      public JAnnotationUse param(String name, Class value){
-         addValue(name, new JAnnotationStringValue(JExpr.lit(value.getName())));
-         return this;
+         return param(name,clazz.owner().ref(value));
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java
index 83fe71629f5..4a53ea25f50 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.codemodel.internal;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java
index 57d7552d7ab..a017b883bc9 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JBlock.java
@@ -111,6 +111,14 @@ public final class JBlock implements JGenerable, JStatement {
         return r;
     }
 
+    /**
+     * Returns true if this block is empty and does not contain
+     * any statement.
+     */
+    public boolean isEmpty() {
+        return content.isEmpty();
+    }
+
 
     /**
      * Adds a local variable declaration to this block
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java
index efd7eddede4..5ae165ac66c 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JCommentPart.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.codemodel.internal;
 
 import java.util.ArrayList;
@@ -77,7 +78,8 @@ public class JCommentPart extends ArrayList<Object> {
      */
     protected void format( JFormatter f, String indent ) {
         if(!f.isPrinting()) {
-            // quickly pass the types to JFormatter
+            // quickly pass the types to JFormatter, as that's all we care.
+            // we don't need to worry about the exact formatting of text.
             for( Object o : this )
                 if(o instanceof JClass)
                     f.g((JClass)o);
@@ -97,12 +99,12 @@ public class JCommentPart extends ArrayList<Object> {
                 while( (idx=s.indexOf('\n'))!=-1 ) {
                     String line = s.substring(0,idx);
                     if(line.length()>0)
-                        f.p(line);
+                        f.p(escape(line));
                     s = s.substring(idx+1);
                     f.nl().p(indent);
                 }
                 if(s.length()!=0)
-                    f.p(s);
+                    f.p(escape(s));
             } else
             if(o instanceof JClass) {
                 // TODO: this doesn't print the parameterized type properly
@@ -117,4 +119,16 @@ public class JCommentPart extends ArrayList<Object> {
         if(!isEmpty())
             f.nl();
     }
+
+    /**
+     * Escapes the appearance of the comment terminator.
+     */
+    private String escape(String s) {
+        while(true) {
+            int idx = s.indexOf("*/");
+            if(idx <0)   return s;
+
+            s = s.substring(0,idx+1)+"<!---->"+s.substring(idx+1);
+        }
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JDirectClass.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JDirectClass.java
index 5ae830159da..f262d892ea9 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JDirectClass.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JDirectClass.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.codemodel.internal;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JExpr.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JExpr.java
index 27fe4645d60..e7bedf64681 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JExpr.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JExpr.java
@@ -198,8 +198,12 @@ public abstract class JExpr {
             char c = s.charAt(i);
             int j = charEscape.indexOf(c);
             if(j>=0) {
-                sb.append('\\');
-                sb.append(charMacro.charAt(j));
+                if((quote=='"' && c=='\'') || (quote=='\'' && c=='"')) {
+                    sb.append(c);
+                } else {
+                    sb.append('\\');
+                    sb.append(charMacro.charAt(j));
+                }
             } else {
                 // technically Unicode escape shouldn't be done here,
                 // for it's a lexical level handling.
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java
index 6b56e9251f7..c117214694f 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JJavaName.java
@@ -231,6 +231,7 @@ public class JJavaName {
               "(.*)basis","$1bases",
                "(.*)axis","$1axes",
                  "(.+)is","$1ises",
+                 "(.+)ss","$1sses",
                  "(.+)us","$1uses",
                   "(.+)s","$1s",
                "(.*)foot","$1feet",
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java
index 3141ebc61f1..cfa75b08a3f 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JMethod.java
@@ -388,10 +388,11 @@ public class JMethod extends JGenerifiableImpl implements JDeclaration, JAnnotat
                 f.g(a).nl();
         }
 
-                // declare the generics parameters
+        f.g(mods);
+
+        // declare the generics parameters
                 super.declare(f);
 
-                f.g(mods);
                 if (!isConstructor())
                         f.g(type);
                 f.id(name).p('(').i();
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java
index e26a961dec2..73c54832858 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JPackage.java
@@ -98,32 +98,7 @@ public final class JPackage implements JDeclaration, JGenerable, JClassContainer
     JPackage(String name, JCodeModel cw) {
         this.owner = cw;
         if (name.equals(".")) {
-            String msg = "JPackage name . is not allowed";
-            throw new IllegalArgumentException(msg);
-        }
-
-        int dots = 1;
-        for (int i = 0; i < name.length(); i++) {
-            char c = name.charAt(i);
-            if (c == '.') {
-                dots++;
-                continue;
-            }
-            if (dots > 1) {
-                String msg = "JPackage name " + name + " missing identifier";
-                throw new IllegalArgumentException(msg);
-            } else if (dots == 1 && !Character.isJavaIdentifierStart(c)) {
-                String msg =
-                    "JPackage name " + name + " contains illegal " + "character for beginning of identifier: " + c;
-                throw new IllegalArgumentException(msg);
-            } else if (!Character.isJavaIdentifierPart(c)) {
-                String msg = "JPackage name " + name + "contains illegal " + "character: " + c;
-                throw new IllegalArgumentException(msg);
-            }
-            dots = 0;
-        }
-        if (!name.trim().equals("") && dots != 0) {
-            String msg = "JPackage name not allowed to end with .";
+            String msg = "Package name . is not allowed";
             throw new IllegalArgumentException(msg);
         }
 
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java
index 9412d3e3156..b5d3bbbe5b6 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.codemodel.internal;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java
index b58d1f50d14..df87594761a 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.codemodel.internal;
 
 import java.lang.reflect.InvocationHandler;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html b/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html
deleted file mode 100644
index 2493ed41413..00000000000
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/fmt/package.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- particular file as subject to the "Classpath" exception as provided
- by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
--->
-<HTML>
-<BODY>
-Various resource file formats (classes that implement <code>JResourceFile</code>).
-</BODY>
-</HTML>
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java b/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java
index aa7a1695eb1..6e2fa832598 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * <h1>Library for generating Java source code</h1>.
  *
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java
index c759b2b249e..05555c623e7 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java
@@ -22,11 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /*
  * @(#)$Id: EncoderFactory.java,v 1.3 2005/09/10 19:07:33 kohsuke Exp $
  */
-
-
 package com.sun.codemodel.internal.util;
 
 import java.lang.reflect.Constructor;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java b/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java
index 4fa997964ce..791e2181618 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java
@@ -22,11 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /*
  * @(#)$Id: MS1252Encoder.java,v 1.2 2005/09/10 19:07:33 kohsuke Exp $
  */
-
-
 package com.sun.codemodel.internal.util;
 
 import java.nio.charset.Charset;
diff --git a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java
index 1523d1a8d0f..198642abdcd 100644
--- a/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.codemodel.internal.writer;
 
 import java.io.OutputStream;
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasPath.java b/jaxws/src/share/classes/com/sun/istack/internal/Builder.java
similarity index 79%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasPath.java
rename to jaxws/src/share/classes/com/sun/istack/internal/Builder.java
index f5459e1dcdb..a5b1a5af5f3 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasPath.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/Builder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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
@@ -22,13 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.swingx.designer.utils;
+package com.sun.istack.internal;
 
 /**
- * HasPath - interface for model nodes that can provide there path in the tree
  *
- * @author Created by Jasper Potts (Jul 2, 2007)
+ * @author Martin Grebac
  */
-public interface HasPath {
-    public String getPath();
+public interface Builder<T> {
+    T build();
 }
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/Pool.java b/jaxws/src/share/classes/com/sun/istack/internal/Pool.java
index 957a3362e3a..589f79a0c69 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/Pool.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/Pool.java
@@ -25,6 +25,7 @@
 package com.sun.istack.internal;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.lang.ref.WeakReference;
 
 /**
  * Pool of reusable objects that are indistinguishable from each other,
@@ -33,6 +34,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  * @author Kohsuke Kawaguchi
  */
 public interface Pool<T> {
+
     /**
      * Gets a new object from the pool.
      *
@@ -46,7 +48,6 @@ public interface Pool<T> {
      */
     void recycle(@NotNull T t);
 
-
     /**
      * Default implementation that uses {@link ConcurrentLinkedQueue}
      * as the data store.
@@ -55,7 +56,10 @@ public interface Pool<T> {
      * <p>
      * Don't rely on the fact that this class extends from {@link ConcurrentLinkedQueue}.
      */
-    public abstract class Impl<T> extends ConcurrentLinkedQueue<T> implements Pool<T> {
+    public abstract class Impl<T> implements Pool<T> {
+
+        private volatile WeakReference<ConcurrentLinkedQueue<T>> queue;
+
         /**
          * Gets a new object from the pool.
          *
@@ -66,9 +70,10 @@ public interface Pool<T> {
          *      always non-null.
          */
         public final @NotNull T take() {
-            T t = super.poll();
-            if(t==null)
+            T t = getQueue().poll();
+            if(t==null) {
                 return create();
+            }
             return t;
         }
 
@@ -76,7 +81,22 @@ public interface Pool<T> {
          * Returns an object back to the pool.
          */
         public final void recycle(T t) {
-            super.offer(t);
+            getQueue().offer(t);
+        }
+
+        private ConcurrentLinkedQueue<T> getQueue() {
+            WeakReference<ConcurrentLinkedQueue<T>> q = queue;
+            if (q != null) {
+                ConcurrentLinkedQueue<T> d = q.get();
+                if (d != null) {
+                    return d;
+                }
+            }
+            // overwrite the queue
+            ConcurrentLinkedQueue<T> d = new ConcurrentLinkedQueue<T>();
+            queue = new WeakReference<ConcurrentLinkedQueue<T>>(d);
+
+            return d;
         }
 
         /**
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
index cf6c0d46d40..ae960953b6b 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
@@ -54,12 +54,22 @@ public class XMLStreamReaderToContentHandler {
 
     // if true, when the conversion is completed, leave the cursor to the last
     // event that was fired (such as end element)
-    private boolean eagerQuit;
+    private final boolean eagerQuit;
 
     /**
      * If true, not start/endDocument event.
      */
-    private boolean fragment;
+    private final boolean fragment;
+
+    // array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }
+    private final String[] inscopeNamespaces;
+
+    /**
+     * @see #XMLStreamReaderToContentHandler(XMLStreamReader, ContentHandler, boolean, boolean, String[])
+     */
+    public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore, boolean eagerQuit, boolean fragment) {
+        this(staxCore, saxCore, eagerQuit, fragment, new String[0]);
+    }
 
     /**
      * Construct a new StAX to SAX adapter that will convert a StAX event
@@ -69,14 +79,22 @@ public class XMLStreamReaderToContentHandler {
      *                StAX event source
      * @param saxCore
      *                SAXevent sink
+     * @param eagerQuit
+     * @param fragment
+     * @param inscopeNamespaces
+     *                array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }
      */
-    public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore, boolean eagerQuit, boolean fragment) {
+    public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore,
+            boolean eagerQuit, boolean fragment, String[] inscopeNamespaces) {
         this.staxStreamReader = staxCore;
         this.saxHandler = saxCore;
         this.eagerQuit = eagerQuit;
         this.fragment = fragment;
+        this.inscopeNamespaces = inscopeNamespaces;
+        assert inscopeNamespaces.length%2 == 0;
     }
 
+
     /*
      * @see StAXReaderToContentHandler#bridge()
      */
@@ -100,6 +118,10 @@ public class XMLStreamReaderToContentHandler {
 
             handleStartDocument();
 
+            for(int i=0; i < inscopeNamespaces.length; i+=2) {
+                saxHandler.startPrefixMapping(inscopeNamespaces[i], inscopeNamespaces[i+1]);
+            }
+
             OUTER:
             do {
                 // These are all of the events listed in the javadoc for
@@ -156,6 +178,10 @@ public class XMLStreamReaderToContentHandler {
                 event=staxStreamReader.next();
             } while (depth!=0);
 
+            for(int i=0; i < inscopeNamespaces.length; i+=2) {
+                saxHandler.endPrefixMapping(inscopeNamespaces[i]);
+            }
+
             handleEndDocument();
         } catch (SAXException e) {
             throw new XMLStreamException2(e);
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizable.java b/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizable.java
new file mode 100644
index 00000000000..82dbde89c17
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizable.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.istack.internal.localization;
+
+/**
+ * Localizable message.
+ *
+ * @author WS Development Team
+ */
+public interface Localizable {
+    /**
+     * Gets the key in the resource bundle.
+     *
+     * @return
+     *      if this method returns {@link #NOT_LOCALIZABLE},
+     *      that means the message is not localizable, and
+     *      the first item of {@link #getArguments()} array
+     *      holds a String.
+     */
+    public String getKey();
+
+    /**
+     * Returns the arguments for message formatting.
+     *
+     * @return
+     *      can be an array of length 0 but never be null.
+     */
+    public Object[] getArguments();
+    public String getResourceBundleName();
+
+
+    /**
+     * Special constant that represents a message that
+     * is not localizable.
+     *
+     * <p>
+     * Use of "new" is to create an unique instance.
+     */
+    public static final String NOT_LOCALIZABLE = new String("\u0000");
+}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIColor.java b/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java
similarity index 66%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIColor.java
rename to jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java
index 572d3461325..4438e131c1e 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIColor.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java
@@ -22,37 +22,35 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.synthmodel;
 
-import org.jdesktop.swingx.designer.paint.Matte;
-
-import javax.swing.UIDefaults;
-import java.awt.Color;
+package com.sun.istack.internal.localization;
 
 /**
- * UIColor
- *
- * @author  Richard Bair
- * @author  Jasper Potts
+ * @author WS Development Team
  */
-public class UIColor extends UIPaint {
+public final class LocalizableMessage implements Localizable {
 
-    public UIColor() {
+    private final String _bundlename;
+    private final String _key;
+    private final Object[] _args;
+
+    public LocalizableMessage(String bundlename, String key, Object... args) {
+        _bundlename = bundlename;
+        _key = key;
+        if(args==null)
+            args = new Object[0];
+        _args = args;
     }
 
-    public UIColor(String id, Matte value) {
-        super(id, value);
+    public String getKey() {
+        return _key;
     }
 
-    public UIColor(String id, Color color, UIDefaults modelDefaults) {
-        this(id, new Matte(color, modelDefaults));
+    public Object[] getArguments() {
+        return _args;
     }
 
-    public Matte getPaint() {
-        return (Matte) super.getPaint();
-    }
-
-    public void setPaint(Matte c) {
-        super.setPaint(c);
+    public String getResourceBundleName() {
+        return _bundlename;
     }
 }
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIcon.java b/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java
similarity index 75%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIcon.java
rename to jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java
index d1a25833de1..066d8b1df36 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIcon.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java
@@ -22,28 +22,22 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.synthmodel;
 
-import javax.swing.Icon;
+package com.sun.istack.internal.localization;
 
 /**
- * UIIcon
- *
- * @author  Richard Bair
- * @author  Jasper Potts
+ * @author WS Development Team
  */
-public class UIIcon extends UIDefault<Icon> {
+public class LocalizableMessageFactory {
 
-    public UIIcon() {
+    private final String _bundlename;
+
+    public LocalizableMessageFactory(String bundlename) {
+        _bundlename = bundlename;
     }
 
-    public Icon getIcon() {
-        return super.getValue();
+    public Localizable getMessage(String key, Object... args) {
+        return new LocalizableMessage(_bundlename, key, args);
     }
 
-    public void setIcon(Icon i) {
-        Icon old = getIcon();
-        super.setValue(i);
-        firePropertyChange("icon", old, i);
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizer.java b/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizer.java
new file mode 100644
index 00000000000..7aa7064d40c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/istack/internal/localization/Localizer.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.istack.internal.localization;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Localizes the {@link Localizable} into a message
+ * by using a configured {@link Locale}.
+ *
+ * @author WS Development Team
+ */
+public class Localizer {
+
+    private final Locale _locale;
+    private final HashMap _resourceBundles;
+
+    public Localizer() {
+        this(Locale.getDefault());
+    }
+
+    public Localizer(Locale l) {
+        _locale = l;
+        _resourceBundles = new HashMap();
+    }
+
+    public Locale getLocale() {
+        return _locale;
+    }
+
+    public String localize(Localizable l) {
+        String key = l.getKey();
+        if (key == Localizable.NOT_LOCALIZABLE) {
+            // this message is not localizable
+            return (String) l.getArguments()[0];
+        }
+        String bundlename = l.getResourceBundleName();
+
+        try {
+            ResourceBundle bundle =
+                (ResourceBundle) _resourceBundles.get(bundlename);
+
+            if (bundle == null) {
+                try {
+                    bundle = ResourceBundle.getBundle(bundlename, _locale);
+                } catch (MissingResourceException e) {
+                    // work around a bug in the com.sun.enterprise.deployment.WebBundleArchivist:
+                    //   all files with an extension different from .class (hence all the .properties files)
+                    //   get copied to the top level directory instead of being in the package where they
+                    //   are defined
+                    // so, since we can't find the bundle under its proper name, we look for it under
+                    //   the top-level package
+
+                    int i = bundlename.lastIndexOf('.');
+                    if (i != -1) {
+                        String alternateBundleName =
+                            bundlename.substring(i + 1);
+                        try {
+                            bundle =
+                                ResourceBundle.getBundle(
+                                    alternateBundleName,
+                                    _locale);
+                        } catch (MissingResourceException e2) {
+                            // give up
+                            return getDefaultMessage(l);
+                        }
+                    }
+                }
+
+                _resourceBundles.put(bundlename, bundle);
+            }
+
+            if (bundle == null) {
+                return getDefaultMessage(l);
+            }
+
+            if (key == null)
+                key = "undefined";
+
+            String msg;
+            try {
+                msg = bundle.getString(key);
+            } catch (MissingResourceException e) {
+                // notice that this may throw a MissingResourceException of its own (caught below)
+                msg = bundle.getString("undefined");
+            }
+
+            // localize all arguments to the given localizable object
+            Object[] args = l.getArguments();
+            for (int i = 0; i < args.length; ++i) {
+                if (args[i] instanceof Localizable)
+                    args[i] = localize((Localizable) args[i]);
+            }
+
+            String message = MessageFormat.format(msg, args);
+            return message;
+
+        } catch (MissingResourceException e) {
+            return getDefaultMessage(l);
+        }
+
+    }
+
+    private String getDefaultMessage(Localizable l) {
+        String key = l.getKey();
+        Object[] args = l.getArguments();
+        StringBuilder sb = new StringBuilder();
+        sb.append("[failed to localize] ");
+        sb.append(key);
+        if (args != null) {
+            sb.append('(');
+            for (int i = 0; i < args.length; ++i) {
+                if (i != 0)
+                    sb.append(", ");
+                sb.append(String.valueOf(args[i]));
+            }
+            sb.append(')');
+        }
+        return sb.toString();
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java b/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
index c4f8f825a3b..7f1e7eaf561 100644
--- a/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
@@ -66,10 +66,7 @@ public class AnnotationProcessorFactoryImpl implements AnnotationProcessorFactor
         types.add("javax.jws.soap.SOAPBinding");
         types.add("javax.jws.soap.SOAPMessageHandler");
         types.add("javax.jws.soap.SOAPMessageHandlers");
-        types.add("javax.xml.ws.BeginService");
-        types.add("javax.xml.ws.EndService");
         types.add("javax.xml.ws.BindingType");
-        types.add("javax.xml.ws.ParameterIndex");
         types.add("javax.xml.ws.RequestWrapper");
         types.add("javax.xml.ws.ResponseWrapper");
         types.add("javax.xml.ws.ServiceMode");
@@ -78,8 +75,6 @@ public class AnnotationProcessorFactoryImpl implements AnnotationProcessorFactor
         types.add("javax.xml.ws.WebServiceClient");
         types.add("javax.xml.ws.WebServiceProvider");
         types.add("javax.xml.ws.WebServiceRef");
-
-        types.add("javax.xml.ws.security.MessageSecurity");
         supportedAnnotations = Collections.unmodifiableCollection(types);
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java
index 2ec45591cc3..768c4617717 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
index 5dec6daad65..768b98d76a7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties
@@ -30,8 +30,8 @@ BASEDIR_DOESNT_EXIST = \
     Non-existent directory: {0}
 
 VERSION = \
-	schemagen version "JAXB 2.1.3" \n\
-	JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.1.3 in JDK)	
+        schemagen version "JAXB 2.1.10 in JDK 6" \n\
+        JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.1.10 in JDK 6)
 
 USAGE = \
 Usage: schemagen [-options ...] <java files> \n\
@@ -42,4 +42,3 @@ Options: \n\
 \ \ \ \ -episode <file>   :  generate episode file for separate compilation\n\
 \ \ \ \ -version          :  display version information\n\
 \ \ \ \ -help             :  display this usage message
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java
index 8a9656f43f3..4db5be20b06 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
index 3b268d5e530..de476e3c586 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
new file mode 100644
index 00000000000..05b997beaec
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.internal.jxc;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * CLI entry point to schemagen that checks for JDK 5.0
+ * @author Kohsuke Kawaguchi
+ */
+public class SchemaGeneratorFacade {
+
+    public static void main(String[] args) throws Throwable {
+        try {
+            ClassLoader cl = SchemaGeneratorFacade.class.getClassLoader();
+            if(cl==null)    cl = ClassLoader.getSystemClassLoader();
+
+            Class driver = cl.loadClass("com.sun.tools.internal.jxc.SchemaGenerator");
+            Method mainMethod = driver.getDeclaredMethod("main", new Class[]{String[].class});
+            try {
+                mainMethod.invoke(null,new Object[]{args});
+            } catch (IllegalAccessException e) {
+                throw e;
+            } catch (InvocationTargetException e) {
+                if(e.getTargetException()!=null)
+                    throw e.getTargetException();
+            }
+        } catch (UnsupportedClassVersionError e) {
+            System.err.println("schemagen requires JDK 5.0 or later. Please download it from http://java.sun.com/j2se/1.5/");
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java
index 47d1fc41874..d1c352923ee 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.apt;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
index 68aa512346a..eec7c077144 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.apt;
 
 import java.util.Arrays;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java
index 8ec9cdb55c5..a40b1599ec4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.apt;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
index e9a053414fd..b3f02da16c4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.apt;
 
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
index 3390a5f5502..1b711803a27 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.apt;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties
index c9a4d4dd55e..c70e9506eeb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties
@@ -31,4 +31,3 @@ UNRECOGNIZED_PARAMETER = \
 
 OPERAND_MISSING = \
     Option "{0}" is missing an operand.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java
index 13f3293fef0..ed257a6cc4d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.apt;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java
index fbeb61d75d7..ea9ad29ec8e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.apt;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
index bbadce081cc..eeb641cff7b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.apt;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java
index 475c8311397..858fd9ab1b0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java
@@ -75,6 +75,11 @@ public class Classes extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
         case 12:
             {
                 if(($__uri == "" && $__local == "classes")) {
@@ -92,18 +97,6 @@ public class Classes extends NGCCHandler {
                 $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
-        case 2:
-            {
-                if(($__uri == "" && $__local == "excludes")) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    $_ngcc_current_state = 6;
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         case 11:
             {
                 if(($__uri == "" && $__local == "includes")) {
@@ -115,9 +108,16 @@ public class Classes extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 2:
             {
-                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(($__uri == "" && $__local == "excludes")) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    $_ngcc_current_state = 6;
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
             }
             break;
         default:
@@ -133,6 +133,17 @@ public class Classes extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 4:
+            {
+                $_ngcc_current_state = 3;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 3:
             {
                 if(($__uri == "" && $__local == "excludes")) {
@@ -144,29 +155,12 @@ public class Classes extends NGCCHandler {
                 }
             }
             break;
-        case 4:
-            {
-                $_ngcc_current_state = 3;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 1:
-            {
-                if(($__uri == "" && $__local == "classes")) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
         case 8:
             {
                 if(($__uri == "" && $__local == "includes")) {
@@ -178,9 +172,15 @@ public class Classes extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 1:
             {
-                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+                if(($__uri == "" && $__local == "classes")) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
             }
             break;
         default:
@@ -196,6 +196,11 @@ public class Classes extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 4:
             {
                 $_ngcc_current_state = 3;
@@ -208,11 +213,6 @@ public class Classes extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
-            {
-                revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -226,6 +226,11 @@ public class Classes extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 4:
             {
                 $_ngcc_current_state = 3;
@@ -238,11 +243,6 @@ public class Classes extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -253,6 +253,11 @@ public class Classes extends NGCCHandler {
 
     public void text(String $value) throws SAXException {
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromText(this, super._cookie, $value);
+            }
+            break;
         case 9:
             {
                 include_content = $value;
@@ -260,14 +265,14 @@ public class Classes extends NGCCHandler {
                 action2();
             }
             break;
-        case 3:
+        case 4:
             {
                 exclude_content = $value;
                 $_ngcc_current_state = 3;
                 action0();
             }
             break;
-        case 4:
+        case 3:
             {
                 exclude_content = $value;
                 $_ngcc_current_state = 3;
@@ -301,11 +306,6 @@ public class Classes extends NGCCHandler {
                 action1();
             }
             break;
-        case 0:
-            {
-                revertToParentFromText(this, super._cookie, $value);
-            }
-            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java
index b58719a3969..c0e1539c5ec 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java
@@ -70,15 +70,10 @@ public class Config extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 4:
             {
-                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 1:
-            {
-                if(($__uri == "" && $__local == "schema")) {
-                    NGCCHandler h = new Schema(this, super._source, $runtime, 3, baseDir);
+                if(($__uri == "" && $__local == "classes")) {
+                    NGCCHandler h = new Classes(this, super._source, $runtime, 34);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -97,10 +92,26 @@ public class Config extends NGCCHandler {
                 }
             }
             break;
+        case 1:
+            {
+                if(($__uri == "" && $__local == "schema")) {
+                    NGCCHandler h = new Schema(this, super._source, $runtime, 31, baseDir);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
         case 2:
             {
                 if(($__uri == "" && $__local == "schema")) {
-                    NGCCHandler h = new Schema(this, super._source, $runtime, 4, baseDir);
+                    NGCCHandler h = new Schema(this, super._source, $runtime, 32, baseDir);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -120,17 +131,6 @@ public class Config extends NGCCHandler {
                 }
             }
             break;
-        case 4:
-            {
-                if(($__uri == "" && $__local == "classes")) {
-                    NGCCHandler h = new Classes(this, super._source, $runtime, 6);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -145,11 +145,6 @@ public class Config extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 1:
             {
                 if(($__uri == "" && $__local == "config")) {
@@ -161,6 +156,11 @@ public class Config extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
@@ -257,13 +257,6 @@ public class Config extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 6:
-            {
-                bd = $value;
-                $_ngcc_current_state = 5;
-                action1();
-            }
-            break;
         case 0:
             {
                 revertToParentFromText(this, super._cookie, $value);
@@ -283,31 +276,38 @@ public class Config extends NGCCHandler {
                 }
             }
             break;
+        case 6:
+            {
+                bd = $value;
+                $_ngcc_current_state = 5;
+                action1();
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 3:
-            {
-                _schema = ((Schema)$__result__);
-                action0();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 4:
-            {
-                _schema = ((Schema)$__result__);
-                action0();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 6:
+        case 34:
             {
                 classes = ((Classes)$__result__);
                 $_ngcc_current_state = 2;
             }
             break;
+        case 31:
+            {
+                _schema = ((Schema)$__result__);
+                action0();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 32:
+            {
+                _schema = ((Schema)$__result__);
+                action0();
+                $_ngcc_current_state = 1;
+            }
+            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java
index 1a7f41f9ca3..a27d2d23d18 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java
@@ -65,6 +65,23 @@ public class Schema extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 2:
+            {
+                if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 6:
             {
                 if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
@@ -88,23 +105,6 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 2:
-            {
-                if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -119,23 +119,23 @@ public class Schema extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 6:
+        case 0:
             {
-                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 2:
+            {
+                if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
-                    $_ngcc_current_state = 2;
+                    $_ngcc_current_state = 1;
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 1:
             {
                 if(($__uri == "" && $__local == "schema")) {
@@ -147,14 +147,14 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 2:
+        case 6:
             {
-                if(($ai = $runtime.getAttributeIndex("","location"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
-                    $_ngcc_current_state = 1;
+                    $_ngcc_current_state = 2;
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
             }
@@ -172,17 +172,6 @@ public class Schema extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 6:
-            {
-                if(($__uri == "" && $__local == "namespace")) {
-                    $_ngcc_current_state = 8;
-                }
-                else {
-                    $_ngcc_current_state = 2;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         case 0:
             {
                 revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
@@ -199,6 +188,17 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 6:
+            {
+                if(($__uri == "" && $__local == "namespace")) {
+                    $_ngcc_current_state = 8;
+                }
+                else {
+                    $_ngcc_current_state = 2;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -212,17 +212,17 @@ public class Schema extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 6:
-            {
-                $_ngcc_current_state = 2;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 0:
             {
                 revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 7:
             {
                 if(($__uri == "" && $__local == "namespace")) {
@@ -233,6 +233,12 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 6:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 3:
             {
                 if(($__uri == "" && $__local == "location")) {
@@ -243,12 +249,6 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -260,24 +260,6 @@ public class Schema extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 8:
-            {
-                namespace = $value;
-                $_ngcc_current_state = 7;
-            }
-            break;
-        case 6:
-            {
-                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 2;
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
         case 0:
             {
                 revertToParentFromText(this, super._cookie, $value);
@@ -295,6 +277,12 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 8:
+            {
+                namespace = $value;
+                $_ngcc_current_state = 7;
+            }
+            break;
         case 4:
             {
                 loc = $value;
@@ -302,6 +290,18 @@ public class Schema extends NGCCHandler {
                 action0();
             }
             break;
+        case 6:
+            {
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 2;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd
index ba213ec743d..ea9f46256a8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd
@@ -23,6 +23,8 @@
  CA 95054 USA or visit www.sun.com if you need additional information or
  have any questions.
 -->
+
+
 <!-- THIS IS A GENERATED FILE. DO NOT MODIFY. -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
   <xs:element name="config">
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java b/jaxws/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java
index 4eb70a1e304..9a886bd373f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.jxc.model.nav;
 
 import java.util.ArrayList;
@@ -306,7 +307,7 @@ public class APTNavigator implements Navigator<TypeMirror,TypeDeclaration,FieldD
     }
 
     public boolean isInnerClass(TypeDeclaration clazz) {
-        return clazz.getDeclaringType()!=null;
+        return clazz.getDeclaringType()!=null && !clazz.getModifiers().contains(Modifier.STATIC);
     }
 
     public boolean isArray(TypeMirror t) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/Invoker.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/Invoker.java
index 6f53444edb1..595b316ab11 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/Invoker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/Invoker.java
@@ -55,10 +55,12 @@ public final class Invoker {
     static int invoke(String mainClass, String[] args) throws Throwable {
         // use the platform default proxy if available.
         // see sun.net.spi.DefaultProxySelector for details.
-        try {
-            System.setProperty("java.net.useSystemProxies","true");
-        } catch (SecurityException e) {
-            // failing to set this property isn't fatal
+        if(!noSystemProxies) {
+            try {
+                System.setProperty("java.net.useSystemProxies","true");
+            } catch (SecurityException e) {
+                // failing to set this property isn't fatal
+            }
         }
 
         ClassLoader oldcc = Thread.currentThread().getContextClassLoader();
@@ -220,4 +222,18 @@ public final class Invoker {
         "com.sun.xml.internal.bind.",
         "com.sun.xml.internal.ws."
     };
+
+    /**
+     * Escape hatch to work around IBM JDK problem.
+     * See http://www-128.ibm.com/developerworks/forums/dw_thread.jsp?nav=false&forum=367&thread=164718&cat=10
+     */
+    public static boolean noSystemProxies = false;
+
+    static {
+        try {
+            noSystemProxies = Boolean.getBoolean(Invoker.class.getName()+".noSystemProxies");
+        } catch(SecurityException e) {
+            // ignore
+        }
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java
index c9c2ff3d62b..54a13505fac 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java
@@ -34,6 +34,7 @@ import com.sun.tools.internal.ws.processor.generator.JavaGeneratorExtensionFacad
  *
  * @see JavaGeneratorExtensionFacade
  * @author Vivek Pandey
+ * @deprecated This class is deprecated, will be removed in JAX-WS 2.2 RI.
  */
 public abstract class TJavaGeneratorExtension {
     /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java
new file mode 100644
index 00000000000..62841fe1f79
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.api;
+
+/**
+ * Allows to customize wsgen behaviour using this extension.
+ * The extension implementations are found using service
+ * discovery mechanism i.e. JAX-WS tooltime locates
+ * {@link WsgenExtension}s through the
+ * <tt>META-INF/services/com.sun.tools.internal.ws.api.WsgenExtension</tt>
+ * files.
+ *
+ * {@link WsgenProtocol} annotation can be specified on the
+ * extensions to extend -wsdl[:protocol] behaviour.
+ *
+ * @author Jitendra Kotamraju
+ * @since JAX-WS RI 2.1.6
+ * @see WsgenProtocol
+ */
+public abstract class WsgenExtension {
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java
new file mode 100644
index 00000000000..87a39e1652f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.api;
+
+import java.lang.annotation.*;
+
+/**
+ * Allows to extend protocol for wsgen's wsdl[:protocol] switch.
+ * This annotation must be specified on {@link WsgenExtension}
+ * implementations.
+ *
+ * @author Jitendra Kotamraju
+ * @since JAX-WS RI 2.1.6
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface WsgenProtocol {
+    /**
+     * Token for wsgen -wsdl[:protocol]
+     * @return
+     */
+    String token();
+
+    /**
+     * The corresponding lexical string used to create BindingID
+     * @return
+     */
+    String lexical();
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java
index 0f5be2fa8a3..20ec348377a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java
@@ -32,6 +32,8 @@ import javax.xml.namespace.QName;
  * A WSDL element or attribute that can be extended.
  *
  * @author Vivek Pandey
+ * @deprecated This interface is deprecated, will be removed in JAX-WS 2.2 RI.
+ *
  */
 public interface TWSDLExtensible {
     /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
index c709b30e5c1..1cca601e943 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java
@@ -29,6 +29,7 @@ package com.sun.tools.internal.ws.api.wsdl;
  * A WSDL extension
  *
  * @author Vivek Pandey
+ * @deprecated This interface is deprecated, will be removed in JAX-WS 2.2 RI.
  */
 public interface TWSDLExtension {
     /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
index 5b7fe935ca4..ce4569ef1cf 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java
@@ -33,6 +33,7 @@ import org.w3c.dom.Element;
  * with it for the WSDL extensibility elements thats not already defined in the WSDL 1.1 spec, such as SOAP or MIME.
  *
  * @author Vivek Pandey
+ * @deprecated This class is deprecated, will be removed in JAX-WS 2.2 RI.
  */
 public abstract class TWSDLExtensionHandler {
     /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
index 45d0a3a42a8..058feaf8b22 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java
@@ -33,6 +33,7 @@ import java.util.Map;
  * Abstracts wsdl:portType/wsdl:operation
  *
  * @author Vivek Pandey
+ * @deprecated This interface is deprecated, will be removed in JAX-WS 2.2 RI.
  */
 public interface TWSDLOperation extends TWSDLExtensible{
     /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
index 6f6e3e00c7f..87b517259d0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java
@@ -33,6 +33,7 @@ import org.xml.sax.Locator;
  * it can be latter used by other extensions to resolve the namespaces.
  *
  * @author Vivek Pandey
+ * @deprecated This interface is deprecated, will be removed in JAX-WS 2.2 RI.
  */
 public interface TWSDLParserContext {
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/package-info.java
index a3a514020ad..72e90c70780 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/package-info.java
@@ -24,7 +24,7 @@
  */
 
 /**
- * <h1>JAX-WS 2.0.1 Tools</h1>
+ * <h1>JAX-WS 2.1 Tools</h1>
  * This document describes the tools included with JAX-WS 2.0.1.
  *
  * {@DotDiagram
@@ -42,22 +42,24 @@
 
        // libraries
       node [style=filled,color=lightblue];
-      CompileTool; "WSAP"; WebServiceAP; Processor; Modeler; ProcessorActions;
+      WsimportTool; WsgenTool;"WSAP"; WebServiceAP; WSDLModeler;WSDLParser;SeiGenerator;ServiceGenerator;ExceptionGenerator;"JAXB XJC APIs";CodeModel;
 
        // aps
 #       node [style=filled,color=lightpink];
 #       "JAX-WS"; tools; runtime; SPI; "Annotation Processor";
 
        "Apt ANT Task" -> APT;
-       "WsGen ANT Task" -> wsgen -> CompileTool;
-       "WsImport ANT Task" -> wsimport -> CompileTool;
+       "WsGen ANT Task" -> wsgen -> WsgenTool;
+       "WsImport ANT Task" -> wsimport -> WsimportTool;
 
-       CompileTool -> APT -> WSAP -> WebServiceAP;
-       CompileTool -> Processor -> Modeler;
-       Processor -> ProcessorActions;
-       CompileTool -> WebServiceAP;
-
-       Modeler -> WSDLModeler;
+       WsgenTool -> APT -> WSAP -> WebServiceAP;
+       WsimportTool -> WSDLModeler;
+       WSDLModeler->WSDLParser;
+       WSDLModeler->"JAXB XJC APIs"
+       WsimportTool->SeiGenerator->CodeModel;
+       WsimportTool->ServiceGenerator->CodeModel;
+       WsimportTool->ExceptionGenerator->CodeModel;
+       WebServiceAP->CodeModel
      }
  * }
  * <div align=right>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
index 9cee479e62e..9d5f9b18c21 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
@@ -156,12 +156,14 @@ public abstract class GeneratorBase
         return comments;
     }
 
-    protected JDefinedClass getClass(String className, ClassType type) {
+    protected JDefinedClass getClass(String className, ClassType type) throws JClassAlreadyExistsException {
         JDefinedClass cls;
         try {
             cls = cm._class(className, type);
         } catch (JClassAlreadyExistsException e){
             cls = cm._getClass(className);
+            if(cls == null)
+                throw e;
         }
         return cls;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
index 79334ed1ce1..bb68e8dee79 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
@@ -36,7 +36,11 @@ import com.sun.tools.internal.ws.processor.model.jaxb.JAXBTypeAndAnnotation;
 import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
 import com.sun.tools.internal.ws.wscompile.Options;
 import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wscompile.AbortException;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
+import com.sun.tools.internal.ws.wsdl.document.PortType;
+import com.sun.tools.internal.ws.wsdl.document.Kinds;
+import com.sun.tools.internal.ws.resources.GeneratorMessages;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
@@ -48,6 +52,8 @@ import javax.xml.ws.Holder;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.xml.sax.Locator;
+
 public class SeiGenerator extends GeneratorBase{
     private String serviceNS;
     private TJavaGeneratorExtension extension;
@@ -83,10 +89,22 @@ public class SeiGenerator extends GeneratorBase{
         }
 
 
-        JDefinedClass cls = getClass(className, ClassType.INTERFACE);
-        if (cls == null)
+        JDefinedClass cls = null;
+        try {
+            cls = getClass(className, ClassType.INTERFACE);
+        } catch (JClassAlreadyExistsException e) {
+            QName portTypeName =
+                (QName) port.getProperty(
+                        ModelProperties.PROPERTY_WSDL_PORT_TYPE_NAME);
+            Locator loc = null;
+            if(portTypeName != null){
+                PortType pt = port.portTypes.get(portTypeName);
+                if(pt!=null)
+                    loc = pt.getLocator();
+            }
+            receiver.error(loc, GeneratorMessages.GENERATOR_SEI_CLASS_ALREADY_EXIST(intf.getName(), portTypeName));
             return;
-
+        }
         // If the class has methods it has already been defined
         // so skip it.
         if (!cls.methods().isEmpty())
@@ -441,15 +459,7 @@ public class SeiGenerator extends GeneratorBase{
         if (port.isProvider()) {
             return;                // Not generating for Provider based endpoint
         }
-
-
-        try {
-            write(port);
-        } catch (Exception e) {
-            throw new GeneratorException(
-                "generator.nestedGeneratorError",
-                e);
-        }
+        write(port);
     }
 
     private void register(TJavaGeneratorExtension h) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
index 2cea1189011..863139188ac 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
@@ -29,11 +29,13 @@ import com.sun.codemodel.internal.*;
 import com.sun.tools.internal.ws.processor.model.Model;
 import com.sun.tools.internal.ws.processor.model.Port;
 import com.sun.tools.internal.ws.processor.model.Service;
+import com.sun.tools.internal.ws.processor.model.ModelProperties;
 import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
 import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
 import com.sun.tools.internal.ws.wscompile.Options;
 import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 import com.sun.tools.internal.ws.resources.GeneratorMessages;
+import com.sun.tools.internal.ws.wsdl.document.PortType;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
 import com.sun.xml.internal.ws.util.JAXWSUtils;
 
@@ -42,161 +44,174 @@ import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceFeature;
 import java.io.IOException;
+import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.logging.Logger;
+
+import org.xml.sax.Locator;
 
 
 /**
- *
  * @author WS Development Team
  */
-public class ServiceGenerator extends GeneratorBase{
+public class ServiceGenerator extends GeneratorBase {
 
-    public static void generate(Model model, WsimportOptions options, ErrorReceiver receiver){
+    public static void generate(Model model, WsimportOptions options, ErrorReceiver receiver) {
         ServiceGenerator serviceGenerator = new ServiceGenerator(model, options, receiver);
         serviceGenerator.doGeneration();
     }
+
     private ServiceGenerator(Model model, WsimportOptions options, ErrorReceiver receiver) {
         super(model, options, receiver);
     }
 
-    private JInvocation createURL(URL url) {
-        return JExpr._new(cm.ref(URL.class)).arg(url.toExternalForm());
-    }
-
     @Override
     public void visit(Service service) {
+        JavaInterface intf = service.getJavaInterface();
+        String className = Names.customJavaTypeClassName(intf);
+        if (donotOverride && GeneratorUtil.classExists(options, className)) {
+            log("Class " + className + " exists. Not overriding.");
+            return;
+        }
+
+        JDefinedClass cls;
         try {
-            JavaInterface intf = service.getJavaInterface();
-            String className = Names.customJavaTypeClassName(intf);
-            if (donotOverride && GeneratorUtil.classExists(options, className)) {
-                log("Class " + className + " exists. Not overriding.");
+            cls = getClass(className, ClassType.CLASS);
+        } catch (JClassAlreadyExistsException e) {
+            receiver.error(service.getLocator(), GeneratorMessages.GENERATOR_SERVICE_CLASS_ALREADY_EXIST(className, service.getName()));
+            return;
+        }
+
+        cls._extends(javax.xml.ws.Service.class);
+        String serviceFieldName = JAXBRIContext.mangleNameToClassName(service.getName().getLocalPart()).toUpperCase();
+        String wsdlLocationName = serviceFieldName + "_WSDL_LOCATION";
+        JFieldVar urlField = cls.field(JMod.PRIVATE | JMod.STATIC | JMod.FINAL, URL.class, wsdlLocationName);
+
+
+        cls.field(JMod.PRIVATE | JMod.STATIC | JMod.FINAL, Logger.class, "logger", cm.ref(Logger.class).staticInvoke("getLogger").arg(JExpr.dotclass(cm.ref(className)).invoke("getName")));
+
+        JClass qNameCls = cm.ref(QName.class);
+        JInvocation inv;
+        inv = JExpr._new(qNameCls);
+        inv.arg("namespace");
+        inv.arg("localpart");
+
+
+        JBlock staticBlock = cls.init();
+        JVar urlVar = staticBlock.decl(cm.ref(URL.class), "url", JExpr._null());
+        JTryBlock tryBlock = staticBlock._try();
+        JVar baseUrl = tryBlock.body().decl(cm.ref(URL.class), "baseUrl");
+        tryBlock.body().assign(baseUrl, JExpr.dotclass(cm.ref(className)).invoke("getResource").arg("."));
+        tryBlock.body().assign(urlVar, JExpr._new(cm.ref(URL.class)).arg(baseUrl).arg(wsdlLocation));
+        JCatchBlock catchBlock = tryBlock._catch(cm.ref(MalformedURLException.class));
+        catchBlock.param("e");
+
+        catchBlock.body().directStatement("logger.warning(\"Failed to create URL for the wsdl Location: " + JExpr.quotify('\'', wsdlLocation) + ", retrying as a local file\");");
+        catchBlock.body().directStatement("logger.warning(e.getMessage());");
+
+        staticBlock.assign(urlField, urlVar);
+
+        //write class comment - JAXWS warning
+        JDocComment comment = cls.javadoc();
+
+        if (service.getJavaDoc() != null) {
+            comment.add(service.getJavaDoc());
+            comment.add("\n\n");
+        }
+
+        for (String doc : getJAXWSClassComment()) {
+            comment.add(doc);
+        }
+
+        JMethod constructor = cls.constructor(JMod.PUBLIC);
+        constructor.param(URL.class, "wsdlLocation");
+        constructor.param(QName.class, "serviceName");
+        constructor.body().directStatement("super(wsdlLocation, serviceName);");
+
+        constructor = cls.constructor(JMod.PUBLIC);
+        constructor.body().directStatement("super(" + wsdlLocationName + ", new QName(\"" + service.getName().getNamespaceURI() + "\", \"" + service.getName().getLocalPart() + "\"));");
+
+        //@WebService
+        JAnnotationUse webServiceClientAnn = cls.annotate(cm.ref(WebServiceClient.class));
+        writeWebServiceClientAnnotation(service, webServiceClientAnn);
+
+        //@HandlerChain
+        writeHandlerConfig(Names.customJavaTypeClassName(service.getJavaInterface()), cls, options);
+
+        for (Port port : service.getPorts()) {
+            if (port.isProvider()) {
+                continue;  // No getXYZPort() for porvider based endpoint
+            }
+
+            //Get the SEI class
+            JType retType;
+            try {
+                retType = getClass(port.getJavaInterface().getName(), ClassType.INTERFACE);
+            } catch (JClassAlreadyExistsException e) {
+                QName portTypeName =
+                        (QName) port.getProperty(
+                                ModelProperties.PROPERTY_WSDL_PORT_TYPE_NAME);
+                Locator loc = null;
+                if (portTypeName != null) {
+                    PortType pt = port.portTypes.get(portTypeName);
+                    if (pt != null)
+                        loc = pt.getLocator();
+                }
+                receiver.error(loc, GeneratorMessages.GENERATOR_SEI_CLASS_ALREADY_EXIST(port.getJavaInterface().getName(), portTypeName));
                 return;
             }
 
-            JDefinedClass cls = getClass(className, ClassType.CLASS);
+            //write getXyzPort()
+            writeDefaultGetPort(port, retType, cls);
 
-            cls._extends(javax.xml.ws.Service.class);
-            String serviceFieldName = JAXBRIContext.mangleNameToClassName(service.getName().getLocalPart()).toUpperCase();
-            String wsdlLocationName = serviceFieldName+"_WSDL_LOCATION";
-            JFieldVar urlField = cls.field(JMod.PRIVATE|JMod.STATIC|JMod.FINAL, URL.class, wsdlLocationName);
-            JClass qNameCls = cm.ref(QName.class);
-            JInvocation inv;
-            inv = JExpr._new(qNameCls);
-            inv.arg("namespace");
-            inv.arg("localpart");
-
-
-            JBlock staticBlock = cls.init();
-            URL url = new URL(JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation)));
-            JVar urlVar = staticBlock.decl(cm.ref(URL.class),"url", JExpr._null());
-            JTryBlock tryBlock = staticBlock._try();
-            tryBlock.body().assign(urlVar, createURL(url));
-            JCatchBlock catchBlock = tryBlock._catch(cm.ref(MalformedURLException.class));
-            catchBlock.param("e");
-            catchBlock.body().directStatement("e.printStackTrace();");
-            staticBlock.assign(urlField, urlVar);
-
-            //write class comment - JAXWS warning
-            JDocComment comment = cls.javadoc();
-
-            if(service.getJavaDoc() != null){
-                comment.add(service.getJavaDoc());
-                comment.add("\n\n");
-            }
-
-            for (String doc : getJAXWSClassComment()) {
-                comment.add(doc);
-            }
-
-            JMethod constructor = cls.constructor(JMod.PUBLIC);
-            constructor.param(URL.class, "wsdlLocation");
-            constructor.param(QName.class, "serviceName");
-            constructor.body().directStatement("super(wsdlLocation, serviceName);");
-
-            constructor = cls.constructor(JMod.PUBLIC);
-            constructor.body().directStatement("super("+wsdlLocationName+", new QName(\""+service.getName().getNamespaceURI()+"\", \""+service.getName().getLocalPart()+"\"));");
-
-            //@WebService
-            JAnnotationUse webServiceClientAnn = cls.annotate(cm.ref(WebServiceClient.class));
-            writeWebServiceClientAnnotation(service, webServiceClientAnn);
-
-            //@HandlerChain
-            writeHandlerConfig(Names.customJavaTypeClassName(service.getJavaInterface()), cls, options);
-
-            for (Port port: service.getPorts()) {
-                if (port.isProvider()) {
-                    continue;  // No getXYZPort() for porvider based endpoint
-                }
-
-                //write getXyzPort()
-                writeDefaultGetPort(port, cls);
-
-                //write getXyzPort(WebServicesFeature...)
-                if(options.target.isLaterThan(Options.Target.V2_1))
-                    writeGetPort(port, cls);
-            }
-        } catch (IOException e) {
-            receiver.error(e);
+            //write getXyzPort(WebServicesFeature...)
+            if (options.target.isLaterThan(Options.Target.V2_1))
+                writeGetPort(port, retType, cls);
         }
     }
 
-    private void writeGetPort(Port port, JDefinedClass cls) {
-        JType retType = getClass(port.getJavaInterface().getName(), ClassType.INTERFACE);
+    private void writeGetPort(Port port, JType retType, JDefinedClass cls) {
         JMethod m = cls.method(JMod.PUBLIC, retType, port.getPortGetter());
         JDocComment methodDoc = m.javadoc();
-        if(port.getJavaDoc() != null)
+        if (port.getJavaDoc() != null)
             methodDoc.add(port.getJavaDoc());
         JCommentPart ret = methodDoc.addReturn();
         JCommentPart paramDoc = methodDoc.addParam("features");
         paramDoc.append("A list of ");
-        paramDoc.append("{@link "+WebServiceFeature.class.getName()+"}");
+        paramDoc.append("{@link " + WebServiceFeature.class.getName() + "}");
         paramDoc.append("to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.");
-        ret.add("returns "+retType.name());
+        ret.add("returns " + retType.name());
         m.varParam(WebServiceFeature.class, "features");
         JBlock body = m.body();
-        StringBuffer statement = new StringBuffer("return (");
-        statement.append(retType.name());
-        statement.append(")super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
+        StringBuffer statement = new StringBuffer("return ");
+        statement.append("super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
         statement.append(retType.name());
         statement.append(".class, features);");
         body.directStatement(statement.toString());
         writeWebEndpoint(port, m);
     }
 
-    private void writeDefaultGetPort(Port port, JDefinedClass cls) {
-        JType retType = getClass(port.getJavaInterface().getName(), ClassType.INTERFACE);
+    private void writeDefaultGetPort(Port port, JType retType, JDefinedClass cls) {
         String portGetter = port.getPortGetter();
         JMethod m = cls.method(JMod.PUBLIC, retType, portGetter);
         JDocComment methodDoc = m.javadoc();
-        if(port.getJavaDoc() != null)
+        if (port.getJavaDoc() != null)
             methodDoc.add(port.getJavaDoc());
         JCommentPart ret = methodDoc.addReturn();
-        ret.add("returns "+retType.name());
+        ret.add("returns " + retType.name());
         JBlock body = m.body();
-        StringBuffer statement = new StringBuffer("return (");
-        statement.append(retType.name());
-        statement.append(")super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
+        StringBuffer statement = new StringBuffer("return ");
+        statement.append("super.getPort(new QName(\"").append(port.getName().getNamespaceURI()).append("\", \"").append(port.getName().getLocalPart()).append("\"), ");
         statement.append(retType.name());
         statement.append(".class);");
         body.directStatement(statement.toString());
         writeWebEndpoint(port, m);
     }
 
-
-    protected JDefinedClass getClass(String className, ClassType type) {
-        JDefinedClass cls;
-        try {
-            cls = cm._class(className, type);
-        } catch (JClassAlreadyExistsException e){
-            cls = cm._getClass(className);
-        }
-        return cls;
-    }
-
     private void writeWebServiceClientAnnotation(Service service, JAnnotationUse wsa) {
         String serviceName = service.getName().getLocalPart();
-        String serviceNS= service.getName().getNamespaceURI();
+        String serviceNS = service.getName().getNamespaceURI();
         wsa.param("name", serviceName);
         wsa.param("targetNamespace", serviceNS);
         wsa.param("wsdlLocation", wsdlLocation);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
index dbc10ddbf8e..71224850728 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: W3CAddressingJavaGeneratorExtension.java,v 1.1.2.4 2006/10/31 19:57:28 vivekp Exp $
- */
 
 package com.sun.tools.internal.ws.processor.generator;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java
index 419d4d16777..b6d727bd259 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java
@@ -26,6 +26,7 @@
 package com.sun.tools.internal.ws.processor.model;
 
 import com.sun.tools.internal.ws.processor.model.java.JavaInterface;
+import com.sun.tools.internal.ws.wsdl.document.PortType;
 import com.sun.tools.internal.ws.wsdl.document.soap.SOAPStyle;
 import com.sun.tools.internal.ws.wsdl.framework.Entity;
 
@@ -174,4 +175,5 @@ public class Port extends ModelObject {
     private String _address;
     private String _serviceImplName;
     private Map<String, Operation> operationsByName = new HashMap<String, Operation>();
+    public Map<QName, PortType> portTypes = new HashMap<QName, PortType>();
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
index e0797fdbe30..196c218570b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
@@ -27,6 +27,7 @@ package com.sun.tools.internal.ws.processor.model.java;
 
 import com.sun.tools.internal.ws.resources.ModelMessages;
 import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 import com.sun.tools.internal.ws.processor.model.Parameter;
 
 import java.util.ArrayList;
@@ -42,12 +43,14 @@ public class JavaMethod {
     private final String name;
     private final List<JavaParameter> parameters = new ArrayList<JavaParameter>();
     private final List<String> exceptions = new ArrayList<String>();
+    private final WsimportOptions options;
     private JavaType returnType;
 
-    public JavaMethod(String name, ErrorReceiver receiver) {
+    public JavaMethod(String name, WsimportOptions options, ErrorReceiver receiver) {
         this.name = name;
         this.returnType = null;
         this.errorReceiver = receiver;
+        this.options = options;
     }
 
     public String getName() {
@@ -83,10 +86,19 @@ public class JavaMethod {
     public void addParameter(JavaParameter param) {
         // verify that this member does not already exist
         if (hasParameter(param.getName())) {
-            errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), param.getParameter().getEntityName()));
-            Parameter duplicParam = getParameter(param.getName());
-            errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), duplicParam.getEntityName()));
-            return;
+            if(options.isExtensionMode()){
+                param.setName(getUniqueName(param.getName()));
+            }else{
+                Parameter duplicParam = getParameter(param.getName());
+                if(param.getParameter().isEmbedded()){
+                    errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE_WRAPPER(param.getName(), param.getParameter().getEntityName()));
+                    errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE_WRAPPER(param.getName(), duplicParam.getEntityName()));
+                }else{
+                    errorReceiver.error(param.getParameter().getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), param.getParameter().getEntityName()));
+                    errorReceiver.error(duplicParam.getLocator(), ModelMessages.MODEL_PARAMETER_NOTUNIQUE(param.getName(), duplicParam.getEntityName()));
+                }
+                return;
+            }
         }
         parameters.add(param);
     }
@@ -106,4 +118,12 @@ public class JavaMethod {
     public Iterator<String> getExceptions() {
         return exceptions.iterator();
     }
+
+    private String getUniqueName(String param){
+        int parmNum = 0;
+        while(hasParameter(param)){
+            param = param + Integer.toString(parmNum++);
+        }
+        return param;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
index 665ce7ad3d5..0d09383a280 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
@@ -71,11 +71,11 @@ public class JAXBType extends AbstractType{
     }
 
     public boolean isUnwrappable(){
-        return getJaxbMapping().getWrapperStyleDrilldown() != null;
+        return jaxbMapping != null && jaxbMapping.getWrapperStyleDrilldown() != null;
     }
 
     public boolean hasWrapperChildren(){
-        return (getWrapperChildren().size() > 0) ? true : false;
+        return wrapperChildren.size() > 0;
     }
 
     public boolean isLiteralType() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
index 9e2e1d0c7f9..9482d323de5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
@@ -210,6 +210,7 @@ public class WebServiceAP implements AnnotationProcessor, ModelBuilder, WebServi
     public void onError(String message) {
         if (messager != null) {
             messager.printError(message);
+            throw new AbortException();
         } else {
             throw new ModelerException(message);
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
index 9efa0064d4c..3809c712f4b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
@@ -441,10 +441,21 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
 
     protected boolean shouldProcessMethod(MethodDeclaration method, WebMethod webMethod) {
         builder.log("should process method: "+method.getSimpleName()+" hasWebMethods: "+ hasWebMethods+" ");
+        /*
+        Fix for https://jax-ws.dev.java.net/issues/show_bug.cgi?id=577
         if (hasWebMethods && webMethod == null) {
             builder.log("webMethod == null");
             return false;
         }
+        */
+        Collection<Modifier> modifiers = method.getModifiers();
+        boolean staticFinal = modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.FINAL);
+        if (staticFinal) {
+            if (webMethod != null) {
+                builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(method.getDeclaringType(), method));
+            }
+            return false;
+        }
         boolean retval = (endpointReferencesInterface ||
                 method.getDeclaringType().equals(typeDecl) ||
                 (method.getDeclaringType().getAnnotation(WebService.class) != null));
@@ -474,10 +485,6 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(classDecl.getQualifiedName()));
             return false;
         }
-        if (classDecl.getDeclaringType() != null && !modifiers.contains(Modifier.STATIC) && !isStateful) {
-            builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(classDecl.getQualifiedName()));
-            return false;
-        }
         boolean hasDefaultConstructor = false;
         for (ConstructorDeclaration constructor : classDecl.getConstructors()) {
             if (constructor.getModifiers().contains(Modifier.PUBLIC) &&
@@ -487,6 +494,11 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
             }
         }
         if (!hasDefaultConstructor && !isStateful) {
+            if (classDecl.getDeclaringType() != null && !modifiers.contains(Modifier.STATIC)) {
+                builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(classDecl.getQualifiedName()));
+                return false;
+            }
+
             builder.onError(classDecl.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(classDecl.getQualifiedName()));
             return false;
         }
@@ -578,7 +590,7 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         }
         ClassType superClass = classDecl.getSuperclass();
 
-        if (!superClass.getDeclaration().getQualifiedName().equals(JAVA_LANG_OBJECT) && superClass != null && !methodsAreLegal(superClass.getDeclaration())) {
+        if (!superClass.getDeclaration().getQualifiedName().equals(JAVA_LANG_OBJECT) && !methodsAreLegal(superClass.getDeclaration())) {
             return false;
         }
         return true;
@@ -596,11 +608,13 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
         if (!hasWebMethods && (webMethod !=null) && webMethod.exclude()) {
             return true;
         }
+        /*
+        This check is not needed as Impl class is already checked that it is not abstract.
         if (typeDecl instanceof ClassDeclaration && method.getModifiers().contains(Modifier.ABSTRACT)) {
             builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(typeDecl.getQualifiedName(), method.getSimpleName()));
             return false;
         }
-
+        */
         if (!isLegalType(method.getReturnType())) {
             builder.onError(method.getPosition(), WebserviceapMessages.localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(typeDecl.getQualifiedName(),
                 method.getSimpleName(),
@@ -750,7 +764,12 @@ public abstract class WebServiceVisitor extends SimpleDeclarationVisitor impleme
     protected boolean isLegalType(TypeMirror type) {
         if (!(type instanceof DeclaredType))
             return true;
-        return !builder.isRemote(((DeclaredType)type).getDeclaration());
+        TypeDeclaration typeDecl = ((DeclaredType)type).getDeclaration();
+        if(typeDecl == null) {
+            // can be null, if this type's declaration is unknown. This may be the result of a processing error, such as a missing class file.
+            builder.onError(WebserviceapMessages.WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(typeDecl.toString(), context.getRound()));
+        }
+        return !builder.isRemote(typeDecl);
     }
 
     protected ParameterDeclaration getOutParameter(MethodDeclaration method) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
index 5ffd4dd2d4c..17fb0729946 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
@@ -127,8 +127,10 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
         boolean beanGenerated = false;
         for (ReferenceType thrownType : method.getThrownTypes()) {
             ClassDeclaration typeDecl = ((ClassType)thrownType).getDeclaration();
-            if (typeDecl == null)
+            if (typeDecl == null){
                 builder.onError(WebserviceapMessages.WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(thrownType.toString(), context.getRound()));
+                return false;
+            }
             boolean tmp = generateExceptionBean(typeDecl, beanPackage);
             beanGenerated = beanGenerated || tmp;
         }
@@ -195,7 +197,7 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
                 if (resWrapper.targetNamespace().length() > 0)
                     resNamespace = resWrapper.targetNamespace();
             }
-            canOverwriteResponse = builder.canOverWriteClass(requestClassName);
+            canOverwriteResponse = builder.canOverWriteClass(responseClassName);
             if (!canOverwriteResponse) {
                 builder.log("Class " + responseClassName + " exists. Not overwriting.");
             }
@@ -593,7 +595,7 @@ public class WebServiceWrapperGenerator extends WebServiceVisitor {
             return;
 
         String accessorName =JAXBRIContext.mangleNameToPropertyName(paramName);
-        String getterPrefix = paramType.equals("boolean") || paramType.equals("java.lang.Boolean") ? "is" : "get";
+        String getterPrefix = paramType.toString().equals("boolean")? "is" : "get";
         JType propType = getType(paramType);
         JMethod m = cls.method(JMod.PUBLIC, propType, getterPrefix+ accessorName);
         JDocComment methodDoc = m.javadoc();
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
index a94a0e2ea0c..8ee0219f5ac 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
@@ -57,6 +57,8 @@ public class ConsoleErrorReporter extends ErrorReceiver {
         print(WscompileMessages.WSIMPORT_ERROR_MESSAGE(e.getMessage()), e);
     }
 
+
+
     public void fatalError(SAXParseException e) {
         if(debug)
             e.printStackTrace();
@@ -76,6 +78,11 @@ public class ConsoleErrorReporter extends ErrorReceiver {
         print(WscompileMessages.WSIMPORT_INFO_MESSAGE(e.getMessage()), e);
     }
 
+    public void debug(SAXParseException e){
+        print(WscompileMessages.WSIMPORT_DEBUG_MESSAGE(e.getMessage()), e);
+    }
+
+
     private void print(String message, SAXParseException e) {
         output.println(message);
         output.println(getLocationString(e));
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
index d095c7ef20b..958c24ccbba 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
@@ -28,6 +28,7 @@ import com.sun.tools.internal.ws.processor.generator.Names;
 import static com.sun.tools.internal.ws.processor.modeler.wsdl.WSDLModelerBase.getExtensionOfType;
 import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
 import com.sun.tools.internal.ws.wscompile.WsimportOptions;
+import com.sun.tools.internal.ws.wscompile.Options;
 import com.sun.tools.internal.ws.wsdl.document.*;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBinding;
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaKinds;
@@ -101,7 +102,7 @@ public class PseudoSchemaBuilder {
             is.setSystemId(sysId+(i + 1));
         }
         //add w3c EPR binding
-        if(!(options.noAddressingBbinding && options.isExtensionMode())){
+        if(!(options.noAddressingBbinding) && options.target.isLaterThan(Options.Target.V2_1)){
             InputSource is = new InputSource(new ByteArrayInputStream(w3ceprSchemaBinding.getBytes()));
             is.setSystemId(sysId+(++i +1));
             b.schemas.add(is);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
index 15ea18e597a..6bc17fa2547 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
@@ -74,7 +74,7 @@ import java.io.IOException;
 public class WSDLModeler extends WSDLModelerBase {
 
     //map of wsdl:operation QName to <soapenv:Body> child, as per BP it must be unique in a port
-    private final Map<QName, QName> uniqueBodyBlocks = new HashMap<QName, QName>();
+    private final Map<QName, Operation> uniqueBodyBlocks = new HashMap<QName, Operation>();
     private final QName VOID_BODYBLOCK = new QName("");
     private ClassNameCollector classNameCollector;
     private final String explicitDefaultPackage;
@@ -334,11 +334,12 @@ public class WSDLModeler extends WSDLModelerBase {
                         || (!soapBinding.getTransport().equals(
                         SOAPConstants.URI_SOAP_TRANSPORT_HTTP) && !soapBinding.getTransport().equals(
                         SOAP12Constants.URI_SOAP_TRANSPORT_HTTP)))) {
-                    warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(wsdlPort.getName()));
                     if (!options.isExtensionMode()) {
                         // cannot deal with non-HTTP ports
+                        warning(wsdlPort, ModelerMessages.WSDLMODELER_WARNING_IGNORING_SOAP_BINDING_NON_HTTP_TRANSPORT(wsdlPort.getName()));
                         return false;
                     }
+
                 }
 
                 /**
@@ -679,7 +680,12 @@ public class WSDLModeler extends WSDLModelerBase {
 
         if (soapStyle == SOAPStyle.RPC) {
             if (soapRequestBody.isEncoded()) {
-                error(soapRequestBody, ModelerMessages.WSDLMODELER_20_RPCENC_NOT_SUPPORTED());
+                if(options.isExtensionMode()){
+                    warning(soapRequestBody, ModelerMessages.WSDLMODELER_20_RPCENC_NOT_SUPPORTED());
+                    processNonSOAPOperation();
+                }else{
+                    error(soapRequestBody, ModelerMessages.WSDLMODELER_20_RPCENC_NOT_SUPPORTED());
+                }
             }
             return processLiteralSOAPOperation(StyleAndUse.RPC_LITERAL);
         }
@@ -815,18 +821,69 @@ public class WSDLModeler extends WSDLModelerBase {
         QName body = VOID_BODYBLOCK;
         QName opName = null;
 
+        Operation thatOp;
         if (bb.hasNext()) {
             body = bb.next().getName();
-            opName = uniqueBodyBlocks.get(body);
+            thatOp = uniqueBodyBlocks.get(body);
         } else {
             //there is no body block
             body = VOID_BODYBLOCK;
-            opName = uniqueBodyBlocks.get(VOID_BODYBLOCK);
+            thatOp = uniqueBodyBlocks.get(VOID_BODYBLOCK);
         }
-        if (opName != null) {
-            error(info.port, ModelerMessages.WSDLMODELER_NON_UNIQUE_BODY(info.port.getName(), info.operation.getName(), opName, body));
-        } else {
-            uniqueBodyBlocks.put(body, info.operation.getName());
+
+        if(thatOp != null){
+            if(options.isExtensionMode()){
+                warning(info.port, ModelerMessages.WSDLMODELER_NON_UNIQUE_BODY_WARNING(info.port.getName(), info.operation.getName(), thatOp.getName(), body));
+            }else{
+                error(info.port, ModelerMessages.WSDLMODELER_NON_UNIQUE_BODY_ERROR(info.port.getName(), info.operation.getName(), thatOp.getName(), body));
+            }
+        }else{
+            uniqueBodyBlocks.put(body, info.operation);
+        }
+
+        //Add additional headers
+        if (options.additionalHeaders) {
+            List<Parameter> additionalHeaders = new ArrayList<Parameter>();
+            if (inputMessage != null) {
+                for (MessagePart part : getAdditionHeaderParts(inputMessage, true)) {
+                    QName name = part.getDescriptor();
+                    JAXBType jaxbType = getJAXBType(part);
+                    Block block = new Block(name, jaxbType, part);
+                    Parameter param = ModelerUtils.createParameter(part.getName(), jaxbType, block);
+                    additionalHeaders.add(param);
+                    request.addHeaderBlock(block);
+                    request.addParameter(param);
+                    definitiveParameterList.add(param);
+                }
+            }
+
+            if (isRequestResponse && outputMessage != null) {
+                List<Parameter> outParams = new ArrayList<Parameter>();
+                for (MessagePart part : getAdditionHeaderParts(outputMessage, false)) {
+                    QName name = part.getDescriptor();
+                    JAXBType jaxbType = getJAXBType(part);
+                    Block block = new Block(name, jaxbType, part);
+                    Parameter param = ModelerUtils.createParameter(part.getName(), jaxbType, block);
+                    param.setMode(Mode.OUT);
+                    outParams.add(param);
+                    response.addHeaderBlock(block);
+                    response.addParameter(param);
+                }
+                for (Parameter outParam : outParams) {
+                    for (Parameter inParam : additionalHeaders) {
+                        if (inParam.getName().equals(outParam.getName()) &&
+                                inParam.getBlock().getName().equals(outParam.getBlock().getName())) {
+                            //it is INOUT
+                            inParam.setMode(Mode.INOUT);
+                            outParam.setMode(Mode.INOUT);
+                            break;
+                        }
+                    }
+                    if (outParam.isOUT()) {
+                        definitiveParameterList.add(outParam);
+                    }
+                }
+            }
         }
 
         // faults with duplicate names
@@ -848,6 +905,7 @@ public class WSDLModeler extends WSDLModelerBase {
         return info.operation;
     }
 
+
     private boolean validateParameterName(List<Parameter> params) {
         if (options.isExtensionMode())
             return true;
@@ -1460,6 +1518,19 @@ public class WSDLModeler extends WSDLModelerBase {
         return null;
     }
 
+    private List<MessagePart> getAdditionHeaderParts(Message message, boolean isInput){
+        List<MessagePart> headerParts = new ArrayList<MessagePart>();
+        List<MessagePart> parts = message.getParts();
+        List<MessagePart> headers = getHeaderParts(isInput);
+
+        for(MessagePart part: headers){
+            if(parts.contains(part))
+                continue;
+            headerParts.add(part);
+        }
+        return headerParts;
+    }
+
     private List<MessagePart> getHeaderPartsFromMessage(Message message, boolean isInput) {
         List<MessagePart> headerParts = new ArrayList<MessagePart>();
         Iterator<MessagePart> parts = message.parts();
@@ -1490,19 +1561,6 @@ public class WSDLModeler extends WSDLModelerBase {
         return null;
     }
 
-    private List<MessagePart> getHeaderPartsNotFromMessage(Message message, boolean isInput) {
-        List<MessagePart> headerParts = new ArrayList<MessagePart>();
-        List<MessagePart> parts = message.getParts();
-        Iterator<MessagePart> headers = getHeaderParts(isInput).iterator();
-        while (headers.hasNext()) {
-            MessagePart part = headers.next();
-            if (!parts.contains(part)) {
-                headerParts.add(part);
-            }
-        }
-        return headerParts;
-    }
-
     private List<MessagePart> getHeaderParts(boolean isInput) {
         TWSDLExtensible ext;
         if (isInput) {
@@ -2247,6 +2305,10 @@ public class WSDLModeler extends WSDLModelerBase {
                 (QName) port.getProperty(
                         ModelProperties.PROPERTY_WSDL_PORT_TYPE_NAME);
         PortType pt = (PortType) document.find(Kinds.PORT_TYPE, portTypeName);
+        //populate the portType map here. We should get rid of all these properties
+        // lets not do it as it may break NB
+        //TODO: clean all these stuff part of NB RFE
+        port.portTypes.put(portTypeName, pt);
         JAXWSBinding jaxwsCust = (JAXWSBinding) getExtensionOfType(pt, JAXWSBinding.class);
         if (jaxwsCust != null && jaxwsCust.getClassName() != null) {
             CustomName name = jaxwsCust.getClassName();
@@ -2271,7 +2333,7 @@ public class WSDLModeler extends WSDLModelerBase {
     private void createJavaMethodForAsyncOperation(Port port, Operation operation,
                                                    JavaInterface intf) {
         String candidateName = getJavaNameForOperation(operation);
-        JavaMethod method = new JavaMethod(candidateName, errReceiver);
+        JavaMethod method = new JavaMethod(candidateName, options, errReceiver);
         Request request = operation.getRequest();
         Iterator requestBodyBlocks = request.getBodyBlocks();
         Block requestBlock =
@@ -2338,7 +2400,7 @@ public class WSDLModeler extends WSDLModelerBase {
             return;
         }
         String candidateName = getJavaNameForOperation(operation);
-        JavaMethod method = new JavaMethod(candidateName, errReceiver);
+        JavaMethod method = new JavaMethod(candidateName, options, errReceiver);
         Request request = operation.getRequest();
         Parameter returnParam = (Parameter) operation.getProperty(WSDL_RESULT_PARAMETER);
         if (returnParam != null) {
@@ -2718,7 +2780,7 @@ public class WSDLModeler extends WSDLModelerBase {
 
     private void reportError(Entity entity,
         String formattedMsg, Exception nestedException ) {
-        Locator locator = (entity == null)?NULL_LOCATOR:entity.getLocator();
+        Locator locator = (entity == null)?null:entity.getLocator();
 
         SAXParseException e = new SAXParseException2( formattedMsg,
             locator,
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
index 89eab9108bb..cd087ed1487 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
@@ -288,23 +288,11 @@ public abstract class WSDLModelerBase implements Modeler {
     private boolean validateMimeContentPartNames(List<MIMEContent> mimeContents) {
         //validate mime:content(s) in the mime:part as per R2909
         for (MIMEContent mimeContent : mimeContents) {
-            String mimeContnetPart = null;
+            String mimeContnetPart;
+            mimeContnetPart = getMimeContentPartName(mimeContent);
             if(mimeContnetPart == null) {
-                mimeContnetPart = getMimeContentPartName(mimeContent);
-                if(mimeContnetPart == null) {
-                    warning(mimeContent, ModelerMessages.MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(info.operation.getName().getLocalPart()));
-                    return false;
-                }
-            }else {
-                String newMimeContnetPart = getMimeContentPartName(mimeContent);
-                if(newMimeContnetPart == null) {
-                    warning(mimeContent, ModelerMessages.MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(info.operation.getName().getLocalPart()));
-                    return false;
-                }else if(!newMimeContnetPart.equals(mimeContnetPart)) {
-                    //throw new ModelerException("mimemodeler.invalidMimeContent.differentPart");
-                    warning(mimeContent, ModelerMessages.MIMEMODELER_INVALID_MIME_CONTENT_DIFFERENT_PART());
-                    return false;
-                }
+                warning(mimeContent, ModelerMessages.MIMEMODELER_INVALID_MIME_CONTENT_MISSING_PART_ATTRIBUTE(info.operation.getName().getLocalPart()));
+                return false;
             }
         }
         return true;
@@ -386,6 +374,9 @@ public abstract class WSDLModelerBase implements Modeler {
     protected String getRequestNamespaceURI(SOAPBody body) {
         String namespaceURI = body.getNamespace();
         if (namespaceURI == null) {
+            if(options.isExtensionMode()){
+                return info.modelPort.getName().getNamespaceURI();
+            }
             // the WSDL document is invalid
             // at least, that's my interpretation of section 3.5 of the WSDL 1.1 spec!
             error(body, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_INPUT_SOAP_BODY_MISSING_NAMESPACE(info.bindingOperation.getName()));
@@ -396,6 +387,9 @@ public abstract class WSDLModelerBase implements Modeler {
     protected String getResponseNamespaceURI(SOAPBody body) {
         String namespaceURI = body.getNamespace();
         if (namespaceURI == null) {
+            if(options.isExtensionMode()){
+                return info.modelPort.getName().getNamespaceURI();
+            }
             // the WSDL document is invalid
             // at least, that's my interpretation of section 3.5 of the WSDL 1.1 spec!
             error(body, ModelerMessages.WSDLMODELER_INVALID_BINDING_OPERATION_OUTPUT_SOAP_BODY_MISSING_NAMESPACE(info.bindingOperation.getName()));
@@ -703,14 +697,14 @@ public abstract class WSDLModelerBase implements Modeler {
         if(numPasses > 1)
             return;
         if(entity == null)
-            errReceiver.warning(NULL_LOCATOR, message);
+            errReceiver.warning(null, message);
         else
             errReceiver.warning(entity.getLocator(), message);
     }
 
     protected void error(Entity entity, String message){
         if(entity == null)
-            errReceiver.error(NULL_LOCATOR, message);
+            errReceiver.error(null, message);
         else
             errReceiver.error(entity.getLocator(), message);
         throw new AbortException();
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
index 4708b06c43d..0d7b12b2d37 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
@@ -80,8 +80,10 @@ public class ClassNameCollector extends ExtendedModelVisitor
     protected void preVisit(Service service) throws Exception {
         registerClassName(
             ((JavaInterface)service.getJavaInterface()).getName());
-        registerClassName(
-            ((JavaInterface)service.getJavaInterface()).getImpl());
+        // We don't generate Impl classes, commenting it out.
+        // Otherwise, it would cause naming conflicts
+        //registerClassName(
+        //    ((JavaInterface)service.getJavaInterface()).getImpl());
     }
 
     protected void processPort11x(Port port){
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
index eb8fde08cb2..00af757f2ae 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java
@@ -38,6 +38,30 @@ public final class GeneratorMessages {
     private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.generator");
     private final static Localizer localizer = new Localizer();
 
+    public static Localizable localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+        return messageFactory.getMessage("generator.service.classAlreadyExist", arg0, arg1);
+    }
+
+    /**
+     * Could not generate Service, class: {0} already exists. Rename wsdl:Service "{1}" using JAX-WS customization
+     *
+     */
+    public static String GENERATOR_SERVICE_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+        return localizer.localize(localizableGENERATOR_SERVICE_CLASS_ALREADY_EXIST(arg0, arg1));
+    }
+
+    public static Localizable localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+        return messageFactory.getMessage("generator.sei.classAlreadyExist", arg0, arg1);
+    }
+
+    /**
+     * Could not generate SEI, class: {0} already exists. Rename wsdl:portType "{1}" using JAX-WS customization
+     *
+     */
+    public static String GENERATOR_SEI_CLASS_ALREADY_EXIST(Object arg0, Object arg1) {
+        return localizer.localize(localizableGENERATOR_SEI_CLASS_ALREADY_EXIST(arg0, arg1));
+    }
+
     public static Localizable localizableGENERATOR_NESTED_GENERATOR_ERROR(Object arg0) {
         return messageFactory.getMessage("generator.nestedGeneratorError", arg0);
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
index c8e2153530c..0bf91632a81 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java
@@ -255,18 +255,6 @@ public final class ModelMessages {
         return localizer.localize(localizableMODEL_SAXPARSER_EXCEPTION(arg0, arg1));
     }
 
-    public static Localizable localizable_002F_002F_JAXWS() {
-        return messageFactory.getMessage("//JAXWS");
-    }
-
-    /**
-     *  2.0
-     *
-     */
-    public static String _002F_002F_JAXWS() {
-        return localizer.localize(localizable_002F_002F_JAXWS());
-    }
-
     public static Localizable localizableMODEL_DUPLICATE_FAULTMESSAGE(Object arg0) {
         return messageFactory.getMessage("model.duplicate.faultmessage", arg0);
     }
@@ -536,7 +524,9 @@ public final class ModelMessages {
     }
 
     /**
-     * Failed to generate Java signature: duplicate parameter names {0}. Use JAXWS binding customization to rename the wsdl:part "{1}"
+     * Failed to generate Java signature: duplicate parameter name "{0}". Try one of these
+     *  1. Use JAXWS binding customization to rename the wsdl:part "{1}"
+     *  2. Run wsimport with -extension switch.
      *
      */
     public static String MODEL_PARAMETER_NOTUNIQUE(Object arg0, Object arg1) {
@@ -639,6 +629,21 @@ public final class ModelMessages {
         return localizer.localize(localizableMODEL_IMPORTER_INVALID_LITERAL(arg0));
     }
 
+    public static Localizable localizableMODEL_PARAMETER_NOTUNIQUE_WRAPPER(Object arg0, Object arg1) {
+        return messageFactory.getMessage("model.parameter.notunique.wrapper", arg0, arg1);
+    }
+
+    /**
+     * Failed to generate Java signature: duplicate parameter name "{0}". Try one of these
+     *  1. Use JAXWS binding customization to rename the wsdl:part "{1}"
+     *  2. Run wsimport with -extension switch.
+     *  3. This is wrapper style operation, to resolve parameter name conflict, you can also try disabling wrapper style by using <jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle> wsdl customization.
+     *
+     */
+    public static String MODEL_PARAMETER_NOTUNIQUE_WRAPPER(Object arg0, Object arg1) {
+        return localizer.localize(localizableMODEL_PARAMETER_NOTUNIQUE_WRAPPER(arg0, arg1));
+    }
+
     public static Localizable localizableMODEL_SCHEMA_NOT_IMPLEMENTED(Object arg0) {
         return messageFactory.getMessage("model.schema.notImplemented", arg0);
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
index 05c04868886..f5160b16359 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java
@@ -331,7 +331,7 @@ public final class ModelerMessages {
     }
 
     /**
-     * Schema descriptor {0} in message part "{1}" could not be bound to Java!
+     * Schema descriptor {0} in message part "{1}" is not defined and could not be bound to Java. Perhaps the schema descriptor {0} is not defined in the schema imported/included in the WSDL. You can either add such imports/includes or run wsimport and provide the schema location using -b switch.
      *
      */
     public static String WSDLMODELER_JAXB_JAVATYPE_NOTFOUND(Object arg0, Object arg1) {
@@ -590,6 +590,18 @@ public final class ModelerMessages {
         return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_OPERATION_CANNOT_HANDLE_BODY_PARTS_ATTRIBUTE(arg0));
     }
 
+    public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("wsdlmodeler.nonUnique.body.error", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signaure on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Try running wsimport with -extension switch, runtime will try to dispatch using SOAPAction
+     *
+     */
+    public static String WSDLMODELER_NON_UNIQUE_BODY_ERROR(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_ERROR(arg0, arg1, arg2, arg3));
+    }
+
     public static Localizable localizableWSDLMODELER_WARNING_IGNORING_SOAP_BINDING_MIXED_STYLE(Object arg0) {
         return messageFactory.getMessage("wsdlmodeler.warning.ignoringSOAPBinding.mixedStyle", arg0);
     }
@@ -818,18 +830,6 @@ public final class ModelerMessages {
         return localizer.localize(localizableWSDLMODELER_INVALID_BINDING_OPERATION_MULTIPLE_MATCHING_OPERATIONS(arg0, arg1));
     }
 
-    public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("wsdlmodeler.nonUnique.body", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * Non unique body parts! In a port, operations must have unique operation signaure on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}
-     *
-     */
-    public static String WSDLMODELER_NON_UNIQUE_BODY(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableWSDLMODELER_NON_UNIQUE_BODY(arg0, arg1, arg2, arg3));
-    }
-
     public static Localizable localizableWSDLMODELER_WARNING_IGNORING_HEADER_CANT_RESOLVE_MESSAGE(Object arg0, Object arg1) {
         return messageFactory.getMessage("wsdlmodeler.warning.ignoringHeader.cant.resolve.message", arg0, arg1);
     }
@@ -1238,6 +1238,18 @@ public final class ModelerMessages {
         return localizer.localize(localizableWSDLMODELER_WARNING_IGNORING_HEADER_FAULT_NOT_FOUND(arg0, arg1, arg2));
     }
 
+    public static Localizable localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("wsdlmodeler.nonUnique.body.warning", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signaure on the wire for successful dispatch. In port {0}, Operations "{1}" and "{2}" have the same request body block {3}. Method dispatching may fail, runtime will try to dispatch using SOAPAction
+     *
+     */
+    public static String WSDLMODELER_NON_UNIQUE_BODY_WARNING(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizableWSDLMODELER_NON_UNIQUE_BODY_WARNING(arg0, arg1, arg2, arg3));
+    }
+
     public static Localizable localizableWSDLMODELER_INVALID_OPERATION_JAVA_RESERVED_WORD_NOT_ALLOWED_WRAPPER_STYLE(Object arg0, Object arg1, Object arg2) {
         return messageFactory.getMessage("wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.wrapperStyle", arg0, arg1, arg2);
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
index 05b617f8d96..407a455f4d1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
@@ -38,52 +38,148 @@ public final class WebserviceapMessages {
     private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.tools.internal.ws.resources.webserviceap");
     private final static Localizer localizer = new Localizer();
 
-    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
-        return messageFactory.getMessage("webserviceap.rpc.literal.must.not.be.bare", arg0);
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.endpointinterfaces.do.not.match", arg0, arg1);
     }
 
     /**
-     * RPC literal SOAPBindings must have parameterStyle WRAPPPED. Class: {0}.
+     * The endpoint interface {0} does not match the interface {1}.
      *
      */
-    public static String WEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(arg0));
+    public static String WEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(arg0, arg1));
     }
 
-    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element.exclude", arg0, arg1, arg2);
+    public static Localizable localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.invalid.webmethod.element.with.exclude", arg0, arg1, arg2);
     }
 
     /**
-     * The @javax.jws.WebMethod({0}) cannot be used on a service endpoint interface. Class: {1} method: {2}
+     * The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class: {1} method: {2}
      *
      */
-    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(arg0, arg1, arg2));
+    public static String WEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.class.is.innerclass.not.static", arg0);
+    public static Localizable localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.sei.cannot.contain.constant.values", arg0, arg1);
     }
 
     /**
-     * Inner classes annotated with @javax.jws.WebService must be static. Class: {0}
+     * An service endpoint interface cannot contain constant declaration: Interface: {0} field: {1}.
      *
      */
-    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(arg0));
+    public static String WEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(arg0, arg1));
     }
 
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.webservice.method.is.abstract", arg0, arg1);
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.rpc.literal.parameters.must.have.webparam", arg0, arg1, arg2);
     }
 
     /**
-     * Classes annotated with @javax.jws.WebService must not have abstract methods. Class: {0} Method: {1}
+     * All rpc literal parameters must have a WebParam annotation.  Class: {0} method: {1} parameter {2}
      *
      */
-    public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(arg0, arg1));
+    public static String WEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.method.exception.bean.name.not.unique", arg0, arg1);
+    }
+
+    /**
+     * Exception bean names must be unique and must not clash with other generated classes.  Class: {0} exception {1}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.and.webserviceprovider", arg0);
+    }
+
+    /**
+     * Classes cannot be annotated with both @javax.jws.WebService and @javax.xml.ws.WebServiceProvider.  Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.no.default.constructor", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must have a public default constructor. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.doc.bare.no.out", arg0, arg1);
+    }
+
+    /**
+     * Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class: {0}, method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.failed.to.parse.handlerchain.file", arg0, arg1);
+    }
+
+    /**
+     * Failed to parse HandlerChain file. Class: {0}, file: {1}
+     *
+     */
+    public static String WEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("webserviceap.java.typeNotFound", arg0);
+    }
+
+    /**
+     * The type: {0} was not found in the mapping
+     *
+     */
+    public static String WEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.declare.exceptions", arg0, arg1, arg2);
+    }
+
+    /**
+     * The method {1} of class {0} is annotated @Oneway but declares the exception {2}
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.webservice.method.is.static.or.final", arg0, arg1);
+    }
+
+    /**
+     * Method annotated with @javax.jws.WebMethod must not be static or final. Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_STATIC_OR_FINAL(arg0, arg1));
     }
 
     public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_RETURN_TYPE(Object arg0, Object arg1) {
@@ -110,112 +206,16 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_WARNING(arg0));
     }
 
-    public static Localizable localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.rpc.soapbinding.not.allowed.on.method", arg0, arg1);
+    public static Localizable localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.method.response.wrapper.bean.name.not.unique", arg0, arg1);
     }
 
     /**
-     * SOAPBinding.Style.RPC binding annotations are not allowed on methods.  Class: {0} Method: {1}
+     * Response wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
      *
      */
-    public static String WEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.could.not.find.handlerchain", arg0, arg1);
-    }
-
-    /**
-     * Could not find the handlerchain {0} in the handler file {1}
-     *
-     */
-    public static String WEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
-        return messageFactory.getMessage("webserviceap.no.package.class.must.have.targetnamespace", arg0);
-    }
-
-    /**
-     * @javax.jws.Webservice annotated classes that do not belong to a package must have the @javax.jws.Webservice.targetNamespace element.  Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("webserviceap.class.not.found", arg0);
-    }
-
-    /**
-     * Class Not Found: {0}
-     *
-     */
-    public static String WEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.doc.bare.no.return.and.no.out", arg0, arg1);
-    }
-
-    /**
-     * Document literal bare methods that do not have a return value must have a single OUT/INOUT parameter.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.method.return.not.unique", arg0, arg1, arg2, arg3);
-    }
-
-    /**
-     * Document literal bare methods must have a unique result name return type combination.  Class {0} method: {1}, result name: {2} return type: {3}
-     *
-     */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(arg0, arg1, arg2, arg3));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.doc.bare.no.out", arg0, arg1);
-    }
-
-    /**
-     * Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class: {0}, method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOC_BARE_NO_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.rpc.literal.parameters.must.have.webparam", arg0, arg1, arg2);
-    }
-
-    /**
-     * All rpc literal parameters must have a WebParam annotation.  Class: {0} method: {1} parameter {2}
-     *
-     */
-    public static String WEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_PARAMETERS_MUST_HAVE_WEBPARAM(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS() {
-        return messageFactory.getMessage("webserviceap.model.already.exists");
-    }
-
-    /**
-     * model already exists
-     *
-     */
-    public static String WEBSERVICEAP_MODEL_ALREADY_EXISTS() {
-        return localizer.localize(localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS());
+    public static String WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
     }
 
     public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(Object arg0, Object arg1) {
@@ -230,402 +230,6 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_ON_INTERFACE(arg0, arg1));
     }
 
-    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.method.not.annotated", arg0, arg1);
-    }
-
-    /**
-     * The method {0} on class {1} is not annotated.
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.non.in.parameters.must.be.holder", arg0, arg1, arg2);
-    }
-
-    /**
-     * Class: {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder.
-     *
-     */
-    public static String WEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.failed.to.find.handlerchain.file", arg0, arg1);
-    }
-
-    /**
-     * Cannot find HandlerChain file. class: {0}, file: {1}
-     *
-     */
-    public static String WEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.operation.name.not.unique", arg0, arg1, arg2);
-    }
-
-    /**
-     * Operation names must be unique.  Class: {0} method: {1} operation name: {2}
-     *
-     */
-    public static String WEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.method.not.implemented", arg0, arg1, arg2);
-    }
-
-    /**
-     * Methods in an endpointInterface must be implemented in the implementation class.  Interface Class:{0} Implementation Class:{1} Method: {2}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.header.parameters.must.have.webparam.name", arg0, arg1, arg2);
-    }
-
-    /**
-     * All WebParam annotations on header parameters must specify a name.  Class: {0} method {1} paramter {2}
-     *
-     */
-    public static String WEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
-        return messageFactory.getMessage("webserviceap.invalid.handlerchain.file.nohandler-config", arg0);
-    }
-
-    /**
-     * The handlerchain file {0} is invalid, it does not contain a handler-config element
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.declare.exceptions", arg0, arg1, arg2);
-    }
-
-    /**
-     * The method {1} of class {0} is annotated @Oneway but declares the exception {2}
-     *
-     */
-    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_DECLARE_EXCEPTIONS(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.have.holders", arg0, arg1);
-    }
-
-    /**
-     * The method {1} of class {0} is annotated @Oneway but contains inout or out paramerters (javax.xml.ws.Holder)
-     *
-     */
-    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.oneway.and.not.one.in", arg0, arg1);
-    }
-
-    /**
-     * Document literal bare methods annotated with @javax.jws.Oneway must have one non-header IN parameter.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
-        return messageFactory.getMessage("webserviceap.rpc.encoded.not.supported", arg0);
-    }
-
-    /**
-     * The {0} class has a rpc/encoded SOAPBinding.  Rpc/encoded SOAPBindings are not supported in JAXWS 2.0.
-     *
-     */
-    public static String WEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("webserviceap.java.typeNotFound", arg0);
-    }
-
-    /**
-     * The type: {0} was not found in the mapping
-     *
-     */
-    public static String WEBSERVICEAP_JAVA_TYPE_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_JAVA_TYPE_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.invalid.sei.annotation", arg0, arg1);
-    }
-
-    /**
-     * The @{0} annotation cannot be used on a service endpoint interface. Class: {1}
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
-        return messageFactory.getMessage("webserviceap.no.webservice.endpoint.found");
-    }
-
-    /**
-     * A web service endpoint could not be found
-     *
-     */
-    public static String WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
-        return localizer.localize(localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.invalid.webmethod.element.with.exclude", arg0, arg1, arg2);
-    }
-
-    /**
-     * The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class: {1} method: {2}
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_WEBMETHOD_ELEMENT_WITH_EXCLUDE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.could.not.find.typedecl", arg0, arg1);
-    }
-
-    /**
-     * Could not get TypeDeclaration for: {0} in apt round: {1}
-     *
-     */
-    public static String WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.cannot.have.more.than.one.out", arg0, arg1);
-    }
-
-    /**
-     * Document literal bare methods must have a return value or one out parameter.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webservice.encoded.not.supported", arg0, arg1);
-    }
-
-    /**
-     * The {0} class has invalid SOAPBinding annotation. {1}/encoded SOAPBinding is not supported
-     *
-     */
-    public static String WEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.class.is.final", arg0);
-    }
-
-    /**
-     * Classes annotated with @javax.jws.WebService must not be final. Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.no.default.constructor", arg0);
-    }
-
-    /**
-     * Classes annotated with @javax.jws.WebService must have a public default constructor. Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_NO_DEFAULT_CONSTRUCTOR(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.sei.cannot.contain.constant.values", arg0, arg1);
-    }
-
-    /**
-     * An service endpoint interface cannot contain constant declaration: Interface: {0} field: {1}.
-     *
-     */
-    public static String WEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_SEI_CANNOT_CONTAIN_CONSTANT_VALUES(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("webserviceap.endpointinterface.class.not.found", arg0);
-    }
-
-    /**
-     * The endpointInterface class {0} could not be found
-     *
-     */
-    public static String WEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.only.one.in.parameter", arg0, arg1, arg2);
-    }
-
-    /**
-     * Document literal bare methods must have no more than 1 non-header in parameter. Class: {0} method: {1} number of non-header parameters: {2}
-     *
-     */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INFO(Object arg0) {
-        return messageFactory.getMessage("webserviceap.info", arg0);
-    }
-
-    /**
-     * info: {0}
-     *
-     */
-    public static String WEBSERVICEAP_INFO(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_INFO(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
-        return messageFactory.getMessage("webserviceap.handlerclass.notspecified", arg0);
-    }
-
-    /**
-     * A handler in the HandlerChain file: {0} does not specify a handler-class
-     *
-     */
-    public static String WEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element", arg0, arg1);
-    }
-
-    /**
-     * The @javax.jws.WebService.{0} element cannot be specified on a service endpoint interface. Class: {1}
-     *
-     */
-    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.method.not.unique", arg0, arg1, arg2);
-    }
-
-    /**
-     * Document literal bare methods must have unique parameter names.  Class: {0} method: {1} parameter name: {2}
-     *
-     */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.method.exception.bean.name.not.unique", arg0, arg1);
-    }
-
-    /**
-     * Exception bean names must be unique and must not clash with other generated classes.  Class: {0} exception {1}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_EXCEPTION_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.holder.parameters.must.not.be.in.only", arg0, arg1, arg2);
-    }
-
-    /**
-     * javax.xml.ws.Holder parameters must not be annotated with the WebParam.Mode.IN property.  Class: {0} method: {1} parameter: {2}
-     *
-     */
-    public static String WEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.doc.bare.and.no.one.in", arg0, arg1);
-    }
-
-    /**
-     * Document literal bare methods must have one non-header, IN/INOUT parameter.  Class: {0} Method: {1}
-     *
-     */
-    public static String WEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.rpc.literal.webparams.must.specify.name", arg0, arg1, arg2);
-    }
-
-    /**
-     * All rpc literal WebParams must specify a name.  Class: {0} method {1} paramter {2}
-     *
-     */
-    public static String WEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(arg0, arg1, arg2));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
-        return messageFactory.getMessage("webserviceap.endpointinterface.has.no.webservice.annotation", arg0);
-    }
-
-    /**
-     * The endpoint interface {0} must have a WebService annotation
-     *
-     */
-    public static String WEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
-        return messageFactory.getMessage("webserviceap.cannot.combine.handlerchain.soapmessagehandlers");
-    }
-
-    /**
-     * You cannot specify both HanlderChain and SOAPMessageHandlers annotations
-     *
-     */
-    public static String WEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
-        return localizer.localize(localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS());
-    }
-
     public static Localizable localizableWEBSERVICEAP_NESTED_MODEL_ERROR(Object arg0) {
         return messageFactory.getMessage("webserviceap.nestedModelError", arg0);
     }
@@ -638,54 +242,6 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_NESTED_MODEL_ERROR(arg0));
     }
 
-    public static Localizable localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.method.request.wrapper.bean.name.not.unique", arg0, arg1);
-    }
-
-    /**
-     * Request wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
-     *
-     */
-    public static String WEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.class.not.public", arg0);
-    }
-
-    /**
-     * Classes annotated with @javax.jws.WebService must be public. Class: {0}
-     *
-     */
-    public static String WEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
-        return messageFactory.getMessage("webserviceap.mixed.binding.style", arg0);
-    }
-
-    /**
-     * Class: {0} contains mixed bindings.  SOAPBinding.Style.RPC and SOAPBinding.Style.DOCUMENT cannot be mixed.
-     *
-     */
-    public static String WEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_MIXED_BINDING_STYLE(arg0));
-    }
-
-    public static Localizable localizableWEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
-        return messageFactory.getMessage("webserviceap.fileNotFound", arg0);
-    }
-
-    /**
-     * error: file not found: {0}
-     *
-     */
-    public static String WEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_FILE_NOT_FOUND(arg0));
-    }
-
     public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_OUT(Object arg0, Object arg1) {
         return messageFactory.getMessage("webserviceap.oneway.and.out", arg0, arg1);
     }
@@ -698,40 +254,40 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_ONEWAY_AND_OUT(arg0, arg1));
     }
 
-    public static Localizable localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.method.response.wrapper.bean.name.not.unique", arg0, arg1);
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.rpc.literal.webparams.must.specify.name", arg0, arg1, arg2);
     }
 
     /**
-     * Response wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
+     * All rpc literal WebParams must specify a name.  Class: {0} method {1} paramter {2}
      *
      */
-    public static String WEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_RESPONSE_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    public static String WEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_WEBPARAMS_MUST_SPECIFY_NAME(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableWEBSERVICEAP_COMPILATION_FAILED() {
-        return messageFactory.getMessage("webserviceap.compilationFailed");
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element.exclude", arg0, arg1, arg2);
     }
 
     /**
-     * compilation failed, errors should have been reported
+     * The @javax.jws.WebMethod({0}) cannot be used on a service endpoint interface. Class: {1} method: {2}
      *
      */
-    public static String WEBSERVICEAP_COMPILATION_FAILED() {
-        return localizer.localize(localizableWEBSERVICEAP_COMPILATION_FAILED());
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT_EXCLUDE(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.one.in.or.out", arg0, arg1);
+    public static Localizable localizableWEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("webserviceap.class.not.found", arg0);
     }
 
     /**
-     * Document literal bare methods must have at least one of: a return, an in parameter or an out parameter.  Class: {0} Method: {1}
+     * Class Not Found: {0}
      *
      */
-    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(arg0, arg1));
+    public static String WEBSERVICEAP_CLASS_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_CLASS_NOT_FOUND(arg0));
     }
 
     public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(Object arg0) {
@@ -746,16 +302,52 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ELEMENT(arg0));
     }
 
-    public static Localizable localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.doc.bare.return.and.out", arg0, arg1);
+    public static Localizable localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
+        return messageFactory.getMessage("webserviceap.cannot.combine.handlerchain.soapmessagehandlers");
     }
 
     /**
-     * Document/literal bare methods cannot have a return type and out parameters. Class: {0}, method: {1}
+     * You cannot specify both HanlderChain and SOAPMessageHandlers annotations
      *
      */
-    public static String WEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(arg0, arg1));
+    public static String WEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS() {
+        return localizer.localize(localizableWEBSERVICEAP_CANNOT_COMBINE_HANDLERCHAIN_SOAPMESSAGEHANDLERS());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.class.is.innerclass.not.static", arg0);
+    }
+
+    /**
+     * Inner classes annotated with @javax.jws.WebService must be static. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_INNERCLASS_NOT_STATIC(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.non.in.parameters.must.be.holder", arg0, arg1, arg2);
+    }
+
+    /**
+     * Class: {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder.
+     *
+     */
+    public static String WEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_NON_IN_PARAMETERS_MUST_BE_HOLDER(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.invalid.sei.annotation.element", arg0, arg1);
+    }
+
+    /**
+     * The @javax.jws.WebService.{0} element cannot be specified on a service endpoint interface. Class: {1}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION_ELEMENT(arg0, arg1));
     }
 
     public static Localizable localizableWEBSERVICEAP_SUCCEEDED() {
@@ -770,76 +362,88 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_SUCCEEDED());
     }
 
-    public static Localizable localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("webserviceap.document.bare.holder.parameters.must.not.be.inout", arg0, arg1, arg2);
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.doc.bare.and.no.one.in", arg0, arg1);
     }
 
     /**
-     * javax.xml.ws.Holder parameters in document bare operations must be WebParam.Mode.INOUT;  Class: {0} method: {1} parameter: {2}
+     * Document literal bare methods must have one non-header, IN/INOUT parameter.  Class: {0} Method: {1}
      *
      */
-    public static String WEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(arg0, arg1, arg2));
+    public static String WEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_AND_NO_ONE_IN(arg0, arg1));
     }
 
-    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
-        return messageFactory.getMessage("webserviceap.webservice.and.webserviceprovider", arg0);
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.webservice.method.is.abstract", arg0, arg1);
     }
 
     /**
-     * Classes cannot be annotated with both @javax.jws.WebService and @javax.xml.ws.WebServiceProvider.  Class: {0}
+     * Classes annotated with @javax.jws.WebService must not have abstract methods. Class: {0} Method: {1}
      *
      */
-    public static String WEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_AND_WEBSERVICEPROVIDER(arg0));
+    public static String WEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_METHOD_IS_ABSTRACT(arg0, arg1));
     }
 
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.endpointinterfaces.do.not.match", arg0, arg1);
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.method.return.not.unique", arg0, arg1, arg2, arg3);
     }
 
     /**
-     * The endpoint interface {0} does not match the interface {1}.
+     * Document literal bare methods must have a unique result name return type combination.  Class {0} method: {1}, result name: {2} return type: {3}
      *
      */
-    public static String WEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACES_DO_NOT_MATCH(arg0, arg1));
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_RETURN_NOT_UNIQUE(arg0, arg1, arg2, arg3));
     }
 
-    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
-        return messageFactory.getMessage("webserviceap.endpointinteface.plus.annotation", arg0);
+    public static Localizable localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
+        return messageFactory.getMessage("webserviceap.no.webservice.endpoint.found");
     }
 
     /**
-     * The @{0} annotation cannot be used in with @javax.jws.WebService.endpointInterface element.
+     * A web service endpoint could not be found
      *
      */
-    public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
-        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(arg0));
+    public static String WEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND() {
+        return localizer.localize(localizableWEBSERVICEAP_NO_WEBSERVICE_ENDPOINT_FOUND());
     }
 
-    public static Localizable localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return messageFactory.getMessage("webserviceap.failed.to.parse.handlerchain.file", arg0, arg1);
+    public static Localizable localizableWEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("webserviceap.fileNotFound", arg0);
     }
 
     /**
-     * Failed to parse HandlerChain file. Class: {0}, file: {1}
+     * error: file not found: {0}
      *
      */
-    public static String WEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
-        return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_PARSE_HANDLERCHAIN_FILE(arg0, arg1));
+    public static String WEBSERVICEAP_FILE_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_FILE_NOT_FOUND(arg0));
     }
 
-    public static Localizable localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return messageFactory.getMessage("webserviceap.method.parameter.types.cannot.implement.remote", arg0, arg1, arg2, arg3);
+    public static Localizable localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
+        return messageFactory.getMessage("webserviceap.invalid.handlerchain.file.nohandler-config", arg0);
     }
 
     /**
-     * Method parameter types cannot implement java.rmi.Remote.  Class: {0} method: {1} parameter: {2} type: {3}
+     * The handlerchain file {0} is invalid, it does not contain a handler-config element
      *
      */
-    public static String WEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
-        return localizer.localize(localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2, arg3));
+    public static String WEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_HANDLERCHAIN_FILE_NOHANDLER_CONFIG(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.header.parameters.must.have.webparam.name", arg0, arg1, arg2);
+    }
+
+    /**
+     * All WebParam annotations on header parameters must specify a name.  Class: {0} method {1} paramter {2}
+     *
+     */
+    public static String WEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_HEADER_PARAMETERS_MUST_HAVE_WEBPARAM_NAME(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2) {
@@ -854,6 +458,210 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_METHOD_RETURN_TYPE_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2));
     }
 
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
+        return messageFactory.getMessage("webserviceap.endpointinteface.plus.annotation", arg0);
+    }
+
+    /**
+     * The @{0} annotation cannot be used in with @javax.jws.WebService.endpointInterface element.
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTEFACE_PLUS_ANNOTATION(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.holder.parameters.must.not.be.in.only", arg0, arg1, arg2);
+    }
+
+    /**
+     * javax.xml.ws.Holder parameters must not be annotated with the WebParam.Mode.IN property.  Class: {0} method: {1} parameter: {2}
+     *
+     */
+    public static String WEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_HOLDER_PARAMETERS_MUST_NOT_BE_IN_ONLY(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.only.one.in.parameter", arg0, arg1, arg2);
+    }
+
+    /**
+     * Document literal bare methods must have no more than 1 non-header in parameter. Class: {0} method: {1} number of non-header parameters: {2}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONLY_ONE_IN_PARAMETER(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.doc.bare.return.and.out", arg0, arg1);
+    }
+
+    /**
+     * Document/literal bare methods cannot have a return type and out parameters. Class: {0}, method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_RETURN_AND_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("webserviceap.method.parameter.types.cannot.implement.remote", arg0, arg1, arg2, arg3);
+    }
+
+    /**
+     * Method parameter types cannot implement java.rmi.Remote.  Class: {0} method: {1} parameter: {2} type: {3}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_PARAMETER_TYPES_CANNOT_IMPLEMENT_REMOTE(arg0, arg1, arg2, arg3));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COMPILATION_FAILED() {
+        return messageFactory.getMessage("webserviceap.compilationFailed");
+    }
+
+    /**
+     * compilation failed, errors should have been reported
+     *
+     */
+    public static String WEBSERVICEAP_COMPILATION_FAILED() {
+        return localizer.localize(localizableWEBSERVICEAP_COMPILATION_FAILED());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS() {
+        return messageFactory.getMessage("webserviceap.model.already.exists");
+    }
+
+    /**
+     * model already exists
+     *
+     */
+    public static String WEBSERVICEAP_MODEL_ALREADY_EXISTS() {
+        return localizer.localize(localizableWEBSERVICEAP_MODEL_ALREADY_EXISTS());
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.could.not.find.typedecl", arg0, arg1);
+    }
+
+    /**
+     * Could not get TypeDeclaration for: {0} in apt round: {1}
+     *
+     */
+    public static String WEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_TYPEDECL(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.class.not.public", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must be public. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_NOT_PUBLIC(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.method.not.unique", arg0, arg1, arg2);
+    }
+
+    /**
+     * Document literal bare methods must have unique parameter names.  Class: {0} method: {1} parameter name: {2}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_METHOD_NOT_UNIQUE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.rpc.soapbinding.not.allowed.on.method", arg0, arg1);
+    }
+
+    /**
+     * SOAPBinding.Style.RPC binding annotations are not allowed on methods.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_SOAPBINDING_NOT_ALLOWED_ON_METHOD(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
+        return messageFactory.getMessage("webserviceap.no.package.class.must.have.targetnamespace", arg0);
+    }
+
+    /**
+     * @javax.jws.Webservice annotated classes that do not belong to a package must have the @javax.jws.Webservice.targetNamespace element.  Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_NO_PACKAGE_CLASS_MUST_HAVE_TARGETNAMESPACE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return messageFactory.getMessage("webserviceap.endpointinterface.has.no.webservice.annotation", arg0);
+    }
+
+    /**
+     * The endpoint interface {0} must have a WebService annotation
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_HAS_NO_WEBSERVICE_ANNOTATION(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INFO(Object arg0) {
+        return messageFactory.getMessage("webserviceap.info", arg0);
+    }
+
+    /**
+     * info: {0}
+     *
+     */
+    public static String WEBSERVICEAP_INFO(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_INFO(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
+        return messageFactory.getMessage("webserviceap.rpc.literal.must.not.be.bare", arg0);
+    }
+
+    /**
+     * RPC literal SOAPBindings must have parameterStyle WRAPPPED. Class: {0}.
+     *
+     */
+    public static String WEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_LITERAL_MUST_NOT_BE_BARE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.could.not.find.handlerchain", arg0, arg1);
+    }
+
+    /**
+     * Could not find the handlerchain {0} in the handler file {1}
+     *
+     */
+    public static String WEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_COULD_NOT_FIND_HANDLERCHAIN(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
+        return messageFactory.getMessage("webserviceap.rpc.encoded.not.supported", arg0);
+    }
+
+    /**
+     * The {0} class has a rpc/encoded SOAPBinding.  Rpc/encoded SOAPBindings are not supported in JAXWS 2.0.
+     *
+     */
+    public static String WEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_RPC_ENCODED_NOT_SUPPORTED(arg0));
+    }
+
     public static Localizable localizableWEBSERVICEAP_ERROR(Object arg0) {
         return messageFactory.getMessage("webserviceap.error", arg0);
     }
@@ -866,6 +674,78 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_ERROR(arg0));
     }
 
+    public static Localizable localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("webserviceap.endpointinterface.class.not.found", arg0);
+    }
+
+    /**
+     * The endpointInterface class {0} could not be found
+     *
+     */
+    public static String WEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_ENDPOINTINTERFACE_CLASS_NOT_FOUND(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.method.not.implemented", arg0, arg1, arg2);
+    }
+
+    /**
+     * Methods in an endpointInterface must be implemented in the implementation class.  Interface Class:{0} Implementation Class:{1} Method: {2}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_NOT_IMPLEMENTED(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_NOT_IMPLEMENTED(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webservice.encoded.not.supported", arg0, arg1);
+    }
+
+    /**
+     * The {0} class has invalid SOAPBinding annotation. {1}/encoded SOAPBinding is not supported
+     *
+     */
+    public static String WEBSERVICE_ENCODED_NOT_SUPPORTED(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICE_ENCODED_NOT_SUPPORTED(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
+        return messageFactory.getMessage("webserviceap.handlerclass.notspecified", arg0);
+    }
+
+    /**
+     * A handler in the HandlerChain file: {0} does not specify a handler-class
+     *
+     */
+    public static String WEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_HANDLERCLASS_NOTSPECIFIED(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.failed.to.find.handlerchain.file", arg0, arg1);
+    }
+
+    /**
+     * Cannot find HandlerChain file. class: {0}, file: {1}
+     *
+     */
+    public static String WEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_FAILED_TO_FIND_HANDLERCHAIN_FILE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.doc.bare.no.return.and.no.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods that do not have a return value must have a single OUT/INOUT parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOC_BARE_NO_RETURN_AND_NO_OUT(arg0, arg1));
+    }
+
     public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_ABSTRACT(Object arg0) {
         return messageFactory.getMessage("webserviceap.webservice.class.is.abstract", arg0);
     }
@@ -890,4 +770,136 @@ public final class WebserviceapMessages {
         return localizer.localize(localizableWEBSERVICEAP_INIT_PARAM_FORMAT_ERROR());
     }
 
+    public static Localizable localizableWEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
+        return messageFactory.getMessage("webserviceap.mixed.binding.style", arg0);
+    }
+
+    /**
+     * Class: {0} contains mixed bindings.  SOAPBinding.Style.RPC and SOAPBinding.Style.DOCUMENT cannot be mixed.
+     *
+     */
+    public static String WEBSERVICEAP_MIXED_BINDING_STYLE(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_MIXED_BINDING_STYLE(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.method.not.annotated", arg0, arg1);
+    }
+
+    /**
+     * The method {0} on class {1} is not annotated.
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_NOT_ANNOTATED(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_NOT_ANNOTATED(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.oneway.operation.cannot.have.holders", arg0, arg1);
+    }
+
+    /**
+     * The method {1} of class {0} is annotated @Oneway but contains inout or out paramerters (javax.xml.ws.Holder)
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_OPERATION_CANNOT_HAVE_HOLDERS(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.cannot.have.more.than.one.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods must have a return value or one out parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_CANNOT_HAVE_MORE_THAN_ONE_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.invalid.sei.annotation", arg0, arg1);
+    }
+
+    /**
+     * The @{0} annotation cannot be used on a service endpoint interface. Class: {1}
+     *
+     */
+    public static String WEBSERVICEAP_INVALID_SEI_ANNOTATION(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_INVALID_SEI_ANNOTATION(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.operation.name.not.unique", arg0, arg1, arg2);
+    }
+
+    /**
+     * Operation names must be unique.  Class: {0} method: {1} operation name: {2}
+     *
+     */
+    public static String WEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_OPERATION_NAME_NOT_UNIQUE(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
+        return messageFactory.getMessage("webserviceap.webservice.class.is.final", arg0);
+    }
+
+    /**
+     * Classes annotated with @javax.jws.WebService must not be final. Class: {0}
+     *
+     */
+    public static String WEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(Object arg0) {
+        return localizer.localize(localizableWEBSERVICEAP_WEBSERVICE_CLASS_IS_FINAL(arg0));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.document.literal.bare.must.have.one.in.or.out", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods must have at least one of: a return, an in parameter or an out parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_LITERAL_BARE_MUST_HAVE_ONE_IN_OR_OUT(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.method.request.wrapper.bean.name.not.unique", arg0, arg1);
+    }
+
+    /**
+     * Request wrapper bean names must be unique and must not clash with other generated classes.  Class: {0} method {1}
+     *
+     */
+    public static String WEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_METHOD_REQUEST_WRAPPER_BEAN_NAME_NOT_UNIQUE(arg0, arg1));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("webserviceap.document.bare.holder.parameters.must.not.be.inout", arg0, arg1, arg2);
+    }
+
+    /**
+     * javax.xml.ws.Holder parameters in document bare operations must be WebParam.Mode.INOUT;  Class: {0} method: {1} parameter: {2}
+     *
+     */
+    public static String WEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWEBSERVICEAP_DOCUMENT_BARE_HOLDER_PARAMETERS_MUST_NOT_BE_INOUT(arg0, arg1, arg2));
+    }
+
+    public static Localizable localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
+        return messageFactory.getMessage("webserviceap.oneway.and.not.one.in", arg0, arg1);
+    }
+
+    /**
+     * Document literal bare methods annotated with @javax.jws.Oneway must have one non-header IN parameter.  Class: {0} Method: {1}
+     *
+     */
+    public static String WEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(Object arg0, Object arg1) {
+        return localizer.localize(localizableWEBSERVICEAP_ONEWAY_AND_NOT_ONE_IN(arg0, arg1));
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
index e1fe69120cb..e30b9616918 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java
@@ -62,6 +62,30 @@ public final class WscompileMessages {
         return localizer.localize(localizableWSGEN_CLASS_NOT_FOUND(arg0));
     }
 
+    public static Localizable localizableWSIMPORT_HTTP_REDIRECT(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsimport.httpRedirect", arg0, arg1);
+    }
+
+    /**
+     * Server returned HTTP Status code: "{0}", retrying with "{1}"
+     *
+     */
+    public static String WSIMPORT_HTTP_REDIRECT(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSIMPORT_HTTP_REDIRECT(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_AUTH_INFO_NEEDED(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsimport.authInfoNeeded", arg0, arg1, arg2);
+    }
+
+    /**
+     * {0},  "{1}" needs authorization, please provide authorization file with read access at {2} or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port//<url-path>
+     *
+     */
+    public static String WSIMPORT_AUTH_INFO_NEEDED(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSIMPORT_AUTH_INFO_NEEDED(arg0, arg1, arg2));
+    }
+
     public static Localizable localizableWSGEN_USAGE_EXAMPLES() {
         return messageFactory.getMessage("wsgen.usage.examples");
     }
@@ -142,6 +166,27 @@ public final class WscompileMessages {
         return localizer.localize(localizableWSIMPORT_MISSING_FILE());
     }
 
+    public static Localizable localizableWSIMPORT_USAGE_EXTENSIONS() {
+        return messageFactory.getMessage("wsimport.usage.extensions");
+    }
+
+    /**
+     *
+     * Extensions:
+     *   -XadditionalHeaders         map headers not bound to request or response message to
+     *                               Java method parameters
+     *   -Xauthfile                  file to carry authorization information in the format
+     *                               http://username:password@example.org/stock?wsdl
+     *   -Xdebug                     print debug information
+     *   -Xno-addressing-databinding enable binding of W3C EndpointReferenceType to Java
+     *   -Xnocompile                 do not compile generated Java files
+     *
+     *
+     */
+    public static String WSIMPORT_USAGE_EXTENSIONS() {
+        return localizer.localize(localizableWSIMPORT_USAGE_EXTENSIONS());
+    }
+
     public static Localizable localizableWSIMPORT_USAGE(Object arg0) {
         return messageFactory.getMessage("wsimport.usage", arg0);
     }
@@ -221,8 +266,8 @@ public final class WscompileMessages {
      *   -p <pkg>                  specifies the target package
      *   -quiet                    suppress wsimport output
      *   -s <directory>            specify where to place generated source files
-     *   -target <version>         generate code as per the given JAXWS specification version.
-     *                             version 2.0 will generate compliant code for JAXWS 2.0 spec.
+     *   -target <version>         generate code as per the given JAXWS spec version
+     *                             e.g. 2.0 will generate compliant code for JAXWS 2.0 spec
      *   -verbose                  output messages about what the compiler is doing
      *   -version                  print version information
      *   -wsdllocation <location>  @WebServiceClient.wsdlLocation value
@@ -245,6 +290,44 @@ public final class WscompileMessages {
         return localizer.localize(localizableWSCOMPILE_ERROR(arg0));
     }
 
+    public static Localizable localizableWSGEN_PROTOCOL_WITHOUT_EXTENSION(Object arg0) {
+        return messageFactory.getMessage("wsgen.protocol.without.extension", arg0);
+    }
+
+    /**
+     * The optional protocol "{0}" must be used in conjunction with the "-extension" option.
+     *
+     */
+    public static String WSGEN_PROTOCOL_WITHOUT_EXTENSION(Object arg0) {
+        return localizer.localize(localizableWSGEN_PROTOCOL_WITHOUT_EXTENSION(arg0));
+    }
+
+    public static Localizable localizableWSIMPORT_COMPILING_CODE() {
+        return messageFactory.getMessage("wsimport.CompilingCode");
+    }
+
+    /**
+     *
+     * compiling code...
+     *
+     *
+     */
+    public static String WSIMPORT_COMPILING_CODE() {
+        return localizer.localize(localizableWSIMPORT_COMPILING_CODE());
+    }
+
+    public static Localizable localizableWSIMPORT_READING_AUTH_FILE(Object arg0) {
+        return messageFactory.getMessage("wsimport.readingAuthFile", arg0);
+    }
+
+    /**
+     * Trying to read authorization file : "{0}"...
+     *
+     */
+    public static String WSIMPORT_READING_AUTH_FILE(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_READING_AUTH_FILE(arg0));
+    }
+
     public static Localizable localizableWSGEN_NO_WEBSERVICES_CLASS(Object arg0) {
         return messageFactory.getMessage("wsgen.no.webservices.class", arg0);
     }
@@ -281,6 +364,18 @@ public final class WscompileMessages {
         return localizer.localize(localizableWSCOMPILE_INFO(arg0));
     }
 
+    public static Localizable localizableWSIMPORT_MAX_REDIRECT_ATTEMPT() {
+        return messageFactory.getMessage("wsimport.maxRedirectAttempt");
+    }
+
+    /**
+     * Can not get a WSDL maximum number of redirects(5) reached
+     *
+     */
+    public static String WSIMPORT_MAX_REDIRECT_ATTEMPT() {
+        return localizer.localize(localizableWSIMPORT_MAX_REDIRECT_ATTEMPT());
+    }
+
     public static Localizable localizableWSIMPORT_WARNING_MESSAGE(Object arg0) {
         return messageFactory.getMessage("wsimport.WarningMessage", arg0);
     }
@@ -324,6 +419,7 @@ public final class WscompileMessages {
     /**
      * generating code...
      *
+     *
      */
     public static String WSIMPORT_GENERATING_CODE() {
         return localizer.localize(localizableWSIMPORT_GENERATING_CODE());
@@ -389,6 +485,30 @@ public final class WscompileMessages {
         return localizer.localize(localizableWSIMPORT_NO_SUCH_JAXB_OPTION(arg0));
     }
 
+    public static Localizable localizableWSIMPORT_AUTH_FILE_NOT_FOUND(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsimport.authFileNotFound", arg0, arg1);
+    }
+
+    /**
+     * Authorization file "{0}" not found. If the WSDL access needs Basic Authentication, please provide authorization file with read access at {1} or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port//<url-path>
+     *
+     */
+    public static String WSIMPORT_AUTH_FILE_NOT_FOUND(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSIMPORT_AUTH_FILE_NOT_FOUND(arg0, arg1));
+    }
+
+    public static Localizable localizableWSIMPORT_DEBUG_MESSAGE(Object arg0) {
+        return messageFactory.getMessage("wsimport.DebugMessage", arg0);
+    }
+
+    /**
+     * [DEBUG] {0}
+     *
+     */
+    public static String WSIMPORT_DEBUG_MESSAGE(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_DEBUG_MESSAGE(arg0));
+    }
+
     public static Localizable localizableWSGEN_COULD_NOT_CREATE_FILE(Object arg0) {
         return messageFactory.getMessage("wsgen.could.not.create.file", arg0);
     }
@@ -413,8 +533,8 @@ public final class WscompileMessages {
         return localizer.localize(localizableWSGEN_WSDL_ARG_NO_GENWSDL(arg0));
     }
 
-    public static Localizable localizableWSGEN_HELP(Object arg0) {
-        return messageFactory.getMessage("wsgen.help", arg0);
+    public static Localizable localizableWSGEN_HELP(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("wsgen.help", arg0, arg1, arg2);
     }
 
     /**
@@ -436,18 +556,20 @@ public final class WscompileMessages {
      *   -s <directory>             specify where to place generated source files
      *   -verbose                   output messages about what the compiler is doing
      *   -version                   print version information
-     *   -wsdl[:protocol]           generate a WSDL file.  The protocol is optional.
-     *                              Valid protocols are soap1.1 and Xsoap1.2, the default
-     *                              is soap1.1.  Xsoap1.2 is not standard and can only be
-     *                              used in conjunction with the -extension option
+     *   -wsdl[:protocol]           generate a WSDL file. The protocol is optional.
+     *                              Valid protocols are {1},
+     *                              the default is soap1.1.
+     *                              The non stanadard protocols {2}
+     *                              can only be used in conjunction with the
+     *                              -extension option.
      *   -servicename <name>        specify the Service name to use in the generated WSDL
      *                              Used in conjunction with the -wsdl option.
      *   -portname <name>           specify the Port name to use in the generated WSDL
      *                              Used in conjunction with the -wsdl option.
      *
      */
-    public static String WSGEN_HELP(Object arg0) {
-        return localizer.localize(localizableWSGEN_HELP(arg0));
+    public static String WSGEN_HELP(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableWSGEN_HELP(arg0, arg1, arg2));
     }
 
     public static Localizable localizableWSIMPORT_INFO_MESSAGE(Object arg0) {
@@ -474,6 +596,18 @@ public final class WscompileMessages {
         return localizer.localize(localizableWSGEN_SOAP_12_WITHOUT_EXTENSION());
     }
 
+    public static Localizable localizableWSIMPORT_ILLEGAL_AUTH_INFO(Object arg0) {
+        return messageFactory.getMessage("wsimport.ILLEGAL_AUTH_INFO", arg0);
+    }
+
+    /**
+     * "{0}" is not a valid authorization information format. The format is http[s]://user:password@host:port//<url-path>.
+     *
+     */
+    public static String WSIMPORT_ILLEGAL_AUTH_INFO(Object arg0) {
+        return localizer.localize(localizableWSIMPORT_ILLEGAL_AUTH_INFO(arg0));
+    }
+
     public static Localizable localizableWSCOMPILE_COMPILATION_FAILED() {
         return messageFactory.getMessage("wscompile.compilationFailed");
     }
@@ -546,6 +680,18 @@ public final class WscompileMessages {
         return localizer.localize(localizableWSIMPORT_NO_WSDL(arg0));
     }
 
+    public static Localizable localizableWSIMPORT_AUTH_INFO_LINENO(Object arg0, Object arg1) {
+        return messageFactory.getMessage("wsimport.AUTH_INFO_LINENO", arg0, arg1);
+    }
+
+    /**
+     * "line {0} of {1}
+     *
+     */
+    public static String WSIMPORT_AUTH_INFO_LINENO(Object arg0, Object arg1) {
+        return localizer.localize(localizableWSIMPORT_AUTH_INFO_LINENO(arg0, arg1));
+    }
+
     public static Localizable localizableWSGEN_USAGE(Object arg0) {
         return messageFactory.getMessage("wsgen.usage", arg0);
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
index d334908a2fe..11771f1a018 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java
@@ -55,37 +55,39 @@ public final class WsdlMessages {
     }
 
     /**
-     * wsdl:binding "{0}" referenced by wsdl:port "{1}", but its not found in the wsdl
+     * wsdl:binding "{0}" referenced by wsdl:port "{1}", but it's not found in the wsdl
      *
      */
     public static String ENTITY_NOT_FOUND_BINDING(Object arg0, Object arg1) {
         return localizer.localize(localizableENTITY_NOT_FOUND_BINDING(arg0, arg1));
     }
 
+    public static Localizable localizablePARSING_UNABLE_TO_GET_METADATA(Object arg0, Object arg1) {
+        return messageFactory.getMessage("parsing.unableToGetMetadata", arg0, arg1);
+    }
+
+    /**
+     * {0}
+     *
+     * {1}
+     *
+     */
+    public static String PARSING_UNABLE_TO_GET_METADATA(Object arg0, Object arg1) {
+        return localizer.localize(localizablePARSING_UNABLE_TO_GET_METADATA(arg0, arg1));
+    }
+
     public static Localizable localizablePARSING_PARSE_FAILED() {
         return messageFactory.getMessage("Parsing.ParseFailed");
     }
 
     /**
-     * Failed to parse the WSDL.
+     *  Failed to parse the WSDL.
      *
      */
     public static String PARSING_PARSE_FAILED() {
         return localizer.localize(localizablePARSING_PARSE_FAILED());
     }
 
-    public static Localizable localizablePARSING_UNABLE_TO_GET_METADATA(Object arg0) {
-        return messageFactory.getMessage("parsing.unableToGetMetadata", arg0);
-    }
-
-    /**
-     * Unable to get Metadata from: {0}
-     *
-     */
-    public static String PARSING_UNABLE_TO_GET_METADATA(Object arg0) {
-        return localizer.localize(localizablePARSING_UNABLE_TO_GET_METADATA(arg0));
-    }
-
     public static Localizable localizableVALIDATION_INVALID_PREFIX(Object arg0) {
         return messageFactory.getMessage("validation.invalidPrefix", arg0);
     }
@@ -151,7 +153,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * wsdl:portType "{0}" referenced by wsdl:binding "{1}", but its not found in the wsdl
+     * wsdl:portType "{0}" referenced by wsdl:binding "{1}", but it's not found in the wsdl
      *
      */
     public static String ENTITY_NOT_FOUND_PORT_TYPE(Object arg0, Object arg1) {
@@ -199,7 +201,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * Both jaxws:version and version are present
+     *  Both jaxws:version and version are present
      *
      */
     public static String INTERNALIZER_TWO_VERSION_ATTRIBUTES() {
@@ -212,7 +214,7 @@ public final class WsdlMessages {
 
     /**
      * Invalid WSDL, duplicate parts in a wsdl:message is not allowed.
-     * wsdl:message {0} has duplicated part name: "{1}"
+     * wsdl:message {0} has a duplicated part name: "{1}"
      *
      */
     public static String VALIDATION_DUPLICATE_PART_NAME(Object arg0, Object arg1) {
@@ -248,7 +250,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * found unexpected non whitespace text: "{0}"
+     * found unexpected non-whitespace text: "{0}"
      *
      */
     public static String PARSING_NON_WHITESPACE_TEXT_FOUND(Object arg0) {
@@ -260,7 +262,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * No target found for the wsdlLocation: {0}
+     *  No target found for the wsdlLocation: {0}
      *
      */
     public static String INTERNALIZER_TARGET_NOT_FOUND(Object arg0) {
@@ -344,7 +346,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * JAXWS version attribute must be "2.0"
+     *  JAXWS version attribute must be "2.0"
      *
      */
     public static String INTERNALIZER_INCORRECT_VERSION() {
@@ -399,6 +401,20 @@ public final class WsdlMessages {
         return localizer.localize(localizablePARSING_INCORRECT_ROOT_ELEMENT(arg0, arg1, arg2, arg3));
     }
 
+    public static Localizable localizableTRY_WITH_MEX(Object arg0) {
+        return messageFactory.getMessage("try.with.mex", arg0);
+    }
+
+    /**
+     * {0}
+     *
+     * retrying with MEX...
+     *
+     */
+    public static String TRY_WITH_MEX(Object arg0) {
+        return localizer.localize(localizableTRY_WITH_MEX(arg0));
+    }
+
     public static Localizable localizableVALIDATION_MISSING_REQUIRED_ATTRIBUTE(Object arg0, Object arg1) {
         return messageFactory.getMessage("validation.missingRequiredAttribute", arg0, arg1);
     }
@@ -440,7 +456,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxws'}'bindings but it is '{'{0}'}'{1}
+     *  not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxws'}'bindings but it is '{'{0}'}'{1}
      *
      */
     public static String PARSER_NOT_A_BINDING_FILE(Object arg0, Object arg1) {
@@ -548,7 +564,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * Unable to parse "{0}" : {1}
+     *  Unable to parse "{0}" : {1}
      *
      */
     public static String ABSTRACT_REFERENCE_FINDER_IMPL_UNABLE_TO_PARSE(Object arg0, Object arg1) {
@@ -596,7 +612,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * XPath evaluation of "{0}" results in empty target node
+     * XPath evaluation of "{0}" results in an empty target node
      *
      */
     public static String INTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(Object arg0) {
@@ -620,7 +636,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * Ignoring customization: "{0}", it has no namespace. It must belong to the customization namespace.
+     * Ignoring customization: "{0}", because it has no namespace. It must belong to the customization namespace.
      *
      */
     public static String INVALID_CUSTOMIZATION_NAMESPACE(Object arg0) {
@@ -687,28 +703,28 @@ public final class WsdlMessages {
         return localizer.localize(localizableVALIDATION_INCORRECT_TARGET_NAMESPACE(arg0, arg1));
     }
 
-    public static Localizable localizableENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1) {
-        return messageFactory.getMessage("entity.notFoundByQName", arg0, arg1);
+    public static Localizable localizableENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("entity.notFoundByQName", arg0, arg1, arg2);
     }
 
     /**
-     * invalid entity name: "{0}" (in namespace: "{1}")
+     * {0} "{1}" not found in the wsdl: {2}
      *
      */
-    public static String ENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1) {
-        return localizer.localize(localizableENTITY_NOT_FOUND_BY_Q_NAME(arg0, arg1));
+    public static String ENTITY_NOT_FOUND_BY_Q_NAME(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableENTITY_NOT_FOUND_BY_Q_NAME(arg0, arg1, arg2));
     }
 
-    public static Localizable localizableINVALID_WSDL(Object arg0) {
-        return messageFactory.getMessage("invalid.wsdl", arg0);
+    public static Localizable localizableINVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return messageFactory.getMessage("invalid.wsdl", arg0, arg1, arg2, arg3);
     }
 
     /**
-     * "{0} does not look like a WSDL document, retrying with MEX..."
+     * Invalid WSDL {0}, expected {1} found {2} at (line {3})
      *
      */
-    public static String INVALID_WSDL(Object arg0) {
-        return localizer.localize(localizableINVALID_WSDL(arg0));
+    public static String INVALID_WSDL(Object arg0, Object arg1, Object arg2, Object arg3) {
+        return localizer.localize(localizableINVALID_WSDL(arg0, arg1, arg2, arg3));
     }
 
     public static Localizable localizableVALIDATION_UNSUPPORTED_SCHEMA_FEATURE(Object arg0) {
@@ -788,7 +804,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * Target node is not an element
+     *  Target node is not an element
      *
      */
     public static String INTERNALIZER_TARGET_NOT_AN_ELEMENT() {
@@ -860,7 +876,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * Not a WSI-BP compliant WSDL (R2001, R2004). xsd:import must not import XML Schema definition emmbedded inline within WSDLDocument.
+     * Not a WSI-BP compliant WSDL (R2001, R2004). xsd:import must not import XML Schema definitions embedded inline within the WSDL document.
      *
      */
     public static String WARNING_WSI_R_2004() {
@@ -872,7 +888,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * Not a WSI-BP compliant WSDL (R2003). xsd:import must only be used inside xsd:schema element.
+     * Not a WSI-BP compliant WSDL (R2003). xsd:import must only be used inside xsd:schema elements.
      *
      */
     public static String WARNING_WSI_R_2003() {
@@ -884,7 +900,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * Not a WSI-BP compliant WSDL (R2002). wsdl:import must not be used to import XML Schema embedded in the WSDL document. Expected wsdl namesapce: {0}, found: {1}
+     * Not a WSI-BP compliant WSDL (R2002). wsdl:import must not be used to import XML Schema embedded in the WSDL document. Expected wsdl namespace: {0}, found: {1}
      *
      */
     public static String WARNING_WSI_R_2002(Object arg0, Object arg1) {
@@ -903,16 +919,28 @@ public final class WsdlMessages {
         return localizer.localize(localizablePARSING_ELEMENT_OR_TYPE_REQUIRED(arg0));
     }
 
-    public static Localizable localizableWARNING_WSI_R_2001(Object arg0) {
-        return messageFactory.getMessage("warning.wsi.r2001", arg0);
+    public static Localizable localizableWARNING_WSI_R_2001() {
+        return messageFactory.getMessage("warning.wsi.r2001");
     }
 
     /**
-     * Not a WSI-BP compliant WSDL (R2001, R2002). wsdl:import must only import WSDL document. Its trying to import: "{0}"
+     * Not a WSI-BP compliant WSDL (R2001, R2002). wsdl:import must import only WSDL documents. It's trying to import: "{0}"
      *
      */
-    public static String WARNING_WSI_R_2001(Object arg0) {
-        return localizer.localize(localizableWARNING_WSI_R_2001(arg0));
+    public static String WARNING_WSI_R_2001() {
+        return localizer.localize(localizableWARNING_WSI_R_2001());
+    }
+
+    public static Localizable localizableFILE_NOT_FOUND(Object arg0) {
+        return messageFactory.getMessage("file.not.found", arg0);
+    }
+
+    /**
+     * {0} is unreachable
+     *
+     */
+    public static String FILE_NOT_FOUND(Object arg0) {
+        return localizer.localize(localizableFILE_NOT_FOUND(arg0));
     }
 
     public static Localizable localizableVALIDATION_INVALID_SIMPLE_TYPE_IN_ELEMENT(Object arg0, Object arg1) {
@@ -944,13 +972,27 @@ public final class WsdlMessages {
     }
 
     /**
-     * JAXWS version attribute must be present
+     *  JAXWS version attribute must be present
      *
      */
     public static String INTERNALIZER_VERSION_NOT_PRESENT() {
         return localizer.localize(localizableINTERNALIZER_VERSION_NOT_PRESENT());
     }
 
+    public static Localizable localizableFAILED_NOSERVICE(Object arg0) {
+        return messageFactory.getMessage("failed.noservice", arg0);
+    }
+
+    /**
+     * failed.noservice=Could not find wsdl:service in the provided WSDL(s):
+     *
+     * {0} At least one WSDL with at least one service definition needs to be provided.
+     *
+     */
+    public static String FAILED_NOSERVICE(Object arg0) {
+        return localizer.localize(localizableFAILED_NOSERVICE(arg0));
+    }
+
     public static Localizable localizablePARSING_TOO_MANY_ELEMENTS(Object arg0, Object arg1, Object arg2) {
         return messageFactory.getMessage("parsing.tooManyElements", arg0, arg1, arg2);
     }
@@ -968,7 +1010,7 @@ public final class WsdlMessages {
     }
 
     /**
-     * "{0}" is not a part of this compilation. Is this a mistake for "{1}"?
+     *  "{0}" is not a part of this compilation. Is this a mistake for "{1}"?
      *
      */
     public static String INTERNALIZER_INCORRECT_SCHEMA_REFERENCE(Object arg0, Object arg1) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties
index 56adeb3f9fa..2a476ee4b0c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties
@@ -25,4 +25,3 @@
 
 configuration.invalidElement=invalid element \"{2}\" in file \"{0}\" (line {1})
 configuration.notBindingFile=Ignoring: binding file "\"{0}\". It is not a jaxws or a jaxb binding file.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties
index 35e5ee4b38c..3d82a4556f0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties
@@ -32,4 +32,5 @@ generator.internal.error.should.not.happen=internal error (should not happen): {
 
 #IndentingWriter
 generator.indentingwriter.charset.cantencode=WSDL has some characters which native java encoder can''t encode: \"{0}\"
- 
+generator.sei.classAlreadyExist=Could not generate SEI, class: {0} already exists. Rename wsdl:portType \"{1}\" using JAX-WS customization
+generator.service.classAlreadyExist=Could not generate Service, class: {0} already exists. Rename wsdl:Service \"{1}\" using JAX-WS customization
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties
index 604da5f327f..2d7cc5461e7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties
@@ -29,4 +29,3 @@
 javacompiler.classpath.error={0} is not available in the classpath, requires Sun's JDK version 5.0 or latter.
 javacompiler.nosuchmethod.error=There is no such method {0} available, requires Sun's JDK version 5.0 or latter.
 javacompiler.error=error : {0}.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/model.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/model.properties
index 17076cf822c..1ed355769af 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/model.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/model.properties
@@ -58,7 +58,6 @@ model.schema.invalidWildcard.allCompositor=xsd:all compositor not supported for
 
 model.uniqueness=uniqueness constraint violation
 model.part.notUnique=parts in wsdl:message \"{0}\", reference \"{1}\", they must reference unique global elements.
-model.parameter.notunique=Failed to generate Java signature: duplicate parameter names {0}. Use JAXWS binding customization to rename the wsdl:part \"{1}\"
 model.exception.notunique=Failed to generate Java signature: duplicate exception names {0}. Use JAXWS binding customization to rename the wsdl:part \"{1}\"
 model.uniqueness.javastructuretype=uniqueness constraint violation, duplicate member \"{0}\" added to JavaStructureType \"{1}\"
 model.parent.type.already.set=parent of type \"{0}\" already set to \"{1}\", new value = \"{2}\"
@@ -78,15 +77,16 @@ model.arraywrapper.no.parent=LiteralArrayWrapper cannot have a parent type
 model.arraywrapper.no.subtypes=LiteralArrayWrapper cannot have subtypes
 model.arraywrapper.no.content.member=LiteralArrayWrapper cannot have a content member
 model.complexType.simpleContent.reservedName=invalid attribute name: "_value" in complexType: \"{0}\", _value is JAXWS reserved name, this name is generated in the generated javabean class to hold content value in the generated javabean class for complexType/simpleContent.
+model.parameter.notunique.wrapper=Failed to generate Java signature: duplicate parameter name \"{0}\". Try one of these\n\t1. Use JAXWS binding customization to rename the wsdl:part \"{1}\"\n\t2. Run wsimport with -extension switch.\n\t3. This is wrapper style operation, to resolve parameter name conflict, you can also try disabling wrapper style by using <jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle> wsdl customization.
+model.parameter.notunique=Failed to generate Java signature: duplicate parameter name \"{0}\". Try one of these\n\t1. Use JAXWS binding customization to rename the wsdl:part \"{1}\"\n\t2. Run wsimport with -extension switch.
 
-//JAXWS 2.0
+#JAXWS 2.0
 model.schema.elementNotFound=Element \"{0}\" not found.
 model.schema.jaxbException.message="{0}"
 model.saxparser.exception:{0}\n{1}
 
 ConsoleErrorReporter.UnknownLocation = \
-	unknown location
+        unknown location
 
 ConsoleErrorReporter.LineXOfY = \
-	\ \ line {0} of {1}
- 
+        \ \ line {0} of {1}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties
index b4228609f25..dee7df8099a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties
@@ -65,9 +65,9 @@ wsdlmodeler.warning.noServiceDefinitionsFound=WSDL document does not define any
 wsdlmodeler.warning.noPortsInService=Service \"{0}\" does not contain any usable ports. try running wsimport with -extension switch.
 wsdlmodeler.warning.noOperationsInPort=Port \"{0}\" does not contain any usable operations
 wsdlmodeler.warning.ignoringNonSOAPPort=ignoring port \"{0}\": not a standard SOAP port. try running wsimport with -extension switch.
-wsdlmodeler.warning.nonSOAPPort=port \"{0}\": not a standard SOAP port. The generated artifacts may not work with JAXWS runtime. 
+wsdlmodeler.warning.nonSOAPPort=port \"{0}\": not a standard SOAP port. The generated artifacts may not work with JAXWS runtime.
 wsdlmodeler.warning.ignoringNonSOAPPort.noAddress=ignoring port \"{0}\": no SOAP address specified. try running wsimport with -extension switch.
-wsdlmodeler.warning.noSOAPAddress=port \"{0}\" is not a SOAP port, it has no soap:address 
+wsdlmodeler.warning.noSOAPAddress=port \"{0}\" is not a SOAP port, it has no soap:address
 wsdlmodeler.warning.ignoringSOAPBinding.nonHTTPTransport:ignoring SOAP port \"{0}\": unrecognized transport. try running wsimport with -extension switch.
 
 #BP1.1 R2705
@@ -189,7 +189,7 @@ mimemodeler.elementPart.invalidElementMimeType=The mime:content part refers to w
 mimemodeler.invalidMimePart.nameNotAllowed=name attribute on wsdl:part in Operation \"{0}\" is ignored. Its not allowed as per WS-I AP 1.0.
 
 
-wsdlmodeler20.rpcenc.not.supported=rpc/encoded wsdl's are not supported in JAXWS 2.0. 
+wsdlmodeler20.rpcenc.not.supported=rpc/encoded wsdl's are not supported in JAXWS 2.0.
 wsdlmodeler.warning.ignoringOperation.notNCName=Ignoring operation \"{0}\", it has illegal character ''{1}'' in its name. Its rpc-literal operation - jaxws won't be able to serialize it!
 
 wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.nonWrapperStyle=Ignoring operation \"{0}\", can''t generate java method. Parameter: part "{2}\" in wsdl:message \"{1}\", is a java keyword. Use customization to change the parameter name or change the wsdl:part name.
@@ -207,11 +207,12 @@ wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.operationName=Invalid o
 wsdlmodeler.warning.ignoringOperation.javaReservedWordNotAllowed.customizedOperationName=Ignoring operation \"{0}\", can''t generate java method ,customized name \"{1}\" of the wsdl:operation is a java keyword.
 wsdlmodeler.invalid.operation.javaReservedWordNotAllowed.customizedOperationName=Invalid operation \"{0}\", can''t generate java method ,customized name \"{1}\" of the wsdl:operation is a java keyword.
 
-wsdlmodeler.jaxb.javatype.notfound=Schema descriptor {0} in message part \"{1}\" could not be bound to Java!
+wsdlmodeler.jaxb.javatype.notfound=Schema descriptor {0} in message part \"{1}\" is not defined and could not be bound to Java. Perhaps the schema descriptor {0} is not defined in the schema imported/included in the WSDL. You can either add such imports/includes or run wsimport and provide the schema location using -b switch.
 wsdlmodeler.unsupportedBinding.mime=WSDL MIME binding is not currently supported!
 
-wsdlmodeler.nonUnique.body=Non unique body parts! In a port, operations must have unique operation signaure on the wire for successful dispatch. In port {0}, Operations \"{1}\" and \"{2}\" have the same request body block {3}
-wsdlmodeler.rpclit.unkownschematype=XML type \"{0}\" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part \"{1}\" in the wsdl:message \"{2}\".    
+wsdlmodeler.nonUnique.body.error=Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signaure on the wire for successful dispatch. In port {0}, Operations \"{1}\" and \"{2}\" have the same request body block {3}. Try running wsimport with -extension switch, runtime will try to dispatch using SOAPAction
+wsdlmodeler.nonUnique.body.warning=Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signaure on the wire for successful dispatch. In port {0}, Operations \"{1}\" and \"{2}\" have the same request body block {3}. Method dispatching may fail, runtime will try to dispatch using SOAPAction
+
+wsdlmodeler.rpclit.unkownschematype=XML type \"{0}\" could not be resolved, XML to JAVA binding failed! Please check the wsdl:part \"{1}\" in the wsdl:message \"{2}\".
 
 wsdlmodeler.responsebean.notfound=wsimport failed to generate async response bean for operation: {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties
index 65e33bc7c8a..85705032caa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties
@@ -24,4 +24,3 @@
 #
 
 processor.missing.model=model is missing
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/util.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/util.properties
index 03064e366ba..6cc6dbf9b3a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/util.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/util.properties
@@ -26,4 +26,3 @@
 holder.valuefield.not.found=Could not find the field in the Holder that contains the Holder''s value: {0}
 null.namespace.found=Encountered error in wsdl. Check namespace of element <{0}>
 sax2dom.notsupported.createelement=SAX2DOMEx.DomImplDoesntSupportCreateElementNs: {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties
index f37386b141f..53f5c341eed 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties
@@ -50,7 +50,7 @@ webserviceap.oneway.operation.cannot.have.return.type=The method {1} of class {0
 webserviceap.oneway.operation.cannot.have.holders=The method {1} of class {0} is annotated @Oneway but contains inout or out paramerters (javax.xml.ws.Holder)
 
 webserviceap.oneway.operation.cannot.declare.exceptions=The method {1} of class {0} is annotated @Oneway but declares the exception {2}
-  
+
 webserviceap.cannot.combine.handlerchain.soapmessagehandlers=You cannot specify both HanlderChain and SOAPMessageHandlers annotations
 
 webserviceap.invalid.handlerchain.file.nohandler-config=The handlerchain file {0} is invalid, it does not contain a handler-config element
@@ -109,19 +109,19 @@ webserviceap.rpc.soapbinding.not.allowed.on.method=SOAPBinding.Style.RPC binding
 
 webserviceap.mixed.binding.style=Class\: {0} contains mixed bindings.  SOAPBinding.Style.RPC and SOAPBinding.Style.DOCUMENT cannot be mixed.
 
-webserviceap.endpointinteface.plus.annotation=The @{0} annotation cannot be used in with @javax.jws.WebService.endpointInterface element. 
+webserviceap.endpointinteface.plus.annotation=The @{0} annotation cannot be used in with @javax.jws.WebService.endpointInterface element.
 
-webserviceap.endpointinteface.plus.element=The @javax.jws.WebService.{0} element cannot be used in with @javax.jws.WebService.endpointInterface element. 
+webserviceap.endpointinteface.plus.element=The @javax.jws.WebService.{0} element cannot be used in with @javax.jws.WebService.endpointInterface element.
 
-webserviceap.non.in.parameters.must.be.holder=Class:\ {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder. 
+webserviceap.non.in.parameters.must.be.holder=Class:\ {0}, method: {1}, parameter: {2} is not WebParam.Mode.IN and is not of type javax.xml.ws.Holder.
 
-webserviceap.invalid.sei.annotation.element=The @javax.jws.WebService.{0} element cannot be specified on a service endpoint interface. Class\: {1} 
+webserviceap.invalid.sei.annotation.element=The @javax.jws.WebService.{0} element cannot be specified on a service endpoint interface. Class\: {1}
 
-webserviceap.invalid.sei.annotation=The @{0} annotation cannot be used on a service endpoint interface. Class\: {1} 
+webserviceap.invalid.sei.annotation=The @{0} annotation cannot be used on a service endpoint interface. Class\: {1}
 
 webserviceap.invalid.sei.annotation.element.exclude=The @javax.jws.WebMethod({0}) cannot be used on a service endpoint interface. Class\: {1} method\: {2}
 
-webserviceap.invalid.webmethod.element.with.exclude=The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class\: {1} method\: {2} 
+webserviceap.invalid.webmethod.element.with.exclude=The @javax.jws.WebMethod.{0} element cannot be specified with the @javax.jws.WebMethod.exclude element. Class\: {1} method\: {2}
 
 webserviceap.doc.bare.no.out=Document/literal bare methods with no return type or OUT/INOUT parameters must be annotated as @Oneway. Class\: {0}, method: {1}
 webserviceap.doc.bare.return.and.out=Document/literal bare methods cannot have a return type and out parameters. Class\: {0}, method: {1}
@@ -137,19 +137,20 @@ webserviceap.webservice.class.is.innerclass.not.static=Inner classes annotated w
 
 webserviceap.webservice.method.is.abstract=Classes annotated with @javax.jws.WebService must not have abstract methods. Class\: {0} Method: {1}
 
-#webserviceap.doc.bare.return.and.out=Document literal bare methods must not have a return value and an OUT/INOUT parameter.  Class\: {0} Method\: {1} 
+webserviceap.webservice.method.is.static.or.final=Method annotated with @javax.jws.WebMethod must not be static or final. Class\: {0} Method: {1}
+
+#webserviceap.doc.bare.return.and.out=Document literal bare methods must not have a return value and an OUT/INOUT parameter.  Class\: {0} Method\: {1}
 
 webserviceap.webservice.no.default.constructor=Classes annotated with @javax.jws.WebService must have a public default constructor. Class\: {0}
 
-webserviceap.oneway.and.not.one.in=Document literal bare methods annotated with @javax.jws.Oneway must have one non-header IN parameter.  Class\: {0} Method\: {1} 
+webserviceap.oneway.and.not.one.in=Document literal bare methods annotated with @javax.jws.Oneway must have one non-header IN parameter.  Class\: {0} Method\: {1}
 
-webserviceap.doc.bare.no.return.and.no.out=Document literal bare methods that do not have a return value must have a single OUT/INOUT parameter.  Class\: {0} Method\: {1} 
+webserviceap.doc.bare.no.return.and.no.out=Document literal bare methods that do not have a return value must have a single OUT/INOUT parameter.  Class\: {0} Method\: {1}
 
-webserviceap.doc.bare.and.no.one.in=Document literal bare methods must have one non-header, IN/INOUT parameter.  Class\: {0} Method\: {1} 
+webserviceap.doc.bare.and.no.one.in=Document literal bare methods must have one non-header, IN/INOUT parameter.  Class\: {0} Method\: {1}
 
 webserviceap.method.not.implemented=Methods in an endpointInterface must be implemented in the implementation class.  Interface Class\:{0} Implementation Class\:{1} Method\: {2}
 
 webserviceap.no.package.class.must.have.targetnamespace=@javax.jws.Webservice annotated classes that do not belong to a package must have the @javax.jws.Webservice.targetNamespace element.  Class\: {0}
 
 webserviceap.webservice.and.webserviceprovider=Classes cannot be annotated with both @javax.jws.WebService and @javax.xml.ws.WebServiceProvider.  Class\: {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
index 6dac1659bf3..03f84bb8457 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties
@@ -44,12 +44,22 @@ wsimport.help=\nUsage: {0} [options] <WSDL_URI>\n\n\
 \  -p <pkg>                  specifies the target package\n\
 \  -quiet                    suppress wsimport output\n\
 \  -s <directory>            specify where to place generated source files\n\
-\  -target <version>         generate code as per the given JAXWS specification version.\n\
-\                            version 2.0 will generate compliant code for JAXWS 2.0 spec.\n\
+\  -target <version>         generate code as per the given JAXWS spec version\n\
+\                            e.g. 2.0 will generate compliant code for JAXWS 2.0 spec\n\
 \  -verbose                  output messages about what the compiler is doing\n\
 \  -version                  print version information\n\
 \  -wsdllocation <location>  @WebServiceClient.wsdlLocation value\n\
 
+wsimport.usage.extensions=\n\
+\Extensions:\n\
+\  -XadditionalHeaders         map headers not bound to request or response message to \n\
+\                              Java method parameters\n\
+\  -Xauthfile                  file to carry authorization information in the format \n\
+\                              http://username:password@example.org/stock?wsdl\n\
+\  -Xdebug                     print debug information\n\
+\  -Xno-addressing-databinding enable binding of W3C EndpointReferenceType to Java\n\
+\  -Xnocompile                 do not compile generated Java files\n\
+
 
 wsimport.usage.examples=\n\
 \Examples:\n\
@@ -76,15 +86,18 @@ wsgen.help=\nUsage: {0} [options] <SEI>\n\n\
 \  -s <directory>             specify where to place generated source files\n\
 \  -verbose                   output messages about what the compiler is doing\n\
 \  -version                   print version information\n\
-\  -wsdl[:protocol]           generate a WSDL file.  The protocol is optional.\n\
-\                             Valid protocols are soap1.1 and Xsoap1.2, the default\n\
-\                             is soap1.1.  Xsoap1.2 is not standard and can only be\n\
-\                             used in conjunction with the -extension option\n\
+\  -wsdl[:protocol]           generate a WSDL file. The protocol is optional.\n\
+\                             Valid protocols are {1},\n\
+\                             the default is soap1.1.\n\
+\                             The non stanadard protocols {2}\n\
+\                             can only be used in conjunction with the\n\
+\                             -extension option.\n\
 \  -servicename <name>        specify the Service name to use in the generated WSDL\n\
 \                             Used in conjunction with the -wsdl option.\n\
 \  -portname <name>           specify the Port name to use in the generated WSDL\n\
 \                             Used in conjunction with the -wsdl option.
 
+
 wsgen.usage.examples=\n\
 \Examples:\n\
 \  wsgen -cp . example.Stock\n\
@@ -93,7 +106,7 @@ wsgen.usage.examples=\n\
 wrapperTask.needEndorsed=\
 You are running on JDK6 which comes with JAX-WS 2.0 API, but this tool requires JAX-WS 2.1 API. \
 Use the endorsed standards override mechanism (http://java.sun.com/javase/6/docs/technotes/guides/standards/), \
-or set xendorsed="true" on <{0}>. 
+or set xendorsed="true" on <{0}>.
 
 wrapperTask.loading20Api=\
 You are loading JAX-WS 2.0 API from {0} but this tool requires JAX-WS 2.1 API.
@@ -126,7 +139,8 @@ wsgen.class.not.found=Class not found: \"{0}\"
 wsgen.could.not.create.file="Could not create file: "\{0}\"
 wsgen.missingFile=Missing SEI
 wsgen.soap12.without.extension=The optional protocol \"Xsoap1.2\" must be used in conjunction with the \"-extension\" option.
-wsgen.wsdl.arg.no.genwsdl=The \"{0}\" option can only be in conjunction with the "-wsdl" option. 
+wsgen.protocol.without.extension=The optional protocol \"{0}\" must be used in conjunction with the \"-extension\" option.
+wsgen.wsdl.arg.no.genwsdl=The \"{0}\" option can only be in conjunction with the "-wsdl" option.
 wsgen.servicename.missing.namespace=The service name \"{0}\" is missing a namespace.
 wsgen.servicename.missing.localname=The service name \"{0}\" is missing a localname.
 wsgen.portname.missing.namespace=The port name \"{0}\" is missing a namespace.
@@ -151,17 +165,41 @@ wsimport.FailedToParse = \
     Failed to parse "{0}": {1}
 
 wsimport.ParsingWSDL=parsing WSDL...\n\n
-wsimport.GeneratingCode=generating code...
-
+wsimport.GeneratingCode=generating code...\n
+wsimport.CompilingCode=\ncompiling code...\n
 wsimport.ILLEGAL_TARGET_VERSION = \
     "{0}" is not a valid target version. "2.0" and "2.1" are supported.
 
+wsimport.ILLEGAL_AUTH_INFO = \
+    "{0}" is not a valid authorization information format. The format is http[s]://user:password@host:port//<url-path>.
+
+wsimport.readingAuthFile = \
+  Trying to read authorization file : "{0}"...
+
+wsimport.authFileNotFound = \
+  Authorization file "{0}" not found. If the WSDL access needs Basic Authentication, please provide authorization file with read access at {1} or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port//<url-path>
+
+wsimport.authInfoNeeded = \
+  {0},  "{1}" needs authorization, please provide authorization file with read access at {2} or use -Xauthfile to give the authorization file and on each line provide authorization information using this format : http[s]://user:password@host:port//<url-path>
+
+wsimport.AUTH_INFO_LINENO = \
+  "line {0} of {1}
+
+
 wsimport.ErrorMessage = \
-	[ERROR] {0}
+        [ERROR] {0}
 
 wsimport.WarningMessage = \
-	[WARNING] {0}
+        [WARNING] {0}
 
 wsimport.InfoMessage = \
-	[INFO] {0}
- 
+        [INFO] {0}
+
+wsimport.DebugMessage = \
+        [DEBUG] {0}
+
+wsimport.httpRedirect = \
+  Server returned HTTP Status code: "{0}", retrying with "{1}"
+
+wsimport.maxRedirectAttempt = \
+  Can not get a WSDL maximum number of redirects(5) reached
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties
index 779d9089356..b23eee41495 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties
@@ -41,7 +41,6 @@ parsing.unknownImportedDocumentType=imported document is of unknown type: {0}
 parsing.unknownNamespacePrefix=undeclared namespace prefix: \"{0}\"
 parsing.invalidURI=invalid URI: {0}
 parsing.ioExceptionWithSystemId=failed to parse document at \"{0}\"
-parsing.unableToGetMetadata= Unable to get Metadata from: {0}
 parsing.ioException=parsing failed: {0}
 parsing.saxExceptionWithSystemId=invalid WSDL file! failed to parse document at \"{0}\"
 parsing.saxException=invalid WSDL file! parsing failed: {0}
@@ -52,16 +51,16 @@ parsing.factoryConfigException=invalid WSDL file! parsing failed: {0}
 parsing.missingRequiredAttribute=missing required attribute \"{1}\" of element \"{0}\"
 parsing.invalidTag=expected element \"{1}\", found \"{0}\"
 parsing.invalidTagNS=Invalid WSDL at {4}: expected element \"{2}\" (in namespace \"{3}\"), found element \"{0}\" (in namespace \"{1}\")
-parsing.nonWhitespaceTextFound=found unexpected non whitespace text: \"{0}\"
+parsing.nonWhitespaceTextFound=found unexpected non-whitespace text: \"{0}\"
 parsing.elementExpected=unexpected non-element found
 #
 entity.duplicate=duplicate entity: \"{0}\"
 entity.duplicateWithType=duplicate \"{0}\" entity: \"{1}\"
 
 entity.notFoundByID=invalid entity id: \"{0}\"
-entity.notFoundByQName=invalid entity name: \"{0}\" (in namespace: \"{1}\")
-entity.notFound.portType=wsdl:portType \"{0}\" referenced by wsdl:binding \"{1}\", but its not found in the wsdl
-entity.notFound.binding=wsdl:binding \"{0}" referenced by wsdl:port \"{1}\", but its not found in the wsdl
+entity.notFoundByQName={0} \"{1}\" not found in the wsdl: {2}
+entity.notFound.portType=wsdl:portType \"{0}\" referenced by wsdl:binding \"{1}\", but it's not found in the wsdl
+entity.notFound.binding=wsdl:binding \"{0}" referenced by wsdl:port \"{1}\", but it's not found in the wsdl
 
 #
 validation.missingRequiredAttribute=missing required attribute \"{0}\" of element \"{1}\"
@@ -71,7 +70,7 @@ validation.invalidElement=invalid element: \"{0}\"
 validation.invalidComplexTypeInElement=invalid element: \"{1}\", has named complexType: \"{0}\"
 validation.invalidSimpleTypeInElement=invalid element: \"{1}\", has named simpleType: \"{0}\"
 validation.duplicatedElement=duplicated element: \"{0}\"
-validation.duplicatePartName=Invalid WSDL, duplicate parts in a wsdl:message is not allowed. \nwsdl:message {0} has duplicated part name: \"{1}\"
+validation.duplicatePartName=Invalid WSDL, duplicate parts in a wsdl:message is not allowed. \nwsdl:message {0} has a duplicated part name: \"{1}\"
 validation.invalidSubEntity=invalid sub-element \"{0}\" of element \"{1}\"
 validation.invalidAttribute=invalid attribute \"{0}\" of element \"{1}\"
 validation.invalidAttributeValue=invalid value \"{1}\" for attribute \"{0}\"
@@ -88,51 +87,54 @@ warning.faultEmptyAction=ignoring empty Action in \"{0}\" {1} element of \"{2}\"
 warning.inputOutputEmptyAction=ignoring empty Action in {0} element of \"{1}\" operation, using default instead
 
 #wsi compliant WSDL warnings
-warning.wsi.r2001=Not a WSI-BP compliant WSDL (R2001, R2002). wsdl:import must only import WSDL document. Its trying to import: \"{0}\"
-warning.wsi.r2002=Not a WSI-BP compliant WSDL (R2002). wsdl:import must not be used to import XML Schema embedded in the WSDL document. Expected wsdl namesapce: {0}, found: {1}
-warning.wsi.r2003=Not a WSI-BP compliant WSDL (R2003). xsd:import must only be used inside xsd:schema element.
-warning.wsi.r2004=Not a WSI-BP compliant WSDL (R2001, R2004). xsd:import must not import XML Schema definition emmbedded inline within WSDLDocument.
+warning.wsi.r2001=Not a WSI-BP compliant WSDL (R2001, R2002). wsdl:import must import only WSDL documents. It's trying to import: \"{0}\"
+warning.wsi.r2002=Not a WSI-BP compliant WSDL (R2002). wsdl:import must not be used to import XML Schema embedded in the WSDL document. Expected wsdl namespace: {0}, found: {1}
+warning.wsi.r2003=Not a WSI-BP compliant WSDL (R2003). xsd:import must only be used inside xsd:schema elements.
+warning.wsi.r2004=Not a WSI-BP compliant WSDL (R2001, R2004). xsd:import must not import XML Schema definitions embedded inline within the WSDL document.
 
 #Parser
 Parsing.ParseFailed = \
-	Failed to parse the WSDL.
+\tFailed to parse the WSDL.
 
 Parsing.NotAWSDL=Failed to get WSDL components, probably {0} is not a valid WSDL file.
 
 AbstractReferenceFinderImpl.UnableToParse = \
-	Unable to parse "{0}" : {1}
+\tUnable to parse "{0}" : {1}
 
 Parser.NotABindingFile = \
-	not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxws'}'bindings but it is '{'{0}'}'{1}
+\tnot an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxws'}'bindings but it is '{'{0}'}'{1}
 
 
 #Internalizer
 Internalizer.TwoVersionAttributes = \
-	Both jaxws:version and version are present
+\tBoth jaxws:version and version are present
 Internalizer.IncorrectVersion = \
-	JAXWS version attribute must be "2.0"
+\tJAXWS version attribute must be "2.0"
 
 Internalizer.VersionNotPresent = \
-	JAXWS version attribute must be present
+\tJAXWS version attribute must be present
 
 internalizer.targetNotAnElement= \
-    Target node is not an element
+\tTarget node is not an element
 internalizer.targetNotFound= \
-    No target found for the wsdlLocation: {0}
+\tNo target found for the wsdlLocation: {0}
 
 Internalizer.IncorrectSchemaReference= \
-	"{0}" is not a part of this compilation. Is this a mistake for "{1}"?
+\t"{0}" is not a part of this compilation. Is this a mistake for "{1}"?
 
 internalizer.XPathEvaluationError = \
     XPath error: {0}
 internalizer.XPathEvaluatesToNoTarget = \
-    XPath evaluation of "{0}" results in empty target node
+    XPath evaluation of "{0}" results in an empty target node
 internalizer.XPathEvaulatesToTooManyTargets = \
     XPath evaluation of "{0}" results in too many ({1}) target nodes
 internalizer.XPathEvaluatesToNonElement = \
     XPath evaluation of "{0}" needs to result in an element.
-invalid.customization.namespace=Ignoring customization: \"{0}\", it has no namespace. It must belong to the customization namespace.    
+invalid.customization.namespace=Ignoring customization: \"{0}\", because it has no namespace. It must belong to the customization namespace.
 
 invalid.wsdl.with.dooc="Not a WSDL document: {0}, it gives \"{1}\", retrying with MEX..."
-invalid.wsdl="{0} does not look like a WSDL document, retrying with MEX..."
- 
+invalid.wsdl=Invalid WSDL {0}, expected {1} found {2} at (line {3})
+try.with.mex= {0} \n\nretrying with MEX...
+file.not.found={0} is unreachable
+parsing.unableToGetMetadata= {0}\n\n{1}
+failed.noservice=failed.noservice=Could not find wsdl:service in the provided WSDL(s): \n\n{0} At least one WSDL with at least one service definition needs to be provided.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/version.properties b/jaxws/src/share/classes/com/sun/tools/internal/ws/version.properties
index 27f0f706450..b6719e45543 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/version.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/version.properties
@@ -23,7 +23,7 @@
 # have any questions.
 #
 
-build-id=JAX-WS RI 2.1.1
-build-version=JAX-WS RI 2.1.1
-major-version=2.1.1
- 
+#Fri May 15 16:16:14 CEST 2009
+build-id=JAX-WS RI 2.1.6
+major-version=2.1.6
+build-version=JAX-WS RI 2.1.6
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java
index bc0f896e2b6..9cdbf39d009 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java
new file mode 100644
index 00000000000..9a6af52cb02
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.istack.internal.NotNull;
+
+import java.net.URL;
+
+/**
+ * Represents authorization information needed by {@link com.sun.tools.internal.ws.wscompile.DefaultAuthenticator} to
+ * authenticate wsimport to access the wsdl.
+ *
+ * @author Vivek Pandey
+ */
+
+public final class AuthInfo {
+    private final String user;
+    private final String password;
+    private final URL url;
+
+    public AuthInfo(@NotNull URL url, @NotNull String user, @NotNull String password){
+        this.url = url;
+        this.user = user;
+        this.password = password;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Returns if the requesting host and port are associated with this {@link AuthInfo}
+     */
+    public boolean matchingHost(@NotNull URL requestingURL) {
+        return requestingURL.equals(url);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
index 2380ef05b50..d0470153414 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.istack.internal.Nullable;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java
new file mode 100644
index 00000000000..433ea5c578e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.tools.internal.ws.processor.modeler.wsdl.ConsoleErrorReporter;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.PasswordAuthentication;
+import java.net.URL;
+import java.util.Arrays;
+
+/**
+ * @author Vivek Pandey
+ */
+public class DefaultAuthTester {
+    public static void main(String[] args) throws BadCommandLineException {
+        DefaultAuthenticator da = new MyAuthenticator(new ConsoleErrorReporter(System.out), new File("c:\\Users\\vivekp\\.metro\\auth"));
+
+        PasswordAuthentication pa = da.getPasswordAuthentication();
+        if(pa!= null && pa.getUserName().equals("vivek") && Arrays.equals(pa.getPassword(), "test".toCharArray()))
+            System.out.println("Success!");
+        else
+            System.out.println("Failiure!");
+
+    }
+
+    private static class MyAuthenticator extends DefaultAuthenticator{
+
+        public MyAuthenticator(@NotNull ErrorReceiver receiver, @NotNull File authfile) throws BadCommandLineException {
+            super(receiver, authfile);
+        }
+
+        protected URL getRequestingURL() {
+            try {
+                return new URL("http://foo.com/myservice?wsdl");
+            } catch (MalformedURLException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java
new file mode 100644
index 00000000000..3b43e0bf399
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.wscompile;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.LocatorImpl;
+
+import java.io.*;
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Vivek Pandey
+ */
+public class DefaultAuthenticator extends Authenticator {
+
+    private final List<AuthInfo> authInfo = new ArrayList<AuthInfo>();
+    private final ErrorReceiver errReceiver;
+    private final String proxyUser;
+    private final String proxyPasswd;
+
+    //can user.home value be null?
+    public static final String defaultAuthfile = System.getProperty("user.home")+ System.getProperty("file.separator")+".metro"+System.getProperty("file.separator")+"auth";
+    private File authFile = new File(defaultAuthfile);
+    private boolean giveError;
+
+    public DefaultAuthenticator(@NotNull ErrorReceiver receiver, @NotNull File authfile) throws BadCommandLineException {
+        this.errReceiver = receiver;
+        this.proxyUser = System.getProperty("http.proxyUser");
+        this.proxyPasswd = System.getProperty("http.proxyPassword");
+
+        if(authfile != null){
+            this.authFile = authfile;
+            this.giveError = true;
+        }
+
+        if(!authFile.exists()){
+            try {
+                error(new SAXParseException(WscompileMessages.WSIMPORT_AUTH_FILE_NOT_FOUND(authFile.getCanonicalPath(), defaultAuthfile), null));
+            } catch (IOException e) {
+                error(new SAXParseException(WscompileMessages.WSIMPORT_FAILED_TO_PARSE(authFile,e.getMessage()), null));
+            }
+            return;
+        }
+
+        if(!authFile.canRead()){
+            error(new SAXParseException("Authorization file: "+authFile + " does not have read permission!", null));
+            return;
+        }
+        parseAuth();
+    }
+
+    protected PasswordAuthentication getPasswordAuthentication() {
+        //If user sets proxy user and passwd and the RequestType is from proxy server then create
+        // PasswordAuthentication using proxyUser and proxyClass;
+        if((getRequestorType() == RequestorType.PROXY) && proxyUser != null && proxyPasswd != null){
+            return new PasswordAuthentication(proxyUser, proxyPasswd.toCharArray());
+        }
+        for(AuthInfo auth:authInfo){
+            if(auth.matchingHost(getRequestingURL())){
+                return new PasswordAuthentication(auth.getUser(), auth.getPassword().toCharArray());
+            }
+        }
+        return null;
+    }
+
+    private void parseAuth() {
+        errReceiver.info(new SAXParseException(WscompileMessages.WSIMPORT_READING_AUTH_FILE(authFile), null));
+
+        BufferedReader in;
+        try {
+            in = new BufferedReader(new InputStreamReader(new FileInputStream(authFile), "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            error(new SAXParseException(e.getMessage(), null));
+            return;
+        } catch (FileNotFoundException e) {
+            error(new SAXParseException(WscompileMessages.WSIMPORT_AUTH_FILE_NOT_FOUND(authFile, defaultAuthfile), null, e));
+            return;
+        }
+        String text;
+        LocatorImpl locator = new LocatorImpl();
+        try {
+            int lineno = 1;
+
+            locator.setSystemId(authFile.getCanonicalPath());
+
+            while ((text = in.readLine()) != null) {
+                locator.setLineNumber(lineno++);
+                try {
+                    URL url = new URL(text);
+                    String authinfo = url.getUserInfo();
+
+                    if (authinfo != null) {
+                        int i = authinfo.indexOf(':');
+
+                        if (i >= 0) {
+                            String user = authinfo.substring(0, i);
+                            String password = authinfo.substring(i + 1);
+                            authInfo.add(new AuthInfo(new URL(text), user, password));
+                        } else {
+                            error(new SAXParseException(WscompileMessages.WSIMPORT_ILLEGAL_AUTH_INFO(url), locator));
+                        }
+                    } else {
+                        error(new SAXParseException(WscompileMessages.WSIMPORT_ILLEGAL_AUTH_INFO(url), locator));
+                    }
+
+                } catch (NumberFormatException e) {
+                    error(new SAXParseException(WscompileMessages.WSIMPORT_ILLEGAL_AUTH_INFO(text), locator));
+                }
+            }
+            in.close();
+        } catch (IOException e) {
+            error(new SAXParseException(WscompileMessages.WSIMPORT_FAILED_TO_PARSE(authFile,e.getMessage()), locator));
+        }
+    }
+
+    /**
+     * When user provides authfile explicitly using -Xauthfile we throw error otherwise show the mesage by default with -Xdebug flag
+     */
+    private void error(SAXParseException e){
+        if(giveError){
+            errReceiver.error(e);
+        } else{
+            errReceiver.debug(e);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
index 5798f950c0a..57d5019e94a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.istack.internal.Nullable;
@@ -126,6 +125,8 @@ public abstract class ErrorReceiver  implements ErrorHandler, ErrorListener {
         info( new SAXParseException(msg,null) );
     }
 
+    public abstract void debug(SAXParseException exception);
+
 //
 //
 // convenience methods for derived classes
@@ -145,7 +146,7 @@ public abstract class ErrorReceiver  implements ErrorHandler, ErrorListener {
           return ModelMessages.CONSOLE_ERROR_REPORTER_LINE_X_OF_Y(line==-1?"?":Integer.toString( line ),
               getShortName( e.getSystemId()));
       } else {
-          return ModelMessages.CONSOLE_ERROR_REPORTER_UNKNOWN_LOCATION();
+          return ""; //for unkown location just return empty string
       }
   }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
index e5516e19d80..4de19e2c935 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.tools.internal.xjc.api.ErrorListener;
@@ -66,6 +65,10 @@ public class ErrorReceiverFilter extends ErrorReceiver {
         if(core!=null)  core.info(exception);
     }
 
+    public void debug(SAXParseException exception) {
+
+    }
+
     public void warning(SAXParseException exception) {
         if(core!=null)  core.warning(exception);
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
index ea7a3dcb6d5..03b5d0503ae 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
@@ -35,6 +35,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URISyntaxException;
 
 /**
  * A helper class to invoke javac.
@@ -43,15 +44,19 @@ import java.net.URL;
  */
 class JavaCompilerHelper{
     static File getJarFile(Class clazz) {
+        URL url = null;
         try {
-            URL url = ParallelWorldClassLoader.toJarUrl(clazz.getResource('/'+clazz.getName().replace('.','/')+".class"));
-            return new File(url.getPath());   // this code is assuming that url is a file URL
+            url = ParallelWorldClassLoader.toJarUrl(clazz.getResource('/'+clazz.getName().replace('.','/')+".class"));
+            return new File(url.toURI());
         } catch (ClassNotFoundException e) {
             // if we can't figure out where JAXB/JAX-WS API are, we couldn't have been executing this code.
             throw new Error(e);
         } catch (MalformedURLException e) {
             // if we can't figure out where JAXB/JAX-WS API are, we couldn't have been executing this code.
             throw new Error(e);
+        } catch (URISyntaxException e) {
+            // url.toURI() is picky and doesn't like ' ' in URL, so this is the fallback
+            return new File(url.getPath());
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java
index 6cf05499ced..da2a6d3cfd0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.tools.internal.ws.resources.WscompileMessages;
@@ -150,6 +149,10 @@ public class Options {
 
 
     public boolean debug = false;
+
+    /**
+     * -Xdebug - gives complete stack trace
+     */
     public boolean debugMode = false;
 
 
@@ -206,7 +209,7 @@ public class Options {
      * @exception BadCommandLineException
      *      thrown when there's a problem in the command-line arguments
      */
-    public final void parseArguments( String[] args ) throws BadCommandLineException {
+    public void parseArguments( String[] args ) throws BadCommandLineException {
 
         for (int i = 0; i < args.length; i++) {
             if(args[i].length()==0)
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
index 820688bbeae..1e6d109d18a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
@@ -24,18 +24,20 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.mirror.apt.Filer;
 import com.sun.tools.internal.ws.resources.WscompileMessages;
+import com.sun.tools.internal.ws.api.WsgenExtension;
+import com.sun.tools.internal.ws.api.WsgenProtocol;
 import com.sun.xml.internal.ws.api.BindingID;
+import com.sun.xml.internal.ws.util.ServiceFinder;
+import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
 
 import javax.jws.WebService;
 import javax.xml.namespace.QName;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author Vivek Pandey
@@ -66,7 +68,9 @@ public class WsgenOptions extends Options {
      * protocol value
      */
     public String protocol = "soap1.1";
-    public String transport;
+
+    public Set<String> protocols = new LinkedHashSet<String>();
+    public Map<String, String> nonstdProtocols = new LinkedHashMap<String, String>();
 
     /**
      * -XwsgenReport
@@ -92,8 +96,22 @@ public class WsgenOptions extends Options {
     private static final String SOAP11 = "soap1.1";
     public static final String X_SOAP12 = "Xsoap1.2";
 
+    public WsgenOptions() {
+        protocols.add(SOAP11);
+        protocols.add(X_SOAP12);
+        nonstdProtocols.put(X_SOAP12, SOAPBindingImpl.X_SOAP12HTTP_BINDING);
+        ServiceFinder<WsgenExtension> extn = ServiceFinder.find(WsgenExtension.class);
+        for(WsgenExtension ext : extn) {
+            Class clazz = ext.getClass();
+            WsgenProtocol pro = (WsgenProtocol)clazz.getAnnotation(WsgenProtocol.class);
+            protocols.add(pro.token());
+            nonstdProtocols.put(pro.token(), pro.lexical());
+        }
+    }
+
     @Override
     protected int parseArguments(String[] args, int i) throws BadCommandLineException {
+
         int j = super.parseArguments(args, i);
         if (args[i].equals(SERVICENAME_OPTION)) {
             serviceName = QName.valueOf(requireArgument(SERVICENAME_OPTION, args, ++i));
@@ -132,10 +150,8 @@ public class WsgenOptions extends Options {
                 index = value.indexOf('/');
                 if (index == -1) {
                     protocol = value;
-                    transport = HTTP;
                 } else {
                     protocol = value.substring(0, index);
-                    transport = value.substring(index + 1);
                 }
                 protocolSet = true;
             }
@@ -168,13 +184,9 @@ public class WsgenOptions extends Options {
     public void validate() throws BadCommandLineException {
         if(nonclassDestDir == null)
             nonclassDestDir = destDir;
-        if (!protocol.equalsIgnoreCase(SOAP11) &&
-                !protocol.equalsIgnoreCase(X_SOAP12)) {
-            throw new BadCommandLineException(WscompileMessages.WSGEN_INVALID_PROTOCOL(protocol, SOAP11 + ", " + X_SOAP12));
-        }
 
-        if (transport != null && !transport.equalsIgnoreCase(HTTP)) {
-            throw new BadCommandLineException(WscompileMessages.WSGEN_INVALID_TRANSPORT(transport, HTTP));
+        if (!protocols.contains(protocol)) {
+            throw new BadCommandLineException(WscompileMessages.WSGEN_INVALID_PROTOCOL(protocol, protocols));
         }
 
         if (endpoints.isEmpty()) {
@@ -184,6 +196,10 @@ public class WsgenOptions extends Options {
             throw new BadCommandLineException(WscompileMessages.WSGEN_SOAP_12_WITHOUT_EXTENSION());
         }
 
+        if (nonstdProtocols.containsKey(protocol) && !isExtensionMode()) {
+            throw new BadCommandLineException(WscompileMessages.WSGEN_PROTOCOL_WITHOUT_EXTENSION(protocol));
+        }
+
         validateEndpointClass();
         validateArguments();
     }
@@ -245,12 +261,13 @@ public class WsgenOptions extends Options {
         }
     }
 
-    public static BindingID getBindingID(String protocol) {
+    BindingID getBindingID(String protocol) {
         if (protocol.equals(SOAP11))
             return BindingID.SOAP11_HTTP;
         if (protocol.equals(X_SOAP12))
             return BindingID.SOAP12_HTTP;
-        return null;
+        String lexical = nonstdProtocols.get(protocol);
+        return (lexical != null) ? BindingID.parse(lexical) : null;
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
index a7372a66f9c..18c0d220efc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.mirror.apt.AnnotationProcessor;
@@ -32,6 +31,8 @@ import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.apt.AnnotationProcessorFactory;
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;
 import com.sun.tools.internal.ws.ToolVersion;
+import com.sun.tools.internal.ws.api.WsgenExtension;
+import com.sun.tools.internal.ws.api.WsgenProtocol;
 import com.sun.tools.internal.ws.processor.modeler.annotation.AnnotationProcessorContext;
 import com.sun.tools.internal.ws.processor.modeler.annotation.WebServiceAP;
 import com.sun.tools.internal.ws.processor.modeler.wsdl.ConsoleErrorReporter;
@@ -46,11 +47,13 @@ import com.sun.xml.internal.ws.api.BindingID;
 import com.sun.xml.internal.ws.api.server.Container;
 import com.sun.xml.internal.ws.api.wsdl.writer.WSDLGeneratorExtension;
 import com.sun.xml.internal.ws.binding.WebServiceFeatureList;
+import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
 import com.sun.xml.internal.ws.model.AbstractSEIModelImpl;
 import com.sun.xml.internal.ws.model.RuntimeModeler;
 import com.sun.xml.internal.ws.util.ServiceFinder;
 import com.sun.xml.internal.ws.wsdl.writer.WSDLGenerator;
 import com.sun.xml.internal.ws.wsdl.writer.WSDLResolver;
+import com.sun.istack.internal.tools.ParallelWorldClassLoader;
 import org.xml.sax.SAXParseException;
 
 import javax.xml.bind.annotation.XmlSeeAlso;
@@ -110,14 +113,16 @@ public class WsgenTool implements AnnotationProcessorFactory {
                 return false;
             }
         }catch (Options.WeAreDone done){
-            usage(done.getOptions());
+            usage((WsgenOptions)done.getOptions());
         }catch (BadCommandLineException e) {
             if(e.getMessage()!=null) {
                 System.out.println(e.getMessage());
                 System.out.println();
             }
-            usage(e.getOptions());
+            usage((WsgenOptions)e.getOptions());
             return false;
+        }catch(AbortException e){
+            //error might have been reported
         }finally{
             if(!options.keep){
                 options.removeGeneratedFiles();
@@ -161,12 +166,27 @@ public class WsgenTool implements AnnotationProcessorFactory {
         }
     }
 
+    /*
+     * To take care of JDK6-JDK6u3, where 2.1 API classes are not there
+     */
+    private static boolean useBootClasspath(Class clazz) {
+        try {
+            ParallelWorldClassLoader.toJarUrl(clazz.getResource('/'+clazz.getName().replace('.','/')+".class"));
+            return true;
+        } catch(Exception e) {
+            return false;
+        }
+    }
+
+
     public boolean buildModel(String endpoint, Listener listener) throws BadCommandLineException {
         final ErrorReceiverFilter errReceiver = new ErrorReceiverFilter(listener);
         context = new AnnotationProcessorContext();
         webServiceAP = new WebServiceAP(options, context, errReceiver, out);
 
-        String[] args = new String[9];
+        boolean bootCP = useBootClasspath(EndpointReference.class) || useBootClasspath(XmlSeeAlso.class);
+
+        String[] args = new String[8 + (bootCP ? 1 :0)];
         args[0] = "-d";
         args[1] = options.destDir.getAbsolutePath();
         args[2] = "-classpath";
@@ -175,7 +195,9 @@ public class WsgenTool implements AnnotationProcessorFactory {
         args[5] = options.sourceDir.getAbsolutePath();
         args[6] = "-XclassesAsDecls";
         args[7] = endpoint;
-        args[8] = "-Xbootclasspath/p:"+JavaCompilerHelper.getJarFile(EndpointReference.class)+File.pathSeparator+JavaCompilerHelper.getJarFile(XmlSeeAlso.class);
+        if (bootCP) {
+            args[8] = "-Xbootclasspath/p:"+JavaCompilerHelper.getJarFile(EndpointReference.class)+File.pathSeparator+JavaCompilerHelper.getJarFile(XmlSeeAlso.class);
+        }
 
         // Workaround for bug 6499165: issue with javac debug option
         workAroundJavacDebug();
@@ -195,11 +217,12 @@ public class WsgenTool implements AnnotationProcessorFactory {
                 throw new BadCommandLineException(WscompileMessages.WSGEN_CLASS_NOT_FOUND(endpoint));
             }
 
-            BindingID bindingID = WsgenOptions.getBindingID(options.protocol);
+            BindingID bindingID = options.getBindingID(options.protocol);
             if (!options.protocolSet) {
                 bindingID = BindingID.parse(endpointClass);
             }
-            RuntimeModeler rtModeler = new RuntimeModeler(endpointClass, options.serviceName, bindingID);
+            WebServiceFeatureList wsfeatures = new WebServiceFeatureList(endpointClass);
+            RuntimeModeler rtModeler = new RuntimeModeler(endpointClass, options.serviceName, bindingID, wsfeatures.toArray());
             rtModeler.setClassLoader(classLoader);
             if (options.portName != null)
                 rtModeler.setPortName(options.portName);
@@ -207,7 +230,7 @@ public class WsgenTool implements AnnotationProcessorFactory {
 
             final File[] wsdlFileName = new File[1]; // used to capture the generated WSDL file.
             final Map<String,File> schemaFiles = new HashMap<String,File>();
-            WebServiceFeatureList wsfeatures = new WebServiceFeatureList(endpointClass);
+
             WSDLGenerator wsdlGenerator = new WSDLGenerator(rtModel,
                     new WSDLResolver() {
                         private File toFile(String suggestedFilename) {
@@ -327,8 +350,12 @@ public class WsgenTool implements AnnotationProcessorFactory {
         }
     }
 
-    protected void usage(Options options) {
-        System.out.println(WscompileMessages.WSGEN_HELP("WSGEN"));
+    protected void usage(WsgenOptions options) {
+        // Just don't see any point in passing WsgenOptions
+        // BadCommandLineException also shouldn't have options
+        if (options == null)
+            options = this.options;
+        System.out.println(WscompileMessages.WSGEN_HELP("WSGEN", options.protocols, options.nonstdProtocols.keySet()));
         System.out.println(WscompileMessages.WSGEN_USAGE_EXAMPLES());
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java
index fcb8c8ffc2d..2a29eb4c854 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.tools.internal.xjc.api.ErrorListener;
@@ -75,6 +74,8 @@ public class WsimportListener implements ErrorListener {
 
     }
 
+    public void debug(SAXParseException exception){}
+
     /**
      * wsimport will periodically invoke this method to see if it should cancel a compilation.
      *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
index 477bf92dc34..88b5994af80 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.codemodel.internal.JCodeModel;
@@ -50,6 +49,7 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
 import java.io.File;
 import java.io.IOException;
+import java.net.Authenticator;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -77,12 +77,28 @@ public class WsimportOptions extends Options {
      */
     public String defaultPackage = null;
 
+    /**
+     * -XadditionalHeaders
+     */
+    public boolean additionalHeaders;
+
+    /**
+     * Setting disableSSLHostVerification to true disables the SSL Hostname verification while fetching the wsdls.
+     * -XdisableSSLHostVerification
+     */
+    public boolean disableSSLHostnameVerification;
+
     /**
      * JAXB's {@link SchemaCompiler} to be used for handling the schema portion.
      * This object is also configured through options.
      */
     private SchemaCompiler schemaCompiler = XJC.createSchemaCompiler();
 
+    /**
+     * Authentication file
+     */
+    public File authFile;
+
     public JCodeModel getCodeModel() {
         if(codeModel == null)
             codeModel = new JCodeModel();
@@ -101,6 +117,50 @@ public class WsimportOptions extends Options {
 
     private JCodeModel codeModel;
 
+    /**
+     * This captures jars passed on the commandline and passes them to XJC and puts them in the classpath for compilation
+     */
+    public List<String> cmdlineJars = new ArrayList<String>();
+
+    /**
+     * Parses arguments and fill fields of this object.
+     *
+     * @exception BadCommandLineException
+     *      thrown when there's a problem in the command-line arguments
+     */
+    @Override
+    public final void parseArguments( String[] args ) throws BadCommandLineException {
+
+        for (int i = 0; i < args.length; i++) {
+            if(args[i].length()==0)
+                throw new BadCommandLineException();
+            if (args[i].charAt(0) == '-') {
+                int j = parseArguments(args,i);
+                if(j==0)
+                    throw new BadCommandLineException(WscompileMessages.WSCOMPILE_INVALID_OPTION(args[i]));
+                i += (j-1);
+            } else {
+                if(args[i].endsWith(".jar")) {
+
+                    try {
+                cmdlineJars.add(args[i]);
+                schemaCompiler.getOptions().scanEpisodeFile(new File(args[i]));
+
+            } catch (com.sun.tools.internal.xjc.BadCommandLineException e) {
+                //Driver.usage(jaxbOptions,false);
+                throw new BadCommandLineException(e.getMessage(), e);
+            }
+                } else{
+                    addFile(args[i]);
+                }
+            }
+        }
+        if(destDir == null)
+            destDir = new File(".");
+        if(sourceDir == null)
+            sourceDir = destDir;
+    }
+
     /** -Xno-addressing-databinding option to disable addressing namespace data binding. This is
      * experimental switch and will be working as a temporary workaround till
      * jaxb can provide a better way to selelctively disable compiling of an
@@ -119,6 +179,12 @@ public class WsimportOptions extends Options {
         } else if (args[i].equals("-wsdllocation")) {
             wsdlLocation = requireArgument("-wsdllocation", args, ++i);
             return 2;
+        } else if (args[i].equals("-XadditionalHeaders")) {
+            additionalHeaders = true;
+            return 1;
+        } else if (args[i].equals("-XdisableSSLHostnameVerification")) {
+            disableSSLHostnameVerification = true;
+            return 1;
         } else if (args[i].equals("-p")) {
             defaultPackage = requireArgument("-p", args, ++i);
             return 2;
@@ -173,6 +239,10 @@ public class WsimportOptions extends Options {
                 //Driver.usage(jaxbOptions,false);
                 throw new BadCommandLineException(e.getMessage(),e);
             }
+        } else if (args[i].equals("-Xauthfile")) {
+            String authfile = requireArgument("-Xauthfile", args, ++i);
+            authFile = new File(authfile);
+            return 2;
         }
 
         return 0; // what's this option?
@@ -182,12 +252,12 @@ public class WsimportOptions extends Options {
         if (wsdls.isEmpty()) {
             throw new BadCommandLineException(WscompileMessages.WSIMPORT_MISSING_FILE());
         }
+
         if(wsdlLocation == null){
             wsdlLocation = wsdls.get(0).getSystemId();
         }
     }
 
-
     @Override
     protected void addFile(String arg) throws BadCommandLineException {
         addFile(arg, wsdls, "*.wsdl");
@@ -360,5 +430,4 @@ public class WsimportOptions extends Options {
             }
         }
     }
-
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java
index 602bb94c994..656e3132340 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wscompile;
 
 import com.sun.codemodel.internal.CodeWriter;
@@ -42,6 +41,7 @@ import com.sun.tools.internal.ws.resources.WsdlMessages;
 import com.sun.tools.internal.xjc.util.NullStream;
 import com.sun.xml.internal.ws.api.server.Container;
 import com.sun.xml.internal.ws.util.ServiceFinder;
+import com.sun.istack.internal.tools.ParallelWorldClassLoader;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.SAXParseException;
 
@@ -53,6 +53,7 @@ import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.net.Authenticator;
 
 /**
  * @author Vivek Pandey
@@ -76,7 +77,6 @@ public class WsimportTool {
         this.container = container;
     }
 
-
     public boolean run(String[] args) {
         class Listener extends WsimportListener {
             ConsoleErrorReporter cer = new ConsoleErrorReporter(out == null ? new PrintStream(new NullStream()) : out);
@@ -106,6 +106,11 @@ public class WsimportTool {
                 cer.warning(exception);
             }
 
+            @Override
+            public void debug(SAXParseException exception) {
+                cer.debug(exception);
+            }
+
             @Override
             public void info(SAXParseException exception) {
                 cer.info(exception);
@@ -132,6 +137,13 @@ public class WsimportTool {
                 if (listener.isCanceled())
                     throw new AbortException();
             }
+
+            @Override
+            public void debug(SAXParseException exception){
+                if(options.debugMode){
+                    listener.debug(exception);
+                }
+            }
         };
 
         for (String arg : args) {
@@ -151,6 +163,11 @@ public class WsimportTool {
                 if( !options.quiet )
                     listener.message(WscompileMessages.WSIMPORT_PARSING_WSDL());
 
+                //set auth info
+                //if(options.authFile != null)
+                    Authenticator.setDefault(new DefaultAuthenticator(receiver, options.authFile));
+
+
                 WSDLModeler wsdlModeler = new WSDLModeler(options, receiver);
                 Model wsdlModel = wsdlModeler.buildModel();
                 if (wsdlModel == null) {
@@ -165,10 +182,13 @@ public class WsimportTool {
                 TJavaGeneratorExtension[] genExtn = ServiceFinder.find(TJavaGeneratorExtension.class).toArray();
                 CustomExceptionGenerator.generate(wsdlModel,  options, receiver);
                 SeiGenerator.generate(wsdlModel, options, receiver, genExtn);
+                if(receiver.hadError()){
+                    throw new AbortException();
+                }
                 ServiceGenerator.generate(wsdlModel, options, receiver);
                 CodeWriter cw = new WSCodeWriter(options.sourceDir, options);
                 if (options.verbose)
-                    cw = new ProgressCodeWriter(cw, System.out);
+                    cw = new ProgressCodeWriter(cw, out);
                 options.getCodeModel().build(cw);
             } catch(AbortException e){
                 //error might have been reported
@@ -177,7 +197,7 @@ public class WsimportTool {
             }
 
             if (!options.nocompile){
-                if(!compileGeneratedClasses(receiver)){
+                if(!compileGeneratedClasses(receiver, listener)){
                     listener.message(WscompileMessages.WSCOMPILE_COMPILATION_FAILED());
                     return false;
                 }
@@ -204,7 +224,20 @@ public class WsimportTool {
         this.options.entityResolver = resolver;
     }
 
-    protected boolean compileGeneratedClasses(ErrorReceiver receiver){
+    /*
+     * To take care of JDK6-JDK6u3, where 2.1 API classes are not there
+     */
+    private static boolean useBootClasspath(Class clazz) {
+        try {
+            ParallelWorldClassLoader.toJarUrl(clazz.getResource('/'+clazz.getName().replace('.','/')+".class"));
+            return true;
+        } catch(Exception e) {
+            return false;
+        }
+    }
+
+
+    protected boolean compileGeneratedClasses(ErrorReceiver receiver, WsimportListener listener){
         List<String> sourceFiles = new ArrayList<String>();
 
         for (File f : options.getGeneratedFiles()) {
@@ -216,14 +249,18 @@ public class WsimportTool {
         if (sourceFiles.size() > 0) {
             String classDir = options.destDir.getAbsolutePath();
             String classpathString = createClasspathString();
-            String[] args = new String[5 + (options.debug ? 1 : 0)
+            boolean bootCP = useBootClasspath(EndpointReference.class) || useBootClasspath(XmlSeeAlso.class);
+            String[] args = new String[4 + (bootCP ? 1 : 0) + (options.debug ? 1 : 0)
                     + sourceFiles.size()];
             args[0] = "-d";
             args[1] = classDir;
             args[2] = "-classpath";
             args[3] = classpathString;
-            args[4] = "-Xbootclasspath/p:"+JavaCompilerHelper.getJarFile(EndpointReference.class)+File.pathSeparator+JavaCompilerHelper.getJarFile(XmlSeeAlso.class);
-            int baseIndex = 5;
+            int baseIndex = 4;
+            if (bootCP) {
+                args[baseIndex++] = "-Xbootclasspath/p:"+JavaCompilerHelper.getJarFile(EndpointReference.class)+File.pathSeparator+JavaCompilerHelper.getJarFile(XmlSeeAlso.class);
+            }
+
             if (options.debug) {
                 args[baseIndex++] = "-g";
             }
@@ -231,6 +268,15 @@ public class WsimportTool {
                 args[baseIndex + i] = sourceFiles.get(i);
             }
 
+            listener.message(WscompileMessages.WSIMPORT_COMPILING_CODE());
+            if(options.verbose){
+                StringBuffer argstr = new StringBuffer();
+                for(String arg:args){
+                    argstr.append(arg).append(" ");
+                }
+                listener.message("javac "+ argstr.toString());
+            }
+
             return JavaCompilerHelper.compile(args, out, receiver);
         }
         //there are no files to compile, so return true?
@@ -238,11 +284,16 @@ public class WsimportTool {
     }
 
     private String createClasspathString() {
-        return System.getProperty("java.class.path");
+        String classpathStr = System.getProperty("java.class.path");
+        for(String s: options.cmdlineJars) {
+            classpathStr = classpathStr+File.pathSeparator+new File(s);
+        }
+        return classpathStr;
     }
 
     protected void usage(Options options) {
         System.out.println(WscompileMessages.WSIMPORT_HELP(WSIMPORT));
+        System.out.println(WscompileMessages.WSIMPORT_USAGE_EXTENSIONS());
         System.out.println(WscompileMessages.WSIMPORT_USAGE_EXAMPLES());
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java
index 3edea397cf1..11b11c23563 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java
@@ -53,8 +53,11 @@ public class Message extends GlobalEntity {
             throw new AbortException();
         }
 
-        _partsByName.put(part.getName(), part);
-        _parts.add(part);
+        if(part.getDescriptor() != null && part.getDescriptorKind() != null) {
+            _partsByName.put(part.getName(), part);
+            _parts.add(part);
+        } else
+            errorReceiver.warning(part.getLocator(), WsdlMessages.PARSING_ELEMENT_OR_TYPE_REQUIRED(part.getName()));
     }
 
     public Iterator<MessagePart> parts() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
index 6930f301a09..06e81f56289 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
@@ -232,15 +232,6 @@ public class JAXWSBinding extends ExtensionImpl {
         this.isProvider = isProvider;
     }
 
-    /* (non-Javadoc)
-     * @see Entity#getProperty(java.lang.String)
-     */
-    public Object getProperty(String key) {
-        if(key.equals(JAXWSBindingsConstants.JAXB_BINDINGS))
-            return jaxbBindings;
-        return null;
-    }
-
     /**
      * @return Returns the methodName.
      */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
index a48380871da..7809842184f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
@@ -134,26 +134,11 @@ public abstract class AbstractDocument {
         }
     }
 
-    public void undefine(GloballyKnown e) {
-        Map map = getMap(e.getKind());
-        if (e.getName() == null)
-            return;
-        QName name =
-            new QName(e.getDefining().getTargetNamespaceURI(), e.getName());
-
-        if (map.containsKey(name)){
-            errReceiver.error(e.getLocator(), WsdlMessages.ENTITY_NOT_FOUND_BY_Q_NAME(e.getElementName().getLocalPart(), e.getElementName().getNamespaceURI()));
-            throw new AbortException();
-        } else{
-            map.remove(name);
-        }
-    }
-
     public GloballyKnown find(Kind k, QName name) {
         Map map = getMap(k);
         Object result = map.get(name);
         if (result == null){
-            errReceiver.error(new LocatorImpl(), WsdlMessages.ENTITY_NOT_FOUND_BY_Q_NAME(name.getLocalPart(), name.getNamespaceURI()));
+            errReceiver.error(null, WsdlMessages.ENTITY_NOT_FOUND_BY_Q_NAME(k.getName(), name, _systemId));
             throw new AbortException();
         }
         return (GloballyKnown) result;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
index 83da2aad6ae..46108332cf8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
 import com.sun.istack.internal.SAXParseException2;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
index 8814ec649f9..0cb4188bfb0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
 import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
index 9659de4add0..9a3a1ffd7e5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
@@ -24,22 +24,23 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
+import com.sun.istack.internal.NotNull;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
+import com.sun.tools.internal.ws.wscompile.AbortException;
+import com.sun.tools.internal.ws.wscompile.DefaultAuthenticator;
 import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
 import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants;
-import com.sun.tools.internal.ws.resources.WscompileMessages;
 import com.sun.tools.internal.xjc.reader.internalizer.LocatorTable;
 import com.sun.xml.internal.bind.marshaller.DataWriter;
+import com.sun.xml.internal.ws.util.JAXWSUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
+import org.xml.sax.*;
 import org.xml.sax.helpers.XMLFilterImpl;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -51,17 +52,15 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXResult;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLSession;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.net.*;
+import java.util.*;
 
 /**
  * @author Vivek Pandey
@@ -134,10 +133,9 @@ public class DOMForest {
         return inlinedSchemaElements;
     }
 
-    public Document parse(InputSource source, boolean root) throws SAXException {
+    public @NotNull Document parse(InputSource source, boolean root) throws SAXException, IOException {
         if (source.getSystemId() == null)
             throw new IllegalArgumentException();
-
         return parse(source.getSystemId(), source, root);
     }
 
@@ -148,7 +146,7 @@ public class DOMForest {
      *
      * @return the parsed DOM document object.
      */
-    public Document parse(String systemId, boolean root) throws SAXException, IOException {
+    public Document parse(String systemId, boolean root) throws SAXException, IOException{
 
         systemId = normalizeSystemId(systemId);
 
@@ -179,13 +177,11 @@ public class DOMForest {
      *
      * @return null if there was a parse error. otherwise non-null.
      */
-    public Document parse(String systemId, InputSource inputSource, boolean root) throws SAXException {
+    public @NotNull Document parse(String systemId, InputSource inputSource, boolean root) throws SAXException, IOException{
         Document dom = documentBuilder.newDocument();
 
         systemId = normalizeSystemId(systemId);
 
-        boolean retryMex = false;
-        Exception exception = null;
         // put into the map before growing a tree, to
         // prevent recursive reference from causing infinite loop.
         core.put(systemId, dom);
@@ -201,8 +197,70 @@ public class DOMForest {
                 reader.setErrorHandler(errorReceiver);
             if (options.entityResolver != null)
                 reader.setEntityResolver(options.entityResolver);
+
+            InputStream is = null;
+            if(inputSource.getByteStream() != null){
+                is = inputSource.getByteStream();
+            }
+            if(is == null){
+                int redirects=0;
+                boolean redirect;
+                URL url = JAXWSUtils.getFileOrURL(inputSource.getSystemId());
+                URLConnection conn = url.openConnection();
+                if (conn instanceof HttpsURLConnection) {
+                    if (options.disableSSLHostnameVerification) {
+                        ((HttpsURLConnection) conn).setHostnameVerifier(new HttpClientVerifier());
+                    }
+                }
+
+                do {
+                    redirect = false;
+                    try {
+                        is = conn.getInputStream();
+                        //is = sun.net.www.protocol.http.HttpURLConnection.openConnectionCheckRedirects(conn);
+                    } catch (IOException e) {
+                        if (conn instanceof HttpURLConnection) {
+                            HttpURLConnection httpConn = ((HttpURLConnection) conn);
+                            int code = httpConn.getResponseCode();
+                            if (code == 401) {
+                                errorReceiver.error(new SAXParseException(WscompileMessages.WSIMPORT_AUTH_INFO_NEEDED(e.getMessage(), systemId, DefaultAuthenticator.defaultAuthfile), null, e));
+                                throw new AbortException();
+                            }
+                            //FOR other code we will retry with MEX
+                        }
+                        throw e;
+                    }
+
+                    //handle 302 or 303, JDK does not seem to handle 302 very well.
+                    //Need to redesign this a bit as we need to throw better error message for IOException in this case
+                    if (conn instanceof HttpURLConnection) {
+                        HttpURLConnection httpConn = ((HttpURLConnection) conn);
+                        int code = httpConn.getResponseCode();
+                        if (code == 302 || code == 303) {
+                            //retry with the value in Location header
+                            List<String> seeOther = httpConn.getHeaderFields().get("Location");
+                            if (seeOther != null && seeOther.size() > 0) {
+                                URL newurl = new URL(url, seeOther.get(0));
+                                if (!newurl.equals(url)){
+                                    errorReceiver.info(new SAXParseException(WscompileMessages.WSIMPORT_HTTP_REDIRECT(code, seeOther.get(0)), null));
+                                    url = newurl;
+                                    httpConn.disconnect();
+                                    if(redirects >= 5){
+                                        errorReceiver.error(new SAXParseException(WscompileMessages.WSIMPORT_MAX_REDIRECT_ATTEMPT(), null));
+                                        throw new AbortException();
+                                    }
+                                    conn = url.openConnection();
+                                    redirects++;
+                                    redirect = true;
+                                }
+                            }
+                        }
+                    }
+                } while (redirect);
+            }
+            inputSource.setByteStream(is);
             reader.parse(inputSource);
-             Element doc = dom.getDocumentElement();
+            Element doc = dom.getDocumentElement();
             if (doc == null) {
                 return null;
             }
@@ -211,18 +269,10 @@ public class DOMForest {
                 inlinedSchemaElements.add((Element) schemas.item(i));
             }
         } catch (ParserConfigurationException e) {
-            exception = e;
-        } catch (IOException e) {
-            exception = e;
-        } catch (SAXException e) {
-            exception = e;
+            errorReceiver.error(e);
+            throw new SAXException(e.getMessage());
         }
 
-        if (exception != null) {
-            errorReceiver.error(WscompileMessages.WSIMPORT_NO_WSDL(systemId), exception);
-            core.remove(systemId);
-            rootDocuments.remove(systemId);
-        }
         return dom;
     }
 
@@ -236,6 +286,14 @@ public class DOMForest {
         return externalReferences;
     }
 
+    // overide default SSL HttpClientVerifier to always return true
+    // effectively overiding Hostname client verification when using SSL
+    private static class HttpClientVerifier implements HostnameVerifier {
+        public boolean verify(String s, SSLSession sslSession) {
+            return true;
+        }
+    }
+
     public interface Handler extends ContentHandler {
         /**
          * Gets the DOM that was built.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java
new file mode 100644
index 00000000000..bc589dc1d61
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import org.w3c.dom.Document;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+
+import com.sun.xml.internal.xsom.parser.XMLParser;
+
+/**
+ * {@link XMLParser} implementation that
+ * parses XML from a DOM forest instead of parsing it from
+ * its original location.
+ *
+ * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Vivek Pandey
+ */
+public class DOMForestParser implements XMLParser {
+
+    /**
+     * DOM forest to be "parsed".
+     */
+    private final DOMForest forest;
+
+    /**
+     * Scanner object will do the actual SAX events generation.
+     */
+    private final DOMForestScanner scanner;
+
+    private final XMLParser fallbackParser;
+
+    /**
+     * @param fallbackParser This parser will be used when DOMForestParser needs to parse
+     *                       documents that are not in the forest.
+     */
+    public DOMForestParser(DOMForest forest, XMLParser fallbackParser) {
+        this.forest = forest;
+        this.scanner = new DOMForestScanner(forest);
+        this.fallbackParser = fallbackParser;
+    }
+
+
+    public void parse(InputSource source, ContentHandler handler,  EntityResolver entityResolver, ErrorHandler errHandler) throws SAXException, IOException {
+
+    }
+
+    public void parse(InputSource source, ContentHandler handler, ErrorHandler errorHandler, EntityResolver entityResolver)
+
+            throws SAXException, IOException {
+        String systemId = source.getSystemId();
+        Document dom = forest.get(systemId);
+
+        if (dom == null) {
+            // if no DOM tree is built for it,
+            // let the fall back parser parse the original document.
+            //
+            // for example, XSOM parses datatypes.xsd (XML Schema part 2)
+            // but this will never be built into the forest.
+            fallbackParser.parse(source, handler, errorHandler, entityResolver);
+            return;
+        }
+
+        scanner.scan(dom, handler);
+
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
index 4638163f24d..e46945418bd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
 import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
index f3d5c7516e9..db92dc2683f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
 import org.w3c.dom.Element;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
index ec65482bd63..a3343f17a06 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
@@ -33,9 +33,14 @@ import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 import com.sun.tools.internal.ws.wsdl.document.jaxws.JAXWSBindingsConstants;
 import com.sun.tools.internal.xjc.util.DOMUtils;
 import com.sun.xml.internal.bind.v2.util.EditDistance;
-import com.sun.xml.internal.ws.util.JAXWSUtils;
 import com.sun.xml.internal.ws.util.DOMUtil;
-import org.w3c.dom.*;
+import com.sun.xml.internal.ws.util.JAXWSUtils;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXParseException;
 
 import javax.xml.namespace.NamespaceContext;
@@ -45,11 +50,17 @@ import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 
 /**
  * Internalizes external binding declarations.
+ *
  * @author Vivek Pandey
  */
 public class Internalizer {
@@ -66,28 +77,28 @@ public class Internalizer {
         this.errorReceiver = errorReceiver;
     }
 
-    public void transform(){
-        Map<Element,Node> targetNodes = new HashMap<Element,Node>();
-        for(Element jaxwsBinding : forest.outerMostBindings){
-            buildTargetNodeMap(jaxwsBinding, jaxwsBinding, targetNodes );
+    public void transform() {
+        Map<Element, Node> targetNodes = new HashMap<Element, Node>();
+        for (Element jaxwsBinding : forest.outerMostBindings) {
+            buildTargetNodeMap(jaxwsBinding, jaxwsBinding, targetNodes);
         }
-        for(Element jaxwsBinding : forest.outerMostBindings){
-            move(jaxwsBinding, targetNodes );
+        for (Element jaxwsBinding : forest.outerMostBindings) {
+            move(jaxwsBinding, targetNodes);
         }
     }
 
     /**
      * Validates attributes of a &lt;JAXWS:bindings> element.
      */
-    private void validate( Element bindings ) {
+    private void validate(Element bindings) {
         NamedNodeMap atts = bindings.getAttributes();
-        for( int i=0; i<atts.getLength(); i++ ) {
-            Attr a = (Attr)atts.item(i);
-            if( a.getNamespaceURI()!=null )
+        for (int i = 0; i < atts.getLength(); i++) {
+            Attr a = (Attr) atts.item(i);
+            if (a.getNamespaceURI() != null)
                 continue;   // all foreign namespace OK.
-            if( a.getLocalName().equals("node") )
+            if (a.getLocalName().equals("node"))
                 continue;
-            if( a.getLocalName().equals("wsdlLocation"))
+            if (a.getLocalName().equals("wsdlLocation"))
                 continue;
 
             // TODO: flag error for this undefined attribute
@@ -99,29 +110,34 @@ public class Internalizer {
      * by using the inherited target node, then put
      * the result into the "result" map.
      */
-    private void buildTargetNodeMap( Element bindings, Node inheritedTarget, Map<Element, Node> result ) {
+    private void buildTargetNodeMap(Element bindings, Node inheritedTarget, Map<Element, Node> result) {
         // start by the inherited target
         Node target = inheritedTarget;
 
         validate(bindings); // validate this node
 
         // look for @wsdlLocation
-        if( bindings.getAttributeNode("wsdlLocation")!=null ) {
-            String wsdlLocation = bindings.getAttribute("wsdlLocation");
+        if (isTopLevelBinding(bindings)) {
+            String wsdlLocation;
+            if (bindings.getAttributeNode("wsdlLocation") != null) {
+                wsdlLocation = bindings.getAttribute("wsdlLocation");
 
-            try {
-                // absolutize this URI.
-                // TODO: use the URI class
-                // TODO: honor xml:base
-                wsdlLocation = new URL(new URL(forest.getSystemId(bindings.getOwnerDocument())),
-                        wsdlLocation ).toExternalForm();
-            } catch( MalformedURLException e ) {
-                wsdlLocation = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation));
+                try {
+                    // absolutize this URI.
+                    // TODO: use the URI class
+                    // TODO: honor xml:base
+                    wsdlLocation = new URL(new URL(forest.getSystemId(bindings.getOwnerDocument())),
+                            wsdlLocation).toExternalForm();
+                } catch (MalformedURLException e) {
+                    wsdlLocation = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation));
+                }
+            } else {
+                //the node does not have
+                wsdlLocation = forest.getFirstRootDocument();
             }
-
-            //target = wsdlDocuments.get(wsdlLocation);
             target = forest.get(wsdlLocation);
-            if(target==null) {
+
+            if (target == null) {
                 reportError(bindings, WsdlMessages.INTERNALIZER_INCORRECT_SCHEMA_REFERENCE(wsdlLocation, EditDistance.findNearest(wsdlLocation, forest.listSystemIDs())));
                 return; // abort processing this <JAXWS:bindings>
             }
@@ -134,7 +150,7 @@ public class Internalizer {
         if (element != null && element.getNamespaceURI().equals(Constants.NS_WSDL) && element.getLocalName().equals("definitions")) {
             //get all schema elements
             Element type = DOMUtils.getFirstChildElement(element, Constants.NS_WSDL, "types");
-            if(type != null){
+            if (type != null) {
                 for (Element schemaElement : DOMUtils.getChildElements(type, Constants.NS_XSD, "schema")) {
                     if (!schemaElement.hasAttributeNS(Constants.NS_XMLNS, "jaxb")) {
                         schemaElement.setAttributeNS(Constants.NS_XMLNS, "xmlns:jaxb", JAXWSBindingsConstants.NS_JAXB_BINDINGS);
@@ -150,88 +166,91 @@ public class Internalizer {
 
 
         boolean hasNode = true;
-        if((isJAXWSBindings(bindings) || isJAXBBindings(bindings)) && bindings.getAttributeNode("node")!=null ) {
+        if ((isJAXWSBindings(bindings) || isJAXBBindings(bindings)) && bindings.getAttributeNode("node") != null) {
             target = evaluateXPathNode(bindings, target, bindings.getAttribute("node"), new NamespaceContextImpl(bindings));
-        }else if(isJAXWSBindings(bindings) && (bindings.getAttributeNode("node")==null) && !isTopLevelBinding(bindings)) {
+        } else
+        if (isJAXWSBindings(bindings) && (bindings.getAttributeNode("node") == null) && !isTopLevelBinding(bindings)) {
             hasNode = false;
-        }else if(isGlobalBinding(bindings) && !isWSDLDefinition(target) && isTopLevelBinding(bindings.getParentNode())){
+        } else
+        if (isGlobalBinding(bindings) && !isWSDLDefinition(target) && isTopLevelBinding(bindings.getParentNode())) {
             target = getWSDLDefintionNode(bindings, target);
         }
 
         //if target is null it means the xpath evaluation has some problem,
         // just return
-        if(target == null)
+        if (target == null)
             return;
 
         // update the result map
-        if(hasNode)
-            result.put( bindings, target );
+        if (hasNode)
+            result.put(bindings, target);
 
         // look for child <JAXWS:bindings> and process them recursively
-        Element[] children = getChildElements( bindings);
+        Element[] children = getChildElements(bindings);
         for (Element child : children)
             buildTargetNodeMap(child, target, result);
     }
 
-    private Node getWSDLDefintionNode(Node bindings, Node target){
+    private Node getWSDLDefintionNode(Node bindings, Node target) {
         return evaluateXPathNode(bindings, target, "wsdl:definitions",
-            new NamespaceContext(){
-                public String getNamespaceURI(String prefix){
-                    return "http://schemas.xmlsoap.org/wsdl/";
-                }
-                public String getPrefix(String nsURI){
-                    throw new UnsupportedOperationException();
-                }
-                public Iterator getPrefixes(String namespaceURI) {
-                    throw new UnsupportedOperationException();
-                }});
+                new NamespaceContext() {
+                    public String getNamespaceURI(String prefix) {
+                        return "http://schemas.xmlsoap.org/wsdl/";
+                    }
+
+                    public String getPrefix(String nsURI) {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public Iterator getPrefixes(String namespaceURI) {
+                        throw new UnsupportedOperationException();
+                    }
+                });
     }
 
-    private boolean isWSDLDefinition(Node target){
-        if(target == null)
+    private boolean isWSDLDefinition(Node target) {
+        if (target == null)
             return false;
         String localName = target.getLocalName();
         String nsURI = target.getNamespaceURI();
         return fixNull(localName).equals("definitions") && fixNull(nsURI).equals("http://schemas.xmlsoap.org/wsdl/");
     }
 
-    private boolean isTopLevelBinding(Node node){
-        if(node instanceof Document)
-            node = ((Document)node).getDocumentElement();
-        return ((node != null) && (((Element)node).getAttributeNode("wsdlLocation") != null));
+    private boolean isTopLevelBinding(Node node) {
+        return node.getOwnerDocument().getDocumentElement() == node;
     }
 
-    private boolean isJAXWSBindings(Node bindings){
+    private boolean isJAXWSBindings(Node bindings) {
         return (bindings.getNamespaceURI().equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS) && bindings.getLocalName().equals("bindings"));
     }
 
-    private boolean isJAXBBindings(Node bindings){
+    private boolean isJAXBBindings(Node bindings) {
         return (bindings.getNamespaceURI().equals(JAXWSBindingsConstants.NS_JAXB_BINDINGS) && bindings.getLocalName().equals("bindings"));
     }
 
-    private boolean isGlobalBinding(Node bindings){
-        if(bindings.getNamespaceURI() == null){
+    private boolean isGlobalBinding(Node bindings) {
+        if (bindings.getNamespaceURI() == null) {
             errorReceiver.warning(forest.locatorTable.getStartLocation((Element) bindings), WsdlMessages.INVALID_CUSTOMIZATION_NAMESPACE(bindings.getLocalName()));
             return false;
         }
-        return  (bindings.getNamespaceURI().equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS) &&
+        return (bindings.getNamespaceURI().equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS) &&
                 (bindings.getLocalName().equals("package") ||
-                bindings.getLocalName().equals("enableAsyncMapping") ||
-                bindings.getLocalName().equals("enableAdditionalSOAPHeaderMapping") ||
-                bindings.getLocalName().equals("enableWrapperStyle") ||
-                bindings.getLocalName().equals("enableMIMEContent")));
+                        bindings.getLocalName().equals("enableAsyncMapping") ||
+                        bindings.getLocalName().equals("enableAdditionalSOAPHeaderMapping") ||
+                        bindings.getLocalName().equals("enableWrapperStyle") ||
+                        bindings.getLocalName().equals("enableMIMEContent")));
     }
 
     private static Element[] getChildElements(Element parent) {
         ArrayList<Element> a = new ArrayList<Element>();
         NodeList children = parent.getChildNodes();
-        for( int i=0; i<children.getLength(); i++ ) {
+        for (int i = 0; i < children.getLength(); i++) {
             Node item = children.item(i);
-            if(!(item instanceof Element ))     continue;
+            if (!(item instanceof Element)) continue;
 
-            if(JAXWSBindingsConstants.NS_JAXWS_BINDINGS.equals(item.getNamespaceURI()) ||
+            if (JAXWSBindingsConstants.NS_JAXWS_BINDINGS.equals(item.getNamespaceURI()) ||
                     JAXWSBindingsConstants.NS_JAXB_BINDINGS.equals(item.getNamespaceURI()))
-                a.add((Element)item);
+                a.add((Element) item);
         }
         return a.toArray(new Element[a.size()]);
     }
@@ -240,24 +259,24 @@ public class Internalizer {
         NodeList nlst;
         try {
             xpath.setNamespaceContext(namespaceContext);
-            nlst = (NodeList)xpath.evaluate(expression, target, XPathConstants.NODESET);
+            nlst = (NodeList) xpath.evaluate(expression, target, XPathConstants.NODESET);
         } catch (XPathExpressionException e) {
             reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATION_ERROR(e.getMessage()), e);
             return null; // abort processing this <jaxb:bindings>
         }
 
-        if( nlst.getLength()==0 ) {
+        if (nlst.getLength() == 0) {
             reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATES_TO_NO_TARGET(expression));
             return null; // abort
         }
 
-        if( nlst.getLength()!=1 ) {
+        if (nlst.getLength() != 1) {
             reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVAULATES_TO_TOO_MANY_TARGETS(expression, nlst.getLength()));
             return null; // abort
         }
 
         Node rnode = nlst.item(0);
-        if(!(rnode instanceof Element )) {
+        if (!(rnode instanceof Element)) {
             reportError((Element) bindings, WsdlMessages.INTERNALIZER_X_PATH_EVALUATES_TO_NON_ELEMENT(expression));
             return null; // abort
         }
@@ -267,9 +286,9 @@ public class Internalizer {
     /**
      * Moves JAXWS customizations under their respective target nodes.
      */
-    private void move( Element bindings, Map<Element, Node> targetNodes ) {
+    private void move(Element bindings, Map<Element, Node> targetNodes) {
         Node target = targetNodes.get(bindings);
-        if(target==null)
+        if (target == null)
             // this must be the result of an error on the external binding.
             // recover from the error by ignoring this node
             return;
@@ -277,52 +296,49 @@ public class Internalizer {
         Element[] children = DOMUtils.getChildElements(bindings);
 
         for (Element item : children) {
-            if ("bindings".equals(item.getLocalName())){
-            // process child <jaxws:bindings> recursively
+            if ("bindings".equals(item.getLocalName())) {
+                // process child <jaxws:bindings> recursively
                 move(item, targetNodes);
-            }else if(isGlobalBinding(item)){
+            } else if (isGlobalBinding(item)) {
                 target = targetNodes.get(item);
-                moveUnder(item,(Element)target);
-            }else {
+                moveUnder(item, (Element) target);
+            } else {
                 if (!(target instanceof Element)) {
                     return; // abort
                 }
                 // move this node under the target
-                moveUnder(item,(Element)target);
+                moveUnder(item, (Element) target);
             }
         }
     }
 
-    private boolean isJAXBBindingElement(Element e){
+    private boolean isJAXBBindingElement(Element e) {
         return fixNull(e.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXB_BINDINGS);
     }
 
-    private boolean isJAXWSBindingElement(Element e){
+    private boolean isJAXWSBindingElement(Element e) {
         return fixNull(e.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS);
     }
 
     /**
      * Moves the "decl" node under the "target" node.
      *
-     * @param decl
-     *      A JAXWS customization element (e.g., &lt;JAXWS:class>)
-     *
-     * @param target
-     *      XML wsdl element under which the declaration should move.
-     *      For example, &lt;xs:element>
+     * @param decl   A JAXWS customization element (e.g., &lt;JAXWS:class>)
+     * @param target XML wsdl element under which the declaration should move.
+     *               For example, &lt;xs:element>
      */
-    private void moveUnder( Element decl, Element target ) {
+    private void moveUnder(Element decl, Element target) {
 
         //if there is @node on decl and has a child element jaxb:bindings, move it under the target
         //Element jaxb = getJAXBBindingElement(decl);
-        if(isJAXBBindingElement(decl)){
+        if (isJAXBBindingElement(decl)) {
             //add jaxb namespace declaration
-            if(!target.hasAttributeNS(Constants.NS_XMLNS, "jaxb")){
+            if (!target.hasAttributeNS(Constants.NS_XMLNS, "jaxb")) {
                 target.setAttributeNS(Constants.NS_XMLNS, "xmlns:jaxb", JAXWSBindingsConstants.NS_JAXB_BINDINGS);
             }
 
             //add jaxb:bindings version info. Lets put it to 1.0, may need to change latter
-            if(!target.hasAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "version")){
+            if (!target.hasAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "version")) {
                 target.setAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "jaxb:version", JAXWSBindingsConstants.JAXB_BINDING_VERSION);
             }
 
@@ -334,7 +350,7 @@ public class Internalizer {
             // it can't support user-defined extensions. This needs more careful thought.
 
             //JAXB doesn't allow writing jaxb:extensionbindingPrefix anywhere other than root element so lets write only on <xs:schema>
-            if(target.getLocalName().equals("schema") && target.getNamespaceURI().equals(Constants.NS_XSD)&& !target.hasAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "extensionBindingPrefixes")){
+            if (target.getLocalName().equals("schema") && target.getNamespaceURI().equals(Constants.NS_XSD) && !target.hasAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "extensionBindingPrefixes")) {
                 target.setAttributeNS(JAXWSBindingsConstants.NS_JAXB_BINDINGS, "jaxb:extensionBindingPrefixes", "xjc");
                 target.setAttributeNS(Constants.NS_XMLNS, "xmlns:xjc", JAXWSBindingsConstants.NS_XJC_BINDINGS);
             }
@@ -342,83 +358,83 @@ public class Internalizer {
             //insert xs:annotation/xs:appinfo where in jaxb:binding will be put
             target = refineSchemaTarget(target);
             copyInscopeNSAttributes(decl);
-        }else if(isJAXWSBindingElement(decl)){
+        } else if (isJAXWSBindingElement(decl)) {
             //add jaxb namespace declaration
-            if(!target.hasAttributeNS(Constants.NS_XMLNS, "JAXWS")){
+            if (!target.hasAttributeNS(Constants.NS_XMLNS, "JAXWS")) {
                 target.setAttributeNS(Constants.NS_XMLNS, "xmlns:JAXWS", JAXWSBindingsConstants.NS_JAXWS_BINDINGS);
             }
 
             //insert xs:annotation/xs:appinfo where in jaxb:binding will be put
             target = refineWSDLTarget(target);
             copyInscopeNSAttributes(decl);
-        }else{
+        } else {
             return;
         }
 
         // finally move the declaration to the target node.
-        if( target.getOwnerDocument()!=decl.getOwnerDocument() ) {
+        if (target.getOwnerDocument() != decl.getOwnerDocument()) {
             // if they belong to different DOM documents, we need to clone them
-            decl = (Element)target.getOwnerDocument().importNode(decl,true);
+            decl = (Element) target.getOwnerDocument().importNode(decl, true);
 
         }
 
-        target.appendChild( decl );
+        target.appendChild(decl);
     }
 
     /**
-     *  Copy in-scope namespace declarations of the decl node
-     *  to the decl node itself so that this move won't change
-     *  the in-scope namespace bindings.
+     * Copy in-scope namespace declarations of the decl node
+     * to the decl node itself so that this move won't change
+     * the in-scope namespace bindings.
      */
-    private void copyInscopeNSAttributes(Element e){
+    private void copyInscopeNSAttributes(Element e) {
         Element p = e;
         Set<String> inscopes = new HashSet<String>();
-        while(true) {
+        while (true) {
             NamedNodeMap atts = p.getAttributes();
-            for( int i=0; i<atts.getLength(); i++ ) {
-                Attr a = (Attr)atts.item(i);
-                if( Constants.NS_XMLNS.equals(a.getNamespaceURI()) ) {
+            for (int i = 0; i < atts.getLength(); i++) {
+                Attr a = (Attr) atts.item(i);
+                if (Constants.NS_XMLNS.equals(a.getNamespaceURI())) {
                     String prefix;
-                    if( a.getName().indexOf(':')==-1 )  prefix = "";
-                    else                                prefix = a.getLocalName();
+                    if (a.getName().indexOf(':') == -1) prefix = "";
+                    else prefix = a.getLocalName();
 
-                    if( inscopes.add(prefix) && p!=e ) {
+                    if (inscopes.add(prefix) && p != e) {
                         // if this is the first time we see this namespace bindings,
                         // copy the declaration.
                         // if p==decl, there's no need to. Note that
                         // we want to add prefix to inscopes even if p==Decl
 
-                        e.setAttributeNodeNS( (Attr)a.cloneNode(true) );
+                        e.setAttributeNodeNS((Attr) a.cloneNode(true));
                     }
                 }
             }
 
-            if( p.getParentNode() instanceof Document )
+            if (p.getParentNode() instanceof Document)
                 break;
 
-            p = (Element)p.getParentNode();
+            p = (Element) p.getParentNode();
         }
 
-        if( !inscopes.contains("") ) {
+        if (!inscopes.contains("")) {
             // if the default namespace was undeclared in the context of decl,
             // it must be explicitly set to "" since the new environment might
             // have a different default namespace URI.
-            e.setAttributeNS(Constants.NS_XMLNS,"xmlns","");
+            e.setAttributeNS(Constants.NS_XMLNS, "xmlns", "");
         }
     }
 
     public Element refineSchemaTarget(Element target) {
         // look for existing xs:annotation
         Element annotation = DOMUtils.getFirstChildElement(target, Constants.NS_XSD, "annotation");
-        if(annotation==null)
+        if (annotation == null)
             // none exists. need to make one
-            annotation = insertXMLSchemaElement( target, "annotation" );
+            annotation = insertXMLSchemaElement(target, "annotation");
 
         // then look for appinfo
-        Element appinfo = DOMUtils.getFirstChildElement(annotation, Constants.NS_XSD, "appinfo" );
-        if(appinfo==null)
+        Element appinfo = DOMUtils.getFirstChildElement(annotation, Constants.NS_XSD, "appinfo");
+        if (appinfo == null)
             // none exists. need to make one
-            appinfo = insertXMLSchemaElement( annotation, "appinfo" );
+            appinfo = insertXMLSchemaElement(annotation, "appinfo");
 
         return appinfo;
     }
@@ -426,9 +442,9 @@ public class Internalizer {
     public Element refineWSDLTarget(Element target) {
         // look for existing xs:annotation
         Element JAXWSBindings = DOMUtils.getFirstChildElement(target, JAXWSBindingsConstants.NS_JAXWS_BINDINGS, "bindings");
-        if(JAXWSBindings==null)
+        if (JAXWSBindings == null)
             // none exists. need to make one
-            JAXWSBindings = insertJAXWSBindingsElement(target, "bindings" );
+            JAXWSBindings = insertJAXWSBindingsElement(target, "bindings");
         return JAXWSBindings;
     }
 
@@ -436,63 +452,63 @@ public class Internalizer {
      * Creates a new XML Schema element of the given local name
      * and insert it as the first child of the given parent node.
      *
-     * @return
-     *      Newly create element.
+     * @return Newly create element.
      */
-    private Element insertXMLSchemaElement( Element parent, String localName ) {
+    private Element insertXMLSchemaElement(Element parent, String localName) {
         // use the same prefix as the parent node to avoid modifying
         // the namespace binding.
         String qname = parent.getTagName();
         int idx = qname.indexOf(':');
-        if(idx==-1)     qname = localName;
-        else            qname = qname.substring(0,idx+1)+localName;
+        if (idx == -1) qname = localName;
+        else qname = qname.substring(0, idx + 1) + localName;
 
-        Element child = parent.getOwnerDocument().createElementNS( Constants.NS_XSD, qname );
+        Element child = parent.getOwnerDocument().createElementNS(Constants.NS_XSD, qname);
 
         NodeList children = parent.getChildNodes();
 
-        if( children.getLength()==0 )
+        if (children.getLength() == 0)
             parent.appendChild(child);
         else
-            parent.insertBefore( child, children.item(0) );
+            parent.insertBefore(child, children.item(0));
 
         return child;
     }
 
-    private Element insertJAXWSBindingsElement( Element parent, String localName ) {
-        String qname = "JAXWS:"+localName;
+    private Element insertJAXWSBindingsElement(Element parent, String localName) {
+        String qname = "JAXWS:" + localName;
 
-        Element child = parent.getOwnerDocument().createElementNS(JAXWSBindingsConstants.NS_JAXWS_BINDINGS, qname );
+        Element child = parent.getOwnerDocument().createElementNS(JAXWSBindingsConstants.NS_JAXWS_BINDINGS, qname);
 
         NodeList children = parent.getChildNodes();
 
-        if( children.getLength()==0 )
+        if (children.getLength() == 0)
             parent.appendChild(child);
         else
-            parent.insertBefore( child, children.item(0) );
+            parent.insertBefore(child, children.item(0));
 
         return child;
     }
 
-    private static @NotNull String fixNull(@Nullable String s) {
-        if(s==null) return "";
-        else        return s;
+    private static
+    @NotNull
+    String fixNull(@Nullable String s) {
+        if (s == null) return "";
+        else return s;
     }
 
 
-    private void reportError( Element errorSource, String formattedMsg ) {
-        reportError( errorSource, formattedMsg, null );
+    private void reportError(Element errorSource, String formattedMsg) {
+        reportError(errorSource, formattedMsg, null);
     }
 
-    private void reportError( Element errorSource,
-        String formattedMsg, Exception nestedException ) {
+    private void reportError(Element errorSource,
+                             String formattedMsg, Exception nestedException) {
 
-        SAXParseException e = new SAXParseException2( formattedMsg,
-            forest.locatorTable.getStartLocation(errorSource),
-            nestedException );
+        SAXParseException e = new SAXParseException2(formattedMsg,
+                forest.locatorTable.getStartLocation(errorSource),
+                nestedException);
         errorReceiver.error(e);
     }
 
 
-
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
index 7f5d0fab387..4306013a5b7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: MemberSubmissionAddressingExtensionHandler.java,v 1.1.2.6 2006/10/31 19:52:07 vivekp Exp $
- */
 
 package com.sun.tools.internal.ws.wsdl.parser;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
index b08905c0d9e..2d1bd833805 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
@@ -24,9 +24,11 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.tools.internal.ws.resources.WscompileMessages;
 import com.sun.tools.internal.ws.resources.WsdlMessages;
 import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
 import com.sun.tools.internal.ws.wscompile.WsimportOptions;
@@ -38,24 +40,23 @@ import com.sun.xml.internal.ws.api.wsdl.parser.MetadataResolverFactory;
 import com.sun.xml.internal.ws.api.wsdl.parser.ServiceDescriptor;
 import com.sun.xml.internal.ws.util.DOMUtil;
 import com.sun.xml.internal.ws.util.ServiceFinder;
-import com.sun.istack.internal.Nullable;
-import com.sun.istack.internal.NotNull;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.helpers.LocatorImpl;
+import org.xml.sax.SAXParseException;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
+import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.HashSet;
-import java.io.IOException;
 
 /**
  * @author Vivek Pandey
@@ -72,36 +73,47 @@ public final class MetadataFinder extends DOMForest{
 
     }
 
-    public void parseWSDL() throws SAXException, IOException {
+    public void parseWSDL(){
         // parse source grammars
         for (InputSource value : options.getWSDLs()) {
             String systemID = value.getSystemId();
             errorReceiver.pollAbort();
 
+            Document dom ;
+            Element doc = null;
+
+            try {
             //if there is entity resolver use it
             if (options.entityResolver != null)
                 value = options.entityResolver.resolveEntity(null, systemID);
             if (value == null)
                 value = new InputSource(systemID);
+                dom = parse(value, true);
 
+                doc = dom.getDocumentElement();
+                if (doc == null) {
+                    continue;
+                }
+                //if its not a WSDL document, retry with MEX
+                if (doc.getNamespaceURI() == null || !doc.getNamespaceURI().equals(WSDLConstants.NS_WSDL) || !doc.getLocalName().equals("definitions")) {
+                    throw new SAXParseException(WsdlMessages.INVALID_WSDL(systemID,
+                        com.sun.xml.internal.ws.wsdl.parser.WSDLConstants.QNAME_DEFINITIONS, doc.getNodeName(), locatorTable.getStartLocation(doc).getLineNumber()), locatorTable.getStartLocation(doc));
+                }
+            } catch(FileNotFoundException e){
+                errorReceiver.error(WsdlMessages.FILE_NOT_FOUND(systemID), e);
+                return;
+            } catch (IOException e) {
+                doc = getFromMetadataResolver(systemID, e);
+            } catch (SAXParseException e) {
+                doc = getFromMetadataResolver(systemID, e);
+            } catch (SAXException e) {
+                doc = getFromMetadataResolver(systemID, e);
+            }
 
-            Document dom = parse(value, true);
-            if (dom == null)
-                continue;
-            Element doc = dom.getDocumentElement();
             if (doc == null) {
                 continue;
             }
-            //if its not a WSDL document, retry with MEX
-            if (doc.getNamespaceURI() == null || !doc.getNamespaceURI().equals(WSDLConstants.NS_WSDL) || !doc.getLocalName().equals("definitions")) {
-                core.remove(systemID);
-                rootDocuments.remove(systemID);
-                errorReceiver.warning(locatorTable.getStartLocation(doc), WsdlMessages.INVALID_WSDL_WITH_DOOC(systemID, "{" + fixNull(doc.getNamespaceURI()) + "}" + doc.getLocalName()));
-                dom = getFromMetadataResolver(systemID);
-                if(dom == null)
-                    continue;
-                doc = dom.getDocumentElement();
-            }
+
             NodeList schemas = doc.getElementsByTagNameNS(SchemaConstants.NS_XSD, "schema");
             for (int i = 0; i < schemas.getLength(); i++) {
                 if(!inlinedSchemaElements.contains(schemas.item(i)))
@@ -137,7 +149,7 @@ public final class MetadataFinder extends DOMForest{
             Document doc = get(location);
             if(doc!=null){
                 Element definition = doc.getDocumentElement();
-                if(definition == null)
+                if(definition == null || definition.getLocalName() == null || definition.getNamespaceURI() == null)
                     continue;
                 if(definition.getNamespaceURI().equals(WSDLConstants.NS_WSDL) && definition.getLocalName().equals("definitions")){
                     rootWsdls.add(location);
@@ -151,17 +163,17 @@ public final class MetadataFinder extends DOMForest{
                 }
             }
         }
+        //no wsdl with wsdl:service found, throw error
+        if(rootWSDL == null){
+            StringBuffer strbuf = new StringBuffer();
+            for(String str : rootWsdls){
+                strbuf.append(str);
+                strbuf.append('\n');
+            }
+            errorReceiver.error(null, WsdlMessages.FAILED_NOSERVICE(strbuf.toString()));
+        }
     }
 
-
-
-
-    private String fixNull(String s) {
-        if (s == null) return "";
-        else return s;
-    }
-
-
     /*
     * If source and target namespace are also passed in,
     * then if the mex resolver is found and it cannot get
@@ -170,10 +182,9 @@ public final class MetadataFinder extends DOMForest{
     * This behavior should only happen when trying a
     * mex request first.
     */
-    private Document getFromMetadataResolver(String systemId) {
-
+    private @Nullable Element getFromMetadataResolver(String systemId, Exception ex) {
         //try MEX
-        MetaDataResolver resolver = null;
+        MetaDataResolver resolver;
         ServiceDescriptor serviceDescriptor = null;
         for (MetadataResolverFactory resolverFactory : ServiceFinder.find(MetadataResolverFactory.class)) {
             resolver = resolverFactory.metadataResolver(options.entityResolver);
@@ -188,14 +199,15 @@ public final class MetadataFinder extends DOMForest{
         }
 
         if (serviceDescriptor != null) {
+            errorReceiver.warning(new SAXParseException(WsdlMessages.TRY_WITH_MEX(ex.getMessage()), null, ex));
             return parseMetadata(systemId, serviceDescriptor);
         } else {
-            errorReceiver.error(new LocatorImpl(), WsdlMessages.PARSING_UNABLE_TO_GET_METADATA(systemId));
+            errorReceiver.error(null, WsdlMessages.PARSING_UNABLE_TO_GET_METADATA(ex.getMessage(), WscompileMessages.WSIMPORT_NO_WSDL(systemId)), ex);
         }
         return null;
     }
 
-    private Document parseMetadata(String systemId, ServiceDescriptor serviceDescriptor) {
+    private Element parseMetadata(@NotNull String systemId, @NotNull ServiceDescriptor serviceDescriptor) {
         List<? extends Source> mexWsdls = serviceDescriptor.getWSDLs();
         List<? extends Source> mexSchemas = serviceDescriptor.getSchemas();
         Document root = null;
@@ -220,8 +232,8 @@ public final class MetadataFinder extends DOMForest{
                     }
                 }
                 NodeList nl = doc.getDocumentElement().getElementsByTagNameNS(WSDLConstants.NS_WSDL, "import");
-                if (nl.getLength() > 0) {
-                    Element imp = (Element) nl.item(0);
+                for(int i = 0; i < nl.getLength(); i++){
+                    Element imp = (Element) nl.item(i);
                     String loc = imp.getAttribute("location");
                     if (loc != null) {
                         if (!externalReferences.contains(loc))
@@ -247,6 +259,6 @@ public final class MetadataFinder extends DOMForest{
             //TODO:handle SAXSource
             //TODO:handler StreamSource
         }
-        return root;
+        return root.getDocumentElement();
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
index b0010ff2c2c..3971e38011b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
@@ -2,7 +2,7 @@
  * reserved comment block
  * DO NOT REMOVE OR ALTER!
  */
-/*
+ /*
  * Portions Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -29,6 +29,22 @@
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.sun.tools.internal.ws.wsdl.parser;
 
 import com.sun.xml.internal.bind.v2.WellKnownNamespace;
@@ -47,21 +63,6 @@ public class NamespaceContextImpl implements NamespaceContext {
         this.e = e;
     }
 
-    /*
-     * Copyright 1999-2004 The Apache Software Foundation.
-     *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     */
     public String getNamespaceURI(String prefix) {
         Node parent = e;
         String namespace = null;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
index ce752e345e5..09a2315d87e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
 import com.sun.tools.internal.ws.resources.WsdlMessages;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
index b948a882d89..7705d097ba5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: W3CAddressingExtensionHandler.java,v 1.1.2.9 2007/02/06 00:33:38 kohsuke Exp $
- */
 
 package com.sun.tools.internal.ws.wsdl.parser;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
index 885f821efc8..b0e4f0ac9b8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
 import com.sun.tools.internal.ws.wsdl.document.WSDLConstants;
@@ -56,9 +55,14 @@ public class WSDLInternalizationLogic implements InternalizationLogic{
                     //TODO: add support for importing schema using wsdl:import
                 }
                 return atts.getValue("location");
-            }else if(SchemaConstants.NS_XSD.equals(nsURI) && "import".equals(localName)){
+            }
+            /*
+            We don't need to do this anymore, JAXB handles the schema imports, includes etc.
+
+            else if(SchemaConstants.NS_XSD.equals(nsURI) && "import".equals(localName)){
                 return atts.getValue("schemaLocation");
             }
+            */
             return null;
         }
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
index c3bf8af4f94..57e0dc36544 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
@@ -29,9 +29,8 @@ import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensible;
 import com.sun.tools.internal.ws.api.wsdl.TWSDLExtensionHandler;
 import com.sun.tools.internal.ws.resources.WsdlMessages;
 import com.sun.tools.internal.ws.util.xml.XmlUtil;
-import com.sun.tools.internal.ws.wscompile.ErrorReceiver;
-import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 import com.sun.tools.internal.ws.wscompile.ErrorReceiverFilter;
+import com.sun.tools.internal.ws.wscompile.WsimportOptions;
 import com.sun.tools.internal.ws.wsdl.document.Binding;
 import com.sun.tools.internal.ws.wsdl.document.BindingFault;
 import com.sun.tools.internal.ws.wsdl.document.BindingInput;
@@ -68,11 +67,11 @@ import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.io.IOException;
 
 /**
  * A parser for WSDL documents. This parser is used only at the tool time.
@@ -135,7 +134,7 @@ public class WSDLParser {
         // parse external binding files
         for (InputSource value : options.getWSDLBindings()) {
             errReceiver.pollAbort();
-            Document root = forest.parse(value, true); // TODO: I think this should be false - KK
+            Document root = forest.parse(value, false);
             if(root==null)       continue;   // error must have been reported
             Element binding = root.getDocumentElement();
             if (!fixNull(binding.getNamespaceURI()).equals(JAXWSBindingsConstants.NS_JAXWS_BINDINGS)
@@ -168,7 +167,7 @@ public class WSDLParser {
     private WSDLDocument buildWSDLDocument(){
         /**
          * Currently we are working off first WSDL document
-         * TODO: add support of creating WSDLDocument from collection of WSDL documents
+         * TODO: add support of creating WSDLDocument from fromjava.collection of WSDL documents
          */
 
         String location = forest.getRootWSDL();
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
index 8a6c054fc4d..bbeed9c2fa8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
@@ -24,7 +24,6 @@
  */
 
 
-
 package com.sun.tools.internal.ws.wsdl.parser;
 
 import com.sun.xml.internal.bind.WhiteSpaceProcessor;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java
new file mode 100644
index 00000000000..97886bad4a9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.internal.xjc;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.bind.JAXBContext;
+
+import com.sun.istack.internal.tools.MaskingClassLoader;
+import com.sun.istack.internal.tools.ParallelWorldClassLoader;
+
+/**
+ * Creates a class loader configured to run XJC 1.0/2.0 safely without
+ * interference with JAXB 2.0 API in Mustang.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+class ClassLoaderBuilder {
+
+    /**
+     * Creates a new class loader that eventually delegates to the given {@link ClassLoader}
+     * such that XJC can be loaded by using this classloader.
+     *
+     * @param v
+     *      Either "1.0" or "2.0", indicating the version of the -source value.
+     */
+    protected static ClassLoader createProtectiveClassLoader(ClassLoader cl, String v) throws ClassNotFoundException, MalformedURLException {
+        if(noHack)  return cl;  // provide an escape hatch
+
+        boolean mustang = false;
+
+        if(JAXBContext.class.getClassLoader()==null) {
+            // JAXB API is loaded from the bootstrap. We need to override one with ours
+            mustang = true;
+
+            List mask = new ArrayList(Arrays.asList(maskedPackages));
+            mask.add("javax.xml.bind.");
+
+            cl = new MaskingClassLoader(cl,mask);
+
+            URL apiUrl = cl.getResource("javax/xml/bind/annotation/XmlSeeAlso.class");
+            if(apiUrl==null)
+                throw new ClassNotFoundException("There's no JAXB 2.1 API in the classpath");
+
+            cl = new URLClassLoader(new URL[]{ParallelWorldClassLoader.toJarUrl(apiUrl)},cl);
+        }
+
+        //Leave XJC2 in the publicly visible place
+        // and then isolate XJC1 in a child class loader,
+        // then use a MaskingClassLoader
+        // so that the XJC2 classes in the parent class loader
+        //  won't interfere with loading XJC1 classes in a child class loader
+
+        if (v.equals("1.0")) {
+            if(!mustang)
+                // if we haven't used Masking ClassLoader, do so now.
+                cl = new MaskingClassLoader(cl,toolPackages);
+            cl = new ParallelWorldClassLoader(cl,"1.0/");
+        } else {
+            if(mustang)
+                // the whole RI needs to be loaded in a separate class loader
+                cl = new ParallelWorldClassLoader(cl,"");
+        }
+
+        return cl;
+    }
+
+
+    /**
+     * The list of package prefixes we want the
+     * {@link MaskingClassLoader} to prevent the parent
+     * classLoader from loading
+     */
+    private static String[] maskedPackages = new String[]{
+        // toolPackages + alpha
+        "com.sun.tools.",
+        "com.sun.codemodel.internal.",
+        "com.sun.relaxng.",
+        "com.sun.xml.internal.xsom.",
+        "com.sun.xml.internal.bind.",
+    };
+
+    private static String[] toolPackages = new String[]{
+        "com.sun.tools.",
+        "com.sun.codemodel.internal.",
+        "com.sun.relaxng.",
+        "com.sun.xml.internal.xsom."
+    };
+
+    /**
+     * Escape hatch in case this class loader hack breaks.
+     */
+    public static final boolean noHack = Boolean.getBoolean(XJCFacade.class.getName()+".nohack");
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Driver.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Driver.java
index 75a302f7f65..b3c9c097c37 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Driver.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Driver.java
@@ -24,6 +24,7 @@
  */
 package com.sun.tools.internal.xjc;
 
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -101,7 +102,7 @@ public class Driver {
 
     private static void _main( String[] args ) throws Exception {
         try {
-            System.exit(run( args, System.err, System.out ));
+            System.exit(run( args, System.out, System.out ));
         } catch (BadCommandLineException e) {
             // there was an error in the command line.
             // print usage and abort.
@@ -240,12 +241,15 @@ public class Driver {
                 listener.message(Messages.format(Messages.PARSING_SCHEMA));
             }
 
+            final boolean[] hadWarning = new boolean[1];
+
             ErrorReceiver receiver = new ErrorReceiverFilter(listener) {
                 public void info(SAXParseException exception) {
                     if(opt.verbose)
                         super.info(exception);
                 }
                 public void warning(SAXParseException exception) {
+                    hadWarning[0] = true;
                     if(!opt.quiet)
                         super.warning(exception);
                 }
@@ -367,6 +371,15 @@ public class Driver {
                 assert false;
             }
 
+            if(opt.debugMode) {
+                try {
+                    new FileOutputStream(new File(opt.targetDir,hadWarning[0]?"hadWarning":"noWarning")).close();
+                } catch (IOException e) {
+                    receiver.error(e);
+                    return -1;
+                }
+            }
+
             return 0;
         } catch( StackOverflowError e ) {
             if(opt.verbose)
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Language.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Language.java
index be45728aa50..48e385ba417 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Language.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Language.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
index 243323e9335..216fdc0693a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties
@@ -24,20 +24,20 @@
 #
 
 ConsoleErrorReporter.UnknownLocation = \
-	unknown location
-	
+        unknown location
+
 ConsoleErrorReporter.LineXOfY = \
-	\ \ line {0} of {1}
+        \ \ line {0} of {1}
 
 ConsoleErrorReporter.UnknownFile = \
-	unknown file
-	
+        unknown file
+
 Driver.Private.Usage = \
 Usage: xjc [-options ...] <schema file/URL/dir/jar> ... [-b <bindinfo>] ...\n\
 If dir is specified, all schema files in it will be compiled.\n\
 If jar is specified, /META-INF/sun-jaxb.episode binding file will be compiled.\n\
 Options:\n\
-\ \ -debug             :  run in the debug mode\n\
+\ \ -debug             :  run in debug mode (includes -verbose)\n\
 \ \ -nv                :  do not perform strict validation of the input schema(s)\n\
 \ \ -extension         :  allow vendor extensions - do not strictly follow the\n\
 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Compatibility Rules and App E.2 from the JAXB Spec\n\
@@ -106,27 +106,30 @@ Options:\n\
 Driver.AddonUsage = \nExtensions:
 
 Driver.ExperimentalLanguageWarning = \
-	Are you trying to compile {0}? Support for {0} is experimental. \
-	You may enable it by using the {1} option.
+        Are you trying to compile {0}? Support for {0} is experimental. \
+        You may enable it by using the {1} option.
 
 Driver.NonExistentDir = \
     cowardly refuses to write to a non-existent directory "{0}"
-	
+
 Driver.MissingRuntimePackageName = \
-	the -use-runtime option is missing a package name
-	
+        the -use-runtime option is missing a package name
+
 Driver.MissingModeOperand = \
-	the -mode option is missing an operand
-	
+        the -mode option is missing an operand
+
 Driver.MissingCompatibilityOperand = \
-	the -compatibility option is missing an operand
+        the -compatibility option is missing an operand
+
+Driver.MissingOperand = \
+        an operand is missing
 
 Driver.MissingProxyHost = \
-	either the -host option is missing an operand \n\
+        either the -host option is missing an operand \n\
         or -port was specified but not -host
-	
+
 Driver.MissingProxyPort = \
-	either the -port option is missing an operand \n\
+        either the -port option is missing an operand \n\
         or -host was specified but not -port
 
 Driver.ILLEGAL_PROXY = \
@@ -145,77 +148,80 @@ Driver.ILLEGAL_PROXY = \
     "{0}" is not a valid proxy format. The format is [user[:password]@]proxyHost:proxyPort
 
 Driver.UnrecognizedMode = \
-	unrecognized mode {0}
+        unrecognized mode {0}
 
 Driver.UnrecognizedParameter = \
-	unrecognized parameter {0}
-	
+        unrecognized parameter {0}
+
 Driver.MissingGrammar = \
-	grammar is not specified
+        grammar is not specified
 
 Driver.NotABindingFile = \
-	not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxb'}'bindings but it is '{'{0}'}'{1}
-		
+        not an external binding file. The root element must be '{'http://java.sun.com/xml/ns/jaxb'}'bindings but it is '{'{0}'}'{1}
+
 Driver.ParsingSchema = \
-	parsing a schema...
-	
+        parsing a schema...
+
 Driver.ParseFailed = \
-	Failed to parse a schema.
+        Failed to parse a schema.
 
 Driver.StackOverflow = \
-	Stack overflow. Either you are compiling a large schema that requires more resource, or \
-	XJC has a bug. First, please extend the stack size by using the -Xss JVM option. If this \
-	doesn'''t solve the problem, please use the -debug option to obtain the stack trace and \
-	contact Sun. 
-		
+        Stack overflow. Either you are compiling a large schema that requires more resources, or \
+        XJC has a bug. First, please extend the stack size by using the -Xss JVM option. If this \
+        doesn'''t solve the problem, please use the -debug option to obtain the stack trace and \
+        contact Sun.
+
 Driver.CompilingSchema = \
-	compiling a schema...
+        compiling a schema...
 
 Driver.FailedToGenerateCode = \
-	Failed to produce code.
+        Failed to produce code.
 
-# DO NOT localize the JAXB 2.1.3 in JDK string - it is a token for an ant <replaceFilter>	
+# DO NOT localize the JAXB 2.1.10 string - it is a token for an ant <replaceFilter>
 Driver.FilePrologComment = \
-	This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK \n\
-	See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\
-	Any modifications to this file will be lost upon recompilation of the source schema. \n\
-	Generated on: {0} \n
+        This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 \n\
+        See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> \n\
+        Any modifications to this file will be lost upon recompilation of the source schema. \n\
+        Generated on: {0} \n
 
 Driver.Version = \
-	xjc version "JAXB 2.1.3" \n\
-	JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.1.3 in JDK)	
+        xjc version "JAXB 2.1.10" \n\
+        JavaTM Architecture for XML Binding(JAXB) Reference Implementation, (build JAXB 2.1.10)
+
+Driver.BuildID = JAXB 2.1.10
+
+# for JDK integration - include version in source zip
+jaxb.jdk.version=2.1.10
 
-Driver.BuildID = JAXB 2.1.3 in JDK
-	
 # see java.text.SimpleDateFormat for format syntax
 Driver.DateFormat = \
-	yyyy.MM.dd
+        yyyy.MM.dd
 
 # see java.text.SimpleDateFormat for format syntax
 Driver.TimeFormat = \
-	hh:mm:ss a z
+        hh:mm:ss a z
 
-# as in: "generated on <date> at <time>"	
+# as in: "generated on <date> at <time>"
 Driver.At = \
-	at
+        at
 
 Driver.ErrorMessage = \
-	[ERROR] {0}
+        [ERROR] {0}
 
 Driver.WarningMessage = \
-	[WARNING] {0}
+        [WARNING] {0}
 
 Driver.InfoMessage = \
-	[INFO] {0}
+        [INFO] {0}
 
 ModelLoader.TooManySchema = \
-	Too many schema files for this schema language. Compile one file at a time.
+        Too many schema files for this schema language. Compile one file at a time.
 
 ModelLoader.BindingFileNotSupportedForRNC = \
     External binding files are not supported for the RELAX NG compact syntax.
 
 Driver.DefaultVersion = \
-	Defaulting the version to JAXB 2.0
+        Defaulting the version to JAXB 2.0
 
 Driver.DefaultPackageWarning = \
     Default Java package specified.  You will not be able to access the generated code from classes in any other package.
@@ -227,10 +233,10 @@ Driver.FailedToParse = \
     Failed to parse "{0}": {1}
 
 Driver.NotAFileNorURL = \
-    "{0}" is neither a file name nor an URL
+    "{0}" is neither a file name nor a URL
 
 FIELD_RENDERER_CONFLICT = \
-    "-{0}" and "-{1}" are mutually exclusive since both affect the code generation 
+    "-{0}" and "-{1}" are mutually exclusive since both affect the code generation
 
 NAME_CONVERTER_CONFLICT = \
     "-{0}" and "-{1}" are mutually exclusive since both affect the code generation
@@ -241,4 +247,3 @@ FAILED_TO_LOAD = \
 PLUGIN_LOAD_FAILURE = \
     Failure to load a plugin: "{0}". Use the system property ''-Dcom.sun.tools.internal.xjc.Options.findServices=true'' to \
     diagnose it further
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java
index 12dd6f1388d..d3096b5eb14 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java
@@ -35,8 +35,8 @@ import com.sun.tools.internal.xjc.reader.dtd.TDTDReader;
 import com.sun.tools.internal.xjc.reader.internalizer.DOMForest;
 import com.sun.tools.internal.xjc.reader.internalizer.DOMForestScanner;
 import com.sun.tools.internal.xjc.reader.internalizer.InternalizationLogic;
-import com.sun.tools.internal.xjc.reader.internalizer.VersionChecker;
 import com.sun.tools.internal.xjc.reader.internalizer.SCDBasedBindingSet;
+import com.sun.tools.internal.xjc.reader.internalizer.VersionChecker;
 import com.sun.tools.internal.xjc.reader.relaxng.RELAXNGCompiler;
 import com.sun.tools.internal.xjc.reader.relaxng.RELAXNGInternalizationLogic;
 import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
@@ -489,6 +489,9 @@ public final class ModelLoader {
 
     /**
      * Parses a {@link DOMForest} into a {@link XSSchemaSet}.
+     *
+     * @return
+     *      null if the parsing failed.
      */
     public XSSchemaSet createXSOM(DOMForest forest, SCDBasedBindingSet scdBasedBindingSet) throws SAXException {
         // set up other parameters to XSOMParser
@@ -504,7 +507,8 @@ public final class ModelLoader {
 
         XSSchemaSet result = reader.getResult();
 
-        scdBasedBindingSet.apply(result,errorReceiver);
+        if(result!=null)
+            scdBasedBindingSet.apply(result,errorReceiver);
 
         return result;
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Options.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Options.java
index b81e4aa9f0a..d163cfc1787 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/Options.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/Options.java
@@ -33,6 +33,7 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -47,6 +48,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.sun.codemodel.internal.CodeWriter;
+import com.sun.codemodel.internal.JPackage;
 import com.sun.codemodel.internal.writer.FileCodeWriter;
 import com.sun.codemodel.internal.writer.PrologCodeWriter;
 import com.sun.org.apache.xml.internal.resolver.CatalogManager;
@@ -129,10 +131,32 @@ public class Options
     /**
      * Generates output for the specified version of the runtime.
      */
-    public SpecVersion target = SpecVersion.V2_1;
+    public SpecVersion target = SpecVersion.LATEST;
 
+    private boolean is2_2 = true;
 
-    /** Target direcoty when producing files. */
+    public Options() {
+        if (is2_2) {
+            try {
+                Class.forName("javax.xml.bind.JAXBPermission");
+            } catch (ClassNotFoundException cnfe) {
+                is2_2 = false;
+            }
+            if (!is2_2) {
+                target = SpecVersion.V2_1;
+            } else {
+                target = SpecVersion.LATEST;
+            }
+        }
+    }
+
+    /**
+     * Target directory when producing files.
+     * <p>
+     * This field is not used when XJC is driven through the XJC API.
+     * Plugins that need to generate extra files should do so by using
+     * {@link JPackage#addResourceFile(JResourceFile)}.
+     */
     public File targetDir = new File(".");
 
     /**
@@ -437,12 +461,15 @@ public class Options
      */
     public int parseArgument( String[] args, int i ) throws BadCommandLineException {
         if (args[i].equals("-classpath") || args[i].equals("-cp")) {
-            File file = new File(requireArgument(args[i],args,++i));
-            try {
-                classpaths.add(file.toURL());
-            } catch (MalformedURLException e) {
-                throw new BadCommandLineException(
-                    Messages.format(Messages.NOT_A_VALID_FILENAME,file),e);
+            String a = requireArgument(args[i], args, ++i);
+            for (String p : a.split(File.pathSeparator)) {
+                File file = new File(p);
+                try {
+                    classpaths.add(file.toURL());
+                } catch (MalformedURLException e) {
+                    throw new BadCommandLineException(
+                        Messages.format(Messages.NOT_A_VALID_FILENAME,file),e);
+                }
             }
             return 2;
         }
@@ -760,6 +787,11 @@ public class Options
         if( schemaLanguage==null )
             schemaLanguage = guessSchemaLanguage();
 
+//        if(target==SpecVersion.V2_2 && !isExtensionMode())
+//            throw new BadCommandLineException(
+//                "Currently 2.2 is still not finalized yet, so using it requires the -extension switch." +
+//                "NOTE THAT 2.2 SPEC MAY CHANGE BEFORE IT BECOMES FINAL.");
+
         if(pluginLoadFailure!=null)
             throw new BadCommandLineException(
                 Messages.format(Messages.PLUGIN_LOAD_FAILURE,pluginLoadFailure));
@@ -768,7 +800,7 @@ public class Options
     /**
      * Finds the <tt>META-INF/sun-jaxb.episode</tt> file to add as a binding customization.
      */
-    private void scanEpisodeFile(File jar) throws BadCommandLineException {
+    public void scanEpisodeFile(File jar) throws BadCommandLineException {
         try {
             URLClassLoader ucl = new URLClassLoader(new URL[]{jar.toURL()});
             Enumeration<URL> resources = ucl.findResources("META-INF/sun-jaxb.episode");
@@ -787,18 +819,21 @@ public class Options
      * Guesses the schema language.
      */
     public Language guessSchemaLanguage() {
+
         // otherwise, use the file extension.
         // not a good solution, but very easy.
-        String name = grammars.get(0).getSystemId().toLowerCase();
+        if ((grammars != null) && (grammars.size() > 0)) {
+            String name = grammars.get(0).getSystemId().toLowerCase();
 
-        if (name.endsWith(".rng"))
-            return Language.RELAXNG;
-        if (name.endsWith(".rnc"))
-            return Language.RELAXNG_COMPACT;
-        if (name.endsWith(".dtd"))
-            return Language.DTD;
-        if (name.endsWith(".wsdl"))
-            return Language.WSDL;
+            if (name.endsWith(".rng"))
+                return Language.RELAXNG;
+            if (name.endsWith(".rnc"))
+                return Language.RELAXNG_COMPACT;
+            if (name.endsWith(".dtd"))
+                return Language.DTD;
+            if (name.endsWith(".wsdl"))
+                return Language.WSDL;
+        }
 
         // by default, assume XML Schema
         return Language.XMLSCHEMA;
@@ -853,6 +888,36 @@ public class Options
         // if true, print debug output
         final boolean debug = com.sun.tools.internal.xjc.util.Util.getSystemProperty(Options.class,"findServices")!=null;
 
+        // if we are running on Mustang or Dolphin, use ServiceLoader
+        // so that we can take advantage of JSR-277 module system.
+        try {
+            Class<?> serviceLoader = Class.forName("java.util.ServiceLoader");
+            if(debug)
+                System.out.println("Using java.util.ServiceLoader");
+            Iterable<T> itr = (Iterable<T>)serviceLoader.getMethod("load",Class.class,ClassLoader.class).invoke(null,clazz,classLoader);
+            List<T> r = new ArrayList<T>();
+            for (T t : itr)
+                r.add(t);
+            return r.toArray((T[])Array.newInstance(clazz,r.size()));
+        } catch (ClassNotFoundException e) {
+            // fall through
+        } catch (IllegalAccessException e) {
+            Error x = new IllegalAccessError();
+            x.initCause(e);
+            throw x;
+        } catch (InvocationTargetException e) {
+            Throwable x = e.getTargetException();
+            if (x instanceof RuntimeException)
+                throw (RuntimeException) x;
+            if (x instanceof Error)
+                throw (Error) x;
+            throw new Error(x);
+        } catch (NoSuchMethodException e) {
+            Error x = new NoSuchMethodError();
+            x.initCause(e);
+            throw x;
+        }
+
         String serviceId = "META-INF/services/" + clazz.getName();
 
         // used to avoid creating the same instance twice
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java
index d5c715d8967..c02872b4f7c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java
index 2ed1b6c75b6..04c14bbd005 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCFacade.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCFacade.java
new file mode 100644
index 00000000000..42a2d11718c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCFacade.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.internal.xjc;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * A shabby driver to invoke XJC1 or XJC2 depending on the command line switch.
+ *
+ * <p>
+ * This class is compiled with -source 1.2 so that we can report a nice user-friendly
+ * "you require Tiger" error message.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class XJCFacade {
+
+    public static void main(String[] args) throws Throwable {
+        String v = "2.0";      // by default, we go 2.0
+
+        for( int i=0; i<args.length; i++ ) {
+            if(args[i].equals("-source")) {
+                if(i+1<args.length) {
+                    v = parseVersion(args[i+1]);
+                }
+            }
+        }
+
+        try {
+            ClassLoader cl = ClassLoaderBuilder.createProtectiveClassLoader(XJCFacade.class.getClassLoader(), v);
+
+            Class driver = cl.loadClass("com.sun.tools.internal.xjc.Driver");
+            Method mainMethod = driver.getDeclaredMethod("main", new Class[]{String[].class});
+            try {
+                mainMethod.invoke(null,new Object[]{args});
+            } catch (IllegalAccessException e) {
+                throw e;
+            } catch (InvocationTargetException e) {
+                if(e.getTargetException()!=null)
+                    throw e.getTargetException();
+            }
+        } catch (UnsupportedClassVersionError e) {
+            System.err.println("XJC requires JDK 5.0 or later. Please download it from http://java.sun.com/j2se/1.5/");
+        }
+    }
+
+    private static String parseVersion(String version) {
+        if(version.equals("1.0"))
+            return version;
+        // if we don't recognize the version number, we'll go to 2.0 RI
+        // anyway. It's easier to report an error message there,
+        // than in here.
+        return "2.0";
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java
index 8f644cac0ae..d0b06de2283 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc;
 
 import java.io.PrintStream;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
index 8ffd942fda5..1ba722450d1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.addon.at_generated;
 
 import java.text.SimpleDateFormat;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java
index 324d137f7eb..9365e7c88ff 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.addon.code_injector;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
index 1c31b0be46e..ebeb8cba5ce 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.addon.code_injector;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
index 6adfe737371..0695bda4d8e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.addon.episode;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java
index f8943dd5928..b62fbfe7e84 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 @XmlNamespace(Const.JAXB_NSURI)
 package com.sun.tools.internal.xjc.addon.episode;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
index 9b26d0973b7..f612195b9c0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
index f8b79676954..f80d415deb4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java
index 41ff0a69a6b..7bcaa97ceb9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api;
 
 import com.sun.mirror.apt.AnnotationProcessorEnvironment;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
index a5c4c29c5aa..6e2b2388a59 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
index 36adf48a0a9..d64b710a3b4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java
@@ -238,6 +238,10 @@ public interface SchemaCompiler {
      * then tweak settings on it. The updated settings will be used when the
      * {@link #bind()} method is invoked.
      *
+     * <p>
+     * The returned {@link Options} object is useful for example to specify
+     * command-line arguments.
+     *
      * @since 2.0.2
      * @deprecated
      *      This method is not really "deprecated" (in the sense of being removed
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java
index de2081b7bfd..19a5732d375 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api;
 
 /**
@@ -30,7 +31,7 @@ package com.sun.tools.internal.xjc.api;
  * @author Kohsuke Kawaguchi
  */
 public enum SpecVersion {
-    V2_0, V2_1;
+    V2_0, V2_1, V2_2;
 
     /**
      * Returns true if this version is equal or later than the given one.
@@ -40,18 +41,19 @@ public enum SpecVersion {
     }
 
     /**
-     * Parses "2.0" and "2.1" into the {@link SpecVersion} object.
+     * Parses "2.0", "2.1", and "2.2" into the {@link SpecVersion} object.
      *
      * @return null for parsing failure.
      */
     public static SpecVersion parse(String token) {
         if(token.equals("2.0"))
             return V2_0;
-        else
         if(token.equals("2.1"))
             return V2_1;
+        if(token.equals("2.2"))
+            return V2_2;
         return null;
     }
 
-    public static final SpecVersion LATEST = V2_1;
+    public static final SpecVersion LATEST = V2_2;
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
index 48ff3c414bb..005d44cf545 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api;
 
 import com.sun.codemodel.internal.JAnnotatable;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
index fcc3654a1c3..b77b058e06f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.j2s;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
index 9f8fe42f0ff..ae21d8f7262 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.j2s;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
index 7e59811f034..55946d44463 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
index dbd22d02fbb..75287a04956 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
index 0cefde91141..3a49290acfa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import org.xml.sax.ErrorHandler;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
index 5ae047dce4d..2d40b89ea87 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import javax.xml.bind.JAXBElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
index 9b5130bbb0b..bda221848f7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
index d6bd0078a1a..9da7913f592 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
index 9b0914c131f..ca025d189b6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import javax.xml.bind.JAXBElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
index 24a7cd023f8..c4efda49f3a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
index c45c55a9e09..3a750a914e8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java
@@ -201,6 +201,11 @@ public final class SchemaCompilerImpl extends ErrorReceiver implements SchemaCom
 //        if(!forest.checkSchemaCorrectness(this))
 //            return null;
 
+        // parse all the binding files given via XJC -b options.
+        // this also takes care of the binding files given in the -episode option.
+        for (InputSource is : opts.getBindFiles())
+            parseSchema(is);
+
         // internalization
         SCDBasedBindingSet scdBasedBindingSet = forest.transform(opts.isExtensionMode());
 
@@ -283,7 +288,7 @@ public final class SchemaCompilerImpl extends ErrorReceiver implements SchemaCom
 
     static {
         try {
-            NO_CORRECTNESS_CHECK = Boolean.getBoolean(SchemaCompilerImpl.class+".noCorrectnessCheck");
+            NO_CORRECTNESS_CHECK = Boolean.getBoolean(SchemaCompilerImpl.class.getName()+".noCorrectnessCheck");
         } catch( Throwable t) {
             // ignore
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
index d5b8e5d34aa..f67aee24bd2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.impl.s2j;
 
 import javax.xml.bind.annotation.XmlAttachmentRef;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/package.html
index 69fe3734d5b..b0e75cf0d14 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/package.html
@@ -58,4 +58,4 @@ Once the model is obtained, generate the code into the file system as follows:
 <h2>Implementation Note</h2>
 <p>
 This package shouldn't contain any implementation code.
-</body></html> 
+</body></html>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
index f945cac8677..e19012c4273 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.util;
 
 import java.io.ByteArrayOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
index f4cea0ff5c1..6560b368c1a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.util;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties
index c7ce9e677d5..408354d1cdd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties
@@ -25,5 +25,3 @@
 
 TOOLS_JAR_NOT_FOUND = \
     JDK''s tools.jar was not found in {0}. Usually this means you are running JRE, not JDK. Please use the java command in JDK 5.0 or later (not JRE.)
- 
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
index 3158dec0837..52247791cd1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.api.util;
 
 import java.io.File;
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasResources.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java
similarity index 74%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasResources.java
rename to jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java
index 82f9c0dd8a9..8cd34d136f0 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasResources.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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
@@ -22,21 +22,16 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.swingx.designer.utils;
+package com.sun.tools.internal.xjc.generator.annotation.ri;
 
-import java.io.File;
+import com.sun.codemodel.internal.JAnnotationWriter;
+import com.sun.xml.internal.bind.annotation.OverrideAnnotationOf;
 
-/**
- * HasResources - interface for model nodes that have resources
- *
- * @author Created by Jasper Potts (Jul 2, 2007)
- */
-public interface HasResources {
+public interface OverrideAnnotationOfWriter
+    extends JAnnotationWriter<OverrideAnnotationOf>
+{
 
-    public File getResourcesDir();
 
-    public File getImagesDir();
-
-    public File getTemplatesDir();
+    OverrideAnnotationOfWriter value(String value);
 
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
index fc8acb1c5b8..4c2373a634b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
@@ -41,4 +41,6 @@ public interface XmlElementRefWriter
 
     XmlElementRefWriter namespace(String value);
 
+    XmlElementRefWriter required(boolean value);
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
index 4227e8080e0..2a0472ead9e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
@@ -101,6 +101,7 @@ import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapter;
 import com.sun.xml.internal.xsom.XmlString;
 import com.sun.istack.internal.NotNull;
+import com.sun.tools.internal.xjc.model.CReferencePropertyInfo;
 
 /**
  * Generates fields and accessors.
@@ -456,7 +457,6 @@ public final class BeanGenerator implements Outline
     private void generateClassBody( ClassOutlineImpl cc ) {
         CClassInfo target = cc.target;
 
-
         // if serialization support is turned on, generate
         // [RESULT]
         // class ... implements Serializable {
@@ -509,7 +509,10 @@ public final class BeanGenerator implements Outline
         if(target.isOrdered()) {
             for(CPropertyInfo p : target.getProperties() ) {
                 if( ! (p instanceof CAttributePropertyInfo )) {
-                    xtw.propOrder(p.getName(false));
+                    if (!( (p instanceof CReferencePropertyInfo) &&
+                           ((CReferencePropertyInfo)p).isDummy())) {
+                        xtw.propOrder(p.getName(false));
+                    }
                 }
             }
         } else {
@@ -730,10 +733,9 @@ public final class BeanGenerator implements Outline
             // none is specified. use the default factory
             fr = model.options.getFieldRendererFactory().getDefault();
 
-        FieldOutline field = fr.generate(cc,prop);
+        FieldOutline field = fr.generate(cc, prop);
         fields.put(prop,field);
 
-
         return field;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
index 23f6f184352..330a188da32 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.generator.bean;
 
 import com.sun.codemodel.internal.JDefinedClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
index 710a00c0f05..b00a2149035 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
@@ -22,8 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.generator.bean;
 
+
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 
@@ -31,6 +33,7 @@ import com.sun.codemodel.internal.JClass;
 import com.sun.codemodel.internal.JCodeModel;
 import com.sun.codemodel.internal.JExpr;
 import com.sun.codemodel.internal.JExpression;
+import com.sun.codemodel.internal.JFieldVar;
 import com.sun.codemodel.internal.JInvocation;
 import com.sun.codemodel.internal.JMethod;
 import com.sun.codemodel.internal.JMod;
@@ -71,15 +74,24 @@ final class ElementOutlineImpl extends ElementOutline {
             if(ei.getScope()!=null)
                 scope = parent.getClazz(ei.getScope()).implRef;
             JExpression scopeClass = scope==null?JExpr._null():scope.dotclass();
+            JFieldVar valField = implClass.field(JMod.PROTECTED|JMod.FINAL|JMod.STATIC,QName.class,"NAME",createQName(cm,ei.getElementName()));
 
             // take this opportunity to generate a constructor in the element class
             JMethod cons = implClass.constructor(JMod.PUBLIC);
             cons.body().invoke("super")
-                .arg(implClass.field(JMod.PROTECTED|JMod.FINAL|JMod.STATIC,QName.class,"NAME",createQName(cm,ei.getElementName())))
+                .arg(valField)
                 .arg(declaredType)
                 .arg(scopeClass)
                 .arg(cons.param(implType,"value"));
 
+            // generate no-arg constructor in the element class (bug #391; section 5.6.2 in JAXB spec 2.1)
+            JMethod noArgCons = implClass.constructor(JMod.PUBLIC);
+            noArgCons.body().invoke("super")
+                .arg(valField)
+                .arg(declaredType)
+                .arg(scopeClass)
+                .arg(JExpr._null());
+
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
index 662842e2cdd..1cf096b4bb4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /*
  * Use is subject to the license terms.
  */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
index 74557b48a32..64e91e8f87f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
@@ -24,14 +24,14 @@
 #
 
 METHOD_COLLISION = \
-	The "{0}" method is defined on both "{1}" and "{2}" and is causing a collision.
+        The "{0}" method is defined on both "{1}" and "{2}" and is causing a collision.
 
 ERR_UNUSABLE_NAME = \
-	Cannot derive a valid Java identifier from "{0}". Specify a customization to change the name.
+        Cannot derive a valid Java identifier from "{0}". Specify a customization to change the name.
 
 ERR_NAME_COLLISION = \
-	Type-safe enum has more than one values that share the same name "{0}". \
-	Use a typesafeEnumMemberName customization to resolve this conflict.
+        Type-safe enum has more than one values that share the same name "{0}". \
+        Use a typesafeEnumMemberName customization to resolve this conflict.
 
 ILLEGAL_CONSTRUCTOR_PARAM = \
     Illegal constructor parameter {0}
@@ -40,5 +40,4 @@ OBJECT_FACTORY_CONFLICT = \
     Two declarations cause a collision in the ObjectFactory class.
 
 OBJECT_FACTORY_CONFLICT_RELATED = \
-    (Related to above error) This is the other declaration.   
- 
+    (Related to above error) This is the other declaration.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
index 3f632dd0416..ecfd1ae738b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /*
  * Use is subject to the license terms.
  */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
index 3018be0e26a..6dd5b7ae130 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.generator.bean;
 
 import java.util.Collection;
@@ -29,6 +30,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.xml.bind.JAXBException;
+import javax.xml.bind.annotation.XmlInlineBinaryData;
 import javax.xml.namespace.QName;
 
 import com.sun.codemodel.internal.JClass;
@@ -157,7 +159,7 @@ abstract class ObjectFactoryGeneratorImpl extends ObjectFactoryGenerator {
 
         JClass scope=null;
         if(ei.getScope()!=null)
-            scope = outline.getClazz(ei.getScope()).implRef;
+            scope = outline.getClazz(ei.getScope()).implClass;
 
 
         JMethod m;
@@ -244,7 +246,10 @@ abstract class ObjectFactoryGeneratorImpl extends ObjectFactoryGenerator {
         if(ei.getDefaultValue()!=null)
             xemw.defaultValue(ei.getDefaultValue());
 
-        // if the element is adapter, put that annotation on the factory method
+        if(ei.getProperty().inlineBinaryData())
+            m.annotate(XmlInlineBinaryData.class);
+
+                    // if the element is adapter, put that annotation on the factory method
         outline.generateAdapterIfNecessary(ei.getProperty(),m);
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
index cb93c0c88ae..27502191ceb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
@@ -216,6 +216,11 @@ final class PackageOutlineImpl implements PackageOutline {
      * Iterate through the hash map looking for the namespace used
      * most frequently.  Ties are arbitrarily broken by the order
      * in which the map keys are iterated over.
+     *
+     * <p>
+     * Because JAX-WS often reassigns the "" namespace URI,
+     * and when that happens it unintentionally also renames (normally
+     * unqualified) local elements, prefer non-"" URI when there's a tie.
      */
     private String getMostUsedURI(HashMap<String, Integer> map) {
         String mostPopular = null;
@@ -228,7 +233,7 @@ final class PackageOutlineImpl implements PackageOutline {
                 mostPopular = uri;
                 count = uriCount;
             } else {
-                if (uriCount > count) {
+                if (uriCount > count || (uriCount==count && mostPopular.equals(""))) {
                     mostPopular = uri;
                     count = uriCount;
                 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
index 216c2d6b2a4..f80ff996247 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.generator.bean;
 
 import javax.xml.bind.JAXBContext;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
index 3cdc3c0b85f..ac7d3aa938a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.generator.bean;
 
 import com.sun.codemodel.internal.JPackage;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
index a1c7b51c4f1..81d6e93f092 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
@@ -33,6 +33,7 @@ import javax.xml.bind.annotation.XmlList;
 import javax.xml.bind.annotation.XmlMixed;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.XmlInlineBinaryData;
 import javax.xml.namespace.QName;
 
 import com.sun.codemodel.internal.JAnnotatable;
@@ -67,6 +68,9 @@ import com.sun.tools.internal.xjc.outline.ClassOutline;
 import com.sun.tools.internal.xjc.outline.FieldAccessor;
 import com.sun.tools.internal.xjc.outline.FieldOutline;
 import com.sun.tools.internal.xjc.reader.TypeUtil;
+import com.sun.tools.internal.xjc.Options;
+import com.sun.tools.internal.xjc.api.SpecVersion;
+import com.sun.xml.internal.bind.api.impl.NameConverter;
 import com.sun.xml.internal.bind.v2.TODO;
 
 /**
@@ -148,6 +152,9 @@ abstract class AbstractField implements FieldOutline {
             field.annotate2(XmlSchemaTypeWriter.class)
                 .name(st.getLocalPart())
                 .namespace(st.getNamespaceURI());
+
+        if(prop.inlineBinaryData())
+            field.annotate(XmlInlineBinaryData.class);
     }
 
     private void annotateReference(JAnnotatable field) {
@@ -165,6 +172,8 @@ abstract class AbstractField implements FieldOutline {
             refw.name(e.getElementName().getLocalPart())
                 .namespace(e.getElementName().getNamespaceURI())
                 .type(e.getType().toType(outline.parent(),IMPLEMENTATION));
+            if(getOptions().target.isLaterThan(SpecVersion.V2_2))
+                refw.required(rp.isRequired());
         } else
         if(elements.size()>1) {
             XmlElementRefsWriter refsw = field.annotate2(XmlElementRefsWriter.class);
@@ -173,6 +182,8 @@ abstract class AbstractField implements FieldOutline {
                 refw.name(e.getElementName().getLocalPart())
                     .namespace(e.getElementName().getNamespaceURI())
                     .type(e.getType().toType(outline.parent(),IMPLEMENTATION));
+                if(getOptions().target.isLaterThan(SpecVersion.V2_2))
+                    refw.required(rp.isRequired());
             }
         }
 
@@ -244,9 +255,15 @@ abstract class AbstractField implements FieldOutline {
 
         // these values are used to determine how to optimize the generated annotation
         XmlNsForm formDefault = parent()._package().getElementFormDefault();
-        String mostUsedURI = parent()._package().getMostUsedNamespaceURI();
         String propName = prop.getName(false);
 
+        String enclosingTypeNS;
+
+        if(parent().target.getTypeName()==null)
+            enclosingTypeNS = parent()._package().getMostUsedNamespaceURI();
+        else
+            enclosingTypeNS = parent().target.getTypeName().getNamespaceURI();
+
         // generate the name property?
         String generatedName = ctype.getTagName().getLocalPart();
         if(!generatedName.equals(propName)) {
@@ -256,7 +273,7 @@ abstract class AbstractField implements FieldOutline {
 
         // generate the namespace property?
         String generatedNS = ctype.getTagName().getNamespaceURI();
-        if (((formDefault == XmlNsForm.QUALIFIED) && !generatedNS.equals(mostUsedURI)) ||
+        if (((formDefault == XmlNsForm.QUALIFIED) && !generatedNS.equals(enclosingTypeNS)) ||
                 ((formDefault == XmlNsForm.UNQUALIFIED) && !generatedNS.equals(""))) {
             if(xew == null) xew = getXew(checkWrapper, field);
             xew.namespace(generatedNS);
@@ -281,7 +298,7 @@ abstract class AbstractField implements FieldOutline {
         // when generating code for 1.4, the runtime can't infer that ArrayList<Foo> derives
         // from Collection<Foo> (because List isn't parameterized), so always expclitly
         // generate @XmlElement(type=...)
-        if( !jtype.equals(exposedType) || (parent().parent().getModel().options.runtime14 && prop.isCollection())) {
+        if( !jtype.equals(exposedType) || (getOptions().runtime14 && prop.isCollection())) {
             if(xew == null) xew = getXew(checkWrapper, field);
             xew.type(jtype);
         }
@@ -300,6 +317,13 @@ abstract class AbstractField implements FieldOutline {
         }
     }
 
+    /**
+     * Gets the {@link Options} in the current compilation context.
+     */
+    protected final Options getOptions() {
+        return parent().parent().getModel().options;
+    }
+
     // ugly hack to lazily create
     private XmlElementsWriter xesw = null;
 
@@ -330,8 +354,9 @@ abstract class AbstractField implements FieldOutline {
         final String generatedName = attName.getLocalPart();
         final String generatedNS = attName.getNamespaceURI();
 
+        // Issue 570; always force generating name="" when do it when globalBindings underscoreBinding is set to non default value
         // generate name property?
-        if(!generatedName.equals(ap.getName(false))) {
+        if(!generatedName.equals(ap.getName(false)) || (outline.parent().getModel().getNameConverter() != NameConverter.standard)) {
             xaw.name(generatedName);
         }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
index 917f3e39e2b..d9bfd7f2c75 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
@@ -31,6 +31,7 @@ import com.sun.codemodel.internal.JFieldVar;
 import com.sun.codemodel.internal.JMod;
 import com.sun.codemodel.internal.JType;
 import com.sun.codemodel.internal.JVar;
+import com.sun.tools.internal.xjc.api.SpecVersion;
 import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
 
@@ -71,7 +72,13 @@ abstract class AbstractFieldWithVar extends AbstractField {
      * {@code isXXXX} as the method name.
      */
     protected String getGetterMethod() {
-        return (getFieldType().boxify().getPrimitiveType()==codeModel.BOOLEAN?"is":"get")+prop.getName(true);
+        if (getOptions().target.isLaterThan(SpecVersion.V2_2)) {
+            return ((getFieldType().isPrimitive() &&
+                     getFieldType().boxify().getPrimitiveType()==codeModel.BOOLEAN) ?
+                         "is":"get") + prop.getName(true);
+        } else {
+            return (getFieldType().boxify().getPrimitiveType()==codeModel.BOOLEAN?"is":"get")+prop.getName(true);
+        }
     }
 
     /**
@@ -98,7 +105,11 @@ abstract class AbstractFieldWithVar extends AbstractField {
         protected final JFieldRef $ref;
 
         public final void toRawValue(JBlock block, JVar $var) {
-            block.assign($var,$target.invoke(getGetterMethod()));
+            if (getOptions().target.isLaterThan(SpecVersion.V2_2)) {
+                block.assign($var,$target.invoke(getGetterMethod()));
+            } else {
+                block.assign($var,$target.invoke(getGetterMethod()));
+            }
         }
 
         public final void fromRawValue(JBlock block, String uniqueName, JExpression $var) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
index a34af24dff4..b5961789481 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
@@ -45,7 +45,7 @@ import com.sun.tools.internal.xjc.model.CPropertyInfo;
  * its underlying data structure.
  *
  * <p>
- * For performance reaons, the actual list object used to store
+ * For performance reasons, the actual list object used to store
  * data is lazily created.
  *
  * @author
@@ -136,7 +136,7 @@ abstract class AbstractListField extends AbstractField {
             .assign(field,newCoreList());
     }
 
-    public final JType getRawType() {
+    public JType getRawType() {
         return codeModel.ref(List.class).narrow(exposedType.boxify());
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
index bc264001349..697cf5bbb9e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
@@ -24,16 +24,15 @@
  */
 package com.sun.tools.internal.xjc.generator.bean.field;
 
-import java.util.ArrayList;
-import java.util.Arrays;
+import com.sun.codemodel.internal.JAssignmentTarget;
 import java.util.List;
-
 import com.sun.codemodel.internal.JBlock;
 import com.sun.codemodel.internal.JClass;
 import com.sun.codemodel.internal.JExpr;
 import com.sun.codemodel.internal.JExpression;
 import com.sun.codemodel.internal.JForLoop;
 import com.sun.codemodel.internal.JMethod;
+import com.sun.codemodel.internal.JMod;
 import com.sun.codemodel.internal.JOp;
 import com.sun.codemodel.internal.JType;
 import com.sun.codemodel.internal.JVar;
@@ -69,12 +68,18 @@ final class ArrayField extends AbstractListField {
         }
 
         public void toRawValue(JBlock block, JVar $var) {
-            block.assign($var,codeModel.ref(Arrays.class).staticInvoke("asList").arg($target.invoke($getAll)));
+            block.assign($var,$target.invoke($getAll));
         }
 
         public void fromRawValue(JBlock block, String uniqueName, JExpression $var) {
-            block.invoke($target,$setAll).arg($var.invoke("toArray").arg(JExpr.newArray(exposedType,$var.invoke("size"))));
+            block.invoke($target,$setAll).arg($var);
         }
+
+        @Override
+        public JExpression hasSetValue() {
+            return field.ne(JExpr._null()).cand(field.ref("length").gt(JExpr.lit(0)));
+        }
+
     }
 
     private JMethod $setAll;
@@ -83,20 +88,28 @@ final class ArrayField extends AbstractListField {
 
     ArrayField(ClassOutlineImpl context, CPropertyInfo prop) {
         super(context,prop,false);
-        generate();
+        generateArray();
+    }
+
+    protected final void generateArray() {
+        field = outline.implClass.field( JMod.PROTECTED, getCoreListType(), prop.getName(false) );
+        annotate(field);
+
+        // generate the rest of accessors
+        generateAccessors();
     }
 
     public void generateAccessors() {
 
         MethodWriter writer = outline.createMethodWriter();
         Accessor acc = create(JExpr._this());
-
         JVar $idx,$value; JBlock body;
-        JType arrayType = exposedType.array();
 
         // [RESULT] T[] getX() {
         //     if( <var>==null )    return new T[0];
-        //     return (T[]) <var>.toArray(new T[<var>.size()]);
+        //     T[] retVal = new T[this._return.length] ;
+        //     System.arraycopy(this._return, 0, "retVal", 0, this._return.length);
+        //     return (retVal);
         // }
         $getAll = writer.declareMethod( exposedType.array(),"get"+prop.getName(true));
         writer.javadoc().append(prop.javadoc);
@@ -104,25 +117,12 @@ final class ArrayField extends AbstractListField {
 
         body._if( acc.ref(true).eq(JExpr._null()) )._then()
             ._return(JExpr.newArray(exposedType,0));
-
-        if(primitiveType==null) {
-            body._return(JExpr.cast(arrayType,
-                acc.ref(true).invoke("toArray").arg( JExpr.newArray(implType,acc.ref(true).invoke("size")) )));
-        } else {
-            // need to copy them manually to unbox values
-            // [RESULT]
-            // T[] r = new T[<ref>.size()];
-            // for( int i=0; i<r.length; i++ )
-            //     r[i] = unbox(<ref>.get(i));
-            JVar $r = body.decl(exposedType.array(),"r",JExpr.newArray(exposedType, acc.ref(true).invoke("size")));
-            JForLoop loop = body._for();
-            JVar $i = loop.init(codeModel.INT,"__i",JExpr.lit(0));
-            loop.test($i.lt($r.ref("length")));
-            loop.update($i.incr());
-            loop.body().assign( $r.component($i),
-                primitiveType.unwrap(acc.ref(true).invoke("get").arg($i)) );
-            body._return($r);
-        }
+        JVar var = body.decl(exposedType.array(), "retVal", JExpr.newArray(implType,acc.ref(true).ref("length")));
+        body.add(codeModel.ref(System.class).staticInvoke("arraycopy")
+                        .arg(acc.ref(true)).arg(JExpr.lit(0))
+                        .arg(var)
+                        .arg(JExpr.lit(0)).arg(acc.ref(true).ref("length")));
+        body._return(JExpr.direct("retVal"));
 
         List<Object> returnTypes = listPossibleTypes(prop);
         writer.javadoc().addReturn().append("array of\n").append(returnTypes);
@@ -139,47 +139,50 @@ final class ArrayField extends AbstractListField {
             ._throw(JExpr._new(codeModel.ref(IndexOutOfBoundsException.class)));
 
         writer.javadoc().append(prop.javadoc);
-        $get.body()._return(acc.unbox(acc.ref(true).invoke("get").arg($idx) ));
+        $get.body()._return(acc.ref(true).component($idx));
 
         writer.javadoc().addReturn().append("one of\n").append(returnTypes);
 
-
         // [RESULT] int getXLength() {
         //     if( <var>==null )    throw new IndexOutOfBoundsException();
-        //     return <ref>.size();
+        //     return <ref>.length;
         // }
         JMethod $getLength = writer.declareMethod(codeModel.INT,"get"+prop.getName(true)+"Length");
         $getLength.body()._if(acc.ref(true).eq(JExpr._null()))._then()
                 ._return(JExpr.lit(0));
-        $getLength.body()._return(acc.ref(true).invoke("size"));
-
+        $getLength.body()._return(acc.ref(true).ref("length"));
 
         // [RESULT] void setX(ET[] values) {
-        //     clear();
         //     int len = values.length;
         //     for( int i=0; i<len; i++ )
-        //         <ref>.add(values[i]);
+        //         <ref>[i] = values[i];
         // }
         $setAll = writer.declareMethod(
             codeModel.VOID,
             "set"+prop.getName(true));
 
         writer.javadoc().append(prop.javadoc);
-
         $value = writer.addParameter(exposedType.array(),"values");
-        $setAll.body().invoke(acc.ref(false),"clear");
         JVar $len = $setAll.body().decl(codeModel.INT,"len", $value.ref("length"));
+
+        $setAll.body().assign(
+                (JAssignmentTarget) acc.ref(true),
+                castToImplTypeArray(JExpr.newArray(
+                    codeModel.ref(exposedType.erasure().fullName()),
+                    $len)));
+
         JForLoop _for = $setAll.body()._for();
         JVar $i = _for.init( codeModel.INT, "i", JExpr.lit(0) );
         _for.test( JOp.lt($i,$len) );
         _for.update( $i.incr() );
-        _for.body().invoke(acc.ref(true),"add").arg(castToImplType(acc.box($value.component($i))));
+        _for.body().assign(acc.ref(true).component($i), castToImplType(acc.box($value.component($i))));
 
         writer.javadoc().addParam($value)
             .append("allowed objects are\n")
             .append(returnTypes);
 
-        // [RESULT] ET setX(int,ET)
+        // [RESULT] ET setX(int idx, ET value)
+        // <ref>[idx] = value
         JMethod $set = writer.declareMethod(
             exposedType,
             "set"+prop.getName(true));
@@ -189,19 +192,33 @@ final class ArrayField extends AbstractListField {
         writer.javadoc().append(prop.javadoc);
 
         body = $set.body();
-        body._return( acc.unbox(
-            acc.ref(true).invoke("set").arg($idx).arg(castToImplType(acc.box($value)))));
+        body._return( JExpr.assign(acc.ref(true).component($idx),
+                                   castToImplType(acc.box($value))));
 
         writer.javadoc().addParam($value)
             .append("allowed object is\n")
             .append(returnTypes);
+
+    }
+
+    @Override
+    public JType getRawType() {
+        return exposedType.array();
     }
 
     protected JClass getCoreListType() {
-        return codeModel.ref(ArrayList.class).narrow(exposedType.boxify());
+        return exposedType.array();
     }
 
     public Accessor create(JExpression targetObject) {
         return new Accessor(targetObject);
     }
+
+    /**
+     * Case from {@link #exposedType} to array of {@link #implType} .
+     */
+    protected final JExpression castToImplTypeArray( JExpression exp ) {
+        return JExpr.cast(implType.array(), exp);
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
index 17786f875bc..bbcfa829dc8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
@@ -48,7 +49,7 @@ final class ConstFieldRenderer implements FieldRenderer {
 
     public FieldOutline generate(ClassOutlineImpl outline, CPropertyInfo prop) {
         if(prop.defaultValue.compute(outline.parent())==null)
-            return fallback.generate(outline,prop);
+            return fallback.generate(outline, prop);
         else
             return new ConstField(outline,prop);
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java
new file mode 100644
index 00000000000..e8768c35463
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.generator.bean.field;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.codemodel.internal.JBlock;
+import com.sun.codemodel.internal.JClass;
+import com.sun.codemodel.internal.JExpr;
+import com.sun.codemodel.internal.JExpression;
+import com.sun.codemodel.internal.JMethod;
+import com.sun.codemodel.internal.JType;
+import com.sun.codemodel.internal.JVar;
+import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
+import com.sun.tools.internal.xjc.generator.bean.MethodWriter;
+import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.tools.internal.xjc.outline.Aspect;
+import com.sun.xml.internal.bind.api.impl.NameConverter;
+import java.io.Serializable;
+
+/**
+ * Realizes a property as an untyped {@link List}.
+ *
+ * <pre>
+ * List getXXX();
+ * </pre>
+ *
+ * <h2>Default value handling</h2>
+ * <p>
+ * Since unmarshaller just adds new values into the storage,
+ * we can't fill the storage by default values at the time of
+ * instanciation. (or oherwise values found in the document will
+ * be appended to default values, where it should overwrite them.)
+ * <p>
+ * Therefore, when the object is created, the storage will be empty.
+ * When the getXXX method is called, we'll check if the storage is
+ * modified in anyway. If it is modified, it must mean that the values
+ * are found in the document, so we just return it.
+ *
+ * Otherwise we will fill in default values and return it to the user.
+ *
+ * <p>
+ * When a list has default values, its dirty flag is set to true.
+ * Marshaller will check this and treat it appropriately.
+ *
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ */
+public class ContentListField extends AbstractListField {
+
+    /**
+     * A concrete class that implements the List interface.
+     * An instance of this class will be used to store data
+     * for this field.
+     */
+    private final JClass coreList;
+
+    /** List getFIELD() method. */
+    private JMethod $get;
+
+    /**
+     * @param coreList
+     *      A concrete class that implements the List interface.
+     *      An instance of this class will be used to store data
+     *      for this field.
+     */
+    protected ContentListField(ClassOutlineImpl context, CPropertyInfo prop, JClass coreList) {
+        // the JAXB runtime picks ArrayList if the signature is List,
+        // so don't do eager allocation if it's ArrayList.
+        // otherwise we need to do eager allocation so that the collection type specified by the user
+        // will be used.
+        super(context, prop, false);
+        this.coreList = coreList;
+        generate();
+    }
+
+    protected final JClass getCoreListType() {
+        return coreList;
+    }
+
+    @Override
+    public void generateAccessors() {
+        final MethodWriter writer = outline.createMethodWriter();
+        final Accessor acc = create(JExpr._this());
+
+        // [RESULT]
+        // List getXXX() {
+        //     return <ref>;
+        // }
+        $get = writer.declareMethod(listT,"get"+prop.getName(true));
+        writer.javadoc().append(prop.javadoc);
+        JBlock block = $get.body();
+        fixNullRef(block);  // avoid using an internal getter
+        block._return(acc.ref(true));
+
+        String pname = NameConverter.standard.toVariableName(prop.getName(true));
+        writer.javadoc().append(
+            "Gets the value of the "+pname+" property.\n\n"+
+            "<p>\n" +
+            "This accessor method returns a reference to the live list,\n" +
+            "not a snapshot. Therefore any modification you make to the\n" +
+            "returned list will be present inside the JAXB object.\n" +
+            "This is why there is not a <CODE>set</CODE> method for the " +pname+ " property.\n" +
+            "\n"+
+            "<p>\n" +
+            "For example, to add a new item, do as follows:\n"+
+            "<pre>\n"+
+            "   get"+prop.getName(true)+"().add(newItem);\n"+
+            "</pre>\n"+
+            "\n\n"
+        );
+
+        writer.javadoc().append(
+            "<p>\n" +
+            "Objects of the following type(s) are allowed in the list\n")
+            .append(listPossibleTypes(prop));
+    }
+
+    public Accessor create(JExpression targetObject) {
+        return new Accessor(targetObject);
+    }
+
+    class Accessor extends AbstractListField.Accessor {
+        protected Accessor( JExpression $target ) {
+            super($target);
+        }
+
+        public void toRawValue(JBlock block, JVar $var) {
+            // [RESULT]
+            // $<var>.addAll(bean.getLIST());
+            // list.toArray( array );
+            block.assign($var,JExpr._new(codeModel.ref(ArrayList.class).narrow(exposedType.boxify())).arg(
+                $target.invoke($get)
+            ));
+        }
+
+        public void fromRawValue(JBlock block, String uniqueName, JExpression $var) {
+            // [RESULT]
+            // bean.getLIST().addAll($<var>);
+            JVar $list = block.decl(listT,uniqueName+'l',$target.invoke($get));
+            block.invoke($list,"addAll").arg($var);
+        }
+    }
+
+    @Override
+    protected JType getType(final Aspect aspect) {
+        if (Aspect.IMPLEMENTATION.equals(aspect)) {
+            return super.getType(aspect);
+        }
+        return codeModel.ref(Serializable.class);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
index 42fc0b301ba..31ecfc065b9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
@@ -27,8 +27,12 @@ package com.sun.tools.internal.xjc.generator.bean.field;
 import java.util.ArrayList;
 
 import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
+import com.sun.tools.internal.xjc.model.CElement;
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.tools.internal.xjc.model.CReferencePropertyInfo;
 import com.sun.tools.internal.xjc.outline.FieldOutline;
+import java.io.Serializable;
+import java.util.Set;
 
 /**
  * Default implementation of the FieldRendererFactory
@@ -64,7 +68,18 @@ final class DefaultFieldRenderer implements FieldRenderer {
         return decideRenderer(outline,prop).generate(outline,prop);
     }
 
-    private FieldRenderer decideRenderer(ClassOutlineImpl outline,CPropertyInfo prop) {
+    private FieldRenderer decideRenderer(ClassOutlineImpl outline, CPropertyInfo prop) {
+
+        if (prop instanceof CReferencePropertyInfo) {
+            CReferencePropertyInfo p = (CReferencePropertyInfo)prop;
+            if (p.isDummy()) {
+                return frf.getDummyList(outline.parent().getCodeModel().ref(ArrayList.class));
+            }
+            if (p.isContent() && (p.isMixedExtendedCust())) {
+                return frf.getContentList(outline.parent().getCodeModel().ref(ArrayList.class).narrow(Serializable.class));
+            }
+        }
+
         if(!prop.isCollection()) {
             // non-collection field
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java
new file mode 100644
index 00000000000..1231b9d5044
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.generator.bean.field;
+
+import com.sun.codemodel.internal.JAnnotatable;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.codemodel.internal.JBlock;
+import com.sun.codemodel.internal.JClass;
+import com.sun.codemodel.internal.JExpr;
+import com.sun.codemodel.internal.JExpression;
+import com.sun.codemodel.internal.JMethod;
+import com.sun.codemodel.internal.JVar;
+import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
+import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.tools.internal.xjc.model.CReferencePropertyInfo;
+import com.sun.xml.internal.bind.annotation.OverrideAnnotationOf;
+
+/**
+ * Realizes a property as an untyped {@link List}.
+ *
+ * <pre>
+ * List getXXX();
+ * </pre>
+ *
+ * <h2>Default value handling</h2>
+ * <p>
+ * Since unmarshaller just adds new values into the storage,
+ * we can't fill the storage by default values at the time of
+ * instanciation. (or oherwise values found in the document will
+ * be appended to default values, where it should overwrite them.)
+ * <p>
+ * Therefore, when the object is created, the storage will be empty.
+ * When the getXXX method is called, we'll check if the storage is
+ * modified in anyway. If it is modified, it must mean that the values
+ * are found in the document, so we just return it.
+ *
+ * Otherwise we will fill in default values and return it to the user.
+ *
+ * <p>
+ * When a list has default values, its dirty flag is set to true.
+ * Marshaller will check this and treat it appropriately.
+ *
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ */
+public class DummyListField extends AbstractListField {
+
+    /**
+     * A concrete class that imp    lements the List interface.
+     * An instance of this class will be used to store data
+     * for this field.
+     */
+    private final JClass coreList;
+
+
+    /** List getFIELD() method. */
+    private JMethod $get;
+
+    /**
+     * @param coreList
+     *      A concrete class that implements the List interface.
+     *      An instance of this class will be used to store data
+     *      for this field.
+     */
+    protected DummyListField(ClassOutlineImpl context, CPropertyInfo prop, JClass coreList) {
+        // the JAXB runtime picks ArrayList if the signature is List,
+        // so don't do eager allocation if it's ArrayList.
+        // otherwise we need to do eager allocation so that the collection type specified by the user
+        // will be used.
+        super(context, prop, !coreList.fullName().equals("java.util.ArrayList"));
+        this.coreList = coreList.narrow(exposedType.boxify());
+        generate();
+    }
+
+    /**
+     * Annotate the field according to the recipes given as {@link CPropertyInfo}.
+     */
+    @Override
+    protected void annotate( JAnnotatable field ) {
+        super.annotate(field);
+
+        if (prop instanceof CReferencePropertyInfo) {
+            CReferencePropertyInfo pref = (CReferencePropertyInfo)prop;
+            if (pref.isDummy()) {
+                annotateDummy(field);
+            }
+        }
+
+    }
+
+    private void annotateDummy(JAnnotatable field) {
+        field.annotate(OverrideAnnotationOf.class);
+    }
+
+    protected final JClass getCoreListType() {
+        return coreList;
+    }
+
+    @Override
+    public void generateAccessors() { }
+
+    public Accessor create(JExpression targetObject) {
+        return new Accessor(targetObject);
+    }
+
+    class Accessor extends AbstractListField.Accessor {
+        protected Accessor( JExpression $target ) {
+            super($target);
+        }
+
+        public void toRawValue(JBlock block, JVar $var) {
+            // [RESULT]
+            // $<var>.addAll(bean.getLIST());
+            // list.toArray( array );
+            block.assign($var,JExpr._new(codeModel.ref(ArrayList.class).narrow(exposedType.boxify())).arg(
+                $target.invoke($get)
+            ));
+        }
+
+        public void fromRawValue(JBlock block, String uniqueName, JExpression $var) {
+            // [RESULT]
+            // bean.getLIST().addAll($<var>);
+            JVar $list = block.decl(listT,uniqueName+'l',$target.invoke($get));
+            block.invoke($list,"addAll").arg($var);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
index 5b5e8b6da97..47cada5ae27 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
@@ -59,7 +59,7 @@ public interface FieldRenderer {
      * class, then return {@link FieldOutline} for accessing
      * the generated field.
      */
-    public FieldOutline generate( ClassOutlineImpl context, CPropertyInfo prop );
+    public FieldOutline generate( ClassOutlineImpl context, CPropertyInfo prop);
 
 //    //
 //    // field renderers
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
index 6d5eea6ebfb..3eee59ad203 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.tools.internal.xjc.Options;
@@ -67,6 +68,12 @@ public class FieldRendererFactory {
     public FieldRenderer getList(JClass coreList) {
         return new UntypedListFieldRenderer(coreList);
     }
+    public FieldRenderer getContentList(JClass coreList) {
+        return new UntypedListFieldRenderer(coreList, false, true);
+    }
+    public FieldRenderer getDummyList(JClass coreList) {
+        return new UntypedListFieldRenderer(coreList, true, false);
+    }
     public FieldRenderer getConst(FieldRenderer fallback) {
         return new ConstFieldRenderer(fallback);
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
index 7ab6dd909ac..d7f21ab1bc9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
@@ -56,7 +56,7 @@ public class IsSetFieldRenderer implements FieldRenderer {
 
     public FieldOutline generate(ClassOutlineImpl context, CPropertyInfo prop) {
         return new IsSetField(context,prop,
-            core.generate(context,prop),
+            core.generate(context, prop),
             generateUnSetMethod,generateIsSetMethod);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
index 77f632889cc..eafc8ab6fcd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
@@ -28,4 +28,3 @@ DEFAULT_SETTER_JAVADOC = \
 
 DEFAULT_GETTER_JAVADOC = \
         Gets the value of the {0} property.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
index 61fa6ea95e1..d0f5805e320 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
@@ -31,7 +31,7 @@ import java.util.ResourceBundle;
 /**
  * Message resources
  */
-enum Messages {
+public enum Messages {
     DEFAULT_GETTER_JAVADOC,     // 1 arg
     DEFAULT_SETTER_JAVADOC,     // 1 arg
     ;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java
new file mode 100644
index 00000000000..910e7cbb973
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.generator.bean.field;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.codemodel.internal.JBlock;
+import com.sun.codemodel.internal.JClass;
+import com.sun.codemodel.internal.JExpr;
+import com.sun.codemodel.internal.JExpression;
+import com.sun.codemodel.internal.JMethod;
+import com.sun.codemodel.internal.JType;
+import com.sun.codemodel.internal.JVar;
+import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
+import com.sun.tools.internal.xjc.generator.bean.MethodWriter;
+import com.sun.tools.internal.xjc.model.CElement;
+import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.tools.internal.xjc.model.CReferencePropertyInfo;
+import com.sun.tools.internal.xjc.outline.Aspect;
+import com.sun.xml.internal.bind.api.impl.NameConverter;
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * Realizes a property as an untyped {@link List}.
+ *
+ * <pre>
+ * List getXXX();
+ * </pre>
+ *
+ * <h2>Default value handling</h2>
+ * <p>
+ * Since unmarshaller just adds new values into the storage,
+ * we can't fill the storage by default values at the time of
+ * instanciation. (or oherwise values found in the document will
+ * be appended to default values, where it should overwrite them.)
+ * <p>
+ * Therefore, when the object is created, the storage will be empty.
+ * When the getXXX method is called, we'll check if the storage is
+ * modified in anyway. If it is modified, it must mean that the values
+ * are found in the document, so we just return it.
+ *
+ * Otherwise we will fill in default values and return it to the user.
+ *
+ * <p>
+ * When a list has default values, its dirty flag is set to true.
+ * Marshaller will check this and treat it appropriately.
+ *
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ */
+public class NoExtendedContentField extends AbstractListField {
+
+    /**
+     * A concrete class that implements the List interface.
+     * An instance of this class will be used to store data
+     * for this field.
+     */
+    private final JClass coreList;
+
+    /** List getFIELD() method. */
+    private JMethod $get;
+
+    /**
+     * @param coreList
+     *      A concrete class that implements the List interface.
+     *      An instance of this class will be used to store data
+     *      for this field.
+     */
+    protected NoExtendedContentField(ClassOutlineImpl context, CPropertyInfo prop, JClass coreList) {
+        // the JAXB runtime picks ArrayList if the signature is List,
+        // so don't do eager allocation if it's ArrayList.
+        // otherwise we need to do eager allocation so that the collection type specified by the user
+        // will be used.
+        super(context, prop, false);
+        this.coreList = coreList;
+        generate();
+    }
+
+    protected final JClass getCoreListType() {
+        return coreList;
+    }
+
+    @Override
+    public void generateAccessors() {
+        final MethodWriter writer = outline.createMethodWriter();
+        final Accessor acc = create(JExpr._this());
+
+        // [RESULT]
+        // List getXXX() {
+        //     return <ref>;
+        // }
+        $get = writer.declareMethod(listT,"get"+prop.getName(true));
+        writer.javadoc().append(prop.javadoc);
+        JBlock block = $get.body();
+        fixNullRef(block);  // avoid using an internal getter
+        block._return(acc.ref(true));
+
+        String pname = NameConverter.standard.toVariableName(prop.getName(true));
+        writer.javadoc().append(
+            "Gets the value of the "+pname+" property.\n\n"+
+            "<p>\n" +
+            "This accessor method returns a reference to the live list,\n" +
+            "not a snapshot. Therefore any modification you make to the\n" +
+            "returned list will be present inside the JAXB object.\n" +
+            "This is why there is not a <CODE>set</CODE> method for the " +pname+ " property.\n" +
+            "\n"+
+            "<p>\n" +
+            "For example, to add a new item, do as follows:\n"+
+            "<pre>\n"+
+            "   get"+prop.getName(true)+"().add(newItem);\n"+
+            "</pre>\n"+
+            "\n\n"
+        );
+
+        writer.javadoc().append(
+            "<p>\n" +
+            "Objects of the following type(s) are allowed in the list\n")
+            .append(listPossibleTypes(prop));
+    }
+
+    public Accessor create(JExpression targetObject) {
+        return new Accessor(targetObject);
+    }
+
+    class Accessor extends AbstractListField.Accessor {
+        protected Accessor( JExpression $target ) {
+            super($target);
+        }
+
+        public void toRawValue(JBlock block, JVar $var) {
+            // [RESULT]
+            // $<var>.addAll(bean.getLIST());
+            // list.toArray( array );
+            block.assign($var,JExpr._new(codeModel.ref(ArrayList.class).narrow(getType(Aspect.EXPOSED).boxify())).arg(
+                $target.invoke($get)
+            ));
+        }
+
+        public void fromRawValue(JBlock block, String uniqueName, JExpression $var) {
+            // [RESULT]
+            // bean.getLIST().addAll($<var>);
+            JVar $list = block.decl(listT,uniqueName+'l',$target.invoke($get));
+            block.invoke($list,"addAll").arg($var);
+        }
+    }
+
+    @Override
+    protected JType getType(final Aspect aspect) {
+        if (Aspect.IMPLEMENTATION.equals(aspect)) {
+            return super.getType(aspect);
+        }
+
+        if (prop instanceof CReferencePropertyInfo) {
+            Set<CElement> elements = ((CReferencePropertyInfo)prop).getElements();
+            if ((elements != null) && (elements.size() > 0)) {
+                return codeModel.ref(Serializable.class);
+            }
+        }
+
+        return codeModel.ref(String.class);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
index a2b3ab492a9..19aff340769 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
@@ -131,10 +131,8 @@ public class SingleField extends AbstractFieldWithVar {
         JBlock body = $set.body();
         body.assign(JExpr._this().ref(ref()),castToImplType($value));
 
-        javadoc = prop.javadoc;
-        if(javadoc.length()==0)
-            javadoc = Messages.DEFAULT_SETTER_JAVADOC.format(nc.toVariableName(prop.getName(true)));
-        writer.javadoc().append(javadoc);
+        // setter always get the default javadoc. See issue #381
+        writer.javadoc().append(Messages.DEFAULT_SETTER_JAVADOC.format(nc.toVariableName(prop.getName(true))));
         writer.javadoc().addParam($value)
             .append("allowed object is\n")
             .append(possibleTypes);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
index ebd640e0252..12147b91c7d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.generator.bean.field;
 
 import com.sun.tools.internal.xjc.generator.bean.ClassOutlineImpl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
index a50638ee34c..882caa7e848 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
@@ -92,10 +92,8 @@ public class UnboxedField extends AbstractFieldWithVar {
         JVar $value = writer.addParameter( ptype, "value" );
         body = $set.body();
         body.assign(JExpr._this().ref(ref()),$value);
-        javadoc = prop.javadoc;
-        if(javadoc.length()==0)
-            javadoc = Messages.DEFAULT_SETTER_JAVADOC.format(nc.toVariableName(prop.getName(true)));
-        writer.javadoc().append(javadoc);
+        // setter always get the default javadoc. See issue #381
+        writer.javadoc().append(Messages.DEFAULT_SETTER_JAVADOC.format(nc.toVariableName(prop.getName(true))));
 
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
index b393538bbcc..e5164691046 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
@@ -38,12 +38,26 @@ import com.sun.tools.internal.xjc.outline.FieldOutline;
 public final class UntypedListFieldRenderer implements FieldRenderer {
 
     private JClass coreList;
+    private boolean dummy;
+    private boolean content;
 
-    protected UntypedListFieldRenderer( JClass coreList ) {
+    protected UntypedListFieldRenderer( JClass coreList) {
+        this(coreList, false, false);
+    }
+
+    protected UntypedListFieldRenderer( JClass coreList, boolean dummy, boolean content) {
         this.coreList = coreList;
+        this.dummy = dummy;
+        this.content = content;
     }
 
     public FieldOutline generate(ClassOutlineImpl context, CPropertyInfo prop) {
-        return new UntypedListField(context,prop,coreList);
+        if (dummy) {
+            return new DummyListField(context, prop, coreList);
+        }
+        if (content) {
+            return new ContentListField(context, prop, coreList);
+        }
+        return new UntypedListField(context, prop, coreList);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java
index 5025c1a0a07..59874ba2998 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * <h1>Code Generator</h1>.
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java
index 46ef108aa22..86e5d0f74fd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.bind.annotation.XmlTransient;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
index c3df0c3a822..0064b5c5d15 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.activation.MimeType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
index b94cf858223..31fee8642cd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Set;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java
index 6b5a820f8f1..5b47cc79bd1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java
index 7e66732629b..5b83afe802b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.namespace.QName;
@@ -38,7 +39,12 @@ import com.sun.xml.internal.xsom.XSComponent;
 import org.xml.sax.Locator;
 
 /**
- * TODO: Because s2j doesn't generate the array binding, this is unnecessary.
+ * Because XJC doesn't generate the array binding, this class will
+ * never show up in the model constructed by XJC.
+ *
+ * <p>
+ * This class is nevertheless defined to make the type checker happy.
+ *
  * @author Kohsuke Kawaguchi
  */
 public final class CArrayInfo extends AbstractCTypeInfoImpl implements ArrayInfo<NType,NClass>, CNonElement, NType {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
index 3024044a248..f36a8eb1a86 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
index 86bf6074175..dc479e94450 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.awt.*;
@@ -261,7 +262,9 @@ public abstract class CBuiltinLeafInfo extends BuiltinLeafInfoImpl<NType,NClass>
         }
     };
     // XMLGregorianCalendar is mutable, so we can't support default values anyhow.
-    public static final CBuiltinLeafInfo CALENDAR = new NoConstantBuiltin(XMLGregorianCalendar.class,"dateTime");
+        // For CALENAR we are uses a most unlikely name so as to avoid potential name
+        // conflicts in the furture.
+        public static final CBuiltinLeafInfo CALENDAR = new NoConstantBuiltin(XMLGregorianCalendar.class,"\u0000");
     public static final CBuiltinLeafInfo DURATION = new NoConstantBuiltin(Duration.class,"duration");
 
     public static final CBuiltinLeafInfo BIG_INTEGER = new Builtin(BigInteger.class,"integer") {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClass.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClass.java
index 2d53b72819e..7f39dab5fd3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClass.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClass.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java
index a1ca008c16c..03bb9b4bc23 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.util.ArrayList;
@@ -41,10 +42,15 @@ import com.sun.codemodel.internal.JClass;
 import com.sun.codemodel.internal.JCodeModel;
 import com.sun.codemodel.internal.JPackage;
 import com.sun.istack.internal.Nullable;
+import com.sun.tools.internal.xjc.Language;
+import com.sun.tools.internal.xjc.Options;
 import com.sun.tools.internal.xjc.model.nav.NClass;
 import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.tools.internal.xjc.outline.Aspect;
 import com.sun.tools.internal.xjc.outline.Outline;
+import com.sun.tools.internal.xjc.reader.Ring;
+import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIFactoryMethod;
 import com.sun.xml.internal.bind.v2.model.core.ClassInfo;
 import com.sun.xml.internal.bind.v2.model.core.Element;
 import com.sun.xml.internal.xsom.XSComponent;
@@ -83,6 +89,11 @@ public final class CClassInfo extends AbstractCElement implements ClassInfo<NTyp
      */
     private final QName typeName;
 
+    /**
+     * Custom {@link #getSqueezedName() squeezed name}, if any.
+     */
+    private /*almost final*/ @Nullable String squeezedName;
+
     /**
      * If this class also gets {@link XmlRootElement}, the class name.
      */
@@ -136,6 +147,16 @@ public final class CClassInfo extends AbstractCElement implements ClassInfo<NTyp
         this.typeName = typeName;
         this.elementName = elementName;
 
+        Language schemaLanguage = model.options.getSchemaLanguage();
+        if ((schemaLanguage != null) &&
+            (schemaLanguage.equals(Language.XMLSCHEMA) || schemaLanguage.equals(Language.WSDL))) {
+            BIFactoryMethod factoryMethod = Ring.get(BGMBuilder.class).getBindInfo(source).get(BIFactoryMethod.class);
+            if(factoryMethod!=null) {
+                factoryMethod.markAsAcknowledged();
+                this.squeezedName = factoryMethod.name;
+            }
+        }
+
         model.add(this);
     }
 
@@ -182,7 +203,7 @@ public final class CClassInfo extends AbstractCElement implements ClassInfo<NTyp
      */
     public boolean inheritsAttributeWildcard() {
         for( CClassInfo c=getBaseClass(); c!=null; c=c.getBaseClass() ) {
-            if(hasAttributeWildcard)
+            if(c.hasAttributeWildcard)
                 return true;
         }
         return false;
@@ -215,6 +236,7 @@ public final class CClassInfo extends AbstractCElement implements ClassInfo<NTyp
      */
     @XmlElement
     public String getSqueezedName() {
+        if (squeezedName != null)  return squeezedName;
         return calcSqueezedName.onBean(this);
     }
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java
index 63b3138fd47..7c98d77714e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JPackage;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java
index 7dfc6c48acd..f7bd33e2304 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java
index 0a33748d5a0..302b684cf6a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.Plugin;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java
index 429b3400cca..2847d5b3321 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java
index fe1c30a090d..728262f3c0f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JExpression;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java
index 496cba404e6..517b8f5b749 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.model.nav.NClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java
index 91de79cc680..ed7eb1ed068 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collection;
@@ -44,6 +45,10 @@ import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.tools.internal.xjc.model.nav.NavigatorImpl;
 import com.sun.tools.internal.xjc.outline.Aspect;
 import com.sun.tools.internal.xjc.outline.Outline;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIInlineBinaryData;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIFactoryMethod;
+import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
+import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.xml.internal.bind.v2.model.core.ElementInfo;
 import com.sun.xml.internal.xsom.XSElementDecl;
 import com.sun.xml.internal.xsom.XmlString;
@@ -99,6 +104,11 @@ public final class CElementInfo extends AbstractCElement
 
     private CElementPropertyInfo property;
 
+    /**
+     * Custom {@link #getSqueezedName() squeezed name}, if any.
+     */
+    private /*almost final*/ @Nullable String squeezedName;
+
     /**
      * Creates an element in the given parent.
      *
@@ -143,10 +153,18 @@ public final class CElementInfo extends AbstractCElement
                 contentType.getExpectedMimeType(),
                 source,null,getLocator(),true);
         this.property.setAdapter(contentType.getAdapterUse());
+        BIInlineBinaryData.handle(source,property);
         property.getTypes().add(new CTypeRef(contentType.getInfo(),tagName,CTypeRef.getSimpleTypeName(source), true,defaultValue));
         this.type = NavigatorImpl.createParameterizedType(
             NavigatorImpl.theInstance.ref(JAXBElement.class),
             getContentInMemoryType() );
+
+        BIFactoryMethod factoryMethod = Ring.get(BGMBuilder.class).getBindInfo(source).get(BIFactoryMethod.class);
+        if(factoryMethod!=null) {
+            factoryMethod.markAsAcknowledged();
+            this.squeezedName = factoryMethod.name;
+        }
+
     }
 
     public final String getDefaultValue() {
@@ -208,6 +226,8 @@ public final class CElementInfo extends AbstractCElement
      */
     @XmlElement
     public String getSqueezedName() {
+        if(squeezedName!=null)  return squeezedName;
+
         StringBuilder b = new StringBuilder();
         CClassInfo s = getScope();
         if(s!=null)
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
index fe2f3a2e01f..3ca8f2a1908 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.util.AbstractList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java
index fb16c02b860..0960b874bbf 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.model.nav.NClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java
index a6471ca5e62..e836d2eb3d4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.model.nav.NClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java
index b1c505f5026..c3ccd3f4dec 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.Plugin;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
index ec2b75f5b46..12c56b70935 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java
@@ -22,14 +22,15 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
+import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.Map;
-import java.lang.annotation.Annotation;
 
-import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 
@@ -41,12 +42,11 @@ import com.sun.tools.internal.xjc.generator.bean.field.FieldRenderer;
 import com.sun.tools.internal.xjc.model.nav.NClass;
 import com.sun.tools.internal.xjc.model.nav.NType;
 import com.sun.xml.internal.bind.api.impl.NameConverter;
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil;
-import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.xsom.XSComponent;
 
-import org.xml.sax.ErrorHandler;
 import org.xml.sax.Locator;
 
 /**
@@ -82,7 +82,12 @@ public abstract class CPropertyInfo implements PropertyInfo<NType,NClass>, CCust
     public String javadoc="";
 
     /**
-     * Specifies how the field is generated by the backedn.
+     * Property with {@link @XmlInlineBinaryData}.
+     */
+    public boolean inlineBinaryData;
+
+    /**
+     * Specifies how the field is generated by the backend.
      */
     @XmlJavaTypeAdapter(RuntimeUtil.ToStringAdapter.class)
     public FieldRenderer realization;
@@ -271,11 +276,8 @@ public abstract class CPropertyInfo implements PropertyInfo<NType,NClass>, CCust
         return customizations;
     }
 
-    /**
-     * @deprecated if you are calling this method directly, there's something wrong.
-     */
     public boolean inlineBinaryData() {
-        return false;
+        return inlineBinaryData;
     }
 
     public abstract <V> V accept( CPropertyVisitor<V> visitor );
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
index 49b0bb9dc45..765c49c0a13 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
index 38973b12377..cc0d3f80e26 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collection;
@@ -51,6 +52,11 @@ import org.xml.sax.Locator;
  */
 public final class CReferencePropertyInfo extends CPropertyInfo implements ReferencePropertyInfo<NType,NClass> {
 
+    /**
+     * True if this property can never be absent legally.
+     */
+    private final boolean required;
+
     /**
      * List of referenced elements.
      */
@@ -58,11 +64,18 @@ public final class CReferencePropertyInfo extends CPropertyInfo implements Refer
 
     private final boolean isMixed;
     private WildcardMode wildcard;
+    private boolean dummy;
+    private boolean content;
+    private boolean isMixedExtendedCust = false;
 
-    public CReferencePropertyInfo(String name, boolean collection, boolean isMixed, XSComponent source,
-                                  CCustomizations customizations, Locator locator) {
-        super(name, collection||isMixed, source, customizations, locator );
+    public CReferencePropertyInfo(String name, boolean collection, boolean required, boolean isMixed, XSComponent source,
+                                  CCustomizations customizations, Locator locator, boolean dummy, boolean content, boolean isMixedExtended) {   // 'dummy' and 'content' here for NHIN fix - a hack in order to be able to handle extended mixed types better
+        super(name, (collection||isMixed) && (!dummy), source, customizations, locator);
         this.isMixed = isMixed;
+        this.required = required;
+        this.dummy = dummy;
+        this.content = content;
+        this.isMixedExtendedCust = isMixedExtended;
     }
 
     public Set<? extends CTypeInfo> ref() {
@@ -108,7 +121,6 @@ public final class CReferencePropertyInfo extends CPropertyInfo implements Refer
         if(isMixed())
             r.add(CBuiltinLeafInfo.STRING);
 
-
         return r;
     }
 
@@ -120,6 +132,18 @@ public final class CReferencePropertyInfo extends CPropertyInfo implements Refer
         return isMixed;
     }
 
+    public boolean isDummy() {
+        return dummy;
+    }
+
+    public boolean isContent() {
+        return content;
+    }
+
+    public boolean isMixedExtendedCust() {
+        return isMixedExtendedCust;
+    }
+
     /**
      * We'll never use a wrapper element in XJC. Always return null.
      */
@@ -198,6 +222,10 @@ public final class CReferencePropertyInfo extends CPropertyInfo implements Refer
         return null;
     }
 
+    public boolean isRequired() {
+        return required;
+    }
+
     @Override
     public QName collectElementNames(Map<QName, CPropertyInfo> table) {
         for (CElement e : elements) {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
index 25936bdb6bb..7261587201c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collections;
@@ -30,7 +31,6 @@ import java.util.List;
 import javax.activation.MimeType;
 import javax.xml.namespace.QName;
 
-import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.model.core.ID;
 import com.sun.xml.internal.xsom.XSComponent;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java
index 66a1dacadff..d4c7ecea285 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java
index a4e183f4ce8..ee709beff1b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
index 105ce6502cc..4667b0086ef 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
index f5cbf4b2079..3a1c4f45bfd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
index bf7188ad202..dec33053f04 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.codemodel.internal.JPackage;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Model.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Model.java
index d53d7970136..dfe629fe295 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Model.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Model.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java
index 62b8a1467f2..6c43f27bc7b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import com.sun.tools.internal.xjc.outline.Outline;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
index fa224d49b08..4d681160931 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.activation.MimeType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java
index 4f414bb53f7..7516fd38bee 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.activation.MimeType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java
index 9b034b35896..6208342b460 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model;
 
 import javax.activation.MimeType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
index 8ccdba727f9..04c6fe4538c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model.nav;
 
 import java.lang.reflect.Modifier;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java
index 40f5ac1a881..592d738560e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model.nav;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java
index e8076cea26e..b24cab8f9c8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model.nav;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
index 88f41e6d9f3..cdec3f633a8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model.nav;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
index 798b9a4c29c..90caddf59e9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model.nav;
 
 import com.sun.codemodel.internal.JClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java
index 8f5d459caff..4e9e4a33137 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model.nav;
 
 import com.sun.codemodel.internal.JType;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
index 2361d123837..4406706e85b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.model.nav;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java
index ba5a17b63fc..543f3b0d1c7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * Implementation of the {@link com.sun.xml.internal.bind.v2.model.core} package for XJC.
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java
index 533cb0cbb80..d22a17d299f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.outline;
 
 import com.sun.tools.internal.xjc.generator.bean.ImplStructureStrategy;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java
index 48dafb4f982..2b7386d4206 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /*
  * Use is subject to the license terms.
  */
@@ -81,7 +82,7 @@ public abstract class ClassOutline {
     /**
      * The implementation class that shall be used for reference.
      * <p>
-     * Usually this field holds the same value as the impl method,
+     * Usually this field holds the same value as the {@link #implClass} method,
      * but sometimes it holds the user-specified implementation class
      * when it is specified.
      * <p>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java
index c0e489f9f9c..6f2f1a5fd28 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.outline;
 
 import com.sun.codemodel.internal.JDefinedClass;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
index 4bc3df8182e..f4125016ae1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.outline;
 
 import com.sun.codemodel.internal.JEnumConstant;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java
index 76e02218b82..9f17c488c86 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.outline;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/package-info.java
index 88129889a26..0730582674f 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * <h1>Schema to Java compiler</h1>.
  *
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
index 4fd4a8a164e..4b6b63777ae 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader;
 
 import java.util.Set;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java
index ed934cfbff7..ed64e3f62ee 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java
@@ -24,7 +24,7 @@
  */
 package com.sun.tools.internal.xjc.reader;
 
-
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 
 
 /**
@@ -53,4 +53,12 @@ public class Const {
 
     /** URI to represent DTD. */
     public static final String DTD = "DTD";
+
+    /**
+     * Attribute name of the expected media type.
+     *
+     * @see WellKnownNamespace#XML_MIME_URI
+     * @see http://www.w3.org/TR/xml-media-types/
+     */
+    public static final String EXPECTED_CONTENT_TYPES = "expectedContentTypes";
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties
index 33f28c47813..0e83b48f3c6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties
@@ -30,30 +30,30 @@
 
 
 ERR_UNDECLARED_PREFIX = \
-	Prefix "{0}" is undeclared
+        Prefix "{0}" is undeclared
 
 ERR_UNEXPECTED_EXTENSION_BINDING_PREFIXES = \
-	extensionBindingPrefixes attribute must be declared at the root element
+        extensionBindingPrefixes attribute must be declared at the root element
 
 ERR_VENDOR_EXTENSION_DISALLOWED_IN_STRICT_MODE = \
     vendor extension bindings (jaxb:extensionBindingPrefixes) are not allowed in the strict mode. Use -extension.
 
 ERR_UNSUPPORTED_EXTENSION = \
-	Unsupported binding namespace "{0}". Perhaps you meant "{1}"?
+        Unsupported binding namespace "{0}". Perhaps you meant "{1}"?
 
 ERR_SUPPORTED_EXTENSION_IGNORED = \
-	Binding declaration namespace "{0}" will be ignored because it is \
-	not designated by the jaxb:extensionBindingPrefixes attribute.
+        Binding declaration namespace "{0}" will be ignored because it is \
+        not designated by the jaxb:extensionBindingPrefixes attribute.
 
 ERR_RELEVANT_LOCATION = \
-	The following location is relevant to the above error
+        The following location is relevant to the above error
 
 
 ERR_CLASS_NOT_FOUND = \
-	Unable to find type "{0}". Without knowing the proper inheritance hierarchy of this type, \
-	XJC may fail to generate some signatures correctly. \
-	Make this class available via the -classpath option.
-	
+        Unable to find type "{0}". Without knowing the proper inheritance hierarchy of this type, \
+        XJC may fail to generate some signatures correctly. \
+        Make this class available via the -classpath option.
+
 DUPLICATE_PROPERTY = \
     Property "{0}" is already defined. Use &lt;jaxb:property> to resolve this conflict.
 
@@ -71,4 +71,3 @@ ERR_ILLEGAL_CUSTOMIZATION_TAGNAME = \
 
 ERR_PLUGIN_NOT_ENABLED = \
     Using "{1}" customizations requires the "-{0}" switch to enable this plug-in.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java
index be36dde9e21..996da0312cc 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java
index 6e7e4c19147..99064ec7195 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java
index faff8881533..ba4f23603b4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader;
 
 import java.lang.reflect.Constructor;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java
index 68ae2e5c9d2..c25195e44b0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.LinkedHashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java
index d4b631e03b6..42d989421e6 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.ArrayList;
@@ -221,7 +222,7 @@ final class Element extends Term implements Comparable<Element> {
 
         switch(contentModelType) {
         case DTDEventListener.CONTENT_MODEL_ANY:
-            CReferencePropertyInfo rp = new CReferencePropertyInfo("Content",true,true,null,null/*TODO*/,locator);
+            CReferencePropertyInfo rp = new CReferencePropertyInfo("Content",true,false,true,null,null/*TODO*/,locator, false, false, false);
             rp.setWildcard(WildcardMode.SKIP);
             ci.addProperty(rp);
             return;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
index 237fb9f67f2..56ecf67b407 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
@@ -24,26 +24,25 @@
 #
 
 TDTDReader.NoRootElement = \
-	No root element was specified.
+        No root element was specified.
 
 TDTDReader.UndefinedElementInBindInfo = \
-	Binding information contains element "{0}", but it's not defined in DTD.
+        Binding information contains element "{0}", but it's not defined in DTD.
 
 TDTDReader.ConversionForNonValueElement = \
-	Conversion declaration is specified for the element "{0}", but \
-	the content model of this element is not #PCDATA.
+        Conversion declaration is specified for the element "{0}", but \
+        the content model of this element is not #PCDATA.
 
 TDTDReader.ContentProperty.ParticleMismatch = \
-	The content model of the element "{0}" does not match \
-	the content-property declaration of the specified binding information.
+        The content model of the element "{0}" does not match \
+        the content-property declaration of the specified binding information.
 
 TDTDReader.ContentProperty.DeclarationTooShort = \
-	The content-property declaration for the element "{0}" is too short.
+        The content-property declaration for the element "{0}" is too short.
 
 TDTDReader.BindInfo.NonExistentElementDeclaration = \
-	DTD does not contain the element "{0}"
+        DTD does not contain the element "{0}"
 
 TDTDReader.BindInfo.NonExistentInterfaceMember = \
-	"{0}" is specified as a member of an interface, \
-	but there is no such class nor interface.
- 
+        "{0}" is specified as a member of an interface, \
+        but there is no such class nor interface.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
index 587eeb0f89d..72bbab08410 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
index 72a37c11fef..956ac2d755b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java
index 8f114f40671..e3a8a11cd12 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.dtd;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
index 9829568d353..1edea852f0d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
index dc121ac243a..cd25bd6f7ae 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
index cd0822f9569..f2169ea1308 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.dtd.bindinfo;
 
 import com.sun.tools.internal.xjc.Options;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
index dc662e63d47..e6936ef28e7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties
@@ -24,6 +24,5 @@
 #
 
 BIConstructor.UndefinedField = \
-	Property "{0}" is declared in the <constructor> declaration \
-	but is not defined in DTD
- 
+        Property "{0}" is declared in the <constructor> declaration \
+        but is not defined in DTD
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
index a71e45ba580..9b8d4824734 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng
@@ -25,7 +25,6 @@
 -->
 <!--
 DTD binding information file which is supported by this version of XJC.
-$Id: bindingfile.rng,v 1.1 2005/04/15 20:09:43 kohsuke Exp $
 
 - Changes from the EA1 is marked by "CHANGE:"
 - "ref:key" and "ref:keyref" are used to specify cross-reference
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd
index 4581ab92695..ae492478e8a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd
@@ -23,9 +23,10 @@
  CA 95054 USA or visit www.sun.com if you need additional information or
  have any questions.
 -->
+
+
 <!--
   DTD binding information file which is supported by this version of XJC.
-  $Id: bindingfile.xsd,v 1.1 2005/04/29 18:11:05 kohsuke Exp $
   
   - Changes from the EA1 is marked by "CHANGE:"
   - "ref:key" and "ref:keyref" are used to specify cross-reference
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
index e80bb2a994b..66dd5097d25 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd
@@ -23,6 +23,8 @@
  CA 95054 USA or visit www.sun.com if you need additional information or
  have any questions.
 -->
+
+
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
   <xs:import schemaLocation="bindingfile.xsd"/>
   <xs:element name="serializable">
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java
index 91be85a49b3..f8f1e60df24 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
index 29759c9b041..b31660f57d4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java
index 4e647394547..0125182de06 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java
@@ -22,8 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -144,7 +146,19 @@ public abstract class Element extends Expression implements ElementSet {
      * all into the given set.
      */
     public void buildStronglyConnectedComponents(List<ConnectedComponent> ccs) {
+
+        // store visited elements - loop detection
+        List<Element> visitedElements = new ArrayList<Element>();
+
         for(Element cur=this; cur!=cur.prevPostOrder; cur=cur.prevPostOrder) {
+
+            if(visitedElements.contains(cur)) {
+                // if I've already processed cur element, I'm in a loop
+                break;
+            } else {
+                visitedElements.add(cur);
+            }
+
             if(cur.belongsToSCC())
                 continue;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
index 6e73c920f79..4fc5c04f2db 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
index 4711260359d..7801d54b85c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.LinkedHashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
index 9583157837e..a35679e33a9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.Set;
@@ -64,10 +65,6 @@ public abstract class Expression {
             // noop
         }
 
-        void assignElementNumber(Set<Element> allElements) {
-            // noop
-        }
-
         public String toString() {
             return "-";
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java
index c612fddbd81..44d90bda4f8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
index 4be389204fb..82a06b076e8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
index aa628cbe871..401a988d84b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
index ded5a787c95..b037cda6c0d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
index c96d78a654c..183db244833 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.gbind;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
index 0cc0003a25f..6ef7e7ea1ad 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import javax.xml.XMLConstants;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
index 5dd998a4175..b6bc6f0ab9a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties
@@ -29,44 +29,44 @@
 
 
 AbstractReferenceFinderImpl.UnableToParse = \
-	Unable to parse "{0}" : {1}
+        Unable to parse "{0}" : {1}
+
 
-	
 
 
 Internalizer.IncorrectSchemaReference = \
-	"{0}" is not a part of this compilation. Is this a mistake for "{1}"?
+        "{0}" is not a part of this compilation. Is this a mistake for "{1}"?
 
 Internalizer.XPathEvaluationError = \
-	XPath error: {0}
+        XPath error: {0}
 
 Internalizer.XPathEvaluatesToNoTarget = \
-	XPath evaluation of "{0}" results in empty target node
+        XPath evaluation of "{0}" results in empty target node
 
 Internalizer.XPathEvaulatesToTooManyTargets = \
-	XPath evaluation of "{0}" results in too many ({1}) target nodes
+        XPath evaluation of "{0}" results in too many ({1}) target nodes
 
 Internalizer.XPathEvaluatesToNonElement = \
-	XPath evaluation of "{0}" needs to result in an element.
+        XPath evaluation of "{0}" needs to result in an element.
 
 Internalizer.XPathEvaluatesToNonSchemaElement = \
-	XPath evaluation of "{0}" needs to result in an element of the schema language, \
-	but it results in {1}
+        XPath evaluation of "{0}" needs to result in an element of the schema language, \
+        but it results in {1}
 
 Internalizer.ContextNodeIsNotElement = \
-	Context node is not an element.
+        Context node is not an element.
 
 Internalizer.OrphanedCustomization = \
-	The "{0}" customization is not associated with any schema element.
+        The "{0}" customization is not associated with any schema element.
 
 Internalizer.IncorrectVersion = \
-	JAXB version attribute must be "1.0"
+        JAXB version attribute must be "1.0"
 
 Internalizer.VersionNotPresent = \
-	JAXB version attribute must be present
+        JAXB version attribute must be present
 
 Internalizer.TwoVersionAttributes = \
-	Both jaxb:version and version are present
+        Both jaxb:version and version are present
 
 ERR_GENERAL_SCHEMA_CORRECTNESS_ERROR = \
     We were unable to ensure the correctness of the schema: {0}
@@ -91,4 +91,3 @@ ERR_SCD_MATCHED_MULTIPLE_NODES_SECOND = \
 
 ERR_FILENAME_IS_NOT_URI = \
     File name is not an URI.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
index bc6d5129f2c..8cb48bf10d9 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java
@@ -2,7 +2,7 @@
  * reserved comment block
  * DO NOT REMOVE OR ALTER!
  */
-/*
+ /*
  * Portions Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,6 +28,23 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
+
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.util.Iterator;
@@ -53,21 +70,6 @@ final class NamespaceContextImpl implements NamespaceContext {
         this.e = e;
     }
 
-    /*
-     * Copyright 1999-2004 The Apache Software Foundation.
-     *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     */
     public String getNamespaceURI(String prefix) {
         Node parent = e;
         String namespace = null;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
index a4d87cf8146..fd853316f0a 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
index f8fe96c1c9c..0064144f717 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * @(#)$Id: WhitespaceStripper.java,v 1.2 2005/04/29 19:56:57 kohsuke Exp $
- */
-
-
 package com.sun.tools.internal.xjc.reader.internalizer;
 
 import com.sun.xml.internal.bind.WhiteSpaceProcessor;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
index 9d5a3df55e0..2d5576a0471 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
index 887b1270170..ed4a46a4edd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import javax.xml.namespace.QName;
@@ -101,7 +102,7 @@ final class ContentModelBinder extends DPatternWalker {
             clazz.addProperty(prop);
         } else {
             CReferencePropertyInfo prop = new CReferencePropertyInfo(
-                    calcName(p),true,false/*TODO*/,null,null,p.getLocation());
+                    calcName(p),true,!optional,false/*TODO*/,null,null,p.getLocation(), false, false, false);
             rts.addTo(prop);
             clazz.addProperty(prop);
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
index 3633252bdb9..8572198a07e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
index f5823ddb16e..b76abf38515 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
index 807ba2a7099..b6c42013453 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import com.sun.xml.internal.rngom.digested.DPatternWalker;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
index 7a7e0c8552b..2f0ee783e94 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
index 056b54155af..4edd3a99f62 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
index 8e585653dfd..83ae7399184 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
index 3dfc3e0350c..b8845842027 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.relaxng;
 
 import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
index 946d7391bfb..c25a7c743e0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.CElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
index b6e50401724..e1e29895f9c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.ArrayList;
@@ -435,6 +436,9 @@ public class BGMBuilder extends BindingComponent {
      * Gets the {@link BIDom} object that applies to the given particle.
      */
     protected final BIDom getLocalDomCustomization( XSParticle p ) {
+        if (p == null) {
+            return null;
+        }
         BIDom dom = getBindInfo(p).get(BIDom.class);
         if(dom!=null)  return dom;
 
@@ -549,4 +553,12 @@ public class BGMBuilder extends BindingComponent {
 
         return name;
     }
+
+    public boolean isGenerateMixedExtensions() {
+        if (globalBinding != null) {
+            return globalBinding.isGenerateMixedExtensions();
+        }
+        return false;
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
index 8ce51518d25..4f011e92f6e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
index 6955f040ce1..751a7b20206 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
index 34d83c801cf..a2ec1c89f58 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.CClassInfo;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
index f2c86a80614..076209cb52b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.reader.Ring;
@@ -48,21 +49,10 @@ public final class BindRed extends ColorBinder {
 
     private final ComplexTypeFieldBuilder ctBuilder = Ring.get(ComplexTypeFieldBuilder.class);
 
-
-
-
-
-
-
-
-
-
     public void complexType(XSComplexType ct) {
         ctBuilder.build(ct);
     }
 
-
-
     public void wildcard(XSWildcard xsWildcard) {
         // TODO: implement this method later
         // I guess we might allow this to be mapped to a generic element property ---
@@ -85,8 +75,6 @@ public final class BindRed extends ColorBinder {
         stb.refererStack.pop();
     }
 
-
-
 /*
     Components that can never be mapped to a class
 */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
index af35fc592e7..83379813def 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
index 2338c976a57..c31ca13cf98 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.reader.Ring;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
index 4bfcc209588..ba8d8e6ee15 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.CElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
index ccd1c851bd8..2bcf2fd1255 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * @(#)$Id: CollisionInfo.java,v 1.1 2005/04/15 20:09:53 kohsuke Exp $
- */
-
-
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import org.xml.sax.Locator;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
index bfd0d615029..1f63c999c66 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.CClassInfo;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
index 6558c122d1e..17e2f477a85 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.ArrayList;
@@ -58,9 +59,9 @@ final class DefaultParticleBinder extends ParticleBinder {
         if(checker.hasNameCollision()) {
             CReferencePropertyInfo prop = new CReferencePropertyInfo(
                 getCurrentBean().getBaseClass()==null?"Content":"Rest",
-                true, false, p,
+                true, false, false, p,
                 builder.getBindInfo(p).toCustomizationList(),
-                p.getLocator() );
+                p.getLocator(), false, false, false);
             RawTypeSetBuilder.build(p,false).addTo(prop);
             prop.javadoc = Messages.format( Messages.MSG_FALLBACK_JAVADOC,
                     checker.getCollisionInfo().toString() );
@@ -170,6 +171,12 @@ final class DefaultParticleBinder extends ParticleBinder {
         }
 
         public void modelGroup(XSModelGroup mg) {
+            // choice gets mapped to a property
+            if(mg.getCompositor()== XSModelGroup.Compositor.CHOICE && builder.getGlobalBinding().isChoiceContentPropertyEnabled()) {
+                mark(outerParticle);
+                return;
+            }
+
             for( XSParticle child : mg.getChildren() )
                 particle(child);
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
index 80cbfc9a488..87507e1524c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
index 50ffbd3ac90..f78f66fa4e3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
index 871e408bc38..7a4d4e009e8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
index 2d151fa7808..9ab9e9333fd 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
index e2bb5e2db5f..0bfe7f95c9d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.reader.gbind.Element;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
index 2eccd9bfd70..cbd765c3db3 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
@@ -30,61 +30,66 @@
 
 
 BGMBuilder.NoGlobalElement = \
-	Schema contains no global element declaration.
+        Schema contains no global element declaration.
+
+UnusedCustomizationChecker.WarnUnusedExpectedContentTypes = \
+    An xmime:expectedContentTypes attribute is present on an incorrect element
 
 BGMBuilder.MultipleSchemaBindings = \
-	Multiple <schemaBindings> are defined for the target namespace "{0}"
+        Multiple <schemaBindings> are defined for the target namespace "{0}"
 
 BGMBuilder.MultipleSchemaBindings.Location = \
-	Another <schemaBindings> is defined here
+        Another <schemaBindings> is defined here
 
 
 
 ClassSelector.ClassNameIsRequired = \
-	Cannot derive a name from schema. A name attribute specified to the <class> customization.
+        Cannot derive a name from schema. A name attribute specified to the <class> customization.
 
 ClassSelector.IncorrectClassName = \
-	Specified name ''{0}'' is not a valid Java identifier.
+        Specified name ''{0}'' is not a valid Java identifier.
 
 ClassSelector.IncorrectPackageName = \
-	The package name ''{1}'' used for this schema is not a valid package name.
+        The package name ''{1}'' used for this schema is not a valid package name.
 
 ClassSelector.JavadocHeading = \
-	<p>Java class for {0}.\n\n<p>The following schema fragment specifies the expected \
-	content contained within this class.
+        <p>Java class for {0}.\n\n<p>The following schema fragment specifies the expected \
+        content contained within this class.
 
 ClassSelector.JavadocLineUnknown = \
-	unknown
+        unknown
 
 ClassSelector.ReservedClassName = \
-	Attempt to create a class having the same name as the reserved word "{0}".
+        Attempt to create a class having the same name as the reserved word "{0}".
 
 
 CollisionInfo.CollisionInfo = \
-	The field name "{0}" is used by two different parts of a schema. See: \n\
-	{1}\n\
-	{2}
+        The field name "{0}" is used by two different parts of a schema. See: \n\
+        {1}\n\
+        {2}
 
 CollisionInfo.UnknownFile = \
-	unknown file
+        unknown file
 
 CollisionInfo.LineXOfY = \
-	line {0} of {1}
+        line {0} of {1}
 
 
 ConversionFinder.CannotBeTypeSafeEnum = \
-	A type safe enum customization is specified to a simple type that cannot \
-	be mapped to a type safe enum.
+        A type safe enum customization is specified to a simple type that cannot \
+        be mapped to a type safe enum.
 ConversionFinder.CannotBeTypeSafeEnum.Location = \
-	Ths relevant simple type declaration is specified at this location
+        Ths relevant simple type declaration is specified at this location
 ConversionFinder.NoEnumNameAvailable = \
-	A name attribute is required to customize an anonymous simple type to type-safe enum.
+        A name attribute is required to customize an anonymous simple type to type-safe enum.
+ConversionFinder.NoEnumFacet= \
+    enum class customization is specified on a type that has no enumeration facet.
 ERR_ILLEGAL_EXPECTED_MIME_TYPE = \
-    Unable to parse the expected MIME type "{0}". {1}. 
+    Unable to parse the expected MIME type "{0}". {1}.
 
 
 DatatypeBuilder.DatatypeError = \
-	Simple type error: {0}
+        Simple type error: {0}
 
 
 
@@ -92,17 +97,17 @@ DatatypeBuilder.DatatypeError = \
 
 
 DefaultParticleBinder.UnableToGenerateNameFromModelGroup = \
-	Unable to generate a property name from a model group. A customization is required.
+        Unable to generate a property name from a model group. A customization is required.
 
 DefaultParticleBinder.FallbackJavadoc = \
-	Gets the rest of the content model. \n\
-	\n\
-	<p>\n\
-	You are getting this "catch-all" property because of the following reason: \n\
-	{0}\n\
-	<p>\n\
-	To get rid of this property, apply a property customization to one \n\
-	of both of the following declarations to change their names: \n
+        Gets the rest of the content model. \n\
+        \n\
+        <p>\n\
+        You are getting this "catch-all" property because of the following reason: \n\
+        {0}\n\
+        <p>\n\
+        To get rid of this property, apply a property customization to one \n\
+        of both of the following declarations to change their names: \n
 
 
 
@@ -111,30 +116,30 @@ DefaultParticleBinder.FallbackJavadoc = \
 
 
 FieldBuilder.IncorrectFixedValue = \
-	The value specified in the fixed attribute "{0}" is not a valid value for the datatype
+        The value specified in the fixed attribute "{0}" is not a valid value for the datatype
 
 FieldBuilder.IncorrectDefaultValue = \
-	The value specified in the default attribute "{0}" is not a valid value for the datatype
+        The value specified in the default attribute "{0}" is not a valid value for the datatype
 
 FieldBuilder.ConflictBetweenUserTypeAndActualType.AttUse = \
-	"{0}" is specified by a customization but this attribute has incompatible type "{1}"
+        "{0}" is specified by a customization but this attribute has incompatible type "{1}"
 
 FieldBuilder.ConflictBetweenUserTypeAndActualType.AttUse.Source = \
-	The relevant customization is specified	at this location
+        The relevant customization is specified at this location
 
 FieldBuilder.Javadoc.NilProperty = \
-	This property is used to control \
-	<a href="http://www.w3.org/TR/2001/REC-xmlschema-0-20010502/#Nils">the xsi:nil feature</a> \
-	of W3C XML Schema. \nSetting this property to true will cause \
-	the output to be &lt;{0} xsi:nil="true" /> regardless of the \
-	values of the other properties.
+        This property is used to control \
+        <a href="http://www.w3.org/TR/2001/REC-xmlschema-0-20010502/#Nils">the xsi:nil feature</a> \
+        of W3C XML Schema. \nSetting this property to true will cause \
+        the output to be &lt;{0} xsi:nil="true" /> regardless of the \
+        values of the other properties.
 
 FieldBuilder.Javadoc.ValueObject = \
-	get/set the complex type value associated with this element.\n \
-	when you unmarshal a document that contains xsi:type, the get{1} method \
-	would return an instance of derived classes of '{'@link {0}'}'. Similarly, if you set \
-	an instance of derived classes, then you would get the instance with xsi:type \
-	when you marshal out to XML.
+        get/set the complex type value associated with this element.\n \
+        when you unmarshal a document that contains xsi:type, the get{1} method \
+        would return an instance of derived classes of '{'@link {0}'}'. Similarly, if you set \
+        an instance of derived classes, then you would get the instance with xsi:type \
+        when you marshal out to XML.
 
 
 SimpleTypeBuilder.UnnestedJavaTypeCustomization = \
@@ -146,11 +151,11 @@ SimpleTypeBuilder.UnnestedJavaTypeCustomization = \
     \t</property>
 
 UnusedCustomizationChecker.UnacknolwedgedCustomization = \
-	compiler was unable to honor this {0} customization. It is attached to a wrong place, \
-	or it's inconsistent with other bindings.
+        compiler was unable to honor this {0} customization. It is attached to a wrong place, \
+        or it's inconsistent with other bindings.
 
 UnusedCustomizationChecker.UnacknolwedgedCustomization.Relevant = \
-	(the above customization is attached to the following location in the schema)
+        (the above customization is attached to the following location in the schema)
 
 ERR_ENUM_MEMBER_NAME_COLLISION = \
     Two enum members yield the same constant name {0}
@@ -160,7 +165,7 @@ ERR_ENUM_MEMBER_NAME_COLLISION_RELATED = \
 
 ERR_CANNOT_GENERATE_ENUM_NAME = \
     Cannot generate a constant name from the enumeration value "{0}". \
-    Use <jaxb:typesafeEnumMember name="..."/> to specify one. 
+    Use <jaxb:typesafeEnumMember name="..."/> to specify one.
 
 ERR_MULTIPLE_GLOBAL_BINDINGS = \
     only one globalBindings customization is allowed in a whole compilation
@@ -178,4 +183,3 @@ ERR_REFERENCE_TO_NONEXPORTED_CLASS_MAP_FALSE = \
 
 ERR_REFERENCE_TO_NONEXPORTED_CLASS_REFERER = \
     (related to above) The problematic schema component is referenced from this component: {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
index e0db71253aa..3b71597f2f8 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
@@ -43,6 +43,9 @@ public class Messages
     static final String WARN_NO_GLOBAL_ELEMENT =
         "BGMBuilder.NoGlobalElement";
 
+    public static final String WARN_UNUSED_EXPECTED_CONTENT_TYPES =
+        "UnusedCustomizationChecker.WarnUnusedExpectedContentTypes";
+
     static final String ERR_MULTIPLE_SCHEMA_BINDINGS =
         "BGMBuilder.MultipleSchemaBindings"; // arg:1
 
@@ -73,6 +76,9 @@ public class Messages
     static final String ERR_NO_ENUM_NAME_AVAILABLE =
         "ConversionFinder.NoEnumNameAvailable"; // arg:0
 
+    static final String ERR_NO_ENUM_FACET =
+        "ConversionFinder.NoEnumFacet"; // arg:0
+
     static final String ERR_ILLEGAL_EXPECTED_MIME_TYPE =
         "ERR_ILLEGAL_EXPECTED_MIME_TYPE"; // args:2
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
index 898dba604e9..05956ca755d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import com.sun.tools.internal.xjc.model.Multiplicity;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
index 55d6a244aa6..2be38026538 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashSet;
@@ -275,7 +276,12 @@ public class RawTypeSetBuilder implements XSTermVisitor {
             if(parent.refs.size() > 1 && p.getAdapter() != null)
                 return RawTypeSet.Mode.MUST_BE_REFERENCE;
 
-            return RawTypeSet.Mode.SHOULD_BE_TYPEREF;
+            if(target.hasClass())
+                // if the CElementInfo was explicitly bound to a class (which happen if and only if
+                // the user requested so, then map that to reference property so that the user sees a class
+                return RawTypeSet.Mode.CAN_BE_TYPEREF;
+            else
+                return RawTypeSet.Mode.SHOULD_BE_TYPEREF;
         }
 
         protected boolean isListOfValues() {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
index fbbe569a0d6..28491c920be 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
index b72a03b0fdc..482c955c621 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
@@ -51,6 +51,7 @@ import com.sun.tools.internal.xjc.model.CNonElement;
 import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.model.TypeUse;
 import com.sun.tools.internal.xjc.model.TypeUseFactory;
+import com.sun.tools.internal.xjc.reader.Const;
 import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIConversion;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIEnum;
@@ -121,6 +122,13 @@ public final class SimpleTypeBuilder extends BindingComponent {
      */
     public final Stack<XSComponent> refererStack = new Stack<XSComponent>();
 
+    /**
+     * Records what xmime:expectedContentTypes annotations we honored and processed,
+     * so that we can later check if the user had these annotations in the places
+     * where we didn't anticipate them.
+     */
+    private final Set<XSComponent> acknowledgedXmimeContentTypes = new HashSet<XSComponent>();
+
     /**
      * The type that was originally passed to this {@link SimpleTypeBuilder#build(XSSimpleType)}.
      * Never null.
@@ -289,7 +297,7 @@ public final class SimpleTypeBuilder extends BindingComponent {
         public TypeUse unionSimpleType(XSUnionSimpleType type) {
             boolean isCollection = false;
             for( int i=0; i<type.getMemberSize(); i++ )
-                if(type.getMember(i).getVariety()==XSVariety.LIST) {
+                if(type.getMember(i).getVariety()==XSVariety.LIST || type.getMember(i).getVariety()==XSVariety.UNION) {
                     isCollection = true;
                     break;
                 }
@@ -369,6 +377,15 @@ public final class SimpleTypeBuilder extends BindingComponent {
         }
 
 
+//        // Issue 558 .. ugly fix; see https://wsit-docs.dev.java.net/releases/1-0-FCS/DataBinding5.html and https://jaxb.dev.java.net/issues/show_bug.cgi?id=558
+//        // need to check specification
+//        if (type.isSimpleType() && builder.getGlobalBinding().isSimpleTypeSubstitution() &&
+//                type.isGlobal() && type.getName() != null &&
+//                (type.getName().equals("unsignedInt") || type.getName().equals("unsignedShort") || type.getName().equals("unsignedByte"))) {
+//                // !type.getName().equals("anySimpleType") && !type.getName().equals("string")) {
+//            return (CNonElement) getClassSelector()._bindToClass(type, type.getSimpleBaseType(), false);
+//        }
+
         // if the type is built in, look for the default binding
         if(type.getTargetNamespace().equals(WellKnownNamespace.XML_SCHEMA)) {
             String name = type.getName();
@@ -584,6 +601,10 @@ public final class SimpleTypeBuilder extends BindingComponent {
                 break;
             }
         }
+        if(memberList.isEmpty()) {
+            getErrorReporter().error( loc, Messages.ERR_NO_ENUM_FACET );
+            return null;
+        }
 
         // use the name of the simple type as the name of the class.
         CClassInfoParent scope;
@@ -616,9 +637,14 @@ public final class SimpleTypeBuilder extends BindingComponent {
     private List<CEnumConstant> buildCEnumConstants(XSRestrictionSimpleType type, boolean needsToGenerateMemberName, Map<String, BIEnumMember> members, XSFacet[] errorRef) {
         List<CEnumConstant> memberList = new ArrayList<CEnumConstant>();
         int idx=1;
+        Set<String> enums = new HashSet<String>(); // to avoid duplicates. See issue #366
+
         for( XSFacet facet : type.getDeclaredFacets(XSFacet.FACET_ENUMERATION)) {
             String name=null;
-            String mdoc=null;
+            String mdoc=builder.getBindInfo(facet).getDocumentation();
+
+            if(!enums.add(facet.getValue().value))
+                continue;   // ignore the 2nd occasion
 
             if( needsToGenerateMemberName ) {
                 // generate names for all member names.
@@ -739,8 +765,9 @@ public final class SimpleTypeBuilder extends BindingComponent {
      */
     private TypeUse lookupBinaryTypeBinding() {
         XSComponent referer = getReferer();
-        String emt = referer.getForeignAttribute(XML_MIME_URI,"expectedContentTypes");
+        String emt = referer.getForeignAttribute(XML_MIME_URI, Const.EXPECTED_CONTENT_TYPES);
         if(emt!=null) {
+            acknowledgedXmimeContentTypes.add(referer);
             try {
                 // see http://www.xml.com/lpt/a/2004/07/21/dive.html
                 List<MimeTypeRange> types = MimeTypeRange.parseRanges(emt);
@@ -772,6 +799,10 @@ public final class SimpleTypeBuilder extends BindingComponent {
         return CBuiltinLeafInfo.BASE64_BYTE_ARRAY;
     }
 
+    public boolean isAcknowledgedXmimeContentTypes(XSComponent c) {
+        return acknowledgedXmimeContentTypes.contains(c);
+    }
+
     /**
      * Returns true if the specified sub-type is an XML type.
      */
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
index e425d273614..1ce9ba02373 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
@@ -29,8 +29,10 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import com.sun.tools.internal.xjc.reader.Const;
 import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIDeclaration;
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.xsom.XSAnnotation;
 import com.sun.xml.internal.xsom.XSAttContainer;
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
@@ -60,11 +62,17 @@ import com.sun.xml.internal.xsom.visitor.XSVisitor;
 /**
  * Reports all unacknowledged customizations as errors.
  *
+ * <p>
+ * Since we scan the whole content tree, we use this to check for unused
+ * <tt>xmime:expectedContentTypes</tt> attributes. TODO: if we find this kind of error checks more
+ * common, use the visitors so that we don't have to mix everything in one class.
+ *
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
 class UnusedCustomizationChecker extends BindingComponent implements XSVisitor, XSSimpleTypeVisitor {
     private final BGMBuilder builder = Ring.get(BGMBuilder.class);
+    private final SimpleTypeBuilder stb = Ring.get(SimpleTypeBuilder.class);
 
     private final Set<XSComponent> visitedComponents = new HashSet<XSComponent>();
 
@@ -102,9 +110,24 @@ class UnusedCustomizationChecker extends BindingComponent implements XSVisitor,
         for( BIDeclaration decl : builder.getBindInfo(c).getDecls() )
             check(decl, c);
 
+        checkExpectedContentTypes(c);
+
         return true;
     }
 
+    private void checkExpectedContentTypes(XSComponent c) {
+        if(c.getForeignAttribute(WellKnownNamespace.XML_MIME_URI, Const.EXPECTED_CONTENT_TYPES)==null)
+            return; // no such attribute
+        if(c instanceof XSParticle)
+            return; // particles get the same foreign attributes as local element decls,
+                    // so we need to skip them
+
+        if(!stb.isAcknowledgedXmimeContentTypes(c)) {
+            // this is not used
+            getErrorReporter().warning(c.getLocator(),Messages.WARN_UNUSED_EXPECTED_CONTENT_TYPES);
+        }
+    }
+
     private void check(BIDeclaration decl, XSComponent c) {
         if( !decl.isAcknowledged() ) {
             getErrorReporter().error(
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
index c5de503b8e0..c3498adbd41 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
@@ -31,17 +31,18 @@ import javax.xml.bind.helpers.DefaultValidationEventHandler;
 import javax.xml.validation.ValidatorHandler;
 
 import com.sun.tools.internal.xjc.Options;
-import com.sun.tools.internal.xjc.SchemaCache;
 import com.sun.tools.internal.xjc.reader.Const;
 import com.sun.xml.internal.xsom.parser.AnnotationContext;
 import com.sun.xml.internal.xsom.parser.AnnotationParser;
 import com.sun.xml.internal.xsom.parser.AnnotationParserFactory;
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 import org.xml.sax.helpers.XMLFilterImpl;
 
 /**
@@ -102,11 +103,22 @@ public class AnnotationParserFactoryImpl implements AnnotationParserFactory {
                             validator.setErrorHandler(errorHandler);
                             startForking(uri,localName,qName,atts,new ValidatorProtecter(validator));
                         }
+
+                        // check for xmime:expectedContentTypes attributes in annotations and report them
+                        for( int i=atts.getLength()-1; i>=0; i-- ) {
+                            if(atts.getURI(i).equals(WellKnownNamespace.XML_MIME_URI)
+                            && atts.getLocalName(i).equals(Const.EXPECTED_CONTENT_TYPES))
+                                errorHandler.warning(new SAXParseException(
+                                    com.sun.tools.internal.xjc.reader.xmlschema.Messages.format(
+                                        com.sun.tools.internal.xjc.reader.xmlschema.Messages.WARN_UNUSED_EXPECTED_CONTENT_TYPES),
+                                    getDocumentLocator()
+                                ));
+                        }
                     }
                 };
             }
 
-            public Object getResult( Object existing ) {
+            public BindInfo getResult( Object existing ) {
                 if(handler==null)
                     // interface contract violation.
                     // the getContentHandler method must have been called.
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
index 42d82d5259f..dae0d5b5cbb 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
@@ -254,9 +254,11 @@ public abstract class BIConversion extends AbstractDeclarationImpl {
         private String printMethodFor(XSSimpleType owner) {
             if(printMethod!=null)   return printMethod;
 
-            String method = getConversionMethod("print",owner);
-            if(method!=null)
-                return method;
+            if(inMemoryType.unboxify().isPrimitive()) {
+                String method = getConversionMethod("print",owner);
+                if(method!=null)
+                    return method;
+            }
 
             return "toString";
         }
@@ -264,10 +266,12 @@ public abstract class BIConversion extends AbstractDeclarationImpl {
         private String parseMethodFor(XSSimpleType owner) {
             if(parseMethod!=null)   return parseMethod;
 
-            String method = getConversionMethod("parse", owner);
-            if(method!=null) {
-                // this cast is necessary for conversion between primitive Java types
-                return '('+inMemoryType.unboxify().fullName()+')'+method;
+            if(inMemoryType.unboxify().isPrimitive()) {
+                String method = getConversionMethod("parse", owner);
+                if(method!=null) {
+                    // this cast is necessary for conversion between primitive Java types
+                    return '('+inMemoryType.unboxify().fullName()+')'+method;
+                }
             }
 
             return "new";
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
new file mode 100644
index 00000000000..195299bb0f1
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.namespace.QName;
+
+import com.sun.xml.internal.xsom.XSComponent;
+import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.tools.internal.xjc.reader.Ring;
+import com.sun.tools.internal.xjc.reader.Const;
+import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
+
+/**
+ * Controls the <tt>ObjectFactory</tt> method name.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@XmlRootElement(name="factoryMethod")
+public class BIFactoryMethod extends AbstractDeclarationImpl {
+    @XmlAttribute
+    public String name;
+
+    /**
+     * If the given component has {@link BIInlineBinaryData} customization,
+     * reflect that to the specified property.
+     */
+    public static void handle(XSComponent source, CPropertyInfo prop) {
+        BIInlineBinaryData inline = Ring.get(BGMBuilder.class).getBindInfo(source).get(BIInlineBinaryData.class);
+        if(inline!=null) {
+            prop.inlineBinaryData = true;
+            inline.markAsAcknowledged();
+        }
+    }
+
+
+    public final QName getName() { return NAME; }
+
+    /** Name of the declaration. */
+    public static final QName NAME = new QName(Const.JAXB_NSURI,"factoryMethod");
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
index 469547452cb..e763810f306 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
@@ -120,6 +120,10 @@ public final class BIGlobalBinding extends AbstractDeclarationImpl {
         return generateElementClass;
     }
 
+    public boolean isGenerateMixedExtensions() {
+        return generateMixedExtensions;
+    }
+
     public boolean isChoiceContentPropertyEnabled() {
         return choiceContentProperty;
     }
@@ -285,6 +289,9 @@ public final class BIGlobalBinding extends AbstractDeclarationImpl {
     @XmlAttribute
     boolean generateElementClass = false;
 
+    @XmlAttribute
+    boolean generateMixedExtensions = false;
+
     @XmlElement(namespace=Const.XJC_EXTENSION_URI)
     Boolean generateElementProperty = null;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java
new file mode 100644
index 00000000000..d311f1d1fc5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlInlineBinaryData;
+import javax.xml.namespace.QName;
+
+import com.sun.tools.internal.xjc.reader.Const;
+import com.sun.tools.internal.xjc.reader.Ring;
+import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
+import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.xml.internal.xsom.XSComponent;
+
+/**
+ * Generates {@link @XmlInlineBinaryData}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@XmlRootElement(name="inlineBinaryData")
+public class BIInlineBinaryData extends AbstractDeclarationImpl {
+
+    /**
+     * If the given component has {@link BIInlineBinaryData} customization,
+     * reflect that to the specified property.
+     */
+    public static void handle(XSComponent source, CPropertyInfo prop) {
+        BIInlineBinaryData inline = Ring.get(BGMBuilder.class).getBindInfo(source).get(BIInlineBinaryData.class);
+        if(inline!=null) {
+            prop.inlineBinaryData = true;
+            inline.markAsAcknowledged();
+        }
+    }
+
+
+    public final QName getName() { return NAME; }
+
+    /** Name of the declaration. */
+    public static final QName NAME = new QName(Const.JAXB_NSURI,"inlineBinaryData");
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
index d2b3b4309ec..85e2f6288d4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
@@ -291,7 +291,9 @@ public final class BIProperty extends AbstractDeclarationImpl {
                 name = JJavaName.getPluralForm(name);
         }
 
-        return wrapUp(new CValuePropertyInfo(name, source,getCustomizations(source),source.getLocator(), tu, typeName ),source);
+        CValuePropertyInfo prop = wrapUp(new CValuePropertyInfo(name, source, getCustomizations(source), source.getLocator(), tu, typeName), source);
+        BIInlineBinaryData.handle(source, prop);
+        return prop;
     }
 
     public CAttributePropertyInfo createAttributeProperty( XSAttributeUse use, TypeUse tu ) {
@@ -353,17 +355,48 @@ public final class BIProperty extends AbstractDeclarationImpl {
 
         types.addTo(prop);
 
+        BIInlineBinaryData.handle(source.getTerm(), prop);
         return prop;
     }
 
+    public CReferencePropertyInfo createDummyExtendedMixedReferenceProperty(
+            String defaultName, XSComponent source, RawTypeSet types) {
+            return createReferenceProperty(
+                    defaultName,
+                    false,
+                    source,
+                    types,
+                    true,
+                    true,
+                    false,
+                    true);
+    }
+
+    public CReferencePropertyInfo createContentExtendedMixedReferenceProperty(
+            String defaultName, XSComponent source, RawTypeSet types) {
+            return createReferenceProperty(
+                    defaultName,
+                    false,
+                    source,
+                    types,
+                    true,
+                    false,
+                    true,
+                    true);
+    }
+
     public CReferencePropertyInfo createReferenceProperty(
             String defaultName, boolean forConstant, XSComponent source,
-            RawTypeSet types, boolean isMixed) {
+            RawTypeSet types, boolean isMixed, boolean dummy, boolean content, boolean isMixedExtended) {
 
-        if(!types.refs.isEmpty())
-            // if this property is empty, don't acknowleedge the customization
-            // this allows pointless property customization to be reported as an error
-            markAsAcknowledged();
+        if (types == null) {    // this is a special case where we need to generate content because potential subtypes would need to be able to override what's store inside
+            content = true;
+        } else {
+            if(!types.refs.isEmpty())
+                // if this property is empty, don't acknowleedge the customization
+                // this allows pointless property customization to be reported as an error
+                markAsAcknowledged();
+        }
         constantPropertyErrorCheck();
 
         String name = getPropertyName(forConstant);
@@ -371,15 +404,19 @@ public final class BIProperty extends AbstractDeclarationImpl {
             name = defaultName;
 
         CReferencePropertyInfo prop = wrapUp(
-            new CReferencePropertyInfo(
-                name,
-                types.getCollectionMode().isRepeated()||isMixed,
-                isMixed, source,
-                getCustomizations(source), source.getLocator() ),
-            source);
-
-        types.addTo(prop);
+                                            new CReferencePropertyInfo(
+                                                name,
+                                                (types == null) ? true : types.getCollectionMode().isRepeated()||isMixed,
+                                                (types == null) ? false : types.isRequired(),
+                                                isMixed,
+                                                source,
+                                                getCustomizations(source), source.getLocator(), dummy, content, isMixedExtended),
+                                        source);
+        if (types != null) {
+            types.addTo(prop);
+        }
 
+        BIInlineBinaryData.handle(source, prop);
         return prop;
     }
 
@@ -407,7 +444,7 @@ public final class BIProperty extends AbstractDeclarationImpl {
         }
 
         if(generateRef) {
-            return createReferenceProperty(defaultName,forConstant,source,types, false);
+            return createReferenceProperty(defaultName,forConstant,source,types, false, false, false, false);
         } else {
             return createElementProperty(defaultName,forConstant,source,types);
         }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
index c7ad95cca59..8ff4365cf19 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
index 9e3a54742af..fba148aeb99 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
index d1637516d63..8c224eff64e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
index cfc7d759e7f..c3c2862b619 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -53,7 +52,6 @@ import com.sun.tools.internal.xjc.model.Model;
 import com.sun.tools.internal.xjc.reader.Ring;
 import com.sun.tools.internal.xjc.reader.xmlschema.BGMBuilder;
 import com.sun.xml.internal.bind.annotation.XmlLocation;
-import com.sun.xml.internal.bind.api.TypeReference;
 import com.sun.xml.internal.bind.marshaller.MinimumEscapeHandler;
 import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
@@ -82,7 +80,7 @@ public final class BindInfo implements Iterable<BIDeclaration> {
     /**
      * Documentation taken from &lt;xs:documentation>s.
      */
-    @XmlElement
+    @XmlElement(namespace=WellKnownNamespace.XML_SCHEMA)
     private Documentation documentation;
 
     /**
@@ -146,7 +144,7 @@ public final class BindInfo implements Iterable<BIDeclaration> {
 
 
     // only used by JAXB
-    @XmlElement
+    @XmlElement(namespace=WellKnownNamespace.XML_SCHEMA)
     void setAppinfo(AppInfo aib) {
         aib.addTo(this);
     }
@@ -318,13 +316,15 @@ public final class BindInfo implements Iterable<BIDeclaration> {
         synchronized(AnnotationParserFactoryImpl.class) {
             try {
                 if(customizationContext==null)
-                    customizationContext = new JAXBContextImpl(
+                    customizationContext = new JAXBContextImpl.JAXBContextBuilder().setClasses(
                         new Class[] {
                             BindInfo.class, // for xs:annotation
                             BIClass.class,
                             BIConversion.User.class,
                             BIConversion.UserAdapter.class,
                             BIDom.class,
+                            BIFactoryMethod.class,
+                            BIInlineBinaryData.class,
                             BIXDom.class,
                             BIXSubstitutable.class,
                             BIEnum.class,
@@ -332,8 +332,7 @@ public final class BindInfo implements Iterable<BIDeclaration> {
                             BIGlobalBinding.class,
                             BIProperty.class,
                             BISchemaBinding.class
-                        }, Collections.<TypeReference>emptyList(),
-                            Collections.<Class,Class>emptyMap(), null, false, null, false, false);
+                        }).build();
                 return customizationContext;
             } catch (JAXBException e) {
                 throw new AssertionError(e);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
index 3e98bdad897..1fe7e69e718 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlTransient;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
index 031542476cc..0e34f741f59 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.ValidationEventHandler;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
index 812ebc6c904..dfaa3761070 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlEnum;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
index f2b747ba657..1f9f0d85e6b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import java.util.ArrayList;
@@ -80,6 +81,10 @@ public class ForkingFilter extends XMLFilterImpl {
         this.loc = locator;
     }
 
+    public Locator getDocumentLocator() {
+        return loc;
+    }
+
     public void startDocument() throws SAXException {
         reset();
         super.startDocument();
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
index 1644ddc2f1f..160d1d8ec36 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
index d1029bf35d6..eb3653ce0ba 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
@@ -29,25 +29,24 @@
 
 
 NGCCRuntimeEx.Unimplemented = \
-	The "{0}" feature is not implemented yet
+        The "{0}" feature is not implemented yet
 
 NGCCRuntimeEx.Unsupported = \
-	The "{0}" feature is an unsupported optional feature
+        The "{0}" feature is an unsupported optional feature
 
 NGCCRuntimeEx.UndefinedPrefix = \
-	Prefix "{0}" is undefined
+        Prefix "{0}" is undefined
 
 
 
 MagicTransducer.AttributeRequired = \
-	parseMethod/printMethod attributes are both required.
+        parseMethod/printMethod attributes are both required.
 
 ERR_ILLEGAL_FIXEDATTR = \
-	fixedAttributeAsConstantProperty is allowed only with attributes with a fixed value constraint.
+        fixedAttributeAsConstantProperty is allowed only with attributes with a fixed value constraint.
 
 ERR_UNDEFINED_SIMPLE_TYPE = \
-	undefined simple type "{0}".
+        undefined simple type "{0}".
 
 ERR_CANNOT_BE_BOUND_TO_SIMPLETYPE = \
     Simple type "{0}" is not allowed by the spec to be bound to a type-safe enum.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
index d94459ef8f6..5c76a44b4c2 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
index 3386af62475..5496fa86cb4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng
@@ -215,6 +215,7 @@
       private boolean xSimpleMode;
       private boolean generateValueClass = true;
       private boolean generateElementClass = false;
+      private boolean generateMixedExtensions = false;
 
       public BIGlobalBinding makeResult() {
         if( enumBaseTypes.size()==0 )
@@ -359,6 +360,12 @@
         </attribute>
       </optional>
 
+      <optional>
+        <attribute name="generateMixedExtensions">
+          value = <data type="boolean"/>
+          generateMixedExtensions = $runtime.parseBoolean(value);
+        </attribute>
+      </optional>
 
       <!-- unimplemented attributes -->
       <optional>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
index f746a880842..46e974cd67e 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd
@@ -23,8 +23,16 @@
  CA 95054 USA or visit www.sun.com if you need additional information or
  have any questions.
 -->
+
+
 <!-- THIS IS A GENERATED FILE. DO NOT MODIFY. -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://java.sun.com/xml/ns/jaxb" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
+  <xs:annotation>
+    <xs:documentation>
+      JAXB customization schema
+    </xs:documentation>
+  </xs:annotation>
+  
   <xs:import namespace="http://java.sun.com/xml/ns/jaxb/xjc" schemaLocation="xjc.xsd"/>
   <xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="xs.xsd"/>
   <xs:element name="bindings">
@@ -38,6 +46,11 @@
   </xs:element>
   <xs:element name="declaration" abstract="true"/>
   <xs:element name="globalBindings" substitutionGroup="jaxb:declaration">
+    <xs:annotation>
+      <xs:documentation>
+        Defines global customization. Only one of this is allowed per compilation.
+      </xs:documentation>
+    </xs:annotation>
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element name="javaType">
@@ -122,6 +135,7 @@
       <xs:attribute name="choiceContentProperty" type="xs:boolean"/>
       <xs:attribute name="generateValueClass" type="xs:boolean"/>
       <xs:attribute name="generateElementClass" type="xs:boolean"/>
+      <xs:attribute name="generateMixedExtensions" type="xs:boolean"/>
       <xs:attribute name="generateElementProperty" type="xs:boolean"/>
       <xs:attribute name="enableValidation" type="xs:boolean"/>
       <xs:attribute name="enableFailFastCheck" type="xs:boolean"/>
@@ -277,6 +291,28 @@
       <xs:attribute name="type" default="w3c"/>
     </xs:complexType>
   </xs:element>
+
+  <xs:element name="inlineBinaryData">
+    <xs:annotation><xs:documentation><![CDATA[
+      Disable binary optimization.
+
+      Used on elements like <xs:element name="foo" type="xs:base64Binary"/> to indicate
+      that this base64 binary data is always inlined and never subjected to the binary
+      transfer optimization (such as XOP/MTOM)
+    ]]></xs:documentation></xs:annotation>
+    <xs:complexType />
+  </xs:element>
+
+  <xs:element name="factoryMethod">
+    <xs:annotation><xs:documentation><![CDATA[
+      Controls the name of the factory method on ObjectFactory. 
+    ]]></xs:documentation></xs:annotation>
+    <xs:complexType>
+      <xs:sequence />
+      <xs:attribute name="name" type="xs:string" use="required" />
+    </xs:complexType>
+  </xs:element>
+
   <xs:group name="anyContents">
     <xs:sequence>
       <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
index 3facd392e0b..e399b7ee207 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 @XmlSchema(elementFormDefault = QUALIFIED, namespace=Const.JAXB_NSURI)
 package com.sun.tools.internal.xjc.reader.xmlschema.bindinfo;
 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
index af2b0a5fb82..480a88a0649 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
@@ -26,8 +26,8 @@
 Object Model that represents customization declarations.
 
 <p>
-	<a href="http://relaxngcc.sourceforge.net/">RelaxNGCC</a> is used to parse
-	XML syntax into this representation, and the other parts of XJC will use
-	this object model.
+        <a href="http://relaxngcc.sourceforge.net/">RelaxNGCC</a> is used to parse
+        XML syntax into this representation, and the other parts of XJC will use
+        this object model.
 </p>
 </body>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
index 4536da0babb..c069b5e7b39 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd
@@ -23,6 +23,8 @@
  CA 95054 USA or visit www.sun.com if you need additional information or
  have any questions.
 -->
+
+
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
   <xs:import namespace="http://java.sun.com/xml/ns/jaxb" schemaLocation="binding.xsd"/>
   <xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="xs.xsd"/>
@@ -80,6 +82,8 @@
     </xs:sequence>
   </xs:group>
 
+  <xs:element name="allowMixedTypeExtensions" type="xs:boolean" />
+  
   <xs:element name="generateElementProperty" type="xs:boolean" />
   <xs:element name="dom">
     <xs:complexType>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
index 379174c20a3..740df8b4fbe 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd
@@ -23,6 +23,8 @@
  CA 95054 USA or visit www.sun.com if you need additional information or
  have any questions.
 -->
+
+
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/2001/XMLSchema" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
   <xs:import namespace="http://java.sun.com/xml/ns/jaxb" schemaLocation="binding.xsd"/>
   <xs:import namespace="http://java.sun.com/xml/ns/jaxb/xjc" schemaLocation="xjc.xsd"/>
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java
new file mode 100644
index 00000000000..75dcff9cd1d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.internal.xjc.reader.xmlschema.ct;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import com.sun.tools.internal.xjc.reader.xmlschema.WildcardNameClassBuilder;
+import com.sun.xml.internal.xsom.XSAttributeUse;
+import com.sun.xml.internal.xsom.XSComplexType;
+import com.sun.xml.internal.xsom.XSContentType;
+import com.sun.xml.internal.xsom.XSDeclaration;
+import com.sun.xml.internal.xsom.XSElementDecl;
+import com.sun.xml.internal.xsom.XSModelGroup;
+import com.sun.xml.internal.xsom.XSModelGroupDecl;
+import com.sun.xml.internal.xsom.XSParticle;
+import com.sun.xml.internal.xsom.XSType;
+import com.sun.xml.internal.xsom.XSWildcard;
+import com.sun.xml.internal.xsom.visitor.XSTermFunction;
+
+import com.sun.xml.internal.rngom.nc.ChoiceNameClass;
+import com.sun.xml.internal.rngom.nc.NameClass;
+import com.sun.xml.internal.rngom.nc.SimpleNameClass;
+
+/**
+ * Binds a complex type derived from another complex type by extension.
+ *
+ * @author
+ *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ */
+abstract class AbstractExtendedComplexTypeBuilder extends CTBuilder {
+
+    /**
+     * Map from {@link XSComplexType} to {@link NameClass}[2] that
+     * represents the names used in its child elements [0] and
+     * attributes [1].
+     */
+    protected final Map<XSComplexType, NameClass[]> characteristicNameClasses = new HashMap<XSComplexType, NameClass[]>();
+
+    /**
+     * Computes a name class that represents everything in a given content model.
+     */
+    protected final XSTermFunction<NameClass> contentModelNameClassBuilder = new XSTermFunction<NameClass>() {
+        public NameClass wildcard(XSWildcard wc) {
+            return WildcardNameClassBuilder.build(wc);
+        }
+
+        public NameClass modelGroupDecl(XSModelGroupDecl decl) {
+            return modelGroup(decl.getModelGroup());
+        }
+
+        public NameClass modelGroup(XSModelGroup group) {
+            NameClass nc = NameClass.NULL;
+            for( int i=0; i<group.getSize(); i++ )
+                nc = new ChoiceNameClass(nc, group.getChild(i).getTerm().apply(this));
+            return nc;
+        }
+
+        public NameClass elementDecl(XSElementDecl decl) {
+            return getNameClass(decl);
+        }
+    };
+
+    /**
+     * Checks if the particles/attributes defined in the type parameter
+     * collides with the name classes of anc/enc.
+     *
+     * @return true if there's a collision.
+     */
+    protected boolean checkCollision(NameClass anc, NameClass enc, XSComplexType type) {
+        NameClass[] chnc = characteristicNameClasses.get(type);
+        if (chnc == null) {
+            chnc = new NameClass[2];
+            chnc[0] = getNameClass(type.getContentType());
+
+            // build attribute name classes
+            NameClass nc = NameClass.NULL;
+            Iterator itr = type.iterateAttributeUses();
+            while( itr.hasNext() )
+                anc = new ChoiceNameClass(anc, getNameClass(((XSAttributeUse) itr.next()).getDecl()));
+            XSWildcard wc = type.getAttributeWildcard();
+            if(wc!=null)
+                nc = new ChoiceNameClass(nc, WildcardNameClassBuilder.build(wc));
+            chnc[1] = nc;
+
+            characteristicNameClasses.put(type, chnc);
+        }
+
+        return chnc[0].hasOverlapWith(enc) || chnc[1].hasOverlapWith(anc);
+    }
+
+    /**
+     * Looks for the derivation chain t_1 > t_2 > ... > t
+     * and find t_i such that t_i derives by restriction but
+     * for every j>i, t_j derives by extension.
+     *
+     * @return null
+     *      If there's no such t_i or if t_i is any type.
+     */
+    protected XSComplexType getLastRestrictedType(XSComplexType t) {
+        if (t.getBaseType() == schemas.getAnyType()) {
+            return null;   // we don't count the restriction from anyType
+        }
+        if (t.getDerivationMethod() == XSType.RESTRICTION) {
+            return t;
+        }
+
+        XSComplexType baseType = t.getBaseType().asComplexType();
+        if (baseType != null) {
+            return getLastRestrictedType(baseType);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Checks if this new extension is safe.
+     *
+     * UGLY.
+     * <p>
+     * If you have ctA extending ctB and ctB restricting ctC, our
+     * Java classes will look like CtAImpl extending CtBImpl
+     * extending CtCImpl.
+     *
+     * <p>
+     * Since a derived class unmarshaller uses the base class unmarshaller,
+     * this could potentially result in incorrect unmarshalling.
+     * We used to just reject such a case, but then we found that
+     * there are schemas that are using it.
+     *
+     * <p>
+     * One generalized observation that we reached is that if the extension
+     * is only adding new elements/attributes which has never been used
+     * in any of its base class (IOW, if none of the particle / attribute use /
+     * attribute wildcard can match the name of newly added elements/attributes)
+     * then it is safe to add them.
+     *
+     * <p>
+     * This function checks if the derivation chain to this type is
+     * not using restriction, and if it is, then checks if it is safe
+     * according to the above condition.
+     *
+     * @return false
+     *      If this complex type needs to be rejected.
+     */
+    protected boolean checkIfExtensionSafe(XSComplexType baseType, XSComplexType thisType) {
+        XSComplexType lastType = getLastRestrictedType(baseType);
+
+        if (lastType == null) {
+            return true;    // no restriction in derivation chain
+        }
+        NameClass anc = NameClass.NULL;
+        // build name class for attributes in new complex type
+        Iterator itr = thisType.iterateDeclaredAttributeUses();
+        while (itr.hasNext()) {
+            anc = new ChoiceNameClass(anc, getNameClass(((XSAttributeUse) itr.next()).getDecl()));
+        }
+        // TODO: attribute wildcard
+
+        NameClass enc = getNameClass(thisType.getExplicitContent());
+
+        // check against every base type ... except the root anyType
+        while (lastType != lastType.getBaseType()) {
+            if (checkCollision(anc, enc, lastType)) {
+                return false;
+            }
+
+            if (lastType.getBaseType().isSimpleType()) // if the base type is a simple type, there won't be
+            // any further name collision.
+            {
+                return true;
+            }
+
+            lastType = lastType.getBaseType().asComplexType();
+        }
+
+        return true;    // OK
+    }
+
+    /**
+     * Gets a {@link NameClass} that represents all the terms in the given content type.
+     * If t is not a particle, just return an empty name class.
+     */
+    private NameClass getNameClass(XSContentType t) {
+        if(t==null) return NameClass.NULL;
+        XSParticle p = t.asParticle();
+        if(p==null) return NameClass.NULL;
+        else        return p.getTerm().apply(contentModelNameClassBuilder);
+    }
+
+    /**
+     * Gets a {@link SimpleNameClass} from the name of a {@link XSDeclaration}.
+     */
+    private NameClass getNameClass(XSDeclaration decl) {
+        return new SimpleNameClass(decl.getTargetNamespace(), decl.getName());
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
index 24317a39f27..304782f953c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
index dc9e40c65c0..e53e0aeefc1 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
@@ -47,7 +47,14 @@ public enum ComplexTypeBindingMode {
      * If a complex type has falled back to the rest content and
      * it is not NOMOREEXTENSION.
      */
-    FALLBACK_REST
+    FALLBACK_REST,
+
+    /**
+     * If a complex type has fallen to the dummy property in order
+     * to override previously inherited content.
+     */
+    FALLBACK_EXTENSION
+
 //
 //    /**
 //     * If a complex type is derived by restriction from a complex type
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
index ddf7f382b70..8bbc93c7860 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
@@ -48,7 +48,8 @@ public final class ComplexTypeFieldBuilder extends BindingComponent {
      * Builders are tried in this order, to put specific ones first.
      */
     private final CTBuilder[] complexTypeBuilders = new CTBuilder[]{
-        new ChoiceContentComplexTypeBuilder(),
+//        new ChoiceContentComplexTypeBuilder(),
+        new MixedExtendedComplexTypeBuilder(),
         new MixedComplexTypeBuilder(),
         new FreshComplexTypeBuilder(),
         new ExtendedComplexTypeBuilder(),
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
index 3b851cd5afe..289cae1beb4 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
@@ -24,28 +24,12 @@
  */
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 
-import com.sun.tools.internal.xjc.model.CClassInfo;
 import com.sun.tools.internal.xjc.model.CClass;
-import com.sun.tools.internal.xjc.reader.xmlschema.WildcardNameClassBuilder;
-import com.sun.xml.internal.xsom.XSAttributeUse;
 import com.sun.xml.internal.xsom.XSComplexType;
 import com.sun.xml.internal.xsom.XSContentType;
-import com.sun.xml.internal.xsom.XSDeclaration;
-import com.sun.xml.internal.xsom.XSElementDecl;
-import com.sun.xml.internal.xsom.XSModelGroup;
-import com.sun.xml.internal.xsom.XSModelGroupDecl;
-import com.sun.xml.internal.xsom.XSParticle;
 import com.sun.xml.internal.xsom.XSType;
-import com.sun.xml.internal.xsom.XSWildcard;
-import com.sun.xml.internal.xsom.visitor.XSTermFunction;
 
-import com.sun.xml.internal.rngom.nc.ChoiceNameClass;
-import com.sun.xml.internal.rngom.nc.NameClass;
-import com.sun.xml.internal.rngom.nc.SimpleNameClass;
 
 /**
  * Binds a complex type derived from another complex type by extension.
@@ -53,14 +37,7 @@ import com.sun.xml.internal.rngom.nc.SimpleNameClass;
  * @author
  *     Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
-final class ExtendedComplexTypeBuilder extends CTBuilder {
-
-    /**
-     * Map from {@link XSComplexType} to {@link NameClass}[2] that
-     * represents the names used in its child elements [0] and
-     * attributes [1].
-     */
-    private final Map<XSComplexType,NameClass[]> characteristicNameClasses = new HashMap<XSComplexType,NameClass[]>();
+final class ExtendedComplexTypeBuilder extends AbstractExtendedComplexTypeBuilder {
 
     public boolean isApplicable(XSComplexType ct) {
         XSType baseType = ct.getBaseType();
@@ -73,8 +50,8 @@ final class ExtendedComplexTypeBuilder extends CTBuilder {
         XSComplexType baseType = ct.getBaseType().asComplexType();
 
         // build the base class
-        CClass baseClass = selector.bindToType(baseType,ct,true);
-        assert baseClass!=null;   // global complex type must map to a class
+        CClass baseClass = selector.bindToType(baseType, ct, true);
+        assert baseClass != null;   // global complex type must map to a class
 
         selector.getCurrentBean().setBaseClass(baseClass);
 
@@ -83,26 +60,23 @@ final class ExtendedComplexTypeBuilder extends CTBuilder {
 
         XSContentType explicitContent = ct.getExplicitContent();
 
-        if(!checkIfExtensionSafe(baseType,ct)) {
+        if (!checkIfExtensionSafe(baseType, ct)) {
             // error. We can't handle any further extension
-            errorReceiver.error( ct.getLocator(),
-                Messages.ERR_NO_FURTHER_EXTENSION.format(
+            errorReceiver.error(ct.getLocator(),
+                    Messages.ERR_NO_FURTHER_EXTENSION.format(
                     baseType.getName(), ct.getName() )
             );
             return;
         }
 
-
         // explicit content is always either empty or a particle.
-        if( explicitContent!=null && explicitContent.asParticle()!=null ) {
-
-            if( baseTypeFlag==ComplexTypeBindingMode.NORMAL) {
+        if (explicitContent != null && explicitContent.asParticle() != null) {
+            if (baseTypeFlag == ComplexTypeBindingMode.NORMAL) {
                 // if we have additional explicit content, process them.
-
                 builder.recordBindingMode(ct,
-                    bgmBuilder.getParticleBinder().checkFallback(explicitContent.asParticle())
-                    ?ComplexTypeBindingMode.FALLBACK_REST
-                    :ComplexTypeBindingMode.NORMAL);
+                        bgmBuilder.getParticleBinder().checkFallback(explicitContent.asParticle())
+                        ? ComplexTypeBindingMode.FALLBACK_REST
+                        : ComplexTypeBindingMode.NORMAL);
 
                 bgmBuilder.getParticleBinder().build(explicitContent.asParticle());
 
@@ -113,165 +87,11 @@ final class ExtendedComplexTypeBuilder extends CTBuilder {
             }
         } else {
             // if it's empty, no additional processing is necessary
-            builder.recordBindingMode(ct, baseTypeFlag );
+            builder.recordBindingMode(ct, baseTypeFlag);
         }
 
         // adds attributes and we are through.
         green.attContainer(ct);
     }
 
-    /**
-     * Checks if this new extension is safe.
-     *
-     * UGLY.
-     * <p>
-     * If you have ctA extending ctB and ctB restricting ctC, our
-     * Java classes will look like CtAImpl extending CtBImpl
-     * extending CtCImpl.
-     *
-     * <p>
-     * Since a derived class unmarshaller uses the base class unmarshaller,
-     * this could potentially result in incorrect unmarshalling.
-     * We used to just reject such a case, but then we found that
-     * there are schemas that are using it.
-     *
-     * <p>
-     * One generalized observation that we reached is that if the extension
-     * is only adding new elements/attributes which has never been used
-     * in any of its base class (IOW, if none of the particle / attribute use /
-     * attribute wildcard can match the name of newly added elements/attributes)
-     * then it is safe to add them.
-     *
-     * <p>
-     * This function checks if the derivation chain to this type is
-     * not using restriction, and if it is, then checks if it is safe
-     * according to the above condition.
-     *
-     * @return false
-     *      If this complex type needs to be rejected.
-     */
-    private boolean checkIfExtensionSafe( XSComplexType baseType, XSComplexType thisType ) {
-        XSComplexType lastType = getLastRestrictedType(baseType);
-
-        if(lastType==null)
-            return true;    // no restriction in derivation chain
-
-        NameClass anc = NameClass.NULL;
-        // build name class for attributes in new complex type
-        Iterator itr = thisType.iterateDeclaredAttributeUses();
-        while( itr.hasNext() )
-            anc = new ChoiceNameClass( anc, getNameClass(((XSAttributeUse)itr.next()).getDecl()) );
-        // TODO: attribute wildcard
-
-        NameClass enc = getNameClass(thisType.getExplicitContent());
-
-        // check against every base type ... except the root anyType
-        while(lastType!=lastType.getBaseType()) {
-            if(checkCollision(anc,enc,lastType))
-                return false;
-
-            if(lastType.getBaseType().isSimpleType())
-                // if the base type is a simple type, there won't be
-                // any further name collision.
-                return true;
-
-            lastType = lastType.getBaseType().asComplexType();
-        }
-
-
-
-        return true;    // OK
-    }
-
-    /**
-     * Checks if the particles/attributes defined in the type parameter
-     * collides with the name classes of anc/enc.
-     *
-     * @return true if there's a collision.
-     */
-    private boolean checkCollision(NameClass anc, NameClass enc, XSComplexType type) {
-        NameClass[] chnc = characteristicNameClasses.get(type);
-        if(chnc==null) {
-            chnc = new NameClass[2];
-            chnc[0] = getNameClass(type.getContentType());
-
-            // build attribute name classes
-            NameClass nc = NameClass.NULL;
-            Iterator itr = type.iterateAttributeUses();
-            while( itr.hasNext() )
-                anc = new ChoiceNameClass( anc, getNameClass(((XSAttributeUse)itr.next()).getDecl()) );
-            XSWildcard wc = type.getAttributeWildcard();
-            if(wc!=null)
-                nc = new ChoiceNameClass( nc, WildcardNameClassBuilder.build(wc) );
-            chnc[1] = nc;
-
-            characteristicNameClasses.put(type,chnc);
-        }
-
-        return chnc[0].hasOverlapWith(enc) || chnc[1].hasOverlapWith(anc);
-    }
-
-    /**
-     * Gets a {@link NameClass} that represents all the terms in the given content type.
-     * If t is not a particle, just return an empty name class.
-     */
-    private NameClass getNameClass( XSContentType t ) {
-        if(t==null) return NameClass.NULL;
-        XSParticle p = t.asParticle();
-        if(p==null) return NameClass.NULL;
-        else        return p.getTerm().apply(contentModelNameClassBuilder);
-    }
-
-    /**
-     * Gets a {@link SimpleNameClass} from the name of a {@link XSDeclaration}.
-     */
-    private NameClass getNameClass( XSDeclaration decl ) {
-        return new SimpleNameClass(decl.getTargetNamespace(),decl.getName());
-    }
-
-    /**
-     * Computes a name class that represents everything in a given content model.
-     */
-    private final XSTermFunction<NameClass> contentModelNameClassBuilder = new XSTermFunction<NameClass>() {
-        public NameClass wildcard(XSWildcard wc) {
-            return WildcardNameClassBuilder.build(wc);
-        }
-
-        public NameClass modelGroupDecl(XSModelGroupDecl decl) {
-            return modelGroup(decl.getModelGroup());
-        }
-
-        public NameClass modelGroup(XSModelGroup group) {
-            NameClass nc = NameClass.NULL;
-            for( int i=0; i<group.getSize(); i++ )
-                nc = new ChoiceNameClass(nc,group.getChild(i).getTerm().apply(this));
-            return nc;
-        }
-
-        public NameClass elementDecl(XSElementDecl decl) {
-            return getNameClass(decl);
-        }
-    };
-
-
-    /**
-     * Looks for the derivation chain t_1 > t_2 > ... > t
-     * and find t_i such that t_i derives by restriction but
-     * for every j>i, t_j derives by extension.
-     *
-     * @return null
-     *      If there's no such t_i or if t_i is any type.
-     */
-    private XSComplexType getLastRestrictedType( XSComplexType t ) {
-        if( t.getBaseType()==schemas.getAnyType() )
-            return null;   // we don't count the restriction from anyType
-        if( t.getDerivationMethod()==XSType.RESTRICTION )
-            return t;
-
-        XSComplexType baseType = t.getBaseType().asComplexType();
-        if(baseType!=null)
-            return getLastRestrictedType(baseType);
-        else
-            return null;
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
index 3f46f175ae7..8ccdbd31502 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
@@ -27,4 +27,3 @@ ERR_NO_FURTHER_EXTENSION = \
     Base complex type "{0}" is derived by restriction, while this complex type "{1}" \
     is derived by extension. This is not currently handled by XJC, but we are \
     seeking input on this issue. Please report this to the JAXB team.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
index a0369dc7cbc..2818b83d160 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
index 963350e23db..d920c2c75fa 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
@@ -22,9 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
+import com.sun.tools.internal.xjc.model.CClass;
 import com.sun.tools.internal.xjc.model.CPropertyInfo;
 import com.sun.tools.internal.xjc.reader.RawTypeSet;
 import com.sun.tools.internal.xjc.reader.xmlschema.RawTypeSetBuilder;
@@ -33,6 +35,7 @@ import static com.sun.tools.internal.xjc.reader.xmlschema.ct.ComplexTypeBindingM
 import com.sun.xml.internal.xsom.XSComplexType;
 import com.sun.xml.internal.xsom.XSContentType;
 import com.sun.xml.internal.xsom.XSType;
+import java.util.List;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -44,12 +47,16 @@ final class MixedComplexTypeBuilder extends CTBuilder {
         if(bt ==schemas.getAnyType() && ct.isMixed())
             return true;    // fresh mixed complex type
 
-        // see issue 148. handle complex type extended from another and added mixed=true.
-        // the current implementation only works when the base type doesn't define
-        // any elements, and we should ideally warn it.
-        if(bt.isComplexType() && !bt.asComplexType().isMixed()
-        && ct.isMixed() && ct.getDerivationMethod()==XSType.EXTENSION)
-            return true;
+        // there's no complex type in the inheritance tree yet
+        if (bt.isComplexType() &&
+            !bt.asComplexType().isMixed() &&
+            ct.isMixed() &&
+            ct.getDerivationMethod() == XSType.EXTENSION) {
+                if (!bgmBuilder.isGenerateMixedExtensions() && (ct.getContentType().asParticle() == null)) {
+                    return false;
+                }
+                return true;
+        }
 
         return false;
     }
@@ -57,18 +64,45 @@ final class MixedComplexTypeBuilder extends CTBuilder {
     public void build(XSComplexType ct) {
         XSContentType contentType = ct.getContentType();
 
-        // if mixed, we fallback immediately
-        builder.recordBindingMode(ct,FALLBACK_CONTENT);
+        boolean generateMixedExtensions = bgmBuilder.isGenerateMixedExtensions();
+        if (generateMixedExtensions) {
+            if (!(ct.getBaseType() == schemas.getAnyType() && ct.isMixed())) {
+                XSComplexType baseType = ct.getBaseType().asComplexType();
+                // build the base class
+                CClass baseClass = selector.bindToType(baseType, ct, true);
+                selector.getCurrentBean().setBaseClass(baseClass);
+            }
+        }
 
+        builder.recordBindingMode(ct, FALLBACK_CONTENT);
         BIProperty prop = BIProperty.getCustomization(ct);
 
         CPropertyInfo p;
 
-        if(contentType.asEmpty()!=null) {
-            p = prop.createValueProperty("Content",false,ct,CBuiltinLeafInfo.STRING,null);
+        if (generateMixedExtensions) {
+            List<XSComplexType> cType = ct.getSubtypes();
+            boolean isSubtyped = (cType != null) && (cType.size() > 0);
+
+            if (contentType.asEmpty() != null) {
+                if (isSubtyped) {
+                    p = prop.createContentExtendedMixedReferenceProperty("Content", ct, null);
+                } else {
+                    p = prop.createValueProperty("Content",false,ct,CBuiltinLeafInfo.STRING,null);
+                }
+            } else if (contentType.asParticle() == null) {
+                p = prop.createContentExtendedMixedReferenceProperty("Content", ct, null);
+            } else {
+                RawTypeSet ts = RawTypeSetBuilder.build(contentType.asParticle(), false);
+                p = prop.createContentExtendedMixedReferenceProperty("Content", ct, ts);
+            }
+
         } else {
-            RawTypeSet ts = RawTypeSetBuilder.build(contentType.asParticle(),false);
-            p = prop.createReferenceProperty("Content",false,ct,ts, true);
+            if(contentType.asEmpty()!=null) {
+                p = prop.createValueProperty("Content",false,ct,CBuiltinLeafInfo.STRING,null);
+            } else {
+                RawTypeSet ts = RawTypeSetBuilder.build(contentType.asParticle(),false);
+                p = prop.createReferenceProperty("Content", false, ct, ts, true, false, true, false);
+            }
         }
 
         selector.getCurrentBean().addProperty(p);
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java
new file mode 100644
index 00000000000..8fa997d4801
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.internal.xjc.reader.xmlschema.ct;
+
+import com.sun.tools.internal.xjc.model.CClass;
+import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.tools.internal.xjc.reader.RawTypeSet;
+import com.sun.tools.internal.xjc.reader.xmlschema.RawTypeSetBuilder;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIGlobalBinding;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIProperty;
+import com.sun.xml.internal.xsom.XSComplexType;
+import com.sun.xml.internal.xsom.XSContentType;
+import com.sun.xml.internal.xsom.XSType;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+final class MixedExtendedComplexTypeBuilder extends AbstractExtendedComplexTypeBuilder {
+
+    public boolean isApplicable(XSComplexType ct) {
+
+        if (!bgmBuilder.isGenerateMixedExtensions()) return false;
+
+        XSType bt = ct.getBaseType();
+        if (bt.isComplexType() &&
+            bt.asComplexType().isMixed() &&
+            ct.isMixed() &&
+            ct.getDerivationMethod()==XSType.EXTENSION &&
+            ct.getContentType().asParticle() != null &&
+            ct.getExplicitContent().asEmpty() == null
+            )  {
+                return true;
+        }
+
+        return false;
+    }
+
+    public void build(XSComplexType ct) {
+        XSComplexType baseType = ct.getBaseType().asComplexType();
+
+        // build the base class
+        CClass baseClass = selector.bindToType(baseType, ct, true);
+        assert baseClass != null;   // global complex type must map to a class
+
+        if (!checkIfExtensionSafe(baseType, ct)) {
+            // error. We can't handle any further extension
+            errorReceiver.error(ct.getLocator(),
+                    Messages.ERR_NO_FURTHER_EXTENSION.format(
+                    baseType.getName(), ct.getName() )
+            );
+            return;
+        }
+
+        selector.getCurrentBean().setBaseClass(baseClass);
+        builder.recordBindingMode(ct, ComplexTypeBindingMode.FALLBACK_EXTENSION);
+
+        BIProperty prop = BIProperty.getCustomization(ct);
+        CPropertyInfo p;
+
+        RawTypeSet ts = RawTypeSetBuilder.build(ct.getContentType().asParticle(), false);
+        p = prop.createDummyExtendedMixedReferenceProperty("contentOverrideFor" + ct.getName(), ct, ts);
+
+        selector.getCurrentBean().addProperty(p);
+
+        // adds attributes and we are through.
+        green.attContainer(ct);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
index 35fce946ae7..65ac9428852 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
@@ -25,7 +25,13 @@
 package com.sun.tools.internal.xjc.reader.xmlschema.ct;
 
 import com.sun.tools.internal.xjc.model.CClass;
+import com.sun.tools.internal.xjc.model.CPropertyInfo;
+import com.sun.tools.internal.xjc.reader.RawTypeSet;
+import com.sun.tools.internal.xjc.reader.xmlschema.RawTypeSetBuilder;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIGlobalBinding;
+import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIProperty;
 import com.sun.xml.internal.xsom.XSComplexType;
+import com.sun.xml.internal.xsom.XSParticle;
 import com.sun.xml.internal.xsom.XSType;
 
 /**
@@ -45,13 +51,13 @@ final class RestrictedComplexTypeBuilder extends CTBuilder {
     }
 
     public void build(XSComplexType ct) {
-        if(bgmBuilder.getGlobalBinding().isRestrictionFreshType()) {
+
+        if (bgmBuilder.getGlobalBinding().isRestrictionFreshType()) {
             // handle derivation-by-restriction like a whole new type
             new FreshComplexTypeBuilder().build(ct);
             return;
         }
 
-
         XSComplexType baseType = ct.getBaseType().asComplexType();
 
         // build the base class
@@ -60,7 +66,29 @@ final class RestrictedComplexTypeBuilder extends CTBuilder {
 
         selector.getCurrentBean().setBaseClass(baseClass);
 
-        // determine the binding of this complex type.
-        builder.recordBindingMode(ct,builder.getBindingMode(baseType));
+        if (bgmBuilder.isGenerateMixedExtensions()) {
+            boolean forceFallbackInExtension = baseType.isMixed() &&
+                                               ct.isMixed() &&
+                                               (ct.getExplicitContent() != null) &&
+                                               bgmBuilder.inExtensionMode;
+            if (forceFallbackInExtension) {
+                builder.recordBindingMode(ct, ComplexTypeBindingMode.NORMAL);
+
+                BIProperty prop = BIProperty.getCustomization(ct);
+                CPropertyInfo p;
+
+                XSParticle particle = ct.getContentType().asParticle();
+                if (particle != null) {
+                    RawTypeSet ts = RawTypeSetBuilder.build(particle, false);
+                    p = prop.createDummyExtendedMixedReferenceProperty("Content", ct, ts);
+                    selector.getCurrentBean().addProperty(p);
+                }
+            } else {
+                // determine the binding of this complex type.
+                builder.recordBindingMode(ct,builder.getBindingMode(baseType));
+            }
+        } else {
+            builder.recordBindingMode(ct,builder.getBindingMode(baseType));
+        }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
index 457c78be513..8239354926b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.reader.xmlschema.parser;
 
 import java.io.InputStream;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
index 258adfc3f5c..9b08f37f020 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties
@@ -30,24 +30,18 @@
 
 
 CustomizationContextChecker.UnacknolwedgedCustomization = \
-	Specified {0} customization is not used.
+        Specified {0} customization is not used.
 
 
 SchemaConstraintChecker.UnableToCheckCorrectness = \
     Unable to check the correctness of the schema due to OutOfMemoryError. \
     This typically happens when your schema contains constructs like maxOccurs="999". \
     In the future compilation, add the '-nv' option to skip the correctness check \
-    for faster compilation. 
+    for faster compilation.
 
 
 
 
 IncorrectNamespaceURIChecker.WarnIncorrectURI = \
-	No JAXB customization was detected in the schema but the prefix "jaxb" is used for \
-	other namespace URIs. If you did intend to use JAXB customization, make sure the namespace URI is "{0}"
-
-	
-
-
-	
- 
+        No JAXB customization was detected in the schema but the prefix "jaxb" is used for \
+        other namespace URIs. If you did intend to use JAXB customization, make sure the namespace URI is "{0}"
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
index 31f0430c2ae..54088a285ba 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.runtime;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
index 42e4f2d7780..3b073506940 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.runtime;
 
 import javax.xml.bind.DatatypeConverter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java
index 35872f3b61a..1923039e513 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.util;
 
 import org.xml.sax.Attributes;
@@ -34,7 +35,6 @@ import org.xml.sax.SAXException;
  * two ContentHandlers.
  *
  *
- * @version     $Id: ForkContentHandler.java,v 1.1 2005/05/23 17:04:58 kohsuke Exp $
  * @author  <a href="mailto:kohsuke.kawaguchi@sun.com">Kohsuke KAWAGUCHI</a>
  */
 public class ForkContentHandler implements ContentHandler {
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
index 4fbe5c132ba..0760c56e3c5 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.util;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties
index 5b80e3f6c9f..94654a89dc7 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties
@@ -30,11 +30,11 @@
 
 
 CodeModelClassFactory.ClassNameCollision = \
-	A class/interface with the same name "{0}" is already in use. \
+        A class/interface with the same name "{0}" is already in use. \
     Use a class customization to resolve this conflict.
 
 CodeModelClassFactory.ClassNameCollision.Source = \
-	(Relevant to above error) another "{0}" is generated from here.
+        (Relevant to above error) another "{0}" is generated from here.
 
 ERR_INVALID_CLASSNAME = \
     Invalid class name "{0}". Either XJC has failed to derive a class name \
@@ -42,12 +42,11 @@ ERR_INVALID_CLASSNAME = \
     to override a name.
 
 CodeModelClassFactory.CaseSensitivityCollision = \
-	This error is caused because on Windows you cannot have both "{0}.java" and "{1}.java" \
-	in the same directory.
+        This error is caused because on Windows you cannot have both "{0}.java" and "{1}.java" \
+        in the same directory.
 
 ERR_CHAMELEON_SCHEMA_GONE_WILD = \
     (Relevant to above error) This confusing error happened most likely because the schema uses a technique called \
     "chameleon schema", which causes a single definition to be loaded multiple times into \
     different namespaces. See http://forums.java.net/jive/thread.jspa?threadID=18631 for \
     more about this.
- 
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java
index 2bc02c60134..ead3b05fa1b 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.util;
 
 import java.text.ParseException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
index c15163df5e5..6ff4077477c 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.util;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
index e7dec2bf5ed..72a59c0d689 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.util;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java
index 5fe712268c3..4b60fca37f0 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.util;
 
 import java.text.ParseException;
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java
index 6139ec9e448..f81aa44dada 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java
+++ b/jaxws/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.tools.internal.xjc.util;
 
 import org.xml.sax.helpers.XMLFilterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java
index 8569e14ecf1..21e6ffb69ff 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java
@@ -27,16 +27,17 @@ package com.sun.xml.internal.bind;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+
+import javax.xml.bind.JAXBException;
+
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
-import com.sun.xml.internal.bind.api.AccessorException;
 
 public class AccessorFactoryImpl implements AccessorFactory {
 
-    private static AccessorFactoryImpl instance = null;
+    private static AccessorFactoryImpl instance = new AccessorFactoryImpl();
     private AccessorFactoryImpl(){}
-    public static synchronized AccessorFactoryImpl getInstance(){
-        if (instance == null)
-            instance = new AccessorFactoryImpl();
+
+    public static AccessorFactoryImpl getInstance(){
         return instance;
     }
 
@@ -44,7 +45,7 @@ public class AccessorFactoryImpl implements AccessorFactory {
      * Access a field of the class.
      *
      * @param bean the class to be processed.
-     * @param f the field within the class to be accessed.
+     * @param field the field within the class to be accessed.
      * @param readOnly  the isStatic value of the field's modifier.
      * @return Accessor the accessor for this field
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java
index 08659a9c93d..ed7725d0e8c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java
index 11bec2e4e52..d5b48a52367 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind;
 
 import javax.xml.bind.Marshaller;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
index 826d986de0f..cb100eb5a4f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java
@@ -52,7 +52,6 @@ import com.sun.xml.internal.bind.v2.TODO;
  * This class is responsible for whitespace normalization.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.9 $
  * @since JAXB1.0
  */
 public final class DatatypeConverterImpl implements DatatypeConverterInterface {
@@ -117,7 +116,7 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
                 sign = -1;
             } else
             if(ch=='+') {
-                ; // noop
+                // noop
             } else
                 throw new NumberFormatException("Not a number: "+s);
         }
@@ -137,7 +136,7 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
         return _parseShort(lexicalXSDShort);
     }
 
-    public static final short _parseShort(CharSequence s) {
+    public static short _parseShort(CharSequence s) {
         return (short)_parseInt(s);
     }
 
@@ -209,7 +208,7 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
     }
 
     public static String _printFloat(float v) {
-        if( v==Float.NaN )                  return "NaN";
+        if( Float.isNaN(v) )                return "NaN";
         if( v==Float.POSITIVE_INFINITY )    return "INF";
         if( v==Float.NEGATIVE_INFINITY )    return "-INF";
         return String.valueOf(v);
@@ -242,16 +241,18 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
         return _parseBoolean(lexicalXSDBoolean);
     }
 
-    public static boolean _parseBoolean(CharSequence literal) {
+    public static Boolean _parseBoolean(CharSequence literal) {
         int i=0;
         int len = literal.length();
         char ch;
+        if (literal.length() <= 0) {
+            return null;
+        }
         do {
             ch = literal.charAt(i++);
         } while(WhiteSpaceProcessor.isWhiteSpace(ch) && i<len);
 
         // if we are strict about errors, check i==len. and report an error
-
         if( ch=='t' || ch=='1' )        return true;
         if( ch=='f' || ch=='0' )        return false;
         TODO.checkSpec("issue #42");
@@ -358,7 +359,8 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
         final int len = s.length();
 
         // "111" is not a valid hex encoding.
-        if( len%2 != 0 )    return null;
+        if( len%2 != 0 )
+            throw new IllegalArgumentException("hexBinary needs to be even-length: "+s);
 
         byte[] out = new byte[len/2];
 
@@ -366,7 +368,7 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
             int h = hexToBin(s.charAt(i  ));
             int l = hexToBin(s.charAt(i+1));
             if( h==-1 || l==-1 )
-                return null;    // illegal character
+                throw new IllegalArgumentException("contains illegal character for hexBinary: "+s);
 
             out[i/2] = (byte)(h*16+l);
         }
@@ -454,7 +456,7 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
     }
 
     public static String _printDecimal(BigDecimal val) {
-        return val.toString();
+        return val.toPlainString();
     }
 
     public String printDouble(double v) {
@@ -462,7 +464,7 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
     }
 
     public static String _printDouble(double v) {
-        if( v==Double.NaN )                    return "NaN";
+        if(Double.isNaN(v))                  return "NaN";
         if( v==Double.POSITIVE_INFINITY )    return "INF";
         if( v==Double.NEGATIVE_INFINITY )    return "-INF";
         return String.valueOf(v);
@@ -884,11 +886,11 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
             if (tz == null)      return;
 
             // otherwise print out normally.
-            int offset;
-            if (tz.inDaylightTime(cal.getTime())) {
-                offset = tz.getRawOffset() + (tz.useDaylightTime()?3600000:0);
-            } else {
-                offset = tz.getRawOffset();
+            int offset = tz.getOffset(cal.getTime().getTime());
+
+            if(offset==0) {
+                buf.append('Z');
+                return;
             }
 
             if (offset >= 0)
@@ -906,7 +908,7 @@ public final class DatatypeConverterImpl implements DatatypeConverterInterface {
         }
 
         /** formats Integer into two-character-wide string. */
-        private static final void formatTwoDigits(int n,StringBuilder buf) {
+        private static void formatTwoDigits(int n,StringBuilder buf) {
             // n is always non-negative.
             if (n < 10) buf.append('0');
             buf.append(n);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/IDResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/IDResolver.java
index c012025a8f2..4953f458c98 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/IDResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/IDResolver.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind;
 
 import java.util.concurrent.Callable;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/Locatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/Locatable.java
index 11f4d768ed9..280b75a2ab6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/Locatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/Locatable.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * @(#)$Id: Locatable.java,v 1.1 2005/04/15 20:03:41 kohsuke Exp $
- */
-
-
 package com.sun.xml.internal.bind;
 
 import com.sun.xml.internal.bind.annotation.XmlLocation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/Util.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/Util.java
index 877f5d71a6f..3125e5dc596 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/Util.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/Util.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind;
 
 import java.util.logging.Logger;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java
index 213b9ee9298..8a3c5b88855 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * @(#)$Id: ValidationEventLocatorEx.java,v 1.1 2005/04/15 20:03:42 kohsuke Exp $
- */
-
-
 package com.sun.xml.internal.bind;
 
 import javax.xml.bind.ValidationEventLocator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java
index c94af0c19ae..6a3913bab7c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.bind;
 
 import static java.lang.annotation.ElementType.PACKAGE;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java
similarity index 70%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java
index 5e84bd5b01c..4f669c05d09 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java
@@ -23,28 +23,20 @@
  * have any questions.
  */
 
-package com.sun.xml.internal.ws.addressing.model;
+package com.sun.xml.internal.bind.annotation;
 
-import javax.xml.ws.WebServiceException;
-import javax.xml.namespace.QName;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * @author Arun Gupta
+ * Designates an annotation from base class which shall be overriden by annotation placed together with this.
+ *
+ * @author Martin Grebac
  */
-public class InvalidMapException extends WebServiceException {
-    QName name;
-    QName subsubcode;
-
-    public InvalidMapException(QName name, QName subsubcode) {
-        this.name = name;
-        this.subsubcode = subsubcode;
-    }
-
-    public QName getMapQName() {
-        return name;
-    }
-
-    public QName getSubsubcode() {
-        return subsubcode;
-    }
+@Retention(RUNTIME)
+@Target({FIELD})
+public @interface OverrideAnnotationOf {
+    String value() default "content";
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java
index 7280ffe93df..472959fdbe0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.annotation;
 
 import java.lang.annotation.Retention;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java
index c091c3b0573..e60c068e876 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.annotation;
 
 import java.lang.annotation.Retention;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java
index cd1b80a34ab..910effefc98 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java
index acd89c323b9..4efff6a57fb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api;
 
 import java.io.InputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java
index 112f8f62e51..5d52e2127b9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api;
 
 import javax.xml.bind.ValidationEventHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java
index 211ef894b38..b4e7ca13632 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api;
 
 import javax.xml.bind.JAXBContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java
index acb2b87881e..cb4149b214b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java
index 586f73704b7..14fbbdc4f33 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api;
 
 import org.xml.sax.ErrorHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
index a759940d61b..cb72a63d918 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
@@ -45,6 +45,7 @@ import com.sun.xml.internal.bind.api.impl.NameConverter;
 import com.sun.xml.internal.bind.v2.ContextFactory;
 import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet;
 
 /**
  * {@link JAXBContext} enhanced with JAXB RI specific functionalities.
@@ -92,7 +93,7 @@ public abstract class JAXBRIContext extends JAXBContext {
        @Nullable String defaultNamespaceRemap, boolean c14nSupport,
        @Nullable RuntimeAnnotationReader ar) throws JAXBException {
         return ContextFactory.createContext(classes, typeRefs, subclassReplacements,
-                defaultNamespaceRemap, c14nSupport, ar, false, false);
+                defaultNamespaceRemap, c14nSupport, ar, false, false, false);
     }
 
     /**
@@ -127,6 +128,15 @@ public abstract class JAXBRIContext extends JAXBContext {
      */
     public abstract @Nullable QName getElementName(@NotNull Object o) throws JAXBException;
 
+    /**
+     * Allows to retrieve the element name based on Class.
+     * @param o
+     * @return
+     * @throws javax.xml.bind.JAXBException
+     * @since 2.1.10
+     */
+    public abstract @Nullable QName getElementName(@NotNull Class o) throws JAXBException;
+
     /**
      * Creates a mini-marshaller/unmarshaller that can process a {@link TypeReference}.
      *
@@ -220,6 +230,7 @@ public abstract class JAXBRIContext extends JAXBContext {
      * @throws IOException
      *      if {@link SchemaOutputResolver} throws an {@link IOException}.
      */
+    @Override
     public abstract void generateSchema(@NotNull SchemaOutputResolver outputResolver) throws IOException;
 
     /**
@@ -263,6 +274,17 @@ public abstract class JAXBRIContext extends JAXBContext {
      */
     public abstract void generateEpisode(Result output);
 
+    /**
+     * Allows you to access the runtime model information of the JAXB XML/Java binding.
+     *
+     * <p>
+     * This is useful for doing a deeper integration with the JAXB RI.
+     * For more information about the model, see https://jaxb2-reflection.dev.java.net/
+     *
+     * @since 2.1.10
+     */
+    public abstract RuntimeTypeInfoSet getRuntimeTypeInfoSet();
+
     /**
      * Computes a Java identifier from a local name.
      *
@@ -423,4 +445,11 @@ public abstract class JAXBRIContext extends JAXBContext {
      */
     public static final String XMLACCESSORFACTORY_SUPPORT = "com.sun.xml.internal.bind.XmlAccessorFactory";
 
+    /**
+     * Retains references to PropertyInfos.
+     *
+     * @since 2.1.10
+     */
+    public static final String RETAIN_REFERENCE_TO_INFO = "retainReferenceToInfo";
+
 }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.java
similarity index 91%
rename from jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.java
index f20ae0091e9..5e8ace4763d 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.java
@@ -22,20 +22,27 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package com.sun.tools.internal.xjc.api.impl.j2s;
+
+
+package com.sun.xml.internal.bind.api;
 
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
 /**
- * @author Kohsuke Kawaguchi
+ * Formats error messages.
+ *
+ * @since JAXB2.1.10
  */
-enum Messages {
-    ;
 
+enum Messages {
+    // TypeReference
+    ARGUMENT_CANT_BE_NULL
+    ;
 
     private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
 
+    @Override
     public String toString() {
         return format();
     }
diff --git a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.properties
similarity index 94%
rename from jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.properties
index a36f23969e7..2848f4c0993 100644
--- a/jaxws/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/Messages.properties
@@ -23,4 +23,5 @@
 # have any questions.
 #
 
- 
+ARGUMENT_CANT_BE_NULL = \
+    Argument(s) "{0}" can''t be null.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java
index a6622707257..cdcab1051e4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java
index 6c439ea945d..36a618f6f73 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api;
 
 import java.lang.annotation.Annotation;
@@ -65,8 +66,17 @@ public final class TypeReference {
     public final Annotation[] annotations;
 
     public TypeReference(QName tagName, Type type, Annotation... annotations) {
-        if(tagName==null || type==null || annotations==null)
-            throw new IllegalArgumentException();
+        if(tagName==null || type==null || annotations==null) {
+            String nullArgs = "";
+
+            if(tagName == null)     nullArgs = "tagName";
+            if(type == null)        nullArgs += (nullArgs.length() > 0 ? ", type" : "type");
+            if(annotations == null) nullArgs += (nullArgs.length() > 0 ? ", annotations" : "annotations");
+
+            Messages.ARGUMENT_CANT_BE_NULL.format(nullArgs);
+
+            throw new IllegalArgumentException(Messages.ARGUMENT_CANT_BE_NULL.format(nullArgs));
+        }
 
         this.tagName = new QName(tagName.getNamespaceURI().intern(), tagName.getLocalPart().intern(), tagName.getPrefix());
         this.type = type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java
index 59f6e53226b..975b1f7b33d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api.impl;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java
index 39103f23c46..aec880a93bd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java
@@ -22,11 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.api.impl;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Methods that convert strings into various formats.
@@ -59,6 +61,18 @@ class NameUtil {
         return c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z' || Character.isLetter(c);
     }
 
+    private String toLowerCase(String s) {
+        return s.toLowerCase(Locale.ENGLISH);
+    }
+
+    private String toUpperCase(char c) {
+        return String.valueOf(c).toUpperCase(Locale.ENGLISH);
+    }
+
+    private String toUpperCase(String s) {
+        return s.toUpperCase(Locale.ENGLISH);
+    }
+
     /**
      * Capitalizes the first character of the specified string,
      * and de-capitalize the rest of characters.
@@ -67,8 +81,8 @@ class NameUtil {
         if (!isLower(s.charAt(0)))
             return s;
         StringBuilder sb = new StringBuilder(s.length());
-        sb.append(Character.toUpperCase(s.charAt(0)));
-        sb.append(s.substring(1).toLowerCase());
+        sb.append(toUpperCase(s.charAt(0)));
+        sb.append(toLowerCase(s.substring(1)));
         return sb.toString();
     }
 
@@ -209,7 +223,7 @@ class NameUtil {
     protected String toMixedCaseName(List<String> ss, boolean startUpper) {
         StringBuilder sb = new StringBuilder();
         if(!ss.isEmpty()) {
-            sb.append(startUpper ? ss.get(0) : ss.get(0).toLowerCase());
+            sb.append(startUpper ? ss.get(0) : toLowerCase(ss.get(0)));
             for (int i = 1; i < ss.size(); i++)
                 sb.append(ss.get(i));
         }
@@ -224,7 +238,7 @@ class NameUtil {
                 ss[i] = capitalize(ss[i]);
         StringBuilder sb = new StringBuilder();
         if( ss.length>0 ) {
-            sb.append(startUpper ? ss[0] : ss[0].toLowerCase());
+            sb.append(startUpper ? ss[0] : toLowerCase(ss[0]));
             for (int i = 1; i < ss.length; i++)
                 sb.append(ss[i]);
         }
@@ -253,10 +267,10 @@ class NameUtil {
     public String toConstantName(List<String> ss) {
         StringBuilder sb = new StringBuilder();
         if( !ss.isEmpty() ) {
-            sb.append(ss.get(0).toUpperCase());
+            sb.append(toUpperCase(ss.get(0)));
             for (int i = 1; i < ss.size(); i++) {
                 sb.append('_');
-                sb.append(ss.get(i).toUpperCase());
+                sb.append(toUpperCase(ss.get(i)));
             }
         }
         return sb.toString();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/package-info.java
index 6aee4d4838f..08592982688 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/api/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/api/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * <h1>Runtime API for the JAX-WS RI</h1>.
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java
index 17e7600f9c6..a486a05dd77 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 //@@3RD PARTY CODE@@
 
 // DataWriter.java - XML writer for data-oriented files.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties
index 783d617783d..4630e7837f8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties
@@ -28,32 +28,31 @@
 #
 
 MarshallerImpl.NotMarshallable = \
-	the object parameter to marshal() is not marshallable
-	
+        the object parameter to marshal() is not marshallable
+
 MarshallerImpl.UnsupportedResult = \
-	unsupported javax.xml.parser.transform.Result parameter
-	
+        unsupported javax.xml.parser.transform.Result parameter
+
 MarshallerImpl.UnsupportedEncoding = \
-	unsupported encoding: {0}
-	
+        unsupported encoding: {0}
+
 MarshallerImpl.NullWriterParam = \
-	StAX writer parameter must not be null
-	
+        StAX writer parameter must not be null
+
 SAXMarshaller.AssertFailed = \
-	assertion failed
-	 
+        assertion failed
+
 SAXMarshaller.MissingObject = \
-	a required object is missing
-	 
+        a required object is missing
+
 SAXMarshaller.MissingObject2 = \
-	a required field "{0}" is missing an object
+        a required field "{0}" is missing an object
 
 SAXMarshaller.DanglingIDREF = \
-	A tree contains a reference to ID "{0}" but it's not a part of the object graph
+        A tree contains a reference to ID "{0}" but it's not a part of the object graph
 
 SAXMarshaller.NotIdentifiable = \
-	An object is referenced as IDREF but its ID field is null
+        An object is referenced as IDREF but its ID field is null
 
 SAX2DOMEx.DomImplDoesntSupportCreateElementNs = \
-	DOM implementation ({0} from {1}) is broken. It does not support the createElementNS method.
- 
+        DOM implementation ({0} from {1}) is broken. It does not support the createElementNS method.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
index ee3517dc00b..33f7a8be2bc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * @(#)$Id: MinimumEscapeHandler.java,v 1.1 2005/04/15 20:03:47 kohsuke Exp $
- */
-
-
 package com.sun.xml.internal.bind.marshaller;
 
 import java.io.IOException;
@@ -52,23 +47,23 @@ public class MinimumEscapeHandler implements CharacterEscapeHandler {
         int limit = start+length;
         for (int i = start; i < limit; i++) {
             char c = ch[i];
-            if( c=='&' || c=='<' || c=='>' || (c=='\"' && isAttVal) ) {
+                if(c == '&' || c == '<' || c == '>' || c == '\r' || (c == '\"' && isAttVal) ) {
                 if(i!=start)
                     out.write(ch,start,i-start);
                 start = i+1;
                 switch (ch[i]) {
-                case '&' :
-                    out.write("&amp;");
-                    break;
-                case '<' :
-                    out.write("&lt;");
-                    break;
-                case '>' :
-                    out.write("&gt;");
-                    break;
-                case '\"' :
-                    out.write("&quot;");
-                    break;
+                    case '&':
+                        out.write("&amp;");
+                        break;
+                    case '<':
+                        out.write("&lt;");
+                        break;
+                    case '>':
+                        out.write("&gt;");
+                        break;
+                    case '\"':
+                        out.write("&quot;");
+                        break;
                 }
             }
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
index 095faecabec..59eb814b48b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java
@@ -26,6 +26,7 @@ package com.sun.xml.internal.bind.marshaller;
 
 import java.io.OutputStream;
 
+import javax.xml.bind.JAXBContext;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.dom.DOMResult;
@@ -61,6 +62,26 @@ public abstract class NamespacePrefixMapper {
      *
      * This method is intended to be overrided by a derived class.
      *
+     *
+     * <p>
+     * As noted in the return value portion of the javadoc, there
+     * are several cases where the preference cannot be honored.
+     * Specifically, as of JAXB RI 2.0 and onward:
+     *
+     * <ol>
+     * <li>
+     * If the prefix returned is already in use as one of the in-scope
+     * namespace bindings. This is partly necessary for correctness
+     * (so that we don't unexpectedly change the meaning of QNames
+     * bound to {@link String}), partly to simplify the marshaller.
+     * <li>
+     * If the prefix returned is "" yet the current {@link JAXBContext}
+     * includes classes that use the empty namespace URI. This allows
+     * the JAXB RI to reserve the "" prefix for the empty namespace URI,
+     * which is the only possible prefix for the URI.
+     * This restriction is also to simplify the marshaller.
+     * </ol>
+     *
      * @param namespaceUri
      *      The namespace URI for which the prefix needs to be found.
      *      Never be null. "" is used to denote the default namespace.
@@ -112,7 +133,7 @@ public abstract class NamespacePrefixMapper {
      *   <ns3:child xmlns:ns3="urn:foo"> ... </ns3:child>
      *   ...
      * </root>
-     * <xmp></pre>
+     * </xmp></pre>
      *
      * <p>
      * The JAXB RI 2.x mostly doesn't exhibit this behavior any more,
@@ -139,7 +160,7 @@ public abstract class NamespacePrefixMapper {
      *   <ns1:child> ... </ns1:child>
      *   ...
      * </root>
-     * <xmp></pre>
+     * </xmp></pre>
      * <p>
      * To control prefixes assigned to those namespace URIs, use the
      * {@link #getPreferredPrefix(String, String, boolean)} method.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
index 8bf89aacd42..0e533a62a40 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 // @@3RD PARTY CODE@@
 
 // XMLWriter.java - serialize an XML document.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
index 85a95df1079..997b8a9d00f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java
@@ -54,7 +54,6 @@ import org.xml.sax.helpers.NamespaceSupport;
  * classes like this.
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.6 $ $Date: 2006/04/24 15:27:52 $
  * @since JAXB1.0
  */
 public class DOMScanner implements LocatorEx,InfosetScanner/*<Node> --- but can't do this to protect 1.0 clients, or can I? */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties
index 40447941cef..6bdaff4ffb0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties
@@ -28,36 +28,34 @@
 #
 
 ContentHandlerEx.UnexpectedEnterElement = \
-	Unexpected element '{'{0}'}':{1}
+        Unexpected element '{'{0}'}':{1}
 
 ContentHandlerEx.UnexpectedLeaveElement = \
-	Unexpected end of element '{'{0}'}':{1}
+        Unexpected end of element '{'{0}'}':{1}
 
 ContentHandlerEx.UnexpectedEnterAttribute = \
-	Unexpected attribute '{'{0}'}':{1}
+        Unexpected attribute '{'{0}'}':{1}
 
 ContentHandlerEx.UnexpectedLeaveAttribute = \
-	Unexpected end of attribute '{'{0}'}':{1}
+        Unexpected end of attribute '{'{0}'}':{1}
 
 ContentHandlerEx.UnexpectedText = \
-	Unexpected text "{0}"
+        Unexpected text "{0}"
 
 ContentHandlerEx.UnexpectedLeaveChild = \
-	compiler error(unexpectedLeaveChild)
-	
+        compiler error(unexpectedLeaveChild)
+
 SAXUnmarshallerHandlerImpl.UnexpectedRootElement = \
-	unexpected root element {0}
-	
+        unexpected root element {0}
+
 SAXUnmarshallerHandlerImpl.UnexpectedRootElement2 = \
-	unexpected root element (uri:"{0}", local:"{1}"). Expected elements are {2}
-	
+        unexpected root element (uri:"{0}", local:"{1}"). Expected elements are {2}
+
 Util.UndefinedPrefix = \
-	undefined prefix: {0}
-	
+        undefined prefix: {0}
+
 Unmarshaller.NullReader = \
-	reader can not be null	
-	
+        reader can not be null
+
 Unmarshaller.IllegalReaderState = \
-	reader must be on a START_ELEMENT event, not a {0} event
-	
- 
+        reader must be on a START_ELEMENT event, not a {0} event
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java
index b1f1fe812e8..feda2008ed5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java
index 939042f3bbd..8fe6164e40b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java
@@ -27,7 +27,6 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: AttributesImpl.java,v 1.2 2005/05/11 19:44:28 kohsuke Exp $
 package com.sun.xml.internal.bind.util;
 
 import org.xml.sax.Attributes;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
index ac3d3652529..68263be1a38 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * @(#)$Id: ValidationEventLocatorExImpl.java,v 1.1 2005/04/15 20:03:50 kohsuke Exp $
- */
-
-
 package com.sun.xml.internal.bind.util;
 
 import javax.xml.bind.helpers.ValidationEventLocatorImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/Which.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/Which.java
index 8e2217d4d07..acbdf16550e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/util/Which.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/util/Which.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * @(#)$Id: Which.java,v 1.1 2005/04/15 20:03:51 kohsuke Exp $
- */
-
-
 package com.sun.xml.internal.bind.util;
 
 import java.net.URL;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
index 1320dd64d8f..be27d0a0683 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java
@@ -22,12 +22,14 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -61,9 +63,9 @@ public final class ClassFactory {
      *
      * To avoid synchronization among threads, we use {@link ThreadLocal}.
      */
-    private static final ThreadLocal<Map<Class,Constructor>> tls = new ThreadLocal<Map<Class,Constructor>>() {
-        public Map<Class, Constructor> initialValue() {
-            return new WeakHashMap<Class,Constructor>();
+    private static final ThreadLocal<Map<Class, WeakReference<Constructor>>> tls = new ThreadLocal<Map<Class,WeakReference<Constructor>>>() {
+        public Map<Class,WeakReference<Constructor>> initialValue() {
+            return new WeakHashMap<Class,WeakReference<Constructor>>();
         }
     };
 
@@ -71,8 +73,11 @@ public final class ClassFactory {
      * Creates a new instance of the class but throw exceptions without catching it.
      */
     public static <T> T create0( final Class<T> clazz ) throws IllegalAccessException, InvocationTargetException, InstantiationException {
-        Map<Class,Constructor> m = tls.get();
-        Constructor<T> cons = m.get(clazz);
+        Map<Class,WeakReference<Constructor>> m = tls.get();
+        Constructor<T> cons = null;
+        WeakReference<Constructor> consRef = m.get(clazz);
+        if(consRef!=null)
+            cons = consRef.get();
         if(cons==null) {
             try {
                 cons = clazz.getDeclaredConstructor(emptyClass);
@@ -101,7 +106,7 @@ public final class ClassFactory {
                 }
             }
 
-            m.put(clazz,cons);
+            m.put(clazz,new WeakReference<Constructor>(cons));
         }
 
         return cons.newInstance(emptyObject);
@@ -142,11 +147,10 @@ public final class ClassFactory {
     /**
      *  Call a method in the factory class to get the object.
      */
-    public static Object create(final Method method) {
-        Object cons = null;
-        Throwable errorMsg = null;
+    public static Object create(Method method) {
+        Throwable errorMsg;
         try {
-            cons = method.invoke(null, emptyObject);
+            return method.invoke(null, emptyObject);
         } catch (InvocationTargetException ive) {
             Throwable target = ive.getTargetException();
 
@@ -170,13 +174,11 @@ public final class ClassFactory {
             logger.log(Level.INFO,"failed to create a new instance of "+method.getReturnType().getName(),eie);
             errorMsg = eie;
         }
-        if (errorMsg != null){
-            NoSuchMethodError exp;
-            exp = new NoSuchMethodError(errorMsg.getMessage());
-            exp.initCause(errorMsg);
-            throw exp;
-        }
-        return cons;
+
+        NoSuchMethodError exp;
+        exp = new NoSuchMethodError(errorMsg.getMessage());
+        exp.initCause(errorMsg);
+        throw exp;
     }
 
     /**
@@ -201,12 +203,4 @@ public final class ClassFactory {
         // and returns null
         return null;
     }
-
-    public static final Class[] COLLECTION_IMPL_CLASSES = new Class[] {
-        ArrayList.class,
-        LinkedList.class,
-        HashSet.class,
-        TreeSet.class,
-        Stack.class,
-    };
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java
index 0ef92f5979f..cdc33e23525 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2;
 
 import java.io.BufferedReader;
@@ -79,6 +80,10 @@ public class ContextFactory {
         if(allNillable==null)
             allNillable = false;
 
+        Boolean retainPropertyInfo = getPropertyValue(properties, JAXBRIContext.RETAIN_REFERENCE_TO_INFO, Boolean.class);
+        if(retainPropertyInfo==null)
+            retainPropertyInfo = false;
+
         Boolean xmlAccessorFactorySupport = getPropertyValue(properties,
            JAXBRIContext.XMLACCESSORFACTORY_SUPPORT,Boolean.class);
         if(xmlAccessorFactorySupport==null){
@@ -103,7 +108,7 @@ public class ContextFactory {
         }
 
         return createContext(classes,Collections.<TypeReference>emptyList(),
-                subclassReplacements,defaultNsUri,c14nSupport,ar,xmlAccessorFactorySupport,allNillable);
+                subclassReplacements,defaultNsUri,c14nSupport,ar,xmlAccessorFactorySupport,allNillable, retainPropertyInfo);
     }
 
     /**
@@ -123,9 +128,19 @@ public class ContextFactory {
     public static JAXBRIContext createContext( Class[] classes,
             Collection<TypeReference> typeRefs, Map<Class,Class> subclassReplacements,
             String defaultNsUri, boolean c14nSupport, RuntimeAnnotationReader ar,
-            boolean xmlAccessorFactorySupport, boolean allNillable) throws JAXBException {
-        return new JAXBContextImpl(classes,typeRefs,subclassReplacements,defaultNsUri,
-                c14nSupport,ar, xmlAccessorFactorySupport,allNillable);
+            boolean xmlAccessorFactorySupport, boolean allNillable, boolean retainPropertyInfo) throws JAXBException {
+
+        JAXBContextImpl.JAXBContextBuilder builder = new JAXBContextImpl.JAXBContextBuilder();
+        builder.setClasses(classes);
+        builder.setTypeRefs(typeRefs);
+        builder.setSubclassReplacements(subclassReplacements);
+        builder.setDefaultNsUri(defaultNsUri);
+        builder.setC14NSupport(c14nSupport);
+        builder.setAnnotationReader(ar);
+        builder.setXmlAccessorFactorySupport(xmlAccessorFactorySupport);
+        builder.setAllNillable(allNillable);
+        builder.setRetainPropertyInfo(retainPropertyInfo);
+        return builder.build();
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties
index 5cb7d62ebc5..25eab7c459c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties
@@ -43,4 +43,3 @@ NO_DEFAULT_CONSTRUCTOR_IN_INNER_CLASS = \
 
 INVALID_TYPE_IN_MAP = \
     Map contains a wrong type
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java
index 2d24ec987f4..6e7fe36991e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
index f0d7902b2ef..b9d02a6751f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.bytecode;
 
 import java.io.ByteArrayOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
index 1a4d8b6a8dc..853733a699c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
index da93afeb549..c478397de28 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
index ffc75d21062..a5cf1f63e2e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
index 0b3d42069d9..a1f035d12c2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
index 87697d02ab5..ab0ad431484 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java
index fa000cc4249..5f34cabb630 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java
@@ -29,7 +29,7 @@ class Init {
 
 
     static Quick[] getAll() {
-        return new Quick[] {new XmlTypeQuick(null, null), new XmlSchemaQuick(null, null), new XmlElementRefsQuick(null, null), new XmlValueQuick(null, null), new XmlElementDeclQuick(null, null), new XmlElementRefQuick(null, null), new XmlTransientQuick(null, null), new XmlElementQuick(null, null), new XmlAttributeQuick(null, null), new XmlRootElementQuick(null, null), new XmlEnumQuick(null, null)};
+        return new Quick[] {new XmlSchemaTypeQuick(null, null), new XmlElementDeclQuick(null, null), new XmlEnumQuick(null, null), new XmlTransientQuick(null, null), new XmlSchemaQuick(null, null), new XmlRootElementQuick(null, null), new XmlElementQuick(null, null), new XmlTypeQuick(null, null), new XmlElementRefQuick(null, null), new XmlElementRefsQuick(null, null), new XmlAttributeQuick(null, null), new XmlValueQuick(null, null)};
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
index 7c0c6601023..f20f9a37c5a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import com.sun.xml.internal.bind.v2.runtime.Location;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
index ad1a98e45c4..26c8728ddef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
@@ -29,6 +30,7 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -96,8 +98,13 @@ public class LocatableAnnotation implements InvocationHandler, Locatable, Locati
         try {
             if(method.getDeclaringClass()==Locatable.class)
                 return method.invoke(this,args);
-            else
-                return method.invoke(core,args);
+            if(Modifier.isStatic(method.getModifiers()))
+                // malicious code can pass in a static Method object.
+                // doing method.invoke() would end up executing it,
+                // so we need to protect against it.
+                throw new IllegalArgumentException();
+
+            return method.invoke(core,args);
         } catch (InvocationTargetException e) {
             if(e.getTargetException()!=null)
                 throw e.getTargetException();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
index c663d3a4fce..8bb76bc93e3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
index 77a9996763f..02dde87533d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties
@@ -25,4 +25,3 @@
 
 DUPLICATE_ANNOTATIONS = \
     Annotation "{0}" is present on both "{1}" and "{2}"
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
index ef6a2e6f119..b03e42a3ea6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
index 13a4b41c6d8..0ff2693f6a7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
index 4a7e9833cfd..209d855fe60 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
index 2fdf0bdc1f3..a9155d61c22 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.annotation;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java
new file mode 100644
index 00000000000..16c076abcdf
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.bind.v2.model.annotation;
+
+import java.lang.annotation.Annotation;
+import javax.xml.bind.annotation.XmlSchemaType;
+
+final class XmlSchemaTypeQuick
+    extends Quick
+    implements XmlSchemaType
+{
+
+    private final XmlSchemaType core;
+
+    public XmlSchemaTypeQuick(Locatable upstream, XmlSchemaType core) {
+        super(upstream);
+        this.core = core;
+    }
+
+    protected Annotation getAnnotation() {
+        return core;
+    }
+
+    protected Quick newInstance(Locatable upstream, Annotation core) {
+        return new XmlSchemaTypeQuick(upstream, ((XmlSchemaType) core));
+    }
+
+    public Class<XmlSchemaType> annotationType() {
+        return XmlSchemaType.class;
+    }
+
+    public String name() {
+        return core.name();
+    }
+
+    public Class type() {
+        return core.type();
+    }
+
+    public String namespace() {
+        return core.namespace();
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java
index a908f60f47f..07895f166a6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
index 278e1ffbbe3..2591db2669c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
index 819005ef948..1087d97a6c3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
index 81de52a27c5..56c28e7efe0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
index c97a2f8fab4..cd810e2bd18 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java
index 62d4984ee84..5333160951b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
index 6a89040b5a0..cd0d1ae2352 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
index d866d506a6d..694f7904c63 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
index d2f7d136e62..45d26304a6b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.XmlEnumValue;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
index 60dfa680279..42f9c191a89 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
index 47198f10244..d834f98d524 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import com.sun.xml.internal.bind.v2.model.impl.ModelBuilder;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java
index 6a243716c3c..a1dc9c5218c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
index 33cf00a8cac..8959181c45b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
index 30d2cd24ca4..185ef05e6c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Map;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
index 56fff25cdd5..b4d5e720b82 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java
index bf34310e655..c54014f0f05 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java
@@ -22,8 +22,10 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import javax.xml.namespace.QName;
 
 /**
@@ -31,20 +33,22 @@ import javax.xml.namespace.QName;
  *
  * Either {@link LeafInfo} or {@link ClassInfo}.
  *
- * TODO: better name.
+ * TODO: better ANYTYPE_NAME.
  *
  * @author Kohsuke Kawaguchi
  */
 public interface NonElement<T,C> extends TypeInfo<T,C> {
+    public static final QName ANYTYPE_NAME = new QName(WellKnownNamespace.XML_SCHEMA, "anyType");
+
     /**
-     * Gets the primary XML type name of the class.
+     * Gets the primary XML type ANYTYPE_NAME of the class.
      *
      * <p>
      * A Java type can be mapped to multiple XML types, but one of them is
      * considered "primary" and used when we generate a schema.
      *
      * @return
-     *      null if the object doesn't have an explicit type name (AKA anonymous.)
+     *      null if the object doesn't have an explicit type ANYTYPE_NAME (AKA anonymous.)
      */
     QName getTypeName();
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
index ed635205be2..229dfd3075f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
index 9367e0b82b3..1eb2d1fd515 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
index fefbbf5b53e..303c3159793 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.XmlMimeType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java
index 528c80eb168..1e44f96dcb7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.XmlList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
index 25afe96fa3f..ddf77ad1d70 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Collection;
@@ -114,5 +115,10 @@ public interface ReferencePropertyInfo<T,C> extends PropertyInfo<T,C> {
      */
     C getDOMHandler();
 
+    /**
+     * Returns true if this element is mandatory.
+     */
+    boolean isRequired();
+
     Adapter<T,C> getAdapter();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
index 091bdae9beb..d9049d828a4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Set;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
index ff917d9f2d0..a776e539401 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.bind.annotation.XmlIDREF;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
index 270c37164a0..91c58a86198 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import java.util.Map;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
index ec1f5aae5a7..aae7a7f6a76 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
index a1640f1cc79..4328c4a175e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
index 996652a473b..7b4e0fd342f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
index 8c3ff288d61..7afe228655a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.core;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java
index c64208bffad..e36ce8d4b32 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * The in-memory model of the JAXB-bound beans.
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
index dc9250d9fc1..547435e4a33 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java
@@ -22,12 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.namespace.QName;
 import javax.xml.bind.annotation.XmlIDREF;
 
-import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.runtime.Location;
 import com.sun.xml.internal.bind.v2.model.core.NonElement;
 import com.sun.xml.internal.bind.v2.model.core.TypeInfo;
@@ -50,7 +50,7 @@ class AnyTypeImpl<T,C> implements NonElement<T,C> {
     }
 
     public QName getTypeName() {
-        return name;
+        return ANYTYPE_NAME;
     }
 
     public T getType() {
@@ -79,5 +79,4 @@ class AnyTypeImpl<T,C> implements NonElement<T,C> {
         return true;
     }
 
-    private static final QName name = new QName(WellKnownNamespace.XML_SCHEMA,"anyType");
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
index 68f8d082035..54b24525c29 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.namespace.QName;
@@ -32,6 +33,7 @@ import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
 import com.sun.xml.internal.bind.v2.model.core.ArrayInfo;
 import com.sun.xml.internal.bind.v2.model.core.NonElement;
 import com.sun.xml.internal.bind.v2.runtime.Location;
+import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
 
 /**
  *
@@ -57,17 +59,22 @@ public class ArrayInfoImpl<TypeT,ClassDeclT,FieldT,MethodT>
                          Locatable upstream, TypeT arrayType) {
         super(builder, upstream);
         this.arrayType = arrayType;
-        this.itemType = builder.getTypeInfo(nav().getComponentType(arrayType), this);
+        TypeT componentType = nav().getComponentType(arrayType);
+        this.itemType = builder.getTypeInfo(componentType, this);
 
-        // TODO: check itemType.getTypeName()!=null and report an error
         QName n = itemType.getTypeName();
+        if(n==null) {
+            builder.reportError(new IllegalAnnotationException(Messages.ANONYMOUS_ARRAY_ITEM.format(
+                nav().getTypeName(componentType)),this));
+            n = new QName("#dummy"); // for error recovery
+        }
         this.typeName = calcArrayTypeName(n);
     }
 
     /**
      * Computes the type name of the array from that of the item type.
      */
-    public static final QName calcArrayTypeName(QName n) {
+    public static QName calcArrayTypeName(QName n) {
         String uri;
         if(n.getNamespaceURI().equals(WellKnownNamespace.XML_SCHEMA)) {
             TODO.checkSpec("this URI");
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
index ae466dda99f..b3ebe3e0d77 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.bind.annotation.XmlAttribute;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
index a3e4c6904a2..cd612f9be12 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
index 9a136e00590..2d5aeaf5c0b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.annotation.Annotation;
@@ -37,6 +38,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.AbstractList;
 
 import javax.xml.bind.annotation.XmlAccessOrder;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -66,7 +68,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 
 import com.sun.istack.internal.FinalArrayList;
-import com.sun.xml.internal.bind.annotation.XmlLocation;
+import com.sun.xml.internal.bind.annotation.OverrideAnnotationOf;
 import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
 import com.sun.xml.internal.bind.v2.model.annotation.MethodLocatable;
 import com.sun.xml.internal.bind.v2.model.core.ClassInfo;
@@ -75,10 +77,10 @@ import com.sun.xml.internal.bind.v2.model.core.ID;
 import com.sun.xml.internal.bind.v2.model.core.NonElement;
 import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
-import com.sun.xml.internal.bind.v2.model.core.TypeInfo;
 import com.sun.xml.internal.bind.v2.model.core.ValuePropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
 import com.sun.xml.internal.bind.v2.runtime.Location;
+import com.sun.xml.internal.bind.v2.util.EditDistance;
 
 
 /**
@@ -116,7 +118,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
      *
      * @see #isOrdered()
      */
-    private final String[] propOrder;
+    private /*final*/ String[] propOrder;
 
     /**
      * Lazily computed.
@@ -169,6 +171,12 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
             propOrder = DEFAULT_ORDER;
         }
 
+        // obtain XmlAccessorOrder and  set proporder (<xs:all> vs <xs:sequence>)
+        XmlAccessorOrder xao = reader().getClassAnnotation(XmlAccessorOrder.class, clazz, this);
+        if((xao != null) && (xao.value() == XmlAccessOrder.UNDEFINED)) {
+            propOrder = null;
+        }
+
         if(nav().isInterface(clazz)) {
             builder.reportError(new IllegalAnnotationException(
                 Messages.CANT_HANDLE_INTERFACE.format(nav().getClassName(clazz)), this ));
@@ -187,16 +195,15 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
                     msg.format(nav().getClassName(clazz)), this ));
             }
         }
-    }
+        }
 
     public ClassInfoImpl<T,C,F,M> getBaseClass() {
-        if(!baseClassComputed) {
-            baseClassComputed = true;
+        if (!baseClassComputed) {
             // compute the base class
             C s = nav().getSuperClass(clazz);
-            if(s==null || s==nav().asDecl(Object.class))
+            if(s==null || s==nav().asDecl(Object.class)) {
                 baseClass = null;
-            else {
+            } else {
                 NonElement<T,C> b = builder.getClassInfo(s, true, this);
                 if(b instanceof ClassInfoImpl) {
                     baseClass = (ClassInfoImpl<T,C,F,M>) b;
@@ -205,6 +212,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
                     baseClass = null;
                 }
             }
+            baseClassComputed = true;
         }
         return baseClass;
     }
@@ -290,8 +298,9 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
         } else {
             //sort them as specified
             PropertySorter sorter = new PropertySorter();
-            for (PropertyInfoImpl p : properties)
+            for (PropertyInfoImpl p : properties) {
                 sorter.checkedGet(p);   // have it check for errors
+            }
             Collections.sort(properties,sorter);
             sorter.checkUnusedProperties();
         }
@@ -340,13 +349,17 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
     }
 
     private void findFieldProperties(C c, XmlAccessType at) {
+
         // always find properties from the super class first
         C sc = nav().getSuperClass(c);
-        if(shouldRecurseSuperClass(sc))
+        if (shouldRecurseSuperClass(sc)) {
             findFieldProperties(sc,at);
+        }
 
         for( F f : nav().getDeclaredFields(c) ) {
             Annotation[] annotations = reader().getAllFieldAnnotations(f,this);
+            boolean isDummy = reader().hasFieldAnnotation(OverrideAnnotationOf.class, f);
+
             if( nav().isTransient(f) ) {
                 // it's an error for transient field to have any binding annotation
                 if(hasJAXBAnnotation(annotations))
@@ -357,12 +370,23 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
             if( nav().isStaticField(f) ) {
                 // static fields are bound only when there's explicit annotation.
                 if(hasJAXBAnnotation(annotations))
-                    addProperty(createFieldSeed(f),annotations);
+                    addProperty(createFieldSeed(f),annotations, false);
             } else {
                 if(at==XmlAccessType.FIELD
                 ||(at==XmlAccessType.PUBLIC_MEMBER && nav().isPublicField(f))
-                || hasJAXBAnnotation(annotations))
-                    addProperty(createFieldSeed(f),annotations);
+                || hasJAXBAnnotation(annotations)) {
+                    if (isDummy) {
+                        ClassInfo<T, C> top = getBaseClass();
+                        while ((top != null) && (top.getProperty("content") == null)) {
+                            top = top.getBaseClass();
+                        }
+                        DummyPropertyInfo prop = (DummyPropertyInfo) top.getProperty("content");
+                        PropertySeed seed = createFieldSeed(f);
+                        ((DummyPropertyInfo)prop).addType(createReferenceProperty(seed));
+                    } else {
+                        addProperty(createFieldSeed(f), annotations, false);
+                    }
+                }
                 checkFieldXmlLocation(f);
             }
         }
@@ -378,7 +402,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
         }
 
         return false;
-    }
+        }
 
     public PropertyInfo<T,C> getProperty(String name) {
         for( PropertyInfo<T,C> p: getProperties() ) {
@@ -467,7 +491,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
             Integer i = get(p.getName());
             if(i==null) {
                 // missing
-                if((p.kind().isOrdered))
+                if (p.kind().isOrdered)
                     builder.reportError(new IllegalAnnotationException(
                         Messages.PROPERTY_MISSING_FROM_ORDER.format(p.getName()),p));
 
@@ -500,8 +524,20 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
             for( int i=0; i<used.length; i++ )
                 if(used[i]==null) {
                     String unusedName = propOrder[i];
-                    builder.reportError(new IllegalAnnotationException(
-                        Messages.PROPERTY_ORDER_CONTAINS_UNUSED_ENTRY.format(unusedName),ClassInfoImpl.this));
+                    String nearest = EditDistance.findNearest(unusedName, new AbstractList<String>() {
+                        public String get(int index) {
+                            return properties.get(index).getName();
+                        }
+
+                        public int size() {
+                            return properties.size();
+                        }
+                    });
+                    boolean isOverriding = (i > (properties.size()-1)) ? false : properties.get(i).hasAnnotation(OverrideAnnotationOf.class);
+                    if (!isOverriding) {
+                        builder.reportError(new IllegalAnnotationException(
+                        Messages.PROPERTY_ORDER_CONTAINS_UNUSED_ENTRY.format(unusedName,nearest),ClassInfoImpl.this));
+                    }
                 }
         }
     }
@@ -536,9 +572,9 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
         }
     }
 
-    private static final class DupliateException extends Exception {
+    private static final class DuplicateException extends Exception {
         final Annotation a1,a2;
-        public DupliateException(Annotation a1, Annotation a2) {
+        public DuplicateException(Annotation a1, Annotation a2) {
             this.a1 = a1;
             this.a2 = a2;
         }
@@ -628,6 +664,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
             XmlElementRefs.class,   // 7
             XmlAnyElement.class,    // 8
             XmlMixed.class,         // 9
+            OverrideAnnotationOf.class,// 10
         };
 
         HashMap<Class,Integer> m = ANNOTATION_NUMBER_MAP;
@@ -645,10 +682,10 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
         }
     }
 
-    private void checkConflict(Annotation a, Annotation b) throws DupliateException {
+    private void checkConflict(Annotation a, Annotation b) throws DuplicateException {
         assert b!=null;
         if(a!=null)
-            throw new DupliateException(a,b);
+            throw new DuplicateException(a,b);
     }
 
     /**
@@ -663,7 +700,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
      *      {@code seed.readAllAnnotation()}, but taken as a parameter
      *      because the caller should know it already.
      */
-    private void addProperty( PropertySeed<T,C,F,M> seed, Annotation[] annotations ) {
+    private void addProperty( PropertySeed<T,C,F,M> seed, Annotation[] annotations, boolean dummy ) {
         // since typically there's a very few annotations on a method,
         // this runs faster than checking for each annotation via readAnnotation(A)
 
@@ -681,6 +718,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
         XmlElementRefs r2 = null;
         XmlAnyElement xae = null;
         XmlMixed mx = null;
+        OverrideAnnotationOf ov = null;
 
         // encountered secondary annotations are accumulated into a bit mask
         int secondaryAnnotations = 0;
@@ -700,6 +738,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
                 case 7:     checkConflict(r2 ,ann); r2  = (XmlElementRefs) ann; break;
                 case 8:     checkConflict(xae,ann); xae = (XmlAnyElement) ann; break;
                 case 9:     checkConflict(mx, ann); mx  = (XmlMixed) ann; break;
+                case 10:    checkConflict(ov, ann); ov  = (OverrideAnnotationOf) ann; break;
                 default:
                     // secondary annotations
                     secondaryAnnotations |= (1<<(index-20));
@@ -732,7 +771,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
                 group = PropertyGroup.ELEMENT;
                 groupCount++;
             }
-            if(r1!=null || r2!=null || xae!=null || mx!=null) {
+            if(r1!=null || r2!=null || xae!=null || mx!=null || ov != null) {
                 group = PropertyGroup.ELEMENT_REF;
                 groupCount++;
             }
@@ -837,7 +876,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
                     err.get(0), err.get(1) ));
 
             // recover by ignoring this property
-        } catch( DupliateException e ) {
+        } catch( DuplicateException e ) {
             // both are present
             builder.reportError(new IllegalAnnotationException(
                 Messages.DUPLICATE_ANNOTATIONS.format(e.a1.annotationType().getName()),
@@ -940,7 +979,7 @@ class ClassInfoImpl<T,C,F,M> extends TypeInfoImpl<T,C,F,M>
                     System.arraycopy(sa,0,r,ga.length,sa.length);
                 }
 
-                addProperty(createAccessorSeed(getter, setter),r);
+                addProperty(createAccessorSeed(getter, setter), r, false);
             }
         }
         // done with complete pairs
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasUIDefaults.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java
similarity index 77%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasUIDefaults.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java
index c774d796c1c..48fc7599eb8 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasUIDefaults.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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
@@ -22,15 +22,14 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.swingx.designer.utils;
 
-import javax.swing.UIDefaults;
+package com.sun.xml.internal.bind.v2.model.impl;
 
 /**
- * HasUIDefaults - A tagging interface for any class that has UIDefaults
+ * {@link PropertyInfo} that allows to add additional elements to the collection.
  *
- * @author Created by Jasper Potts (Jun 22, 2007)
+ * @author Martin Grebac
  */
-public interface HasUIDefaults {
-    public UIDefaults getUiDefaults();
+public interface DummyPropertyInfo<T, C, F, M> {
+    void addType(PropertyInfoImpl<T, C, F, M> info);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
index 1faed72178b..e6d7e5e3706 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.bind.annotation.XmlElementWrapper;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
index ddcae966794..f3aba381662 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
index 3ed31649067..cfeb6433f70 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.AbstractList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
index b13521e1507..940b7604709 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import com.sun.xml.internal.bind.v2.model.core.EnumConstant;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
index 3e0967e8c8a..b7989abe229 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
index 6c7bdd842d4..880d5eee710 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
index 2c8fa37525b..49eacf90f09 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
index e8c9874899b..bcaf9543d4f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
index eaea94fa6e4..555341a8063 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Arrays;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java
index 7a49bf2741d..b2743c64772 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.text.MessageFormat;
@@ -56,7 +57,7 @@ enum Messages {
     SUPER_CLASS_HAS_WILDCARD, // 0 args
     INVALID_ATTRIBUTE_WILDCARD_TYPE, // 1 arg
     PROPERTY_MISSING_FROM_ORDER, // 1 arg
-    PROPERTY_ORDER_CONTAINS_UNUSED_ENTRY, // 1 arg
+    PROPERTY_ORDER_CONTAINS_UNUSED_ENTRY, // 2 args
 
     INVALID_XML_ENUM_VALUE, // 2 arg
     FAILED_TO_INITIALE_DATATYPE_FACTORY, // 0 args
@@ -72,7 +73,7 @@ enum Messages {
     SIMPLE_TYPE_IS_REQUIRED, // 1 arg
     PROPERTY_COLLISION, // 1 arg
     INVALID_IDREF, // 1 arg
-    INVALID_XML_ELEMENT_REF, // 0 arg
+    INVALID_XML_ELEMENT_REF, // 1 arg
     NO_XML_ELEMENT_DECL, // 2 args
     XML_ELEMENT_WRAPPER_ON_NON_COLLECTION, // 1 arg
 
@@ -84,20 +85,31 @@ enum Messages {
 
     INCOMPATIBLE_API_VERSION, // 2 args
     INCOMPATIBLE_API_VERSION_MUSTANG, // 2 args
+    RUNNING_WITH_1_0_RUNTIME, // 2 args
 
     MISSING_JAXB_PROPERTIES, // 1arg
     TRANSIENT_FIELD_NOT_BINDABLE, // 1 arg
     THERE_MUST_BE_VALUE_IN_XMLVALUE, // 1 arg
     UNMATCHABLE_ADAPTER, // 2 args
+    ANONYMOUS_ARRAY_ITEM, // 1 arg
 
     ACCESSORFACTORY_INSTANTIATION_EXCEPTION, // 2 arg
     ACCESSORFACTORY_ACCESS_EXCEPTION, // 2 arg
     CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR, // 2 arg
     CUSTOM_ACCESSORFACTORY_FIELD_ERROR, // 2 arg
+        XMLGREGORIANCALENDAR_INVALID, // 1 arg
+        XMLGREGORIANCALENDAR_SEC, // 0 arg
+        XMLGREGORIANCALENDAR_MIN, // 0 arg
+        XMLGREGORIANCALENDAR_HR, // 0 arg
+        XMLGREGORIANCALENDAR_DAY, // 0 arg
+        XMLGREGORIANCALENDAR_MONTH, // 0 arg
+        XMLGREGORIANCALENDAR_YEAR, // 0 arg
+        XMLGREGORIANCALENDAR_TIMEZONE, // 0 arg
     ;
 
     private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
 
+    @Override
     public String toString() {
         return format();
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
index 929ba29db8f..00810496ebc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties
@@ -51,7 +51,7 @@ DUPLICATE_ENTRY_IN_PROP_ORDER = \
     Property "{0}" appears more than once in the @XmlType.propOrder
 
 DUPLICATE_PROPERTIES = \
-    There are two properties named "{0}" 
+    There are two properties named "{0}"
 
 XML_ELEMENT_MAPPING_ON_NON_IXMLELEMENT_METHOD = \
     The {0} method has @XmlElementMapping on it, but it doesn''t return a sub-type of JAXBElement.
@@ -61,7 +61,7 @@ SCOPE_IS_NOT_COMPLEXTYPE = \
 
 CONFLICTING_XML_ELEMENT_MAPPING = \
     The element name '{'{0}'}'{1} has more than one mapping.
-    
+
 REFERENCE_TO_NON_ELEMENT = \
     Property {0} is annotated with @XmlReference but doesn''t refer to an element.
 
@@ -81,8 +81,8 @@ PROPERTY_MISSING_FROM_ORDER = \
     Property {0} is present but not specified in @XmlType.propOrder
 
 PROPERTY_ORDER_CONTAINS_UNUSED_ENTRY = \
-    Property {0} appears in @XmlType.propOrder, but no such property exists
-    
+    Property {0} appears in @XmlType.propOrder, but no such property exists. Maybe you meant {1}?
+
 INVALID_XML_ENUM_VALUE = \
     "{0}" is not a valid value for {1}.
 
@@ -121,7 +121,7 @@ INVALID_IDREF = \
     XmlIDREF property is referencing a type "{0}" that doesn''t have an XmlID property.
 
 INVALID_XML_ELEMENT_REF = \
-    XmlElementRef points to a non-existent class.
+    Invalid @XmlElementRef : Type "{0}" or any of it's subclasses are not known to this context.
 
 NO_XML_ELEMENT_DECL = \
     There''s no ObjectFactory with an @XmlElementDecl for the element '{'{0}'}'{1}.
@@ -161,8 +161,12 @@ INCOMPATIBLE_API_VERSION_MUSTANG = \
     Use the endorsed directory mechanism to place jaxb-api.jar in the bootstrap classloader. \
     (See http://java.sun.com/j2se/1.5.0/docs/guide/standards/)
 
+RUNNING_WITH_1_0_RUNTIME = \
+    You are trying to run JAXB 2.0 runtime (from {1}) but you have old JAXB 1.0 runtime earlier \
+    in the classpath (at {0}) Please remove the JAXB 1.0 runtime for 2.0 runtime to work correctly.
+
 UNMATCHABLE_ADAPTER = \
-    Adapter {0} is not applicable to the field type {1}. 
+    Adapter {0} is not applicable to the field type {1}.
 
 ACCESSORFACTORY_INSTANTIATION_EXCEPTION = \
     Unable to create instance of AccessorFactory, {0} for class {1}.
@@ -175,4 +179,30 @@ CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = \
 
 CUSTOM_ACCESSORFACTORY_FIELD_ERROR = \
     Custom AccessorFactory, {0}, is reporting an error accessing a field. {1}
- 
+
+ANONYMOUS_ARRAY_ITEM = \
+    {0} is used as an array component type, so it cannot be anonymous.
+
+XMLGREGORIANCALENDAR_INVALID = \
+    Invalid set of fields set for XMLGregorianCalendar type {0}.
+
+XMLGREGORIANCALENDAR_SEC = \
+    Seconds not set.
+
+XMLGREGORIANCALENDAR_MIN = \
+    Minutes not set.
+
+XMLGREGORIANCALENDAR_HR = \
+    Hour not set.
+
+XMLGREGORIANCALENDAR_DAY = \
+    Day not set.
+
+XMLGREGORIANCALENDAR_MONTH = \
+    Month not set.
+
+XMLGREGORIANCALENDAR_YEAR = \
+    Year not set.
+
+XMLGREGORIANCALENDAR_TIMEZONE = \
+    Timezone not set.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
index 1baa96d3702..922af0c2d8d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.HashMap;
@@ -50,6 +51,7 @@ import com.sun.xml.internal.bind.v2.model.core.TypeInfo;
 import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
+import com.sun.xml.internal.bind.WhiteSpaceProcessor;
 
 
 /**
@@ -164,6 +166,22 @@ public class ModelBuilder<T,C,F,M> {
         }
     }
 
+    /**
+     * Makes sure that we don't have conflicting 1.0 runtime,
+     * and report an error if we do.
+     */
+    static {
+        try {
+            WhiteSpaceProcessor.isWhiteSpace("xyz");
+        } catch (NoSuchMethodError e) {
+            // we seem to be getting 1.0 runtime
+            throw new LinkageError( Messages.RUNNING_WITH_1_0_RUNTIME.format(
+                Which.which(WhiteSpaceProcessor.class),
+                Which.which(ModelBuilder.class)
+            ));
+        }
+    }
+
     protected TypeInfoSetImpl<T,C,F,M> createTypeInfoSet() {
         return new TypeInfoSetImpl<T,C,F,M>(nav,reader,BuiltinLeafInfoImpl.createLeaves(nav));
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
index 93c2c252908..e829172a1f4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Collection;
@@ -103,8 +104,6 @@ abstract class PropertyInfoImpl<T,C,F,M>
         }
         this.expectedMimeType = mt;
         this.inlineBinary = seed.hasAnnotation(XmlInlineBinaryData.class);
-        this.schemaType = Util.calcSchemaType(reader(),seed,parent.clazz,
-                getIndividualType(),this);
 
         T t = seed.getRawType();
 
@@ -147,6 +146,8 @@ abstract class PropertyInfoImpl<T,C,F,M>
         }
 
         this.id = calcId();
+        this.schemaType = Util.calcSchemaType(reader(),seed,parent.clazz,
+                getIndividualType(),this);
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
index 422e7e6ecd1..a6134192bc5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
index d45cc5a531c..de2e4b32a79 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Collections;
@@ -47,6 +48,7 @@ import com.sun.xml.internal.bind.v2.model.core.ReferencePropertyInfo;
 import com.sun.xml.internal.bind.v2.model.core.WildcardMode;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
+import java.util.Iterator;
 
 /**
  * Implementation of {@link ReferencePropertyInfo}.
@@ -55,19 +57,24 @@ import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
  */
 class ReferencePropertyInfoImpl<T,C,F,M>
     extends ERPropertyInfoImpl<T,C,F,M>
-    implements ReferencePropertyInfo<T,C>
+    implements ReferencePropertyInfo<T,C>, DummyPropertyInfo<T, C, F, M>
 {
     /**
      * Lazily computed.
      * @see #getElements()
      */
     private Set<Element<T,C>> types;
+    private Set<PropertyInfoImpl<T,C,F,M>> subTypes = new LinkedHashSet<PropertyInfoImpl<T,C,F,M>>();
 
     private final boolean isMixed;
 
     private final WildcardMode wildcard;
     private final C domHandler;
-
+    /**
+     * Lazily computed.
+     * @see #isRequired()
+     */
+    private Boolean isRequired;
 
     public ReferencePropertyInfoImpl(
         ClassInfoImpl<T,C,F,M> classInfo,
@@ -75,7 +82,7 @@ class ReferencePropertyInfoImpl<T,C,F,M>
 
         super(classInfo, seed);
 
-        isMixed = seed.readAnnotation(XmlMixed.class)!=null;
+        isMixed = seed.readAnnotation(XmlMixed.class) != null;
 
         XmlAnyElement xae = seed.readAnnotation(XmlAnyElement.class);
         if(xae==null) {
@@ -131,6 +138,8 @@ class ReferencePropertyInfoImpl<T,C,F,M>
                 ann = null;
         }
 
+        isRequired = !isCollection();  // this is by default, to remain compatible with 2.1
+
         if(ann!=null) {
             Navigator<T,C,F,M> nav = nav();
             AnnotationReader<T,C,F,M> reader = reader();
@@ -147,6 +156,11 @@ class ReferencePropertyInfoImpl<T,C,F,M>
                 else
                     yield = addAllSubtypes(type);
 
+                // essentially "isRequired &= isRequired(r)" except that we'd like to skip evaluating isRequird(r)
+                // if the value is already false.
+                if(isRequired && !isRequired(r))
+                    isRequired = false;
+
                 if(last && !yield) {
                     // a reference didn't produce any type.
                     // diagnose the problem
@@ -159,7 +173,7 @@ class ReferencePropertyInfoImpl<T,C,F,M>
                         ));
                     } else {
                         parent.builder.reportError(new IllegalAnnotationException(
-                            Messages.INVALID_XML_ELEMENT_REF.format(),this));
+                            Messages.INVALID_XML_ELEMENT_REF.format(type),this));
                     }
 
                     // reporting one error would do.
@@ -171,9 +185,101 @@ class ReferencePropertyInfoImpl<T,C,F,M>
             }
         }
 
+        Iterator<PropertyInfoImpl<T,C,F,M>> i = subTypes.iterator();
+        while (i.hasNext()) {
+
+            ReferencePropertyInfoImpl<T,C,F,M> info = (ReferencePropertyInfoImpl<T, C, F, M>) i.next();
+            PropertySeed sd = info.seed;
+            refs = sd.readAnnotation(XmlElementRefs.class);
+            ref = sd.readAnnotation(XmlElementRef.class);
+
+            if (refs != null && ref != null) {
+                parent.builder.reportError(new IllegalAnnotationException(
+                        Messages.MUTUALLY_EXCLUSIVE_ANNOTATIONS.format(
+                        nav().getClassName(parent.getClazz())+'#'+seed.getName(),
+                        ref.annotationType().getName(), refs.annotationType().getName()),
+                        ref, refs ));
+            }
+
+            if (refs != null) {
+                ann = refs.value();
+            } else {
+                if (ref != null) {
+                    ann = new XmlElementRef[]{ref};
+                } else {
+                    ann = null;
+                }
+            }
+
+            if (ann != null) {
+                Navigator<T,C,F,M> nav = nav();
+                AnnotationReader<T,C,F,M> reader = reader();
+
+                final T defaultType = nav.ref(XmlElementRef.DEFAULT.class);
+                final C je = nav.asDecl(JAXBElement.class);
+
+                for( XmlElementRef r : ann ) {
+                    boolean yield;
+                    T type = reader.getClassValue(r,"type");
+                    if (type.equals(defaultType)) {
+                        type = nav.erasure(getIndividualType());
+                    }
+                    if (nav.getBaseClass(type,je) != null) {
+                        yield = addGenericElement(r, info);
+
+                    } else {
+                        yield = addAllSubtypes(type);
+                    }
+
+                    if(last && !yield) {
+                        // a reference didn't produce any type.
+                        // diagnose the problem
+                        if(type.equals(nav.ref(JAXBElement.class))) {
+                            // no XmlElementDecl
+                            parent.builder.reportError(new IllegalAnnotationException(
+                                Messages.NO_XML_ELEMENT_DECL.format(
+                                    getEffectiveNamespaceFor(r), r.name()),
+                                this
+                            ));
+                        } else {
+                            parent.builder.reportError(new IllegalAnnotationException(
+                                Messages.INVALID_XML_ELEMENT_REF.format(),this));
+                        }
+
+                        // reporting one error would do.
+                        // often the element ref field is using @XmlElementRefs
+                        // to point to multiple JAXBElements.
+                        // reporting one error for each @XmlElemetnRef is thus often redundant.
+                        return;
+                    }
+                }
+            }
+        }
+
         types = Collections.unmodifiableSet(types);
     }
 
+    public boolean isRequired() {
+        if(isRequired==null)
+            calcTypes(false);
+        return isRequired;
+    }
+
+    /**
+     * If we find out that we are working with 2.1 API, remember the fact so that
+     * we don't waste time generating exceptions every time we call {@link #isRequired(XmlElementRef)}.
+     */
+    private static boolean is2_2 = true;
+
+    /**
+     * Reads the value of {@code XmlElementRef.required()}.
+     *
+     * If we are working as 2.1 RI, this defaults to true.
+     */
+    private boolean isRequired(XmlElementRef ref) {
+        return true;
+    }
+
     /**
      * @return
      *      true if the reference yields at least one type
@@ -184,6 +290,13 @@ class ReferencePropertyInfoImpl<T,C,F,M>
         return addGenericElement(parent.owner.getElementInfo(parent.getClazz(),new QName(nsUri,r.name())));
     }
 
+    private boolean addGenericElement(XmlElementRef r, ReferencePropertyInfoImpl<T,C,F,M> info) {
+        String nsUri = info.getEffectiveNamespaceFor(r);
+        ElementInfo ei = parent.owner.getElementInfo(info.parent.getClazz(), new QName(nsUri, r.name()));
+        types.add(ei);
+        return true;
+    }
+
     private String getEffectiveNamespaceFor(XmlElementRef r) {
         String nsUri = r.namespace();
 
@@ -244,6 +357,7 @@ class ReferencePropertyInfoImpl<T,C,F,M>
     }
 
 
+    @Override
     protected void link() {
         super.link();
 
@@ -254,6 +368,9 @@ class ReferencePropertyInfoImpl<T,C,F,M>
 
     }
 
+    public final void addType(PropertyInfoImpl<T,C,F,M> info) {
+        subTypes.add(info);
+    }
 
     public final boolean isMixed() {
         return isMixed;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
index 1528d202a2b..455e0a4b6c1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.LinkedHashSet;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
index c84fc8d6f41..53ec275426e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
index 13232ebad18..12eafb4ac4c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
index 272759a89cb..44e825a380c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
index 3b8e1db63fb..0c2e02c9ecc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.awt.*;
@@ -56,6 +57,7 @@ import javax.activation.MimeType;
 import javax.activation.MimeTypeParseException;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
 import javax.xml.bind.ValidationEvent;
 import javax.xml.bind.helpers.ValidationEventImpl;
 import javax.xml.datatype.DatatypeConfigurationException;
@@ -174,6 +176,7 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
     public static final RuntimeBuiltinLeafInfoImpl<String> STRING = new StringImpl<String>(String.class,
         createXS("string"),
         createXS("normalizedString"),
+        createXS("anyURI"),
         createXS("token"),
         createXS("language"),
         createXS("Name"),
@@ -282,12 +285,29 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
                     return v.toExternalForm();
                 }
             },
+            new StringImpl<URI>(URI.class, createXS("string")) {
+                public URI parse(CharSequence text) throws SAXException {
+                    try {
+                        return new URI(text.toString());
+                    } catch (URISyntaxException e) {
+                        UnmarshallingContext.getInstance().handleError(e);
+                        return null;
+                    }
+                }
+
+                public String print(URI v) {
+                    return v.toString();
+                }
+            },
             new StringImpl<Class>(Class.class, createXS("string")) {
                 public Class parse(CharSequence text) throws SAXException {
                     TODO.checkSpec("JSR222 Issue #42");
                     try {
                         String name = WhiteSpaceProcessor.trim(text).toString();
-                        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+                        ClassLoader cl = UnmarshallingContext.getInstance().classLoader;
+                        if(cl==null)
+                            cl = Thread.currentThread().getContextClassLoader();
+
                         if(cl!=null)
                             return cl.loadClass(name);
                         else
@@ -319,7 +339,11 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
                         // normally images can be content-sniffed.
                         // so the MIME type check will only make us slower and draconian, both of which
                         // JAXB 2.0 isn't interested.
-                        return ImageIO.read(is);
+                        try {
+                            return ImageIO.read(is);
+                        } finally {
+                            is.close();
+                        }
                     } catch (IOException e) {
                         UnmarshallingContext.getInstance().handleError(e);
                         return null;
@@ -366,8 +390,10 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
                         Iterator<ImageWriter> itr = ImageIO.getImageWritersByMIMEType(mimeType);
                         if(itr.hasNext()) {
                             ImageWriter w = itr.next();
-                            w.setOutput(ImageIO.createImageOutputStream(imageData));
+                            ImageOutputStream os = ImageIO.createImageOutputStream(imageData);
+                            w.setOutput(os);
                             w.write(convertToBufferedImage(v));
+                            os.close();
                             w.dispose();
                         } else {
                             // no encoder
@@ -383,7 +409,7 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
                         // TODO: proper error reporting
                         throw new RuntimeException(e);
                     }
-                    Base64Data bd = xs.getCachedBase64DataInstance();
+                    Base64Data bd = new Base64Data();
                     imageData.set(bd,mimeType);
                     return bd;
                 }
@@ -398,7 +424,7 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
                 }
 
                 public Base64Data print(DataHandler v) {
-                    Base64Data bd = XMLSerializer.getInstance().getCachedBase64DataInstance();
+                    Base64Data bd = new Base64Data();
                     bd.set(v);
                     return bd;
                 }
@@ -419,7 +445,7 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
 
                 public Base64Data print(Source v) {
                     XMLSerializer xs = XMLSerializer.getInstance();
-                    Base64Data bd = xs.getCachedBase64DataInstance();
+                    Base64Data bd = new Base64Data();
 
                     String contentType = xs.getXMIMEContentType();
                     MimeType mt = null;
@@ -486,21 +512,27 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
 
                     QName type = xs.getSchemaType();
                     if(type!=null) {
-                        String format = xmlGregorianCalendarFormatString.get(type);
-                        if(format!=null)
-                            return format(format,cal);
-                        // TODO:
-                        // we need to think about how to report an error where @XmlSchemaType
-                        // didn't take effect. a general case is when a transducer isn't even
-                        // written to look at that value.
-                    }
-
+                                                try {
+                                                        checkXmlGregorianCalendarFieldRef(type, cal);
+                                                        String format = xmlGregorianCalendarFormatString.get(type);
+                                                        if(format!=null)
+                                                                return format(format,cal);
+                                                        // TODO:
+                                                        // we need to think about how to report an error where @XmlSchemaType
+                                                        // didn't take effect. a general case is when a transducer isn't even
+                                                        // written to look at that value.
+                                                } catch (javax.xml.bind.MarshalException e){
+                                                        //-xs.handleError(e);
+                                                        System.out.println(e.toString());
+                                                        return "";
+                                                }
+                                        }
                     return cal.toXMLFormat();
                 }
 
                 public XMLGregorianCalendar parse(CharSequence lexical) throws SAXException {
                     try {
-                        return datatypeFactory.newXMLGregorianCalendar(lexical.toString());
+                        return datatypeFactory.newXMLGregorianCalendar(lexical.toString().trim()); // (.trim() - issue 396)
                     } catch (Exception e) {
                         UnmarshallingContext.getInstance().handleError(e);
                         return null;
@@ -611,7 +643,7 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
 
                 public Base64Data print(byte[] v) {
                     XMLSerializer w = XMLSerializer.getInstance();
-                    Base64Data bd = w.getCachedBase64DataInstance();
+                    Base64Data bd = new Base64Data();
                     String mimeType = w.getXMIMEContentType();
                     bd.set(v,mimeType);
                     return bd;
@@ -737,21 +769,6 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
                     w.getNamespaceContext().declareNamespace(v.getNamespaceURI(),v.getPrefix(),false);
                 }
             },
-            new StringImpl<URI>(URI.class, createXS("anyURI")) {
-                public URI parse(CharSequence text) throws SAXException {
-                    TODO.checkSpec("JSR222 Issue #42");
-                    try {
-                        return new URI(text.toString());
-                    } catch (URISyntaxException e) {
-                        UnmarshallingContext.getInstance().handleError(e);
-                        return null;
-                    }
-                }
-
-                public String print(URI v) {
-                    return v.toString();
-                }
-            },
             new StringImpl<Duration>(Duration.class,  createXS("duration")) {
                 public String print(Duration duration) {
                     return duration.toString();
@@ -821,6 +838,61 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
         }
     }
 
+        private static void checkXmlGregorianCalendarFieldRef(QName type,
+                XMLGregorianCalendar cal)throws javax.xml.bind.MarshalException{
+                StringBuffer buf = new StringBuffer();
+                int bitField = xmlGregorianCalendarFieldRef.get(type);
+                final int l = 0x1;
+                int pos = 0;
+                while (bitField != 0x0){
+                        int bit = bitField & l;
+                        bitField >>>= 4;
+                        pos++;
+
+                        if (bit == 1) {
+                                switch(pos){
+                                        case 1:
+                                                if (cal.getSecond() == DatatypeConstants.FIELD_UNDEFINED){
+                                                        buf.append("  " + Messages.XMLGREGORIANCALENDAR_SEC);
+                                                }
+                                                break;
+                                        case 2:
+                                                if (cal.getMinute() == DatatypeConstants.FIELD_UNDEFINED){
+                                                        buf.append("  " + Messages.XMLGREGORIANCALENDAR_MIN);
+                                                }
+                                                break;
+                                        case 3:
+                                                if (cal.getHour() == DatatypeConstants.FIELD_UNDEFINED){
+                                                        buf.append("  " + Messages.XMLGREGORIANCALENDAR_HR);
+                                                }
+                                                break;
+                                        case 4:
+                                                if (cal.getDay() == DatatypeConstants.FIELD_UNDEFINED){
+                                                        buf.append("  " + Messages.XMLGREGORIANCALENDAR_DAY);
+                                                }
+                                                break;
+                                        case 5:
+                                                if (cal.getMonth() == DatatypeConstants.FIELD_UNDEFINED){
+                                                        buf.append("  " + Messages.XMLGREGORIANCALENDAR_MONTH);
+                                                }
+                                                break;
+                                        case 6:
+                                                if (cal.getYear() == DatatypeConstants.FIELD_UNDEFINED){
+                                                        buf.append("  " + Messages.XMLGREGORIANCALENDAR_YEAR);
+                                                }
+                                                break;
+                                        case 7:  // ignore timezone setting
+                                                break;
+                                }
+                        }
+                }
+                if (buf.length() > 0){
+                        throw new javax.xml.bind.MarshalException(
+                         Messages.XMLGREGORIANCALENDAR_INVALID.format(type.getLocalPart())
+                         + buf.toString());
+                }
+        }
+
     /**
      * Format string for the {@link XMLGregorianCalendar}.
      */
@@ -839,6 +911,30 @@ public abstract class RuntimeBuiltinLeafInfoImpl<T> extends BuiltinLeafInfoImpl<
         m.put(DatatypeConstants.GMONTHDAY,  "--%M-%D" +"%z");
     }
 
+        /**
+         * Field designations for XMLGregorianCalendar format string.
+         * sec          0x0000001
+         * min          0x0000010
+         * hrs          0x0000100
+         * day          0x0001000
+         * month        0x0010000
+         * year         0x0100000
+         * timezone 0x1000000
+         */
+        private static final Map<QName, Integer> xmlGregorianCalendarFieldRef =
+                new HashMap<QName, Integer>();
+        static {
+                Map<QName, Integer> f = xmlGregorianCalendarFieldRef;
+                f.put(DatatypeConstants.DATETIME,   0x1111111);
+                f.put(DatatypeConstants.DATE,       0x1111000);
+                f.put(DatatypeConstants.TIME,       0x1000111);
+                f.put(DatatypeConstants.GDAY,       0x1001000);
+                f.put(DatatypeConstants.GMONTH,     0x1010000);
+                f.put(DatatypeConstants.GYEAR,      0x1100000);
+                f.put(DatatypeConstants.GYEARMONTH, 0x1110000);
+                f.put(DatatypeConstants.GMONTHDAY,  0x1011000);
+        }
+
     /**
      * {@link RuntimeBuiltinLeafInfoImpl} for {@link UUID}.
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
index fce327ac853..4e92f905a2d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.io.IOException;
@@ -33,12 +34,14 @@ import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.bind.JAXBException;
 
 import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.bind.AccessorFactory;
+import com.sun.xml.internal.bind.AccessorFactoryImpl;
+import com.sun.xml.internal.bind.XmlAccessorFactory;
 import com.sun.xml.internal.bind.annotation.XmlLocation;
 import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.v2.ClassFactory;
@@ -48,18 +51,15 @@ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeClassInfo;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeElement;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeValuePropertyInfo;
+import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
 import com.sun.xml.internal.bind.v2.runtime.Location;
 import com.sun.xml.internal.bind.v2.runtime.Name;
 import com.sun.xml.internal.bind.v2.runtime.Transducer;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
-import com.sun.xml.internal.bind.AccessorFactory;
-import com.sun.xml.internal.bind.AccessorFactoryImpl;
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
-import com.sun.xml.internal.bind.XmlAccessorFactory;
-import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
 
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
@@ -90,7 +90,8 @@ class RuntimeClassInfoImpl extends ClassInfoImpl<Type,Class,Field,Method>
         AccessorFactory accFactory = null;
 
         // user providing class to be used.
-        if (((RuntimeModelBuilder)builder).context.xmlAccessorFactorySupport){
+        JAXBContextImpl context = ((RuntimeModelBuilder) builder).context;
+        if (context!=null && context.xmlAccessorFactorySupport){
             factoryAnn = findXmlAccessorFactoryAnnotation(clazz);
 
             if (factoryAnn != null) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
index f8840bec2cb..24a4cf61d9b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
index 99b07e6b261..2226ef42352 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
index 9e7dd64a0c5..61606cdbf6c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
index edf1dfb4e0e..45e52c1a984 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
index f272a293b8a..6b35e3c190f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
index 06b25a2f5d3..59615463d7a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
@@ -50,7 +51,10 @@ import com.sun.xml.internal.bind.v2.runtime.SchemaTypeTransducer;
 import com.sun.xml.internal.bind.v2.runtime.Transducer;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
+import com.sun.istack.internal.Nullable;
 
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
+import javax.xml.namespace.QName;
 import org.xml.sax.SAXException;
 
 /**
@@ -66,8 +70,9 @@ import org.xml.sax.SAXException;
 public class RuntimeModelBuilder extends ModelBuilder<Type,Class,Field,Method> {
     /**
      * The {@link JAXBContextImpl} for which the model is built.
+     * Null when created for reflection.
      */
-    public final JAXBContextImpl context;
+    public final @Nullable JAXBContextImpl context;
 
     public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader annotationReader, Map<Class, Class> subclassReplacements, String defaultNamespaceRemap) {
         super(annotationReader, Navigator.REFLECTION, subclassReplacements, defaultNamespaceRemap);
@@ -144,13 +149,19 @@ public class RuntimeModelBuilder extends ModelBuilder<Type,Class,Field,Method> {
         if(src.inlineBinaryData())
             t = new InlineBinaryTransducer(t);
 
-        if(src.getSchemaType()!=null)
+        if(src.getSchemaType()!=null) {
+            if (src.getSchemaType().equals(createXSSimpleType())) {
+                return RuntimeBuiltinLeafInfoImpl.STRING;
+            }
             t = new SchemaTypeTransducer(t,src.getSchemaType());
+        }
 
         return t;
     }
 
-
+    private static QName createXSSimpleType() {
+        return new QName(WellKnownNamespace.XML_SCHEMA,"anySimpleType");
+    }
 
     /**
      * Transducer implementation for ID.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
index b96c46fe3af..1b80609e4e3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
index 709d047b993..80380c279e6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
index 2dd76c6f364..98322bcb120 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
index f428ebde42e..12f387d6c14 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
index 2676694c762..1021a20ce5c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Collections;
@@ -87,8 +88,8 @@ abstract class SingleTypePropertyInfoImpl<T,C,F,M>
     public void link() {
         super.link();
 
-        if(!type.isSimpleType() && id()!=ID.IDREF) {
-            parent.builder.reportError(new IllegalAnnotationException(
+        if (!(NonElement.ANYTYPE_NAME.equals(type.getTypeName()) || type.isSimpleType() || id()==ID.IDREF)) {
+                parent.builder.reportError(new IllegalAnnotationException(
                 Messages.SIMPLE_TYPE_IS_REQUIRED.format(),
                 seed
             ));
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
index 1766502b99b..6a9d7d226fd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
index 9c966a5e150..2e8881e7f77 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
index 4f4d46434ee..00c45496e5c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java
index d205e72b721..c09198625d8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import javax.activation.MimeType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
index 38478671734..455b51fa60c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.impl;
 
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
index 47efff30125..c6d6d9db179 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.lang.reflect.GenericArrayType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
index 596a0310e02..da7a3f49f4f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.util.Collection;
@@ -386,6 +387,9 @@ public interface Navigator<T,C,F,M> {
      *
      * This is only used to improve the error diagnostics, so
      * it's OK to fail to detect some inner classes as such.
+     *
+     * Note that this method should return false for nested classes
+     * (static classes.)
      */
     boolean isInnerClass(C clazz);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
index 8b71c4a65ea..6b19deb62ca 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.lang.reflect.MalformedParameterizedTypeException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
index 6f59f82874b..7531a4d3810 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.lang.reflect.Array;
@@ -143,7 +144,7 @@ public final class ReflectionNavigator implements Navigator<Type,Class,Field,Met
 
         Type replace( TypeVariable v ) {
             for(int i=0; i<params.length; i++)
-                if(params[i]==v)
+                if(params[i].equals(v))
                     return args[i];
             return v;   // this is a free variable
         }
@@ -548,7 +549,7 @@ public final class ReflectionNavigator implements Navigator<Type,Class,Field,Met
     }
 
     public boolean isInnerClass(Class clazz) {
-        return clazz.getEnclosingClass()!=null;
+        return clazz.getEnclosingClass()!=null && !Modifier.isStatic(clazz.getModifiers());
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java
index b0205e9c77d..64cea495d87 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.lang.reflect.GenericArrayType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java
index 8e001d14565..b7350d3906a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.nav;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
index 62994a1fc0a..412d2367812 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
index 641b27c531c..efd529edeab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
index 8438e9c0dc7..b7d08dd889d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
index 73093432217..10b0b1fd691 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
index 183fd78d69f..21f518fcdd2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
index cf114d1d8e1..dbc8574443b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
index 33eb07a52b4..bf6046c4eed 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
index 7e78aa015fc..9837573bb74 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
index ad351f9f045..980fcda632c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
index 7a94c5cb747..4069bbc07c7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
index ec5d58ce717..d05b7eaf9a1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
index 6f20325e385..d71074d4f37 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
index 87610b707c0..698f95b4308 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
index db24c7f78ec..be146fc61d7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
index 15fc6514d87..fbd9176eae7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
index 0724b71c0ba..cbc0622fc97 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
index 3f7e5792a2a..d51902c34c4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
index 974854c048a..33f1d583b62 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.model.runtime;
 
 import java.lang.reflect.Type;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
index 45cfb381d88..d5b14b748ed 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * The specialization of {@link com.sun.xml.internal.bind.v2.model.core} for the runtime.
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java
index e62f76e7630..5b6f28d5f10 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * <h1>The JAXB 2.0 runtime</h1>.
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
index 3777a56c560..fe8a0f46c6e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -51,7 +52,9 @@ import org.xml.sax.SAXException;
  *
  * @author Kohsuke Kawaguchi
  */
-final class AnyTypeBeanInfo extends JaxBeanInfo<Object> {
+final class AnyTypeBeanInfo extends JaxBeanInfo<Object> implements AttributeAccessor {
+
+    private boolean nilIncluded = false;
 
     public AnyTypeBeanInfo(JAXBContextImpl grammar,RuntimeTypeInfo anyTypeInfo) {
         super(grammar, anyTypeInfo, Object.class, new QName(WellKnownNamespace.XML_SCHEMA,"anyType"), false, true, false);
@@ -113,7 +116,9 @@ final class AnyTypeBeanInfo extends JaxBeanInfo<Object> {
             String local = a.getLocalName();
             String name = a.getName();
             if(local==null) local = name;
-
+            if (uri.equals(WellKnownNamespace.XML_SCHEMA_INSTANCE) && ("nil".equals(local))) {
+                nilIncluded = true;
+            }
             if(name.startsWith("xmlns")) continue;// DOM reports ns decls as attributes
 
             target.attribute(uri,local,a.getValue());
@@ -163,4 +168,8 @@ final class AnyTypeBeanInfo extends JaxBeanInfo<Object> {
     private static final W3CDomHandler domHandler = new W3CDomHandler();
     private static final DomLoader domLoader = new DomLoader(domHandler);
     private final XsiTypeLoader substLoader = new XsiTypeLoader(this);
+
+    public boolean isNilIncluded() {
+        return nilIncluded;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java
index 2c3b4042b57..4fe71b330d9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -54,14 +55,18 @@ final class ArrayBeanInfoImpl  extends JaxBeanInfo {
 
     private final Class itemType;
     private final JaxBeanInfo itemBeanInfo;
-    private final Loader loader;
+    private Loader loader;
 
     public ArrayBeanInfoImpl(JAXBContextImpl owner, RuntimeArrayInfo rai) {
         super(owner,rai,rai.getType(), rai.getTypeName(), false, true, false);
         this.itemType = jaxbType.getComponentType();
         this.itemBeanInfo = owner.getOrCreate(rai.getItemType());
+    }
 
-        loader = new ArrayLoader(owner);
+    @Override
+    protected void link(JAXBContextImpl grammar) {
+        getLoader(grammar,false);
+        super.link(grammar);
     }
 
     private final class ArrayLoader extends Loader implements Receiver {
@@ -119,7 +124,7 @@ final class ArrayBeanInfoImpl  extends JaxBeanInfo {
             if(item==null) {
                 target.writeXsiNilTrue();
             } else {
-                target.childAsXsiType(item,"arrayItem",itemBeanInfo);
+                target.childAsXsiType(item,"arrayItem",itemBeanInfo, false);
             }
             target.endElement();
         }
@@ -168,6 +173,9 @@ final class ArrayBeanInfoImpl  extends JaxBeanInfo {
     }
 
     public final Loader getLoader(JAXBContextImpl context, boolean typeSubstitutionCapable) {
+        if(loader==null)
+            loader = new ArrayLoader(context);
+
         // type substitution not possible
         return loader;
     }
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/HasUIStyle.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java
similarity index 79%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/HasUIStyle.java
rename to jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java
index e73b43405d9..f7f6179df74 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/HasUIStyle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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
@@ -22,15 +22,14 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.synthmodel;
+
+package com.sun.xml.internal.bind.v2.runtime;
 
 /**
- * HasUIStyle - A marker interface for all classes that have a UIStyle
  *
- * @author  Richard Bair
- * @author  Jasper Potts
+ * @author snajper
  */
-public interface HasUIStyle {
+public interface AttributeAccessor<BeanT> {
 
-    public UIStyle getStyle();
+    public boolean isNilIncluded();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
index bc103aaec53..f5a8b277b33 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java
@@ -151,6 +151,8 @@ public class BinderImpl<XmlNode> extends Binder<XmlNode> {
     }
 
     public XmlNode getXMLNode(Object jaxbObject) {
+        if(jaxbObject==null)
+            throw new IllegalArgumentException();
         AssociationMap.Entry<XmlNode> e = assoc.byPeer(jaxbObject);
         if(e==null)     return null;
         return e.element();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
index 380d2ba2b9b..a2b6b00e6f8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
index c95ca8c7855..fa2c8049641 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import javax.xml.bind.JAXBException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
index 3688773b12e..183a6333fca 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -132,7 +133,7 @@ final class BridgeImpl<T> extends InternalBridge<T> {
         if(value==null) {
             out.writeXsiNilTrue();
         } else {
-            out.childAsXsiType(value,null,bi);
+            out.childAsXsiType(value,null,bi,false);
         }
         out.endElement();
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
index d9ae488c030..c8995c71499 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -36,6 +37,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.bind.ValidationEvent;
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.helpers.ValidationEventImpl;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -44,6 +46,7 @@ import com.sun.istack.internal.FinalArrayList;
 import com.sun.xml.internal.bind.Util;
 import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.v2.ClassFactory;
+import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.model.core.ID;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeClassInfo;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
@@ -65,7 +68,9 @@ import org.xml.sax.helpers.LocatorImpl;
  *
  * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
  */
-public final class ClassBeanInfoImpl<BeanT> extends JaxBeanInfo<BeanT> {
+public final class ClassBeanInfoImpl<BeanT> extends JaxBeanInfo<BeanT> implements AttributeAccessor<BeanT> {
+
+    private boolean isNilIncluded = false;
 
     /**
      * Properties of this bean class but not its ancestor classes.
@@ -288,17 +293,22 @@ public final class ClassBeanInfoImpl<BeanT> extends JaxBeanInfo<BeanT> {
 
     public void serializeRoot(BeanT bean, XMLSerializer target) throws SAXException, IOException, XMLStreamException {
         if(tagName==null) {
-            target.reportError(
-                    new ValidationEventImpl(
-                            ValidationEvent.ERROR,
-                            Messages.UNABLE_TO_MARSHAL_NON_ELEMENT.format(bean.getClass().getName()),
-                            null,
-                            null));
+            Class beanClass = bean.getClass();
+            String message;
+
+            if (beanClass.isAnnotationPresent(XmlRootElement.class)) {
+                message = Messages.UNABLE_TO_MARSHAL_UNBOUND_CLASS.format(beanClass.getName());
+            } else {
+                message = Messages.UNABLE_TO_MARSHAL_NON_ELEMENT.format(beanClass.getName());
+            }
+
+            target.reportError(new ValidationEventImpl(ValidationEvent.ERROR,message,null, null));
         }
         else {
             target.startElement(tagName,bean);
             target.childAsSoleContent(bean,null);
             target.endElement();
+            target.currentProperty.remove();
         }
     }
 
@@ -306,18 +316,30 @@ public final class ClassBeanInfoImpl<BeanT> extends JaxBeanInfo<BeanT> {
         if(superClazz!=null)
             superClazz.serializeBody(bean,target);
         try {
-            for( Property<BeanT> p : properties )
+            for( Property<BeanT> p : properties ) {
+                target.currentProperty.set(p);
                 p.serializeBody(bean,target, null);
+            }
         } catch (AccessorException e) {
             target.reportError(null,e);
         }
     }
 
     public void serializeAttributes(BeanT bean, XMLSerializer target) throws SAXException, IOException, XMLStreamException {
-        try {
-            for( AttributeProperty<BeanT> p : attributeProperties )
+        for( AttributeProperty<BeanT> p : attributeProperties )
+            try {
+                final Property parentProperty = target.getCurrentProperty();
+                target.currentProperty.set(p);
                 p.serializeAttributes(bean,target);
+                target.currentProperty.set(parentProperty);
+                if (p.attName.equals(WellKnownNamespace.XML_SCHEMA_INSTANCE, "nil")) {
+                    isNilIncluded = true;
+                }
+            } catch (AccessorException e) {
+                target.reportError(null,e);
+            }
 
+        try {
             if(inheritedAttWildcard!=null) {
                 Map<QName,String> map = inheritedAttWildcard.get(bean);
                 target.attWildcardAsAttributes(map,null);
@@ -329,8 +351,12 @@ public final class ClassBeanInfoImpl<BeanT> extends JaxBeanInfo<BeanT> {
 
     public void serializeURIs(BeanT bean, XMLSerializer target) throws SAXException {
         try {
-            for( Property<BeanT> p : uriProperties )
+            final Property parentProperty = target.getCurrentProperty();
+            for( Property<BeanT> p : uriProperties ) {
+                target.currentProperty.set(p);
                 p.serializeURIs(bean,target);
+            }
+            target.currentProperty.set(parentProperty);
 
             if(inheritedAttWildcard!=null) {
                 Map<QName,String> map = inheritedAttWildcard.get(bean);
@@ -369,4 +395,8 @@ public final class ClassBeanInfoImpl<BeanT> extends JaxBeanInfo<BeanT> {
     private static final AttributeProperty[] EMPTY_PROPERTIES = new AttributeProperty[0];
 
     private static final Logger logger = Util.getClassLogger();
+
+    public boolean isNilIncluded() {
+        return isNilIncluded;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
index 3fc280695e9..aad5875c536 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java
index a381562ab57..183db3b24d9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.util.HashMap;
@@ -96,13 +97,13 @@ public abstract class Coordinator implements ErrorHandler, ValidationEventHandle
     /**
      * The {@link Coordinator} in charge before this {@link Coordinator}.
      */
-    private Coordinator old;
+    private Object old;
 
     /**
      * A 'pointer' to a {@link Coordinator} that keeps track of the currently active {@link Coordinator}.
      * Having this improves the runtime performance.
      */
-    private Coordinator[] table;
+    private Object[] table;
 
     /**
      * When we set {@link #table} to null, record who did it.
@@ -148,13 +149,13 @@ public abstract class Coordinator implements ErrorHandler, ValidationEventHandle
     }
 
     public static Coordinator _getInstance() {
-        return activeTable.get()[0];
+        return (Coordinator) activeTable.get()[0];
     }
 
     // this much is necessary to avoid calling get and set twice when we push.
-    private static final ThreadLocal<Coordinator[]> activeTable = new ThreadLocal<Coordinator[]>() {
-        public Coordinator[] initialValue() {
-            return new Coordinator[1];
+    private static final ThreadLocal<Object[]> activeTable = new ThreadLocal<Object[]>() {
+        public Object[] initialValue() {
+            return new Object[1];
         }
     };
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java
index e29725fc32f..8e7ea88825c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.util.HashSet;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java
index 66217615052..39612b47519 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
@@ -37,6 +38,7 @@ import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeElementInfo;
+import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.property.Property;
 import com.sun.xml.internal.bind.v2.runtime.property.PropertyFactory;
 import com.sun.xml.internal.bind.v2.runtime.property.UnmarshallerChain;
@@ -136,7 +138,7 @@ public final class ElementBeanInfoImpl extends JaxBeanInfo<JAXBElement> {
                     if(value==null) {
                         target.writeXsiNilTrue();
                     } else {
-                        target.childAsXsiType(value,"value",tbi);
+                        target.childAsXsiType(value,"value",tbi, false);
                     }
                     target.endElement();
                 } else {
@@ -172,6 +174,11 @@ public final class ElementBeanInfoImpl extends JaxBeanInfo<JAXBElement> {
 
             public void wrapUp() {
             }
+
+            public RuntimePropertyInfo getInfo() {
+                return property.getInfo();
+            }
+
         };
     }
 
@@ -224,6 +231,10 @@ public final class ElementBeanInfoImpl extends JaxBeanInfo<JAXBElement> {
             state.target = state.backup;
             state.backup = null;
 
+            if (state.nil) {
+                e.setNil(true);
+            }
+
             if(o!=null)
                 // if the value is a leaf type, it's often already set to the element
                 // through Accessor.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
index fec5064813f..d9f1aada88c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
index ef787816bca..dcccde12c9c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.lang.annotation.Annotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
index e1a07feab78..8e6d9dc2109 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
index aab952d3be1..2377d036a01 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
index 930b502b42a..b6ad7562ba9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
index 0fd9cb0904b..ae130d4dc3d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java
@@ -40,6 +40,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 import javax.xml.bind.Binder;
 import javax.xml.bind.DatatypeConverter;
@@ -68,7 +70,6 @@ import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
 
 import com.sun.istack.internal.NotNull;
-import com.sun.istack.internal.Nullable;
 import com.sun.istack.internal.Pool;
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -122,7 +123,6 @@ import org.xml.sax.helpers.DefaultHandler;
 /**
  * This class provides the implementation of JAXBContext.
  *
- * @version $Revision$
  */
 public final class JAXBContextImpl extends JAXBRIContext {
 
@@ -215,6 +215,10 @@ public final class JAXBContextImpl extends JAXBRIContext {
      */
     public final boolean allNillable;
 
+    /**
+     * Store properties, so that they can be recovered in the run (is here because of JSON encoding of Jersey).
+     */
+    public final boolean retainPropertyInfo;
 
     private WeakReference<RuntimeTypeInfoSet> typeInfoSetCache;
 
@@ -240,41 +244,38 @@ public final class JAXBContextImpl extends JAXBRIContext {
      * @param xmlAccessorFactorySupport
      *      Use custom com.sun.xml.internal.bind.v2.runtime.reflect.Accessor implementation.
      */
-    public JAXBContextImpl(Class[] classes, Collection<TypeReference> typeRefs,
-        Map<Class,Class> subclassReplacements, String defaultNsUri, boolean c14nSupport,
-        @Nullable RuntimeAnnotationReader ar, boolean xmlAccessorFactorySupport, boolean allNillable) throws JAXBException {
-        // initialize datatype converter with ours
-        DatatypeConverter.setDatatypeConverter(DatatypeConverterImpl.theInstance);
+    public JAXBContextImpl(JAXBContextBuilder builder) throws JAXBException {
 
-        if(defaultNsUri==null)      defaultNsUri="";    // fool-proof
+        this.defaultNsUri = builder.defaultNsUri;
+        this.retainPropertyInfo = builder.retainPropertyInfo;
+        this.annotaitonReader = builder.annotationReader;
+        this.subclassReplacements = builder.subclassReplacements;
+        this.c14nSupport = builder.c14nSupport;
+        this.classes = builder.classes;
+        this.xmlAccessorFactorySupport = builder.xmlAccessorFactorySupport;
+        this.allNillable = builder.allNillable;
 
-        if(ar==null)
-            ar = new RuntimeInlineAnnotationReader();
+        Collection<TypeReference> typeRefs = builder.typeRefs;
 
-        if(subclassReplacements==null)  subclassReplacements=Collections.emptyMap();
-        if(typeRefs==null)              typeRefs=Collections.emptyList();
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            public Void run() {
+                DatatypeConverter.setDatatypeConverter(DatatypeConverterImpl.theInstance);
+                return null;
+            }
+        });
 
-        this.annotaitonReader = ar;
-        this.subclassReplacements = subclassReplacements;
-
-        boolean fastBoot;
+        boolean fastB;
         try {
-            fastBoot = Boolean.getBoolean(JAXBContextImpl.class.getName()+".fastBoot");
+            fastB = Boolean.getBoolean(JAXBContextImpl.class.getName()+".fastBoot");
         } catch (SecurityException e) {
-            fastBoot = false;
+            fastB = false;
         }
-        this.fastBoot = fastBoot;
+        this.fastBoot = fastB;
 
-        this.defaultNsUri = defaultNsUri;
-        this.c14nSupport = c14nSupport;
-        this.xmlAccessorFactorySupport = xmlAccessorFactorySupport;
-        this.allNillable = allNillable;
-        this.classes = new Class[classes.length];
         System.arraycopy(classes,0,this.classes,0,classes.length);
 
         RuntimeTypeInfoSet typeSet = getTypeInfoSet();
 
-
         // at least prepare the empty table so that we don't have to check for null later
         elements.put(null,new LinkedHashMap<QName, ElementBeanInfoImpl>());
 
@@ -378,7 +379,6 @@ public final class JAXBContextImpl extends JAXBRIContext {
             bridges.put(tr,bridge);
         }
 
-
         this.nameList = nameBuilder.conclude();
 
         for (JaxBeanInfo bi : beanInfos.values())
@@ -396,10 +396,19 @@ public final class JAXBContextImpl extends JAXBRIContext {
         return hasSwaRef;
     }
 
+    public RuntimeTypeInfoSet getRuntimeTypeInfoSet() {
+        try {
+            return getTypeInfoSet();
+        } catch (IllegalAnnotationsException e) {
+            // impossible, once the model is constructred
+            throw new AssertionError(e);
+        }
+    }
+
     /**
      * Creates a {@link RuntimeTypeInfoSet}.
      */
-    private RuntimeTypeInfoSet getTypeInfoSet() throws IllegalAnnotationsException {
+    public RuntimeTypeInfoSet getTypeInfoSet() throws IllegalAnnotationsException {
 
         // check cache
         if(typeInfoSetCache!=null) {
@@ -473,7 +482,7 @@ public final class JAXBContextImpl extends JAXBRIContext {
     }
 
     protected JaxBeanInfo getOrCreate( RuntimeArrayInfo ai ) {
-        JaxBeanInfo abi = beanInfos.get(ai.getType());
+        JaxBeanInfo abi = beanInfos.get(ai);
         if(abi!=null)   return abi;
 
         abi = new ArrayBeanInfoImpl(this,ai);
@@ -879,6 +888,13 @@ public final class JAXBContextImpl extends JAXBRIContext {
         return new QName(bi.getElementNamespaceURI(o),bi.getElementLocalName(o));
     }
 
+    public QName getElementName(Class o) throws JAXBException {
+        JaxBeanInfo bi = getBeanInfo(o,true);
+        if(!bi.isElement())
+            return null;
+        return new QName(bi.getElementNamespaceURI(o),bi.getElementLocalName(o));
+    }
+
     public Bridge createBridge(TypeReference ref) {
         return bridges.get(ref);
     }
@@ -925,6 +941,7 @@ public final class JAXBContextImpl extends JAXBRIContext {
         return pkg.getImplementationVersion();
     }
 
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder(Which.which(getClass()) + " Build-Id: " + getBuildId());
         buf.append("\nClasses known to this context:\n");
@@ -976,8 +993,9 @@ public final class JAXBContextImpl extends JAXBRIContext {
         System.arraycopy(classes,0,newList,0,classes.length);
         newList[classes.length] = clazz;
 
-        return new JAXBContextImpl(newList,bridges.keySet(),subclassReplacements,
-        defaultNsUri,c14nSupport,annotaitonReader, xmlAccessorFactorySupport, allNillable);
+        JAXBContextBuilder builder = new JAXBContextBuilder(this);
+        builder.setClasses(newList);
+        return builder.build();
     }
 
     private static final Comparator<QName> QNAME_COMPARATOR = new Comparator<QName>() {
@@ -988,4 +1006,100 @@ public final class JAXBContextImpl extends JAXBRIContext {
             return lhs.getNamespaceURI().compareTo(rhs.getNamespaceURI());
         }
     };
+
+    public static class JAXBContextBuilder {
+
+        private boolean retainPropertyInfo = false;
+        private String defaultNsUri = "";
+        private @NotNull RuntimeAnnotationReader annotationReader = new RuntimeInlineAnnotationReader();
+        private @NotNull Map<Class,Class> subclassReplacements = Collections.emptyMap();
+        private boolean c14nSupport = false;
+        private Class[] classes;
+        private Collection<TypeReference> typeRefs;
+        private boolean xmlAccessorFactorySupport = false;
+        private boolean allNillable;
+
+        public JAXBContextBuilder() {};
+
+        public JAXBContextBuilder(JAXBContextImpl baseImpl) {
+            this.retainPropertyInfo = baseImpl.retainPropertyInfo;
+            this.defaultNsUri = baseImpl.defaultNsUri;
+            this.annotationReader = baseImpl.annotaitonReader;
+            this.subclassReplacements = baseImpl.subclassReplacements;
+            this.c14nSupport = baseImpl.c14nSupport;
+            this.classes = baseImpl.classes;
+            this.typeRefs = baseImpl.bridges.keySet();
+            this.xmlAccessorFactorySupport = baseImpl.xmlAccessorFactorySupport;
+            this.allNillable = baseImpl.allNillable;
+        }
+
+        public JAXBContextBuilder setRetainPropertyInfo(boolean val) {
+            this.retainPropertyInfo = val;
+            return this;
+        }
+
+        public JAXBContextBuilder setC14NSupport(boolean val) {
+            this.c14nSupport = val;
+            return this;
+        }
+
+        public JAXBContextBuilder setXmlAccessorFactorySupport(boolean val) {
+            this.xmlAccessorFactorySupport = val;
+            return this;
+        }
+
+        public JAXBContextBuilder setDefaultNsUri(String val) {
+            this.defaultNsUri = val;
+            return this;
+        }
+
+        public JAXBContextBuilder setAllNillable(boolean val) {
+            this.allNillable = val;
+            return this;
+        }
+
+        public JAXBContextBuilder setClasses(Class[] val) {
+            this.classes = val;
+            return this;
+        }
+
+        public JAXBContextBuilder setAnnotationReader(RuntimeAnnotationReader val) {
+            this.annotationReader = val;
+            return this;
+        }
+
+        public JAXBContextBuilder setSubclassReplacements(Map<Class,Class> val) {
+            this.subclassReplacements = val;
+            return this;
+        }
+
+        public JAXBContextBuilder setTypeRefs(Collection<TypeReference> val) {
+            this.typeRefs = val;
+            return this;
+        }
+
+        public JAXBContextImpl build() throws JAXBException {
+
+            // fool-proof
+            if (this.defaultNsUri == null) {
+                this.defaultNsUri = "";
+            }
+
+            if (this.subclassReplacements == null) {
+                this.subclassReplacements = Collections.emptyMap();
+            }
+
+            if (this.annotationReader == null) {
+                this.annotationReader = new RuntimeInlineAnnotationReader();
+            }
+
+            if (this.typeRefs == null) {
+                this.typeRefs = Collections.<TypeReference>emptyList();
+            }
+
+            return new JAXBContextImpl(this);
+        }
+
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
index 5b89cba63cd..9aa7693b26f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java
@@ -414,33 +414,54 @@ public abstract class JaxBeanInfo<BeanT> {
      */
     protected final void setLifecycleFlags() {
         try {
-            for( Method m : jaxbType.getDeclaredMethods() ) {
-                String name = m.getName();
-                if(name.equals("beforeUnmarshal")) {
-                    if(match(m,unmarshalEventParams)) {
-                        cacheLifecycleMethod(m, FLAG_HAS_BEFORE_UNMARSHAL_METHOD);
+            Class<BeanT> jt = jaxbType;
+
+            if (lcm == null) {
+                lcm = new LifecycleMethods();
+            }
+
+            while (jt != null) {
+                for (Method m : jt.getDeclaredMethods()) {
+                    String name = m.getName();
+
+                    if (lcm.beforeUnmarshal == null) {
+                        if (name.equals("beforeUnmarshal")) {
+                            if (match(m, unmarshalEventParams)) {
+                                cacheLifecycleMethod(m, FLAG_HAS_BEFORE_UNMARSHAL_METHOD);
+                            }
+                        }
                     }
-                } else
-                if(name.equals("afterUnmarshal")) {
-                    if(match(m,unmarshalEventParams)) {
-                        cacheLifecycleMethod(m, FLAG_HAS_AFTER_UNMARSHAL_METHOD);
+
+                    if (lcm.afterUnmarshal == null) {
+                        if (name.equals("afterUnmarshal")) {
+                            if (match(m, unmarshalEventParams)) {
+                                cacheLifecycleMethod(m, FLAG_HAS_AFTER_UNMARSHAL_METHOD);
+                            }
+                        }
                     }
-                } else
-                if(name.equals("beforeMarshal")) {
-                    if(match(m,marshalEventParams)) {
-                        cacheLifecycleMethod(m, FLAG_HAS_BEFORE_MARSHAL_METHOD);
+
+                    if (lcm.beforeMarshal == null) {
+                        if (name.equals("beforeMarshal")) {
+                            if (match(m, marshalEventParams)) {
+                                cacheLifecycleMethod(m, FLAG_HAS_BEFORE_MARSHAL_METHOD);
+                            }
+                        }
                     }
-                } else
-                if(name.equals("afterMarshal")) {
-                    if(match(m,marshalEventParams)) {
-                        cacheLifecycleMethod(m, FLAG_HAS_AFTER_MARSHAL_METHOD);
+
+                    if (lcm.afterMarshal == null) {
+                        if (name.equals("afterMarshal")) {
+                            if (match(m, marshalEventParams)) {
+                                cacheLifecycleMethod(m, FLAG_HAS_AFTER_MARSHAL_METHOD);
+                            }
+                        }
                     }
                 }
+                jt = (Class<BeanT>) jt.getSuperclass();
             }
-        } catch(SecurityException e) {
+        } catch (SecurityException e) {
             // this happens when we don't have enough permission.
-            logger.log( Level.WARNING, Messages.UNABLE_TO_DISCOVER_EVENTHANDLER.format(
-                jaxbType.getName(), e ));
+            logger.log(Level.WARNING, Messages.UNABLE_TO_DISCOVER_EVENTHANDLER.format(
+                    jaxbType.getName(), e));
         }
     }
 
@@ -512,9 +533,9 @@ public abstract class JaxBeanInfo<BeanT> {
         try {
             m.invoke(child,unm,parent);
         } catch (IllegalAccessException e) {
-            UnmarshallingContext.getInstance().handleError(e);
+            UnmarshallingContext.getInstance().handleError(e, false);
         } catch (InvocationTargetException e) {
-            UnmarshallingContext.getInstance().handleError(e);
+            UnmarshallingContext.getInstance().handleError(e, false);
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
index 2f434a456fe..4dda70092ef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
index 23008cc17f1..46e20a1f22b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.lang.reflect.Method;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java
index 4670926bdc7..3db7036d64b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
index 820c7f67b46..ae478f3b8bb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java
@@ -53,6 +53,7 @@ import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.validation.Schema;
 import javax.xml.validation.ValidatorHandler;
+import javax.xml.namespace.NamespaceContext;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
@@ -131,9 +132,6 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
      *      non-null if the marshaller is working inside {@link BinderImpl}.
      */
     public MarshallerImpl( JAXBContextImpl c, AssociationMap assoc ) {
-        // initialize datatype converter with ours
-        DatatypeConverter.setDatatypeConverter(DatatypeConverterImpl.theInstance);
-
         context = c;
         serializer = new XMLSerializer(this);
         c14nSupport = context.c14nSupport;
@@ -149,6 +147,16 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
         return context;
     }
 
+    /**
+     * Marshals to {@link OutputStream} with the given in-scope namespaces
+     * taken into account.
+     *
+     * @since 2.1.5
+     */
+    public void marshal(Object obj, OutputStream out, NamespaceContext inscopeNamespace) throws JAXBException {
+        write(obj, createWriter(out), new StAXPostInitAction(inscopeNamespace,serializer));
+    }
+
     public void marshal(Object obj, XMLStreamWriter writer) throws JAXBException {
         write(obj, XMLStreamWriterOutput.create(writer,context), new StAXPostInitAction(writer,serializer));
     }
@@ -252,7 +260,7 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
                     if(obj==null)
                         serializer.writeXsiNilTrue();
                     else
-                        serializer.childAsXsiType(obj,"root",bi);
+                        serializer.childAsXsiType(obj,"root",bi, false);
                 }
                 serializer.endElement();
                 postwrite();
@@ -426,14 +434,18 @@ public /*to make unit tests happy*/ final class MarshallerImpl extends AbstractM
 
         if(encoding.equals("UTF-8")) {
             Encoded[] table = context.getUTF8NameTable();
+            final UTF8XmlOutput out;
             if(isFormattedOutput())
-                return new IndentingUTF8XmlOutput(os,indent,table);
+                out = new IndentingUTF8XmlOutput(os,indent,table);
             else {
                 if(c14nSupport)
-                    return new C14nXmlOutput(os,table,context.c14nSupport);
+                    out = new C14nXmlOutput(os,table,context.c14nSupport);
                 else
-                    return new UTF8XmlOutput(os,table);
+                    out = new UTF8XmlOutput(os,table);
             }
+            if(header!=null)
+                out.setHeader(header);
+            return out;
         }
 
         try {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java
index 1f4be623ea3..d636a721087 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.text.MessageFormat;
@@ -42,6 +43,7 @@ enum Messages {
     DANGLING_IDREF, // 1 arg
     NULL_OUTPUT_RESOLVER, // 0 args
     UNABLE_TO_MARSHAL_NON_ELEMENT, // 1 arg
+    UNABLE_TO_MARSHAL_UNBOUND_CLASS, // 1 arg
     UNSUPPORTED_PROPERTY, // 1 arg
     NULL_PROPERTY_NAME, // 0 args
     MUST_BE_X, // 3 args
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties
index 79d34b7e597..a57e7c0bbf9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties
@@ -24,13 +24,13 @@
 #
 
 NOT_MARSHALLABLE = \
-	the object parameter to marshal() is not marshallable
+        the object parameter to marshal() is not marshallable
 
 UNSUPPORTED_RESULT = \
-	unsupported javax.xml.parser.transform.Result parameter
+        unsupported javax.xml.parser.transform.Result parameter
 
 UNSUPPORTED_ENCODING = \
-	unsupported encoding: {0}
+        unsupported encoding: {0}
 
 ILLEGAL_PARAMETER = \
     Illegal "{0}" parameter: {1}
@@ -48,17 +48,17 @@ UNRECOGNIZED_ELEMENT_NAME = \
     The tag name "{0}" is not known to this JAXBContext.
 
 TYPE_MISMATCH = \
-	"{1}" property of a "{0}" object contains an object of type "{2}" but this is not allowed. \
-	See javadoc of this property for what this property can accept.
+        "{1}" property of a "{0}" object contains an object of type "{2}" but this is not allowed. \
+        See javadoc of this property for what this property can accept.
 
 MISSING_OBJECT = \
-	a required field "{0}" is missing an object
+        a required field "{0}" is missing an object
 
 NOT_IDENTIFIABLE = \
-	An object is referenced as IDREF but its ID field is null
+        An object is referenced as IDREF but its ID field is null
 
 DANGLING_IDREF = \
-	A tree contains a reference to ID "{0}" but it's not a part of the object graph
+        A tree contains a reference to ID "{0}" but it's not a part of the object graph
 
 NULL_OUTPUT_RESOLVER = \
     schema output resolver must not be null
@@ -66,6 +66,9 @@ NULL_OUTPUT_RESOLVER = \
 UNABLE_TO_MARSHAL_NON_ELEMENT = \
     unable to marshal type "{0}" as an element because it is missing an @XmlRootElement annotation
 
+UNABLE_TO_MARSHAL_UNBOUND_CLASS = \
+    unable to marshal type "{0}" as an element because it is not known to this context.
+
 UNSUPPORTED_PROPERTY = \
     "{0}" is not a supported property
 
@@ -74,7 +77,7 @@ NULL_PROPERTY_NAME = \
 
 MUST_BE_X = \
     property "{0}" must be an instance of type {1}, not {2}
-    
+
 SUBSTITUTED_BY_ANONYMOUS_TYPE = \
     Instance of "{1}" is substituting "{0}", but "{2}" is bound to an anonymous type.
 
@@ -92,4 +95,3 @@ UNKNOWN_CLASS = \
 
 FAILED_TO_GENERATE_SCHEMA = \
     Failed to generate schema.
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
index 8eee884c91a..4cc2941f56c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.awt.*;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java
index c1650c3c53f..28daaab673d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
index 8682f7d017c..167366778ce 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.util.HashMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java
index a076711c96f..e1bb7c7d31e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
index d6d77f64483..065c00f7f21 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.util.Collections;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
index 2582b3a835a..7e0875a0f36 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
index 58d2dd4fee2..76b3b7e35da 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
index c87e4e22b73..59c5caf6a60 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java
index 1173ecd1f3c..df25299fc0e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
index 83d16fd9424..e150a91e477 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
index bfc6d5c3899..0e6968cca4e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java
@@ -52,6 +52,7 @@ import javax.xml.transform.TransformerException;
 import javax.xml.transform.sax.SAXResult;
 
 import com.sun.istack.internal.SAXException2;
+import com.sun.xml.internal.bind.CycleRecoverable;
 import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper;
 import com.sun.xml.internal.bind.util.ValidationEventLocatorExImpl;
@@ -61,10 +62,10 @@ import com.sun.xml.internal.bind.v2.runtime.output.MTOMXmlOutput;
 import com.sun.xml.internal.bind.v2.runtime.output.NamespaceContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.output.Pcdata;
 import com.sun.xml.internal.bind.v2.runtime.output.XmlOutput;
+import com.sun.xml.internal.bind.v2.runtime.property.Property;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.IntData;
 import com.sun.xml.internal.bind.v2.util.CollisionCheckStack;
-import com.sun.xml.internal.bind.CycleRecoverable;
 
 import org.xml.sax.SAXException;
 
@@ -131,6 +132,9 @@ public final class XMLSerializer extends Coordinator {
 
     private NamespaceContextImpl.Element nse;
 
+    // Introduced based on Jersey requirements - to be able to retrieve marshalled name
+    ThreadLocal<Property> currentProperty = new ThreadLocal<Property>();
+
     /**
      * Set to true if a text is already written,
      * and we need to print ' ' for additional text methods.
@@ -181,7 +185,6 @@ public final class XMLSerializer extends Coordinator {
 
     public AttachmentMarshaller attachmentMarshaller;
 
-
     /*package*/ XMLSerializer( MarshallerImpl _owner ) {
         this.marshaller = _owner;
         this.grammar = marshaller.context;
@@ -192,11 +195,13 @@ public final class XMLSerializer extends Coordinator {
 
     /**
      * Gets the cached instance of {@link Base64Data}.
+     *
+     * @deprecated
+     *      {@link Base64Data} is no longer cached, so that
+     *      XMLStreamWriterEx impl can retain the data, like JAX-WS does.
      */
     public Base64Data getCachedBase64DataInstance() {
-        if(base64Data==null)
-            base64Data = new Base64Data();
-        return base64Data;
+        return new Base64Data();
     }
 
     /**
@@ -607,7 +612,7 @@ public final class XMLSerializer extends Coordinator {
      *      Used as a part of the error message in case anything goes wrong
      *      with 'o'.
      */
-    public final void childAsXsiType( Object child, String fieldName, JaxBeanInfo expected ) throws SAXException, IOException, XMLStreamException {
+    public final void childAsXsiType( Object child, String fieldName, JaxBeanInfo expected, boolean nillable) throws SAXException, IOException, XMLStreamException {
         if(child==null) {
             handleMissingObjectError(fieldName);
         } else {
@@ -658,12 +663,26 @@ public final class XMLSerializer extends Coordinator {
                 }
             }
             actual.serializeURIs(child,this);
+
+            if (nillable) {
+                getNamespaceContext().declareNamespace(WellKnownNamespace.XML_SCHEMA_INSTANCE,"xsi",true);
+            }
+
             endNamespaceDecls(child);
             if(!asExpected) {
                 attribute(WellKnownNamespace.XML_SCHEMA_INSTANCE,"type",
                     DatatypeConverter.printQName(actualTypeName,getNamespaceContext()));
             }
+
             actual.serializeAttributes(child,this);
+            boolean nilDefined = false;
+            if (actual instanceof AttributeAccessor) {
+                nilDefined = ((AttributeAccessor)actual).isNilIncluded();
+            }
+            if ((nillable) && (!nilDefined)) {
+                attribute(WellKnownNamespace.XML_SCHEMA_INSTANCE,"nil","true");
+            }
+
             endAttributes();
             actual.serializeBody(child,this);
 
@@ -1028,6 +1047,14 @@ public final class XMLSerializer extends Coordinator {
         return getCurrentLocation(null);
     }
 
+    /**
+     * May return null when the property hasn't been set.
+     * Introduced based on Jersey requirements.
+     */
+    public Property getCurrentProperty() {
+        return currentProperty.get();
+    }
+
     /**
      * When called from within the realm of the marshaller, this method
      * returns the current {@link XMLSerializer} in charge.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
index dc67cda23a9..d901f1540f8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
index 391b1cb07a5..fda6167693b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import com.sun.xml.internal.bind.v2.runtime.AssociationMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
index 03274cbaea1..1d55836223a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
index 6350afbc4be..96e595f0fc7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
@@ -75,6 +76,8 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
      */
     final static class TablesPerJAXBContext {
         final int[] elementIndexes;
+        final int[] elementIndexPrefixes;
+
         final int[] attributeIndexes;
         final int[] localNameIndexes;
 
@@ -103,6 +106,7 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
          */
         TablesPerJAXBContext(JAXBContextImpl context, int initialIndexOffset) {
             elementIndexes = new int[context.getNumberOfElementNames()];
+            elementIndexPrefixes = new int[context.getNumberOfElementNames()];
             attributeIndexes = new int[context.getNumberOfAttributeNames()];
             localNameIndexes = new int[context.getNumberOfLocalNames()];
 
@@ -244,6 +248,7 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
         }
     }
 
+    @Override
     public void startDocument(XMLSerializer serializer, boolean fragment,
             int[] nsUriIndex2prefixIndex, NamespaceContextImpl nsContext)
             throws IOException, SAXException, XMLStreamException {
@@ -253,25 +258,29 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
             fiout.initiateLowLevelWriting();
     }
 
+    @Override
     public void endDocument(boolean fragment) throws IOException, SAXException, XMLStreamException {
         super.endDocument(fragment);
     }
 
+    @Override
     public void beginStartTag(Name name) throws IOException {
         fiout.writeLowLevelTerminationAndMark();
 
         if (nsContext.getCurrent().count() == 0) {
             final int qNameIndex = tables.elementIndexes[name.qNameIndex] - tables.indexOffset;
-            if (qNameIndex >= 0) {
+            final int prefixIndex = nsUriIndex2prefixIndex[name.nsUriIndex];
+
+            if (qNameIndex >= 0 &&
+                    tables.elementIndexPrefixes[name.qNameIndex] == prefixIndex) {
                 fiout.writeLowLevelStartElementIndexed(EncodingConstants.ELEMENT, qNameIndex);
             } else {
                 tables.elementIndexes[name.qNameIndex] = fiout.getNextElementIndex() + tables.indexOffset;
-
-                final int prefix = nsUriIndex2prefixIndex[name.nsUriIndex];
+                tables.elementIndexPrefixes[name.qNameIndex] = prefixIndex;
                 writeLiteral(EncodingConstants.ELEMENT | EncodingConstants.ELEMENT_LITERAL_QNAME_FLAG,
                         name,
-                        nsContext.getPrefix(prefix),
-                        nsContext.getNamespaceURI(prefix));
+                        nsContext.getPrefix(prefixIndex),
+                        nsContext.getNamespaceURI(prefixIndex));
             }
         } else {
             beginStartTagWithNamespaces(name);
@@ -291,19 +300,22 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
         fiout.writeLowLevelEndNamespaces();
 
         final int qNameIndex = tables.elementIndexes[name.qNameIndex] - tables.indexOffset;
-        if (qNameIndex >= 0) {
+        final int prefixIndex = nsUriIndex2prefixIndex[name.nsUriIndex];
+
+        if (qNameIndex >= 0 &&
+                tables.elementIndexPrefixes[name.qNameIndex] == prefixIndex) {
             fiout.writeLowLevelStartElementIndexed(0, qNameIndex);
         } else {
             tables.elementIndexes[name.qNameIndex] = fiout.getNextElementIndex() + tables.indexOffset;
-
-            final int prefix = nsUriIndex2prefixIndex[name.nsUriIndex];
+            tables.elementIndexPrefixes[name.qNameIndex] = prefixIndex;
             writeLiteral(EncodingConstants.ELEMENT_LITERAL_QNAME_FLAG,
                     name,
-                    nsContext.getPrefix(prefix),
-                    nsContext.getNamespaceURI(prefix));
+                    nsContext.getPrefix(prefixIndex),
+                    nsContext.getNamespaceURI(prefixIndex));
         }
     }
 
+    @Override
     public void attribute(Name name, String value) throws IOException {
         fiout.writeLowLevelStartAttributes();
 
@@ -351,19 +363,23 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
         }
     }
 
+    @Override
     public void endStartTag() throws IOException {
         fiout.writeLowLevelEndStartElement();
     }
 
+    @Override
     public void endTag(Name name) throws IOException {
         fiout.writeLowLevelEndElement();
     }
 
+    @Override
     public void endTag(int prefix, String localName) throws IOException {
         fiout.writeLowLevelEndElement();
     }
 
 
+    @Override
     public void text(Pcdata value, boolean needsSeparatingWhitespace) throws IOException {
         if (needsSeparatingWhitespace)
             fiout.writeLowLevelText(" ");
@@ -387,6 +403,7 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
     }
 
 
+    @Override
     public void text(String value, boolean needsSeparatingWhitespace) throws IOException {
         if (needsSeparatingWhitespace)
             fiout.writeLowLevelText(" ");
@@ -395,6 +412,7 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
     }
 
 
+    @Override
     public void beginStartTag(int prefix, String localName) throws IOException {
         fiout.writeLowLevelTerminationAndMark();
 
@@ -424,6 +442,7 @@ public final class FastInfosetStreamWriterOutput extends XMLStreamWriterOutput {
             tables.incrementMaxIndexValue();
     }
 
+    @Override
     public void attribute(int prefix, String localName, String value) throws IOException {
         fiout.writeLowLevelStartAttributes();
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
index 42c229b7443..a3cc7f00aa1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
index 17835a026ee..002abd1d9f2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import com.sun.xml.internal.bind.v2.runtime.AssociationMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
index d189430e41a..c8fad09ebfe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
index 7e12ce802f2..beb1d27827e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
index 2bc80c294ec..a11cfab4fc1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -164,7 +165,7 @@ public final class NamespaceContextImpl implements NamespaceContext2 {
                                 break;
                             }
                         }
-
+                        current.setTagName(subst, current.elementLocalName, current.getOuterPeer());
                         return i;
                     } else {
                         // first, if the previous URI assigned to "" is
@@ -217,6 +218,7 @@ public final class NamespaceContextImpl implements NamespaceContext2 {
 
     public int force(@NotNull String uri, @NotNull String prefix) {
         // check for the existing binding
+
         for( int i=size-1; i>=0; i-- ) {
             if(prefixes[i].equals(prefix)) {
                 if(nsUris[i].equals(uri))
@@ -442,6 +444,8 @@ public final class NamespaceContextImpl implements NamespaceContext2 {
             }
             context.size = baseIndex;
             context.current = prev;
+            // release references to user objects
+            outerPeer = innerPeer = null;
             return prev;
         }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
index 22454b9601d..1b9b46412bd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
index 060d4d1730c..e18276d1259 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -84,7 +85,15 @@ public class SAXOutput extends XmlOutputAbstractImpl {
             qname = localName;
         } else {
             nsUri = nsContext.getNamespaceURI(prefix);
-            qname = nsContext.getPrefix(prefix)+':'+localName;
+            String p = nsContext.getPrefix(prefix);
+            if(p.length()==0)
+                // this is more likely a bug in the application code (NamespacePrefixMapper implementation)
+                // this only happens when it tries to assign "" prefix to a non-"" URI,
+                // which is by itself violation of namespace rec. But let's just be safe.
+                // See http://forums.java.net/jive/thread.jspa?messageID=212598#212598
+                qname = localName;
+            else
+                qname = p +':'+localName;
         }
         atts.addAttribute( nsUri, localName, qname, "CDATA", value );
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
new file mode 100644
index 00000000000..6b83a67cdbc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.bind.v2.runtime.output;
+
+import javax.xml.stream.XMLStreamException;
+
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data;
+
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
+
+/**
+ * {@link XmlOutput} for {@link XMLStreamWriterEx}.
+ *
+ * @author Paul Sandoz.
+ */
+public final class StAXExStreamWriterOutput extends XMLStreamWriterOutput {
+    private final XMLStreamWriterEx out;
+
+    public StAXExStreamWriterOutput(XMLStreamWriterEx out) {
+        super(out);
+        this.out = out;
+    }
+
+    public void text(Pcdata value, boolean needsSeparatingWhitespace) throws XMLStreamException {
+        if(needsSeparatingWhitespace) {
+            out.writeCharacters(" ");
+        }
+
+        if (!(value instanceof Base64Data)) {
+            out.writeCharacters(value.toString());
+        } else {
+            Base64Data v = (Base64Data)value;
+            out.writeBinary(v.getDataHandler());
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
index f7603e98d11..a4042560683 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
index 68b18d5ee13..e983db3c2d1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
index fad08392d46..5fe11b74968 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
@@ -160,8 +161,8 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
 
     private static Class initFIStAXWriterClass() {
         try {
-            Class llfisw = MarshallerImpl.class.getClassLoader().
-                    loadClass("com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter");
+            Class llfisw = Class.forName(
+                    "com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter", true, MarshallerImpl.class.getClassLoader());
             Class sds = MarshallerImpl.class.getClassLoader().
                     loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer");
             // Check if StAXDocumentSerializer implements LowLevelFastInfosetStreamWriter
@@ -179,7 +180,9 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
             if (FI_STAX_WRITER_CLASS == null)
                 return null;
 
-            Class c = UnmarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput");
+            Class c = Class.forName(
+                    "com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput", true,
+                    UnmarshallerImpl.class.getClassLoader());
             return c.getConstructor(FI_STAX_WRITER_CLASS, JAXBContextImpl.class);
         } catch (Throwable e) {
             return null;
@@ -194,7 +197,7 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
 
     private static Class initStAXExWriterClass() {
         try {
-            return MarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx");
+            return Class.forName("com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx",true,MarshallerImpl.class.getClassLoader());
         } catch (Throwable e) {
             return null;
         }
@@ -202,7 +205,7 @@ public class XMLStreamWriterOutput extends XmlOutputAbstractImpl {
 
     private static Constructor<? extends XmlOutput> initStAXExOutputClass() {
         try {
-            Class c = UnmarshallerImpl.class.getClassLoader().loadClass("com.sun.xml.internal.bind.v2.runtime.output.StAXExStreamWriterOutput");
+            Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.StAXExStreamWriterOutput",true, UnmarshallerImpl.class.getClassLoader());
             return c.getConstructor(STAXEX_WRITER_CLASS);
         } catch (Throwable e) {
             return null;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
index 37ba1ed92c5..7999a054f3f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
index af3607e774e..fbafe6fb9b5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.output;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
index b715ea0491d..3b6e0ff31fd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * Code that writes well-formed XML ({@link XmlOutput} and its implementations}.
  */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
index 476bc0755e2..37b5047df35 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
index af694560524..81d76e9feb5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
index 8d2d9906727..8deeb56c37d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -50,7 +51,7 @@ final class ArrayElementNodeProperty<BeanT,ListT,ItemT> extends ArrayElementProp
         if(item==null) {
             w.writeXsiNilTrue();
         } else {
-            w.childAsXsiType(item,fieldName,expected);
+            w.childAsXsiType(item,fieldName,expected, false);
         }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
index f5c27aedccb..f61962b7240 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -150,7 +151,7 @@ abstract class ArrayElementProperty<BeanT,ListT,ItemT> extends ArrayERProperty<B
                         // for the purpose of simple type substitution, make it a non-error
 
                         w.startElement(typeMap.values().iterator().next().tagName,null);
-                        w.childAsXsiType(item,fieldName,w.grammar.getBeanInfo(Object.class));
+                        w.childAsXsiType(item,fieldName,w.grammar.getBeanInfo(Object.class), false);
                     } else {
                         w.startElement(tt.tagName,null);
                         serializeItem(tt.beanInfo,item,w);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java
index 7c10a7b3c64..f99cc666faf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
index 270dc10cda1..71397a1be58 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -122,7 +123,7 @@ class ArrayReferenceNodeProperty<BeanT,ListT,ItemT> extends ArrayERProperty<Bean
         if(isMixed) {
             // handler for processing mixed contents.
             loaders.put(TEXT_HANDLER,
-                new ChildLoader(new MixedTextoader(recv),null));
+                new ChildLoader(new MixedTextLoader(recv),null));
         }
 
         if(domHandler!=null) {
@@ -131,17 +132,18 @@ class ArrayReferenceNodeProperty<BeanT,ListT,ItemT> extends ArrayERProperty<Bean
         }
     }
 
-    private static final class MixedTextoader extends Loader {
+    private static final class MixedTextLoader extends Loader {
 
         private final Receiver recv;
 
-        public MixedTextoader(Receiver recv) {
+        public MixedTextLoader(Receiver recv) {
             super(true);
             this.recv = recv;
         }
 
         public void text(UnmarshallingContext.State state, CharSequence text) throws SAXException {
-            recv.receive(state,text.toString());
+            if(text.length()!=0) // length 0 text is pointless
+                recv.receive(state,text.toString());
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
index 5c899917009..aedce12d236 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -62,6 +63,11 @@ public final class AttributeProperty<BeanT> extends PropertyImpl<BeanT>
      */
     public final Name attName;
 
+    /**
+     * Required
+     */
+    public final boolean required;
+
     /**
      * Heart of the conversion logic.
      */
@@ -72,6 +78,7 @@ public final class AttributeProperty<BeanT> extends PropertyImpl<BeanT>
     public AttributeProperty(JAXBContextImpl context, RuntimeAttributePropertyInfo prop) {
         super(context,prop);
         this.attName = context.nameBuilder.createAttributeName(prop.getXmlName());
+        this.required = prop.isRequired();
         this.xacc = TransducedAccessor.get(context,prop);
         this.acc = prop.getAccessor();   // we only use this for binder, so don't waste memory by optimizing
     }
@@ -83,8 +90,10 @@ public final class AttributeProperty<BeanT> extends PropertyImpl<BeanT>
      */
     public void serializeAttributes(BeanT o, XMLSerializer w) throws SAXException, AccessorException, IOException, XMLStreamException {
         CharSequence value = xacc.print(o);
-        if(value!=null)
-            w.attribute(attName,value.toString());
+        if(value != null)
+            w.attribute(attName, value.toString());
+        else if(required)
+           w.attribute(attName, "");
     }
 
     public void serializeURIs(BeanT o, XMLSerializer w) throws AccessorException, SAXException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
index 6146d26398d..095e2c7eaa3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
index 5458d005020..26edae3c1fe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
index fc31ce45297..429f8f61f58 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties
@@ -28,4 +28,3 @@ UNSUBSTITUTABLE_TYPE = \
 
 UNEXPECTED_JAVA_TYPE = \
     Java class {0} is not allowed in this property. Expected types are: {1}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java
index 6e20e6da580..704c140f9ee 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -34,6 +35,7 @@ import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.v2.model.core.ID;
 import com.sun.xml.internal.bind.v2.model.core.PropertyInfo;
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
+import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
 import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
@@ -125,4 +127,14 @@ public interface Property<BeanT> extends StructureLoaderBuilder {
      * to clean up any unnecessary references.
      */
     void wrapUp();
+
+
+
+    /**
+     * Provides more {@link RuntimePropertyInfo} information on the property.
+     *
+     * @return
+     *      null if RETAIN_REFERENCE_TO_INFO property is not set on the {@link JAXBContext}
+     */
+    public RuntimePropertyInfo getInfo();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
index db35b10c799..0a09ae3bf1f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.lang.reflect.Constructor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
index 6bbdb447f70..037eaf2b4c0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -44,9 +45,17 @@ abstract class PropertyImpl<BeanT> implements Property<BeanT> {
      * Name of this field.
      */
     protected final String fieldName;
+    private RuntimePropertyInfo propertyInfo = null;
 
     public PropertyImpl(JAXBContextImpl context, RuntimePropertyInfo prop) {
         fieldName = prop.getName();
+        if (context.retainPropertyInfo) {
+            propertyInfo = prop;
+        }
+    }
+
+    public RuntimePropertyInfo getInfo() {
+        return propertyInfo;
     }
 
     public void serializeBody(BeanT o, XMLSerializer w, Object outerPeer) throws SAXException, AccessorException, IOException, XMLStreamException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
index d17d29af2be..e6984036069 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
index cd6826cf385..074ca7a4843 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java
@@ -22,9 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +35,6 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 
 import com.sun.xml.internal.bind.api.AccessorException;
-import com.sun.xml.internal.bind.v2.util.QNameMap;
 import com.sun.xml.internal.bind.v2.model.core.PropertyKind;
 import com.sun.xml.internal.bind.v2.model.core.TypeRef;
 import com.sun.xml.internal.bind.v2.model.runtime.RuntimeElementPropertyInfo;
@@ -43,12 +44,14 @@ import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
 import com.sun.xml.internal.bind.v2.runtime.Name;
 import com.sun.xml.internal.bind.v2.runtime.XMLSerializer;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.ChildLoader;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.ChildLoader;
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator;
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
+import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader;
+import com.sun.xml.internal.bind.v2.util.QNameMap;
 
+import javax.xml.bind.JAXBElement;
 import org.xml.sax.SAXException;
 
 /**
@@ -111,7 +114,7 @@ final class SingleElementNodeProperty<BeanT,ValueT> extends PropertyImpl<BeanT>
 
     public void serializeBody(BeanT o, XMLSerializer w, Object outerPeer) throws SAXException, AccessorException, IOException, XMLStreamException {
         ValueT v = acc.get(o);
-        if(v!=null) {
+        if (v!=null) {
             Class vtype = v.getClass();
             TagAndType tt=typeNames.get(vtype); // quick way that usually works
 
@@ -124,6 +127,7 @@ final class SingleElementNodeProperty<BeanT,ValueT> extends PropertyImpl<BeanT>
                 }
             }
 
+            boolean addNilDecl = (o instanceof JAXBElement) && ((JAXBElement)o).isNil();
             if(tt==null) {
                 // actually this is an error, because the actual type was not a sub-type
                 // of any of the types specified in the annotations,
@@ -131,14 +135,13 @@ final class SingleElementNodeProperty<BeanT,ValueT> extends PropertyImpl<BeanT>
                 // it's convenient to marshal this anyway (for example so that classes
                 // generated from simple types like String can be marshalled as expected.)
                 w.startElement(typeNames.values().iterator().next().tagName,null);
-                w.childAsXsiType(v,fieldName,w.grammar.getBeanInfo(Object.class));
+                w.childAsXsiType(v,fieldName,w.grammar.getBeanInfo(Object.class), addNilDecl && nillable);
             } else {
                 w.startElement(tt.tagName,null);
-                w.childAsXsiType(v,fieldName,tt.beanInfo);
+                w.childAsXsiType(v,fieldName,tt.beanInfo, addNilDecl && nillable);
             }
             w.endElement();
-        } else
-        if(nillable) {
+        } else if (nillable) {
             w.startElement(nullTagName,null);
             w.writeXsiNilTrue();
             w.endElement();
@@ -150,7 +153,9 @@ final class SingleElementNodeProperty<BeanT,ValueT> extends PropertyImpl<BeanT>
 
         for (TypeRef<Type,Class> e : prop.getTypes()) {
             JaxBeanInfo bi = context.getOrCreate((RuntimeTypeInfo) e.getTarget());
-            Loader l = bi.getLoader(context,true);
+            // if the expected Java type is already final, type substitution won't really work anyway.
+            // this also traps cases like trying to substitute xsd:long element with xsi:type='xsd:int'
+            Loader l = bi.getLoader(context,!Modifier.isFinal(bi.jaxbType.getModifiers()));
             if(e.getDefaultValue()!=null)
                 l = new DefaultValueLoaderDecorator(l,e.getDefaultValue());
             if(nillable || chain.context.allNillable)
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
index d044e002db4..8d895f70af8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
@@ -236,14 +237,14 @@ final class SingleMapNodeProperty<BeanT,ValueT extends Map> extends PropertyImpl
                 Object key = e.getKey();
                 if(key!=null) {
                     w.startElement(keyTag,key);
-                    w.childAsXsiType(key,fieldName,keyBeanInfo);
+                    w.childAsXsiType(key,fieldName,keyBeanInfo, false);
                     w.endElement();
                 }
 
                 Object value = e.getValue();
                 if(value!=null) {
                     w.startElement(valueTag,value);
-                    w.childAsXsiType(value,fieldName,valueBeanInfo);
+                    w.childAsXsiType(value,fieldName,valueBeanInfo, false);
                     w.endElement();
                 }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
index 89d4a39fc6b..9753921a17f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java
index 2a41727f659..3a43496ffdb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java
index 9f3b5fb33db..028879b2d46 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java
index c0a278ce5db..a6b97a298fd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java
@@ -23,9 +23,6 @@
  * have any questions.
  */
 
-/*
- * @(#)$Id:
- */
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java
index 44a4b270f91..79d5803a385 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.property;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
index e06ac090d24..6a3c0c7cea8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.lang.reflect.Field;
@@ -42,11 +43,13 @@ import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
 import com.sun.xml.internal.bind.v2.model.core.Adapter;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+import com.sun.xml.internal.bind.v2.model.impl.RuntimeModelBuilder;
 import com.sun.xml.internal.bind.v2.runtime.reflect.opt.OptimizedAccessorFactory;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Loader;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.Receiver;
 import com.sun.xml.internal.bind.v2.runtime.unmarshaller.UnmarshallingContext;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
+import com.sun.istack.internal.Nullable;
 
 import org.xml.sax.SAXException;
 
@@ -84,10 +87,11 @@ public abstract class Accessor<BeanT,ValueT> implements Receiver {
      *
      * @param context
      *      The {@link JAXBContextImpl} that owns the whole thing.
+     *      (See {@link RuntimeModelBuilder#context}.)
      * @return
      *      At least the implementation can return <tt>this</tt>.
      */
-    public Accessor<BeanT,ValueT> optimize(JAXBContextImpl context) {
+    public Accessor<BeanT,ValueT> optimize(@Nullable JAXBContextImpl context) {
         return this;
     }
 
@@ -156,6 +160,9 @@ public abstract class Accessor<BeanT,ValueT> implements Receiver {
             set((BeanT)state.target,(ValueT)o);
         } catch (AccessorException e) {
             Loader.handleGenericException(e,true);
+        } catch (IllegalAccessError iae) {
+            // throw UnmarshalException instead IllegalAccesssError | Issue 475
+            Loader.handleGenericError(iae);
         }
     }
 
@@ -189,8 +196,6 @@ public abstract class Accessor<BeanT,ValueT> implements Receiver {
 
         private static final Logger logger = Util.getClassLogger();
 
-        // TODO: revisit. this is a security hole because this method can be used by anyone
-        // to enable access to a field.
         public FieldReflection(Field f) {
             super((Class<ValueT>)f.getType());
             this.f = f;
@@ -198,6 +203,9 @@ public abstract class Accessor<BeanT,ValueT> implements Receiver {
             int mod = f.getModifiers();
             if(!Modifier.isPublic(mod) || Modifier.isFinal(mod) || !Modifier.isPublic(f.getDeclaringClass().getModifiers())) {
                 try {
+                    // attempt to make it accessible, but do so in the security context of the calling application.
+                    // don't do this in the doPrivilege block, as that would create a security hole for anyone
+                    // to make any field accessible.
                     f.setAccessible(true);
                 } catch( SecurityException e ) {
                     if(!accessWarned)
@@ -231,7 +239,7 @@ public abstract class Accessor<BeanT,ValueT> implements Receiver {
 
         @Override
         public Accessor<BeanT,ValueT> optimize(JAXBContextImpl context) {
-            if(context.fastBoot)
+            if(context!=null && context.fastBoot)
                 // let's not waste time on doing this for the sake of faster boot.
                 return this;
             Accessor<BeanT,ValueT> acc = OptimizedAccessorFactory.get(f);
@@ -343,7 +351,7 @@ public abstract class Accessor<BeanT,ValueT> implements Receiver {
             if(getter==null || setter==null)
                 // if we aren't complete, OptimizedAccessor won't always work
                 return this;
-            if(context.fastBoot)
+            if(context!=null && context.fastBoot)
                 // let's not waste time on doing this for the sake of faster boot.
                 return this;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
index 913cbf05330..3ec1daec25e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java
index 49e6f77df84..cb0d434eba6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java
index 2c584f74a78..59611d75003 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java
index c26d297daa8..427f75f0b58 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java
index 71f530508ce..8858328d6aa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import javax.xml.bind.JAXBException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java
index f4df2e693f8..27976376307 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.lang.ref.WeakReference;
@@ -36,6 +37,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
+import java.util.LinkedList;
+import java.util.HashSet;
+import java.util.TreeSet;
+import java.util.Stack;
 import java.util.concurrent.Callable;
 
 import javax.xml.bind.JAXBException;
@@ -139,7 +144,7 @@ public abstract class Lister<BeanT,PropT,ItemT,PackT> {
     }
 
     private static Class getImplClass(Class<?> fieldType) {
-        return ClassFactory.inferImplClass(fieldType,ClassFactory.COLLECTION_IMPL_CLASSES);
+        return ClassFactory.inferImplClass(fieldType,COLLECTION_IMPL_CLASSES);
     }
 
     /**
@@ -474,4 +479,11 @@ public abstract class Lister<BeanT,PropT,ItemT,PackT> {
         }
     };
 
+    private static final Class[] COLLECTION_IMPL_CLASSES = new Class[] {
+        ArrayList.class,
+        LinkedList.class,
+        HashSet.class,
+        TreeSet.class,
+        Stack.class
+    };
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
index b74f0f99aaa..c2fc8fd39d2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
index 58daf1a6e8e..67d13024e95 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties
@@ -38,4 +38,3 @@ NO_SETTER = \
 NO_GETTER = \
     The property has a setter "{0}" but no getter. \
     For marshaller, please define getters.
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
index 86085836161..e2060c93f14 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
index 552d7cccf1c..06c399e2dde 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -83,7 +84,8 @@ final class PrimitiveArrayListerBoolean<BeanT> extends Lister<BeanT,boolean[],Bo
                 System.arraycopy(buf,0,nb,0,buf.length);
                 buf = nb;
             }
-            buf[size++] = b;
+            if(b!=null)
+                buf[size++] = b;
         }
 
         boolean[] build() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
index 5b2e9683637..70987efa4dd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -83,7 +84,8 @@ final class PrimitiveArrayListerByte<BeanT> extends Lister<BeanT,byte[],Byte,Pri
                 System.arraycopy(buf,0,nb,0,buf.length);
                 buf = nb;
             }
-            buf[size++] = b;
+            if(b!=null)
+                buf[size++] = b;
         }
 
         byte[] build() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
index 21af48680ef..003bc23948b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -83,7 +84,8 @@ final class PrimitiveArrayListerCharacter<BeanT> extends Lister<BeanT,char[],Cha
                 System.arraycopy(buf,0,nb,0,buf.length);
                 buf = nb;
             }
-            buf[size++] = b;
+            if(b!=null)
+                buf[size++] = b;
         }
 
         char[] build() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
index 00580f319fc..4d848ff98d8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -83,7 +84,8 @@ final class PrimitiveArrayListerDouble<BeanT> extends Lister<BeanT,double[],Doub
                 System.arraycopy(buf,0,nb,0,buf.length);
                 buf = nb;
             }
-            buf[size++] = b;
+            if(b!=null)
+                buf[size++] = b;
         }
 
         double[] build() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
index 0a72a794fc6..a8dbfec2053 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -83,7 +84,8 @@ final class PrimitiveArrayListerFloat<BeanT> extends Lister<BeanT,float[],Float,
                 System.arraycopy(buf,0,nb,0,buf.length);
                 buf = nb;
             }
-            buf[size++] = b;
+            if(b!=null)
+                buf[size++] = b;
         }
 
         float[] build() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
index 53b9a8a177b..4cc855dd749 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -83,7 +84,8 @@ final class PrimitiveArrayListerInteger<BeanT> extends Lister<BeanT,int[],Intege
                 System.arraycopy(buf,0,nb,0,buf.length);
                 buf = nb;
             }
-            buf[size++] = b;
+            if(b!=null)
+                buf[size++] = b;
         }
 
         int[] build() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
index 02c6a7a7679..17d57b2d06c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -83,7 +84,8 @@ final class PrimitiveArrayListerLong<BeanT> extends Lister<BeanT,long[],Long,Pri
                 System.arraycopy(buf,0,nb,0,buf.length);
                 buf = nb;
             }
-            buf[size++] = b;
+            if(b!=null)
+                buf[size++] = b;
         }
 
         long[] build() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
index 673b0eb53b7..de040267e86 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import com.sun.xml.internal.bind.api.AccessorException;
@@ -83,7 +84,8 @@ final class PrimitiveArrayListerShort<BeanT> extends Lister<BeanT,short[],Short,
                 System.arraycopy(buf,0,nb,0,buf.length);
                 buf = nb;
             }
-            buf[size++] = b;
+            if(b!=null)
+                buf[size++] = b;
         }
 
         short[] build() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
index 26f4d82e203..16de40cbb9a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
index b2a61d640e9..0b86afd57e6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.io.InputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
index 9d31df9d3c1..5db68a5138f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
index 205570f7de4..a21b75c916d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
index d37fb41457a..448c1b8243a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
index e5638176fa5..d3389218d6b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
index f4038948e4a..7bf0d98f1de 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
index 992021caa70..6171d31c125 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
index 1be74c250bf..deaded956f1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
index 1e6baf9981e..42050291df3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
index e929827eeb2..3a63c8792be 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
index f0e4ee5d66f..c778a4f0ea1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
index 8f5f1b287c3..2ddede0fc55 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
index fc97c48a7f3..bf0870caacd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.lang.reflect.InvocationTargetException;
@@ -37,6 +38,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.sun.xml.internal.bind.Util;
+import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
 
 /**
  * A {@link ClassLoader} used to "inject" optimized accessor classes
@@ -113,6 +115,12 @@ final class Injector {
 
     private final ClassLoader parent;
 
+    /**
+     * True if this injector is capable of injecting accessors.
+     * False otherwise, which happens if this classloader can't see {@link Accessor}.
+     */
+    private final boolean loadable;
+
     private static final Method defineClass;
     private static final Method resolveClass;
 
@@ -138,10 +146,23 @@ final class Injector {
     private Injector(ClassLoader parent) {
         this.parent = parent;
         assert parent!=null;
+
+        boolean loadable = false;
+
+        try {
+            loadable = parent.loadClass(Accessor.class.getName())==Accessor.class;
+        } catch (ClassNotFoundException e) {
+            ; // not loadable
+        }
+
+        this.loadable = loadable;
     }
 
 
     private synchronized Class inject(String className, byte[] image) {
+        if(!loadable)   // this injector cannot inject anything
+            return null;
+
         Class c = classes.get(className);
         if(c==null) {
             // we need to inject a class into the
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
index a0549b7eb3d..69008e550c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
index 0d214308f5c..cd1aafefc06 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
index bdc0de7f827..57cf639e1e6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
index c3b9a9e98e5..0f688e73dc9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
index 1cb1358d3cf..ddd958ac5fc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
index 95d60203178..ee623618147 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
index c38737b4df1..272b2d97f98 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
index 4500602ee6d..93ff8630e97 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
index 00be3e99cc7..0191c3abcde 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
index cfe365965f9..5e8c54ecb4a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.lang.reflect.Field;
@@ -32,6 +33,7 @@ import java.util.logging.Logger;
 
 import com.sun.xml.internal.bind.Util;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
+import com.sun.xml.internal.bind.v2.runtime.RuntimeUtil;
 
 import static com.sun.xml.internal.bind.v2.bytecode.ClassTailor.toVMClassName;
 import static com.sun.xml.internal.bind.v2.bytecode.ClassTailor.toVMTypeName;
@@ -89,7 +91,7 @@ public abstract class OptimizedAccessorFactory {
 
         if(t.isPrimitive())
             opt = AccessorInjector.prepare( getter.getDeclaringClass(),
-                methodTemplateName+t.getName(),
+                methodTemplateName+RuntimeUtil.primitiveToBox.get(t).getSimpleName(),
                 newClassName,
                 toVMClassName(Bean.class),
                 toVMClassName(getter.getDeclaringClass()),
@@ -142,7 +144,7 @@ public abstract class OptimizedAccessorFactory {
 
         if(field.getType().isPrimitive())
             opt = AccessorInjector.prepare( field.getDeclaringClass(),
-                fieldTemplateName+field.getType().getName(),
+                fieldTemplateName+RuntimeUtil.primitiveToBox.get(field.getType()).getSimpleName(),
                 newClassName,
                 toVMClassName(Bean.class),
                 toVMClassName(field.getDeclaringClass()),
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
index 4e9f320dc32..fb9f95e7b1e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.lang.reflect.Field;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
index 78750da3e04..666be2b8b98 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
index 9ac66b6c29a..ffd486a1a2a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
index c28384210e0..fd77b809f3b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
index f248583bf71..2859abbb6a7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
index b2eedfdf58a..a2904f513b6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
index f2000d84026..9370208468b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
index 3c72844f24a..08c4bc8d590 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
index 30179aae843..005f6bd0795 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
index a33499f246a..9cc504421ad 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
index 6a422b52955..05bb4e005e3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
index 6647ba301d8..f29c9bf958d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
index 5c9bb786a2a..608d4a04057 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
index 2a1f2916aa8..9650336ad3f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
index a0b424776fc..e700178dfeb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
index 3e0883f51bf..ec608a951ff 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.reflect.opt;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
index 57149a8ae00..50d24b61e3c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.Attributes;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
index 1d2337c8938..2c5702d290d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.util.AttributesImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
index 02148532133..9caa98f3d45 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.io.ByteArrayInputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
index 5b0349c34e6..27fa0593ad4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
index 5bc387decfd..fde63eea8dc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java
@@ -22,13 +22,18 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.util.HashMap;
 import java.util.concurrent.Callable;
 
+import javax.xml.bind.ValidationEventHandler;
+
 import com.sun.xml.internal.bind.IDResolver;
 
+import org.xml.sax.SAXException;
+
 /**
  * Default implementation of {@link IDResolver}.
  *
@@ -38,16 +43,19 @@ final class DefaultIDResolver extends IDResolver {
     /** Records ID->Object map. */
     private HashMap<String,Object> idmap = null;
 
-    public void startDocument() {
+    @Override
+    public void startDocument(ValidationEventHandler eventHandler) throws SAXException {
         if(idmap!=null)
             idmap.clear();
     }
 
+    @Override
     public void bind(String id, Object obj) {
         if(idmap==null)     idmap = new HashMap<String,Object>();
         idmap.put(id,obj);
     }
 
+    @Override
     public Callable resolve(final String id, Class targetType) {
         return new Callable() {
             public Object call() throws Exception {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
index 6ff02a682b2..d631879c048 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
index 40ed98ac441..a13c1a4c03d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java
@@ -23,9 +23,6 @@
  * have any questions.
  */
 
-/*
- * @(#)$Id: Discarder.java,v 1.4 2005/09/10 19:07:43 kohsuke Exp $
- */
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
index 52f846c35c1..92eb1ae9d27 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.annotation.DomHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
index 97f7739a0b4..93f8cd22e22 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.stream.Location;
@@ -30,6 +31,7 @@ import javax.xml.stream.XMLStreamException;
 
 import com.sun.xml.internal.bind.WhiteSpaceProcessor;
 import com.sun.xml.internal.fastinfoset.stax.StAXDocumentParser;
+import com.sun.xml.internal.org.jvnet.fastinfoset.EncodingAlgorithmIndexes;
 import org.xml.sax.SAXException;
 
 /**
@@ -237,26 +239,42 @@ final class FastInfosetConnector extends StAXConnector {
 
     private void processNonIgnorableText() throws SAXException {
         textReported = true;
-        if (fastInfosetStreamReader.getTextAlgorithmBytes() == null) {
-            charArray.set();
-            visitor.text(charArray);
-        } else {
+        boolean isTextAlgorithmAplied =
+                (fastInfosetStreamReader.getTextAlgorithmBytes() != null);
+
+        if (isTextAlgorithmAplied &&
+                fastInfosetStreamReader.getTextAlgorithmIndex() == EncodingAlgorithmIndexes.BASE64) {
             base64Data.set(fastInfosetStreamReader.getTextAlgorithmBytesClone(),null);
             visitor.text(base64Data);
+        } else {
+            if (isTextAlgorithmAplied) {
+                fastInfosetStreamReader.getText();
+            }
+
+            charArray.set();
+            visitor.text(charArray);
         }
     }
 
     private void processIgnorableText() throws SAXException {
-        if (fastInfosetStreamReader.getTextAlgorithmBytes() == null) {
+        boolean isTextAlgorithmAplied =
+                (fastInfosetStreamReader.getTextAlgorithmBytes() != null);
+
+        if (isTextAlgorithmAplied &&
+                fastInfosetStreamReader.getTextAlgorithmIndex() == EncodingAlgorithmIndexes.BASE64) {
+            base64Data.set(fastInfosetStreamReader.getTextAlgorithmBytesClone(),null);
+            visitor.text(base64Data);
+            textReported = true;
+        } else {
+            if (isTextAlgorithmAplied) {
+                fastInfosetStreamReader.getText();
+            }
+
             charArray.set();
             if (!WhiteSpaceProcessor.isWhiteSpace(charArray)) {
                 visitor.text(charArray);
                 textReported = true;
             }
-        } else {
-            base64Data.set(fastInfosetStreamReader.getTextAlgorithmBytesClone(),null);
-            visitor.text(base64Data);
-            textReported = true;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
index 994dd02fc0d..842de739c75 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
index 3d9ae5a32f8..b21667e3d18 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
index e83d9c8eb28..e0335e289df 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
index 3a3b44a11a3..3a3ce5d5db3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
index 3c4cc3b56a0..20f81bc5269 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
index 599efd130ef..0921bccb074 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.util.Collection;
@@ -91,8 +92,17 @@ public abstract class Loader {
         state.receiver = null;
     }
 
+    @SuppressWarnings({"StringEquality"})
     protected final void reportUnexpectedChildElement(TagName ea, boolean canRecover) throws SAXException {
-        reportError(Messages.UNEXPECTED_ELEMENT.format(ea.uri,ea.local,computeExpectedElements()), canRecover );
+        if(canRecover && !UnmarshallingContext.getInstance().parent.hasEventHandler())
+            // this error happens particurly often (when input documents contain a lot of unexpected elements to be ignored),
+            // so don't bother computing all the messages and etc if we know that
+            // there's no event handler to receive the error in the end. See #286
+            return;
+        if(ea.uri!=ea.uri.intern() || ea.local!=ea.local.intern())
+            reportError(Messages.UNINTERNED_STRINGS.format(), canRecover );
+        else
+            reportError(Messages.UNEXPECTED_ELEMENT.format(ea.uri,ea.local,computeExpectedElements()), canRecover );
     }
 
     /**
@@ -213,6 +223,9 @@ public abstract class Loader {
         reportError(e.getMessage(), e, canRecover );
     }
 
+    public static void handleGenericError(Error e) throws SAXException {
+        reportError(e.getMessage(), false);
+    }
 
     protected static void reportError(String msg, boolean canRecover) throws SAXException {
         reportError(msg, null, canRecover );
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
index be4750742d5..247eda1c13c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.net.URL;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
index 7eba826c26d..97dbea7298f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.ValidationEventLocator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
index ff9b0cd4aa3..81729a22f7f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.activation.DataHandler;
@@ -78,7 +79,7 @@ final class MTOMDecorator implements XmlVisitor {
     }
 
     public void startElement(TagName tagName) throws SAXException {
-        if(tagName.local=="Include" && tagName.uri==WellKnownNamespace.XOP) {
+        if(tagName.local.equals("Include") && tagName.uri.equals(WellKnownNamespace.XOP)) {
             // found xop:Include
             String href = tagName.atts.getValue("href");
             DataHandler attachment = au.getAttachmentAsDataHandler(href);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
index 62672145963..b8f782a6699 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.text.MessageFormat;
@@ -38,6 +39,7 @@ enum Messages {
     UNRECOGNIZED_TYPE_NAME, // 1 arg
     UNRECOGNIZED_TYPE_NAME_MAYBE, // 2 args
     UNABLE_TO_CREATE_MAP, // 1 arg
+    UNINTERNED_STRINGS, // no args
     ;
 
     private static final ResourceBundle rb = ResourceBundle.getBundle(Messages.class.getName());
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
index 2f61f7a43fb..141dfb52739 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties
@@ -36,7 +36,7 @@ UNRESOLVED_IDREF = \
     Undefined ID "{0}".
 
 UNEXPECTED_ELEMENT = \
-	unexpected element (uri:"{0}", local:"{1}"). Expected elements are {2}
+        unexpected element (uri:"{0}", local:"{1}"). Expected elements are {2}
 
 UNEXPECTED_TEXT = \
     unexpected text "{0}"
@@ -45,4 +45,6 @@ UNABLE_TO_CREATE_MAP = \
     The type of the field is {0}, but JAXB doesn't know how to create an instance \
     assignable to it. Create an instance in the constructor, or use a type that can \
     be assignable from HashMap.
- 
+
+UNINTERNED_STRINGS = \
+    Namespace URIs and local names to the unmarshaller needs to be interned.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
index 11feacb12b6..fb3bbbb3ec4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
index 73741a3a0fa..045789ac45e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
index d1f58842e38..cae6881adce 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
index 4a7ad294b80..dfcd61dfb1c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java
@@ -22,12 +22,14 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.UnmarshallerHandler;
 
 import com.sun.xml.internal.bind.WhiteSpaceProcessor;
+import com.sun.xml.internal.bind.v2.runtime.ClassBeanInfoImpl;
 
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
@@ -116,7 +118,17 @@ public final class SAXConnector implements UnmarshallerHandler {
         if( qname==null || qname.length()==0 )
             qname=local;
 
-        processText(true);
+
+        boolean ignorable = true;
+        StructureLoader sl;
+
+        // not null only if element content is processed (StructureLoader is used)
+        // ugly
+        if((sl = this.context.getStructureLoader()) != null) {
+            ignorable = ((ClassBeanInfoImpl)sl.getBeanInfo()).hasElementOnlyContentModel();
+        }
+
+        processText(ignorable);
 
         tagName.uri = uri;
         tagName.local = local;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
index 6ae01839861..7647a2f0413 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
index 72dd4232f45..05c0e636aa1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.ValidationEventLocator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
index 848e57b46de..8675b339502 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java
new file mode 100644
index 00000000000..88090dedb0e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
+import org.xml.sax.SAXException;
+
+/**
+ * Reads XML from StAX {@link XMLStreamReader} and
+ * feeds events to {@link XmlVisitor}.
+ *
+ * @author Ryan.Shoemaker@Sun.COM
+ * @author Kohsuke Kawaguchi
+ * @version JAXB 2.0
+ */
+final class StAXExConnector extends StAXStreamConnector {
+
+    // StAX event source
+    private final XMLStreamReaderEx in;
+
+    public StAXExConnector(XMLStreamReaderEx in, XmlVisitor visitor) {
+        super(in,visitor);
+        this.in = in;
+    }
+
+    @Override
+    protected void handleCharacters() throws XMLStreamException, SAXException {
+        if( predictor.expectText() ) {
+            CharSequence pcdata = in.getPCDATA();
+            if(pcdata instanceof com.sun.xml.internal.org.jvnet.staxex.Base64Data) {
+                com.sun.xml.internal.org.jvnet.staxex.Base64Data bd = (com.sun.xml.internal.org.jvnet.staxex.Base64Data) pcdata;
+                Base64Data binary = new Base64Data();
+                if(!bd.hasData())
+                    binary.set(bd.getDataHandler());
+                else
+                    binary.set( bd.get(), bd.getDataLen(), bd.getMimeType() );
+                // we make an assumption here that the binary data shows up on its own
+                // not adjacent to other text. So it's OK to fire it off right now.
+                visitor.text(binary);
+                textReported = true;
+            } else {
+                buffer.append(pcdata);
+            }
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
index 81870b56a5d..4e20256d2e0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.lang.reflect.Constructor;
@@ -68,13 +69,14 @@ class StAXStreamConnector extends StAXConnector {
 
         // Quick hack until SJSXP fixes 6270116
         boolean isZephyr = readerClass.getName().equals("com.sun.xml.internal.stream.XMLReaderImpl");
-        if(isZephyr)
+        if (getBoolProp(reader,"org.codehaus.stax2.internNames") &&
+            getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
             ; // no need for interning
         else
-        if(checkImplementaionNameOfSjsxp(reader))
+        if (isZephyr)
             ; // no need for interning
-        if(getBoolProp(reader,"org.codehaus.stax2.internNames")
-        && getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
+        else
+        if (checkImplementaionNameOfSjsxp(reader))
             ; // no need for interning.
         else
             visitor = new InterningXmlVisitor(visitor);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
index bd24507ecf0..b9488a3dafe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.util.Collection;
@@ -256,4 +257,8 @@ public final class StructureLoader extends Loader {
     }
 
     private static final QNameMap<TransducedAccessor> EMPTY = new QNameMap<TransducedAccessor>();
+
+    public JaxBeanInfo getBeanInfo() {
+        return beanInfo;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
index 5f6576a769d..c76c49b4ac3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
index 3bf69b483be..b79444d4bef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.api.AccessorException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
index 18e21d53bfd..954b8932a83 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java
@@ -266,6 +266,15 @@ public final class UnmarshallerImpl extends AbstractUnmarshallerImpl implements
         }
     }
 
+    /**
+     * Returns true if an event handler is installed.
+     * <p>
+     * The default handler ignores any errors, and for that this method returns false.
+     */
+    public final boolean hasEventHandler() {
+        return getEventHandler()!=this;
+    }
+
     @Override
     public <T> JAXBElement<T> unmarshal(Node node, Class<T> expectedType) throws JAXBException {
         if(expectedType==null)
@@ -297,9 +306,11 @@ public final class UnmarshallerImpl extends AbstractUnmarshallerImpl implements
                 scanner.scan((Document)node);
             else
                 // no other type of input is supported
-                throw new IllegalArgumentException();
+                throw new IllegalArgumentException("Unexpected node type: "+node);
 
-            return handler.getContext().getResult();
+            Object retVal = handler.getContext().getResult();
+            handler.getContext().clearResult();
+            return retVal;
         } catch( SAXException e ) {
             throw createUnmarshalException(e);
         }
@@ -340,7 +351,9 @@ public final class UnmarshallerImpl extends AbstractUnmarshallerImpl implements
             throw handleStreamException(e);
         }
 
-        return h.getContext().getResult();
+        Object retVal = h.getContext().getResult();
+        h.getContext().clearResult();
+        return retVal;
     }
 
     @Override
@@ -422,6 +435,10 @@ public final class UnmarshallerImpl extends AbstractUnmarshallerImpl implements
             coordinator.classResolver = (ClassResolver)value;
             return;
         }
+        if(name.equals(ClassLoader.class.getName())) {
+            coordinator.classLoader = (ClassLoader)value;
+            return;
+        }
         super.setProperty(name, value);
     }
 
@@ -516,4 +533,8 @@ public final class UnmarshallerImpl extends AbstractUnmarshallerImpl implements
     public void setListener(Listener listener) {
         externalListener = listener;
     }
+
+    public UnmarshallingContext getContext() {
+        return coordinator;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
index bc0c0b30686..3a598b87726 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import java.lang.reflect.InvocationTargetException;
@@ -58,9 +59,9 @@ import com.sun.xml.internal.bind.v2.runtime.AssociationMap;
 import com.sun.xml.internal.bind.v2.runtime.Coordinator;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.JaxBeanInfo;
+import com.sun.xml.internal.bind.v2.runtime.ElementBeanInfoImpl;
 
 import org.xml.sax.ErrorHandler;
-import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.LocatorImpl;
 
@@ -86,6 +87,17 @@ public final class UnmarshallingContext extends Coordinator
      */
     private State current;
 
+    private static final LocatorEx DUMMY_INSTANCE;
+
+    static {
+        LocatorImpl loc = new LocatorImpl();
+        loc.setPublicId(null);
+        loc.setSystemId(null);
+        loc.setLineNumber(-1);
+        loc.setColumnNumber(-1);
+        DUMMY_INSTANCE = new LocatorExWrapper(loc);
+    }
+
     private @NotNull LocatorEx locator = DUMMY_INSTANCE;
 
     /** Root object that is being unmarshalled. */
@@ -159,6 +171,12 @@ public final class UnmarshallingContext extends Coordinator
      */
     public @Nullable ClassResolver classResolver;
 
+    /**
+     * User-supplied {@link ClassLoader} for converting name to {@link Class}.
+     * For backward compatibility, when null, use thread context classloader.
+     */
+    public @Nullable ClassLoader classLoader;
+
     /**
      * State information for each element.
      */
@@ -183,6 +201,30 @@ public final class UnmarshallingContext extends Coordinator
 
         /**
          * Hack for making JAXBElement unmarshalling work.
+         *
+         * <p>
+         * While the unmarshalling is in progress, the {@link #target} field stores the object being unmarshalled.
+         * This makes it convenient to keep track of the unmarshalling activity in context of XML infoset, but
+         * since there's only one {@link State} per element, this mechanism only works when there's one object
+         * per element, which breaks down when we have {@link JAXBElement}, since the presence of JAXBElement
+         * requires that we have two objects unmarshalled (a JAXBElement X and a value object Y bound to an XML type.)
+         *
+         * <p>
+         * So to make room for storing both, this {@link #backup} field is used. When we create X instance
+         * in the above example, we set that to {@code state.prev.target} and displace its old value to
+         * {@code state.prev.backup} (where Y goes to {@code state.target}.) Upon the completion of the unmarshalling
+         * of Y, we revert this.
+         *
+         * <p>
+         * While this attributes X incorrectly to its parent element, this preserves the parent/child
+         * relationship between unmarshalled objects and {@link State} parent/child relationship, and
+         * it thereby makes {@link Receiver} mechanism simpler.
+         *
+         * <p>
+         * Yes, I know this is a hack, and no, I'm not proud of it.
+         *
+         * @see ElementBeanInfoImpl.IntercepterLoader#startElement(State, TagName)
+         * @see ElementBeanInfoImpl.IntercepterLoader#intercept(State, Object)
          */
         public Object backup;
 
@@ -210,6 +252,8 @@ public final class UnmarshallingContext extends Coordinator
         public final State prev;
         private State next;
 
+        public boolean nil = false;
+
         /**
          * Gets the context.
          */
@@ -514,6 +558,13 @@ public final class UnmarshallingContext extends Coordinator
         throw new UnmarshalException((String)null);
     }
 
+    void clearResult() {
+        if (isUnmarshalInProgress) {
+            throw new IllegalStateException();
+        }
+        result = null;
+    }
+
     /**
      * Creates a new instance of the specified class.
      * In the unmarshaller, we need to check the user-specified factory class.
@@ -970,6 +1021,7 @@ public final class UnmarshallingContext extends Coordinator
          * Receives the root element and determines how to start
          * unmarshalling.
          */
+        @Override
         public void childElement(UnmarshallingContext.State state, TagName ea) throws SAXException {
             Loader loader = state.getContext().selectRootLoader(state,ea);
             if(loader!=null) {
@@ -1002,6 +1054,9 @@ public final class UnmarshallingContext extends Coordinator
                 ((JAXBElement<Object>)state.backup).setValue(o);
                 o = state.backup;
             }
+            if (state.nil) {
+                ((JAXBElement<Object>)o).setNil(true);
+            }
             state.getContext().result = o;
         }
     }
@@ -1126,14 +1181,32 @@ public final class UnmarshallingContext extends Coordinator
         return (UnmarshallingContext) Coordinator._getInstance();
     }
 
-    private static final LocatorEx DUMMY_INSTANCE;
+    /**
+     * Allows to access elements which are expected in current state.
+     * Useful for getting elements/attributes for current parent.
+     *
+     * @return
+     */
+    public Collection<QName> getCurrentExpectedElements() {
+        pushCoordinator();
+        try {
+            State s = getCurrentState();
+            Loader l = s.loader;
+            return l.getExpectedChildElements();
+        } finally {
+            popCoordinator();
+        }
+    }
 
-    static {
-        LocatorImpl loc = new LocatorImpl();
-        loc.setPublicId(null);
-        loc.setSystemId(null);
-        loc.setLineNumber(-1);
-        loc.setColumnNumber(-1);
-        DUMMY_INSTANCE = new LocatorExWrapper(loc);
+    /**
+     * Gets StructureLoader if used as loader.
+     * Useful when determining if element is mixed or not.
+     *
+     */
+    public StructureLoader getStructureLoader() {
+        if(current.loader instanceof StructureLoader)
+            return (StructureLoader)current.loader;
+
+        return null;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
index fdc871a2957..cc2c0732f24 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.v2.runtime.reflect.TransducedAccessor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
index 2b49b885ccc..5f2cd202ca7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java
@@ -23,9 +23,6 @@
  * have any questions.
  */
 
-/*
- * @(#)$Id: WildcardLoader.java,v 1.3.6.1 2006/08/23 17:24:39 kohsuke Exp $
- */
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.bind.annotation.DomHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
index 7e4078ce939..5039b9d6699 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.NamespaceContext;
@@ -143,9 +144,9 @@ public interface XmlVisitor {
          *
          * <p>
          * If this method returns true, all the whitespaces are considered significant
-         * and thus need to be reported as a {@link #text} event. Furthermore,
+         * and thus need to be reported as a {@link XmlVisitor#text} event. Furthermore,
          * if the element has no children (like &lt;foo/>), then it has to be reported
-         * an empty {@link #text} event.
+         * an empty {@link XmlVisitor#text} event.
          */
         boolean expectText();
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
index 740eaa6eaad..8ee61343376 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
@@ -29,6 +30,9 @@ import com.sun.xml.internal.bind.api.AccessorException;
 import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
 
+import java.util.Collection;
+import javax.xml.bind.JAXBElement;
+import javax.xml.namespace.QName;
 import org.xml.sax.SAXException;
 
 /**
@@ -49,17 +53,24 @@ public class XsiNilLoader extends ProxyLoader {
     protected Loader selectLoader(UnmarshallingContext.State state, TagName ea) throws SAXException {
         int idx = ea.atts.getIndex(WellKnownNamespace.XML_SCHEMA_INSTANCE,"nil");
 
-        if(idx!=-1) {
-            String value = ea.atts.getValue(idx);
-            if(DatatypeConverterImpl._parseBoolean(value)) {
+        if (idx!=-1) {
+            if (DatatypeConverterImpl._parseBoolean(ea.atts.getValue(idx))) {
                 onNil(state);
-                return Discarder.INSTANCE;
+                boolean hasOtherAttributes = (ea.atts.getLength() - 1) > 0;
+                // see issues 6759703 and 565 - need to preserve attributes even if the element is nil; only when the type is stored in JAXBElement
+                if (!(hasOtherAttributes && (state.prev.target instanceof JAXBElement))) {
+                    return Discarder.INSTANCE;
+                }
             }
         }
-
         return defaultLoader;
     }
 
+        @Override
+        public Collection<QName> getExpectedChildElements() {
+            return defaultLoader.getExpectedChildElements();
+        }
+
     /**
      * Called when xsi:nil='true' was found.
      */
@@ -75,13 +86,16 @@ public class XsiNilLoader extends ProxyLoader {
             this.acc = acc;
         }
 
+        @Override
         protected void onNil(UnmarshallingContext.State state) throws SAXException {
             try {
                 acc.set(state.prev.target,null);
+                state.prev.nil = true;
             } catch (AccessorException e) {
                 handleGenericException(e,true);
             }
         }
+
     }
 
     public static final class Array extends XsiNilLoader {
@@ -89,6 +103,7 @@ public class XsiNilLoader extends ProxyLoader {
             super(core);
         }
 
+        @Override
         protected void onNil(UnmarshallingContext.State state) {
             // let the receiver add this to the lister
             state.target = null;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
index f3d8cdb12df..125a1dbbd24 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.runtime.unmarshaller;
 
 import javax.xml.namespace.QName;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
index 8d6ba01718d..9c9cb2326a5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java
index 14772100d15..44baa3b28f0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import javax.xml.bind.annotation.XmlNsForm;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
index 6b2dee052d2..957c3ab9c5b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import com.sun.xml.internal.bind.v2.schemagen.xmlschema.Particle;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java
index 2743e2cabdc..b228940bd2e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import java.util.ResourceBundle;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties
index 28d7d716366..b682ad241d6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties
@@ -24,4 +24,3 @@
 #
 
 ANONYMOUS_TYPE_CYCLE=Anonymous types form an infinite cycle: {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
index 6c8c84237c6..dfdc34c5ee7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import java.util.TreeMap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java
index c3b041989a4..8f4881d02e2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
index 2676fc62caf..d71d1023b48 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen;
 
 import java.io.IOException;
@@ -42,6 +43,7 @@ import java.util.logging.Logger;
 
 import javax.activation.MimeType;
 import javax.xml.bind.SchemaOutputResolver;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Result;
 import javax.xml.transform.stream.StreamResult;
@@ -54,6 +56,7 @@ import com.sun.xml.internal.bind.api.ErrorListener;
 import com.sun.xml.internal.bind.v2.TODO;
 import com.sun.xml.internal.bind.v2.WellKnownNamespace;
 import com.sun.xml.internal.bind.v2.util.CollisionCheckStack;
+import com.sun.xml.internal.bind.v2.util.StackRecorder;
 import static com.sun.xml.internal.bind.v2.WellKnownNamespace.XML_SCHEMA;
 import com.sun.xml.internal.bind.v2.model.core.Adapter;
 import com.sun.xml.internal.bind.v2.model.core.ArrayInfo;
@@ -267,9 +270,27 @@ public final class XmlSchemaGenerator<T,C,F,M> {
     public void add( ElementInfo<T,C> elem ) {
         assert elem!=null;
 
+        boolean nillable = false; // default value
+
         QName name = elem.getElementName();
         Namespace n = getNamespace(name.getNamespaceURI());
-        n.elementDecls.put(name.getLocalPart(),n.new ElementWithType(true,elem.getContentType()));
+        ElementInfo ei;
+
+        if (elem.getScope() != null) { // (probably) never happens
+            ei = this.types.getElementInfo(elem.getScope().getClazz(), name);
+        } else {
+            ei = this.types.getElementInfo(null, name);
+        }
+
+        XmlElement xmlElem = ei.getProperty().readAnnotation(XmlElement.class);
+
+        if (xmlElem == null) {
+            nillable = false;
+        } else {
+            nillable = xmlElem.nillable();
+        }
+
+        n.elementDecls.put(name.getLocalPart(),n.new ElementWithType(nillable, elem.getContentType()));
 
         // search for foreign namespace references
         n.processForeignNamespaces(elem.getProperty());
@@ -404,6 +425,11 @@ public final class XmlSchemaGenerator<T,C,F,M> {
         if(resolver==null)
             throw new IllegalArgumentException();
 
+        if(logger.isLoggable(Level.FINE)) {
+            // debug logging to see what's going on.
+            logger.log(Level.FINE,"Wrigin XML Schema for "+toString(),new StackRecorder());
+        }
+
         // make it fool-proof
         resolver = new FoolProofResolver(resolver);
         this.errorListener = errorListener;
@@ -1026,7 +1052,7 @@ public final class XmlSchemaGenerator<T,C,F,M> {
                         if(ep.isCollectionNillable()) {
                             e.nillable(true);
                         }
-                        writeOccurs(e,true,repeated);
+                        writeOccurs(e,!ep.isCollectionRequired(),repeated);
 
                         ComplexType p = e.complexType();
                         choice.write(p);
@@ -1180,10 +1206,7 @@ public final class XmlSchemaGenerator<T,C,F,M> {
             }
 
 
-            final Tree choice = Tree.makeGroup(GroupKind.CHOICE, children).makeRepeated(rp.isCollection()).makeOptional(rp.isCollection());
-            // it's a curious omission that XmlElementRef doesn't have required().
-            // instead right now a collection will make it [0,unbounded]
-
+            final Tree choice = Tree.makeGroup(GroupKind.CHOICE, children).makeRepeated(rp.isCollection()).makeOptional(!rp.isRequired());
 
             final QName ename = rp.getXmlName();
 
@@ -1253,6 +1276,16 @@ public final class XmlSchemaGenerator<T,C,F,M> {
             addDependencyTo(tref.getTarget().getTypeName());
         }
 
+        @Override
+        public String toString() {
+            StringBuilder buf = new StringBuilder();
+            buf.append("[classes=").append(classes);
+            buf.append(",elementDecls=").append(elementDecls);
+            buf.append(",enums=").append(enums);
+            buf.append("]");
+            return super.toString();
+        }
+
         /**
          * Represents a global element declaration to be written.
          *
@@ -1338,6 +1371,18 @@ public final class XmlSchemaGenerator<T,C,F,M> {
         return (o.equals(adapter.adapterType));
     }
 
+    /**
+     * Debug information of what's in this {@link XmlSchemaGenerator}.
+     */
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        for (Namespace ns : namespaces.values()) {
+            if(buf.length()>0)  buf.append(',');
+            buf.append(ns.uri).append('=').append(ns);
+        }
+        return super.toString()+'['+buf+']';
+    }
+
     /**
      * return the string representation of the processContents mode of the
      * give wildcard, or null if it is the schema default "strict"
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
index bf833917799..e57adb1dc87 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen.episode;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
index fbdf2f92cdb..fac53cb32ee 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen.episode;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
index 534ff758a77..c068d0d7d69 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen.episode;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
index 4af20cdc167..459ab49f122 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * TXW interfaces for writing episode file, which is what XJC needs to
  * handle separate compilation.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java
index 336802edd2f..7eaa75b0714 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 /**
  * Schema generator.
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
index 013f0aa20a9..77ad41a5bf1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 import com.sun.xml.internal.txw2.TypedXmlWriter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
index d3a0c64ff86..14c207785e0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java
@@ -37,10 +37,10 @@ public interface Element
     public Element type(QName value);
 
     @XmlAttribute
-    public Element block(String value);
+    public Element block(String[] value);
 
     @XmlAttribute
-    public Element block(String[] value);
+    public Element block(String value);
 
     @XmlAttribute
     public Element nillable(boolean value);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
index 2fbb76652d5..b504004cb93 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java
@@ -35,10 +35,10 @@ public interface Occurs
     @XmlAttribute
     public Occurs minOccurs(int value);
 
-    @XmlAttribute
-    public Occurs maxOccurs(int value);
-
     @XmlAttribute
     public Occurs maxOccurs(String value);
 
+    @XmlAttribute
+    public Occurs maxOccurs(int value);
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
index 3b5f9b625c0..4aa85f01b17 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.schemagen.xmlschema;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
index 6f7700794b8..b696d455a1e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java
@@ -56,10 +56,10 @@ public interface Schema
     public Schema attributeFormDefault(String value);
 
     @XmlAttribute
-    public Schema blockDefault(String value);
+    public Schema blockDefault(String[] value);
 
     @XmlAttribute
-    public Schema blockDefault(String[] value);
+    public Schema blockDefault(String value);
 
     @XmlAttribute
     public Schema finalDefault(String value);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
index a417fdeb7df..e9a8d331971 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java
@@ -35,10 +35,10 @@ public interface SimpleType
 
 
     @XmlAttribute("final")
-    public SimpleType _final(String[] value);
+    public SimpleType _final(String value);
 
     @XmlAttribute("final")
-    public SimpleType _final(String value);
+    public SimpleType _final(String[] value);
 
     @XmlAttribute
     public SimpleType name(String value);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
index 07d0233be81..3b5eea1948e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java
@@ -35,10 +35,10 @@ public interface Wildcard
     @XmlAttribute
     public Wildcard processContents(String value);
 
-    @XmlAttribute
-    public Wildcard namespace(String[] value);
-
     @XmlAttribute
     public Wildcard namespace(String value);
 
+    @XmlAttribute
+    public Wildcard namespace(String[] value);
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java
index 05c7fda79b5..7d21af46944 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.util;
 
 import java.io.ByteArrayOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java
index c563b01c95d..572158da2f9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.util;
 
 import java.util.AbstractList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
index 6b017eb985b..dab533381bb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.util;
 
 import java.io.IOException;
@@ -58,6 +59,12 @@ public final class DataSourceSource extends StreamSource {
      */
     private final String charset;
 
+    // remember the value we returned so that the 2nd invocation
+    // will return the same object, which is what's expeted out of
+    // StreamSource
+    private Reader r;
+    private InputStream is;
+
     public DataSourceSource(DataHandler dh) throws MimeTypeParseException {
         this(dh.getDataSource());
     }
@@ -88,7 +95,9 @@ public final class DataSourceSource extends StreamSource {
     public Reader getReader() {
         try {
             if(charset==null)   return null;
-            else                return new InputStreamReader(source.getInputStream(),charset);
+            if(r==null)
+                r = new InputStreamReader(source.getInputStream(),charset);
+            return r;
         } catch (IOException e) {
             // argh
             throw new RuntimeException(e);
@@ -98,8 +107,10 @@ public final class DataSourceSource extends StreamSource {
     @Override
     public InputStream getInputStream() {
         try {
-            if(charset==null)   return source.getInputStream();
-            else                return null;
+            if(charset!=null)   return null;
+            if(is==null)
+                is = source.getInputStream();
+            return is;
         } catch (IOException e) {
             // argh
             throw new RuntimeException(e);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java
index 6c35c5998d7..4e96a868abd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * @(#)$Id$
- */
-
-
 package com.sun.xml.internal.bind.v2.util;
 
 import java.util.Collection;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
index 52ddc36fc7f..5bacaacd64d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.util;
 
 import org.xml.sax.ErrorHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
index b93b6ec8524..67ef586ed88 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.util;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java
index 00fbb5dadd0..b354a0647db 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.util;
 import java.util.AbstractSet;
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java
new file mode 100644
index 00000000000..93191c0a88e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.bind.v2.util;
+
+/**
+ * Created to record the caller stack trace in logging.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class StackRecorder extends Throwable {
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java
index 0b0d7e4be85..ed84658438b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.bind.v2.util;
 
 import java.util.Map;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java
index 7ffc6efdb29..8d2328510bc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java
@@ -58,7 +58,7 @@ import java.util.Vector;
  * @author David Brownell
  * @author Janet Koenig
  * @author Kohsuke KAWAGUCHI
- * @version $Id: DTDParser.java,v 1.1 2005/05/15 04:24:19 kohsuke Exp $
+ * @version $Id: DTDParser.java,v 1.1 2005/05/31 22:28:54 kohsuke Exp $
  */
 public class DTDParser {
     public final static String TYPE_CDATA = "CDATA";
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties
index 57f36287012..9edd202c70e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties
@@ -28,7 +28,7 @@
 #
 # P-NNN ... parser messages
 # F-NNN ... message fragments (sometimes associated with more
-#		than one message, but usually just with one)
+#               than one message, but usually just with one)
 # V-NNN ... validation related messages
 #
 # Most messages can be produced in only one way.
@@ -45,51 +45,51 @@ P-003 = Premature end of input
 P-004 = Missing whitespace {0}
 P-005 = Only whitespace allowed {0}
 
-	#
-	# unadorned "missing whitespace", with P-004 only
-	#
-	F-000 = after element name declaration
-	F-001 = between attribute name and type
-	F-002 = after NOTATION type name
-	F-003 = between attribute type and default value
-	F-004 = after #FIXED
-	F-005 = after <!ENTITY declaration
-	F-006 = after % in parameter entity declaration
-	F-007 = after entity name
-	F-008 = before SYSTEM literal URI
-	F-009 = after PUBLIC keyword
-	# F-010 ... identifier can be reused
-	F-011 = after notation name
-	# F-012 ... identifier can be reused
-	# F-013 ... identifier can be reused
+        #
+        # unadorned "missing whitespace", with P-004 only
+        #
+        F-000 = after element name declaration
+        F-001 = between attribute name and type
+        F-002 = after NOTATION type name
+        F-003 = between attribute type and default value
+        F-004 = after #FIXED
+        F-005 = after <!ENTITY declaration
+        F-006 = after % in parameter entity declaration
+        F-007 = after entity name
+        F-008 = before SYSTEM literal URI
+        F-009 = after PUBLIC keyword
+        # F-010 ... identifier can be reused
+        F-011 = after notation name
+        # F-012 ... identifier can be reused
+        # F-013 ... identifier can be reused
 
-	#
-	# in declaration, in "S Name", with P-004 and P-005
-	#
-	F-014 = before name in <!DOCTYPE declaration
-	F-015 = before name in <!ELEMENT declaration
-	F-016 = before name in <!ATTLIST declaration
-	F-017 = before name in <!ENTITY declaration
-	F-018 = before NDATA notation name in <!ENTITY declaration
-	F-019 = before name in <!NOTATION declaration
+        #
+        # in declaration, in "S Name", with P-004 and P-005
+        #
+        F-014 = before name in <!DOCTYPE declaration
+        F-015 = before name in <!ELEMENT declaration
+        F-016 = before name in <!ATTLIST declaration
+        F-017 = before name in <!ENTITY declaration
+        F-018 = before NDATA notation name in <!ENTITY declaration
+        F-019 = before name in <!NOTATION declaration
 
 P-006 = Name tokens must not start with "{0}" characters
 P-007 = Value must be quoted
 P-008 = Next character must be "{0}" {1} {2}
 
-	F-020 = terminating reference to entity
-	F-021 = terminating reference to parameter entity
-	F-022 = terminating comment
-	F-023 = in XML Declaration
-	F-024 = terminating internal DTD subset
-	F-025 = terminating <!DOCTYPE ...> declaration
-	F-026 = after attribute name
-	F-027 = terminating element
-	F-028 = starting content model for element
-	F-029 = starting list of attribute NOTATIONS
-	F-030 = beginning condition DTD subset
-	F-031 = terminating <!ENTITY ...> declaration
-	F-032 = terminating <!NOTATION ...> declaration
+        F-020 = terminating reference to entity
+        F-021 = terminating reference to parameter entity
+        F-022 = terminating comment
+        F-023 = in XML Declaration
+        F-024 = terminating internal DTD subset
+        F-025 = terminating <!DOCTYPE ...> declaration
+        F-026 = after attribute name
+        F-027 = terminating element
+        F-028 = starting content model for element
+        F-029 = starting list of attribute NOTATIONS
+        F-030 = beginning condition DTD subset
+        F-031 = terminating <!ENTITY ...> declaration
+        F-032 = terminating <!NOTATION ...> declaration
 
 P-009 = Illegal character or entity reference syntax
 
@@ -99,10 +99,10 @@ P-012 = Use "&lt;" for "<" in attribute values
 P-013 = Illegal reference to external entity "&{0};" in attribute
 P-014 = Reference to undefined entity "&{0};"
 P-015 = Expecting quoted value for {0}
-	
-	F-033 = PUBLIC identifier
-	F-034 = SYSTEM identifier
-	F-035 = attribute value {0}
+
+        F-033 = PUBLIC identifier
+        F-034 = SYSTEM identifier
+        F-035 = attribute value {0}
 
 P-016 = Illegal character in PUBLIC identifier:  "{0}"
 P-017 = End of entity while processing comment
@@ -155,7 +155,7 @@ P-059 = External parameter entity "%{0};" has characters after markup
 
 P-060 = Illegal character "{0}" in encoding name
 P-061 = Declared encoding "{0}" does not match actual one "{1}"; \
-	this might not be an error
+        this might not be an error
 P-062 = Notation must be PUBLIC or SYSTEM
 P-063 = Using first definition of notation "{0}"
 P-064 = Premature end of parameter entity "%{0};"
@@ -175,10 +175,10 @@ P-076 = Character conversion error: "{0}" (line number may be too low)
 P-077 = Maximum symbol length ({0} characters) exceeded
 P-078 = No messages for locale "{0}" are available
 P-079 = The content beginning "<{1}" is not legal markup \
-	Perhaps the "{1}" (&#{0};) character should be a letter
+        Perhaps the "{1}" (&#{0};) character should be a letter
 
 P-080 = Parameter entity references must not appear within \
-	markup declarations in the internal DTD subset
+        markup declarations in the internal DTD subset
 P-081 = Incomplete Unicode surrogate pair:  &#x{0}
 
 #
@@ -188,7 +188,7 @@ P-081 = Incomplete Unicode surrogate pair:  &#x{0}
 # there's no need for the VC, ever; and "standalone" would then affect
 # WF-ness.  For the moment this assumes it's to be a VC not a WFC
 #
-V-000 =	Validation is disabled
+V-000 = Validation is disabled
 V-001 = Valid documents must have a <!DOCTYPE declaration
 V-002 = This document is standalone, so it must not refer to "&{0};"
 V-003 = Undeclared notation "{0}" is used by an <!ENTITY...> declaration
@@ -200,9 +200,9 @@ V-008 = Attribute "{0}" of element "{1}" must only have value "{2}"
 V-009 = Attribute value for "{0}" is #REQUIRED
 
 V-010 = This document is standalone, \
-	so attribute "{0}" must not be defaulted
+        so attribute "{0}" must not be defaulted
 V-011 = This document is standalone, \
-	so element "{0}" must not have ignorable whitespace
+        so element "{0}" must not have ignorable whitespace
 V-012 = Element "{0}" was already declared
 V-013 = Parameter entities must not contain partial declarations
 V-014 = Parameter entity nesting error in content model for "{0}"
@@ -235,4 +235,3 @@ V-038 = Element "{0}" requires additional elements
 V-039 = IDREFS attributes must have at least one value
 
 V-040 = ENTITIES attributes must have at least one value
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
index 27e8640b690..302eb930ad9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java
@@ -24,6 +24,14 @@
  *
  * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
+/*
+ *
+ * This code is subject to the freebxml License, Version 1.1
+ *
+ * Copyright (c) 2001 - 2005 freebxml.org.  All rights reserved.
+ *
+ * $Header: /cvs/fi/FastInfoset/src/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java,v 1.3.2.4 2009/05/13 08:53:01 oleksiys Exp $
+ */
 package com.sun.xml.internal.fastinfoset;
 
 import java.text.MessageFormat;
@@ -35,19 +43,12 @@ import java.util.ResourceBundle;
 /**
  * This class contains methods common to all *ResourceBundle classes
  *
- * @author  Paul Sterk / Sun Microsystems
+ * @author FastInfoset team
  */
 public abstract class AbstractResourceBundle extends ResourceBundle {
 
     public static final String LOCALE = "com.sun.xml.internal.fastinfoset.locale";
-    static String _bundleName = null;
 
-    public static String getBundleName() {
-        return _bundleName;
-    }
-    public static void setBundleName(String name) {
-        _bundleName = name;
-    }
     /**
      * Gets 'key' from ResourceBundle and format mesage using 'args'.
      *
@@ -60,24 +61,6 @@ public abstract class AbstractResourceBundle extends ResourceBundle {
         return MessageFormat.format(pattern, args);
     }
 
-    /**
-     * Gets 'key' from ResourceBundle and format mesage using 'args'.
-     *
-     * @param key String key for message.
-     * @param args Array of arguments for message.
-     * @param locale Locale in which to perform key lookup.
-     * @return String formatted message.
-     */
-    public String getString(String key, Object args[], Locale locale) {
-        String pattern = null;
-        if (locale == null) {
-            pattern = getBundle().getString(key);
-        } else {
-            pattern = getBundle(_bundleName, locale).getString(key);
-        }
-        return MessageFormat.format(pattern, args);
-    }
-
     /**
      * Parse a locale string, return corresponding Locale instance.
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java
index 68619d68bef..beeaf0dd907 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java
@@ -72,11 +72,14 @@ import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetParser;
  */
 public abstract class Decoder implements FastInfosetParser {
 
-    protected static final char[] XML_NAMESPACE_NAME_CHARS = EncodingConstants.XML_NAMESPACE_NAME.toCharArray();
+    private static final char[] XML_NAMESPACE_NAME_CHARS =
+            EncodingConstants.XML_NAMESPACE_NAME.toCharArray();
 
-    protected static final char[] XMLNS_NAMESPACE_PREFIX_CHARS = EncodingConstants.XMLNS_NAMESPACE_PREFIX.toCharArray();
+    private static final char[] XMLNS_NAMESPACE_PREFIX_CHARS =
+            EncodingConstants.XMLNS_NAMESPACE_PREFIX.toCharArray();
 
-    protected static final char[] XMLNS_NAMESPACE_NAME_CHARS = EncodingConstants.XMLNS_NAMESPACE_NAME.toCharArray();
+    private static final char[] XMLNS_NAMESPACE_NAME_CHARS =
+            EncodingConstants.XMLNS_NAMESPACE_NAME.toCharArray();
 
     /**
      * String interning system property.
@@ -592,7 +595,7 @@ public abstract class Decoder implements FastInfosetParser {
                     prefixIndex, namespaceNameIndex, localNameIndex,
                     _charBuffer);
             if (isAttribute) {
-                qualifiedName.createAttributeValues(_duplicateAttributeVerifier.MAP_SIZE);
+                qualifiedName.createAttributeValues(DuplicateAttributeVerifier.MAP_SIZE);
             }
             array.add(qualifiedName);
         }
@@ -755,7 +758,7 @@ public abstract class Decoder implements FastInfosetParser {
      */
     protected final int decodeNonIdentifyingStringOnFirstBit() throws FastInfosetException, IOException {
         final int b = read();
-        switch(DecoderStateTables.NISTRING[b]) {
+        switch(DecoderStateTables.NISTRING(b)) {
             case DecoderStateTables.NISTRING_UTF8_SMALL_LENGTH:
                 _addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
                 _octetBufferLength = (b & EncodingConstants.OCTET_STRING_LENGTH_5TH_BIT_SMALL_MASK) + 1;
@@ -844,7 +847,7 @@ public abstract class Decoder implements FastInfosetParser {
         // Remove top 4 bits of restricted alphabet or encoding algorithm integer
         b &= 0x0F;
         // Reuse UTF8 length states
-        switch(DecoderStateTables.NISTRING[b]) {
+        switch(DecoderStateTables.NISTRING(b)) {
             case DecoderStateTables.NISTRING_UTF8_SMALL_LENGTH:
                 _octetBufferLength = b + 1;
                 break;
@@ -901,7 +904,7 @@ public abstract class Decoder implements FastInfosetParser {
      */
     protected final String decodeIdentifyingNonEmptyStringOnFirstBit(StringArray table) throws FastInfosetException, IOException {
         final int b = read();
-        switch(DecoderStateTables.ISTRING[b]) {
+        switch(DecoderStateTables.ISTRING(b)) {
             case DecoderStateTables.ISTRING_SMALL_LENGTH:
             {
                 _octetBufferLength = b + 1;
@@ -950,7 +953,7 @@ public abstract class Decoder implements FastInfosetParser {
      */
     protected final String decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(boolean namespaceNamePresent) throws FastInfosetException, IOException {
         final int b = read();
-        switch(DecoderStateTables.ISTRING_PREFIX_NAMESPACE[b]) {
+        switch(DecoderStateTables.ISTRING_PREFIX_NAMESPACE(b)) {
             case DecoderStateTables.ISTRING_PREFIX_NAMESPACE_LENGTH_3:
             {
                 _octetBufferLength = EncodingConstants.XML_NAMESPACE_PREFIX_LENGTH;
@@ -1016,7 +1019,7 @@ public abstract class Decoder implements FastInfosetParser {
                 if (namespaceNamePresent) {
                     _prefixIndex = 0;
                     // Peak at next byte and check the index of the XML namespace name
-                    if (DecoderStateTables.ISTRING_PREFIX_NAMESPACE[peek()]
+                    if (DecoderStateTables.ISTRING_PREFIX_NAMESPACE(peek())
                             != DecoderStateTables.ISTRING_PREFIX_NAMESPACE_INDEX_ZERO) {
                         throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.wrongNamespaceName"));
                     }
@@ -1045,12 +1048,12 @@ public abstract class Decoder implements FastInfosetParser {
      */
     protected final String decodeIdentifyingNonEmptyStringIndexOnFirstBitAsPrefix(boolean namespaceNamePresent) throws FastInfosetException, IOException {
         final int b = read();
-        switch(DecoderStateTables.ISTRING_PREFIX_NAMESPACE[b]) {
+        switch(DecoderStateTables.ISTRING_PREFIX_NAMESPACE(b)) {
             case DecoderStateTables.ISTRING_PREFIX_NAMESPACE_INDEX_ZERO:
                 if (namespaceNamePresent) {
                     _prefixIndex = 0;
                     // Peak at next byte and check the index of the XML namespace name
-                    if (DecoderStateTables.ISTRING_PREFIX_NAMESPACE[peek()]
+                    if (DecoderStateTables.ISTRING_PREFIX_NAMESPACE(peek())
                             != DecoderStateTables.ISTRING_PREFIX_NAMESPACE_INDEX_ZERO) {
                         throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.wrongNamespaceName"));
                     }
@@ -1081,7 +1084,7 @@ public abstract class Decoder implements FastInfosetParser {
      */
     protected final String decodeIdentifyingNonEmptyStringOnFirstBitAsNamespaceName(boolean prefixPresent) throws FastInfosetException, IOException {
         final int b = read();
-        switch(DecoderStateTables.ISTRING_PREFIX_NAMESPACE[b]) {
+        switch(DecoderStateTables.ISTRING_PREFIX_NAMESPACE(b)) {
             case DecoderStateTables.ISTRING_PREFIX_NAMESPACE_LENGTH_3:
             case DecoderStateTables.ISTRING_PREFIX_NAMESPACE_LENGTH_5:
             case DecoderStateTables.ISTRING_SMALL_LENGTH:
@@ -1165,7 +1168,7 @@ public abstract class Decoder implements FastInfosetParser {
      */
     protected final String decodeIdentifyingNonEmptyStringIndexOnFirstBitAsNamespaceName(boolean prefixPresent) throws FastInfosetException, IOException {
         final int b = read();
-        switch(DecoderStateTables.ISTRING_PREFIX_NAMESPACE[b]) {
+        switch(DecoderStateTables.ISTRING_PREFIX_NAMESPACE(b)) {
             case DecoderStateTables.ISTRING_PREFIX_NAMESPACE_INDEX_ZERO:
                 if (prefixPresent) {
                     _namespaceNameIndex = 0;
@@ -1220,7 +1223,7 @@ public abstract class Decoder implements FastInfosetParser {
      */
     protected final void decodeNonEmptyOctetStringLengthOnSecondBit() throws FastInfosetException, IOException {
         final int b = read();
-        switch(DecoderStateTables.ISTRING[b]) {
+        switch(DecoderStateTables.ISTRING(b)) {
             case DecoderStateTables.ISTRING_SMALL_LENGTH:
                 _octetBufferLength = b + 1;
                 break;
@@ -1249,7 +1252,7 @@ public abstract class Decoder implements FastInfosetParser {
      */
     protected final int decodeIntegerIndexOnSecondBit() throws FastInfosetException, IOException {
         final int b = read();
-        switch(DecoderStateTables.ISTRING[b]) {
+        switch(DecoderStateTables.ISTRING(b)) {
             case DecoderStateTables.ISTRING_INDEX_SMALL:
                 return b & EncodingConstants.INTEGER_2ND_BIT_SMALL_MASK;
             case DecoderStateTables.ISTRING_INDEX_MEDIUM:
@@ -1454,7 +1457,7 @@ public abstract class Decoder implements FastInfosetParser {
         int b1;
         while (end != _octetBufferOffset) {
             b1 = _octetBuffer[_octetBufferOffset++] & 0xFF;
-            if (DecoderStateTables.UTF8[b1] == DecoderStateTables.UTF8_ONE_BYTE) {
+            if (DecoderStateTables.UTF8(b1) == DecoderStateTables.UTF8_ONE_BYTE) {
                 _charBuffer[_charBufferLength++] = (char) b1;
             } else {
                 decodeTwoToFourByteUtf8Character(b1, end);
@@ -1468,7 +1471,7 @@ public abstract class Decoder implements FastInfosetParser {
         int b1;
         while (end != _octetBufferOffset) {
             b1 = _octetBuffer[_octetBufferOffset++] & 0xFF;
-            if (DecoderStateTables.UTF8[b1] == DecoderStateTables.UTF8_ONE_BYTE) {
+            if (DecoderStateTables.UTF8(b1) == DecoderStateTables.UTF8_ONE_BYTE) {
                 ch[_charBufferLength++] = (char) b1;
             } else {
                 decodeTwoToFourByteUtf8Character(ch, b1, end);
@@ -1478,7 +1481,7 @@ public abstract class Decoder implements FastInfosetParser {
     }
 
     private void decodeTwoToFourByteUtf8Character(int b1, int end) throws IOException {
-        switch(DecoderStateTables.UTF8[b1]) {
+        switch(DecoderStateTables.UTF8(b1)) {
             case DecoderStateTables.UTF8_TWO_BYTES:
             {
                 // Decode byte 2
@@ -1523,7 +1526,7 @@ public abstract class Decoder implements FastInfosetParser {
     }
 
     private void decodeTwoToFourByteUtf8Character(char ch[], int b1, int end) throws IOException {
-        switch(DecoderStateTables.UTF8[b1]) {
+        switch(DecoderStateTables.UTF8(b1)) {
             case DecoderStateTables.UTF8_TWO_BYTES:
             {
                 // Decode byte 2
@@ -1576,7 +1579,7 @@ public abstract class Decoder implements FastInfosetParser {
         final int end = _octetBufferLength + _octetBufferOffset;
 
         int b1 = _octetBuffer[_octetBufferOffset++] & 0xFF;
-        if (DecoderStateTables.UTF8_NCNAME[b1] == DecoderStateTables.UTF8_NCNAME_NCNAME) {
+        if (DecoderStateTables.UTF8_NCNAME(b1) == DecoderStateTables.UTF8_NCNAME_NCNAME) {
             _charBuffer[_charBufferLength++] = (char) b1;
         } else {
             decodeUtf8NCNameStartTwoToFourByteCharacters(b1, end);
@@ -1584,7 +1587,7 @@ public abstract class Decoder implements FastInfosetParser {
 
         while (end != _octetBufferOffset) {
             b1 = _octetBuffer[_octetBufferOffset++] & 0xFF;
-            if (DecoderStateTables.UTF8_NCNAME[b1] < DecoderStateTables.UTF8_TWO_BYTES) {
+            if (DecoderStateTables.UTF8_NCNAME(b1) < DecoderStateTables.UTF8_TWO_BYTES) {
                 _charBuffer[_charBufferLength++] = (char) b1;
             } else {
                 decodeUtf8NCNameTwoToFourByteCharacters(b1, end);
@@ -1593,7 +1596,7 @@ public abstract class Decoder implements FastInfosetParser {
     }
 
     private void decodeUtf8NCNameStartTwoToFourByteCharacters(int b1, int end) throws IOException {
-        switch(DecoderStateTables.UTF8_NCNAME[b1]) {
+        switch(DecoderStateTables.UTF8_NCNAME(b1)) {
             case DecoderStateTables.UTF8_TWO_BYTES:
             {
                 // Decode byte 2
@@ -1642,7 +1645,7 @@ public abstract class Decoder implements FastInfosetParser {
     }
 
     private void decodeUtf8NCNameTwoToFourByteCharacters(int b1, int end) throws IOException {
-        switch(DecoderStateTables.UTF8_NCNAME[b1]) {
+        switch(DecoderStateTables.UTF8_NCNAME(b1)) {
             case DecoderStateTables.UTF8_TWO_BYTES:
             {
                 // Decode byte 2
@@ -1787,6 +1790,10 @@ public abstract class Decoder implements FastInfosetParser {
 
     }
 
+    protected String createQualifiedNameString(String second) {
+        return createQualifiedNameString(XMLNS_NAMESPACE_PREFIX_CHARS, second);
+    }
+
     protected String createQualifiedNameString(char[] first, String second) {
         final int l1 = first.length;
         final int l2 = second.length();
@@ -1880,10 +1887,12 @@ public abstract class Decoder implements FastInfosetParser {
             }
         }
 
+        @Override
         public int read(byte b[]) throws IOException {
             return read(b, 0, b.length);
         }
 
+        @Override
         public int read(byte b[], int off, int len) throws IOException {
             if (b == null) {
                 throw new NullPointerException();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
index 36a5b7be949..0bd59551810 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java
@@ -62,9 +62,9 @@ public class DecoderStateTables {
     public final static int TERMINATOR_SINGLE               = 22;
     public final static int TERMINATOR_DOUBLE               = 23;
 
-    public static final int[] DII = new int[256];
+    private static final int[] DII = new int[256];
 
-    private static int[][] DII_RANGES = {
+    private static final int[][] DII_RANGES = {
         // EII
 
         // %00000000 to %00011111  EII no attributes small index
@@ -161,9 +161,9 @@ public class DecoderStateTables {
         { 0xFF, TERMINATOR_DOUBLE }
     };
 
-    public static final int[] EII = new int[256];
+    private static final int[] EII = new int[256];
 
-    private static int[][] EII_RANGES = {
+    private static final int[][] EII_RANGES = {
         // EII
 
         // %00000000 to %00011111  EII no attributes small index
@@ -349,9 +349,9 @@ public class DecoderStateTables {
     public final static int AII_TERMINATOR_SINGLE           = 4;
     public final static int AII_TERMINATOR_DOUBLE           = 5;
 
-    public static final int[] AII = new int[256];
+    private static final int[] AII = new int[256];
 
-    private static int[][] AII_RANGES = {
+    private static final int[][] AII_RANGES = {
         // %00000000 to %00111111  AII small index
         { 0x3F, AII_INDEX_SMALL },
 
@@ -404,9 +404,9 @@ public class DecoderStateTables {
     public final static int NISTRING_INDEX_LARGE           = 10;
     public final static int NISTRING_EMPTY                 = 11;
 
-    public static final int[] NISTRING = new int[256];
+    private static final int[] NISTRING = new int[256];
 
-    private static int[][] NISTRING_RANGES = {
+    private static final int[][] NISTRING_RANGES = {
         // UTF-8 string
 
         // %00000000 to %00000111  UTF-8 no add to table small length
@@ -521,9 +521,9 @@ public class DecoderStateTables {
     /* package */ final static int ISTRING_INDEX_MEDIUM        = 4;
     /* package */ final static int ISTRING_INDEX_LARGE         = 5;
 
-    /* package */ static final int[] ISTRING = new int[256];
+    private static final int[] ISTRING = new int[256];
 
-    private static int[][] ISTRING_RANGES = {
+    private static final int[][] ISTRING_RANGES = {
         // %00000000 to %00111111 small length
         { 0x3F, ISTRING_SMALL_LENGTH },
 
@@ -559,9 +559,9 @@ public class DecoderStateTables {
     /* package */ final static int ISTRING_PREFIX_NAMESPACE_LENGTH_36  = 9;
     /* package */ final static int ISTRING_PREFIX_NAMESPACE_INDEX_ZERO = 10;
 
-    /* package */ static final int[] ISTRING_PREFIX_NAMESPACE = new int[256];
+    private static final int[] ISTRING_PREFIX_NAMESPACE = new int[256];
 
-    private static int[][] ISTRING_PREFIX_NAMESPACE_RANGES = {
+    private static final int[][] ISTRING_PREFIX_NAMESPACE_RANGES = {
         // %00000000 to %00000001 small length
         { 0x01, ISTRING_SMALL_LENGTH },
 
@@ -627,9 +627,9 @@ public class DecoderStateTables {
     /* package */ final static int UTF8_THREE_BYTES           = 3;
     /* package */ final static int UTF8_FOUR_BYTES            = 4;
 
-    /* package */ static final int[] UTF8_NCNAME = new int[256];
+    private static final int[] UTF8_NCNAME = new int[256];
 
-    private static int[][] UTF8_NCNAME_RANGES = {
+    private static final int[][] UTF8_NCNAME_RANGES = {
 
         // Basic Latin
 
@@ -699,9 +699,9 @@ public class DecoderStateTables {
 
     /* package */ final static int UTF8_ONE_BYTE = 1;
 
-    /* package */ static final int[] UTF8 = new int[256];
+    private static final int[] UTF8 = new int[256];
 
-    private static int[][] UTF8_RANGES = {
+    private static final int[][] UTF8_RANGES = {
 
         // Basic Latin
 
@@ -763,8 +763,40 @@ public class DecoderStateTables {
         }
     }
 
+    public static final int DII(final int index) {
+        return DII[index];
+    }
+
+    public static final int EII(final int index) {
+        return EII[index];
+    }
+
+    public static final int AII(final int index) {
+        return AII[index];
+    }
+
+    public static final int NISTRING(final int index) {
+        return NISTRING[index];
+    }
+
+    public static final int ISTRING(final int index) {
+        return ISTRING[index];
+    }
+
+    public static final int ISTRING_PREFIX_NAMESPACE(final int index) {
+        return ISTRING_PREFIX_NAMESPACE[index];
+    }
+
+    public static final int UTF8(final int index) {
+        return UTF8[index];
+    }
+
+    public static final int UTF8_NCNAME(final int index) {
+        return UTF8_NCNAME[index];
+    }
+
     static {
-        // EII
+        // DII
         constructTable(DII, DII_RANGES);
 
         // EII
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java
index b9983ddfb92..9c89e1d0b8c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java
@@ -95,9 +95,9 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         }
     }
 
-    protected static int[] NUMERIC_CHARACTERS_TABLE;
+    private static int[] NUMERIC_CHARACTERS_TABLE;
 
-    protected static int[] DATE_TIME_CHARACTERS_TABLE;
+    private static int[] DATE_TIME_CHARACTERS_TABLE;
 
     static {
         NUMERIC_CHARACTERS_TABLE = new int[maxCharacter(RestrictedAlphabet.NUMERIC_CHARACTERS) + 1];
@@ -235,10 +235,16 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected int _markIndex = -1;
 
     /**
-     * The limit on the size of [normalized value] of Attribute Information
+     * The minimum size of [normalized value] of Attribute Information
      * Items that will be indexed.
      */
-    protected int attributeValueSizeConstraint = FastInfosetSerializer.ATTRIBUTE_VALUE_SIZE_CONSTRAINT;
+    protected int minAttributeValueSize = FastInfosetSerializer.MIN_ATTRIBUTE_VALUE_SIZE;
+
+    /**
+     * The maximum size of [normalized value] of Attribute Information
+     * Items that will be indexed.
+     */
+    protected int maxAttributeValueSize = FastInfosetSerializer.MAX_ATTRIBUTE_VALUE_SIZE;
 
     /**
      * The limit on the size of indexed Map for attribute values
@@ -247,11 +253,18 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected int attributeValueMapTotalCharactersConstraint = FastInfosetSerializer.ATTRIBUTE_VALUE_MAP_MEMORY_CONSTRAINT / 2;
 
     /**
-     * The limit on the size of character content chunks
+     * The minimum size of character content chunks
      * of Character Information Items or Comment Information Items that
      * will be indexed.
      */
-    protected int characterContentChunkSizeContraint = FastInfosetSerializer.CHARACTER_CONTENT_CHUNK_SIZE_CONSTRAINT;
+    protected int minCharacterContentChunkSize = FastInfosetSerializer.MIN_CHARACTER_CONTENT_CHUNK_SIZE;
+
+    /**
+     * The maximum size of character content chunks
+     * of Character Information Items or Comment Information Items that
+     * will be indexed.
+     */
+    protected int maxCharacterContentChunkSize = FastInfosetSerializer.MAX_CHARACTER_CONTENT_CHUNK_SIZE;
 
     /**
      * The limit on the size of indexed Map for character content chunks
@@ -373,19 +386,44 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     /**
      * {@inheritDoc}
      */
-    public void setCharacterContentChunkSizeLimit(int size) {
-        if (size < 0 ) {
-            size = 0;
-        }
-
-        characterContentChunkSizeContraint = size;
+    public int getMinCharacterContentChunkSize() {
+        return minCharacterContentChunkSize;
     }
 
     /**
      * {@inheritDoc}
      */
-    public int getCharacterContentChunkSizeLimit() {
-        return characterContentChunkSizeContraint;
+    public void setMinCharacterContentChunkSize(int size) {
+        if (size < 0 ) {
+            size = 0;
+        }
+
+        minCharacterContentChunkSize = size;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getMaxCharacterContentChunkSize() {
+        return maxCharacterContentChunkSize;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setMaxCharacterContentChunkSize(int size) {
+        if (size < 0 ) {
+            size = 0;
+        }
+
+        maxCharacterContentChunkSize = size;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getCharacterContentChunkMapMemoryLimit() {
+        return characterContentChunkMapTotalCharactersConstraint * 2;
     }
 
     /**
@@ -400,42 +438,63 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     }
 
     /**
-     * {@inheritDoc}
+     * Checks whether character content chunk (its length) matches length limit
+     *
+     * @param length the length of character content chunk is checking to be added to Map.
+     * @return whether character content chunk length matches limit
      */
-    public int getCharacterContentChunkMapMemoryLimit() {
-        return characterContentChunkMapTotalCharactersConstraint * 2;
+    public boolean isCharacterContentChunkLengthMatchesLimit(int length) {
+        return length >= minCharacterContentChunkSize &&
+                length <= maxCharacterContentChunkSize;
     }
 
     /**
-     * Checks whether character content chunk (its length) matches limits:
-     * length limit itself and limit for total capacity of specified CharArrayIntMap
+     * Checks whether character content table has enough memory to
+     * store character content chunk with the given length
      *
      * @param length the length of character content chunk is checking to be added to Map.
      * @param map the custom CharArrayIntMap, which memory limits will be checked.
-     * @return whether character content chunk length matches limits
+     * @return whether character content map has enough memory
      */
-    public boolean isCharacterContentChunkLengthMatchesLimit(int length, CharArrayIntMap map) {
-        return (length < characterContentChunkSizeContraint) &&
-                (map.getTotalCharacterCount() + length <
-                        characterContentChunkMapTotalCharactersConstraint);
+    public boolean canAddCharacterContentToTable(int length, CharArrayIntMap map) {
+        return map.getTotalCharacterCount() + length <
+                        characterContentChunkMapTotalCharactersConstraint;
     }
 
     /**
      * {@inheritDoc}
      */
-    public void setAttributeValueSizeLimit(int size) {
+    public int getMinAttributeValueSize() {
+        return minAttributeValueSize;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setMinAttributeValueSize(int size) {
         if (size < 0 ) {
             size = 0;
         }
 
-        attributeValueSizeConstraint = size;
+        minAttributeValueSize = size;
     }
 
     /**
      * {@inheritDoc}
      */
-    public int getAttributeValueSizeLimit() {
-        return attributeValueSizeConstraint;
+    public int getMaxAttributeValueSize() {
+        return maxAttributeValueSize;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setMaxAttributeValueSize(int size) {
+        if (size < 0 ) {
+            size = 0;
+        }
+
+        maxAttributeValueSize = size;
     }
 
     /**
@@ -458,15 +517,26 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     }
 
     /**
-     * Checks whether attribute value (its length) matches limits:
-     * length limit itself and limit for index Map total capacity
+     * Checks whether attribute value (its length) matches length limit
      *
-     * @return whether attribute value matches limits
+     * @param length the length of attribute
+     * @return whether attribute value matches limit
      */
     public boolean isAttributeValueLengthMatchesLimit(int length) {
-        return (length < attributeValueSizeConstraint) &&
-                (_v.attributeValue.getTotalCharacterCount() + length <
-                        attributeValueMapTotalCharactersConstraint);
+        return length >= minAttributeValueSize &&
+                length <= maxAttributeValueSize;
+    }
+
+    /**
+     * Checks whether attribute table has enough memory to
+     * store attribute value with the given length
+     *
+     * @param length the length of attribute value is checking to be added to Map.
+     * @return whether attribute map has enough memory
+     */
+    public boolean canAddAttributeToTable(int length) {
+        return _v.attributeValue.getTotalCharacterCount() + length <
+                        attributeValueMapTotalCharactersConstraint;
     }
 
     /**
@@ -668,7 +738,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      * @throws ArrayIndexOutOfBoundsException.
      */
     protected final void encodeCharacters(char[] ch, int offset, int length) throws IOException {
-        final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
+        final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length);
         encodeNonIdentifyingStringOnThirdBit(ch, offset, length, _v.characterContentChunk, addToTable, true);
     }
 
@@ -685,10 +755,48 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      * @throws ArrayIndexOutOfBoundsException.
      */
     protected final void encodeCharactersNoClone(char[] ch, int offset, int length) throws IOException {
-        final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
+        final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length);
         encodeNonIdentifyingStringOnThirdBit(ch, offset, length, _v.characterContentChunk, addToTable, false);
     }
 
+    /**
+     * Encode a chunk of Character Information Items using a numeric
+     * alphabet that results in the encoding of a character in 4 bits
+     * (or two characters per octet).
+     *
+     * @param id the restricted alphabet identifier.
+     * @param table the table mapping characters to 4 bit values.
+     * @param ch the array of characters.
+     * @param offset the offset into the array of characters.
+     * @param length the length of characters.
+     * @param addToTable if characters should be added to table.
+     * @throws ArrayIndexOutOfBoundsException.
+     */
+    protected final void encodeNumericFourBitCharacters(char[] ch, int offset, int length,
+            boolean addToTable) throws FastInfosetException, IOException {
+        encodeFourBitCharacters(RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX,
+                NUMERIC_CHARACTERS_TABLE, ch, offset, length, addToTable);
+    }
+
+    /**
+     * Encode a chunk of Character Information Items using a date-time
+     * alphabet that results in the encoding of a character in 4 bits
+     * (or two characters per octet).
+     *
+     * @param id the restricted alphabet identifier.
+     * @param table the table mapping characters to 4 bit values.
+     * @param ch the array of characters.
+     * @param offset the offset into the array of characters.
+     * @param length the length of characters.
+     * @param addToTable if characters should be added to table.
+     * @throws ArrayIndexOutOfBoundsException.
+     */
+    protected final void encodeDateTimeFourBitCharacters(char[] ch, int offset, int length,
+            boolean addToTable) throws FastInfosetException, IOException {
+        encodeFourBitCharacters(RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX,
+                DATE_TIME_CHARACTERS_TABLE, ch, offset, length, addToTable);
+    }
+
     /**
      * Encode a chunk of Character Information Items using a restricted
      * alphabet that results in the encoding of a character in 4 bits
@@ -705,18 +813,31 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected final void encodeFourBitCharacters(int id, int[] table, char[] ch, int offset, int length,
             boolean addToTable) throws FastInfosetException, IOException {
         if (addToTable) {
-            final int index = _v.characterContentChunk.obtainIndex(ch, offset, length, true);
+            // if char array could be added to table
+            boolean canAddCharacterContentToTable =
+                    canAddCharacterContentToTable(length, _v.characterContentChunk);
+
+            // obtain/get index
+            int index = canAddCharacterContentToTable ?
+                _v.characterContentChunk.obtainIndex(ch, offset, length, true) :
+                _v.characterContentChunk.get(ch, offset, length);
+
             if (index != KeyIntMap.NOT_PRESENT) {
+                // if char array is in table
                 _b = EncodingConstants.CHARACTER_CHUNK | 0x20;
                 encodeNonZeroIntegerOnFourthBit(index);
                 return;
+            } else if (canAddCharacterContentToTable) {
+                // if char array is not in table, but could be added
+                _b = EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG | EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG;
+            } else {
+                // if char array is not in table and could not be added
+                _b = EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG;
             }
+        } else {
+            _b = EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG;
         }
 
-        // This procedure assumes that id <= 64
-        _b = (addToTable) ?
-            EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG | EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG :
-            EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG;
         write (_b);
 
         // Encode bottom 6 bits of enoding algorithm id
@@ -742,12 +863,29 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected final void encodeAlphabetCharacters(String alphabet, char[] ch, int offset, int length,
             boolean addToTable) throws FastInfosetException, IOException {
         if (addToTable) {
-            final int index = _v.characterContentChunk.obtainIndex(ch, offset, length, true);
+            // if char array could be added to table
+            boolean canAddCharacterContentToTable =
+                    canAddCharacterContentToTable(length, _v.characterContentChunk);
+
+            // obtain/get index
+            int index = canAddCharacterContentToTable ?
+                _v.characterContentChunk.obtainIndex(ch, offset, length, true) :
+                _v.characterContentChunk.get(ch, offset, length);
+
             if (index != KeyIntMap.NOT_PRESENT) {
+                // if char array is in table
                 _b = EncodingConstants.CHARACTER_CHUNK | 0x20;
                 encodeNonZeroIntegerOnFourthBit(index);
                 return;
+            } else if (canAddCharacterContentToTable) {
+                // if char array is not in table, but could be added
+                _b = EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG | EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG;
+            } else {
+                // if char array is not in table and could not be added
+                _b = EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG;
             }
+        } else {
+            _b = EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG;
         }
 
         int id = _v.restrictedAlphabet.get(alphabet);
@@ -756,9 +894,6 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         }
         id += EncodingConstants.RESTRICTED_ALPHABET_APPLICATION_START;
 
-        _b = (addToTable) ?
-            EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG | EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG :
-            EncodingConstants.CHARACTER_CHUNK | EncodingConstants.CHARACTER_CHUNK_RESTRICTED_ALPHABET_FLAG;
         _b |= (id & 0xC0) >> 6;
         write(_b);
 
@@ -781,7 +916,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         encodeIdentifyingNonEmptyStringOnFirstBit(target, _v.otherNCName);
 
         // Data
-        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(data.length(), _v.characterContentChunk);
+        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(data.length());
         encodeNonIdentifyingStringOnFirstBit(data, _v.otherString, addToTable);
     }
 
@@ -820,7 +955,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected final void encodeComment(char[] ch, int offset, int length) throws IOException {
         write(EncodingConstants.COMMENT);
 
-        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.otherString);
+        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length);
         encodeNonIdentifyingStringOnFirstBit(ch, offset, length, _v.otherString, addToTable, true);
     }
 
@@ -839,7 +974,7 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
     protected final void encodeCommentNoClone(char[] ch, int offset, int length) throws IOException {
         write(EncodingConstants.COMMENT);
 
-        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.otherString);
+        boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length);
         encodeNonIdentifyingStringOnFirstBit(ch, offset, length, _v.otherString, addToTable, false);
     }
 
@@ -1033,21 +1168,39 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
      *
      * @param s the string to encode
      * @param map the vocabulary table of strings to indexes.
-     * @param addToTable true if the string should be added to the vocabulary
+     * @param addToTable true if the string could be added to the vocabulary
+     *                   table (if table has enough memory)
+     * @param mustBeAddedToTable true if the string must be added to the vocabulary
      *                   table (if not already present in the table).
      */
-    protected final void encodeNonIdentifyingStringOnFirstBit(String s, StringIntMap map, boolean addToTable) throws IOException {
+    protected final void encodeNonIdentifyingStringOnFirstBit(String s, StringIntMap map,
+            boolean addToTable, boolean mustBeAddedToTable) throws IOException {
         if (s == null || s.length() == 0) {
             // C.26 an index (first bit '1') with seven '1' bits for an empty string
             write(0xFF);
         } else {
-            if (addToTable) {
-                int index = map.obtainIndex(s);
-                if (index == KeyIntMap.NOT_PRESENT) {
-                    _b = EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG | _nonIdentifyingStringOnFirstBitCES;
+            if (addToTable || mustBeAddedToTable) {
+                // if attribute value could be added to table
+                boolean canAddAttributeToTable = mustBeAddedToTable ||
+                        canAddAttributeToTable(s.length());
+
+                // obtain/get index
+                int index = canAddAttributeToTable ?
+                    map.obtainIndex(s) :
+                    map.get(s);
+
+                if (index != KeyIntMap.NOT_PRESENT) {
+                    // if attribute value is in table
+                    encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
+                } else if (canAddAttributeToTable) {
+                    // if attribute value is not in table, but could be added
+                    _b = EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG |
+                            _nonIdentifyingStringOnFirstBitCES;
                     encodeNonEmptyCharacterStringOnFifthBit(s);
                 } else {
-                    encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
+                    // if attribute value is not in table and could not be added
+                    _b = _nonIdentifyingStringOnFirstBitCES;
+                    encodeNonEmptyCharacterStringOnFifthBit(s);
                 }
             } else {
                 _b = _nonIdentifyingStringOnFirstBitCES;
@@ -1073,12 +1226,28 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             if (addToTable) {
                 final char[] ch = s.toCharArray();
                 final int length = s.length();
-                int index = map.obtainIndex(ch, 0, length, false);
-                if (index == KeyIntMap.NOT_PRESENT) {
-                    _b = EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG | _nonIdentifyingStringOnFirstBitCES;
+
+                // if char array could be added to table
+                boolean canAddCharacterContentToTable =
+                        canAddCharacterContentToTable(length, map);
+
+                // obtain/get index
+                int index = canAddCharacterContentToTable ?
+                    map.obtainIndex(ch, 0, length, false) :
+                    map.get(ch, 0, length);
+
+                if (index != KeyIntMap.NOT_PRESENT) {
+                    // if char array is in table
+                    encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
+                } else if (canAddCharacterContentToTable) {
+                    // if char array is not in table, but could be added
+                    _b = EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG |
+                            _nonIdentifyingStringOnFirstBitCES;
                     encodeNonEmptyCharacterStringOnFifthBit(ch, 0, length);
                 } else {
-                    encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
+                    // if char array is not in table and could not be added
+                    _b = _nonIdentifyingStringOnFirstBitCES;
+                    encodeNonEmptyCharacterStringOnFifthBit(s);
                 }
             } else {
                 _b = _nonIdentifyingStringOnFirstBitCES;
@@ -1107,12 +1276,27 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
             write(0xFF);
         } else {
             if (addToTable) {
-                int index = map.obtainIndex(ch, offset, length, clone);
-                if (index == KeyIntMap.NOT_PRESENT) {
-                    _b = EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG | _nonIdentifyingStringOnFirstBitCES;
+                // if char array could be added to table
+                boolean canAddCharacterContentToTable =
+                        canAddCharacterContentToTable(length, map);
+
+                // obtain/get index
+                int index = canAddCharacterContentToTable ?
+                    map.obtainIndex(ch, offset, length, clone) :
+                    map.get(ch, offset, length);
+
+                if (index != KeyIntMap.NOT_PRESENT) {
+                    // if char array is in table
+                    encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
+                } else if (canAddCharacterContentToTable) {
+                    // if char array is not in table, but could be added
+                    _b = EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG |
+                            _nonIdentifyingStringOnFirstBitCES;
                     encodeNonEmptyCharacterStringOnFifthBit(ch, offset, length);
                 } else {
-                    encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
+                    // if char array is not in table and could not be added
+                    _b = _nonIdentifyingStringOnFirstBitCES;
+                    encodeNonEmptyCharacterStringOnFifthBit(ch, offset, length);
                 }
             } else {
                 _b = _nonIdentifyingStringOnFirstBitCES;
@@ -1121,23 +1305,59 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         }
     }
 
-    protected final void encodeNonIdentifyingStringOnFirstBit(int id, int[] table, String s, boolean addToTable)
+    protected final void encodeNumericNonIdentifyingStringOnFirstBit(
+            String s, boolean addToTable, boolean mustBeAddedToTable)
+            throws IOException, FastInfosetException {
+        encodeNonIdentifyingStringOnFirstBit(
+                                    RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX,
+                                    NUMERIC_CHARACTERS_TABLE, s, addToTable,
+                                    mustBeAddedToTable);
+    }
+
+    protected final void encodeDateTimeNonIdentifyingStringOnFirstBit(
+            String s, boolean addToTable, boolean mustBeAddedToTable)
+            throws IOException, FastInfosetException {
+        encodeNonIdentifyingStringOnFirstBit(
+                                    RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX,
+                                    DATE_TIME_CHARACTERS_TABLE, s, addToTable,
+                                    mustBeAddedToTable);
+    }
+
+    protected final void encodeNonIdentifyingStringOnFirstBit(int id, int[] table,
+            String s, boolean addToTable, boolean mustBeAddedToTable)
             throws IOException, FastInfosetException {
         if (s == null || s.length() == 0) {
             // C.26 an index (first bit '1') with seven '1' bits for an empty string
             write(0xFF);
             return;
-        } else if (addToTable) {
-            final int index = _v.attributeValue.obtainIndex(s);
-            if (index != KeyIntMap.NOT_PRESENT) {
-                encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
-                return;
-            }
         }
 
-        _b = (addToTable)
-                ? EncodingConstants.NISTRING_RESTRICTED_ALPHABET_FLAG | EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG
-                : EncodingConstants.NISTRING_RESTRICTED_ALPHABET_FLAG;
+        if (addToTable || mustBeAddedToTable) {
+            // if attribute value could be added to table
+            boolean canAddAttributeToTable = mustBeAddedToTable ||
+                    canAddAttributeToTable(s.length());
+
+            // obtain/get index
+            int index = canAddAttributeToTable ?
+                _v.attributeValue.obtainIndex(s) :
+                _v.attributeValue.get(s);
+
+            if (index != KeyIntMap.NOT_PRESENT) {
+                // if attribute value is in table
+                encodeNonZeroIntegerOnSecondBitFirstBitOne(index);
+                return;
+            } else if (canAddAttributeToTable) {
+                // if attribute value is not in table, but could be added
+                _b = EncodingConstants.NISTRING_RESTRICTED_ALPHABET_FLAG |
+                        EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG;
+            } else {
+                // if attribute value is not in table and could not be added
+                _b = EncodingConstants.NISTRING_RESTRICTED_ALPHABET_FLAG;
+            }
+        } else {
+            _b = EncodingConstants.NISTRING_RESTRICTED_ALPHABET_FLAG;
+        }
+
         // Encode identification and top four bits of alphabet id
         write (_b | ((id & 0xF0) >> 4));
         // Encode bottom 4 bits of alphabet id
@@ -1294,13 +1514,13 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         // Encode bottom 4 bits of enoding algorithm id
         _b = (id & 0x0F) << 4;
 
-        final int octetLength = BuiltInEncodingAlgorithmFactory.table[id].
+        final int octetLength = BuiltInEncodingAlgorithmFactory.getAlgorithm(id).
                     getOctetLengthFromPrimitiveLength(length);
 
         encodeNonZeroOctetStringLengthOnFifthBit(octetLength);
 
         ensureSize(octetLength);
-        BuiltInEncodingAlgorithmFactory.table[id].
+        BuiltInEncodingAlgorithmFactory.getAlgorithm(id).
                 encodeToBytes(data, offset, length, _octetBuffer, _octetBufferIndex);
         _octetBufferIndex += octetLength;
     }
@@ -1323,16 +1543,31 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         // length cannot be zero since sequence of CIIs has to be > 0
 
         if (addToTable) {
-            int index = map.obtainIndex(ch, offset, length, clone);
-            if (index == KeyIntMap.NOT_PRESENT) {
+            // if char array could be added to table
+            boolean canAddCharacterContentToTable =
+                    canAddCharacterContentToTable(length, map);
+
+            // obtain/get index
+            int index = canAddCharacterContentToTable ?
+                map.obtainIndex(ch, offset, length, clone) :
+                map.get(ch, offset, length);
+
+            if (index != KeyIntMap.NOT_PRESENT) {
+                // if char array is in table
+                _b = EncodingConstants.CHARACTER_CHUNK | 0x20;
+                encodeNonZeroIntegerOnFourthBit(index);
+            } else if (canAddCharacterContentToTable) {
+                // if char array is not in table, but could be added
                 _b = EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG |
                         _nonIdentifyingStringOnThirdBitCES;
                 encodeNonEmptyCharacterStringOnSeventhBit(ch, offset, length);
             } else {
-                _b = EncodingConstants.CHARACTER_CHUNK | 0x20;
-                encodeNonZeroIntegerOnFourthBit(index);
+                // if char array is not in table and could not be added
+                    _b = _nonIdentifyingStringOnThirdBitCES;
+                    encodeNonEmptyCharacterStringOnSeventhBit(ch, offset, length);
             }
         } else {
+            // char array will not be added to map
             _b = _nonIdentifyingStringOnThirdBitCES;
             encodeNonEmptyCharacterStringOnSeventhBit(ch, offset, length);
         }
@@ -1508,13 +1743,13 @@ public abstract class Encoder extends DefaultHandler implements FastInfosetSeria
         // Encode bottom 6 bits of enoding algorithm id
         _b = (id & 0x3F) << 2;
 
-        final int octetLength = BuiltInEncodingAlgorithmFactory.table[id].
+        final int octetLength = BuiltInEncodingAlgorithmFactory.getAlgorithm(id).
                     getOctetLengthFromPrimitiveLength(length);
 
         encodeNonZeroOctetStringLengthOnSenventhBit(octetLength);
 
         ensureSize(octetLength);
-        BuiltInEncodingAlgorithmFactory.table[id].
+        BuiltInEncodingAlgorithmFactory.getAlgorithm(id).
                 encodeToBytes(data, offset, length, _octetBuffer, _octetBufferIndex);
         _octetBufferIndex += octetLength;
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
index 77cdb1e5fd0..e81cdd1a837 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java
@@ -33,7 +33,7 @@ import com.sun.xml.internal.org.jvnet.fastinfoset.EncodingAlgorithmIndexes;
 
 public final class BuiltInEncodingAlgorithmFactory {
 
-    public final static BuiltInEncodingAlgorithm[] table =
+    private final static BuiltInEncodingAlgorithm[] table =
             new BuiltInEncodingAlgorithm[EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END + 1];
 
     public final static HexadecimalEncodingAlgorithm hexadecimalEncodingAlgorithm = new HexadecimalEncodingAlgorithm();
@@ -65,4 +65,8 @@ public final class BuiltInEncodingAlgorithmFactory {
         table[EncodingAlgorithmIndexes.DOUBLE] = doubleEncodingAlgorithm;
         table[EncodingAlgorithmIndexes.UUID] = uuidEncodingAlgorithm;
     }
+
+    public static BuiltInEncodingAlgorithm getAlgorithm(int index) {
+        return table[index];
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
index 5ecfebb1354..5dfe9571138 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java
@@ -37,7 +37,7 @@ import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
 public class HexadecimalEncodingAlgorithm extends BuiltInEncodingAlgorithm {
     private static final char NIBBLE_TO_HEXADECIMAL_TABLE[] =
         {   '0','1','2','3','4','5','6','7',
-            '8','9','A','B','B','D','E','F' };
+            '8','9','A','B','C','D','E','F' };
 
     private static final int HEXADECIMAL_TO_NIBBLE_TABLE[] = {
         /*'0'*/ 0,
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
index 61f186184b2..53ecaacc5a7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java
@@ -140,14 +140,15 @@ public class LongEncodingAlgorithm extends IntegerEncodingAlgorithm {
             }
 
             final long l =
-                    ((long)(b[0] & 0xFF) << 56) |
-                    ((long)(b[1] & 0xFF) << 48) |
-                    ((long)(b[2] & 0xFF) << 40) |
-                    ((long)(b[3] & 0xFF) << 32) |
-                    ((b[4] & 0xFF) << 24) |
-                    ((b[5] & 0xFF) << 16) |
-                    ((b[6] & 0xFF) << 8) |
-                    (b[7] & 0xFF);
+                    (((long) b[0] << 56) +
+                    ((long) (b[1] & 0xFF) << 48) +
+                    ((long) (b[2] & 0xFF) << 40) +
+                    ((long) (b[3] & 0xFF) << 32) +
+                    ((long) (b[4] & 0xFF) << 24) +
+                    ((b[5] & 0xFF) << 16) +
+                    ((b[6] & 0xFF) << 8) +
+                    ((b[7] & 0xFF) << 0));
+
             longList.add(Long.valueOf(l));
         }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
index 93f96130ebb..a7e9135884e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java
@@ -69,7 +69,7 @@ public class UUIDEncodingAlgorithm extends LongEncodingAlgorithm {
 
         final long[] ldata = (long[])data;
 
-        final int end = ldata.length - 1;
+        final int end = ldata.length - 2;
         for (int i = 0; i <= end; i += 2) {
             s.append(toUUIDString(ldata[i], ldata[i + 1]));
             if (i != end) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
index fbfc0f1e64a..73c4f1dd216 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java
@@ -45,6 +45,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
+import com.sun.xml.internal.fastinfoset.util.DuplicateAttributeVerifier;
+import org.w3c.dom.Text;
 
 /**
  * The Fast Infoset DOM parser.
@@ -127,7 +129,7 @@ public class DOMDocumentParser extends Decoder {
         boolean documentTypeDeclarationOccured = false;
         while(!_terminate || !firstElementHasOccured) {
             _b = read();
-            switch(DecoderStateTables.DII[_b]) {
+            switch(DecoderStateTables.DII(_b)) {
                 case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                     processEII(_elementNameTable._array[_b], false);
                     firstElementHasOccured = true;
@@ -147,8 +149,8 @@ public class DOMDocumentParser extends Decoder {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = processLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
-                                _elementNameTable.getNext());
+                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     firstElementHasOccured = true;
@@ -166,9 +168,9 @@ public class DOMDocumentParser extends Decoder {
                     documentTypeDeclarationOccured = true;
 
                     String system_identifier = ((_b & EncodingConstants.DOCUMENT_TYPE_SYSTEM_IDENTIFIER_FLAG) > 0)
-                        ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : null;
+                    ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : null;
                     String public_identifier = ((_b & EncodingConstants.DOCUMENT_TYPE_PUBLIC_IDENTIFIER_FLAG) > 0)
-                        ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : null;
+                    ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : null;
 
                     _b = read();
                     while (_b == EncodingConstants.PROCESSING_INSTRUCTION) {
@@ -221,7 +223,7 @@ public class DOMDocumentParser extends Decoder {
         // Decode any remaining Comment IIs, PI IIs
         while(!_terminate) {
             _b = read();
-            switch(DecoderStateTables.DII[_b]) {
+            switch(DecoderStateTables.DII(_b)) {
                 case DecoderStateTables.COMMENT_II:
                     processCommentII();
                     break;
@@ -319,7 +321,7 @@ public class DOMDocumentParser extends Decoder {
 
         while(!_terminate) {
             _b = read();
-            switch(DecoderStateTables.EII[_b]) {
+            switch(DecoderStateTables.EII(_b)) {
                 case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                     processEII(_elementNameTable._array[_b], false);
                     break;
@@ -335,8 +337,8 @@ public class DOMDocumentParser extends Decoder {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = processLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
-                                _elementNameTable.getNext());
+                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     break;
@@ -347,36 +349,36 @@ public class DOMDocumentParser extends Decoder {
                 case DecoderStateTables.CII_UTF8_SMALL_LENGTH:
                 {
                     _octetBufferLength = (_b & EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK)
-                        + 1;
-                    processUtf8CharacterString();
+                    + 1;
+                    appendOrCreateTextData(processUtf8CharacterString());
                     break;
                 }
                 case DecoderStateTables.CII_UTF8_MEDIUM_LENGTH:
                 {
                     _octetBufferLength = read() + EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_LIMIT;
-                    processUtf8CharacterString();
+                    appendOrCreateTextData(processUtf8CharacterString());
                     break;
                 }
-                case DecoderStateTables.CII_UTF8_LARGE_LENGTH:
+                    case DecoderStateTables.CII_UTF8_LARGE_LENGTH:
                 {
                     _octetBufferLength = (read() << 24) |
-                        (read() << 16) |
-                        (read() << 8) |
-                        read();
+                            (read() << 16) |
+                            (read() << 8) |
+                            read();
                     _octetBufferLength += EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_LIMIT;
-                    processUtf8CharacterString();
+                    appendOrCreateTextData(processUtf8CharacterString());
                     break;
                 }
                 case DecoderStateTables.CII_UTF16_SMALL_LENGTH:
                 {
                     _octetBufferLength = (_b & EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_SMALL_MASK)
-                        + 1;
+                    + 1;
                     String v = decodeUtf16StringAsString();
                     if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
                         _characterContentChunkTable.add(_charBuffer, _charBufferLength);
                     }
 
-                    _currentNode.appendChild(_document.createTextNode(v));
+                    appendOrCreateTextData(v);
                     break;
                 }
                 case DecoderStateTables.CII_UTF16_MEDIUM_LENGTH:
@@ -387,22 +389,22 @@ public class DOMDocumentParser extends Decoder {
                         _characterContentChunkTable.add(_charBuffer, _charBufferLength);
                     }
 
-                    _currentNode.appendChild(_document.createTextNode(v));
+                    appendOrCreateTextData(v);
                     break;
                 }
                 case DecoderStateTables.CII_UTF16_LARGE_LENGTH:
                 {
                     _octetBufferLength = (read() << 24) |
-                        (read() << 16) |
-                        (read() << 8) |
-                        read();
+                            (read() << 16) |
+                            (read() << 8) |
+                            read();
                     _octetBufferLength += EncodingConstants.OCTET_STRING_LENGTH_7TH_BIT_MEDIUM_LIMIT;
                     String v = decodeUtf16StringAsString();
                     if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
                         _characterContentChunkTable.add(_charBuffer, _charBufferLength);
                     }
 
-                    _currentNode.appendChild(_document.createTextNode(v));
+                    appendOrCreateTextData(v);
                     break;
                 }
                 case DecoderStateTables.CII_RA:
@@ -421,15 +423,12 @@ public class DOMDocumentParser extends Decoder {
                         _characterContentChunkTable.add(_charBuffer, _charBufferLength);
                     }
 
-                    _currentNode.appendChild(_document.createTextNode(v));
+                    appendOrCreateTextData(v);
                     break;
                 }
                 case DecoderStateTables.CII_EA:
                 {
-                    if ((_b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0) {
-                        throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
-                    }
-
+                    final boolean addToTable = (_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0;
                     // Decode encoding algorithm integer
                     _identifier = (_b & 0x02) << 6;
                     _b = read();
@@ -437,45 +436,48 @@ public class DOMDocumentParser extends Decoder {
 
                     decodeOctetsOnSeventhBitOfNonIdentifyingStringOnThirdBit(_b);
                     final String s = convertEncodingAlgorithmDataToCharacters(false);
-                    _currentNode.appendChild(_document.createTextNode(s));
+                    if (addToTable) {
+                        _characterContentChunkTable.add(s.toCharArray(), s.length());
+                    }
+                    appendOrCreateTextData(s);
                     break;
                 }
                 case DecoderStateTables.CII_INDEX_SMALL:
                 {
                     final String s = _characterContentChunkTable.getString(_b & EncodingConstants.INTEGER_4TH_BIT_SMALL_MASK);
 
-                    _currentNode.appendChild(_document.createTextNode(s));
+                    appendOrCreateTextData(s);
                     break;
                 }
                 case DecoderStateTables.CII_INDEX_MEDIUM:
                 {
                     final int index = (((_b & EncodingConstants.INTEGER_4TH_BIT_MEDIUM_MASK) << 8) | read())
-                        + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
+                    + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
                     final String s = _characterContentChunkTable.getString(index);
 
-                    _currentNode.appendChild(_document.createTextNode(s));
+                    appendOrCreateTextData(s);
                     break;
                 }
                 case DecoderStateTables.CII_INDEX_LARGE:
                 {
                     int index = ((_b & EncodingConstants.INTEGER_4TH_BIT_LARGE_MASK) << 16) |
-                        (read() << 8) |
-                        read();
+                            (read() << 8) |
+                            read();
                     index += EncodingConstants.INTEGER_4TH_BIT_MEDIUM_LIMIT;
                     final String s = _characterContentChunkTable.getString(index);
 
-                    _currentNode.appendChild(_document.createTextNode(s));
+                    appendOrCreateTextData(s);
                     break;
                 }
                 case DecoderStateTables.CII_INDEX_LARGE_LARGE:
                 {
                     int index = (read() << 16) |
-                        (read() << 8) |
-                        read();
+                            (read() << 8) |
+                            read();
                     index += EncodingConstants.INTEGER_4TH_BIT_LARGE_LIMIT;
                     final String s = _characterContentChunkTable.getString(index);
 
-                    _currentNode.appendChild(_document.createTextNode(s));
+                    appendOrCreateTextData(s);
                     break;
                 }
                 case DecoderStateTables.COMMENT_II:
@@ -489,9 +491,9 @@ public class DOMDocumentParser extends Decoder {
                     String entity_reference_name = decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherNCName);
 
                     String system_identifier = ((_b & EncodingConstants.UNEXPANDED_ENTITY_SYSTEM_IDENTIFIER_FLAG) > 0)
-                        ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : null;
+                    ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : null;
                     String public_identifier = ((_b & EncodingConstants.UNEXPANDED_ENTITY_PUBLIC_IDENTIFIER_FLAG) > 0)
-                        ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : null;
+                    ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : null;
 
                     // TODO create Node
                     break;
@@ -512,18 +514,26 @@ public class DOMDocumentParser extends Decoder {
         _currentNode = parentCurrentNode;
     }
 
-    private final void processUtf8CharacterString() throws FastInfosetException, IOException {
+    private void appendOrCreateTextData(String textData) {
+        Node lastChild = _currentNode.getLastChild();
+        if (lastChild instanceof Text) {
+            ((Text) lastChild).appendData(textData);
+        } else {
+            _currentNode.appendChild(
+                    _document.createTextNode(textData));
+        }
+    }
+
+    private final String processUtf8CharacterString() throws FastInfosetException, IOException {
         if ((_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0) {
             _characterContentChunkTable.ensureSize(_octetBufferLength);
             final int charactersOffset = _characterContentChunkTable._arrayIndex;
             decodeUtf8StringAsCharBuffer(_characterContentChunkTable._array, charactersOffset);
             _characterContentChunkTable.add(_charBufferLength);
-            _currentNode.appendChild(_document.createTextNode(
-                    _characterContentChunkTable.getString(_characterContentChunkTable._cachedIndex)));
+            return _characterContentChunkTable.getString(_characterContentChunkTable._cachedIndex);
         } else {
             decodeUtf8StringAsCharBuffer();
-            _currentNode.appendChild(_document.createTextNode(
-                    new String(_charBuffer, 0, _charBufferLength)));
+            return new String(_charBuffer, 0, _charBufferLength);
         }
     }
 
@@ -560,43 +570,43 @@ public class DOMDocumentParser extends Decoder {
                             EncodingConstants.XMLNS_NAMESPACE_NAME,
                             EncodingConstants.XMLNS_NAMESPACE_PREFIX,
                             EncodingConstants.XMLNS_NAMESPACE_PREFIX);
-                    a.setValue ("");
+                    a.setValue("");
 
                     _prefixIndex = _namespaceNameIndex = _namespacePrefixes[_namespacePrefixesIndex++] = -1;
                     break;
-                // no prefix, namespace
-                // Declaration of default namespace
+                    // no prefix, namespace
+                    // Declaration of default namespace
                 case 1:
                     a = createAttribute(
                             EncodingConstants.XMLNS_NAMESPACE_NAME,
                             EncodingConstants.XMLNS_NAMESPACE_PREFIX,
                             EncodingConstants.XMLNS_NAMESPACE_PREFIX);
-                    a.setValue (decodeIdentifyingNonEmptyStringOnFirstBitAsNamespaceName(false));
+                    a.setValue(decodeIdentifyingNonEmptyStringOnFirstBitAsNamespaceName(false));
 
                     _prefixIndex = _namespacePrefixes[_namespacePrefixesIndex++] = -1;
                     break;
-                // prefix, no namespace
-                // Undeclaration of namespace
+                    // prefix, no namespace
+                    // Undeclaration of namespace
                 case 2:
                     prefix = decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(false);
                     a = createAttribute(
                             EncodingConstants.XMLNS_NAMESPACE_NAME,
-                            createQualifiedNameString(XMLNS_NAMESPACE_PREFIX_CHARS, prefix),
+                            createQualifiedNameString(prefix),
                             prefix);
-                    a.setValue ("");
+                    a.setValue("");
 
                     _namespaceNameIndex = -1;
                     _namespacePrefixes[_namespacePrefixesIndex++] = _prefixIndex;
                     break;
-                // prefix, namespace
-                // Declaration of prefixed namespace
+                    // prefix, namespace
+                    // Declaration of prefixed namespace
                 case 3:
                     prefix = decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(true);
                     a = createAttribute(
                             EncodingConstants.XMLNS_NAMESPACE_NAME,
-                            createQualifiedNameString(XMLNS_NAMESPACE_PREFIX_CHARS, prefix),
+                            createQualifiedNameString(prefix),
                             prefix);
-                    a.setValue (decodeIdentifyingNonEmptyStringOnFirstBitAsNamespaceName(true));
+                    a.setValue(decodeIdentifyingNonEmptyStringOnFirstBitAsNamespaceName(true));
 
                     _namespacePrefixes[_namespacePrefixesIndex++] = _prefixIndex;
                     break;
@@ -614,7 +624,7 @@ public class DOMDocumentParser extends Decoder {
         final int end = _namespacePrefixesIndex;
 
         _b = read();
-        switch(DecoderStateTables.EII[_b]) {
+        switch(DecoderStateTables.EII(_b)) {
             case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                 processEII(_elementNameTable._array[_b], hasAttributes);
                 break;
@@ -627,8 +637,8 @@ public class DOMDocumentParser extends Decoder {
             case DecoderStateTables.EII_LITERAL:
             {
                 final QualifiedName qn = processLiteralQualifiedName(
-                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
-                            _elementNameTable.getNext());
+                        _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                        _elementNameTable.getNext());
                 _elementNameTable.add(qn);
                 processEII(qn, hasAttributes);
                 break;
@@ -659,7 +669,7 @@ public class DOMDocumentParser extends Decoder {
                         -1,
                         _identifier,
                         null);
-            // no prefix, namespace
+                // no prefix, namespace
             case 1:
                 return q.set(
                         null,
@@ -669,10 +679,10 @@ public class DOMDocumentParser extends Decoder {
                         _namespaceNameIndex,
                         _identifier,
                         null);
-            // prefix, no namespace
+                // prefix, no namespace
             case 2:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.qNameMissingNamespaceName"));
-            // prefix, namespace
+                // prefix, namespace
             case 3:
                 return q.set(
                         decodeIdentifyingNonEmptyStringIndexOnFirstBitAsPrefix(true),
@@ -700,7 +710,7 @@ public class DOMDocumentParser extends Decoder {
                         -1,
                         _identifier,
                         null);
-            // no prefix, namespace
+                // no prefix, namespace
             case 1:
                 return new QualifiedName(
                         null,
@@ -710,10 +720,10 @@ public class DOMDocumentParser extends Decoder {
                         _namespaceNameIndex,
                         _identifier,
                         null);
-            // prefix, no namespace
+                // prefix, no namespace
             case 2:
                 throw new FastInfosetException(CommonResourceBundle.getInstance().getString("message.qNameMissingNamespaceName"));
-            // prefix, namespace
+                // prefix, namespace
             case 3:
                 return new QualifiedName(
                         decodeIdentifyingNonEmptyStringIndexOnFirstBitAsPrefix(true),
@@ -740,21 +750,21 @@ public class DOMDocumentParser extends Decoder {
         do {
             // AII qualified name
             b = read();
-            switch (DecoderStateTables.AII[b]) {
+            switch (DecoderStateTables.AII(b)) {
                 case DecoderStateTables.AII_INDEX_SMALL:
                     name = _attributeNameTable._array[b];
                     break;
                 case DecoderStateTables.AII_INDEX_MEDIUM:
                 {
                     final int i = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                        + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                     name = _attributeNameTable._array[i];
                     break;
                 }
                 case DecoderStateTables.AII_INDEX_LARGE:
                 {
                     final int i = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                        + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                     name = _attributeNameTable._array[i];
                     break;
                 }
@@ -762,7 +772,7 @@ public class DOMDocumentParser extends Decoder {
                     name = processLiteralQualifiedName(
                             b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
                             _attributeNameTable.getNext());
-                    name.createAttributeValues(_duplicateAttributeVerifier.MAP_SIZE);
+                    name.createAttributeValues(DuplicateAttributeVerifier.MAP_SIZE);
                     _attributeNameTable.add(name);
                     break;
                 case DecoderStateTables.AII_TERMINATOR_DOUBLE:
@@ -782,14 +792,14 @@ public class DOMDocumentParser extends Decoder {
             _duplicateAttributeVerifier.checkForDuplicateAttribute(name.attributeHash, name.attributeId);
 
             Attr a = createAttribute(
-                        name.namespaceName,
-                        name.qName,
-                        name.localName);
+                    name.namespaceName,
+                    name.qName,
+                    name.localName);
 
             // [normalized value] of AII
 
             b = read();
-            switch(DecoderStateTables.NISTRING[b]) {
+            switch(DecoderStateTables.NISTRING(b)) {
                 case DecoderStateTables.NISTRING_UTF8_SMALL_LENGTH:
                 {
                     final boolean addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
@@ -820,9 +830,9 @@ public class DOMDocumentParser extends Decoder {
                 {
                     final boolean addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
                     final int length = (read() << 24) |
-                        (read() << 16) |
-                        (read() << 8) |
-                        read();
+                            (read() << 16) |
+                            (read() << 8) |
+                            read();
                     _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_5TH_BIT_MEDIUM_LIMIT;
                     value = decodeUtf8StringAsString();
                     if (addToTable) {
@@ -863,9 +873,9 @@ public class DOMDocumentParser extends Decoder {
                 {
                     final boolean addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
                     final int length = (read() << 24) |
-                        (read() << 16) |
-                        (read() << 8) |
-                        read();
+                            (read() << 16) |
+                            (read() << 8) |
+                            read();
                     _octetBufferLength = length + EncodingConstants.OCTET_STRING_LENGTH_5TH_BIT_MEDIUM_LIMIT;
                     value = decodeUtf16StringAsString();
                     if (addToTable) {
@@ -897,16 +907,16 @@ public class DOMDocumentParser extends Decoder {
                 }
                 case DecoderStateTables.NISTRING_EA:
                 {
-                    if ((b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0) {
-                        throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
-                    }
-
+                    final boolean addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
                     _identifier = (b & 0x0F) << 4;
                     b = read();
                     _identifier |= (b & 0xF0) >> 4;
 
                     decodeOctetsOnFifthBitOfNonIdentifyingStringOnFirstBit(b);
                     value = convertEncodingAlgorithmDataToCharacters(true);
+                    if (addToTable) {
+                        _attributeValueTable.add(value);
+                    }
                     a.setValue(value);
                     _currentElement.setAttributeNode(a);
                     break;
@@ -920,7 +930,7 @@ public class DOMDocumentParser extends Decoder {
                 case DecoderStateTables.NISTRING_INDEX_MEDIUM:
                 {
                     final int index = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                        + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                     value = _attributeValueTable._array[index];
 
                     a.setValue(value);
@@ -930,7 +940,7 @@ public class DOMDocumentParser extends Decoder {
                 case DecoderStateTables.NISTRING_INDEX_LARGE:
                 {
                     final int index = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                        + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                     value = _attributeValueTable._array[index];
 
                     a.setValue(value);
@@ -992,7 +1002,7 @@ public class DOMDocumentParser extends Decoder {
                     _v.otherString.add(new CharArrayString(data, false));
                 }
 
-                _currentNode.appendChild (_document.createProcessingInstruction (target, data));
+                _currentNode.appendChild(_document.createProcessingInstruction(target, data));
                 break;
             }
             case NISTRING_ENCODING_ALGORITHM:
@@ -1001,11 +1011,11 @@ public class DOMDocumentParser extends Decoder {
             {
                 final String data = _v.otherString.get(_integer).toString();
 
-                _currentNode.appendChild (_document.createProcessingInstruction (target, data));
+                _currentNode.appendChild(_document.createProcessingInstruction(target, data));
                 break;
             }
             case NISTRING_EMPTY_STRING:
-                _currentNode.appendChild (_document.createProcessingInstruction (target, ""));
+                _currentNode.appendChild(_document.createProcessingInstruction(target, ""));
                 break;
         }
     }
@@ -1021,9 +1031,9 @@ public class DOMDocumentParser extends Decoder {
     protected String convertEncodingAlgorithmDataToCharacters(boolean isAttributeValue) throws FastInfosetException, IOException {
         StringBuffer buffer = new StringBuffer();
         if (_identifier < EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
-            Object array = BuiltInEncodingAlgorithmFactory.table[_identifier].
-                decodeFromBytes(_octetBuffer, _octetBufferStart, _octetBufferLength);
-            BuiltInEncodingAlgorithmFactory.table[_identifier].convertToCharacters(array,  buffer);
+            Object array = BuiltInEncodingAlgorithmFactory.getAlgorithm(_identifier).
+                    decodeFromBytes(_octetBuffer, _octetBufferStart, _octetBufferLength);
+            BuiltInEncodingAlgorithmFactory.getAlgorithm(_identifier).convertToCharacters(array,  buffer);
         } else if (_identifier == EncodingAlgorithmIndexes.CDATA) {
             if (!isAttributeValue) {
                 // Set back buffer position to start of encoded string
@@ -1044,5 +1054,4 @@ public class DOMDocumentParser extends Decoder {
         }
         return buffer.toString();
     }
-
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
index 7b273326d60..be138b15eec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java
@@ -202,7 +202,7 @@ public class DOMDocumentSerializer extends Encoder {
 
                 final String value = a.getNodeValue();
                 final boolean addToTable = isAttributeValueLengthMatchesLimit(value.length());
-                encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+                encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, false);
             }
 
             _b = EncodingConstants.TERMINATOR;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
index 9bf8375248d..e5b0bc63952 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java
@@ -2,7 +2,7 @@
  * reserved comment block
  * DO NOT REMOVE OR ALTER!
  */
-/*
+ /*
  * Portions Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -112,7 +112,7 @@ import java.util.Arrays;
  * @author Michael Glavassevich, IBM
  * @author Rahul Srivastava, Sun Microsystems Inc.
  *
- * @version $Id: XMLChar.java,v 1.1 2005/04/18 12:54:47 sandoz Exp $
+ * @version $Id: XMLChar.java,v 1.2 2006/03/16 16:22:16 sandoz Exp $
  */
 public class XMLChar {
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
index e76aa6e39fb..84e6ae800f0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties
@@ -22,6 +22,8 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
+#
 
 # Sample ResourceBundle properties file
 message.optinalValues = Optional values (other than initial vocabulary) of DII not supported
@@ -132,7 +134,7 @@ message.secondOccurenceOfDTDII=A second occurence of a Document Type Declaration
 message.URINotPresent=URI not present for encoding algorithm identifier {0}
 message.algorithmNotRegistered=Encoding algorithm not registered for URI {0}
 message.featureNotSupported=Feature not supported\: {0}
-message.propertyNotRecognized=Property not recognized\: 
+message.propertyNotRecognized=Property not recognized\:
 message.inputSource=InputSource must include a byte stream or a system ID
 message.qNameOfEIINotInScope=Qualified name of EII not in scope
 message.unsupportedAlgorithm=Unsupported built-in encoding algorithm\: {0}
@@ -172,7 +174,7 @@ message.noMoreItems=no more items to return
 message.nullPropertyName=Property name can not be null.
 
 message.validationNotSupported=This implementation does not support validation
-message.externalEntities=This implementation does not resolve external entities 
+message.externalEntities=This implementation does not resolve external entities
 message.propertyNotSupported=Property {0} is not supported
 message.noElement=No element.
 message.nullXMLEventAllocator=XMLEvent Allocator may not be null
@@ -203,4 +205,3 @@ message.illegalInitialCapacity=Illegal initial capacity\: {0}
 message.illegalLoadFactor=Illegal load factor\: {0}
 message.duplicateNamespaceAttribute=Duplicate namespace attribute entry
 message.readonlyList=The list is read-only. Content can not be changed.
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
index 7f45b19ed40..a77fbf82ec5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java
@@ -268,7 +268,7 @@ public class AttributesHolder implements EncodingAlgorithmAttributes {
     private final StringBuffer convertEncodingAlgorithmDataToString(int identifier, String URI, Object data) throws FastInfosetException, IOException {
         EncodingAlgorithm ea = null;
         if (identifier < EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
-            ea = BuiltInEncodingAlgorithmFactory.table[identifier];
+            ea = BuiltInEncodingAlgorithmFactory.getAlgorithm(identifier);
         } else if (identifier == EncodingAlgorithmIndexes.CDATA) {
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.CDATAAlgorithmNotSupported"));
         } else if (identifier >= EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
index d69461a6f9e..73fa4969e56 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java
@@ -446,7 +446,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         boolean documentTypeDeclarationOccured = false;
         while(!_terminate || !firstElementHasOccured) {
             _b = read();
-            switch(DecoderStateTables.DII[_b]) {
+            switch(DecoderStateTables.DII(_b)) {
                 case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                     processEII(_elementNameTable._array[_b], false);
                     firstElementHasOccured = true;
@@ -466,8 +466,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = decodeLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
-                                _elementNameTable.getNext());
+                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     firstElementHasOccured = true;
@@ -540,7 +540,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         // Decode any remaining Comment IIs, PI IIs
         while(!_terminate) {
             _b = read();
-            switch(DecoderStateTables.DII[_b]) {
+            switch(DecoderStateTables.DII(_b)) {
                 case DecoderStateTables.COMMENT_II:
                     processCommentII();
                     break;
@@ -578,7 +578,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
 
         while(!_terminate) {
             _b = read();
-            switch(DecoderStateTables.EII[_b]) {
+            switch(DecoderStateTables.EII(_b)) {
                 case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                     processEII(_elementNameTable._array[_b], false);
                     break;
@@ -594,8 +594,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = decodeLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
-                                _elementNameTable.getNext());
+                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     break;
@@ -690,9 +690,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 }
                 case DecoderStateTables.CII_EA:
                 {
-                    if ((_b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0) {
-                        throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
-                    }
+                    final boolean addToTable = (_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0;
 
                     // Decode encoding algorithm integer
                     _identifier = (_b & 0x02) << 6;
@@ -701,7 +699,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
 
                     decodeOctetsOnSeventhBitOfNonIdentifyingStringOnThirdBit(_b);
 
-                    processCIIEncodingAlgorithm();
+                    processCIIEncodingAlgorithm(addToTable);
                     break;
                 }
                 case DecoderStateTables.CII_INDEX_SMALL:
@@ -719,7 +717,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 case DecoderStateTables.CII_INDEX_MEDIUM:
                 {
                     final int index = (((_b & EncodingConstants.INTEGER_4TH_BIT_MEDIUM_MASK) << 8) | read())
-                            + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
+                    + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
                     try {
                         _contentHandler.characters(_characterContentChunkTable._array,
                                 _characterContentChunkTable._offset[index],
@@ -896,7 +894,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
 
         while(!_terminate) {
             _b = read();
-            switch(DecoderStateTables.EII[_b]) {
+            switch(DecoderStateTables.EII(_b)) {
                 case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                     processEII(_elementNameTable._array[_b], false);
                     break;
@@ -912,8 +910,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 case DecoderStateTables.EII_LITERAL:
                 {
                     final QualifiedName qn = decodeLiteralQualifiedName(
-                                _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
-                                _elementNameTable.getNext());
+                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                            _elementNameTable.getNext());
                     _elementNameTable.add(qn);
                     processEII(qn, (_b & EncodingConstants.ELEMENT_ATTRIBUTE_FLAG) > 0);
                     break;
@@ -1008,10 +1006,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 }
                 case DecoderStateTables.CII_EA:
                 {
-                    if ((_b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0) {
-                        throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
-                    }
-
+                    final boolean addToTable = (_b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0;
                     // Decode encoding algorithm integer
                     _identifier = (_b & 0x02) << 6;
                     _b = read();
@@ -1019,7 +1014,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
 
                     decodeOctetsOnSeventhBitOfNonIdentifyingStringOnThirdBit(_b);
 
-                    processCIIEncodingAlgorithm();
+                    processCIIEncodingAlgorithm(addToTable);
                     break;
                 }
                 case DecoderStateTables.CII_INDEX_SMALL:
@@ -1037,7 +1032,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 case DecoderStateTables.CII_INDEX_MEDIUM:
                 {
                     final int index = (((_b & EncodingConstants.INTEGER_4TH_BIT_MEDIUM_MASK) << 8) | read())
-                            + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
+                    + EncodingConstants.INTEGER_4TH_BIT_SMALL_LIMIT;
                     try {
                         _contentHandler.characters(_characterContentChunkTable._array,
                                 _characterContentChunkTable._offset[index],
@@ -1175,16 +1170,16 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                     prefix = namespaceName = "";
                     _namespaceNameIndex = _prefixIndex = _namespacePrefixes[_namespacePrefixesIndex++] = -1;
                     break;
-                // no prefix, namespace
-                // Declaration of default namespace
+                    // no prefix, namespace
+                    // Declaration of default namespace
                 case 1:
                     prefix = "";
                     namespaceName = decodeIdentifyingNonEmptyStringOnFirstBitAsNamespaceName(false);
 
                     _prefixIndex = _namespacePrefixes[_namespacePrefixesIndex++] = -1;
                     break;
-                // prefix, no namespace
-                // Undeclaration of namespace
+                    // prefix, no namespace
+                    // Undeclaration of namespace
                 case 2:
                     prefix = decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(false);
                     namespaceName = "";
@@ -1192,8 +1187,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                     _namespaceNameIndex = -1;
                     _namespacePrefixes[_namespacePrefixesIndex++] = _prefixIndex;
                     break;
-                // prefix, namespace
-                // Declaration of prefixed namespace
+                    // prefix, namespace
+                    // Declaration of prefixed namespace
                 case 3:
                     prefix = decodeIdentifyingNonEmptyStringOnFirstBitAsPrefix(true);
                     namespaceName = decodeIdentifyingNonEmptyStringOnFirstBitAsNamespaceName(true);
@@ -1232,7 +1227,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         final int end = _namespacePrefixesIndex;
 
         _b = read();
-        switch(DecoderStateTables.EII[_b]) {
+        switch(DecoderStateTables.EII(_b)) {
             case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                 processEII(_elementNameTable._array[_b], hasAttributes);
                 break;
@@ -1245,8 +1240,8 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
             case DecoderStateTables.EII_LITERAL:
             {
                 final QualifiedName qn = decodeLiteralQualifiedName(
-                            _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
-                            _elementNameTable.getNext());
+                        _b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
+                        _elementNameTable.getNext());
                 _elementNameTable.add(qn);
                 processEII(qn, hasAttributes);
                 break;
@@ -1260,7 +1255,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 final int prefixIndex = _namespacePrefixes[i];
                 _prefixTable.popScope(prefixIndex);
                 prefix = (prefixIndex > 0) ? _prefixTable.get(prefixIndex - 1) :
-                        (prefixIndex == -1) ? "" : EncodingConstants.XML_NAMESPACE_PREFIX;
+                    (prefixIndex == -1) ? "" : EncodingConstants.XML_NAMESPACE_PREFIX;
                 _contentHandler.endPrefixMapping(prefix);
             }
             _namespacePrefixesIndex = start;
@@ -1283,21 +1278,21 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         do {
             // AII qualified name
             b = read();
-            switch (DecoderStateTables.AII[b]) {
+            switch (DecoderStateTables.AII(b)) {
                 case DecoderStateTables.AII_INDEX_SMALL:
                     name = _attributeNameTable._array[b];
                     break;
                 case DecoderStateTables.AII_INDEX_MEDIUM:
                 {
                     final int i = (((b & EncodingConstants.INTEGER_2ND_BIT_MEDIUM_MASK) << 8) | read())
-                            + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
+                    + EncodingConstants.INTEGER_2ND_BIT_SMALL_LIMIT;
                     name = _attributeNameTable._array[i];
                     break;
                 }
                 case DecoderStateTables.AII_INDEX_LARGE:
                 {
                     final int i = (((b & EncodingConstants.INTEGER_2ND_BIT_LARGE_MASK) << 16) | (read() << 8) | read())
-                            + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
+                    + EncodingConstants.INTEGER_2ND_BIT_MEDIUM_LIMIT;
                     name = _attributeNameTable._array[i];
                     break;
                 }
@@ -1327,7 +1322,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
             // [normalized value] of AII
 
             b = read();
-            switch(DecoderStateTables.NISTRING[b]) {
+            switch(DecoderStateTables.NISTRING(b)) {
                 case DecoderStateTables.NISTRING_UTF8_SMALL_LENGTH:
                     _octetBufferLength = (b & EncodingConstants.OCTET_STRING_LENGTH_5TH_BIT_SMALL_MASK) + 1;
                     value = decodeUtf8StringAsString();
@@ -1410,9 +1405,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                 }
                 case DecoderStateTables.NISTRING_EA:
                 {
-                    if ((b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0) {
-                        throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
-                    }
+                    final boolean addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
 
                     _identifier = (b & 0x0F) << 4;
                     b = read();
@@ -1420,7 +1413,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
 
                     decodeOctetsOnFifthBitOfNonIdentifyingStringOnFirstBit(b);
 
-                    processAIIEncodingAlgorithm(name);
+                    processAIIEncodingAlgorithm(name, addToTable);
                     break;
                 }
                 case DecoderStateTables.NISTRING_INDEX_SMALL:
@@ -1529,7 +1522,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
         }
     }
 
-    protected final void processCIIEncodingAlgorithm() throws FastInfosetException, IOException {
+    protected final void processCIIEncodingAlgorithm(boolean addToTable) throws FastInfosetException, IOException {
         if (_identifier < EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
             if (_primitiveHandler != null) {
                 processCIIBuiltInEncodingAlgorithmAsPrimitive();
@@ -1551,18 +1544,28 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                     throw new FastInfosetException(e);
                 }
             }
-        } else if (_identifier == EncodingAlgorithmIndexes.CDATA) {
-                // Set back buffer position to start of encoded string
-                _octetBufferOffset -= _octetBufferLength;
-                decodeUtf8StringIntoCharBuffer();
 
-                try {
-                    _lexicalHandler.startCDATA();
-                    _contentHandler.characters(_charBuffer, 0, _charBufferLength);
-                    _lexicalHandler.endCDATA();
-                } catch (SAXException e) {
-                    throw new FastInfosetException(e);
-                }
+            if (addToTable) {
+                StringBuffer buffer = new StringBuffer();
+                processBuiltInEncodingAlgorithmAsCharacters(buffer);
+                _characterContentChunkTable.add(buffer.toString().toCharArray(), buffer.length());
+            }
+        } else if (_identifier == EncodingAlgorithmIndexes.CDATA) {
+            // Set back buffer position to start of encoded string
+            _octetBufferOffset -= _octetBufferLength;
+            decodeUtf8StringIntoCharBuffer();
+
+            try {
+                _lexicalHandler.startCDATA();
+                _contentHandler.characters(_charBuffer, 0, _charBufferLength);
+                _lexicalHandler.endCDATA();
+            } catch (SAXException e) {
+                throw new FastInfosetException(e);
+            }
+
+            if (addToTable) {
+                _characterContentChunkTable.add(_charBuffer, _charBufferLength);
+            }
         } else if (_identifier >= EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START && _algorithmHandler != null) {
             final String URI = _v.encodingAlgorithm.get(_identifier - EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START);
             if (URI == null) {
@@ -1585,6 +1588,9 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
                     throw new FastInfosetException(e);
                 }
             }
+            if (addToTable) {
+                throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
+            }
         } else if (_identifier >= EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START) {
             // TODO should have property to ignore
             throw new EncodingAlgorithmException(
@@ -1723,7 +1729,7 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
     }
 
 
-    protected final void processAIIEncodingAlgorithm(QualifiedName name) throws FastInfosetException, IOException {
+    protected final void processAIIEncodingAlgorithm(QualifiedName name, boolean addToTable) throws FastInfosetException, IOException {
         if (_identifier < EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
             if (_primitiveHandler != null || _algorithmHandler != null) {
                 Object data = processBuiltInEncodingAlgorithmAsObject();
@@ -1761,18 +1767,22 @@ public class SAXDocumentParser extends Decoder implements FastInfosetReader {
             // reported, allows for support through handler if required.
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.identifiers10to31Reserved"));
         }
+
+        if (addToTable) {
+            _attributeValueTable.add(_attributes.getValue(_attributes.getIndex(name.qName)));
+        }
     }
 
     protected final void processBuiltInEncodingAlgorithmAsCharacters(StringBuffer buffer) throws FastInfosetException, IOException {
         // TODO not very efficient, need to reuse buffers
-        Object array = BuiltInEncodingAlgorithmFactory.table[_identifier].
+        Object array = BuiltInEncodingAlgorithmFactory.getAlgorithm(_identifier).
                 decodeFromBytes(_octetBuffer, _octetBufferStart, _octetBufferLength);
 
-        BuiltInEncodingAlgorithmFactory.table[_identifier].convertToCharacters(array,  buffer);
+        BuiltInEncodingAlgorithmFactory.getAlgorithm(_identifier).convertToCharacters(array,  buffer);
     }
 
     protected final Object processBuiltInEncodingAlgorithmAsObject() throws FastInfosetException, IOException {
-        return BuiltInEncodingAlgorithmFactory.table[_identifier].
+        return BuiltInEncodingAlgorithmFactory.getAlgorithm(_identifier).
                 decodeFromBytes(_octetBuffer, _octetBufferStart, _octetBufferLength);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
index 97c137a432f..780616c49c7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java
@@ -430,9 +430,8 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         try {
             encodeTermination();
 
-            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
-            encodeFourBitCharacters(RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX, NUMERIC_CHARACTERS_TABLE,
-                    ch, start, length, addToTable);
+            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length);
+            encodeNumericFourBitCharacters(ch, start, length, addToTable);
         } catch (IOException e) {
             throw new SAXException(e);
         } catch (FastInfosetException e) {
@@ -448,9 +447,8 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         try {
             encodeTermination();
 
-            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
-            encodeFourBitCharacters(RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX, DATE_TIME_CHARACTERS_TABLE,
-                    ch, start, length, addToTable);
+            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length);
+            encodeDateTimeFourBitCharacters(ch, start, length, addToTable);
         } catch (IOException e) {
             throw new SAXException(e);
         } catch (FastInfosetException e) {
@@ -466,7 +464,7 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
         try {
             encodeTermination();
 
-            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length, _v.characterContentChunk);
+            final boolean addToTable = isCharacterContentChunkLengthMatchesLimit(length);
             encodeAlphabetCharacters(alphabet, ch, start, length, addToTable);
         } catch (IOException e) {
             throw new SAXException(e);
@@ -518,6 +516,7 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
 
     protected void encodeAttributes(Attributes atts) throws IOException, FastInfosetException {
         boolean addToTable;
+        boolean mustBeAddedToTable;
         String value;
         if (atts instanceof EncodingAlgorithmAttributes) {
             final EncodingAlgorithmAttributes eAtts = (EncodingAlgorithmAttributes)atts;
@@ -529,24 +528,21 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
                     // If data is null then there is no algorithm data
                     if (data == null) {
                         value = eAtts.getValue(i);
-                        addToTable = eAtts.getToIndex(i) || isAttributeValueLengthMatchesLimit(value.length());
+                        addToTable = isAttributeValueLengthMatchesLimit(value.length());
+                        mustBeAddedToTable = eAtts.getToIndex(i);
 
                         alphabet = eAtts.getAlpababet(i);
-                        if (alphabet == null)
-                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
-                        else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS)
-                            encodeNonIdentifyingStringOnFirstBit(
-                                    RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX,
-                                    DATE_TIME_CHARACTERS_TABLE,
-                                    value, addToTable);
-                        else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS)
-                            encodeNonIdentifyingStringOnFirstBit(
-                                    RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX,
-                                    NUMERIC_CHARACTERS_TABLE,
-                                    value, addToTable);
-                        else
-                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
-
+                        if (alphabet == null) {
+                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, mustBeAddedToTable);
+                        } else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS) {
+                            encodeDateTimeNonIdentifyingStringOnFirstBit(
+                                    value, addToTable, mustBeAddedToTable);
+                        } else if (alphabet == RestrictedAlphabet.NUMERIC_CHARACTERS) {
+                            encodeNumericNonIdentifyingStringOnFirstBit(
+                                    value, addToTable, mustBeAddedToTable);
+                        } else {
+                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, mustBeAddedToTable);
+                        }
                     } else {
                         encodeNonIdentifyingStringOnFirstBit(eAtts.getAlgorithmURI(i),
                                 eAtts.getAlgorithmIndex(i), data);
@@ -558,7 +554,7 @@ public class SAXDocumentSerializer extends Encoder implements FastInfosetWriter
                 if (encodeAttribute(atts.getURI(i), atts.getQName(i), atts.getLocalName(i))) {
                     value = atts.getValue(i);
                     addToTable = isAttributeValueLengthMatchesLimit(value.length());
-                    encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+                    encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, false);
                 }
             }
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
index c943b3a5ff7..b9b79f7edcc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java
@@ -148,6 +148,7 @@ public class SAXDocumentSerializerWithPrefixMapping extends SAXDocumentSerialize
 
     protected final void encodeAttributes(Attributes atts) throws IOException, FastInfosetException {
         boolean addToTable;
+        boolean mustToBeAddedToTable;
         String value;
         if (atts instanceof EncodingAlgorithmAttributes) {
             final EncodingAlgorithmAttributes eAtts = (EncodingAlgorithmAttributes)atts;
@@ -160,28 +161,24 @@ public class SAXDocumentSerializerWithPrefixMapping extends SAXDocumentSerialize
                     // If data is null then there is no algorithm data
                     if (data == null) {
                         value = eAtts.getValue(i);
-                        addToTable = eAtts.getToIndex(i) || isAttributeValueLengthMatchesLimit(value.length());
-
+                        addToTable = isAttributeValueLengthMatchesLimit(value.length());
+                        mustToBeAddedToTable = eAtts.getToIndex(i);
                         alphabet = eAtts.getAlpababet(i);
                         if (alphabet == null) {
                             if (uri == "http://www.w3.org/2001/XMLSchema-instance" ||
                                     uri.equals("http://www.w3.org/2001/XMLSchema-instance")) {
                                 value = convertQName(value);
                             }
-                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
-                        } else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS)
-                            encodeNonIdentifyingStringOnFirstBit(
-                                    RestrictedAlphabet.DATE_TIME_CHARACTERS_INDEX,
-                                    DATE_TIME_CHARACTERS_TABLE,
-                                    value, addToTable);
-                        else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS)
-                            encodeNonIdentifyingStringOnFirstBit(
-                                    RestrictedAlphabet.NUMERIC_CHARACTERS_INDEX,
-                                    NUMERIC_CHARACTERS_TABLE,
-                                    value, addToTable);
-                        else
-                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
-
+                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, mustToBeAddedToTable);
+                        } else if (alphabet == RestrictedAlphabet.DATE_TIME_CHARACTERS) {
+                            encodeDateTimeNonIdentifyingStringOnFirstBit(
+                                    value, addToTable, mustToBeAddedToTable);
+                        } else if (alphabet == RestrictedAlphabet.NUMERIC_CHARACTERS) {
+                            encodeNumericNonIdentifyingStringOnFirstBit(
+                                    value, addToTable, mustToBeAddedToTable);
+                        } else {
+                            encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, mustToBeAddedToTable);
+                        }
                     } else {
                         encodeNonIdentifyingStringOnFirstBit(eAtts.getAlgorithmURI(i),
                                 eAtts.getAlgorithmIndex(i), data);
@@ -199,7 +196,7 @@ public class SAXDocumentSerializerWithPrefixMapping extends SAXDocumentSerialize
                             uri.equals("http://www.w3.org/2001/XMLSchema-instance")) {
                         value = convertQName(value);
                     }
-                    encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+                    encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, false);
                 }
             }
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
index fd13d2fced3..40e838d9d9b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java
@@ -51,6 +51,7 @@ import com.sun.xml.internal.org.jvnet.fastinfoset.EncodingAlgorithmIndexes;
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetException;
 import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
 import com.sun.xml.internal.fastinfoset.org.apache.xerces.util.XMLChar;
+import com.sun.xml.internal.fastinfoset.util.DuplicateAttributeVerifier;
 import com.sun.xml.internal.org.jvnet.fastinfoset.stax.FastInfosetStreamReader;
 
 /**
@@ -151,11 +152,13 @@ public class StAXDocumentParser extends Decoder
         _manager = manager;
     }
 
+    @Override
     public void setInputStream(InputStream s) {
         super.setInputStream(s);
         reset();
     }
 
+    @Override
     public void reset() {
         super.reset();
         if (_internalState != INTERNAL_STATE_START_DOCUMENT &&
@@ -269,7 +272,7 @@ public class StAXDocumentParser extends Decoder
 
             // Process information item
             final int b = read();
-            switch(DecoderStateTables.EII[b]) {
+            switch(DecoderStateTables.EII(b)) {
                 case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                     processEII(_elementNameTable._array[b], false);
                     return _eventType;
@@ -351,17 +354,14 @@ public class StAXDocumentParser extends Decoder
                 }
                 case DecoderStateTables.CII_EA:
                 {
-                    if ((b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0) {
-                        throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
-                    }
-
+                    final boolean addToTable = (b & EncodingConstants.CHARACTER_CHUNK_ADD_TO_TABLE_FLAG) > 0;
                     // Decode encoding algorithm integer
                     _algorithmId = (b & 0x02) << 6;
                     final int b2 = read();
                     _algorithmId |= (b2 & 0xFC) >> 2;
 
                     decodeOctetsOnSeventhBitOfNonIdentifyingStringOnThirdBit(b2);
-                    processCIIEncodingAlgorithm();
+                    processCIIEncodingAlgorithm(addToTable);
 
                     return _eventType = CHARACTERS;
                 }
@@ -817,9 +817,10 @@ public class StAXDocumentParser extends Decoder
         }
 
         try {
-            System.arraycopy(_characters, sourceStart, target,
-                    targetStart, length);
-            return length;
+            int bytesToCopy = Math.min(_charBufferLength, length);
+            System.arraycopy(_characters, _charactersOffset + sourceStart,
+                    target, targetStart, bytesToCopy);
+            return bytesToCopy;
         } catch (IndexOutOfBoundsException e) {
             throw new XMLStreamException(e);
         }
@@ -983,7 +984,7 @@ public class StAXDocumentParser extends Decoder
 
     public final int peekNext() throws XMLStreamException {
         try {
-            switch(DecoderStateTables.EII[peek(this)]) {
+            switch(DecoderStateTables.EII(peek(this))) {
                 case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                 case DecoderStateTables.EII_AIIS_INDEX_SMALL:
                 case DecoderStateTables.EII_INDEX_MEDIUM:
@@ -1213,7 +1214,7 @@ public class StAXDocumentParser extends Decoder
         _currentNamespaceAIIsEnd = _namespaceAIIsIndex;
 
         b = read();
-        switch(DecoderStateTables.EII[b]) {
+        switch(DecoderStateTables.EII(b)) {
             case DecoderStateTables.EII_NO_AIIS_INDEX_SMALL:
                 processEII(_elementNameTable._array[b], hasAttributes);
                 break;
@@ -1288,7 +1289,7 @@ public class StAXDocumentParser extends Decoder
         do {
             // AII qualified name
             b = read();
-            switch (DecoderStateTables.AII[b]) {
+            switch (DecoderStateTables.AII(b)) {
                 case DecoderStateTables.AII_INDEX_SMALL:
                     name = _attributeNameTable._array[b];
                     break;
@@ -1310,7 +1311,7 @@ public class StAXDocumentParser extends Decoder
                     name = processLiteralQualifiedName(
                             b & EncodingConstants.LITERAL_QNAME_PREFIX_NAMESPACE_NAME_MASK,
                             _attributeNameTable.getNext());
-                    name.createAttributeValues(_duplicateAttributeVerifier.MAP_SIZE);
+                    name.createAttributeValues(DuplicateAttributeVerifier.MAP_SIZE);
                     _attributeNameTable.add(name);
                     break;
                 case DecoderStateTables.AII_TERMINATOR_DOUBLE:
@@ -1332,7 +1333,7 @@ public class StAXDocumentParser extends Decoder
             _duplicateAttributeVerifier.checkForDuplicateAttribute(name.attributeHash, name.attributeId);
 
             b = read();
-            switch(DecoderStateTables.NISTRING[b]) {
+            switch(DecoderStateTables.NISTRING(b)) {
                 case DecoderStateTables.NISTRING_UTF8_SMALL_LENGTH:
                     _octetBufferLength = (b & EncodingConstants.OCTET_STRING_LENGTH_5TH_BIT_SMALL_MASK) + 1;
                     value = decodeUtf8StringAsString();
@@ -1415,17 +1416,14 @@ public class StAXDocumentParser extends Decoder
                 }
                 case DecoderStateTables.NISTRING_EA:
                 {
-                    if ((b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0) {
-                        throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.addToTableNotSupported"));
-                    }
-
+                    final boolean addToTable = (b & EncodingConstants.NISTRING_ADD_TO_TABLE_FLAG) > 0;
                     // Decode encoding algorithm integer
                     _identifier = (b & 0x0F) << 4;
                     b = read();
                     _identifier |= (b & 0xF0) >> 4;
 
                     decodeOctetsOnFifthBitOfNonIdentifyingStringOnFirstBit(b);
-                    processAIIEncodingAlgorithm(name);
+                    processAIIEncodingAlgorithm(name, addToTable);
                     break;
                 }
                 case DecoderStateTables.NISTRING_INDEX_SMALL:
@@ -1596,7 +1594,7 @@ public class StAXDocumentParser extends Decoder
         ? decodeIdentifyingNonEmptyStringOnFirstBit(_v.otherURI) : "";
     }
 
-    protected final void processCIIEncodingAlgorithm() throws FastInfosetException, IOException {
+    protected final void processCIIEncodingAlgorithm(boolean addToTable) throws FastInfosetException, IOException {
         _algorithmData = _octetBuffer;
         _algorithmDataOffset = _octetBufferStart;
         _algorithmDataLength = _octetBufferLength;
@@ -1613,9 +1611,14 @@ public class StAXDocumentParser extends Decoder
             // reported, allows for support through handler if required.
             throw new EncodingAlgorithmException(CommonResourceBundle.getInstance().getString("message.identifiers10to31Reserved"));
         }
+
+        if (addToTable) {
+            convertEncodingAlgorithmDataToCharacters();
+            _characterContentChunkTable.add(_characters, _characters.length);
+        }
     }
 
-    protected final void processAIIEncodingAlgorithm(QualifiedName name) throws FastInfosetException, IOException {
+    protected final void processAIIEncodingAlgorithm(QualifiedName name, boolean addToTable) throws FastInfosetException, IOException {
         String URI = null;
         if (_identifier >= EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START) {
             URI = _v.encodingAlgorithm.get(_identifier - EncodingConstants.ENCODING_ALGORITHM_APPLICATION_START);
@@ -1636,6 +1639,9 @@ public class StAXDocumentParser extends Decoder
         final byte[] data = new byte[_octetBufferLength];
         System.arraycopy(_octetBuffer, _octetBufferStart, data, 0, _octetBufferLength);
         _attributes.addAttributeWithAlgorithmData(name, URI, _identifier, data);
+        if (addToTable) {
+            _attributeValueTable.add(_attributes.getValue(_attributes.getIndex(name.qName)));
+        }
     }
 
     protected final void convertEncodingAlgorithmDataToCharacters() throws FastInfosetException, IOException {
@@ -1643,9 +1649,9 @@ public class StAXDocumentParser extends Decoder
         if (_algorithmId == EncodingAlgorithmIndexes.BASE64) {
             convertBase64AlorithmDataToCharacters(buffer);
         } else if (_algorithmId < EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
-            Object array = BuiltInEncodingAlgorithmFactory.table[_algorithmId].
+            Object array = BuiltInEncodingAlgorithmFactory.getAlgorithm(_algorithmId).
                     decodeFromBytes(_algorithmData, _algorithmDataOffset, _algorithmDataLength);
-            BuiltInEncodingAlgorithmFactory.table[_algorithmId].convertToCharacters(array,  buffer);
+            BuiltInEncodingAlgorithmFactory.getAlgorithm(_algorithmId).convertToCharacters(array,  buffer);
         } else if (_algorithmId == EncodingAlgorithmIndexes.CDATA) {
             _octetBufferOffset -= _octetBufferLength;
             decodeUtf8StringIntoCharBuffer();
@@ -1745,7 +1751,7 @@ public class StAXDocumentParser extends Decoder
     public boolean isBase64Follows() throws IOException {
         // Process information item
         int b = peek(this);
-        switch (DecoderStateTables.EII[b]) {
+        switch (DecoderStateTables.EII(b)) {
             case DecoderStateTables.CII_EA:
                 int algorithmId = (b & 0x02) << 6;
                 int b2 = peek2(this);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
index 5b9b792d184..b616b1c388d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java
@@ -197,7 +197,7 @@ public class StAXDocumentSerializer extends Encoder
     public void writeStartElement(String namespaceURI, String localName)
         throws XMLStreamException
     {
-        writeStartElement(getPrefix(namespaceURI), localName, namespaceURI);
+        writeStartElement("", localName, namespaceURI);
     }
 
     public void writeStartElement(String prefix, String localName,
@@ -231,7 +231,7 @@ public class StAXDocumentSerializer extends Encoder
     public void writeEmptyElement(String namespaceURI, String localName)
         throws XMLStreamException
     {
-        writeEmptyElement(getPrefix(namespaceURI), localName, namespaceURI);
+        writeEmptyElement("", localName, namespaceURI);
     }
 
     public void writeEmptyElement(String prefix, String localName,
@@ -581,8 +581,15 @@ public class StAXDocumentSerializer extends Encoder
                 }
 
                 // If element's prefix is empty - apply default scope namespace
-                if (_currentPrefix.length() == 0 && _currentUri.length() == 0) {
-                    _currentUri = _nsContext.getNamespaceURI("");
+                if (_currentPrefix.length() == 0) {
+                    if (_currentUri.length() == 0) {
+                        _currentUri = _nsContext.getNamespaceURI("");
+                    } else {
+                        String tmpPrefix = getPrefix(_currentUri);
+                        if (tmpPrefix != null) {
+                            _currentPrefix = tmpPrefix;
+                        }
+                    }
                 }
 
                 encodeElementQualifiedNameOnThirdBit(_currentUri, _currentPrefix, _currentLocalName);
@@ -594,7 +601,7 @@ public class StAXDocumentSerializer extends Encoder
                     final String value = _attributesArray[i];
                     _attributesArray[i++] = null;
                     final boolean addToTable = isAttributeValueLengthMatchesLimit(value.length());
-                    encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+                    encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, false);
 
                     _b = EncodingConstants.TERMINATOR;
                     _terminate = true;
@@ -701,7 +708,7 @@ public class StAXDocumentSerializer extends Encoder
     public final void writeLowLevelAttributeValue(String value) throws IOException
     {
         final boolean addToTable = isAttributeValueLengthMatchesLimit(value.length());
-        encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable);
+        encodeNonIdentifyingStringOnFirstBit(value, _v.attributeValue, addToTable, false);
     }
 
     public final void writeLowLevelStartNameLiteral(int type, String prefix, byte[] utf8LocalName,
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java
deleted file mode 100644
index 582200e40c5..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- */
-
-
-
-package com.sun.xml.internal.fastinfoset.stax.events;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.events.Namespace;
-import javax.xml.stream.events.XMLEvent;
-import javax.xml.stream.util.XMLEventAllocator;
-import javax.xml.stream.util.XMLEventConsumer;
-
-import com.sun.xml.internal.fastinfoset.CommonResourceBundle;
-
-/**
- * This class provides the same functionality as StAXEventAllocatorBase, but without
- * using EventFactory and creating a new object for each call.
- *
- * It seems to be good idea using static components. Unfortunately, EventReader's peek
- * and next methods require that multiple instances being created.
- *
- */
-public class StAXEventAllocator implements XMLEventAllocator {
-    StartElementEvent startElement = new StartElementEvent();
-    EndElementEvent endElement = new EndElementEvent();
-    CharactersEvent characters = new CharactersEvent();
-    CharactersEvent cData = new CharactersEvent("",true);
-    CharactersEvent space = new CharactersEvent();
-    CommentEvent comment = new CommentEvent();
-    EntityReferenceEvent entity = new EntityReferenceEvent();
-    ProcessingInstructionEvent pi = new ProcessingInstructionEvent();
-    StartDocumentEvent startDoc = new StartDocumentEvent();
-    EndDocumentEvent endDoc = new EndDocumentEvent();
-    DTDEvent dtd = new DTDEvent();
-
-    /** Creates a new instance of StAXEventAllocator */
-    public StAXEventAllocator() {
-    }
-    public XMLEventAllocator newInstance() {
-        return new StAXEventAllocator();
-    }
-
-  /**
-   * This method allocates an event given the current state of the XMLStreamReader.
-   * If this XMLEventAllocator does not have a one-to-one mapping between reader state
-   * and events this method will return null.
-   * @param streamReader The XMLStreamReader to allocate from
-   * @return the event corresponding to the current reader state
-   */
-    public XMLEvent allocate(XMLStreamReader streamReader) throws XMLStreamException {
-        if(streamReader == null )
-            throw new XMLStreamException(CommonResourceBundle.getInstance().getString("message.nullReader"));
-        return getXMLEvent(streamReader);
-    }
-
-  /**
-   * This method allocates an event or set of events given the current state of
-   * the XMLStreamReader and adds the event or set of events to the consumer that
-   * was passed in.
-   * @param streamReader The XMLStreamReader to allocate from
-   * @param consumer The XMLEventConsumer to add to.
-   */
-    public void allocate(XMLStreamReader streamReader, XMLEventConsumer consumer) throws XMLStreamException {
-        consumer.add(getXMLEvent(streamReader));
-
-    }
-    // ---------------------end of methods defined by XMLEventAllocator-----------------//
-
-
-    XMLEvent getXMLEvent(XMLStreamReader reader){
-        EventBase event = null;
-        int eventType = reader.getEventType();
-
-        switch(eventType){
-
-            case XMLEvent.START_ELEMENT:
-            {
-                startElement.reset();
-                startElement.setName(new QName(reader.getNamespaceURI(),
-                                   reader.getLocalName(), reader.getPrefix()));
-
-                addAttributes(startElement,reader);
-                addNamespaces(startElement, reader);
-                //need to fix it along with the Reader
-                //setNamespaceContext(startElement,reader);
-                event = startElement;
-                break;
-            }
-            case XMLEvent.END_ELEMENT:
-            {
-                endElement.reset();
-                endElement.setName(new QName(reader.getNamespaceURI(),
-                                 reader.getLocalName(),reader.getPrefix()));
-                addNamespaces(endElement,reader);
-                event = endElement ;
-                break;
-            }
-            case XMLEvent.PROCESSING_INSTRUCTION:
-            {
-                pi.setTarget(reader.getPITarget());
-                pi.setData(reader.getPIData());
-                event = pi;
-                break;
-            }
-            case XMLEvent.CHARACTERS:
-            {
-                characters.setData(reader.getText());
-                event = characters;
-                /**
-                if (reader.isWhiteSpace()) {
-                    space.setData(reader.getText());
-                    space.setSpace(true);
-                    event = space;
-                }
-                else {
-                    characters.setData(reader.getText());
-                    event = characters;
-                }
-                 */
-                break;
-            }
-            case XMLEvent.COMMENT:
-            {
-                comment.setText(reader.getText());
-                event = comment;
-                break;
-            }
-            case XMLEvent.START_DOCUMENT:
-            {
-                startDoc.reset();
-                String encoding = reader.getEncoding();
-                String version = reader.getVersion();
-                if (encoding != null)
-                    startDoc.setEncoding(encoding);
-                if (version != null)
-                    startDoc.setVersion(version);
-                startDoc.setStandalone(reader.isStandalone());
-                if(reader.getCharacterEncodingScheme() != null){
-                    startDoc.setDeclaredEncoding(true);
-                }else{
-                    startDoc.setDeclaredEncoding(false);
-                }
-                event = startDoc ;
-                break;
-            }
-            case XMLEvent.END_DOCUMENT:{
-                event = endDoc;
-                break;
-            }
-            case XMLEvent.ENTITY_REFERENCE:{
-                entity.setName(reader.getLocalName());
-                entity.setDeclaration(new EntityDeclarationImpl(reader.getLocalName(),reader.getText()));
-                event = entity;
-                break;
-
-            }
-            case XMLEvent.ATTRIBUTE:{
-                event = null ;
-                break;
-            }
-            case XMLEvent.DTD:{
-                dtd.setDTD(reader.getText());
-                event = dtd;
-                break;
-            }
-            case XMLEvent.CDATA:{
-                cData.setData(reader.getText());
-                event = cData;
-                break;
-            }
-            case XMLEvent.SPACE:{
-                space.setData(reader.getText());
-                space.setSpace(true);
-                event = space;
-                break;
-            }
-        }
-        event.setLocation(reader.getLocation());
-        return event ;
-    }
-
-    //use event.addAttribute instead of addAttributes to avoid creating another list
-    protected void addAttributes(StartElementEvent event,XMLStreamReader reader){
-        AttributeBase attr = null;
-        for(int i=0; i<reader.getAttributeCount() ;i++){
-            attr =  new AttributeBase(reader.getAttributeName(i), reader.getAttributeValue(i));
-            attr.setAttributeType(reader.getAttributeType(i));
-            attr.setSpecified(reader.isAttributeSpecified(i));
-            event.addAttribute(attr);
-        }
-    }
-
-    //add namespaces to StartElement/EndElement
-    protected void addNamespaces(StartElementEvent event,XMLStreamReader reader){
-        Namespace namespace = null;
-        for(int i=0; i<reader.getNamespaceCount(); i++){
-            namespace =  new NamespaceBase(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
-            event.addNamespace(namespace);
-        }
-    }
-
-    protected void addNamespaces(EndElementEvent event,XMLStreamReader reader){
-        Namespace namespace = null;
-        for(int i=0; i<reader.getNamespaceCount(); i++){
-            namespace =  new NamespaceBase(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
-            event.addNamespace(namespace);
-        }
-    }
-
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java
index ded97a5e467..c7d9e26a294 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java
@@ -55,9 +55,9 @@ public class VocabularyGenerator extends DefaultHandler implements LexicalHandle
     protected ParserVocabulary _parserVocabulary;
     protected com.sun.xml.internal.org.jvnet.fastinfoset.Vocabulary _v;
 
-    protected int attributeValueSizeConstraint = FastInfosetSerializer.ATTRIBUTE_VALUE_SIZE_CONSTRAINT;
+    protected int attributeValueSizeConstraint = FastInfosetSerializer.MAX_ATTRIBUTE_VALUE_SIZE;
 
-    protected int characterContentChunkSizeContraint = FastInfosetSerializer.CHARACTER_CONTENT_CHUNK_SIZE_CONSTRAINT;
+    protected int characterContentChunkSizeContraint = FastInfosetSerializer.MAX_CHARACTER_CONTENT_CHUNK_SIZE;
 
     /** Creates a new instance of VocabularyGenerator */
     public VocabularyGenerator() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
index 5fa64221a9f..84e11642746 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java
@@ -114,6 +114,26 @@ public class CharArrayIntMap extends KeyIntMap {
         }
     }
 
+    /**
+     * Method returns an index of the passed character buffer in
+     * <code>CharArrayIntMap</code>.
+     *
+     * @return index of character buffer in <code>CharArrayIntMap</code>,
+     * otherwise NOT_PRESENT.
+     */
+    public final int get(char[] ch, int start, int length) {
+        final int hash = hashHash(CharArray.hashCode(ch, start, length));
+        return get(ch, start, length, hash);
+    }
+
+    /**
+     * Method returns an index of the passed character buffer in
+     * <code>CharArrayIntMap</code>. If character buffer is not in
+     * <code>CharArrayIntMap</code> - it will be added.
+     *
+     * @return index of character buffer in <code>CharArrayIntMap</code>, or
+     * NOT_PRESENT if character buffer was just added.
+     */
     public final int obtainIndex(char[] ch, int start, int length, boolean clone) {
         final int hash = hashHash(CharArray.hashCode(ch, start, length));
 
@@ -162,7 +182,7 @@ public class CharArrayIntMap extends KeyIntMap {
             }
         }
 
-        return -1;
+        return NOT_PRESENT;
     }
 
     private final void addEntry(char[] ch, int start, int length, int hash, int value, int bucketIndex) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
index 7a2cb936206..b3b4847ea1d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java
@@ -35,7 +35,7 @@ public class DuplicateAttributeVerifier {
 
     public int _currentIteration;
 
-    private static class Entry {
+    public static class Entry {
         private int iteration;
         private int value;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
index f821395e594..da4a74bc9a8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java
@@ -84,11 +84,16 @@ final public class NamespaceContextImplementation implements NamespaceContext {
                 final String declaredPrefix = prefixes[i];
 
                 // Check if prefix is out of scope
-                for (++i; i < namespacePosition; i++)
-                    if (declaredPrefix == prefixes[i])
-                        return null;
+                boolean isOutOfScope = false;
+                for (int j = i + 1; j < namespacePosition; j++)
+                    if (declaredPrefix == prefixes[j]) {
+                        isOutOfScope = true;
+                        break;
+                    }
 
-                return declaredPrefix;
+                if (!isOutOfScope) {
+                    return declaredPrefix;
+                }
             }
         }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
index 38a758282df..667bb6d4a0c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java
@@ -166,7 +166,7 @@ public class StringIntMap extends KeyIntMap {
             }
         }
 
-        return -1;
+        return NOT_PRESENT;
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
index e986f0351f6..587a13e5e4a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPExceptionImpl.java,v 1.3 2006/01/27 12:49:17 vj135062 Exp $
- * $Revision: 1.3 $
- * $Date: 2006/01/27 12:49:17 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
index 6f365dc27de..f7d91109dbe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: HttpSOAPConnection.java,v 1.41 2006/01/27 12:49:17 vj135062 Exp $
- * $Revision: 1.41 $
- * $Date: 2006/01/27 12:49:17 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.client.p2p;
@@ -66,8 +61,8 @@ public class HttpSOAPConnection extends SOAPConnection {
         Logger.getLogger(LogDomainConstants.HTTP_CONN_DOMAIN,
                          "com.sun.xml.internal.messaging.saaj.client.p2p.LocalStrings");
 
-    public static final String defaultProxyHost = null;
-    public static  final int defaultProxyPort = -1;
+    private static final String defaultProxyHost = null;
+    private static final int defaultProxyPort = -1;
 
     MessageFactory messageFactory = null;
 
@@ -80,8 +75,8 @@ public class HttpSOAPConnection extends SOAPConnection {
         try {
             messageFactory = MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL);
         } catch (NoSuchMethodError ex) {
-                    //fallback to default SOAP 1.1 in this case for backward compatibility
-                    messageFactory = MessageFactory.newInstance();
+            //fallback to default SOAP 1.1 in this case for backward compatibility
+            messageFactory = MessageFactory.newInstance();
         } catch (Exception ex) {
             log.log(Level.SEVERE, "SAAJ0001.p2p.cannot.create.msg.factory", ex);
             throw new SOAPExceptionImpl("Unable to create message factory", ex);
@@ -107,17 +102,16 @@ public class HttpSOAPConnection extends SOAPConnection {
 
         Class urlEndpointClass = null;
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
         try {
-                if (loader != null) {
-                        urlEndpointClass = loader.loadClass(JAXM_URLENDPOINT);
-                } else {
-                        urlEndpointClass = Class.forName(JAXM_URLENDPOINT);
-                    }
-                } catch (ClassNotFoundException ex) {
-                    //Do nothing. URLEndpoint is available only when JAXM is there.
-                    log.finest("SAAJ0090.p2p.endpoint.available.only.for.JAXM");
-                }
+            if (loader != null) {
+                urlEndpointClass = loader.loadClass(JAXM_URLENDPOINT);
+            } else {
+                urlEndpointClass = Class.forName(JAXM_URLENDPOINT);
+            }
+        } catch (ClassNotFoundException ex) {
+            //Do nothing. URLEndpoint is available only when JAXM is there.
+            log.finest("SAAJ0090.p2p.endpoint.available.only.for.JAXM");
+        }
 
         if (urlEndpointClass != null) {
             if (urlEndpointClass.isInstance(endPoint)) {
@@ -654,23 +648,24 @@ public class HttpSOAPConnection extends SOAPConnection {
 
         return ret;
     }
+
     //private static String SSL_PKG = "com.sun.net.ssl.internal.www.protocol";
     //private static String SSL_PROVIDER =
-              //  "com.sun.net.ssl.internal.ssl.Provider";
+      //  "com.sun.net.ssl.internal.ssl.Provider";
     private static final String SSL_PKG;
-    private static  final String SSL_PROVIDER;
-
+    private static final String SSL_PROVIDER;
 
     static {
-                if (isIBMVM) {
-                    SSL_PKG ="com.ibm.net.ssl.internal.www.protocol";
-                    SSL_PROVIDER ="com.ibm.net.ssl.internal.ssl.Provider";
-                } else {
-                    //if not IBM VM default to Sun.
-                    SSL_PKG = "com.sun.net.ssl.internal.www.protocol";
-                    SSL_PROVIDER ="com.sun.net.ssl.internal.ssl.Provider";
-                }
-            }
+        if (isIBMVM) {
+            SSL_PKG ="com.ibm.net.ssl.internal.www.protocol";
+            SSL_PROVIDER ="com.ibm.net.ssl.internal.ssl.Provider";
+        } else {
+            //if not IBM VM default to Sun.
+            SSL_PKG = "com.sun.net.ssl.internal.www.protocol";
+            SSL_PROVIDER ="com.sun.net.ssl.internal.ssl.Provider";
+        }
+    }
+
     private void initHttps() {
         //if(!setHttps) {
         String pkgs = System.getProperty("java.protocol.handler.pkgs");
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
index 340ceac0694..b03d19cee34 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: HttpSOAPConnectionFactory.java,v 1.6 2006/01/27 12:49:18 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:18 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.client.p2p;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
index 3a4eaeecc84..789362f489c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties
@@ -53,4 +53,3 @@ SAAJ0055.p2p.added.ssl.provider=SAAJ0055: Added SSL_PROVIDER {0}
 # Trace messages
 SAAJ0090.p2p.endpoint.available.only.for.JAXM=SAAJ0090: URLEndpoint is available only when JAXM is there
 SAAJ0091.p2p.https.auth.in.POST.true=SAAJ0091: HTTPS Authorization in POST set to true
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
index 31f472e26df..c2dff5b1a2c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: AttachmentPartImpl.java,v 1.1.1.1.2.1 2007/11/27 07:19:29 kumarjayanti Exp $
- * $Revision: 1.1.1.1.2.1 $
- * $Date: 2007/11/27 07:19:29 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
@@ -100,7 +95,7 @@ public class AttachmentPartImpl extends AttachmentPart {
                 mailMap.addMailcap(
                     "image/gif"
                         + hndlrStr
-                        + "com.sun.xml.internal.messaging.saaj.soap.GifDataContentHandler");*/
+                        + "com.sun.xml.internal.messaging.saaj.soap.GifDataContentHandler"); */
                 /*mailMap.addMailcap(
                     "multipart/*"
                         + hndlrStr
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
index f136a463686..5cb0be68cd0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: Envelope.java,v 1.8 2006/01/27 12:49:26 vj135062 Exp $
- * $Revision: 1.8 $
- * $Date: 2006/01/27 12:49:26 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
index 00ca9c0a9b4..872d93abefd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
@@ -85,6 +80,9 @@ public class EnvelopeFactory {
                     e);
             }
             InputSource is = SAXSource.sourceToInputSource(src);
+            if (is.getEncoding()== null && soapPart.getSourceCharsetEncoding() != null) {
+                is.setEncoding(soapPart.getSourceCharsetEncoding());
+            }
             XMLReader rejectFilter;
             try {
                 rejectFilter = new RejectDoctypeSaxFilter(saxParser);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
index c4e2c23e5c2..66ee50db08e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: FastInfosetDataContentHandler.java,v 1.1.1.1 2006/01/27 13:10:56 kumarjayanti Exp $
- * $Revision: 1.1.1.1 $
- * $Date: 2006/01/27 13:10:56 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
index 587b09a315c..87de88ec5ab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: GifDataContentHandler.java,v 1.2.2.1 2007/11/27 07:19:29 kumarjayanti Exp $
- * $Revision: 1.2.2.1 $
- * $Date: 2007/11/27 07:19:29 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
@@ -34,6 +29,7 @@ package com.sun.xml.internal.messaging.saaj.soap;
 import java.awt.datatransfer.DataFlavor;
 import java.io.*;
 import java.awt.*;
+
 import javax.activation.*;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
index 85968511df0..5a65a95badd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: ImageDataContentHandler.java,v 1.1.1.1.2.1 2007/11/27 07:19:28 kumarjayanti Exp $
- * $Revision: 1.1.1.1.2.1 $
- * $Date: 2007/11/27 07:19:28 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
index 41391b66b11..cc978a8a4ce 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: JpegDataContentHandler.java,v 1.1.1.1.2.1 2007/11/27 07:19:29 kumarjayanti Exp $
- * $Revision: 1.1.1.1.2.1 $
- * $Date: 2007/11/27 07:19:29 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
@@ -157,7 +152,6 @@ public class JpegDataContentHandler
                 Graphics g = bufImage.createGraphics();
                 g.drawImage(img, 0, 0, null);
             }
-
             ImageIO.write(bufImage, "jpeg", os);
 
         } catch (Exception ex) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
index a60c6172d03..ab3be4d2d72 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties
@@ -105,4 +105,3 @@ SAAJ0591.soap.exception.in.set.property=SAAJ0591: Exception {0}  when trying to
 
 # Info messages
 SAAJ0580.soap.set.Content-Type=SAAJ0580: Content-Type set to {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
index 945139fc69a..86ccadfe456 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
index 51b47bbe1fd..8c8eb00242f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
@@ -151,7 +146,7 @@ public abstract class MessageImpl
      *      must be all lower case
      */
     private static boolean isSoap1_1Type(String primary, String sub) {
-        return primary.equals("text") && sub.equals("xml")
+        return primary.equalsIgnoreCase("text") && sub.equalsIgnoreCase("xml")
             || primary.equals("application")
                && sub.equals("fastinfoset");
     }
@@ -848,6 +843,7 @@ public abstract class MessageImpl
             }
         }
         attachments = f;
+       // needsSave();
     }
 
     public AttachmentPart createAttachmentPart() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
index 4e0d9028d56..43e0216ec4d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: MultipartDataContentHandler.java,v 1.3 2006/01/27 12:49:28 vj135062 Exp $
- * $Revision: 1.3 $
- * $Date: 2006/01/27 12:49:28 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
index 990f19fa150..a5bc4512a1d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.messaging.saaj.soap;
 
 import javax.xml.soap.SAAJMetaFactory;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
index 560f841e9fc..1a34f1b06bd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPDocument.java,v 1.5 2006/01/27 12:49:28 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
index 41e8981be08..0e94f764ce1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPDocumentFragment.java,v 1.6 2006/01/27 12:49:28 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
index 260d1c84276..34e43a2587f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
@@ -45,7 +42,7 @@ import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
 
 public class SOAPDocumentImpl extends DocumentImpl implements SOAPDocument {
 
-    protected static final  Logger log =
+    protected static final Logger log =
         Logger.getLogger(LogDomainConstants.SOAP_DOMAIN,
                          "com.sun.xml.internal.messaging.saaj.soap.LocalStrings");
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
index 3bbc6cb9103..0ec709753eb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
index 4eced47e2f4..582ee496a77 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 /**
  * Created on Nov 19, 2002
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
index a0b1039306b..137ea8c8293 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
@@ -612,20 +607,20 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
 
             InputStream inputStream = ((StreamSource) source).getInputStream();
             if (inputStream != null) {
-                if (sourceCharsetEncoding == null) {
+                if (getSourceCharsetEncoding() == null) {
                     reader = new InputStreamReader(inputStream);
                 } else {
                     try {
                         reader =
                             new InputStreamReader(
-                                inputStream, sourceCharsetEncoding);
+                                inputStream, getSourceCharsetEncoding());
                     } catch (UnsupportedEncodingException uee) {
                         log.log(
                             Level.SEVERE,
                             "SAAJ0551.soap.unsupported.encoding",
-                            new Object[] {sourceCharsetEncoding});
+                            new Object[] {getSourceCharsetEncoding()});
                         throw new SOAPExceptionImpl(
-                            "Unsupported encoding " + sourceCharsetEncoding,
+                            "Unsupported encoding " + getSourceCharsetEncoding(),
                             uee);
                     }
                 }
@@ -797,4 +792,8 @@ public abstract class SOAPPartImpl extends SOAPPart implements SOAPDocument {
     public void detachNode() {
         // Nothing seems to be required to be done here
     }
+
+    public String getSourceCharsetEncoding() {
+        return sourceCharsetEncoding;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
index e5c607996b7..7361c44bb0a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPVersionMismatchException.java,v 1.6 2006/01/27 12:49:29 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:29 $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
index d810918ca9e..901a2be0386 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: StringDataContentHandler.java,v 1.6 2006/01/27 12:49:29 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:29 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
@@ -35,127 +30,139 @@ import java.awt.datatransfer.DataFlavor;
 import java.io.*;
 
 import javax.activation.*;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.MimeUtility;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.util.ASCIIUtility;
+import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.ContentType;
 
 /**
  * JAF data content handler for text/plain --> String
  *
- * @author Anil Vijendran
  */
 public class StringDataContentHandler implements DataContentHandler {
-    /**
-     * return the DataFlavors for this <code>DataContentHandler</code>
-     * @return The DataFlavors.
-     */
-    public DataFlavor[] getTransferDataFlavors() { // throws Exception;
-        DataFlavor flavors[] = new DataFlavor[2];
+    private static ActivationDataFlavor myDF = new ActivationDataFlavor(
+        java.lang.String.class,
+        "text/plain",
+        "Text String");
 
-        try {
-            flavors[0] =
-                new ActivationDataFlavor(
-                    Class.forName("java.lang.String"),
-                    "text/plain",
-                    "text string");
-        } catch (Exception e) {
-        }
-
-        flavors[1] = new DataFlavor("text/plain", "Plain Text");
-        return flavors;
-    }
-
-    /**
-     * return the Transfer Data of type DataFlavor from InputStream
-     * @param df The DataFlavor.
-     * @param ins The InputStream corresponding to the data.
-     * @return The constructed Object.
-     */
-    public Object getTransferData(DataFlavor df, DataSource ds) {
-
-        // this is sort of hacky, but will work for the
-        // sake of testing...
-        if (df.getMimeType().startsWith("text/plain")) {
-            if (df
-                .getRepresentationClass()
-                .getName()
-                .equals("java.lang.String")) {
-                // spit out String
-                StringBuffer buf = new StringBuffer();
-                char data[] = new char[1024];
-                // InputStream is = null;
-                InputStreamReader isr = null;
-                int bytes_read = 0;
-                int total_bytes = 0;
-
-                try {
-                    isr = new InputStreamReader(ds.getInputStream());
-
-                    while (true) {
-                        bytes_read = isr.read(data);
-                        if (bytes_read > 0)
-                            buf.append(data, 0, bytes_read);
-                        else
-                            break;
-                        total_bytes += bytes_read;
-                    }
-                } catch (Exception e) {
-                }
-
-                return buf.toString();
-
-            } else if (
-                df.getRepresentationClass().getName().equals(
-                    "java.io.InputStream")) {
-                // spit out InputStream
-                try {
-                    return ds.getInputStream();
-                } catch (Exception e) {
-                }
-            }
-
-        }
-        return null;
+    protected ActivationDataFlavor getDF() {
+        return myDF;
     }
 
     /**
+     * Return the DataFlavors for this <code>DataContentHandler</code>.
      *
+     * @return The DataFlavors
      */
-    public Object getContent(DataSource ds) { // throws Exception;
-        StringBuffer buf = new StringBuffer();
-        char data[] = new char[1024];
-        // InputStream is = null;
-        InputStreamReader isr = null;
-        int bytes_read = 0;
-        int total_bytes = 0;
+    public DataFlavor[] getTransferDataFlavors() {
+        return new DataFlavor[] { getDF() };
+    }
+
+    /**
+     * Return the Transfer Data of type DataFlavor from InputStream.
+     *
+     * @param df The DataFlavor
+     * @param ds The DataSource corresponding to the data
+     * @return String object
+     */
+    public Object getTransferData(DataFlavor df, DataSource ds)
+                        throws IOException {
+        // use myDF.equals to be sure to get ActivationDataFlavor.equals,
+        // which properly ignores Content-Type parameters in comparison
+        if (getDF().equals(df))
+            return getContent(ds);
+        else
+            return null;
+    }
+
+    public Object getContent(DataSource ds) throws IOException {
+        String enc = null;
+        InputStreamReader is = null;
 
         try {
-            isr = new InputStreamReader(ds.getInputStream());
-
-            while (true) {
-                bytes_read = isr.read(data);
-                if (bytes_read > 0)
-                    buf.append(data, 0, bytes_read);
-                else
-                    break;
-                total_bytes += bytes_read;
-            }
-        } catch (Exception e) {
+            enc = getCharset(ds.getContentType());
+            is = new InputStreamReader(ds.getInputStream(), enc);
+        } catch (IllegalArgumentException iex) {
+            /*
+             * An unknown charset of the form ISO-XXX-XXX will cause
+             * the JDK to throw an IllegalArgumentException.  The
+             * JDK will attempt to create a classname using this string,
+             * but valid classnames must not contain the character '-',
+             * and this results in an IllegalArgumentException, rather than
+             * the expected UnsupportedEncodingException.  Yikes.
+             */
+            throw new UnsupportedEncodingException(enc);
         }
 
-        return buf.toString();
-    }
-    /**
-     * construct an object from a byte stream
-     * (similar semantically to previous method, we are deciding
-     *  which one to support)
-     */
-    public void writeTo(Object obj, String mimeType, OutputStream os)
-        throws IOException {
-        if (!mimeType.startsWith("text/plain"))
-            throw new IOException(
-                "Invalid type \"" + mimeType + "\" on StringDCH");
+        try {
+            int pos = 0;
+            int count;
+            char buf[] = new char[1024];
 
-        Writer out = new OutputStreamWriter(os);
-        out.write((String) obj);
-        out.flush();
+            while ((count = is.read(buf, pos, buf.length - pos)) != -1) {
+                pos += count;
+                if (pos >= buf.length) {
+                    int size = buf.length;
+                    if (size < 256*1024)
+                        size += size;
+                    else
+                        size += 256*1024;
+                    char tbuf[] = new char[size];
+                    System.arraycopy(buf, 0, tbuf, 0, pos);
+                    buf = tbuf;
+                }
+            }
+            return new String(buf, 0, pos);
+        } finally {
+            try {
+                is.close();
+            } catch (IOException ex) { }
+        }
+    }
+
+    /**
+     * Write the object to the output stream, using the specified MIME type.
+     */
+    public void writeTo(Object obj, String type, OutputStream os)
+                        throws IOException {
+        if (!(obj instanceof String))
+            throw new IOException("\"" + getDF().getMimeType() +
+                "\" DataContentHandler requires String object, " +
+                "was given object of type " + obj.getClass().toString());
+
+        String enc = null;
+        OutputStreamWriter osw = null;
+
+        try {
+            enc = getCharset(type);
+            osw = new OutputStreamWriter(os, enc);
+        } catch (IllegalArgumentException iex) {
+            /*
+             * An unknown charset of the form ISO-XXX-XXX will cause
+             * the JDK to throw an IllegalArgumentException.  The
+             * JDK will attempt to create a classname using this string,
+             * but valid classnames must not contain the character '-',
+             * and this results in an IllegalArgumentException, rather than
+             * the expected UnsupportedEncodingException.  Yikes.
+             */
+            throw new UnsupportedEncodingException(enc);
+        }
+
+        String s = (String)obj;
+        osw.write(s, 0, s.length());
+        osw.flush();
+    }
+
+    private String getCharset(String type) {
+        try {
+            ContentType ct = new ContentType(type);
+            String charset = ct.getParameter("charset");
+            if (charset == null)
+                // If the charset parameter is absent, use US-ASCII.
+                charset = "us-ascii";
+            return MimeUtility.javaCharset(charset);
+        } catch (Exception ex) {
+            return null;
+        }
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
index 46f89c4ff53..2b5382edac1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: XmlDataContentHandler.java,v 1.12 2006/01/27 12:49:30 vj135062 Exp $
- * $Revision: 1.12 $
- * $Date: 2006/01/27 12:49:30 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap;
@@ -104,7 +99,7 @@ public class XmlDataContentHandler implements DataContentHandler {
      */
     public void writeTo(Object obj, String mimeType, OutputStream os)
         throws IOException {
-        if (!mimeType.equals("text/xml") && !mimeType.equals("application/xml"))
+        if (!mimeType.startsWith("text/xml") && !mimeType.startsWith("application/xml"))
             throw new IOException(
                 "Invalid content type \"" + mimeType + "\" for XmlDCH");
 
@@ -116,7 +111,13 @@ public class XmlDataContentHandler implements DataContentHandler {
                 // Streaming transform applies only to javax.xml.transform.StreamSource
                 transformer.transform((Source) getContent((DataSource)obj), result);
             } else {
-                transformer.transform((Source) obj, result);
+                Source src=null;
+                if (obj instanceof String) {
+                     src= new StreamSource(new java.io.StringReader((String) obj));
+                } else {
+                    src=(Source) obj;
+                }
+                transformer.transform(src, result);
             }
         } catch (Exception ex) {
             throw new IOException(
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
index 2db889d9ebb..b01335f99af 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPFactoryDynamicImpl.java,v 1.2 2006/01/27 12:49:32 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
index 6bba9c84440..bc35fafa123 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPMessageFactoryDynamicImpl.java,v 1.4 2006/01/27 12:49:32 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
index 83f4ac24bdd..aec8047e03c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: BodyElementImpl.java,v 1.14 2006/01/27 12:49:33 vj135062 Exp $
- * $Revision: 1.14 $
- * $Date: 2006/01/27 12:49:33 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
index 2ec0855be1e..d49c074b964 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: BodyImpl.java,v 1.41 2006/01/27 12:49:34 vj135062 Exp $
- * $Revision: 1.41 $
- * $Date: 2006/01/27 12:49:34 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
index c44cd4b5444..c17bbb5e237 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
index 32266d3e349..971574ecb64 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
index d8286f1a6bd..cf1dea6c342 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: DetailEntryImpl.java,v 1.8 2006/01/27 12:49:34 vj135062 Exp $
- * $Revision: 1.8 $
- * $Date: 2006/01/27 12:49:34 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
index caecc726ba8..fd42a0acf91 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java
@@ -22,11 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: DetailImpl.java,v 1.16 2006/01/27 12:49:34 vj135062 Exp $
- * $Revision: 1.16 $
- * $Date: 2006/01/27 12:49:34 $
- */
+
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
@@ -125,4 +121,28 @@ public abstract class DetailImpl extends FaultElementImpl implements Detail {
        return true;
    }
 
+    //overriding this method since the only two uses of this method
+    // are in ElementImpl and DetailImpl
+    //whereas the original base impl does the correct job for calls to it inside ElementImpl
+    // But it would not work for DetailImpl.
+    protected SOAPElement circumventBug5034339(SOAPElement element) {
+
+        Name elementName = element.getElementName();
+        if (!isNamespaceQualified(elementName)) {
+            String prefix = elementName.getPrefix();
+            String defaultNamespace = getNamespaceURI(prefix);
+            if (defaultNamespace != null) {
+                Name newElementName =
+                    NameImpl.create(
+                        elementName.getLocalName(),
+                        elementName.getPrefix(),
+                        defaultNamespace);
+                SOAPElement newElement = createDetailEntry(newElementName);
+                replaceChild(newElement, element);
+                return newElement;
+            }
+        }
+        return element;
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
index e5e124e9016..f440c257623 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: ElementFactory.java,v 1.16 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.16 $
- * $Date: 2006/01/27 12:49:35 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
index 80c98922f27..20f3c463c0a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
@@ -38,7 +33,6 @@ import java.util.logging.Logger;
 import javax.xml.namespace.QName;
 import javax.xml.soap.*;
 
-import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
 import org.w3c.dom.*;
 import org.w3c.dom.Node;
 
@@ -64,6 +58,19 @@ public class ElementImpl
         Logger.getLogger(LogDomainConstants.SOAP_IMPL_DOMAIN,
                          "com.sun.xml.internal.messaging.saaj.soap.impl.LocalStrings");
 
+    /**
+     * XML Information Set REC
+     * all namespace attributes (including those named xmlns,
+     * whose [prefix] property has no value) have a namespace URI of http://www.w3.org/2000/xmlns/
+     */
+    public final static String XMLNS_URI = "http://www.w3.org/2000/xmlns/".intern();
+
+    /**
+     * The XML Namespace ("http://www.w3.org/XML/1998/namespace"). This is
+     * the Namespace URI that is automatically mapped to the "xml" prefix.
+     */
+    public final static String XML_URI = "http://www.w3.org/XML/1998/namespace".intern();
+
     public ElementImpl(SOAPDocumentImpl ownerDoc, Name name) {
         super(
             ownerDoc,
@@ -141,11 +148,11 @@ public class ElementImpl
     public String getNamespaceURI(String prefix) {
 
         if ("xmlns".equals(prefix)) {
-            return NamespaceContext.XMLNS_URI;
+            return XMLNS_URI;
         }
 
         if("xml".equals(prefix)) {
-            return NamespaceContext.XML_URI;
+            return XML_URI;
         }
 
         if ("".equals(prefix)) {
@@ -167,11 +174,11 @@ public class ElementImpl
                         }
                     }*/
                     if (((Element) currentAncestor).hasAttributeNS(
-                            NamespaceContext.XMLNS_URI, "xmlns")) {
+                            XMLNS_URI, "xmlns")) {
 
                         String uri =
                             ((Element) currentAncestor).getAttributeNS(
-                                NamespaceContext.XMLNS_URI, "xmlns");
+                                XMLNS_URI, "xmlns");
                         if ("".equals(uri))
                             return null;
                         else {
@@ -204,9 +211,9 @@ public class ElementImpl
                 //}
 
                 if (((Element) currentAncestor).hasAttributeNS(
-                        NamespaceContext.XMLNS_URI, prefix)) {
+                        XMLNS_URI, prefix)) {
                     return ((Element) currentAncestor).getAttributeNS(
-                               NamespaceContext.XMLNS_URI, prefix);
+                               XMLNS_URI, prefix);
                 }
 
                 currentAncestor = currentAncestor.getParentNode();
@@ -492,7 +499,7 @@ public class ElementImpl
 
         uri = uri.length() == 0 ? null : uri;
         if (qualifiedName.equals("xmlns")) {
-            uri = NamespaceContext.XMLNS_URI;
+            uri = XMLNS_URI;
         }
 
         if (uri == null) {
@@ -505,9 +512,9 @@ public class ElementImpl
     public SOAPElement addNamespaceDeclaration(String prefix, String uri)
         throws SOAPException {
         if (prefix.length() > 0) {
-            setAttributeNS(NamespaceContext.XMLNS_URI, "xmlns:" + prefix, uri);
+            setAttributeNS(XMLNS_URI, "xmlns:" + prefix, uri);
         } else {
-            setAttributeNS(NamespaceContext.XMLNS_URI, "xmlns", uri);
+            setAttributeNS(XMLNS_URI, "xmlns", uri);
         }
         //Fix for CR:6474641
         //tryToFindEncodingStyleAttributeName();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
index 1c4cf2b030a..62b1990129a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: EnvelopeImpl.java,v 1.1.1.1 2006/01/27 13:10:56 kumarjayanti Exp $
- * $Revision: 1.1.1.1 $
- * $Date: 2006/01/27 13:10:56 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
index 47ac1d0cb6d..d145fc95ebb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: FaultElementImpl.java,v 1.10 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.10 $
- * $Date: 2006/01/27 12:49:35 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
index f9c44744245..35e4832737d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: FaultImpl.java,v 1.2 2006/11/16 17:39:10 kumarjayanti Exp $
- * $Revision: 1.2 $
- * $Date: 2006/11/16 17:39:10 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
@@ -100,7 +95,7 @@ public abstract class FaultImpl extends ElementImpl implements SOAPFault {
         throws SOAPException {
 
         if (prefix == null || prefix.equals("")) {
-            if (uri == null || uri.equals("")) {
+            if (uri == null) {
                 log.severe("SAAJ0140.impl.no.ns.URI");
                 throw new SOAPExceptionImpl("No NamespaceURI, SOAP requires faultcode content to be a QName");
             }
@@ -121,7 +116,7 @@ public abstract class FaultImpl extends ElementImpl implements SOAPFault {
         if (uri == null || uri.equals("")) {
             uri = this.faultCodeElement.getNamespaceURI(prefix);
         }
-        if (uri == null || uri.equals("")) {
+        if (uri == null) {
             log.severe("SAAJ0140.impl.no.ns.URI");
             throw new SOAPExceptionImpl("No NamespaceURI, SOAP requires faultcode content to be a QName");
         } else {
@@ -256,7 +251,7 @@ public abstract class FaultImpl extends ElementImpl implements SOAPFault {
         }
     }
 
-    private SOAPFaultElement addFaultCodeElement() throws SOAPException {
+    protected SOAPFaultElement addFaultCodeElement() throws SOAPException {
         if (this.faultCodeElement == null)
             findFaultCodeElement();
         if (this.faultCodeElement == null) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
index eab766dfade..dd171c42976 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: HeaderElementImpl.java,v 1.26 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.26 $
- * $Date: 2006/01/27 12:49:35 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
index fa87cee148f..990a72fcb4c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: HeaderImpl.java,v 1.33 2006/01/27 12:49:35 vj135062 Exp $
- * $Revision: 1.33 $
- * $Date: 2006/01/27 12:49:35 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
index 2def1f555ba..02cd01e87e1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties
@@ -46,7 +46,7 @@ SAAJ0122.impl.body.already.exists=SAAJ0122: Can't add a body when one is already
 SAAJ0123.impl.no.reserved.xmlns=SAAJ0123: Cannot declare reserved xmlns prefix
 SAAJ0124.impl.qualified.name.cannot.be.xmlns=SAAJ0124: Qualified name cannot be xmlns
 #SAAJ0125.impl.URI.cannot.be.null=SAAJ0125: URI cannot be null
-SAAJ0126.impl.cannot.locate.ns=SAAJ0126: Unable to locate namespace for prefix {0} 
+SAAJ0126.impl.cannot.locate.ns=SAAJ0126: Unable to locate namespace for prefix {0}
 SAAJ0127.impl.no.null.for.parent.elem=SAAJ0127: Cannot pass NULL to setParentElement
 
 SAAJ0130.impl.header.elem.parent.mustbe.header=SAAJ0130: Parent of a SOAPHeaderElement has to be a SOAPHeader
@@ -83,4 +83,3 @@ SAAJ0159.impl.version.mismatch.detail=SAAJ0159: SOAP Version mismatch encountere
 # Info messages
 SAAJ0190.impl.set.xml.declaration=SAAJ0190: Omit XML declaration set to {0}
 SAAJ0191.impl.set.encoding=SAAJ0191: Encoding is set to {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
index 064b6c6e181..045224126a4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
index 51453756be1..eb539b12b5e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: TreeException.java,v 1.5 2006/01/27 12:49:36 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:36 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.impl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
index 12b953a18e8..893adb76f1f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties
@@ -28,4 +28,3 @@
 # Error messages
 SAAJ0201.name.not.created.from.null.tag=SAAJ0201: Cannot create a name from a null tag
 SAAJ0202.name.invalid.arg.format=SAAJ0202: Argument "{0}" must be of the form: prefix:localName
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
index 43c2602b99a..4b4716296f4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- *
- *
- */
 
 
 package com.sun.xml.internal.messaging.saaj.soap.name;
@@ -38,10 +33,8 @@ import javax.xml.namespace.QName;
 import javax.xml.soap.Name;
 import javax.xml.soap.SOAPConstants;
 
-import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
+//import com.sun.org.apache.xerces.internal.xni.NamespaceContext;
 import org.w3c.dom.Element;
-
-import com.sun.xml.internal.messaging.saaj.soap.impl.ElementImpl;
 import com.sun.xml.internal.messaging.saaj.util.LogDomainConstants;
 
 public class NameImpl implements Name {
@@ -67,6 +60,13 @@ public class NameImpl implements Name {
         Logger.getLogger(LogDomainConstants.NAMING_DOMAIN,
                          "com.sun.xml.internal.messaging.saaj.soap.name.LocalStrings");
 
+    /**
+     * XML Information Set REC
+     * all namespace attributes (including those named xmlns,
+     * whose [prefix] property has no value) have a namespace URI of http://www.w3.org/2000/xmlns/
+     */
+    public final static String XMLNS_URI = "http://www.w3.org/2000/xmlns/".intern();
+
     protected NameImpl(String name) {
         this.localName = name == null ? "" : name;
     }
@@ -77,9 +77,9 @@ public class NameImpl implements Name {
         this.prefix = prefix == null ? "" : prefix;
 
         if (this.prefix.equals("xmlns") && this.uri.equals("")) {
-            this.uri = NamespaceContext.XMLNS_URI;
+            this.uri = XMLNS_URI;
         }
-        if (this.uri.equals(NamespaceContext.XMLNS_URI) && this.prefix.equals("")) {
+        if (this.uri.equals(XMLNS_URI) && this.prefix.equals("")) {
             this.prefix = "xmlns";
         }
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
index 10ab166c223..cb1d9e32e21 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: Body1_1Impl.java,v 1.14 2006/01/27 12:49:38 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
index 14607fc5fa3..6632c62880d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: BodyElement1_1Impl.java,v 1.13 2006/01/27 12:49:39 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
index 8d300bb7654..2b8a83dce6d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: Detail1_1Impl.java,v 1.12 2006/01/27 12:49:40 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
index 9b61ae1edb5..9f9c3b3540c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: DetailEntry1_1Impl.java,v 1.13 2006/01/27 12:49:40 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
index 2369a2244ec..1ee3e80dcc5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: Envelope1_1Impl.java,v 1.8 2006/01/27 12:49:41 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
index 5f34dc31507..2c7824d5ada 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
@@ -315,4 +312,65 @@ public class Fault1_1Impl extends FaultImpl {
                        (NameImpl)qname);
     }
 
+    public void setFaultCode(String faultCode, String prefix, String uri)
+        throws SOAPException {
+        if (prefix == null || prefix.equals("")) {
+            if (uri != null && !"".equals(uri)) {
+                prefix = getNamespacePrefix(uri);
+                if (prefix == null || prefix.equals("")) {
+                    prefix = "ns0";
+                }
+            }
+        }
+
+
+        if (this.faultCodeElement == null)
+            findFaultCodeElement();
+
+        if (this.faultCodeElement == null)
+            this.faultCodeElement = addFaultCodeElement();
+        else
+            this.faultCodeElement.removeContents();
+
+        if (uri == null || uri.equals("")) {
+            if (prefix != null && !"".equals("prefix")) {
+                uri = this.faultCodeElement.getNamespaceURI(prefix);
+            }
+        }
+
+//        if (standardFaultCode(faultCode) &&
+//                ((uri == null) || uri.equals(""))) {
+//             log.log(Level.WARNING, "SAAJ0306.ver1_1.faultcode.incorrect.namespace", new Object[]{faultCode});
+//               // throw new SOAPExceptionImpl("Namespace Error, Standard Faultcode: " +  faultCode + ", should be in SOAP 1.1 Namespace");
+//        }
+
+        if (uri == null) {
+            //SOAP 1.1 Allows this
+            if (prefix != null && !"".equals(prefix)) {
+                log.severe("SAAJ0140.impl.no.ns.URI");
+                throw new SOAPExceptionImpl("No NamespaceURI, SOAP requires faultcode content to be a QName");
+            }
+        } else {
+            checkIfStandardFaultCode(faultCode, uri);
+            ((FaultElementImpl) this.faultCodeElement).ensureNamespaceIsDeclared(prefix, uri);
+        }
+
+        if (prefix == null || "".equals(prefix)) {
+            finallySetFaultCode(faultCode);
+        } else {
+            finallySetFaultCode(prefix + ":" + faultCode);
+        }
+    }
+
+    private boolean standardFaultCode(String faultCode) {
+        if (faultCode.equals("VersionMismatch") || faultCode.equals("MustUnderstand")
+            || faultCode.equals("Client") || faultCode.equals("Server")) {
+            return true;
+        }
+        if (faultCode.startsWith("VersionMismatch.") || faultCode.startsWith("MustUnderstand.")
+            || faultCode.startsWith("Client.") || faultCode.startsWith("Server.")) {
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
index 45225bf5b98..057bf4169c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: FaultElement1_1Impl.java,v 1.12 2006/01/27 12:49:41 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
index 7ef3e0cd349..b08f703c111 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
index 0a875a9c3f9..b4040c24faf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
index 695a2316bbf..53db8d5396b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties
@@ -29,7 +29,7 @@
 # Error messages
 SAAJ0301.ver1_1.hdr.op.unsupported.in.SOAP1.1=SAAJ0301: Operation {0} not supported by SOAP 1.1
 SAAJ0302.ver1_1.hdr.attr.unsupported.in.SOAP1.1=SAAJ0302: {0} not supported by SOAP 1.1
-SAAJ0303.ver1_1.msg.op.unsupported.in.SOAP1.1=SAAJ0303: Operation {0} not supported by SOAP 1.1 
-SAAJ0304.ver1_1.msg.invalid.SOAP1.1=SAAJ0304: InputStream does not represent a valid SOAP 1.1 Message 
+SAAJ0303.ver1_1.msg.op.unsupported.in.SOAP1.1=SAAJ0303: Operation {0} not supported by SOAP 1.1
+SAAJ0304.ver1_1.msg.invalid.SOAP1.1=SAAJ0304: InputStream does not represent a valid SOAP 1.1 Message
 SAAJ0305.ver1_2.detail.exists.error=SAAJ0305: Cannot add Detail, Detail already exists
- 
+SAAJ0306.ver1_1.faultcode.incorrect.namespace=SAAJ0306: Namespace Warning, Standard Faultcode {0}, should ideally be in SOAP 1.1 Namespace
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
index 7d2f71b6184..8f7fb4ddf6c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
index 641c1233940..ce869dd3b4a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPFactory1_1Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
- */
 
 
 
@@ -61,10 +58,8 @@ public class SOAPFactory1_1Impl extends SOAPFactoryImpl {
             throw new IllegalArgumentException("reasonText argument for createFault was passed NULL");
         }
         Fault1_1Impl fault = new Fault1_1Impl(createDocument(), null);
-        fault.setFaultString(reasonText);
-
         fault.setFaultCode(faultCode);
-
+        fault.setFaultString(reasonText);
         return fault;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
index 365326af36c..8d9f27b6ee0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPMessageFactory1_1Impl.java,v 1.7 2006/01/27 12:49:42 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
index 5a03285be91..b7ac44b5d03 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
index 328ecb7a546..1014bfb4de7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
@@ -50,7 +47,7 @@ import com.sun.xml.internal.messaging.saaj.soap.name.NameImpl;
 
 public class Body1_2Impl extends BodyImpl {
 
-    protected static  final Logger log =
+    protected static final Logger log =
         Logger.getLogger(Body1_2Impl.class.getName(),
                          "com.sun.xml.internal.messaging.saaj.soap.ver1_2.LocalStrings");
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
index ddc753da713..d6ca7013d7d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: BodyElement1_2Impl.java,v 1.13 2006/01/27 12:49:44 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
index ec880e50e34..a9d4fd29e7a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
index 06a4fec00b3..a0409595a17 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: DetailEntry1_2Impl.java,v 1.13 2006/01/27 12:49:45 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
index 11d4dc2ff9d..4cd1355fc32 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
index 0e789f8df94..d83dbbfb776 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
index 3bcd71bbc1a..3abf8aed6ee 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: FaultElement1_2Impl.java,v 1.13 2006/01/27 12:49:48 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
index 2ea0f0d9191..6b0ee09e25f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
index 14ebdadc12d..02ca6467194 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
index d2f776946ff..09e8a99eac7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties
@@ -53,4 +53,3 @@ SAAJ0434.ver1_2.text.element.not.present=SAAJ0434: env:Text must be present insi
 SAAJ0435.ver1_2.code.not.standard=SAAJ0435: {0} is not a standard Code value
 SAAJ0436.ver1_2.detail.exists.error=SAAJ0436: Cannot add Detail, Detail already exists
 SAAJ0437.ver1_2.version.mismatch.error=SAAJ0437: Incorrect SOAP version for Detail element, expected SOAP 1.2
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
index 5bae9a1d84a..08dc943b136 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: Message1_2Impl.java,v 1.18 2006/01/27 12:49:48 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
index e1ffa63ca85..28073bdc62e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPFactory1_2Impl.java,v 1.1.1.1 2006/01/27 13:10:57 kumarjayanti Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
index 433cb695922..2b07599c287 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: SOAPMessageFactory1_2Impl.java,v 1.7 2006/01/27 12:49:48 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
index a21da41b63e..fe2f1dca012 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- *
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java
index 44319d3218e..b1aed7567eb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: Base64.java,v 1.4 2006/01/27 12:49:50 vj135062 Exp $
- * $Revision: 1.4 $
- * $Date: 2006/01/27 12:49:50 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.util;
@@ -43,7 +38,7 @@ package com.sun.xml.internal.messaging.saaj.util;
  * This class is used by XML Schema binary format validation
  *
  * @author Jeffrey Rodriguez
- * @version $Revision: 1.4 $ $Date: 2006/01/27 12:49:50 $
+ * @version
  */
 public final class Base64 {
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
index 25405079f82..61a315bfe12 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java
@@ -22,12 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: ByteInputStream.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $ $Revision:
- * 1.3 $ $Date: 2006/01/27 12:49:51 $
- */
-
-
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.io.ByteArrayInputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
index 96b95a82042..2b9add15019 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java
@@ -22,10 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: ByteOutputStream.java,v 1.7 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.7 $ $Date: 2006/01/27 12:49:51 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.util;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java
index e2be17128b0..f2d4e90db4c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: CharReader.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:51 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.util;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
index 6755232c6f1..63b0af52317 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: CharWriter.java,v 1.6 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.6 $
- * $Date: 2006/01/27 12:49:51 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.util;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
index 52d2946678e..ebc13dfc1fe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: FastInfosetReflection.java,v 1.2 2006/06/06 18:46:01 sandoz Exp $
- * $Revision: 1.2 $
- * $Date: 2006/06/06 18:46:01 $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
index 66991a9b2c9..b4669b83ac2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
index ea897bc1d39..84770d56aba 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: JAXMStreamSource.java,v 1.9 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.9 $
- * $Date: 2006/01/27 12:49:51 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.util;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
index 1bfc1edff8e..949687cebe0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: JaxmURI.java,v 1.4 2006/01/27 12:49:51 vj135062 Exp $
- * $Revision: 1.4 $
- * $Date: 2006/01/27 12:49:51 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.util;
@@ -67,7 +62,7 @@ import java.io.Serializable;
 * default port for a specific scheme). Rather, it only knows the
 * grammar and basic set of operations that can be applied to a URI.
 *
-* @version  $Id: JaxmURI.java,v 1.4 2006/01/27 12:49:51 vj135062 Exp $
+* @version
 *
 **********************************************************************/
  public class JaxmURI implements Serializable {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
index c6ec37757cb..b8689e2acdd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties
@@ -31,4 +31,3 @@ SAAJ0602.util.getXMLReader.exception=SAAJ0602: Can't create RejectDoctypSaxFilte
 SAAJ0603.util.setProperty.exception=SAAJ0603: Can't create RejectDoctypSaxFilter because XMLReader.setProperty threw an exception. See stack trace for detalis
 
 # Info messages
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
index 0493b401057..f51e3559972 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: LogDomainConstants.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:52 $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
index 79e0b6896f4..c6325230718 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: MimeHeadersUtil.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
index e1e3f2f25c1..c5e4684dc3c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: NamespaceContextIterator.java,v 1.8 2006/01/27 12:49:52 vj135062 Exp $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
index 6b736cf9dc3..615388ff403 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: ParseUtil.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:52 $
- */
 
 
 package com.sun.xml.internal.messaging.saaj.util;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
index 00c11303826..0648f27706a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java
@@ -22,11 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: ParserPool.java,v 1.5 2006/01/27 12:49:52 vj135062 Exp $
- * $Revision: 1.5 $
- * $Date: 2006/01/27 12:49:52 $
- */
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
index c977ae6968f..0ba192a95b9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.util.logging.Logger;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
index 584fd801044..604706d0d13 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 /*
  * Created on Feb 28, 2003
  *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
index c404867501b..da34da47033 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package com.sun.xml.internal.messaging.saaj.util;
 
 import java.io.*;
@@ -36,7 +35,7 @@ import javax.xml.transform.TransformerException;
  *  <?xml ... ?>
  *
  * @author Panos Kougiouris (panos@acm.org)
- * @version $Revision: 1.1.1.1 $ $Date: 2006/01/27 13:10:58 $
+ * @version
  */
 
 public class XMLDeclarationParser {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
index 903b618f7b0..a33be4b37d5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 /*
  * EfficientStreamingTransformer.java
  *
@@ -64,20 +63,20 @@ public class EfficientStreamingTransformer
 
   //static final String version;
   //static final String vendor;
+  //removing the static :security issue : see CR 6813167
+  private final TransformerFactory transformerFactory = TransformerFactory.newInstance();
 
-  protected static final TransformerFactory transformerFactory = TransformerFactory.newInstance();
-
-   //removing support for Java 1.4 and 1.3 : CR6658158
-    /*static {
-    version = System.getProperty("java.vm.version");
-    vendor = System.getProperty("java.vm.vendor");
-    if (vendor.startsWith("Sun") &&
-    (version.startsWith("1.4") || version.startsWith("1.3"))) {
-    transformerFactory =
-    new com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl();
-    }
-}
-*/
+  /**
+  removing support for Java 1.4 and 1.3 : CR6658158
+  static {
+        version = System.getProperty("java.vm.version");
+        vendor = System.getProperty("java.vm.vendor");
+        if (vendor.startsWith("Sun") &&
+            (version.startsWith("1.4") || version.startsWith("1.3"))) {
+            transformerFactory =
+                new com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl();
+        }
+  }*/
 
     /**
      * TransformerFactory instance.
@@ -396,8 +395,9 @@ public class EfficientStreamingTransformer
 
     /**
      * Threadlocal to hold a Transformer instance for this thread.
+     * removing this optimiztion :  see CR 6813167
      */
-    private static ThreadLocal effTransformer = new ThreadLocal();
+    //private static ThreadLocal effTransformer = new ThreadLocal();
 
     /**
      * Return Transformer instance for this thread, allocating a new one if
@@ -405,11 +405,14 @@ public class EfficientStreamingTransformer
      * properties or any other data set on a previously used transformer.
      */
     public static Transformer newTransformer() {
-        Transformer tt = (Transformer) effTransformer.get();
+       //removing this optimiztion: see CR 6813167
+        /* Transformer tt = (Transformer) ef U15 :fTransformer.get();
         if (tt == null) {
             effTransformer.set(tt = new EfficientStreamingTransformer());
         }
         return tt;
+        */
+        return new EfficientStreamingTransformer();
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
index 128c7711983..0aaf17b1cb9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java
@@ -102,10 +102,16 @@ public interface FastInfosetSerializer {
         "http://jvnet.org/fastinfoset/parser/properties/external-vocabularies";
 
     /**
-     * The default value for the limit on the size of character content chunks
+     * The default minimum size of the character content chunks,
      * that will be indexed.
      */
-    public final static int CHARACTER_CONTENT_CHUNK_SIZE_CONSTRAINT = 32;
+    public final static int MIN_CHARACTER_CONTENT_CHUNK_SIZE = 0;
+
+    /**
+     * The default maximum size of the character content chunks,
+     * that will be indexed.
+     */
+    public final static int MAX_CHARACTER_CONTENT_CHUNK_SIZE = 32;
 
     /**
      * The default value for limit on the size of indexed Map for attribute values
@@ -114,13 +120,17 @@ public interface FastInfosetSerializer {
     public static final int CHARACTER_CONTENT_CHUNK_MAP_MEMORY_CONSTRAINT = Integer.MAX_VALUE;
 
     /**
-     * The default value for the limit on the size of attribute values
-     * that will be indexed.
+     * The default minimum size of the attribute values, that will be indexed.
      */
-    public final static int ATTRIBUTE_VALUE_SIZE_CONSTRAINT = 32;
+    public final static int MIN_ATTRIBUTE_VALUE_SIZE = 0;
 
     /**
-     * The default value for limit on the size of indexed Map for character content chunks
+     * The default maximum size of the attribute values, that will be indexed.
+     */
+    public final static int MAX_ATTRIBUTE_VALUE_SIZE = 32;
+
+    /**
+     * The default value for limit on the size of indexed Map for attribute values
      * Limit is measured in bytes not in number of entries
      */
     public static final int ATTRIBUTE_VALUE_MAP_MEMORY_CONSTRAINT = Integer.MAX_VALUE;
@@ -217,21 +227,44 @@ public interface FastInfosetSerializer {
     public Map getRegisteredEncodingAlgorithms();
 
     /**
-     * Sets the limit on the size of character content chunks
+     * Gets the minimum size of character content chunks
      * that will be indexed.
      *
-     * @param size The character content chunk size limit. Any chunk less
-     * that a length of size limit will be indexed.
+     * @return The minimum character content chunk size.
      */
-    public void setCharacterContentChunkSizeLimit(int size);
+    public int getMinCharacterContentChunkSize();
 
     /**
-     * Gets the limit on the size of character content chunks
+     * Sets the minimum size of character content chunks
      * that will be indexed.
      *
-     * @return The character content chunk size limit.
+     * @param size the minimum character content chunk size.
      */
-    public int getCharacterContentChunkSizeLimit();
+    public void setMinCharacterContentChunkSize(int size);
+
+    /**
+     * Gets the maximum size of character content chunks
+     * that will be indexed.
+     *
+     * @return The maximum character content chunk size.
+     */
+    public int getMaxCharacterContentChunkSize();
+
+    /**
+     * Sets the maximum size of character content chunks
+     * that will be indexed.
+     *
+     * @param size the maximum character content chunk size.
+     */
+    public void setMaxCharacterContentChunkSize(int size);
+
+    /**
+     * Gets the limit on the memory size of Map of attribute values
+     * that will be indexed.
+     *
+     * @return The attribute value size limit.
+     */
+    public int getCharacterContentChunkMapMemoryLimit();
 
     /**
      * Sets the limit on the memory size of Map of attribute values
@@ -242,30 +275,45 @@ public interface FastInfosetSerializer {
      */
     public void setCharacterContentChunkMapMemoryLimit(int size);
 
+    /**
+     * Gets the minimum size of attribute values
+     * that will be indexed.
+     *
+     * @return The minimum attribute values size.
+     */
+    public int getMinAttributeValueSize();
+
+    /**
+     * Sets the minimum size of attribute values
+     * that will be indexed.
+     *
+     * @param size the minimum attribute values size.
+     */
+    public void setMinAttributeValueSize(int size);
+
+    /**
+     * Gets the maximum size of attribute values
+     * that will be indexed.
+     *
+     * @return The maximum attribute values size.
+     */
+    public int getMaxAttributeValueSize();
+
+    /**
+     * Sets the maximum size of attribute values
+     * that will be indexed.
+     *
+     * @param size the maximum attribute values size.
+     */
+    public void setMaxAttributeValueSize(int size);
+
     /**
      * Gets the limit on the memory size of Map of attribute values
      * that will be indexed.
      *
      * @return The attribute value size limit.
      */
-    public int getCharacterContentChunkMapMemoryLimit();
-
-    /**
-     * Sets the limit on the size of attribute values
-     * that will be indexed.
-     *
-     * @param size The attribute value size limit. Any value less
-     * that a length of size limit will be indexed.
-     */
-    public void setAttributeValueSizeLimit(int size);
-
-    /**
-     * Gets the limit on the size of attribute values
-     * that will be indexed.
-     *
-     * @return The attribute value size limit.
-     */
-    public int getAttributeValueSizeLimit();
+    public int getAttributeValueMapMemoryLimit();
 
     /**
      * Sets the limit on the memory size of Map of attribute values
@@ -276,14 +324,6 @@ public interface FastInfosetSerializer {
      */
     public void setAttributeValueMapMemoryLimit(int size);
 
-    /**
-     * Gets the limit on the memory size of Map of attribute values
-     * that will be indexed.
-     *
-     * @return The attribute value size limit.
-     */
-    public int getAttributeValueMapMemoryLimit();
-
     /**
      * Set the external vocabulary that shall be used when serializing.
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
index 8ade78da43f..b97f1b99ee9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java
@@ -148,7 +148,7 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
      * to see if the attribute is already in the list: that is
      * the responsibility of the application.</p>
      *
-     * @param uri The Namespace URI, or the empty string if
+     * @param URI The Namespace URI, or the empty string if
      *        none is available or Namespace processing is not
      *        being performed.
      * @param localName The local name, or the empty string if
@@ -183,7 +183,7 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
      * to see if the attribute is already in the list: that is
      * the responsibility of the application.</p>
      *
-     * @param uri The Namespace URI, or the empty string if
+     * @param URI The Namespace URI, or the empty string if
      *        none is available or Namespace processing is not
      *        being performed.
      * @param localName The local name, or the empty string if
@@ -193,7 +193,7 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
      * @param type The attribute type as a string.
      * @param value The attribute value.
      * @param index True if attribute should be indexed.
-     * @param index The alphabet associated with the attribute value,
+     * @param alphabet The alphabet associated with the attribute value,
      *              may be null if there is no associated alphabet.
      */
     public void addAttribute(String URI, String localName, String qName,
@@ -221,7 +221,7 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
      * to see if the attribute is already in the list: that is
      * the responsibility of the application.</p>
      *
-     * @param uri The Namespace URI, or the empty string if
+     * @param URI The Namespace URI, or the empty string if
      *        none is available or Namespace processing is not
      *        being performed.
      * @param localName The local name, or the empty string if
@@ -259,7 +259,7 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
      * to see if the attribute is already in the list: that is
      * the responsibility of the application.</p>
      *
-     * @param uri The Namespace URI, or the empty string if
+     * @param URI The Namespace URI, or the empty string if
      *        none is available or Namespace processing is not
      *        being performed.
      * @param localName The local name, or the empty string if
@@ -573,7 +573,7 @@ public class EncodingAlgorithmAttributesImpl implements EncodingAlgorithmAttribu
             int identifier, String URI, Object data) throws FastInfosetException, IOException {
         EncodingAlgorithm ea = null;
         if (identifier < EncodingConstants.ENCODING_ALGORITHM_BUILTIN_END) {
-            ea = BuiltInEncodingAlgorithmFactory.table[identifier];
+            ea = BuiltInEncodingAlgorithmFactory.getAlgorithm(identifier);
         } else if (identifier == EncodingAlgorithmIndexes.CDATA) {
             throw new EncodingAlgorithmException(
                     CommonResourceBundle.getInstance().getString("message.CDATAAlgorithmNotSupported"));
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java
new file mode 100644
index 00000000000..d7f549b2e35
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.nio.ByteBuffer;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+final class Chunk {
+    volatile Chunk next;
+    volatile Data data;
+
+    public Chunk(Data data) {
+        this.data = data;
+    }
+
+    /**
+     * Creates a new chunk and adds to linked list.
+     *
+     * @param dataHead of the linked list
+     * @param buf MIME part partial data
+     * @return created chunk
+     */
+    public Chunk createNext(DataHead dataHead, ByteBuffer buf) {
+        return next = new Chunk(data.createNext(dataHead, buf));
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java
new file mode 100644
index 00000000000..2cbdc8b6cb9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * Constructs a InputStream from a linked list of {@link Chunk}s.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+final class ChunkInputStream extends InputStream {
+    Chunk current;
+    int offset;
+    int len;
+    final MIMEMessage msg;
+    final MIMEPart part;
+    byte[] buf;
+
+    public ChunkInputStream(MIMEMessage msg, MIMEPart part, Chunk startPos) {
+        this.current = startPos;
+        len = current.data.size();
+        buf = current.data.read();
+        this.msg = msg;
+        this.part = part;
+    }
+
+    @Override
+    public int read(byte b[], int off, int sz) throws IOException {
+        if(!fetch())    return -1;
+
+        sz = Math.min(sz, len-offset);
+        System.arraycopy(buf,offset,b,off,sz);
+        return sz;
+    }
+
+    public int read() throws IOException {
+        if(!fetch()) return -1;
+        return (buf[offset++] & 0xff);
+    }
+
+    /**
+     * Gets to the next chunk if we are done with the current one.
+     * @return
+     */
+    private boolean fetch() {
+        if (current == null) {
+            throw new IllegalStateException("Stream already closed");
+        }
+        while(offset==len) {
+            while(!part.parsed && current.next == null) {
+                msg.makeProgress();
+            }
+            current = current.next;
+
+            if (current == null) {
+                return false;
+            }
+            this.offset = 0;
+            this.buf = current.data.read();
+            this.len = current.data.size();
+        }
+        return true;
+    }
+
+    public void close() throws IOException {
+        super.close();
+        current = null;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java
new file mode 100644
index 00000000000..ff7387441eb
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.nio.ByteBuffer;
+
+/**
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+interface Data {
+
+    /**
+     * size of the chunk given by the parser
+     *
+     * @return size of the chunk
+     */
+    int size();
+
+    /**
+     * TODO: should the return type be ByteBuffer ??
+     * Return part's partial data. The data is read only.
+     *
+     * @return a byte array which contains {#size()} bytes. The returned
+     *         array may be larger than {#size()} bytes and contains data
+     *         from offset 0.
+     */
+    byte[] read();
+
+    /**
+     * Write this partial data to a file
+     *
+     * @param file to which the data needs to be written
+     * @return file pointer before the write operation(at which the data is
+     *         written from)
+     */
+    long writeTo(DataFile file);
+
+    /**
+     * Factory method to create a Data. The implementation could
+     * be file based one or memory based one.
+     *
+     * @param dataHead start of the linked list of data objects
+     * @param buf contains partial content for a part
+     * @return Data
+     */
+    Data createNext(DataHead dataHead, ByteBuffer buf);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java
new file mode 100644
index 00000000000..c146fde2e75
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.*;
+
+/**
+ * Use {@link RandomAccessFile} for concurrent access of read
+ * and write partial part's content.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+final class DataFile {
+    private WeakDataFile weak;
+    private long writePointer;
+
+    DataFile(File file) {
+        writePointer=0;
+        weak = new WeakDataFile(this, file);
+    }
+
+    /**
+     *
+     */
+    void close() {
+        weak.close();
+    }
+
+    /**
+     * Read data from the given file pointer position.
+     *
+     * @param pointer read position
+     * @param buf that needs to be filled
+     * @param offset the start offset of the data.
+     * @param length of data that needs to be read
+     */
+    synchronized void read(long pointer, byte[] buf, int offset, int length ) {
+        weak.read(pointer, buf, offset, length);
+    }
+
+    void renameTo(File f) {
+        weak.renameTo(f);
+    }
+
+    /**
+     * Write data to the file
+     *
+     * @param data that needs to written to a file
+     * @param offset start offset in the data
+     * @param length no bytes to write
+     * @return file pointer before the write operation(or at which the
+     *         data is written)
+     */
+    synchronized long writeTo(byte[] data, int offset, int length) {
+        long temp = writePointer;
+        writePointer = weak.writeTo(writePointer, data, offset, length);
+        return temp;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java
new file mode 100644
index 00000000000..c1db30ef4e8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.*;
+import java.nio.ByteBuffer;
+
+/**
+ * Represents an attachment part in a MIME message. MIME message parsing is done
+ * lazily using a pull parser, so the part may not have all the data. {@link #read}
+ * and {@link #readOnce} may trigger the actual parsing the message. In fact,
+ * parsing of an attachment part may be triggered by calling {@link #read} methods
+ * on some other attachemnt parts. All this happens behind the scenes so the
+ * application developer need not worry about these details.
+ *
+ * @author Jitendra Kotamraju
+ */
+final class DataHead {
+
+    /**
+     * Linked list to keep the part's content
+     */
+    volatile Chunk head, tail;
+
+    /**
+     * If the part is stored in a file, non-null.
+     */
+    DataFile dataFile;
+
+    private final MIMEPart part;
+
+    boolean readOnce;
+    volatile long inMemory;
+
+    /**
+     * Used only for debugging. This records where readOnce() is called.
+     */
+    private Throwable consumedAt;
+
+    DataHead(MIMEPart part) {
+        this.part = part;
+    }
+
+    void addBody(ByteBuffer buf) {
+        synchronized(this) {
+            inMemory += buf.limit();
+        }
+        if (tail != null) {
+            tail = tail.createNext(this, buf);
+        } else {
+            head = tail = new Chunk(new MemoryData(buf, part.msg.config));
+        }
+    }
+
+    void doneParsing() {
+    }
+
+    void moveTo(File f) {
+        if (dataFile != null) {
+            dataFile.renameTo(f);
+        } else {
+            try {
+                OutputStream os = new FileOutputStream(f);
+                InputStream in = readOnce();
+                byte[] buf = new byte[8192];
+                int len;
+                while((len=in.read(buf)) != -1) {
+                    os.write(buf, 0, len);
+                }
+                os.close();
+            } catch(IOException ioe) {
+                throw new MIMEParsingException(ioe);
+            }
+        }
+    }
+
+    void close() {
+        if (dataFile != null) {
+            head = tail = null;
+            dataFile.close();
+        }
+    }
+
+
+    /**
+     * Can get the attachment part's content multiple times. That means
+     * the full content needs to be there in memory or on the file system.
+     * Calling this method would trigger parsing for the part's data. So
+     * do not call this unless it is required(otherwise, just wrap MIMEPart
+     * into a object that returns InputStream for e.g DataHandler)
+     *
+     * @return data for the part's content
+     */
+    public InputStream read() {
+        if (readOnce) {
+            throw new IllegalStateException("readOnce() is called before, read() cannot be called later.");
+        }
+
+        // Trigger parsing for the part
+        while(tail == null) {
+            if (!part.msg.makeProgress()) {
+                throw new IllegalStateException("No such MIME Part: "+part);
+            }
+        }
+
+        if (head == null) {
+            throw new IllegalStateException("Already read. Probably readOnce() is called before.");
+        }
+        return new ReadMultiStream();
+    }
+
+    /**
+     * Used for an assertion. Returns true when readOnce() is not already called.
+     * or otherwise throw an exception.
+     *
+     * <p>
+     * Calling this method also marks the stream as 'consumed'
+     *
+     * @return true if readOnce() is not called before
+     */
+    private boolean unconsumed() {
+        if (consumedAt != null) {
+            AssertionError error = new AssertionError("readOnce() is already called before. See the nested exception from where it's called.");
+            error.initCause(consumedAt);
+            throw error;
+        }
+        consumedAt = new Exception().fillInStackTrace();
+        return true;
+    }
+
+    /**
+     * Can get the attachment part's content only once. The content
+     * will be lost after the method. Content data is not be stored
+     * on the file system or is not kept in the memory for the
+     * following case:
+     *   - Attachement parts contents are accessed sequentially
+     *
+     * In general, take advantage of this when the data is used only
+     * once.
+     *
+     * @return data for the part's content
+     */
+    public InputStream readOnce() {
+        assert unconsumed();
+        if (readOnce) {
+            throw new IllegalStateException("readOnce() is called before. It can only be called once.");
+        }
+        readOnce = true;
+        // Trigger parsing for the part
+        while(tail == null) {
+            if (!part.msg.makeProgress() && tail == null) {
+                throw new IllegalStateException("No such Part: "+part);
+            }
+        }
+        InputStream in = new ReadOnceStream();
+        head = null;
+        return in;
+    }
+
+    class ReadMultiStream extends InputStream {
+        Chunk current;
+        int offset;
+        int len;
+        byte[] buf;
+
+        public ReadMultiStream() {
+            this.current = head;
+            len = current.data.size();
+            buf = current.data.read();
+        }
+
+        @Override
+        public int read(byte b[], int off, int sz) throws IOException {
+            if(!fetch())    return -1;
+
+            sz = Math.min(sz, len-offset);
+            System.arraycopy(buf,offset,b,off,sz);
+            offset += sz;
+            return sz;
+        }
+
+        public int read() throws IOException {
+            if (!fetch()) {
+                return -1;
+            }
+            return (buf[offset++] & 0xff);
+        }
+
+        void adjustInMemoryUsage() {
+            // Nothing to do in this case.
+        }
+
+        /**
+         * Gets to the next chunk if we are done with the current one.
+         * @return
+         */
+        private boolean fetch() {
+            if (current == null) {
+                throw new IllegalStateException("Stream already closed");
+            }
+            while(offset==len) {
+                while(!part.parsed && current.next == null) {
+                    part.msg.makeProgress();
+                }
+                current = current.next;
+
+                if (current == null) {
+                    return false;
+                }
+                adjustInMemoryUsage();
+                this.offset = 0;
+                this.buf = current.data.read();
+                this.len = current.data.size();
+            }
+            return true;
+        }
+
+        public void close() throws IOException {
+            super.close();
+            current = null;
+        }
+    }
+
+    final class ReadOnceStream extends ReadMultiStream {
+
+        @Override
+        void adjustInMemoryUsage() {
+            synchronized(DataHead.this) {
+                inMemory -= current.data.size();    // adjust current memory usage
+            }
+        }
+
+    }
+
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java
new file mode 100644
index 00000000000..6f8877de670
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Keeps the Part's partial content data in a file.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+final class FileData implements Data {
+    private final DataFile file;
+    private final long pointer;         // read position
+    private final int length;
+
+    FileData(DataFile file, ByteBuffer buf) {
+        this(file, file.writeTo(buf.array(), 0, buf.limit()), buf.limit());
+    }
+
+    FileData(DataFile file, long pointer, int length) {
+        this.file = file;
+        this.pointer = pointer;
+        this.length = length;
+    }
+
+    public byte[] read() {
+        byte[] buf = new byte[length];
+        file.read(pointer, buf, 0, length);
+        return buf;
+    }
+
+    /*
+     * This shouldn't be called
+     */
+    public long writeTo(DataFile file) {
+        throw new IllegalStateException();
+    }
+
+    public int size() {
+        return length;
+    }
+
+    /*
+     * Always create FileData
+     */
+    public Data createNext(DataHead dataHead, ByteBuffer buf) {
+        return new FileData(file, buf);
+    }
+}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIBorder.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java
similarity index 70%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIBorder.java
rename to jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java
index 46c35ed1b08..9f6e7a74eba 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIBorder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java
@@ -22,32 +22,28 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.synthmodel;
+package com.sun.xml.internal.org.jvnet.mimepull;
 
-import javax.swing.border.Border;
+import java.util.ArrayList;
+import java.util.Collection;
 
 /**
- * UIBorder
+ * {@link java.util.ArrayList} with the final keyword.
  *
- * @author  Richard Bair
- * @author  Jasper Potts
+ * <p>
+ * This gives HotSpot a better hint that all methods can be inlined.
+ *
+ * @author Kohsuke Kawaguchi
  */
-public class UIBorder extends UIDefault<Border> {
-
-    public UIBorder() {
+final class FinalArrayList<T> extends ArrayList<T> {
+    public FinalArrayList(int initialCapacity) {
+        super(initialCapacity);
     }
 
-    public UIBorder(String id, Border b) {
-        super(id, b);
+    public FinalArrayList() {
     }
 
-    public Border getBorder() {
-        return super.getValue();
-    }
-
-    public void setBorder(Border b) {
-        Border old = getBorder();
-        super.setValue(b);
-        firePropertyChange("border", old, b);
+    public FinalArrayList(Collection<? extends T> ts) {
+        super(ts);
     }
 }
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDimension.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java
similarity index 72%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDimension.java
rename to jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java
index e611ad62743..f207d2d2d02 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDimension.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java
@@ -22,27 +22,27 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import java.awt.Dimension;
+package com.sun.xml.internal.org.jvnet.mimepull;
 
 /**
- * UIDimension
+ * The Header class stores a name/value pair to represent headers.
  *
- * @author  Richard Bair
- * @author  Jasper Potts
+ * @author John Mani
  */
-public class UIDimension extends UIDefault<Dimension> {
-    public UIDimension() {
-    }
 
-    public Dimension getDimension() {
-        return super.getValue();
-    }
+public interface Header {
 
-    public void setDimension(Dimension d) {
-        Dimension old = getDimension();
-        super.setValue(d);
-        firePropertyChange("dimension", old, d);
-    }
+    /**
+     * Returns the name of this header.
+     *
+     * @return          name of the header
+     */
+    String getName();
+
+    /**
+     * Returns the value of this header.
+     *
+     * @return          value of the header
+     */
+    String getValue();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java
new file mode 100644
index 00000000000..b6ebd86f59a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.IOException;
+import java.util.NoSuchElementException;
+import java.util.List;
+
+/**
+ * InternetHeaders is a utility class that manages RFC822 style
+ * headers. Given an RFC822 format message stream, it reads lines
+ * until the blank line that indicates end of header. The input stream
+ * is positioned at the start of the body. The lines are stored
+ * within the object and can be extracted as either Strings or
+ * {@link Header} objects. <p>
+ * <p/>
+ * This class is mostly intended for service providers. MimeMessage
+ * and MimeBody use this class for holding their headers. <p>
+ * <p/>
+ * <hr> <strong>A note on RFC822 and MIME headers</strong><p>
+ * <p/>
+ * RFC822 and MIME header fields <strong>must</strong> contain only
+ * US-ASCII characters. If a header contains non US-ASCII characters,
+ * it must be encoded as per the rules in RFC 2047. The MimeUtility
+ * class provided in this package can be used to to achieve this.
+ * Callers of the <code>setHeader</code>, <code>addHeader</code>, and
+ * <code>addHeaderLine</code> methods are responsible for enforcing
+ * the MIME requirements for the specified headers.  In addition, these
+ * header fields must be folded (wrapped) before being sent if they
+ * exceed the line length limitation for the transport (1000 bytes for
+ * SMTP).  Received headers may have been folded.  The application is
+ * responsible for folding and unfolding headers as appropriate. <p>
+ *
+ * @author John Mani
+ * @author Bill Shannon
+ */
+final class InternetHeaders {
+
+    private final FinalArrayList<hdr> headers = new FinalArrayList<hdr>();
+
+    /**
+     * Read and parse the given RFC822 message stream till the
+     * blank line separating the header from the body. Store the
+     * header lines inside this InternetHeaders object. <p>
+     * <p/>
+     * Note that the header lines are added into this InternetHeaders
+     * object, so any existing headers in this object will not be
+     * affected.
+     *
+     * @param   lis RFC822 input stream
+     */
+    InternetHeaders(MIMEParser.LineInputStream lis) {
+        // Read header lines until a blank line. It is valid
+        // to have BodyParts with no header lines.
+        String line;
+        String prevline = null; // the previous header line, as a string
+        // a buffer to accumulate the header in, when we know it's needed
+        StringBuffer lineBuffer = new StringBuffer();
+
+        try {
+            //while ((line = lis.readLine()) != null) {
+            do {
+                line = lis.readLine();
+                if (line != null &&
+                        (line.startsWith(" ") || line.startsWith("\t"))) {
+                    // continuation of header
+                    if (prevline != null) {
+                        lineBuffer.append(prevline);
+                        prevline = null;
+                    }
+                    lineBuffer.append("\r\n");
+                    lineBuffer.append(line);
+                } else {
+                    // new header
+                    if (prevline != null)
+                        addHeaderLine(prevline);
+                    else if (lineBuffer.length() > 0) {
+                        // store previous header first
+                        addHeaderLine(lineBuffer.toString());
+                        lineBuffer.setLength(0);
+                    }
+                    prevline = line;
+                }
+            } while (line != null && line.length() > 0);
+        } catch (IOException ioex) {
+            throw new MIMEParsingException("Error in input stream", ioex);
+        }
+    }
+
+    /**
+     * Return all the values for the specified header. The
+     * values are String objects.  Returns <code>null</code>
+     * if no headers with the specified name exist.
+     *
+     * @param   name header name
+     * @return          array of header values, or null if none
+     */
+    List<String> getHeader(String name) {
+        // XXX - should we just step through in index order?
+        FinalArrayList<String> v = new FinalArrayList<String>(); // accumulate return values
+
+        int len = headers.size();
+        for( int i=0; i<len; i++ ) {
+            hdr h = (hdr) headers.get(i);
+            if (name.equalsIgnoreCase(h.name)) {
+                v.add(h.getValue());
+            }
+        }
+        return (v.size() == 0) ? null : v;
+    }
+
+    /**
+     * Return all the headers as an Enumeration of
+     * {@link Header} objects.
+     *
+     * @return  Header objects
+     */
+    FinalArrayList<? extends Header> getAllHeaders() {
+        return headers; // conceptually it should be read-only, but for performance reason I'm not wrapping it here
+    }
+
+    /**
+     * Add an RFC822 header line to the header store.
+     * If the line starts with a space or tab (a continuation line),
+     * add it to the last header line in the list. <p>
+     * <p/>
+     * Note that RFC822 headers can only contain US-ASCII characters
+     *
+     * @param   line    raw RFC822 header line
+     */
+    void addHeaderLine(String line) {
+        try {
+            char c = line.charAt(0);
+            if (c == ' ' || c == '\t') {
+                hdr h = (hdr) headers.get(headers.size() - 1);
+                h.line += "\r\n" + line;
+            } else
+                headers.add(new hdr(line));
+        } catch (StringIndexOutOfBoundsException e) {
+            // line is empty, ignore it
+            return;
+        } catch (NoSuchElementException e) {
+            // XXX - vector is empty?
+        }
+    }
+
+}
+
+/*
+ * A private utility class to represent an individual header.
+ */
+
+class hdr implements Header {
+
+    String name;    // the canonicalized (trimmed) name of this header
+    // XXX - should name be stored in lower case?
+    String line;    // the entire RFC822 header "line"
+
+    /*
+     * Constructor that takes a line and splits out
+     * the header name.
+     */
+    hdr(String l) {
+        int i = l.indexOf(':');
+        if (i < 0) {
+            // should never happen
+            name = l.trim();
+        } else {
+            name = l.substring(0, i).trim();
+        }
+        line = l;
+    }
+
+    /*
+     * Constructor that takes a header name and value.
+     */
+    hdr(String n, String v) {
+        name = n;
+        line = n + ": " + v;
+    }
+
+    /*
+     * Return the "name" part of the header line.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /*
+     * Return the "value" part of the header line.
+     */
+    public String getValue() {
+        int i = line.indexOf(':');
+        if (i < 0)
+            return line;
+
+        int j;
+        if (name.equalsIgnoreCase("Content-Description")) {
+            // Content-Description should retain the folded whitespace after header unfolding -
+            // rf. RFC2822 section 2.2.3, rf. RFC2822 section 3.2.3
+            for (j = i + 1; j < line.length(); j++) {
+                char c = line.charAt(j);
+                if (!(/*c == ' ' ||*/c == '\t' || c == '\r' || c == '\n'))
+                    break;
+            }
+        } else {
+            // skip whitespace after ':'
+            for (j = i + 1; j < line.length(); j++) {
+                char c = line.charAt(j);
+                if (!(c == ' ' || c == '\t' || c == '\r' || c == '\n'))
+                    break;
+            }
+        }
+        return line.substring(j);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java
new file mode 100644
index 00000000000..49a3aab2023
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Configuration for MIME message parsing and storing.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class MIMEConfig {
+
+    private static final int DEFAULT_CHUNK_SIZE = 8192;
+    private static final long DEFAULT_MEMORY_THRESHOLD = 1048576L;
+    private static final String DEFAULT_FILE_PREFIX = "MIME";
+
+    // Parses the entire message eagerly
+    boolean parseEagerly;
+
+    // Approximate Chunk size
+    int chunkSize;
+
+    // Maximum in-memory data per attachment
+    long memoryThreshold;
+
+    // Do not store to disk
+    boolean onlyMemory;
+
+    // temp Dir to store large files
+    File tempDir;
+    String prefix;
+    String suffix;
+
+
+    private MIMEConfig(boolean parseEagerly, int chunkSize,
+                       long inMemoryThreshold, String dir, String prefix, String suffix) {
+        this.parseEagerly = parseEagerly;
+        this.chunkSize = chunkSize;
+        this.memoryThreshold = inMemoryThreshold;
+        this.prefix = prefix;
+        this.suffix = suffix;
+        setDir(dir);
+    }
+
+    public MIMEConfig() {
+        this(false, DEFAULT_CHUNK_SIZE, DEFAULT_MEMORY_THRESHOLD, null,
+                DEFAULT_FILE_PREFIX, null);
+    }
+
+    boolean isParseEagerly() {
+        return parseEagerly;
+    }
+
+    public void setParseEagerly(boolean parseEagerly) {
+        this.parseEagerly = parseEagerly;
+    }
+
+    int getChunkSize() {
+        return chunkSize;
+    }
+
+    void setChunkSize(int chunkSize) {
+        this.chunkSize = chunkSize;
+    }
+
+    long getMemoryThreshold() {
+        return memoryThreshold;
+    }
+
+    /**
+     * If the attachment is greater than the threshold, it is
+     * written to the disk.
+     *
+     * @param memoryThreshold no of bytes per attachment
+     *        if -1, then the whole attachment is kept in memory
+     */
+    public void setMemoryThreshold(long memoryThreshold) {
+        this.memoryThreshold = memoryThreshold;
+    }
+
+    boolean isOnlyMemory() {
+        return memoryThreshold == -1L;
+    }
+
+    File getTempDir() {
+        return tempDir;
+    }
+
+    String getTempFilePrefix() {
+        return prefix;
+    }
+
+    String getTempFileSuffix() {
+        return suffix;
+    }
+
+    /**
+     * @param dir
+     */
+    public void setDir(String dir) {
+        if (tempDir == null && dir != null && !dir.equals("")) {
+            tempDir = new File(dir);
+        }
+    }
+
+    /**
+     * Validates if it can create temporary files. Otherwise, it stores
+     * attachment contents in memory.
+     */
+    public void validate() {
+        if (!isOnlyMemory()) {
+            try {
+                File tempFile = (tempDir == null)
+                        ? File.createTempFile(prefix, suffix)
+                        : File.createTempFile(prefix, suffix, tempDir);
+                tempFile.delete();
+            } catch(Exception ioe) {
+                memoryThreshold = -1L;      // whole attachment will be in-memory
+            }
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java
new file mode 100644
index 00000000000..7e48a1a7eca
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.nio.ByteBuffer;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+abstract class MIMEEvent {
+
+    enum EVENT_TYPE {START_MESSAGE, START_PART, HEADERS, CONTENT, END_PART, END_MESSAGE}
+
+    /**
+     * Returns a event for parser's current cursor location in the MIME message.
+     *
+     * <p>
+     * {@link EVENT_TYPE#START_MESSAGE} and {@link EVENT_TYPE#START_MESSAGE} events
+     * are generated only once.
+     *
+     * <p>
+     * {@link EVENT_TYPE#START_PART}, {@link EVENT_TYPE#END_PART}, {@link EVENT_TYPE#HEADERS}
+     * events are generated only once for each attachment part.
+     *
+     * <p>
+     * {@link EVENT_TYPE#CONTENT} event may be generated more than once for an attachment
+     * part.
+     *
+     * @return event type
+     */
+    abstract EVENT_TYPE getEventType();
+
+    static final StartMessage START_MESSAGE = new StartMessage();
+    static final StartPart START_PART = new StartPart();
+    static final EndPart END_PART = new EndPart();
+    static final EndMessage END_MESSAGE = new EndMessage();
+
+    static final class StartMessage extends MIMEEvent {
+        EVENT_TYPE getEventType() {
+            return EVENT_TYPE.START_MESSAGE;
+        }
+    }
+
+    static final class StartPart extends MIMEEvent {
+        EVENT_TYPE getEventType() {
+            return EVENT_TYPE.START_PART;
+        }
+    }
+
+    static final class EndPart extends MIMEEvent {
+        EVENT_TYPE getEventType () {
+            return EVENT_TYPE.END_PART;
+        }
+    }
+
+    static final class Headers extends MIMEEvent {
+        InternetHeaders ih;
+
+        Headers(InternetHeaders ih) {
+            this.ih = ih;
+        }
+
+        EVENT_TYPE getEventType() {
+            return EVENT_TYPE.HEADERS;
+        }
+
+        InternetHeaders getHeaders() {
+            return ih;
+        }
+    }
+
+    static final class Content extends MIMEEvent {
+        private final ByteBuffer buf;
+
+        Content(ByteBuffer buf) {
+            this.buf = buf;
+        }
+
+        EVENT_TYPE getEventType() {
+            return EVENT_TYPE.CONTENT;
+        }
+
+        ByteBuffer getData() {
+            return buf;
+        }
+    }
+
+    static final class EndMessage extends MIMEEvent {
+        EVENT_TYPE getEventType() {
+            return EVENT_TYPE.END_MESSAGE;
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java
new file mode 100644
index 00000000000..4b3b062781d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.logging.Logger;
+
+/**
+ * Represents MIME message. MIME message parsing is done lazily using a
+ * pull parser.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class MIMEMessage {
+    private static final Logger LOGGER = Logger.getLogger(MIMEMessage.class.getName());
+
+    MIMEConfig config;
+
+    private final InputStream in;
+    private final List<MIMEPart> partsList;
+    private final Map<String, MIMEPart> partsMap;
+    private final Iterator<MIMEEvent> it;
+    private boolean parsed;     // true when entire message is parsed
+    private MIMEPart currentPart;
+    private int currentIndex;
+
+    /**
+     * @see MIMEMessage(InputStream, String, MIMEConfig)
+     */
+    public MIMEMessage(InputStream in, String boundary) {
+        this(in, boundary, new MIMEConfig());
+    }
+
+    /**
+     * Creates a MIME message from the content's stream. The content stream
+     * is closed when EOF is reached.
+     *
+     * @param in MIME message stream
+     * @param boundary the separator for parts(pass it without --)
+     * @param config various configuration parameters
+     */
+    public MIMEMessage(InputStream in, String boundary, MIMEConfig config) {
+        this.in = in;
+        this.config = config;
+        MIMEParser parser = new MIMEParser(in, boundary, config);
+        it = parser.iterator();
+
+        partsList = new ArrayList<MIMEPart>();
+        partsMap = new HashMap<String, MIMEPart>();
+        if (config.isParseEagerly()) {
+            parseAll();
+        }
+    }
+
+    /**
+     * Gets all the attachments by parsing the entire MIME message. Avoid
+     * this if possible since it is an expensive operation.
+     *
+     * @return list of attachments.
+     */
+    public List<MIMEPart> getAttachments() {
+        if (!parsed) {
+            parseAll();
+        }
+        return partsList;
+    }
+
+    /**
+     * Creates nth attachment lazily. It doesn't validate
+     * if the message has so many attachments. To
+     * do the validation, the message needs to be parsed.
+     * The parsing of the message is done lazily and is done
+     * while reading the bytes of the part.
+     *
+     * @param index sequential order of the part. starts with zero.
+     * @return attachemnt part
+     */
+    public MIMEPart getPart(int index) {
+        LOGGER.fine("index="+index);
+        MIMEPart part = (index < partsList.size()) ? partsList.get(index) : null;
+        if (parsed && part == null) {
+            throw new MIMEParsingException("There is no "+index+" attachment part ");
+        }
+        if (part == null) {
+            // Parsing will done lazily and will be driven by reading the part
+            part = new MIMEPart(this);
+            partsList.add(index, part);
+        }
+        LOGGER.fine("Got attachment at index="+index+" attachment="+part);
+        return part;
+    }
+
+    /**
+     * Creates a lazy attachment for a given Content-ID. It doesn't validate
+     * if the message contains an attachment with the given Content-ID. To
+     * do the validation, the message needs to be parsed. The parsing of the
+     * message is done lazily and is done while reading the bytes of the part.
+     *
+     * @param contentId Content-ID of the part, expects Content-ID without <, >
+     * @return attachemnt part
+     */
+    public MIMEPart getPart(String contentId) {
+        LOGGER.fine("Content-ID="+contentId);
+        MIMEPart part = getDecodedCidPart(contentId);
+        if (parsed && part == null) {
+            throw new MIMEParsingException("There is no attachment part with Content-ID = "+contentId);
+        }
+        if (part == null) {
+            // Parsing is done lazily and is driven by reading the part
+            part = new MIMEPart(this, contentId);
+            partsMap.put(contentId, part);
+        }
+        LOGGER.fine("Got attachment for Content-ID="+contentId+" attachment="+part);
+        return part;
+    }
+
+    // this is required for Indigo interop, it writes content-id without escaping
+    private MIMEPart getDecodedCidPart(String cid) {
+        MIMEPart part = partsMap.get(cid);
+        if (part == null) {
+            if (cid.indexOf('%') != -1) {
+                try {
+                    String tempCid = URLDecoder.decode(cid, "utf-8");
+                    part = partsMap.get(tempCid);
+                } catch(UnsupportedEncodingException ue) {
+                    // Ignore it
+                }
+            }
+        }
+        return part;
+    }
+
+
+    /**
+     * Parses the whole MIME message eagerly
+     */
+    public void parseAll() {
+        while(makeProgress()) {
+            // Nothing to do
+        }
+    }
+
+
+    /**
+     * Parses the MIME message in a pull fashion.
+     *
+     * @return
+     *      false if the parsing is completed.
+     */
+    public synchronized boolean makeProgress() {
+        if (!it.hasNext()) {
+            return false;
+        }
+
+        MIMEEvent event = it.next();
+
+        switch(event.getEventType()) {
+            case START_MESSAGE :
+                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.START_MESSAGE);
+                break;
+
+            case START_PART :
+                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.START_PART);
+                break;
+
+            case HEADERS :
+                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.HEADERS);
+                MIMEEvent.Headers headers = (MIMEEvent.Headers)event;
+                InternetHeaders ih = headers.getHeaders();
+                List<String> cids = ih.getHeader("content-id");
+                String cid = (cids != null) ? cids.get(0) : currentIndex+"";
+                if (cid.length() > 2 && cid.charAt(0)=='<') {
+                    cid = cid.substring(1,cid.length()-1);
+                }
+                MIMEPart listPart = (currentIndex < partsList.size()) ? partsList.get(currentIndex) : null;
+                MIMEPart mapPart = getDecodedCidPart(cid);
+                if (listPart == null && mapPart == null) {
+                    currentPart = getPart(cid);
+                    partsList.add(currentIndex, currentPart);
+                } else if (listPart == null) {
+                    currentPart = mapPart;
+                    partsList.add(currentIndex, mapPart);
+                } else if (mapPart == null) {
+                    currentPart = listPart;
+                    currentPart.setContentId(cid);
+                    partsMap.put(cid, currentPart);
+                } else if (listPart != mapPart) {
+                    throw new MIMEParsingException("Created two different attachments using Content-ID and index");
+                }
+                currentPart.setHeaders(ih);
+                break;
+
+            case CONTENT :
+                LOGGER.finer("MIMEEvent="+MIMEEvent.EVENT_TYPE.CONTENT);
+                MIMEEvent.Content content = (MIMEEvent.Content)event;
+                ByteBuffer buf = content.getData();
+                currentPart.addBody(buf);
+                break;
+
+            case END_PART :
+                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.END_PART);
+                currentPart.doneParsing();
+                ++currentIndex;
+                break;
+
+            case END_MESSAGE :
+                LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.END_MESSAGE);
+                parsed = true;
+                try {
+                    in.close();
+                } catch(IOException ioe) {
+                    throw new MIMEParsingException(ioe);
+                }
+                break;
+
+            default :
+                throw new MIMEParsingException("Unknown Parser state = "+event.getEventType());
+        }
+        return true;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java
new file mode 100644
index 00000000000..19f9053b1db
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java
@@ -0,0 +1,500 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.*;
+import java.util.logging.Logger;
+import java.nio.ByteBuffer;
+
+/**
+ * Pull parser for the MIME messages. Applications can use pull API to continue
+ * the parsing MIME messages lazily.
+ *
+ * <pre>
+ * for e.g.:
+ * <p>
+ *
+ * MIMEParser parser = ...
+ * Iterator<MIMEEvent> it = parser.iterator();
+ * while(it.hasNext()) {
+ *   MIMEEvent event = it.next();
+ *   ...
+ * }
+ * </pre>
+ *
+ * @author Jitendra Kotamraju
+ */
+class MIMEParser implements Iterable<MIMEEvent> {
+
+    private static final Logger LOGGER = Logger.getLogger(MIMEParser.class.getName());
+
+    // Actually, the grammar doesn't support whitespace characters
+    // after boundary. But the mail implementation checks for it.
+    // We will only check for these many whitespace characters after boundary
+    private static final int NO_LWSP = 1000;
+    private enum STATE {START_MESSAGE, SKIP_PREAMBLE, START_PART, HEADERS, BODY, END_PART, END_MESSAGE}
+    private STATE state = STATE.START_MESSAGE;
+
+    private final InputStream in;
+    private final byte[] bndbytes;
+    private final int bl;
+    private final MIMEConfig config;
+    private final int[] bcs = new int[128]; // BnM algo: Bad Character Shift table
+    private final int[] gss;                // BnM algo : Good Suffix Shift table
+
+    /**
+     * Have we parsed the data from our InputStream yet?
+     */
+    private boolean parsed;
+
+    /*
+     * Read and process body partsList until we see the
+     * terminating boundary line (or EOF).
+     */
+    private boolean done = false;
+
+    private boolean eof;
+    private final int capacity;
+    private byte[] buf;
+    private int len;
+    private boolean bol;        // beginning of the line
+
+    /*
+     * Parses the MIME content. At the EOF, it also closes input stream
+     */
+    MIMEParser(InputStream in, String boundary, MIMEConfig config) {
+        this.in = in;
+        this.bndbytes = getBytes("--"+boundary);
+        bl = bndbytes.length;
+        this.config = config;
+        gss = new int[bl];
+        compileBoundaryPattern();
+
+        // \r\n + boundary + "--\r\n" + lots of LWSP
+        capacity = config.chunkSize+2+bl+4+NO_LWSP;
+        createBuf(capacity);
+    }
+
+    /**
+     * Returns iterator for the parsing events. Use the iterator to advance
+     * the parsing.
+     *
+     * @return iterator for parsing events
+     */
+    public Iterator<MIMEEvent> iterator() {
+        return new MIMEEventIterator();
+    }
+
+    class MIMEEventIterator implements Iterator<MIMEEvent> {
+
+        public boolean hasNext() {
+            return !parsed;
+        }
+
+        public MIMEEvent next() {
+            switch(state) {
+                case START_MESSAGE :
+                    LOGGER.finer("MIMEParser state="+STATE.START_MESSAGE);
+                    state = STATE.SKIP_PREAMBLE;
+                    return MIMEEvent.START_MESSAGE;
+
+                case SKIP_PREAMBLE :
+                    LOGGER.finer("MIMEParser state="+STATE.SKIP_PREAMBLE);
+                    skipPreamble();
+                    // fall through
+                case START_PART :
+                    LOGGER.finer("MIMEParser state="+STATE.START_PART);
+                    state = STATE.HEADERS;
+                    return MIMEEvent.START_PART;
+
+                case HEADERS :
+                    LOGGER.finer("MIMEParser state="+STATE.HEADERS);
+                    InternetHeaders ih = readHeaders();
+                    state = STATE.BODY;
+                    bol = true;
+                    return new MIMEEvent.Headers(ih);
+
+                case BODY :
+                    LOGGER.finer("MIMEParser state="+STATE.BODY);
+                    ByteBuffer buf = readBody();
+                    bol = false;
+                    return new MIMEEvent.Content(buf);
+
+                case END_PART :
+                    LOGGER.finer("MIMEParser state="+STATE.END_PART);
+                    if (done) {
+                        state = STATE.END_MESSAGE;
+                    } else {
+                        state = STATE.START_PART;
+                    }
+                    return MIMEEvent.END_PART;
+
+                case END_MESSAGE :
+                    LOGGER.finer("MIMEParser state="+STATE.END_MESSAGE);
+                    parsed = true;
+                    return MIMEEvent.END_MESSAGE;
+
+                default :
+                    throw new MIMEParsingException("Unknown Parser state = "+state);
+            }
+        }
+
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Collects the headers for the current part by parsing mesage stream.
+     *
+     * @return headers for the current part
+     */
+    private InternetHeaders readHeaders() {
+        if (!eof) {
+            fillBuf();
+        }
+        return new InternetHeaders(new LineInputStream());
+    }
+
+    /**
+     * Reads and saves the part of the current attachment part's content.
+     * At the end of this method, buf should have the remaining data
+     * at index 0.
+     *
+     * @return a chunk of the part's content
+     *
+     */
+    private ByteBuffer readBody() {
+        if (!eof) {
+            fillBuf();
+        }
+        int start = match(buf, 0, len);     // matches boundary
+        if (start == -1) {
+            // No boundary is found
+            assert eof || len >= config.chunkSize;
+            int chunkSize = eof ? len : config.chunkSize;
+            if (eof) {
+                // Should we throw exception as there is no closing boundary ? But some impl
+                // like SAAJ do not throw excpetion.
+                // throw new MIMEParsingException("Reached EOF, but there is no closing MIME boundary.");
+                done = true;
+                state = STATE.END_PART;
+            }
+            return adjustBuf(chunkSize, len-chunkSize);
+        }
+        // Found boundary.
+        // Is it at the start of a line ?
+        int chunkLen = start;
+        if (bol && start == 0) {
+            // nothing to do
+        } else if (start > 0 && (buf[start-1] == '\n' || buf[start-1] =='\r')) {
+            --chunkLen;
+            if (buf[start-1] == '\n' && start >1 && buf[start-2] == '\r') {
+                --chunkLen;
+            }
+        } else {
+           return adjustBuf(start+1, len-start-1);  // boundary is not at beginning of a line
+        }
+
+        if (start+bl+1 < len && buf[start+bl] == '-' && buf[start+bl+1] == '-') {
+            state = STATE.END_PART;
+            done = true;
+            return adjustBuf(chunkLen, 0);
+        }
+
+        // Consider all the whitespace in boundary+whitespace+"\r\n"
+        int lwsp = 0;
+        for(int i=start+bl; i < len && (buf[i] == ' ' || buf[i] == '\t'); i++) {
+            ++lwsp;
+        }
+
+        // Check for \n or \r\n in boundary+whitespace+"\n" or boundary+whitespace+"\r\n"
+        if (start+bl+lwsp < len && buf[start+bl+lwsp] == '\n') {
+            state = STATE.END_PART;
+            return adjustBuf(chunkLen, len-start-bl-lwsp-1);
+        } else if (start+bl+lwsp+1 < len && buf[start+bl+lwsp] == '\r' && buf[start+bl+lwsp+1] == '\n') {
+            state = STATE.END_PART;
+            return adjustBuf(chunkLen, len-start-bl-lwsp-2);
+        } else if (start+bl+lwsp+1 < len) {
+            return adjustBuf(chunkLen+1, len-chunkLen-1);       // boundary string in a part data
+        } else if (eof) {
+            done = true;
+            state = STATE.END_PART;
+            return adjustBuf(chunkLen, 0);
+            // Should we throw exception as there is no closing boundary ? But some impl
+            // like SAAJ do not throw excpetion.
+            //throw new MIMEParsingException("Reached EOF, but there is no closing MIME boundary.");
+        }
+
+        // Some more data needed to determine if it is indeed a proper boundary
+        return adjustBuf(chunkLen, len-chunkLen);
+    }
+
+    /**
+     * Returns a chunk from the original buffer. A new buffer is
+     * created with the remaining bytes.
+     *
+     * @param chunkSize create a chunk with these many bytes
+     * @param remaining bytes from the end of the buffer that need to be copied to
+     *        the beginning of the new buffer
+     * @return chunk
+     */
+    private ByteBuffer adjustBuf(int chunkSize, int remaining) {
+        assert buf != null;
+        assert chunkSize >= 0;
+        assert remaining >= 0;
+
+        byte[] temp = buf;
+        // create a new buf and adjust it without this chunk
+        createBuf(remaining);
+        System.arraycopy(temp, len-remaining, buf, 0, remaining);
+        len = remaining;
+
+        return ByteBuffer.wrap(temp, 0, chunkSize);
+    }
+
+    private void createBuf(int min) {
+        buf = new byte[min < capacity ? capacity : min];
+    }
+
+    /**
+     * Skips the preamble to find the first attachment part
+     */
+    private void skipPreamble() {
+
+        while(true) {
+            if (!eof) {
+                fillBuf();
+            }
+            int start = match(buf, 0, len);     // matches boundary
+            if (start == -1) {
+                // No boundary is found
+                if (eof) {
+                    throw new MIMEParsingException("Missing start boundary");
+                } else {
+                    adjustBuf(len-bl+1, bl-1);
+                    continue;
+                }
+            }
+
+            if (start > config.chunkSize) {
+                adjustBuf(start, len-start);
+                continue;
+            }
+            // Consider all the whitespace boundary+whitespace+"\r\n"
+            int lwsp = 0;
+            for(int i=start+bl; i < len && (buf[i] == ' ' || buf[i] == '\t'); i++) {
+                ++lwsp;
+            }
+            // Check for \n or \r\n
+            if (start+bl+lwsp < len && (buf[start+bl+lwsp] == '\n' || buf[start+bl+lwsp] == '\r') ) {
+                if (buf[start+bl+lwsp] == '\n') {
+                    adjustBuf(start+bl+lwsp+1, len-start-bl-lwsp-1);
+                    break;
+                } else if (start+bl+lwsp+1 < len && buf[start+bl+lwsp+1] == '\n') {
+                    adjustBuf(start+bl+lwsp+2, len-start-bl-lwsp-2);
+                    break;
+                }
+            }
+            adjustBuf(start+1, len-start-1);
+        }
+        LOGGER.fine("Skipped the preamble. buffer len="+len);
+    }
+
+    private static byte[] getBytes(String s) {
+        char [] chars= s.toCharArray();
+        int size = chars.length;
+        byte[] bytes = new byte[size];
+
+        for (int i = 0; i < size;)
+            bytes[i] = (byte) chars[i++];
+        return bytes;
+    }
+
+        /**
+     * Boyer-Moore search method. Copied from java.util.regex.Pattern.java
+     *
+     * Pre calculates arrays needed to generate the bad character
+     * shift and the good suffix shift. Only the last seven bits
+     * are used to see if chars match; This keeps the tables small
+     * and covers the heavily used ASCII range, but occasionally
+     * results in an aliased match for the bad character shift.
+     */
+    private void compileBoundaryPattern() {
+        int i, j;
+
+        // Precalculate part of the bad character shift
+        // It is a table for where in the pattern each
+        // lower 7-bit value occurs
+        for (i = 0; i < bndbytes.length; i++) {
+            bcs[bndbytes[i]&0x7F] = i + 1;
+        }
+
+        // Precalculate the good suffix shift
+        // i is the shift amount being considered
+NEXT:   for (i = bndbytes.length; i > 0; i--) {
+            // j is the beginning index of suffix being considered
+            for (j = bndbytes.length - 1; j >= i; j--) {
+                // Testing for good suffix
+                if (bndbytes[j] == bndbytes[j-i]) {
+                    // src[j..len] is a good suffix
+                    gss[j-1] = i;
+                } else {
+                    // No match. The array has already been
+                    // filled up with correct values before.
+                    continue NEXT;
+                }
+            }
+            // This fills up the remaining of optoSft
+            // any suffix can not have larger shift amount
+            // then its sub-suffix. Why???
+            while (j > 0) {
+                gss[--j] = i;
+            }
+        }
+        // Set the guard value because of unicode compression
+        gss[bndbytes.length -1] = 1;
+    }
+
+    /**
+     * Finds the boundary in the given buffer using Boyer-Moore algo.
+     * Copied from java.util.regex.Pattern.java
+     *
+     * @param mybuf boundary to be searched in this mybuf
+     * @param off start index in mybuf
+     * @param len number of bytes in mybuf
+     *
+     * @return -1 if there is no match or index where the match starts
+     */
+    private int match(byte[] mybuf, int off, int len) {
+        int last = len - bndbytes.length;
+
+        // Loop over all possible match positions in text
+NEXT:   while (off <= last) {
+            // Loop over pattern from right to left
+            for (int j = bndbytes.length - 1; j >= 0; j--) {
+                byte ch = mybuf[off+j];
+                if (ch != bndbytes[j]) {
+                    // Shift search to the right by the maximum of the
+                    // bad character shift and the good suffix shift
+                    off += Math.max(j + 1 - bcs[ch&0x7F], gss[j]);
+                    continue NEXT;
+                }
+            }
+            // Entire pattern matched starting at off
+            return off;
+        }
+        return -1;
+    }
+
+    /**
+     * Fills the remaining buf to the full capacity
+     */
+    private void fillBuf() {
+        LOGGER.finer("Before fillBuf() buffer len="+len);
+        assert !eof;
+        while(len < buf.length) {
+            int read;
+            try {
+                read = in.read(buf, len, buf.length-len);
+            } catch(IOException ioe) {
+                throw new MIMEParsingException(ioe);
+            }
+            if (read == -1) {
+                eof = true;
+                try {
+                    LOGGER.fine("Closing the input stream.");
+                    in.close();
+                } catch(IOException ioe) {
+                    throw new MIMEParsingException(ioe);
+                }
+                break;
+            } else {
+                len += read;
+            }
+        }
+        LOGGER.finer("After fillBuf() buffer len="+len);
+    }
+
+    private void doubleBuf() {
+        byte[] temp = new byte[2*len];
+        System.arraycopy(buf, 0, temp, 0, len);
+        buf = temp;
+        if (!eof) {
+            fillBuf();
+        }
+    }
+
+    class LineInputStream {
+        private int offset;
+
+        /*
+         * Read a line containing only ASCII characters from the input
+         * stream. A line is terminated by a CR or NL or CR-NL sequence.
+         * A common error is a CR-CR-NL sequence, which will also terminate
+         * a line.
+         * The line terminator is not returned as part of the returned
+         * String. Returns null if no data is available. <p>
+         *
+         * This class is similar to the deprecated
+         * <code>DataInputStream.readLine()</code>
+         */
+        public String readLine() throws IOException {
+
+            int hdrLen = 0;
+            int lwsp = 0;
+            while(offset+hdrLen < len) {
+                if (buf[offset+hdrLen] == '\n') {
+                    lwsp = 1;
+                    break;
+                }
+                if (offset+hdrLen+1 == len) {
+                    doubleBuf();
+                }
+                if (offset+hdrLen+1 >= len) {   // No more data in the stream
+                    assert eof;
+                    return null;
+                }
+                if (buf[offset+hdrLen] == '\r' && buf[offset+hdrLen+1] == '\n') {
+                    lwsp = 2;
+                    break;
+                }
+                ++hdrLen;
+            }
+            if (hdrLen == 0) {
+                adjustBuf(offset+lwsp, len-offset-lwsp);
+                return null;
+            }
+
+            String hdr = new String(buf, offset, hdrLen);
+            offset += hdrLen+lwsp;
+            return hdr;
+        }
+
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java
new file mode 100644
index 00000000000..203ef32058b
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+
+/**
+ * The <code>MIMEParsingException</code> class is the base
+ * exception class for all MIME message parsing exceptions.
+ *
+ */
+
+public class MIMEParsingException extends java.lang.RuntimeException {
+
+    /**
+     * Constructs a new exception with <code>null</code> as its
+     * detail message. The cause is not initialized.
+     */
+    public MIMEParsingException() {
+        super();
+    }
+
+    /**
+     * Constructs a new exception with the specified detail
+     * message.  The cause is not initialized.
+     *
+     * @param message The detail message which is later
+     *                retrieved using the getMessage method
+     */
+    public MIMEParsingException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail
+     * message and cause.
+     *
+     * @param message The detail message which is later retrieved
+     *                using the getMessage method
+     * @param cause   The cause which is saved for the later
+     *                retrieval throw by the getCause method
+     */
+    public MIMEParsingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new WebServiceException with the specified cause
+     * and a detail message of <tt>(cause==null ? null :
+     * cause.toString())</tt> (which typically contains the
+     * class and detail message of <tt>cause</tt>).
+     *
+     * @param cause The cause which is saved for the later
+     *              retrieval throw by the getCause method.
+     *              (A <tt>null</tt> value is permitted, and
+     *              indicates that the cause is nonexistent or
+     *              unknown.)
+     */
+    public MIMEParsingException(Throwable cause) {
+        super(cause);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java
new file mode 100644
index 00000000000..9756f65cee5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+/**
+ * Represents an attachment part in a MIME message. MIME message parsing is done
+ * lazily using a pull parser, so the part may not have all the data. {@link #read}
+ * and {@link #readOnce} may trigger the actual parsing the message. In fact,
+ * parsing of an attachment part may be triggered by calling {@link #read} methods
+ * on some other attachemnt parts. All this happens behind the scenes so the
+ * application developer need not worry about these details.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class MIMEPart {
+
+    private volatile InternetHeaders headers;
+    private volatile String contentId;
+    private String contentType;
+    volatile boolean parsed;    // part is parsed or not
+    final MIMEMessage msg;
+    private final DataHead dataHead;
+
+    MIMEPart(MIMEMessage msg) {
+        this.msg = msg;
+        this.dataHead = new DataHead(this);
+    }
+
+    MIMEPart(MIMEMessage msg, String contentId) {
+        this(msg);
+        this.contentId = contentId;
+    }
+
+    /**
+     * Can get the attachment part's content multiple times. That means
+     * the full content needs to be there in memory or on the file system.
+     * Calling this method would trigger parsing for the part's data. So
+     * do not call this unless it is required(otherwise, just wrap MIMEPart
+     * into a object that returns InputStream for e.g DataHandler)
+     *
+     * @return data for the part's content
+     */
+    public InputStream read() {
+        return dataHead.read();
+    }
+
+    /**
+     * Cleans up any resources that are held by this part (for e.g. deletes
+     * the temp file that is used to serve this part's content). After
+     * calling this, one shouldn't call {@link #read()} or {@link #readOnce()}
+     */
+    public void close() {
+        dataHead.close();
+    }
+
+
+    /**
+     * Can get the attachment part's content only once. The content
+     * will be lost after the method. Content data is not be stored
+     * on the file system or is not kept in the memory for the
+     * following case:
+     *   - Attachement parts contents are accessed sequentially
+     *
+     * In general, take advantage of this when the data is used only
+     * once.
+     *
+     * @return data for the part's content
+     */
+    public InputStream readOnce() {
+        return dataHead.readOnce();
+    }
+
+    public void moveTo(File f) {
+        dataHead.moveTo(f);
+    }
+
+    /**
+     * Returns Content-ID MIME header for this attachment part
+     *
+     * @return Content-ID of the part
+     */
+    public String getContentId() {
+        if (contentId == null) {
+            getHeaders();
+        }
+        return contentId;
+    }
+
+    /**
+     * Returns Content-Type MIME header for this attachment part
+     *
+     * @return Content-Type of the part
+     */
+    public String getContentType() {
+        if (contentType == null) {
+            getHeaders();
+        }
+        return contentType;
+    }
+
+    private void getHeaders() {
+        // Trigger parsing for the part headers
+        while(headers == null) {
+            if (!msg.makeProgress()) {
+                if (headers == null) {
+                    throw new IllegalStateException("Internal Error. Didn't get Headers even after complete parsing.");
+                }
+            }
+        }
+    }
+
+    /**
+     * Return all the values for the specified header.
+     * Returns <code>null</code> if no headers with the
+     * specified name exist.
+     *
+     * @param   name header name
+     * @return  list of header values, or null if none
+     */
+    public List<String> getHeader(String name) {
+        getHeaders();
+        assert headers != null;
+        return headers.getHeader(name);
+    }
+
+    /**
+     * Return all the headers
+     *
+     * @return list of Header objects
+     */
+    public List<? extends Header> getAllHeaders() {
+        getHeaders();
+        assert headers != null;
+        return headers.getAllHeaders();
+    }
+
+    /**
+     * Callback to set headers
+     *
+     * @param headers MIME headers for the part
+     */
+    void setHeaders(InternetHeaders headers) {
+        this.headers = headers;
+        List<String> ct = getHeader("Content-Type");
+        this.contentType = (ct == null) ? "application/octet-stream" : ct.get(0);
+    }
+
+    /**
+     * Callback to notify that there is a partial content for the part
+     *
+     * @param buf content data for the part
+     */
+    void addBody(ByteBuffer buf) {
+        dataHead.addBody(buf);
+    }
+
+    /**
+     * Callback to indicate that parsing is done for this part
+     * (no more update events for this part)
+     */
+    void doneParsing() {
+        parsed = true;
+        dataHead.doneParsing();
+    }
+
+    /**
+     * Callback to set Content-ID for this part
+     * @param cid Content-ID of the part
+     */
+    void setContentId(String cid) {
+        this.contentId = cid;
+    }
+
+    @Override
+    public String toString() {
+        return "Part="+contentId;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java
new file mode 100644
index 00000000000..b5cef3ce656
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.nio.ByteBuffer;
+import java.io.File;
+import java.io.IOException;
+import java.util.logging.Logger;
+
+/**
+ * Keeps the Part's partial content data in memory.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+final class MemoryData implements Data {
+    private static final Logger LOGGER = Logger.getLogger(MemoryData.class.getName());
+
+    private final byte[] data;
+    private final int len;
+    private final MIMEConfig config;
+
+    MemoryData(ByteBuffer buf, MIMEConfig config) {
+        data = buf.array();
+        len = buf.limit();
+        this.config = config;
+    }
+
+    // size of the chunk given by the parser
+    public int size() {
+        return len;
+    }
+
+    public byte[] read() {
+        return data;
+    }
+
+    public long writeTo(DataFile file) {
+        return file.writeTo(data, 0, len);
+    }
+
+    /**
+     *
+     * @param dataHead
+     * @param buf
+     * @return
+     */
+    public Data createNext(DataHead dataHead, ByteBuffer buf) {
+        if (!config.isOnlyMemory() && dataHead.inMemory >= config.memoryThreshold) {
+            try {
+                String prefix = config.getTempFilePrefix();
+                String suffix = config.getTempFileSuffix();
+                File dir = config.getTempDir();
+                File tempFile = (dir == null)
+                        ? File.createTempFile(prefix, suffix)
+                        : File.createTempFile(prefix, suffix, dir);
+                LOGGER.fine("Created temp file = "+tempFile);
+                dataHead.dataFile = new DataFile(tempFile);
+            } catch(IOException ioe) {
+                throw new MIMEParsingException(ioe);
+            }
+
+            if (dataHead.head != null) {
+                for(Chunk c=dataHead.head; c != null; c=c.next) {
+                    long pointer = c.data.writeTo(dataHead.dataFile);
+                    c.data = new FileData(dataHead.dataFile, pointer, len);
+                }
+            }
+            return new FileData(dataHead.dataFile, buf);
+        } else {
+            return new MemoryData(buf, config);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java
new file mode 100644
index 00000000000..020e4c6022c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.mimepull;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * Removing files based on this
+ * <a href="http://java.sun.com/developer/technicalArticles/javase/finalization/">article</a>
+ *
+ * @author Jitendra Kotamraju
+ */
+final class WeakDataFile extends WeakReference<DataFile> {
+
+    private static final Logger LOGGER = Logger.getLogger(WeakDataFile.class.getName());
+    private static final int MAX_ITERATIONS = 2;
+    private static ReferenceQueue<DataFile> refQueue = new ReferenceQueue<DataFile>();
+    private static List<WeakDataFile> refList = new ArrayList<WeakDataFile>();
+    private final File file;
+    private final RandomAccessFile raf;
+
+    WeakDataFile(DataFile df, File file) {
+        super(df, refQueue);
+        refList.add(this);
+        this.file = file;
+        try {
+            raf = new RandomAccessFile(file, "rw");
+        } catch(IOException ioe) {
+            throw new MIMEParsingException(ioe);
+        }
+        drainRefQueueBounded();
+    }
+
+    synchronized void read(long pointer, byte[] buf, int offset, int length ) {
+        try {
+            raf.seek(pointer);
+            raf.readFully(buf, offset, length);
+        } catch(IOException ioe) {
+            throw new MIMEParsingException(ioe);
+        }
+    }
+
+    synchronized long writeTo(long pointer, byte[] data, int offset, int length) {
+        try {
+            raf.seek(pointer);
+            raf.write(data, offset, length);
+            return raf.getFilePointer();    // Update pointer for next write
+        } catch(IOException ioe) {
+            throw new MIMEParsingException(ioe);
+        }
+    }
+
+    void close() {
+        LOGGER.fine("Deleting file = "+file.getName());
+        refList.remove(this);
+        try {
+            raf.close();
+            file.delete();
+        } catch(IOException ioe) {
+            throw new MIMEParsingException(ioe);
+        }
+    }
+
+    void renameTo(File f) {
+        LOGGER.fine("Moving file="+file+" to="+f);
+        refList.remove(this);
+        try {
+            raf.close();
+            file.renameTo(f);
+        } catch(IOException ioe) {
+            throw new MIMEParsingException(ioe);
+        }
+
+    }
+
+    static void drainRefQueueBounded() {
+        int iterations = 0;
+        WeakDataFile weak = (WeakDataFile) refQueue.poll();
+        while (weak != null && iterations < MAX_ITERATIONS) {
+            LOGGER.fine("Cleaning file = "+weak.file+" from reference queue.");
+            weak.close();
+            ++iterations;
+            weak = (WeakDataFile) refQueue.poll();
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
index 1f49ce33e11..47790fd5ba9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.org.jvnet.staxex;
 
 import javax.activation.DataHandler;
@@ -44,6 +45,7 @@ import java.io.OutputStream;
 public class Base64Data implements CharSequence, Cloneable {
 
     // either dataHandler or (data,dataLen,mimeType?) must be present
+    // (note that having both is allowed)
 
     private DataHandler dataHandler;
 
@@ -73,6 +75,7 @@ public class Base64Data implements CharSequence, Cloneable {
 
     /**
      * Clone constructor
+     * @param that needs to be cloned
      */
     public Base64Data(Base64Data that) {
         that.get();
@@ -92,8 +95,10 @@ public class Base64Data implements CharSequence, Cloneable {
     /**
      * Fills in the data object by a portion of the byte[].
      *
+     * @param data actual data
      * @param len
      *      data[0] to data[len-1] are treated as the data.
+     * @param mimeType MIME type
      * @param cloneByRef
      *      true if data[] can be cloned by reference
      */
@@ -108,8 +113,10 @@ public class Base64Data implements CharSequence, Cloneable {
     /**
      * Fills in the data object by a portion of the byte[].
      *
+     * @param data actual data bytes
      * @param len
      *      data[0] to data[len-1] are treated as the data.
+     * @param mimeType MIME type
      */
     public void set(byte[] data, int len, String mimeType) {
         set(data,len,mimeType,false);
@@ -120,6 +127,7 @@ public class Base64Data implements CharSequence, Cloneable {
      *
      * @param data
      *      this buffer may be owned directly by the unmarshaleld JAXB object.
+     * @param mimeType MIME type
      */
     public void set(byte[] data,String mimeType) {
         set(data,data.length,mimeType,false);
@@ -127,6 +135,8 @@ public class Base64Data implements CharSequence, Cloneable {
 
     /**
      * Fills in the data object by a {@link DataHandler}.
+     *
+     * @param data DataHandler for the data
      */
     public void set(DataHandler data) {
         assert data!=null;
@@ -135,7 +145,11 @@ public class Base64Data implements CharSequence, Cloneable {
     }
 
     /**
-     * Gets the raw data.
+     * Gets the raw data. If the returned DataHandler is {@link StreamingDataHandler},
+     * callees may need to downcast to take advantage of its capabilities.
+     *
+     * @see StreamingDataHandler
+     * @return DataHandler for the data
      */
     public DataHandler getDataHandler() {
         if(dataHandler==null){
@@ -162,6 +176,8 @@ public class Base64Data implements CharSequence, Cloneable {
 
     /**
      * Gets the byte[] of the exact length.
+     *
+     * @return byte[] for data
      */
     public byte[] getExact() {
         get();
@@ -175,6 +191,9 @@ public class Base64Data implements CharSequence, Cloneable {
 
     /**
      * Gets the data as an {@link InputStream}.
+     *
+     * @return data as InputStream
+     * @throws IOException if i/o error occurs
      */
     public InputStream getInputStream() throws IOException {
         if(dataHandler!=null)
@@ -186,6 +205,8 @@ public class Base64Data implements CharSequence, Cloneable {
     /**
      * Returns false if this object only has {@link DataHandler} and therefore
      * {@link #get()} operation is likely going to be expensive.
+     *
+     * @return false if it has only DataHandler
      */
     public boolean hasData() {
         return data!=null;
@@ -193,6 +214,8 @@ public class Base64Data implements CharSequence, Cloneable {
 
     /**
      * Gets the raw data. The size of the byte array maybe larger than the actual length.
+     *
+     * @return data as byte[], the array may be larger
      */
     public byte[] get() {
         if(data==null) {
@@ -212,7 +235,18 @@ public class Base64Data implements CharSequence, Cloneable {
         return data;
     }
 
+    /**
+     * Gets the length of the binary data counted in bytes.
+     *
+     * Note that if this object encapsulates {@link DataHandler},
+     * this method would have to read the whole thing into {@code byte[]}
+     * just to count the length, because {@link DataHandler}
+     * doesn't easily expose the length.
+     *
+     * @return no of bytes
+     */
     public int getDataLen() {
+        get();
         return dataLen;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java
index e7c90e5c387..54262803384 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.org.jvnet.staxex;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
index b435885c7b1..e0696f60662 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.org.jvnet.staxex;
 
 import java.io.ByteArrayOutputStream;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
index 04bc27bcbf2..4983f3fb4bd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.org.jvnet.staxex;
 
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java
new file mode 100644
index 00000000000..92669995b5e
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.org.jvnet.staxex;
+
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * {@link DataHandler} extended to offer better buffer management
+ * in a streaming environment.
+ *
+ * <p>
+ * {@link DataHandler} is used commonly as a data format across
+ * multiple systems (such as JAXB/WS.) Unfortunately, {@link DataHandler}
+ * has the semantics of "read as many times as you want", so this makes
+ * it difficult for involving parties to handle a BLOB in a streaming fashion.
+ *
+ * <p>
+ * {@link StreamingDataHandler} solves this problem by offering methods
+ * that enable faster bulk "consume once" read operation.
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class StreamingDataHandler extends DataHandler {
+
+    public StreamingDataHandler(Object o, String s) {
+        super(o, s);
+    }
+
+    public StreamingDataHandler(URL url) {
+        super(url);
+    }
+
+    public StreamingDataHandler(DataSource dataSource) {
+        super(dataSource);
+    }
+
+    /**
+     * Works like {@link #getInputStream()} except that this method
+     * can be invoked only once.
+     *
+     * <p>
+     * This is used as a signal from the caller that there will
+     * be no further {@link #getInputStream()} invocation nor
+     * {@link #readOnce()} invocation on this object (which would
+     * result in {@link IOException}.)
+     *
+     * <p>
+     * When {@link DataHandler} is backed by a streaming BLOB
+     * (such as an attachment in a web service read from the network),
+     * this allows the callee to avoid unnecessary buffering.
+     *
+     * <p>
+     * Note that it is legal to call {@link #getInputStream()}
+     * multiple times and then call {@link #readOnce()} afterward.
+     * Streams created such a way can be read in any order &mdash;
+     * there's no requirement that streams created earlier must be read
+     * first.
+     *
+     * @return
+     *      always non-null. Represents the content of this BLOB.
+     *      The returned stream is generally not buffered, so for
+     *      better performance read in a big batch or wrap this into
+     *      {@link BufferedInputStream}.
+     * @throws IOException
+     *      if any i/o error
+     */
+    public abstract InputStream readOnce() throws IOException;
+
+    /**
+     * Obtains the BLOB into a specified file.
+     *
+     * <p>
+     * Semantically, this method is roughly equivalent to the following
+     * code, except that the actual implementation is likely to be a lot faster.
+     *
+     * <pre>
+     * InputStream i = getInputStream();
+     * OutputStream o = new FileOutputStream(dst);
+     * int ch;
+     * while((ch=i.read())!=-1)  o.write(ch);
+     * i.close();
+     * o.close();
+     * </pre>
+     *
+     * <p>
+     * The main motivation behind this method is that often
+     * {@link DataHandler} that reads data from a streaming source
+     * will use a temporary file as a data store to hold data
+     * (think of commons-fileupload.) In such case this method
+     * can be as fast as calling {@link File#renameTo(File)}.
+     *
+     * <p>
+     * This method shouldn't be called when there are any
+     * open streams.
+     *
+     * <p>
+     * After this method is invoked, {@link #readOnce()} and
+     * {@link #getInputStream()} will simply open the destination
+     * file you've specified as an argument. So if you further
+     * move the file or delete this file, those methods will
+     * behave in undefined fashion. For a simliar reason,
+     * calling this method multiple times will cause
+     * undefined behavior.
+     */
+    public abstract void moveTo(File dst) throws IOException;
+
+    /**
+     * Releases any resources associated with this DataHandler.
+     * (such as an attachment in a web service read from a temp
+     * file will be deleted.) After calling this method, it is
+     * illegal to call any other methods.
+     */
+    public abstract void close() throws IOException;
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
index 8bf0f1c4e15..b156facf26b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.org.jvnet.staxex;
 
 import javax.xml.stream.XMLStreamReader;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
index 255b32d562b..172c84c0313 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java
@@ -22,13 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.org.jvnet.staxex;
 
-import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
-
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.stream.XMLStreamException;
 import javax.activation.DataHandler;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
 import java.io.OutputStream;
 
 /**
@@ -85,6 +84,7 @@ public interface XMLStreamWriterEx extends XMLStreamWriter {
      *
      * <p>
      * (data,start,len) triplet identifies the binary data to be written.
+     * After the method invocation, the callee owns the buffer.
      *
      * @param contentType
      *      this mandatory parameter identifies the MIME type of the binary data.
@@ -103,7 +103,7 @@ public interface XMLStreamWriterEx extends XMLStreamWriter {
      * {@link DataHandler#getInputStream()}.
      *
      * @param data
-     *      always non-null.
+     *      always non-null. After this method call, the callee owns the data handler.
      */
     void writeBinary(DataHandler data) throws XMLStreamException;
 
@@ -132,7 +132,7 @@ public interface XMLStreamWriterEx extends XMLStreamWriter {
      * Writes like {@link #writeCharacters(String)} but hides
      * actual data format.
      *
-     * @return
+     * @param data
      *      The {@link CharSequence} that represents the
      *      character infoset items to be written.
      *
@@ -144,10 +144,6 @@ public interface XMLStreamWriterEx extends XMLStreamWriter {
      *      as binary data may take advantage of mor efficient
      *      data representation.)
      *
-     *      <p>
-     *      The object returned from this method belongs to the parser,
-     *      and its content is guaranteed to be the same only until
-     *      the {@link #next()} method is invoked.
      */
     void writePCDATA(CharSequence data) throws XMLStreamException;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties
index 5cc5b00c262..2462b349268 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties
@@ -125,4 +125,3 @@ first_id=first occurrence of ID \"{0}\"
 # Fragments
 name_absent_namespace=\"{0}\"
 name_with_namespace=\"{1}\" from namespace \"{0}\"
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
index be8e2e5e50b..e7cfb8d602d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties
@@ -25,4 +25,3 @@
 
 # Properties file specifying messages
 builtin_param=builtin datatypes do not have any parameters
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties
index 141893fd91d..6ae7d60fe26 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties
@@ -26,4 +26,3 @@
 # common messages between XML and compact syntax parser
 parent_ref_outside_grammar=parentRef is used outside a grammar
 ref_outside_grammar=ref is used outside a grammar
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties
index 9f53da09f61..d185d09106f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties
@@ -45,4 +45,3 @@ ns_name_except_contains_ns_name=\"except\" in \"nsName\" contains \"nsName\"
 illegal_surrogate_pair=illegal surrogate pair
 relax_ng_namespace=annotations cannot have namespace URI \"http://relaxng.org/ns/structure/1.0\"
 top_level_follow_annotation=top-level pattern cannot have following annotations
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties
index 9fc08f382fc..fefd2ea223c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties
@@ -61,4 +61,3 @@ too_many_children=too many child elements: only one child element is allowed
 undefined_prefix=undefined prefix \"{0}\"
 value_contains_foreign_element=\"value\" element cannot contain foreign elements
 wrong_uri_version=namespace URI has wrong version: expected \"{0}\" but got \"{1}\"
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
index b9f15baa54d..cec60603e02 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java
@@ -48,13 +48,13 @@ public abstract class AbstractProcessor extends AbstractCreatorProcessor {
     protected  static final int STATE_COMMENT_AS_STRING             = 15;
     protected  static final int STATE_PROCESSING_INSTRUCTION        = 16;
     protected  static final int STATE_END                           = 17;
-    protected  static final int[] _eiiStateTable = new int[256];
+    private  static final int[] _eiiStateTable = new int[256];
 
     protected  static final int STATE_NAMESPACE_ATTRIBUTE           = 1;
     protected  static final int STATE_NAMESPACE_ATTRIBUTE_P         = 2;
     protected  static final int STATE_NAMESPACE_ATTRIBUTE_P_U       = 3;
     protected  static final int STATE_NAMESPACE_ATTRIBUTE_U         = 4;
-    protected  static final int[] _niiStateTable = new int[256];
+    private  static final int[] _niiStateTable = new int[256];
 
     protected  static final int STATE_ATTRIBUTE_U_LN_QN             = 1;
     protected  static final int STATE_ATTRIBUTE_P_U_LN              = 2;
@@ -64,7 +64,7 @@ public abstract class AbstractProcessor extends AbstractCreatorProcessor {
     protected  static final int STATE_ATTRIBUTE_P_U_LN_OBJECT       = 6;
     protected  static final int STATE_ATTRIBUTE_U_LN_OBJECT         = 7;
     protected  static final int STATE_ATTRIBUTE_LN_OBJECT           = 8;
-    protected  static final int[] _aiiStateTable = new int[256];
+    private  static final int[] _aiiStateTable = new int[256];
 
     static {
         /*
@@ -172,6 +172,18 @@ public abstract class AbstractProcessor extends AbstractCreatorProcessor {
         return _eiiStateTable[readStructure()];
     }
 
+    protected static int getEIIState(int item) {
+        return _eiiStateTable[item];
+    }
+
+    protected static int getNIIState(int item) {
+        return _niiStateTable[item];
+    }
+
+    protected static int getAIIState(int item) {
+        return _aiiStateTable[item];
+    }
+
     protected final int readStructure16() {
         return (readStructure() << 8) | readStructure();
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
index cf699aca967..8e6ca51f57c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java
@@ -61,7 +61,7 @@ public class MutableXMLStreamBuffer extends XMLStreamBuffer {
      * The default array size for the arrays used in internal representation
      * of the XML infoset.
      */
-    public static int DEFAULT_ARRAY_SIZE = 512;
+    public static final int DEFAULT_ARRAY_SIZE = 512;
 
     /**
      * Create a new MutableXMLStreamBuffer using the
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
index 01fe77e0bbc..44b0688fa32 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java
@@ -158,7 +158,7 @@ public class SAXBufferCreator extends AbstractCreator
         _namespaceAttributes[_namespaceAttributesPtr++] = uri;
 
         if (_namespaceAttributesPtr == _namespaceAttributes.length) {
-            final String[] namespaceAttributes = new String[_namespaceAttributesPtr * 3 / 2 + 1];
+            final String[] namespaceAttributes = new String[_namespaceAttributesPtr * 2];
             System.arraycopy(_namespaceAttributes, 0, namespaceAttributes, 0, _namespaceAttributesPtr);
             _namespaceAttributes = namespaceAttributes;
         }
@@ -182,6 +182,10 @@ public class SAXBufferCreator extends AbstractCreator
 
     private void storeAttributes(Attributes attributes) {
         for (int i = 0; i < attributes.getLength(); i++) {
+            // Skip NS attributes. Some versions of JDK seem to send wrong local name
+            // Also it is not stored correctly by the following.
+            if (attributes.getQName(i).startsWith("xmlns"))
+                continue;
             storeQualifiedName(T_ATTRIBUTE_LN,
                     attributes.getURI(i),
                     attributes.getLocalName(i),
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
index 795d596e575..30a7fb4cf57 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java
@@ -551,7 +551,7 @@ public class SAXBufferProcessor extends AbstractProcessor implements XMLReader {
 
     private int processNamespaceAttributes(int item) throws SAXException {
         do {
-            switch(_niiStateTable[item]) {
+            switch(getNIIState(item)) {
                 case STATE_NAMESPACE_ATTRIBUTE:
                     // Undeclaration of default namespace
                     processNamespaceAttribute("", "");
@@ -584,7 +584,7 @@ public class SAXBufferProcessor extends AbstractProcessor implements XMLReader {
 
     private void processAttributes(int item) throws SAXException {
         do {
-            switch(_aiiStateTable[item]) {
+            switch(getAIIState(item)) {
                 case STATE_ATTRIBUTE_U_LN_QN:
                     _attributes.addAttributeWithQName(readStructureString(), readStructureString(), readStructureString(), readStructureString(), readContentString());
                     break;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
index 88c8fd9e857..ef776539205 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java
@@ -25,6 +25,8 @@
 package com.sun.xml.internal.stream.buffer.stax;
 
 import com.sun.xml.internal.stream.buffer.AbstractCreator;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * {@link AbstractCreator} with additional convenience code.
@@ -34,6 +36,11 @@ import com.sun.xml.internal.stream.buffer.AbstractCreator;
  * @author Kohsuke Kawaguchi
  */
 abstract class StreamBufferCreator extends AbstractCreator {
+
+    private boolean checkAttributeValue = false;
+
+    protected List<String> attributeValuePrefixes = new ArrayList<String>();
+
     protected void storeQualifiedName(int item, String prefix, String uri, String localName) {
         if (uri != null && uri.length() > 0) {
             if (prefix != null && prefix.length() > 0) {
@@ -71,6 +78,20 @@ abstract class StreamBufferCreator extends AbstractCreator {
 
         storeStructureString(type);
         storeContentString(value);
+        if(checkAttributeValue && value.indexOf("://") == -1){  // the condition after && avoids looking inside URIs
+            int firstIndex = value.indexOf(":");
+            int lastIndex = value.lastIndexOf(":");  // Check last index of : as some SAML namespace have multiple ":"s
+            if(firstIndex != -1 && lastIndex == firstIndex){
+                String valuePrefix = value.substring(0, firstIndex);
+                if(!attributeValuePrefixes.contains(valuePrefix)){
+                    attributeValuePrefixes.add(valuePrefix);
+                }
+            }
+        }
+    }
+
+    public final List getAttributeValuePrefixes(){
+        return attributeValuePrefixes;
     }
 
     protected final void storeProcessingInstruction(String target, String data) {
@@ -78,4 +99,12 @@ abstract class StreamBufferCreator extends AbstractCreator {
         storeStructureString(target);
         storeStructureString(data);
     }
+
+    public final boolean isCheckAttributeValue(){
+        return checkAttributeValue;
+    }
+
+    public final void setCheckAttributeValue(boolean value){
+        this.checkAttributeValue = value;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
index 7f07e4bb22c..43f8b672efa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java
@@ -313,6 +313,28 @@ public class StreamReaderBufferCreator extends StreamBufferCreator {
         }
     }
 
+    /**
+     * A low level method a create a structure element explicitly. This is useful when xsb is
+     * created from a fragment's XMLStreamReader and inscope namespaces can be passed using
+     * this method. Note that there is no way to enumerate namespaces from XMLStreamReader.
+     *
+     * For e.g: Say the SOAP message is as follows
+     *
+     *  <S:Envelope xmlns:n1=".."><S:Body><ns2:A> ...
+     *
+     * when xsb is to be created using a reader that is at <ns2:A> tag, the inscope
+     * namespace like 'n1' can be passed using this method.
+     *
+     * WARNING: Instead of using this, try other methods(if you don't know what you are
+     * doing).
+     *
+     * @param ns an array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }.
+     */
+    public void storeElement(String nsURI, String localName, String prefix, String[] ns) {
+        storeQualifiedName(T_ELEMENT_LN, prefix, nsURI, localName);
+        storeNamespaceAttributes(ns);
+    }
+
     private void storeNamespaceAttributes(XMLStreamReader reader) {
         int count = reader.getNamespaceCount();
         for (int i = 0; i < count; i++) {
@@ -320,6 +342,15 @@ public class StreamReaderBufferCreator extends StreamBufferCreator {
         }
     }
 
+    /**
+     * @param ns an array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }.
+     */
+    private void storeNamespaceAttributes(String[] ns) {
+        for (int i = 0; i < ns.length; i=i+2) {
+            storeNamespaceAttribute(ns[i], ns[i+1]);
+        }
+    }
+
     private void storeAttributes(XMLStreamReader reader) {
         int count = reader.getAttributeCount();
         for (int i = 0; i < count; i++) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
index d1e5bc69ded..50a28a0f0af 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java
@@ -215,7 +215,8 @@ public class StreamReaderBufferProcessor extends AbstractProcessor implements XM
         _characters = null;
         _charSequence = null;
         while(true) {// loop only if we read STATE_DOCUMENT
-            switch(readEiiState()) {
+            int eiiState = readEiiState();
+            switch(eiiState) {
                 case STATE_DOCUMENT:
                     // we'll always produce a full document, and we've already report START_DOCUMENT event.
                     // so simply skil this
@@ -311,7 +312,7 @@ public class StreamReaderBufferProcessor extends AbstractProcessor implements XM
                         return _eventType = END_DOCUMENT;
                     }
                 default:
-                    throw new XMLStreamException("Invalid State");
+                    throw new XMLStreamException("Internal XSB error: Invalid State="+eiiState);
             }
             // this should be unreachable
         }
@@ -597,9 +598,11 @@ public class StreamReaderBufferProcessor extends AbstractProcessor implements XM
         }
 
         try {
-            System.arraycopy(_characters, sourceStart, target,
-                    targetStart, length);
-            return length;
+            int remaining = _textLen - sourceStart;
+            int len = remaining > length ? length : remaining;
+            sourceStart += _textOffset;
+            System.arraycopy(_characters, sourceStart, target, targetStart, len);
+            return len;
         } catch (IndexOutOfBoundsException e) {
             throw new XMLStreamException(e);
         }
@@ -748,7 +751,7 @@ public class StreamReaderBufferProcessor extends AbstractProcessor implements XM
                 resizeNamespaceAttributes();
             }
 
-            switch(_niiStateTable[item]){
+            switch(getNIIState(item)){
                 case STATE_NAMESPACE_ATTRIBUTE:
                     // Undeclaration of default namespace
                     _namespaceAIIsPrefix[_namespaceAIIsEnd] =
@@ -782,7 +785,7 @@ public class StreamReaderBufferProcessor extends AbstractProcessor implements XM
 
     private void processAttributes(int item){
         do {
-            switch(_aiiStateTable[item]){
+            switch(getAIIState(item)){
                 case STATE_ATTRIBUTE_U_LN_QN: {
                     final String uri = readStructureString();
                     final String localName = readStructureString();
@@ -801,6 +804,8 @@ public class StreamReaderBufferProcessor extends AbstractProcessor implements XM
                     _attributeCache.addAttributeWithPrefix("", "", readStructureString(), readStructureString(), readContentString());
                     break;
                 }
+                default :
+                    assert false : "Internal XSB Error: wrong attribute state, Item="+item;
             }
             readStructure();
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
index 6f165ef7abc..ce3c953e399 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java
@@ -258,8 +258,10 @@ public class StreamWriterBufferCreator extends StreamBufferCreator implements XM
     }
 
     public void writeBinary(DataHandler dataHandler) throws XMLStreamException {
-        // TODO
-        throw new UnsupportedOperationException();
+        Base64Data d = new Base64Data();
+        d.set(dataHandler);
+        storeStructure(T_TEXT_AS_OBJECT);
+        storeContentObject(d);
     }
 
     public OutputStream writeBinary(String endpointURL) throws XMLStreamException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
index 51676492162..71a1a149897 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java
@@ -27,6 +27,12 @@ package com.sun.xml.internal.stream.buffer.stax;
 
 import com.sun.xml.internal.stream.buffer.AbstractProcessor;
 import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
 
 import javax.xml.stream.XMLStreamException;
@@ -96,6 +102,8 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
     /**
      * Writes a full XML infoset event to the given writer,
      * including start/end document.
+     * Any inscope namespaces present will be written as namespace
+     * delcarations on each top-level element.
      */
     public void write(XMLStreamWriter writer) throws XMLStreamException{
 
@@ -105,11 +113,8 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
             writer.writeStartDocument();
         }
 
-        // TODO: if we are writing a fragment XMLStreamBuffer as a full document,
-        // we need to put in-scope namespaces as top-level ns decls.
-
         while(true) {
-            int item = _eiiStateTable[peekStructure()];
+            int item = getEIIState(peekStructure());
             writer.flush();
 
             switch(item) {
@@ -162,7 +167,8 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
     /**
      * Writes the buffer as a fragment, meaning
      * the writer will not receive start/endDocument events.
-     *
+     * Any inscope namespaces present will be written as namespace
+     * delcarations on each top-level element.
      * <p>
      * If {@link XMLStreamBuffer} has a forest, this method will write all the forests.
      */
@@ -177,7 +183,7 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
     public void writeFragmentEx(XMLStreamWriterEx writer) throws XMLStreamException {
         int depth = 0;  // used to determine when we are done with a tree.
 
-        int item = _eiiStateTable[peekStructure()];
+        int item = getEIIState(peekStructure());
         if(item==STATE_DOCUMENT)
             readStructure();    // skip STATE_DOCUMENT
 
@@ -194,7 +200,7 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
                     final String localName = readStructureString();
                     final String prefix = getPrefixFromQName(readStructureString());
                     writer.writeStartElement(prefix,localName,uri);
-                    writeAttributes(writer);
+                    writeAttributes(writer, isInscope(depth));
                     break;
                 }
                 case STATE_ELEMENT_P_U_LN: {
@@ -203,7 +209,7 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
                     final String uri = readStructureString();
                     final String localName = readStructureString();
                     writer.writeStartElement(prefix,localName,uri);
-                    writeAttributes(writer);
+                    writeAttributes(writer, isInscope(depth));
                     break;
                 }
                 case STATE_ELEMENT_U_LN: {
@@ -211,14 +217,14 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
                     final String uri = readStructureString();
                     final String localName = readStructureString();
                     writer.writeStartElement("",localName,uri);
-                    writeAttributes(writer);
+                    writeAttributes(writer, isInscope(depth));
                     break;
                 }
                 case STATE_ELEMENT_LN: {
                     depth ++;
                     final String localName = readStructureString();
                     writer.writeStartElement(localName);
-                    writeAttributes(writer);
+                    writeAttributes(writer, isInscope(depth));
                     break;
                 }
                 case STATE_TEXT_AS_CHAR_ARRAY_SMALL: {
@@ -286,7 +292,7 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
     public void writeFragmentNoEx(XMLStreamWriter writer) throws XMLStreamException {
         int depth = 0;
 
-        int item = _eiiStateTable[peekStructure()];
+        int item = getEIIState(peekStructure());
         if(item==STATE_DOCUMENT)
             readStructure();    // skip STATE_DOCUMENT
 
@@ -302,7 +308,7 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
                     final String localName = readStructureString();
                     final String prefix = getPrefixFromQName(readStructureString());
                     writer.writeStartElement(prefix,localName,uri);
-                    writeAttributes(writer);
+                    writeAttributes(writer, isInscope(depth));
                     break;
                 }
                 case STATE_ELEMENT_P_U_LN: {
@@ -311,7 +317,7 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
                     final String uri = readStructureString();
                     final String localName = readStructureString();
                     writer.writeStartElement(prefix,localName,uri);
-                    writeAttributes(writer);
+                    writeAttributes(writer, isInscope(depth));
                     break;
                 }
                 case STATE_ELEMENT_U_LN: {
@@ -319,14 +325,14 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
                     final String uri = readStructureString();
                     final String localName = readStructureString();
                     writer.writeStartElement("",localName,uri);
-                    writeAttributes(writer);
+                    writeAttributes(writer, isInscope(depth));
                     break;
                 }
                 case STATE_ELEMENT_LN: {
                     depth ++;
                     final String localName = readStructureString();
                     writer.writeStartElement(localName);
-                    writeAttributes(writer);
+                    writeAttributes(writer, isInscope(depth));
                     break;
                 }
                 case STATE_TEXT_AS_CHAR_ARRAY_SMALL: {
@@ -391,37 +397,81 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
 
     }
 
-    private void writeAttributes(XMLStreamWriter writer) throws XMLStreamException {
+    private boolean isInscope(int depth) {
+        return _buffer.getInscopeNamespaces().size() > 0 && depth ==1;
+    }
+
+    /*
+     * @param inscope: true means write inscope namespaces
+     */
+    private void writeAttributes(XMLStreamWriter writer, boolean inscope) throws XMLStreamException {
+        // prefixSet to collect prefixes that are written before writing inscope namespaces
+        Set<String> prefixSet = inscope ? new HashSet<String>() : Collections.<String>emptySet();
         int item = peekStructure();
         if ((item & TYPE_MASK) == T_NAMESPACE_ATTRIBUTE) {
             // Skip the namespace declarations on the element
             // they will have been added already
-            item = writeNamespaceAttributes(item, writer);
+            item = writeNamespaceAttributes(item, writer, inscope, prefixSet);
+        }
+        if (inscope) {
+            writeInscopeNamespaces(writer, prefixSet);
         }
         if ((item & TYPE_MASK) == T_ATTRIBUTE) {
             writeAttributes(item, writer);
         }
     }
 
-    private int writeNamespaceAttributes(int item, XMLStreamWriter writer) throws XMLStreamException {
+    private static String fixNull(String s) {
+        if (s == null) return "";
+        else return s;
+    }
+
+    /*
+     * @param prefixSet: already written prefixes
+     */
+    private void writeInscopeNamespaces(XMLStreamWriter writer, Set<String> prefixSet) throws XMLStreamException {
+        for (Map.Entry<String, String> e : _buffer.getInscopeNamespaces().entrySet()) {
+            String key = fixNull(e.getKey());
+            // If the prefix is already written, do not write the prefix
+            if (!prefixSet.contains(key)) {
+                writer.writeNamespace(key, e.getValue());
+            }
+        }
+    }
+
+    private int writeNamespaceAttributes(int item, XMLStreamWriter writer, boolean collectPrefixes, Set<String> prefixSet) throws XMLStreamException {
         do {
-            switch(_niiStateTable[item]){
+            switch(getNIIState(item)){
                 case STATE_NAMESPACE_ATTRIBUTE:
                     // Undeclaration of default namespace
                     writer.writeDefaultNamespace("");
+                    if (collectPrefixes) {
+                        prefixSet.add("");
+                    }
                     break;
                 case STATE_NAMESPACE_ATTRIBUTE_P:
                     // Undeclaration of namespace
                     // Declaration with prefix
-                    writer.writeNamespace(readStructureString(), "");
+                    String prefix = readStructureString();
+                    writer.writeNamespace(prefix, "");
+                    if (collectPrefixes) {
+                        prefixSet.add(prefix);
+                    }
                     break;
                 case STATE_NAMESPACE_ATTRIBUTE_P_U:
                     // Declaration with prefix
-                    writer.writeNamespace(readStructureString(), readStructureString());
+                    prefix = readStructureString();
+                    writer.writeNamespace(prefix, readStructureString());
+                    if (collectPrefixes) {
+                        prefixSet.add(prefix);
+                    }
                     break;
                 case STATE_NAMESPACE_ATTRIBUTE_U:
                     // Default declaration
                     writer.writeDefaultNamespace(readStructureString());
+                    if (collectPrefixes) {
+                        prefixSet.add("");
+                    }
                     break;
             }
             readStructure();
@@ -434,7 +484,7 @@ public class StreamWriterBufferProcessor extends AbstractProcessor {
 
     private void writeAttributes(int item, XMLStreamWriter writer) throws XMLStreamException {
         do {
-            switch(_aiiStateTable[item]) {
+            switch(getAIIState(item)) {
                 case STATE_ATTRIBUTE_U_LN_QN: {
                     final String uri = readStructureString();
                     final String localName = readStructureString();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java
index 1564b2be438..d58cdafa69e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java
@@ -27,7 +27,6 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // This class is in the Public Domain.  NO WARRANTY!
-// $Id: NamespaceSupport.java,v 1.1 2005/04/14 21:45:18 kohsuke Exp $
 
 package com.sun.xml.internal.txw2;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/TXW.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/TXW.java
index c65acccdeb6..0dae79a053f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/TXW.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/TXW.java
@@ -26,6 +26,7 @@
 package com.sun.xml.internal.txw2;
 
 import com.sun.xml.internal.txw2.output.XmlSerializer;
+import com.sun.xml.internal.txw2.output.TXWSerializer;
 import com.sun.xml.internal.txw2.annotation.XmlElement;
 import com.sun.xml.internal.txw2.annotation.XmlNamespace;
 
@@ -84,6 +85,11 @@ public abstract class TXW {
      *      The target of the writing.
      */
     public static <T extends TypedXmlWriter> T create( Class<T> rootElement, XmlSerializer out ) {
+        if (out instanceof TXWSerializer) {
+            TXWSerializer txws = (TXWSerializer) out;
+            return txws.txw._element(rootElement);
+        }
+
         Document doc = new Document(out);
         QName n = getTagName(rootElement);
         return new ContainerElement(doc,null,n.getNamespaceURI(),n.getLocalPart())._cast(rootElement);
@@ -102,6 +108,10 @@ public abstract class TXW {
      * @see #create(Class,XmlSerializer)
      */
     public static <T extends TypedXmlWriter> T create( QName tagName, Class<T> rootElement, XmlSerializer out ) {
+        if (out instanceof TXWSerializer) {
+            TXWSerializer txws = (TXWSerializer) out;
+            return txws.txw._element(tagName,rootElement);
+        }
         return new ContainerElement(new Document(out),null,tagName.getNamespaceURI(),tagName.getLocalPart())._cast(rootElement);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java
index 915b6bc47ca..21533643ff1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java
@@ -26,11 +26,7 @@
 package com.sun.xml.internal.txw2.annotation;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import static java.lang.annotation.ElementType.METHOD;
-
-import com.sun.xml.internal.txw2.DatatypeWriter;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java
index 0dd788948ef..431cf118049 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java
@@ -58,6 +58,8 @@ public abstract class ResultFactory {
             return new DomSerializer((DOMResult) result);
         if (result instanceof StreamResult)
             return new StreamSerializer((StreamResult) result);
+        if (result instanceof TXWResult)
+            return new TXWSerializer(((TXWResult)result).getWriter());
 
         throw new UnsupportedOperationException("Unsupported Result type: " + result.getClass().getName());
     }
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIInsets.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java
similarity index 59%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIInsets.java
rename to jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java
index 3e320de6682..53b7c96be61 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIInsets.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java
@@ -22,41 +22,44 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.synthmodel;
+package com.sun.xml.internal.txw2.output;
 
-import java.awt.Insets;
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+
+import javax.xml.transform.Result;
 
 /**
- * UIInsets
+ * Allow you to wrap {@link TypedXmlWriter} into a {@link Result}
+ * so that it can be passed to {@link ResultFactory}.
  *
- * @author  Richard Bair
- * @author  Jasper Potts
+ * <p>
+ * This class doesn't extend from known {@link Result} type,
+ * so it won't work elsewhere.
+ *
+ * @author Kohsuke Kawaguchi
  */
-public class UIInsets extends UIDefault<Insets> {
+public class TXWResult implements Result {
+    private String systemId;
 
-    public UIInsets() {
+    private TypedXmlWriter writer;
+
+    public TXWResult(TypedXmlWriter writer) {
+        this.writer = writer;
     }
 
-    public UIInsets(String id, Insets value) {
-        super(id, value);
+    public TypedXmlWriter getWriter() {
+        return writer;
     }
 
-    public Insets getInsets() {
-        return super.getValue();
+    public void setWriter(TypedXmlWriter writer) {
+        this.writer = writer;
     }
 
-    public void setInsets(Insets i) {
-        Insets old = getInsets();
-        super.setValue(i);
-        firePropertyChange("insets", old, i);
-        // update model defaults
-        getUiDefaults().put(getName(), i);
+    public String getSystemId() {
+        return systemId;
     }
 
-
-    public String toString() {
-        return "UiInset(" + getName() + ")" +
-                ((getInsets() == null) ? " NONE" : "(" + getInsets().top + "," + getInsets().left + "," +
-                        getInsets().bottom + "," + getInsets().right + ")");
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java
new file mode 100644
index 00000000000..f50028096e1
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.txw2.output;
+
+import com.sun.xml.internal.txw2.TypedXmlWriter;
+import com.sun.xml.internal.txw2.TXW;
+
+/**
+ * Dummpy implementation to pass through {@link TypedXmlWriter}
+ * to {@link TXW}
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public final class TXWSerializer implements XmlSerializer {
+    public final TypedXmlWriter txw;
+
+    public TXWSerializer(TypedXmlWriter txw) {
+        this.txw = txw;
+    }
+
+    public void startDocument() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void endDocument() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void beginStartTag(String uri, String localName, String prefix) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void writeAttribute(String uri, String localName, String prefix, StringBuilder value) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void writeXmlns(String prefix, String uri) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void endStartTag(String uri, String localName, String prefix) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void endTag() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void text(StringBuilder text) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void cdata(StringBuilder text) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void comment(StringBuilder comment) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void flush() {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
index 7f042f0ee24..c5280b452d4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.addressing;
 
 import com.sun.istack.internal.NotNull;
@@ -238,7 +237,7 @@ public class EndpointReferenceUtil {
                                 msEpr.referenceParameters = new MemberSubmissionEndpointReference.Elements();
                                 msEpr.referenceParameters.elements = new ArrayList<Element>();
                             }
-                            msEpr.referenceParameters.elements.add((Element) refParams.item(i));
+                            msEpr.referenceParameters.elements.add((Element) refParams.item(j));
                         }
                     }
                 } else if (child.getNamespaceURI().equals(AddressingVersion.W3C.nsUri) &&
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java
new file mode 100644
index 00000000000..f0a38fec227
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing;
+
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.addressing.model.MissingAddressingHeaderException;
+
+/**
+ * @author Rama Pulavarthi
+ */
+public class W3CWsaClientTube extends WsaClientTube {
+    public W3CWsaClientTube(WSDLPort wsdlPort, WSBinding binding, Tube next) {
+        super(wsdlPort, binding, next);
+    }
+
+    public W3CWsaClientTube(WsaClientTube that, TubeCloner cloner) {
+        super(that, cloner);
+    }
+
+    public W3CWsaClientTube copy(TubeCloner cloner) {
+        return new W3CWsaClientTube(this, cloner);
+    }
+
+    @Override
+    protected void checkMandatoryHeaders(Packet packet, boolean foundAction, boolean foundTo, boolean foundReplyTo,
+                                         boolean foundFaultTo, boolean foundMessageID, boolean foundRelatesTo) {
+        super.checkMandatoryHeaders(packet, foundAction, foundTo, foundReplyTo, foundFaultTo, foundMessageID, foundRelatesTo);
+
+        // if it is not one-way, response must contain wsa:RelatesTo
+        // RelatesTo required as per
+        // Table 5-3 of http://www.w3.org/TR/2006/WD-ws-addr-wsdl-20060216/#wsdl11requestresponse
+        if (expectReply && (packet.getMessage() != null) && !foundRelatesTo) {
+            String action = packet.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
+            // Don't check for AddressingFaults as
+            // Faults for requests with duplicate MessageId will have no wsa:RelatesTo
+            if (!packet.getMessage().isFault() || !action.equals(addressingVersion.getDefaultFaultAction())) {
+                throw new MissingAddressingHeaderException(addressingVersion.relatesToTag,packet);
+            }
+        }
+
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java
new file mode 100644
index 00000000000..d1e4a5889ed
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.addressing;
+
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.addressing.model.MissingAddressingHeaderException;
+import com.sun.istack.internal.NotNull;
+
+/**
+ * @author Rama Pulavarthi
+ */
+public class W3CWsaServerTube extends WsaServerTube{
+    public W3CWsaServerTube(WSEndpoint endpoint, @NotNull WSDLPort wsdlPort, WSBinding binding, Tube next) {
+        super(endpoint, wsdlPort, binding, next);
+    }
+
+    public W3CWsaServerTube(WsaServerTube that, TubeCloner cloner) {
+        super(that, cloner);
+    }
+
+    protected Packet validateInboundHeaders(Packet packet) {
+        return super.validateInboundHeaders(packet);
+    }
+
+    public W3CWsaServerTube copy(TubeCloner cloner) {
+        return new W3CWsaServerTube(this, cloner);
+    }
+
+    @Override
+    protected void checkMandatoryHeaders(
+            Packet packet, boolean foundAction, boolean foundTo, boolean foundReplyTo,
+            boolean foundFaultTo, boolean foundMessageId, boolean foundRelatesTo) {
+        super.checkMandatoryHeaders(packet, foundAction, foundTo, foundReplyTo,
+                foundFaultTo, foundMessageId, foundRelatesTo);
+
+        // find Req/Response or Oneway using WSDLModel(if it is availabe)
+        WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
+        // Taking care of protocol messages as they do not have any corresponding operations
+        if (wbo != null) {
+            // if two-way and no wsa:MessageID is found
+            if (!wbo.getOperation().isOneWay() && !foundMessageId) {
+                throw new MissingAddressingHeaderException(addressingVersion.messageIDTag,packet);
+            }
+        }
+
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java
index 11714a506df..001f2c35f79 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java
@@ -27,9 +27,7 @@ package com.sun.xml.internal.ws.addressing;
 
 import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.ws.addressing.model.ActionNotSupportedException;
-import com.sun.xml.internal.ws.addressing.model.MapRequiredException;
 import com.sun.xml.internal.ws.api.WSBinding;
-import com.sun.xml.internal.ws.api.message.HeaderList;
 import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
@@ -44,10 +42,13 @@ import javax.xml.ws.WebServiceException;
  * WsaClientTube appears in the Tubeline only if addressing is enabled.
  * This tube checks the validity of addressing headers in the incoming messages
  * based on the WSDL model.
- *
+ * @author Rama Pulavarthi
  * @author Arun Gupta
  */
-public final class WsaClientTube extends WsaTube {
+public class WsaClientTube extends WsaTube {
+    // capture if the request expects a reply so that it can be used to
+    // determine if its oneway for response validation.
+    protected boolean expectReply = true;
     public WsaClientTube(WSDLPort wsdlPort, WSBinding binding, Tube next) {
         super(wsdlPort, binding, next);
     }
@@ -61,20 +62,23 @@ public final class WsaClientTube extends WsaTube {
     }
 
     public @NotNull NextAction processRequest(Packet request) {
+        expectReply = request.expectReply;
         return doInvoke(next,request);
    }
 
     public @NotNull NextAction processResponse(Packet response) {
         // if one-way then, no validation
-        if (response.getMessage() != null)
+        if (response.getMessage() != null) {
             response = validateInboundHeaders(response);
+            response.addSatellite(new WsaPropertyBag(addressingVersion,soapVersion,response));
+        }
 
         return doReturnWith(response);
     }
 
 
     @Override
-    public void validateAction(Packet packet) {
+    protected void validateAction(Packet packet) {
         //There may not be a WSDL operation.  There may not even be a WSDL.
         //For instance this may be a RM CreateSequence message.
         WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
@@ -91,14 +95,4 @@ public final class WsaClientTube extends WsaTube {
             throw new ActionNotSupportedException(gotA);
     }
 
-    @Override
-    protected void checkMandatoryHeaders(Packet packet, boolean foundAction, boolean foundTo, boolean foundMessageID, boolean foundRelatesTo) {
-        super.checkMandatoryHeaders(packet, foundAction, foundTo, foundMessageID, foundRelatesTo);
-
-//        if(!foundRelatesTo)
-//            // RelatesTo required as per
-//            // Table 5-3 of http://www.w3.org/TR/2006/WD-ws-addr-wsdl-20060216/#wsdl11requestresponse
-//            throw new MapRequiredException(addressingVersion.relatesToTag);
-
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
new file mode 100644
index 00000000000..8ad719b5f46
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.addressing;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.PropertySet;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.message.Header;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.developer.JAXWSProperties;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
+/**
+ * Provides access to the Addressing headers.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Rama Pulavarthi
+ * @since 2.1.3
+ */
+public class WsaPropertyBag extends PropertySet {
+    private final @NotNull AddressingVersion addressingVersion;
+    private final @NotNull SOAPVersion soapVersion;
+    /**
+     * We can't store {@link Message} here as those may get replaced as
+     * the packet travels through the pipeline.
+     */
+    private final @NotNull Packet packet;
+
+
+    WsaPropertyBag(AddressingVersion addressingVersion, SOAPVersion soapVersion, Packet packet) {
+        this.addressingVersion = addressingVersion;
+        this.soapVersion = soapVersion;
+        this.packet = packet;
+    }
+
+    /**
+     * Gets the <tt>wsa:To</tt> header.
+     *
+     * @return
+     *      null if the incoming SOAP message didn't have the header.
+     */
+    @Property(JAXWSProperties.ADDRESSING_TO)
+    public String getTo() throws XMLStreamException {
+        Header h = packet.getMessage().getHeaders().get(addressingVersion.toTag, false);
+        if (h == null) return null;
+        return h.getStringContent();
+    }
+
+    /**
+     * Gets the <tt>wsa:From</tt> header.
+     *
+     * @return
+     *      null if the incoming SOAP message didn't have the header.
+     */
+    @Property(JAXWSProperties.ADDRESSING_FROM)
+    public WSEndpointReference getFrom() throws XMLStreamException {
+        return getEPR(addressingVersion.fromTag);
+    }
+
+    /**
+     * Gets the <tt>wsa:Action</tt> header content as String.
+     *
+     * @return
+     *      null if the incoming SOAP message didn't have the header.
+     */
+    @Property(JAXWSProperties.ADDRESSING_ACTION)
+    public String getAction() {
+        Header h = packet.getMessage().getHeaders().get(addressingVersion.actionTag, false);
+        if(h==null) return null;
+        return h.getStringContent();
+    }
+
+    /**
+     * Gets the <tt>wsa:MessageID</tt> header content as String.
+     *
+     * @return
+     *      null if the incoming SOAP message didn't have the header.
+     */
+    // WsaServerTube.REQUEST_MESSAGE_ID is exposed for backward compatibility with 2.1
+    @Property({JAXWSProperties.ADDRESSING_MESSAGEID,WsaServerTube.REQUEST_MESSAGE_ID})
+    public String getMessageID() {
+        return packet.getMessage().getHeaders().getMessageID(addressingVersion,soapVersion);
+    }
+
+    private WSEndpointReference getEPR(QName tag) throws XMLStreamException {
+        Header h = packet.getMessage().getHeaders().get(tag, false);
+        if(h==null) return null;
+        return h.readAsEPR(addressingVersion);
+    }
+
+    protected PropertyMap getPropertyMap() {
+        return model;
+    }
+
+    private static final PropertyMap model;
+    static {
+        model = parse(WsaPropertyBag.class);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java
index 901ce3fee98..42b0ee5492e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java
@@ -29,8 +29,8 @@ import com.sun.istack.internal.NotNull;
 import static com.sun.xml.internal.ws.addressing.W3CAddressingConstants.ONLY_ANONYMOUS_ADDRESS_SUPPORTED;
 import static com.sun.xml.internal.ws.addressing.W3CAddressingConstants.ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED;
 import com.sun.xml.internal.ws.addressing.model.ActionNotSupportedException;
-import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
-import com.sun.xml.internal.ws.addressing.model.MapRequiredException;
+import com.sun.xml.internal.ws.addressing.model.InvalidAddressingHeaderException;
+import com.sun.xml.internal.ws.addressing.model.MissingAddressingHeaderException;
 import com.sun.xml.internal.ws.api.EndpointAddress;
 import com.sun.xml.internal.ws.api.SOAPVersion;
 import com.sun.xml.internal.ws.api.WSBinding;
@@ -42,28 +42,27 @@ import com.sun.xml.internal.ws.api.message.Messages;
 import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
-import com.sun.xml.internal.ws.api.pipe.ClientTubeAssemblerContext;
-import com.sun.xml.internal.ws.api.pipe.Fiber;
-import com.sun.xml.internal.ws.api.pipe.NextAction;
-import com.sun.xml.internal.ws.api.pipe.TransportTubeFactory;
-import com.sun.xml.internal.ws.api.pipe.Tube;
-import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.*;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.developer.JAXWSProperties;
 import com.sun.xml.internal.ws.message.FaultDetailHeader;
 import com.sun.xml.internal.ws.resources.AddressingMessages;
 
 import javax.xml.soap.SOAPFault;
 import javax.xml.ws.WebServiceException;
 import java.net.URI;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Handles WS-Addressing for the server.
  *
+ * @author Rama Pulavarthi
  * @author Kohsuke Kawaguchi
  * @author Arun Gupta
  */
-public final class WsaServerTube extends WsaTube {
-
+public class WsaServerTube extends WsaTube {
+    private WSEndpoint endpoint;
     // store the replyTo/faultTo of the message currently being processed.
     // both will be set to non-null in processRequest
     private WSEndpointReference replyTo;
@@ -74,12 +73,15 @@ public final class WsaServerTube extends WsaTube {
      * Used for determining ReplyTo or Fault Action for non-anonymous responses     *
      */
     private WSDLBoundOperation wbo;
-    public WsaServerTube(@NotNull WSDLPort wsdlPort, WSBinding binding, Tube next) {
+    public WsaServerTube(WSEndpoint endpoint, @NotNull WSDLPort wsdlPort, WSBinding binding, Tube next) {
         super(wsdlPort, binding, next);
+        this.endpoint = endpoint;
+
     }
 
     public WsaServerTube(WsaServerTube that, TubeCloner cloner) {
         super(that, cloner);
+        endpoint = that.endpoint;
     }
 
     public WsaServerTube copy(TubeCloner cloner) {
@@ -90,6 +92,8 @@ public final class WsaServerTube extends WsaTube {
         Message msg = request.getMessage();
         if(msg==null)   return doInvoke(next,request); // hmm?
 
+        // expose bunch of addressing related properties for advanced applications
+        request.addSatellite(new WsaPropertyBag(addressingVersion,soapVersion,request));
 
         // Store request ReplyTo and FaultTo in requestPacket.invocationProperties
         // so that they can be used after responsePacket is received.
@@ -97,33 +101,27 @@ public final class WsaServerTube extends WsaTube {
 
         HeaderList hl = request.getMessage().getHeaders();
         try {
-        replyTo = hl.getReplyTo(addressingVersion, soapVersion);
-        faultTo = hl.getFaultTo(addressingVersion, soapVersion);
-        } catch (InvalidMapException e) {
-            SOAPFault soapFault = helper.newInvalidMapFault(e, addressingVersion);
+            replyTo = hl.getReplyTo(addressingVersion, soapVersion);
+            faultTo = hl.getFaultTo(addressingVersion, soapVersion);
+        } catch (InvalidAddressingHeaderException e) {
+            LOGGER.log(Level.WARNING,
+                    addressingVersion.getInvalidMapText()+", Problem header:" + e.getProblemHeader()+ ", Reason: "+ e.getSubsubcode(),e);
+            SOAPFault soapFault = helper.createInvalidAddressingHeaderFault(e, addressingVersion);
             // WS-A fault processing for one-way methods
-            if (request.getMessage().isOneWay(wsdlPort)) {
-                request.createServerResponse(null, wsdlPort, null, binding);
-                return doInvoke(next, request);
+            if ((wsdlPort!=null) && request.getMessage().isOneWay(wsdlPort)) {
+                Packet response = request.createServerResponse(null, wsdlPort, null, binding);
+                return doReturnWith(response);
             }
 
             Message m = Messages.create(soapFault);
             if (soapVersion == SOAPVersion.SOAP_11) {
-                FaultDetailHeader s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getMapQName());
+                FaultDetailHeader s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getProblemHeader());
                 m.getHeaders().add(s11FaultDetailHeader);
             }
 
             Packet response = request.createServerResponse(m, wsdlPort, null, binding);
             return doReturnWith(response);
         }
-        String messageId = hl.getMessageID(addressingVersion, soapVersion);
-
-        // TODO: This is probably not a very good idea.
-        // if someone wants to get this data, let them get from HeaderList.
-        // we can even provide a convenience method
-        //  -- KK.
-        request.invocationProperties.put(REQUEST_MESSAGE_ID, messageId);
-
 
         // defaulting
         if (replyTo == null)    replyTo = addressingVersion.anonymousEpr;
@@ -136,7 +134,7 @@ public final class WsaServerTube extends WsaTube {
         // if one-way message and WS-A header processing fault has occurred,
         // then do no further processing
         if (p.getMessage() == null)
-            // TODO: record the problem that we are dropping this problem on the floor.
+            // request message is invalid, exception is logged by now  and response is sent back  with null message
             return doReturnWith(p);
 
         // if we find an error in addressing header, just turn around the direction here
@@ -201,7 +199,7 @@ public final class WsaServerTube extends WsaTube {
         if (packet.transportBackChannel != null)
             packet.transportBackChannel.close();
 
-        if (packet.getMessage().isOneWay(wsdlPort)) {
+        if ((wsdlPort!=null) && packet.getMessage().isOneWay(wsdlPort)) {
             // one way message but with replyTo. I believe this is a hack for WS-TX - KK.
             LOGGER.fine(AddressingMessages.NON_ANONYMOUS_RESPONSE_ONEWAY());
             return;
@@ -219,7 +217,7 @@ public final class WsaServerTube extends WsaTube {
         // we need to assemble a pipeline to talk to this endpoint.
         // TODO: what to pass as WSService?
         Tube transport = TransportTubeFactory.create(Thread.currentThread().getContextClassLoader(),
-            new ClientTubeAssemblerContext(adrs, wsdlPort, null, binding));
+            new ClientTubeAssemblerContext(adrs, wsdlPort, null, binding,endpoint.getContainer()));
 
         packet.endpointAddress = adrs;
         String action = packet.getMessage().isFault() ?
@@ -227,11 +225,12 @@ public final class WsaServerTube extends WsaTube {
                 helper.getOutputAction(wbo);
         //set the SOAPAction, as its got to be same as wsa:Action
         packet.soapAction = action;
+        packet.expectReply = false;
         Fiber.current().runSync(transport, packet);
     }
 
     @Override
-    public void validateAction(Packet packet) {
+    protected void validateAction(Packet packet) {
         //There may not be a WSDL operation.  There may not even be a WSDL.
         //For instance this may be a RM CreateSequence message.
         WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
@@ -254,9 +253,8 @@ public final class WsaServerTube extends WsaTube {
         }
     }
 
-    @Override
-    public void checkCardinality(Packet packet) {
-        super.checkCardinality(packet);
+    protected void checkMessageAddressingProperties(Packet packet) {
+        super.checkMessageAddressingProperties(packet);
 
         // wsaw:Anonymous validation
         WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
@@ -270,7 +268,7 @@ public final class WsaServerTube extends WsaTube {
             try {
                 new EndpointAddress(URI.create(replyTo.getAddress()));
             } catch (Exception e) {
-                throw new InvalidMapException(addressingVersion.replyToTag, addressingVersion.invalidAddressTag);
+                throw new InvalidAddressingHeaderException(addressingVersion.replyToTag, addressingVersion.invalidAddressTag);
             }
         }
         //for now only validate ReplyTo
@@ -279,31 +277,13 @@ public final class WsaServerTube extends WsaTube {
             try {
                 new EndpointAddress(URI.create(faultTo.getAddress()));
             } catch (IllegalArgumentException e) {
-                throw new InvalidMapException(addressingVersion.faultToTag, addressingVersion.invalidAddressTag);
+                throw new InvalidAddressingHeaderException(addressingVersion.faultToTag, addressingVersion.invalidAddressTag);
             }
         }
         */
 
     }
 
-    protected void checkMandatoryHeaders(
-        Packet packet, boolean foundAction, boolean foundTo, boolean foundMessageId, boolean foundRelatesTo) {
-        super.checkMandatoryHeaders(packet, foundAction, foundTo, foundMessageId, foundRelatesTo);
-        WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
-        // no need to check for for non-application messages
-        if (wbo == null)
-            return;
-
-        // if no wsa:To header is found
-        if (!foundTo)
-            throw new MapRequiredException(addressingVersion.toTag);
-
-        // if two-way and no wsa:MessageID is found
-        if (!wbo.getOperation().isOneWay() && !foundMessageId)
-            throw new MapRequiredException(addressingVersion.messageIDTag);
-    }
-
-
     final void checkAnonymousSemantics(WSDLBoundOperation wbo, WSEndpointReference replyTo, WSEndpointReference faultTo) {
         // no check if Addressing is not enabled or is Member Submission
         if (addressingVersion == null || addressingVersion == AddressingVersion.MEMBER)
@@ -329,17 +309,17 @@ public final class WsaServerTube extends WsaTube {
             break;
         case prohibited:
             if (replyToValue != null && replyToValue.equals(addressingVersion.anonymousUri))
-                throw new InvalidMapException(addressingVersion.replyToTag, ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED);
+                throw new InvalidAddressingHeaderException(addressingVersion.replyToTag, ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED);
 
             if (faultToValue != null && faultToValue.equals(addressingVersion.anonymousUri))
-                throw new InvalidMapException(addressingVersion.faultToTag, ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED);
+                throw new InvalidAddressingHeaderException(addressingVersion.faultToTag, ONLY_NON_ANONYMOUS_ADDRESS_SUPPORTED);
             break;
         case required:
             if (replyToValue != null && !replyToValue.equals(addressingVersion.anonymousUri))
-                throw new InvalidMapException(addressingVersion.replyToTag, ONLY_ANONYMOUS_ADDRESS_SUPPORTED);
+                throw new InvalidAddressingHeaderException(addressingVersion.replyToTag, ONLY_ANONYMOUS_ADDRESS_SUPPORTED);
 
             if (faultToValue != null && !faultToValue.equals(addressingVersion.anonymousUri))
-                throw new InvalidMapException(addressingVersion.faultToTag, ONLY_ANONYMOUS_ADDRESS_SUPPORTED);
+                throw new InvalidAddressingHeaderException(addressingVersion.faultToTag, ONLY_ANONYMOUS_ADDRESS_SUPPORTED);
             break;
         default:
             // cannot reach here
@@ -347,6 +327,10 @@ public final class WsaServerTube extends WsaTube {
         }
     }
 
+    /**
+     * @deprecated
+     *      Use {@link JAXWSProperties#ADDRESSING_MESSAGEID}.
+     */
     public static final String REQUEST_MESSAGE_ID = "com.sun.xml.internal.ws.addressing.request.messageID";
 
     private static final Logger LOGGER = Logger.getLogger(WsaServerTube.class.getName());
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java
index 1baa69ba169..c489f1717cb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java
@@ -26,8 +26,8 @@
 package com.sun.xml.internal.ws.addressing;
 
 import com.sun.istack.internal.NotNull;
-import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
-import com.sun.xml.internal.ws.addressing.model.MapRequiredException;
+import com.sun.xml.internal.ws.addressing.model.InvalidAddressingHeaderException;
+import com.sun.xml.internal.ws.addressing.model.MissingAddressingHeaderException;
 import com.sun.xml.internal.ws.api.SOAPVersion;
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
@@ -50,7 +50,10 @@ import javax.xml.soap.SOAPFault;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.soap.SOAPBinding;
 import java.util.Iterator;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 
 /**
  * WS-Addressing processing code shared between client and server.
@@ -58,6 +61,7 @@ import java.util.Iterator;
  * <p>
  * This tube is used only when WS-Addressing is enabled.
  *
+ * @author Rama Pulavarthi
  * @author Arun Gupta
  */
 abstract class WsaTube extends AbstractFilterTubeImpl {
@@ -119,25 +123,27 @@ abstract class WsaTube extends AbstractFilterTubeImpl {
      * a fault message and returns that. Otherwise
      * it will pass through the parameter 'packet' object to the return value.
      */
-    protected final Packet validateInboundHeaders(Packet packet) {
+    protected Packet validateInboundHeaders(Packet packet) {
         SOAPFault soapFault;
         FaultDetailHeader s11FaultDetailHeader;
 
         try {
-            checkCardinality(packet);
-
+            checkMessageAddressingProperties(packet);
             return packet;
-        } catch (InvalidMapException e) {
-            soapFault = helper.newInvalidMapFault(e, addressingVersion);
-            s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getMapQName());
-        } catch (MapRequiredException e) {
-            soapFault = helper.newMapRequiredFault(e, addressingVersion);
-            s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getMapQName());
+        } catch (InvalidAddressingHeaderException e) {
+            LOGGER.log(Level.WARNING,
+                    addressingVersion.getInvalidMapText()+", Problem header:" + e.getProblemHeader()+ ", Reason: "+ e.getSubsubcode(),e);
+            soapFault = helper.createInvalidAddressingHeaderFault(e, addressingVersion);
+            s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getProblemHeader());
+        } catch (MissingAddressingHeaderException e) {
+            LOGGER.log(Level.WARNING,addressingVersion.getMapRequiredText()+", Problem header:"+ e.getMissingHeaderQName(),e);
+            soapFault = helper.newMapRequiredFault(e);
+            s11FaultDetailHeader = new FaultDetailHeader(addressingVersion, addressingVersion.problemHeaderQNameTag.getLocalPart(), e.getMissingHeaderQName());
         }
 
         if (soapFault != null) {
             // WS-A fault processing for one-way methods
-            if (packet.getMessage().isOneWay(wsdlPort)) {
+            if ((wsdlPort !=null)  && packet.getMessage().isOneWay(wsdlPort)) {
                 return packet.createServerResponse(null, wsdlPort, null, binding);
             }
 
@@ -146,13 +152,28 @@ abstract class WsaTube extends AbstractFilterTubeImpl {
                 m.getHeaders().add(s11FaultDetailHeader);
             }
 
-            Packet response = packet.createServerResponse(m, wsdlPort, null,  binding);
-            return response;
+            return packet.createServerResponse(m, wsdlPort, null,  binding);
         }
 
         return packet;
     }
 
+    /**
+     * This method checks all the WS-Addressing headers are valid and as per the spec definded rules.
+     * Mainly it checks the cardinality of the WSA headers and checks that mandatory headers exist.
+     * It also checks if the SOAPAction is equal to wsa:Action value when non-empty.
+     *
+     * Override this method if you need to additional checking of headers other than just existence of the headers.
+     * For ex: On server-side, check Anonymous and Non-Anonymous semantics in addition to checking cardinality.
+     *
+     * Override checkMandatoryHeaders(Packet p) to have different validation rules for different versions
+     *
+     * @param packet
+     */
+    protected void checkMessageAddressingProperties(Packet packet) {
+        checkCardinality(packet);
+    }
+
     final boolean isAddressingEngagedOrRequired(Packet packet, WSBinding binding) {
         if (AddressingVersion.isRequired(binding))
             return true;
@@ -187,7 +208,7 @@ abstract class WsaTube extends AbstractFilterTubeImpl {
      * <li>an uknown WS-Addressing header is present</li>
      * </ul>
      */
-    public void checkCardinality(Packet packet) {
+    protected void checkCardinality(Packet packet) {
         Message message = packet.getMessage();
         if (message == null) {
             if (addressingRequired)
@@ -202,7 +223,7 @@ abstract class WsaTube extends AbstractFilterTubeImpl {
             // no WS-A headers are found
             if (addressingRequired)
                 // if WS-A is required, then throw an exception looking for wsa:Action header
-                throw new MapRequiredException(addressingVersion.actionTag);
+                throw new MissingAddressingHeaderException(addressingVersion.actionTag,packet);
             else
                 // else no need to process
                 return;
@@ -284,7 +305,7 @@ abstract class WsaTube extends AbstractFilterTubeImpl {
 
         // check for invalid cardinality first before checking for mandatory headers
         if (duplicateHeader != null) {
-            throw new InvalidMapException(duplicateHeader, addressingVersion.invalidCardinalityTag);
+            throw new InvalidAddressingHeaderException(duplicateHeader, addressingVersion.invalidCardinalityTag);
         }
 
         // WS-A is engaged if wsa:Action header is found
@@ -296,7 +317,16 @@ abstract class WsaTube extends AbstractFilterTubeImpl {
         // Both wsa:Action and wsa:To MUST be present on request (for oneway MEP) and
         // response messages (for oneway and request/response MEP only)
         if (engaged || addressingRequired) {
-            checkMandatoryHeaders(packet, foundAction, foundTo, foundMessageId, foundRelatesTo);
+            // Check for mandatory headers always (even for Protocol messages).
+            // If it breaks any interop scenarios, Remove the comments.
+            /*
+            WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
+            // no need to check for for non-application messages
+            if (wbo == null)
+                return;
+            */
+            checkMandatoryHeaders(packet, foundAction, foundTo, foundReplyTo,
+                    foundFaultTo, foundMessageId, foundRelatesTo);
         }
     }
 
@@ -306,18 +336,14 @@ abstract class WsaTube extends AbstractFilterTubeImpl {
         // TODO: always in current role, this may not to be fixed.
         if (binding == null)
             return true;
+        return ((SOAPBinding)binding).getRoles().contains(header.getRole(soapVersion));
 
-
-        if (soapVersion == SOAPVersion.SOAP_11) {
-            // Rama: Why not checking for SOAP 1.1?
-            return true;
-        } else {
-            String role = header.getRole(soapVersion);
-            return (role.equals(SOAPVersion.SOAP_12.implicitRole));
-        }
     }
 
     protected final WSDLBoundOperation getWSDLBoundOperation(Packet packet) {
+        //we can find Req/Response or Oneway only with WSDLModel
+        if(wsdlPort == null)
+            return null;
         return packet.getMessage().getOperation(wsdlPort);
     }
 
@@ -326,21 +352,34 @@ abstract class WsaTube extends AbstractFilterTubeImpl {
         if (gotA == null)
             throw new WebServiceException(AddressingMessages.VALIDATION_SERVER_NULL_ACTION());
         if(packet.soapAction != null && !packet.soapAction.equals("\"\"") && !packet.soapAction.equals("\""+gotA+"\"")) {
-            throw new InvalidMapException(addressingVersion.actionTag, addressingVersion.actionMismatchTag);
+            throw new InvalidAddressingHeaderException(addressingVersion.actionTag, addressingVersion.actionMismatchTag);
         }
     }
 
     protected abstract void validateAction(Packet packet);
-    protected void checkMandatoryHeaders(
-        Packet packet, boolean foundAction, boolean foundTo, boolean foundMessageId, boolean foundRelatesTo) {
-        WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
-        // no need to check for for non-application messages
-        if (wbo == null)
-            return;
 
+    /**
+     * This should be called only when Addressing is engaged.
+     *
+     * Checks only for presence of wsa:Action and validates that wsa:Action
+     * equals SOAPAction header when non-empty
+     * Should be overridden if other wsa headers need to be checked based on version.
+     *
+     * @param packet
+     * @param foundAction
+     * @param foundTo
+     * @param foundReplyTo
+     * @param foundFaultTo
+     * @param foundMessageId
+     * @param foundRelatesTo
+     */
+    protected void checkMandatoryHeaders(
+        Packet packet, boolean foundAction, boolean foundTo, boolean foundReplyTo,
+            boolean foundFaultTo, boolean foundMessageId, boolean foundRelatesTo) {
         // if no wsa:Action header is found
         if (!foundAction)
-            throw new MapRequiredException(addressingVersion.actionTag);
+            throw new MissingAddressingHeaderException(addressingVersion.actionTag,packet);
         validateSOAPAction(packet);
     }
+    private static final Logger LOGGER = Logger.getLogger(WsaTube.class.getName());
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
index 7fd6d7c96d2..a21ba8dec6e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java
@@ -25,8 +25,8 @@
 
 package com.sun.xml.internal.ws.addressing;
 
-import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
-import com.sun.xml.internal.ws.addressing.model.MapRequiredException;
+import com.sun.xml.internal.ws.addressing.model.InvalidAddressingHeaderException;
+import com.sun.xml.internal.ws.addressing.model.MissingAddressingHeaderException;
 import com.sun.xml.internal.ws.api.SOAPVersion;
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
@@ -41,11 +41,8 @@ import com.sun.xml.internal.ws.model.wsdl.WSDLOperationImpl;
 import com.sun.xml.internal.ws.model.JavaMethodImpl;
 import com.sun.xml.internal.ws.model.CheckedExceptionImpl;
 import com.sun.istack.internal.Nullable;
-import com.sun.istack.internal.NotNull;
 import org.w3c.dom.Element;
 
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
 import javax.xml.soap.Detail;
 import javax.xml.soap.SOAPConstants;
@@ -218,10 +215,10 @@ public abstract class WsaTubeHelper {
     public String getSOAPAction(Packet packet) {
         String action = "";
 
-        if (packet == null)
+        if (packet == null || packet.getMessage() == null)
             return action;
 
-        if (packet.getMessage() == null)
+        if (wsdlPort == null)
             return action;
 
         WSDLBoundOperation op = packet.getMessage().getOperation(wsdlPort);
@@ -234,10 +231,11 @@ public abstract class WsaTubeHelper {
     }
 
     public String getOutputAction(Packet packet) {
-        String action = AddressingVersion.UNSET_OUTPUT_ACTION;
+        //String action = AddressingVersion.UNSET_OUTPUT_ACTION;
+        String action = null;
         if(seiModel!= null) {
             JavaMethodImpl jm = (JavaMethodImpl) packet.getMessage().getMethod(seiModel);
-            if(jm.getOutputAction() != null && !jm.getOutputAction().equals("")) {
+            if(jm != null && jm.getOutputAction() != null && !jm.getOutputAction().equals("")) {
                 return jm.getOutputAction();
             }
         }
@@ -257,8 +255,8 @@ public abstract class WsaTubeHelper {
         }
         return action;
     }
-    public SOAPFault newInvalidMapFault(InvalidMapException e, AddressingVersion av) {
-        QName name = e.getMapQName();
+    public SOAPFault createInvalidAddressingHeaderFault(InvalidAddressingHeaderException e, AddressingVersion av) {
+        QName name = e.getProblemHeader();
         QName subsubcode = e.getSubsubcode();
         QName subcode = av.invalidMapTag;
         String faultstring = String.format(av.getInvalidMapText(), name, subsubcode);
@@ -287,10 +285,10 @@ public abstract class WsaTubeHelper {
         }
     }
 
-    public SOAPFault newMapRequiredFault(MapRequiredException e, AddressingVersion av) {
-        QName subcode = av.mapRequiredTag;
-        QName subsubcode = av.mapRequiredTag;
-        String faultstring = av.getMapRequiredText();
+    public SOAPFault newMapRequiredFault(MissingAddressingHeaderException e) {
+        QName subcode = addVer.mapRequiredTag;
+        QName subsubcode = addVer.mapRequiredTag;
+        String faultstring = addVer.getMapRequiredText();
 
         try {
             SOAPFactory factory;
@@ -301,7 +299,7 @@ public abstract class WsaTubeHelper {
                 fault.setFaultCode(SOAPConstants.SOAP_SENDER_FAULT);
                 fault.appendFaultSubcode(subcode);
                 fault.appendFaultSubcode(subsubcode);
-                getMapRequiredDetail(e.getMapQName(), fault.addDetail());
+                getMapRequiredDetail(e.getMissingHeaderQName(), fault.addDetail());
             } else {
                 factory = SOAPVersion.SOAP_11.saajSoapFactory;
                 fault = factory.createFault();
@@ -320,8 +318,6 @@ public abstract class WsaTubeHelper {
     public abstract void getInvalidMapDetail(QName name, Element element);
     public abstract void getMapRequiredDetail(QName name, Element element);
 
-    protected Unmarshaller unmarshaller;
-    protected Marshaller marshaller;
     protected SEIModel seiModel;
     protected WSDLPort wsdlPort;
     protected WSBinding binding;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
index 8a24292eacc..f072a93898a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java
@@ -53,20 +53,19 @@ public class WsaTubeHelperImpl extends WsaTubeHelper {
 
     public WsaTubeHelperImpl(WSDLPort wsdlPort, SEIModel seiModel, WSBinding binding) {
         super(binding,seiModel,wsdlPort);
-        try {
-            unmarshaller = jc.createUnmarshaller();
-            marshaller = jc.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
-        } catch (JAXBException e) {
-            throw new WebServiceException(e);
-        }
+    }
+
+    private Marshaller createMarshaller() throws JAXBException {
+        Marshaller marshaller = jc.createMarshaller();
+        marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+        return marshaller;
     }
 
     @Override
     public final void getProblemActionDetail(String action, Element element) {
         ProblemAction pa = new ProblemAction(action);
         try {
-            marshaller.marshal(pa, element);
+            createMarshaller().marshal(pa, element);
         } catch (JAXBException e) {
             throw new WebServiceException(e);
         }
@@ -76,7 +75,7 @@ public class WsaTubeHelperImpl extends WsaTubeHelper {
     public final void getInvalidMapDetail(QName name, Element element) {
         ProblemHeaderQName phq = new ProblemHeaderQName(name);
         try {
-            marshaller.marshal(phq, element);
+            createMarshaller().marshal(phq, element);
         } catch (JAXBException e) {
             throw new WebServiceException(e);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
index 6718544f745..c95fb751867 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java
@@ -25,19 +25,18 @@
 
 package com.sun.xml.internal.ws.addressing.model;
 
+import com.sun.xml.internal.ws.resources.AddressingMessages;
+
 import javax.xml.ws.WebServiceException;
 
 /**
  * @author Arun Gupta
  */
 public class ActionNotSupportedException extends WebServiceException {
-    String action;
-
-    protected ActionNotSupportedException() {
-        super();
-    }
+    private String action;
 
     public ActionNotSupportedException(String action) {
+        super(AddressingMessages.ACTION_NOT_SUPPORTED_EXCEPTION(action));
         this.action = action;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java
new file mode 100644
index 00000000000..b2b22fd7264
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing.model;
+
+import com.sun.xml.internal.ws.resources.AddressingMessages;
+
+import javax.xml.ws.WebServiceException;
+import javax.xml.namespace.QName;
+
+/**
+ * This exception captures SOAP Fault information when a WS-Addressing 1.0 Message Addressing
+ * Property is invalid and cannot be processed.
+ *
+ * @author Rama Pulavarthi
+ */
+public class InvalidAddressingHeaderException extends WebServiceException {
+    private QName problemHeader;
+    private QName subsubcode;
+
+    /**
+     * Creates a InvalidAddressingHeader exception capturing information about the invalid
+     * Addressing Message Property and the reason in Subsubcode.
+     * @param problemHeader
+     *      represents the invalid Addressing Header.
+     * @param subsubcode
+     *      represents the reason why the Addressing header in question is invalid.
+     */
+    public InvalidAddressingHeaderException(QName problemHeader, QName subsubcode) {
+        super(AddressingMessages.INVALID_ADDRESSING_HEADER_EXCEPTION(problemHeader,subsubcode));
+        this.problemHeader = problemHeader;
+        this.subsubcode = subsubcode;
+    }
+
+    public QName getProblemHeader() {
+        return problemHeader;
+    }
+
+    public QName getSubsubcode() {
+        return subsubcode;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java
new file mode 100644
index 00000000000..c73941d0ea4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing.model;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.resources.AddressingMessages;
+
+import javax.xml.ws.WebServiceException;
+import javax.xml.namespace.QName;
+
+/**
+ * This exception signals that a particular WS-Addressing header is missing in a SOAP message.
+ *
+ * @author Rama Pulavarthi
+ */
+public class MissingAddressingHeaderException extends WebServiceException {
+    private final QName name;
+    private final Packet packet;
+
+    /**
+     *
+     * @param name QName of the missing WS-Addressing Header
+     */
+    public MissingAddressingHeaderException(@NotNull QName name) {
+        this(name,null);
+    }
+
+    public MissingAddressingHeaderException(@NotNull QName name, @Nullable Packet p) {
+        super(AddressingMessages.MISSING_HEADER_EXCEPTION(name));
+        this.name = name;
+        this.packet = p;
+    }
+
+    /**
+     * Gets the QName of the missing WS-Addressing Header.
+     *
+     * @return
+     *      never null.
+     */
+    public QName getMissingHeaderQName() {
+        return name;
+    }
+
+    /**
+     * The {@link Packet} in which a header was missing.
+     *
+     * <p>
+     * This object can be used to deep-inspect the problematic SOAP message.
+     */
+    public Packet getPacket() {
+        return packet;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java
new file mode 100644
index 00000000000..078b207e235
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing.v200408;
+
+import com.sun.xml.internal.ws.addressing.WsaClientTube;
+import com.sun.xml.internal.ws.addressing.model.MissingAddressingHeaderException;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressing;
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressingFeature;
+
+/**
+ * @author Rama Pulavarthi
+ */
+public class MemberSubmissionWsaClientTube extends WsaClientTube {
+    private final MemberSubmissionAddressing.Validation validation;
+
+    public MemberSubmissionWsaClientTube(WSDLPort wsdlPort, WSBinding binding, Tube next) {
+        super(wsdlPort, binding, next);
+        validation = binding.getFeature(MemberSubmissionAddressingFeature.class).getValidation();
+
+    }
+
+    public MemberSubmissionWsaClientTube(MemberSubmissionWsaClientTube that, TubeCloner cloner) {
+        super(that, cloner);
+        this.validation = that.validation;
+
+    }
+    public MemberSubmissionWsaClientTube copy(TubeCloner cloner) {
+        return new MemberSubmissionWsaClientTube(this, cloner);
+    }
+
+    @Override
+    protected void checkMandatoryHeaders(Packet packet, boolean foundAction, boolean foundTo, boolean foundReplyTo,
+                                         boolean foundFaultTo, boolean foundMessageID, boolean foundRelatesTo) {
+        super.checkMandatoryHeaders(packet,foundAction,foundTo,foundReplyTo,foundFaultTo,foundMessageID,foundRelatesTo);
+
+        // if no wsa:To header is found
+        if (!foundTo) {
+            throw new MissingAddressingHeaderException(addressingVersion.toTag,packet);
+        }
+
+        if (!validation.equals(MemberSubmissionAddressing.Validation.LAX)) {
+
+            // if it is not one-way, response must contain wsa:RelatesTo
+            // RelatesTo required as per
+            // Table 5-3 of http://www.w3.org/TR/2006/WD-ws-addr-wsdl-20060216/#wsdl11requestresponse
+            if (expectReply && (packet.getMessage() != null) && !foundRelatesTo) {
+                String action = packet.getMessage().getHeaders().getAction(addressingVersion, soapVersion);
+                // Don't check for AddressingFaults as
+                // Faults for requests with duplicate MessageId will have no wsa:RelatesTo
+                if (!packet.getMessage().isFault() || !action.equals(addressingVersion.getDefaultFaultAction())) {
+                    throw new MissingAddressingHeaderException(addressingVersion.relatesToTag,packet);
+                }
+            }
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java
new file mode 100644
index 00000000000..a7a31f27a29
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.addressing.v200408;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.addressing.WsaServerTube;
+import com.sun.xml.internal.ws.addressing.model.MissingAddressingHeaderException;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressing;
+import com.sun.xml.internal.ws.developer.MemberSubmissionAddressingFeature;
+
+/**
+ * @author Rama Pulavarthi
+ */
+public class MemberSubmissionWsaServerTube extends WsaServerTube {
+    private final MemberSubmissionAddressing.Validation validation;
+    public MemberSubmissionWsaServerTube(WSEndpoint endpoint, @NotNull WSDLPort wsdlPort, WSBinding binding, Tube next) {
+        super(endpoint, wsdlPort, binding, next);
+        validation = binding.getFeature(MemberSubmissionAddressingFeature.class).getValidation();
+    }
+
+    public MemberSubmissionWsaServerTube(MemberSubmissionWsaServerTube that, TubeCloner cloner) {
+        super(that, cloner);
+        this.validation = that.validation;
+    }
+
+    public MemberSubmissionWsaServerTube copy(TubeCloner cloner) {
+        return new MemberSubmissionWsaServerTube(this, cloner);
+    }
+
+    @Override
+    protected void checkMandatoryHeaders(Packet packet, boolean foundAction, boolean foundTo, boolean foundReplyTo,
+            boolean foundFaultTo, boolean foundMessageId, boolean foundRelatesTo) {
+
+        super.checkMandatoryHeaders(packet, foundAction, foundTo, foundReplyTo,
+                foundFaultTo, foundMessageId, foundRelatesTo);
+
+        // if no wsa:To header is found
+        if (!foundTo)
+            throw new MissingAddressingHeaderException(addressingVersion.toTag,packet);
+
+        //we can find Req/Response or Oneway only with WSDLModel
+        if (wsdlPort != null) {
+            WSDLBoundOperation wbo = getWSDLBoundOperation(packet);
+            // if two-way, must contain wsa:ReplyTo
+            // Unlike W3C version, we cannot assume default value as anonymous if not present.
+            // For protocol messages, don't check as they do not have any corresponding wsdl operations
+            if (wbo != null && !wbo.getOperation().isOneWay() && !foundReplyTo) {
+                throw new MissingAddressingHeaderException(addressingVersion.replyToTag,packet);
+            }
+        }
+        if (!validation.equals(MemberSubmissionAddressing.Validation.LAX)) {
+            // wsa:MessageId is required if wsa:ReplyTo is present.
+            if ((foundReplyTo || foundFaultTo) && !foundMessageId)
+                throw new MissingAddressingHeaderException(addressingVersion.messageIDTag,packet);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
index 27ff72ebfa2..bb333d4a521 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java
@@ -54,20 +54,19 @@ public class WsaTubeHelperImpl extends WsaTubeHelper {
 
     public WsaTubeHelperImpl(WSDLPort wsdlPort, SEIModel seiModel, WSBinding binding) {
         super(binding,seiModel,wsdlPort);
-        try {
-            unmarshaller = jc.createUnmarshaller();
-            marshaller = jc.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
-        } catch (JAXBException e) {
-            throw new WebServiceException(e);
-        }
+    }
+
+    private Marshaller createMarshaller() throws JAXBException {
+        Marshaller marshaller = jc.createMarshaller();
+        marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+        return marshaller;
     }
 
     @Override
     public final void getProblemActionDetail(String action, Element element) {
         ProblemAction pa = new ProblemAction(action);
         try {
-            marshaller.marshal(pa, element);
+            createMarshaller().marshal(pa, element);
         } catch (JAXBException e) {
             throw new WebServiceException(e);
         }
@@ -77,7 +76,7 @@ public class WsaTubeHelperImpl extends WsaTubeHelper {
     public final void getInvalidMapDetail(QName name, Element element) {
         ProblemHeaderQName phq = new ProblemHeaderQName(name);
         try {
-            marshaller.marshal(phq, element);
+            createMarshaller().marshal(phq, element);
         } catch (JAXBException e) {
             throw new WebServiceException(e);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java
index f466f24e6af..da7de8f6881 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java
@@ -34,7 +34,10 @@ import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
 import com.sun.xml.internal.ws.binding.WebServiceFeatureList;
 import com.sun.xml.internal.ws.encoding.SOAPBindingCodec;
 import com.sun.xml.internal.ws.encoding.XMLHTTPBindingCodec;
+import com.sun.xml.internal.ws.encoding.soap.streaming.SOAPNamespaceConstants;
+import com.sun.xml.internal.ws.encoding.soap.streaming.SOAP12NamespaceConstants;
 import com.sun.xml.internal.ws.util.ServiceFinder;
+import com.sun.xml.internal.ws.developer.JAXWSProperties;
 
 import javax.xml.ws.BindingType;
 import javax.xml.ws.WebServiceException;
@@ -96,6 +99,18 @@ public abstract class BindingID {
         return BindingImpl.create(this);
     }
 
+    /**
+     * Returns wsdl:binding@transport attribute. Sub classes
+     * are expected to override this method to provide their transport
+     * attribute.
+     *
+     * @return wsdl:binding@transport attribute
+     * @since JAX-WS RI 2.1.6
+     */
+    public @NotNull String getTransport() {
+        return SOAPNamespaceConstants.TRANSPORT_HTTP;
+    }
+
     public final @NotNull WSBinding createBinding(WebServiceFeature... features) {
         return BindingImpl.create(this, features);
     }
@@ -228,6 +243,8 @@ public abstract class BindingID {
     public static @NotNull BindingID parse(String lexical) {
         if(lexical.equals(XML_HTTP.toString()))
             return XML_HTTP;
+        if(lexical.equals(REST_HTTP.toString()))
+            return REST_HTTP;
         if(belongsTo(lexical,SOAP11_HTTP.toString()))
             return customize(lexical,SOAP11_HTTP);
         if(belongsTo(lexical,SOAP12_HTTP.toString()))
@@ -335,7 +352,16 @@ public abstract class BindingID {
      */
     public static final BindingID XML_HTTP = new Impl(SOAPVersion.SOAP_11, HTTPBinding.HTTP_BINDING,false) {
         public Codec createEncoder(WSBinding binding) {
-            return new XMLHTTPBindingCodec();
+            return new XMLHTTPBindingCodec(binding);
+        }
+    };
+
+    /**
+     * Constant that represents REST.
+     */
+    private static final BindingID REST_HTTP = new Impl(SOAPVersion.SOAP_11, JAXWSProperties.REST_BINDING,true) {
+        public Codec createEncoder(WSBinding binding) {
+            return new XMLHTTPBindingCodec(binding);
         }
     };
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java
index 14bdf40a43d..ff4a175779e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java
@@ -193,6 +193,9 @@ public final class EndpointAddress {
      */
     public URLConnection openConnection() throws IOException {
         assert url!=null : uri+" doesn't have the corresponding URL";
+        if (url == null) {
+            throw new WebServiceException("URI="+uri+" doesn't have the corresponding URL");
+        }
         if(proxy!=null)
             return url.openConnection(proxy);
         else
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java
new file mode 100644
index 00000000000..71354fbd529
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api;
+
+import com.sun.xml.internal.ws.api.server.Container;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * Used to locate resources for jax-ws extensions. Using this, extensions
+ * do not to have to write container specific code to locate resources.
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class ResourceLoader {
+
+    /**
+     * Returns the actual location of the resource from the 'resource' arg
+     * that represents a virtual locaion of a file understood by a container.
+     * ResourceLoader impl for a Container knows how to map this
+     * virtual location to actual location.
+     * <p>
+     * Extensions can get hold of this object using {@link Container}.
+     * <p/>
+     * for e.g.:
+     * <pre>
+     * ResourceLoader loader = container.getSPI(ResourceLoader.class);
+     * URL catalog = loader.get("jax-ws-catalog.xml");
+     * </pre>
+     * A ResourceLoader for servlet environment, may do the following.
+     * <pre>
+     * URL getResource(String resource) {
+     *     return servletContext.getResource("/WEB-INF/"+resource);
+     * }
+     * </pre>
+     *
+     * @param resource Designates a path that is understood by the container. The
+     *             implementations must support "jax-ws-catalog.xml" resource.
+     * @return the actual location, if found, or null if not found.
+     * @throws MalformedURLException if there is an error in creating URL
+     */
+    public abstract URL getResource(String resource) throws MalformedURLException;
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java
index 4642d6c8ff4..6fa7324f60a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java
@@ -25,6 +25,7 @@
 
 package com.sun.xml.internal.ws.api;
 
+import com.sun.xml.internal.bind.util.Which;
 import com.sun.xml.internal.ws.encoding.soap.SOAP12Constants;
 
 import javax.xml.namespace.QName;
@@ -167,6 +168,11 @@ public enum SOAPVersion {
             saajSoapFactory = SOAPFactory.newInstance(saajFactoryString);
         } catch (SOAPException e) {
             throw new Error(e);
+        } catch (NoSuchMethodError e) {
+            // SAAJ 1.3 is not in the classpath
+            LinkageError x = new LinkageError("You are loading old SAAJ from "+ Which.which(MessageFactory.class));
+            x.initCause(e);
+            throw x;
         }
         this.faultCodeMustUnderstand = faultCodeMustUnderstand;
         this.requiredRoles = requiredRoles;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSService.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSService.java
index 42cdd66762f..da020df74c1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSService.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/WSService.java
@@ -25,7 +25,11 @@
 
 package com.sun.xml.internal.ws.api;
 
+import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.api.server.ContainerResolver;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
 import com.sun.xml.internal.ws.client.WSServiceDelegate;
 
 import javax.xml.bind.JAXBContext;
@@ -83,6 +87,19 @@ public abstract class WSService extends ServiceDelegate {
      */
     public abstract Dispatch<Object> createDispatch(QName portName, WSEndpointReference wsepr, JAXBContext jaxbContext, Service.Mode mode, WebServiceFeature... features);
 
+    /**
+     * Gets the {@link Container} object.
+     *
+     * <p>
+     * The components inside {@link WSEndpoint} uses this reference
+     * to communicate with the hosting environment.
+     *
+     * @return
+     *      always same object. If no "real" {@link Container} instance
+     *      is given, {@link Container#NONE} will be returned.
+     */
+    public abstract @NotNull Container getContainer();
+
     /**
      * Create a <code>Service</code> instance.
      *
@@ -117,6 +134,69 @@ public abstract class WSService extends ServiceDelegate {
         return create(null,new QName(WSService.class.getName(),"dummy"));
     }
 
+    /**
+     * Typed parameter bag used by {@link WSService#create(URL, QName, InitParams)}
+     *
+     * @since 2.1.3
+     */
+    public static final class InitParams {
+        private Container container;
+        /**
+         * Sets the {@link Container} object used by the created service.
+         * This allows the client to use a specific {@link Container} instance
+         * as opposed to the one obtained by {@link ContainerResolver}.
+         */
+        public void setContainer(Container c) {
+            this.container = c;
+        }
+        public Container getContainer() {
+            return container;
+        }
+    }
+
+    /**
+     * To create a {@link Service}, we need to go through the API that doesn't let us
+     * pass parameters, so as a hack we use thread local.
+     */
+    protected static final ThreadLocal<InitParams> INIT_PARAMS = new ThreadLocal<InitParams>();
+
+    /**
+     * Used as a immutable constant so that we can avoid null check.
+     */
+    protected static final InitParams EMPTY_PARAMS = new InitParams();
+
+    /**
+     * Creates a {@link Service} instance.
+     *
+     * <p>
+     * This method works really like {@link Service#create(URL, QName)}
+     * except it takes one more RI specific parameter.
+     *
+     * @param wsdlDocumentLocation
+     *          {@code URL} for the WSDL document location for the service.
+     *          Can be null, in which case WSDL is not loaded.
+     * @param serviceName
+     *          {@code QName} for the service.
+     * @param properties
+     *          Additional RI specific initialization parameters. Can be null.
+     * @throws WebServiceException
+     *          If any error in creation of the specified service.
+     **/
+    public static Service create( URL wsdlDocumentLocation, QName serviceName, InitParams properties) {
+        if(INIT_PARAMS.get()!=null)
+            throw new IllegalStateException("someone left non-null InitParams");
+        INIT_PARAMS.set(properties);
+        try {
+            Service svc = Service.create(wsdlDocumentLocation, serviceName);
+            if(INIT_PARAMS.get()!=null)
+                throw new IllegalStateException("Service "+svc+" didn't recognize InitParams");
+            return svc;
+        } finally {
+            // even in case of an exception still reset INIT_PARAMS
+            INIT_PARAMS.set(null);
+        }
+    }
+
     /**
      * Obtains the {@link WSService} that's encapsulated inside a {@link Service}.
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
index 9a28f7170aa..d40ec5f2fdc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java
@@ -522,6 +522,10 @@ public enum AddressingVersion {
      * {@link WSBinding} and for the {@link WSDLPort} port.
      *
      * @return WS-A version specific helper
+     *
+     * @deprecated
+     *     TODO  why are we exposing implementation specificc class through api?
+     *     TODO  Remove it if no one elase uses it.
      */
     public abstract WsaTubeHelper getWsaHelper(WSDLPort wsdlPort, SEIModel seiModel, WSBinding binding);
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
index f0de7f5a5ce..1e649af2c3e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java
@@ -110,17 +110,18 @@ final class OutboundReferenceParameterHeader extends AbstractHeaderImpl {
             reader.nextTag();   // move to the first element, which is the header element
 
             attributes = new FinalArrayList<Attribute>();
-
+            boolean refParamAttrWritten = false;
             for (int i = 0; i < reader.getAttributeCount(); i++) {
                 final String localName = reader.getAttributeLocalName(i);
                 final String namespaceURI = reader.getAttributeNamespace(i);
                 final String value = reader.getAttributeValue(i);
-
+                if(namespaceURI.equals(AddressingVersion.W3C.nsUri)&& localName.equals("IS_REFERENCE_PARAMETER"))
+                    refParamAttrWritten = true;
                 attributes.add(new Attribute(namespaceURI,localName,value));
             }
-
-            // we are adding one more attribute "wsa:IsReferenceParameter"
-            attributes.add(new Attribute(AddressingVersion.W3C.nsUri,IS_REFERENCE_PARAMETER,TRUE_VALUE));
+            // we are adding one more attribute "wsa:IsReferenceParameter", if its not alrady there
+            if(!refParamAttrWritten)
+                attributes.add(new Attribute(AddressingVersion.W3C.nsUri,IS_REFERENCE_PARAMETER,TRUE_VALUE));
         } catch (XMLStreamException e) {
             throw new WebServiceException("Unable to read the attributes for {"+nsUri+"}"+localName+" header",e);
         }
@@ -209,14 +210,17 @@ final class OutboundReferenceParameterHeader extends AbstractHeaderImpl {
     public void writeTo(XMLStreamWriter w) throws XMLStreamException {
         infoset.writeToXMLStreamWriter(new XMLStreamWriterFilter(w) {
             private boolean root=true;
-
+            private boolean onRootEl = true;
             public void writeStartElement(String localName) throws XMLStreamException {
                 super.writeStartElement(localName);
                 writeAddedAttribute();
             }
 
             private void writeAddedAttribute() throws XMLStreamException {
-                if(!root)   return;
+                if(!root) {
+                    onRootEl = false;
+                    return;
+                }
                 root=false;
                 writeNamespace("wsa",AddressingVersion.W3C.nsUri);
                 super.writeAttribute("wsa",AddressingVersion.W3C.nsUri,IS_REFERENCE_PARAMETER,TRUE_VALUE);
@@ -245,6 +249,19 @@ final class OutboundReferenceParameterHeader extends AbstractHeaderImpl {
                     super.writeNamespace(prefix,namespaceURI);
             }
 
+            public void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException {
+                //skip if its on root element and attribute is wsa;IsReferenceParameter, as we write it.
+                if(onRootEl && namespaceURI.equals(AddressingVersion.W3C.nsUri)
+                            && localName.equals(IS_REFERENCE_PARAMETER))
+                    return;
+
+                writer.writeAttribute(prefix, namespaceURI, localName, value);
+            }
+            public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException {
+
+
+                writer.writeAttribute(namespaceURI, localName, value);
+            }
             private boolean isPrefixDeclared(String prefix, String namespaceURI ) {
                 return namespaceURI.equals(getNamespaceContext().getNamespaceURI(prefix));
             }
@@ -271,14 +288,18 @@ final class OutboundReferenceParameterHeader extends AbstractHeaderImpl {
                 if(depth++==0) {
                     // add one more attribute
                     super.startPrefixMapping("wsa",AddressingVersion.W3C.nsUri);
-                    AttributesImpl atts2 = new AttributesImpl(atts);
-                    atts2.addAttribute(
-                        AddressingVersion.W3C.nsUri,
-                        IS_REFERENCE_PARAMETER,
-                        "wsa:IsReferenceParameter",
-                        "CDATA",
-                        TRUE_VALUE);
-                    atts = atts2;
+
+                    //Add the attirbute wsa:IsReferenceParameter if not present already
+                    if(atts.getIndex(AddressingVersion.W3C.nsUri,IS_REFERENCE_PARAMETER) == -1) {
+                        AttributesImpl atts2 = new AttributesImpl(atts);
+                        atts2.addAttribute(
+                                AddressingVersion.W3C.nsUri,
+                                IS_REFERENCE_PARAMETER,
+                                "wsa:IsReferenceParameter",
+                                "CDATA",
+                                TRUE_VALUE);
+                        atts = atts2;
+                    }
                 }
 
                 super.startElement(uri, localName, qName, atts);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
index 6014672f895..8286771c325 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java
@@ -36,7 +36,7 @@ import com.sun.xml.internal.stream.buffer.stax.StreamReaderBufferProcessor;
 import com.sun.xml.internal.stream.buffer.stax.StreamWriterBufferCreator;
 import com.sun.xml.internal.ws.addressing.EndpointReferenceUtil;
 import com.sun.xml.internal.ws.addressing.W3CAddressingConstants;
-import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
+import com.sun.xml.internal.ws.addressing.model.InvalidAddressingHeaderException;
 import com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionAddressingConstants;
 import com.sun.xml.internal.ws.api.message.Header;
 import com.sun.xml.internal.ws.api.message.HeaderList;
@@ -625,8 +625,8 @@ public final class WSEndpointReference {
             } else
             if(localName.equals("Address")) {
                 if(address!=null) // double <Address>. That's an error.
-                    throw new InvalidMapException(new QName(version.nsUri,rootLocalName),AddressingVersion.fault_duplicateAddressInEpr);
-                address = xsr.getElementText();
+                    throw new InvalidAddressingHeaderException(new QName(version.nsUri,rootLocalName),AddressingVersion.fault_duplicateAddressInEpr);
+                address = xsr.getElementText().trim();
             } else {
                 XMLStreamReaderUtil.skipElement(xsr);
             }
@@ -641,7 +641,7 @@ public final class WSEndpointReference {
         }
 
         if(address==null)
-            throw new InvalidMapException(new QName(version.nsUri,rootLocalName),version.fault_missingAddressInEpr);
+            throw new InvalidAddressingHeaderException(new QName(version.nsUri,rootLocalName),version.fault_missingAddressInEpr);
     }
 
 
@@ -656,8 +656,8 @@ public final class WSEndpointReference {
     public XMLStreamReader read(final @NotNull String localName) throws XMLStreamException {
         return new StreamReaderBufferProcessor(infoset) {
             protected void processElement(String prefix, String uri, String _localName) {
-                if(_depth==0)
-                        _localName = localName;
+                if (_depth == 0)
+                    _localName = localName;
                 super.processElement(prefix, uri, _localName);
             }
         };
@@ -834,6 +834,8 @@ public final class WSEndpointReference {
         private @Nullable QName portName;
         private @Nullable QName portTypeName; //interfaceName
         private @Nullable Source wsdlSource;
+        private @Nullable String wsdliLocation;
+
         public @Nullable QName getServiceName(){
             return serviceName;
         }
@@ -846,6 +848,9 @@ public final class WSEndpointReference {
         public @Nullable Source getWsdlSource(){
             return wsdlSource;
         }
+        public @Nullable String getWsdliLocation(){
+            return wsdliLocation;
+        }
 
         private Metadata() {
             try {
@@ -875,16 +880,23 @@ public final class WSEndpointReference {
                 do {
                     //If the current element is metadata enclosure, look inside
                     if (xsr.getLocalName().equals(version.eprType.wsdlMetadata.getLocalPart())) {
+                        String wsdlLoc = xsr.getAttributeValue("http://www.w3.org/ns/wsdl-instance","wsdlLocation");
+                        if (wsdlLoc != null)
+                            wsdliLocation = wsdlLoc.trim();
                         XMLStreamBuffer mark;
                         while ((mark = xsr.nextTagAndMark()) != null) {
                             localName = xsr.getLocalName();
                             ns = xsr.getNamespaceURI();
                             if (localName.equals(version.eprType.serviceName)) {
                                 String portStr = xsr.getAttributeValue(null, version.eprType.portName);
+                                if(serviceName != null)
+                                    throw new RuntimeException("More than one "+ version.eprType.serviceName +" element in EPR Metadata");
                                 serviceName = getElementTextAsQName(xsr);
-                                if (serviceName != null)
+                                if (serviceName != null && portStr != null)
                                     portName = new QName(serviceName.getNamespaceURI(), portStr);
                             } else if (localName.equals(version.eprType.portTypeName)) {
+                                if(portTypeName != null)
+                                    throw new RuntimeException("More than one "+ version.eprType.portTypeName +" element in EPR Metadata");
                                 portTypeName = getElementTextAsQName(xsr);
                             } else if (ns.equals(WSDLConstants.NS_WSDL)
                                     && localName.equals(WSDLConstants.QNAME_DEFINITIONS.getLocalPart())) {
@@ -922,7 +934,7 @@ public final class WSEndpointReference {
                     } else if (localName.equals(version.eprType.serviceName)) {
                         String portStr = xsr.getAttributeValue(null, version.eprType.portName);
                         serviceName = getElementTextAsQName(xsr);
-                        if (serviceName != null)
+                        if (serviceName != null && portStr != null)
                             portName = new QName(serviceName.getNamespaceURI(), portStr);
                     } else if (localName.equals(version.eprType.portTypeName)) {
                         portTypeName = getElementTextAsQName(xsr);
@@ -936,7 +948,7 @@ public final class WSEndpointReference {
         }
 
         private QName getElementTextAsQName(StreamReaderBufferProcessor xsr) throws XMLStreamException {
-            String text = xsr.getElementText();
+            String text = xsr.getElementText().trim();
             String prefix = XmlUtil.getPrefix(text);
             String name = XmlUtil.getLocalPart(text);
             if (name != null) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java
new file mode 100644
index 00000000000..bb7c1b33de5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.handler;
+
+import javax.xml.ws.handler.Handler;
+import javax.xml.namespace.QName;
+import java.util.Set;
+
+
+/**
+ * The <code>MessageHandler</code> class extends <code>Handler</code>
+ * to provide typesafety for the message context parameter and add a method
+ * to obtain access to the headers that may be processed by the handler.
+ * Its provides similar functionality as a SOAPHandler but provides RI's
+ * Message in the MessageContext.
+ *
+ * @author Rama Pulavarthi
+ * @since JAX-WS 2.1.3
+ */
+public interface MessageHandler<C extends MessageHandlerContext> extends Handler<C> {
+
+
+   /** Gets the header blocks that can be processed by this Handler
+   *  instance.
+   *
+   *  @return Set of <code>QNames</code> of header blocks processed by this
+   *           handler instance. <code>QName</code> is the qualified
+   *           name of the outermost element of the Header block.
+  **/
+  Set<QName> getHeaders();
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java
new file mode 100644
index 00000000000..d2989ca7e76
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.handler;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+
+import javax.xml.ws.handler.MessageContext;
+import java.util.Set;
+
+/**
+ * The <code>MessageHandlerContext</code> interface extends
+ * <code>MessageContext</code> to provide easy access to the contained message.
+ *
+ * This context provides access to RI's <code>Message</code> model for efficient access
+ * to various things like accessing headers etc. It also provides access to
+ * binding information as <code>WSBinding</code>.
+ *
+ * @author Rama Pulavarthi
+ * @since JAX-WS 2.1.3
+ */
+public interface MessageHandlerContext extends MessageContext {
+    /**
+     * Gets the message from this message context
+     *
+     * @return The contained message; returns <code>null</code> if no
+     *         message is present in this message context
+     */
+    public Message getMessage();
+
+
+    /**
+     * Sets the message in this message context
+     */
+    public void setMessage(Message message);
+
+    /**
+     * @see javax.xml.ws.handler.soap.SOAPMessageContext#getRoles()
+     */
+     public Set<String> getRoles();
+
+
+    /**
+     * Provides access to <code>WSBinding</code> which can be used in various ways.
+     * for example: <code>WSBinding#getSOAPVersion</code> to get SOAP version of the binding.
+     *              <code>WSBinding#isFeatureEnabled(AddressingFeature)</code> to check if addressing is enabled
+     */
+    public WSBinding getWSBinding();
+
+    /**
+     * Provides access to <code>SEIModel</code>.
+     */
+    public @Nullable SEIModel getSEIModel();
+
+    /**
+     * Gets the {@link WSDLPort} that represents the port.
+     * @return
+     *      returns the WSDLModel of the port that the client/endpoint binds to.
+     *      null when the Service is not configured with WSDL information.
+     */
+    public @Nullable WSDLPort getPort();
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java
new file mode 100644
index 00000000000..fa3548b37cc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.message;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.bind.api.Bridge;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Source;
+
+/**
+ * A <code>FilterMessageImpl</code> contains some other Message, which it uses
+ * as its  basic source of message data, possibly transforming the data along
+ * the way or providing  additional functionality.
+ *
+ * <p>
+ * The class <code>FilterMessageImpl</code> itself simply overrides
+ * all the methods of <code>Message</code> and invokes them on
+ * contained Message delegate. Subclasses of <code>FilterMessageImpl</code>
+ * may further override some of  these methods and may also provide
+ * additional methods and fields.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class FilterMessageImpl extends Message {
+    private final Message delegate;
+
+    protected FilterMessageImpl(Message delegate) {
+        this.delegate = delegate;
+    }
+
+    public boolean hasHeaders() {
+        return delegate.hasHeaders();
+    }
+
+    public @NotNull HeaderList getHeaders() {
+        return delegate.getHeaders();
+    }
+
+    public @NotNull AttachmentSet getAttachments() {
+        return delegate.getAttachments();
+    }
+
+    protected boolean hasAttachments() {
+        return delegate.hasAttachments();
+    }
+
+    public boolean isOneWay(@NotNull WSDLPort port) {
+        return delegate.isOneWay(port);
+    }
+
+    public @Nullable String getPayloadLocalPart() {
+        return delegate.getPayloadLocalPart();
+    }
+
+    public String getPayloadNamespaceURI() {
+        return delegate.getPayloadNamespaceURI();
+    }
+
+    public boolean hasPayload() {
+        return delegate.hasPayload();
+    }
+
+    public boolean isFault() {
+        return delegate.isFault();
+    }
+
+    public @Nullable QName getFirstDetailEntryName() {
+        return delegate.getFirstDetailEntryName();
+    }
+
+    public Source readEnvelopeAsSource() {
+        return delegate.readEnvelopeAsSource();
+    }
+
+    public Source readPayloadAsSource() {
+        return delegate.readPayloadAsSource();
+    }
+
+    public SOAPMessage readAsSOAPMessage() throws SOAPException {
+        return delegate.readAsSOAPMessage();
+    }
+
+    public SOAPMessage readAsSOAPMessage(Packet packet, boolean inbound) throws SOAPException {
+        return delegate.readAsSOAPMessage(packet, inbound);
+    }
+
+    public <T> T readPayloadAsJAXB(Unmarshaller unmarshaller) throws JAXBException {
+        return (T)delegate.readPayloadAsJAXB(unmarshaller);
+    }
+
+    public <T> T readPayloadAsJAXB(Bridge<T> bridge) throws JAXBException {
+        return delegate.readPayloadAsJAXB(bridge);
+    }
+
+    public XMLStreamReader readPayload() throws XMLStreamException {
+        return delegate.readPayload();
+    }
+
+    public void consume() {
+        delegate.consume();
+    }
+
+    public void writePayloadTo(XMLStreamWriter sw) throws XMLStreamException {
+        delegate.writePayloadTo(sw);
+    }
+
+    public void writeTo(XMLStreamWriter sw) throws XMLStreamException {
+        delegate.writeTo(sw);
+    }
+
+    public void writeTo(ContentHandler contentHandler, ErrorHandler errorHandler) throws SAXException {
+        delegate.writeTo(contentHandler, errorHandler);
+    }
+
+    public Message copy() {
+        return delegate.copy();
+    }
+
+    public @NotNull String getID(@NotNull WSBinding binding) {
+        return delegate.getID(binding);
+    }
+
+    public @NotNull String getID(AddressingVersion av, SOAPVersion sv) {
+        return delegate.getID(av, sv);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java
index 8a313d63856..91317414a2b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java
@@ -42,6 +42,7 @@ import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
 import com.sun.xml.internal.ws.client.dispatch.DispatchImpl;
 import com.sun.xml.internal.ws.message.AttachmentSetImpl;
 import com.sun.xml.internal.ws.message.jaxb.JAXBMessage;
+import com.sun.xml.internal.ws.fault.SOAPFaultBuilder;
 import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
 import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
 import org.xml.sax.ContentHandler;
@@ -54,11 +55,13 @@ import javax.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.Detail;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Source;
 import javax.xml.ws.Dispatch;
+import javax.xml.ws.WebServiceException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -427,6 +430,27 @@ public abstract class Message {
         return nsUri.equals(SOAPVersion.SOAP_11.nsUri) || nsUri.equals(SOAPVersion.SOAP_12.nsUri);
     }
 
+    /**
+     * It gives S:Envelope/S:Body/S:Fault/detail 's first child's name. Should
+     * be called for messages that have SOAP Fault.
+     *
+     * <p> This implementation is expensive so concrete implementations are
+     * expected to override this one.
+     *
+     * @return first detail entry's name, if there is one
+     *         else null
+     */
+    public @Nullable QName getFirstDetailEntryName() {
+        assert isFault();
+        Message msg = copy();
+        try {
+            SOAPFaultBuilder fault = SOAPFaultBuilder.create(msg);
+            return fault.getFirstDetailEntryName();
+        } catch (JAXBException e) {
+            throw new WebServiceException(e);
+        }
+    }
+
     /**
      * Consumes this message including the envelope.
      * returns it as a {@link Source} object.
@@ -484,6 +508,8 @@ public abstract class Message {
      *
      * This consumes the message.
      *
+     * @return null
+     *      if there's no payload.
      * @throws JAXBException
      *      If JAXB reports an error during the processing.
      */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java
index 93367d5a3c3..cb99b01a5bd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java
@@ -31,10 +31,10 @@ import com.sun.xml.internal.bind.api.JAXBRIContext;
 import com.sun.xml.internal.bind.v2.runtime.MarshallerImpl;
 import com.sun.xml.internal.stream.buffer.XMLStreamBuffer;
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
 import com.sun.xml.internal.ws.api.pipe.Tube;
 import com.sun.xml.internal.ws.api.pipe.Codecs;
-import com.sun.xml.internal.ws.encoding.StreamSOAPCodec;
 import com.sun.xml.internal.ws.fault.SOAPFaultBuilder;
 import com.sun.xml.internal.ws.message.AttachmentSetImpl;
 import com.sun.xml.internal.ws.message.DOMMessage;
@@ -48,6 +48,9 @@ import com.sun.xml.internal.ws.message.source.ProtocolSourceMessage;
 import com.sun.xml.internal.ws.streaming.XMLStreamReaderException;
 import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
 import com.sun.xml.internal.ws.util.DOMUtil;
+import com.sun.xml.internal.ws.addressing.WsaTubeHelper;
+import com.sun.xml.internal.ws.addressing.model.MissingAddressingHeaderException;
+import com.sun.xml.internal.ws.resources.AddressingMessages;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -302,6 +305,35 @@ public abstract class Messages {
         return new DOMMessage(ver,fault);
     }
 
+    /**
+     * @deprecated
+     *      Use {@link #createAddressingFaultMessage(WSBinding, Packet, QName)}
+     */
+    public static Message createAddressingFaultMessage(WSBinding binding, QName missingHeader) {
+        return createAddressingFaultMessage(binding,null,missingHeader);
+    }
+
+    /**
+     * Creates a fault {@link Message} that captures the code/subcode/subsubcode
+     * defined by WS-Addressing if one of the expected WS-Addressing headers is
+     * missing in the message
+     *
+     * @param binding WSBinding
+     * @param p
+     *      {@link Packet} that was missing a WS-Addressing header.
+     * @param missingHeader The missing WS-Addressing Header
+     * @return
+     *      A message representing SOAPFault that contains the WS-Addressing code/subcode/subsubcode.
+     */
+    public static Message createAddressingFaultMessage(WSBinding binding, Packet p, QName missingHeader) {
+        AddressingVersion av = binding.getAddressingVersion();
+        if(av == null) {
+            // Addressing is not enabled.
+            throw new WebServiceException(AddressingMessages.ADDRESSING_SHOULD_BE_ENABLED());
+        }
+        WsaTubeHelper helper = av.getWsaHelper(null,null,binding);
+        return create(helper.newMapRequiredFault(new MissingAddressingHeaderException(missingHeader,p)));
+    }
     /**
      * Creates a fault {@link Message} that captures the code/subcode/subsubcode
      * defined by WS-Addressing if wsa:Action is not supported.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java
index 9a9ddfa9980..57b0b018701 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java
@@ -28,7 +28,7 @@ import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.bind.marshaller.SAX2DOMEx;
 import com.sun.xml.internal.ws.addressing.WsaTubeHelper;
-import com.sun.xml.internal.ws.addressing.model.InvalidMapException;
+import com.sun.xml.internal.ws.addressing.model.InvalidAddressingHeaderException;
 import com.sun.xml.internal.ws.api.DistributedPropertySet;
 import com.sun.xml.internal.ws.api.EndpointAddress;
 import com.sun.xml.internal.ws.api.PropertySet;
@@ -36,9 +36,9 @@ import com.sun.xml.internal.ws.api.SOAPVersion;
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
 import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
+import com.sun.xml.internal.ws.api.model.SEIModel;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
-import com.sun.xml.internal.ws.api.model.SEIModel;
 import com.sun.xml.internal.ws.api.pipe.Tube;
 import com.sun.xml.internal.ws.api.server.TransportBackChannel;
 import com.sun.xml.internal.ws.api.server.WSEndpoint;
@@ -52,7 +52,6 @@ import com.sun.xml.internal.ws.message.RelatesToHeader;
 import com.sun.xml.internal.ws.message.StringHeader;
 import com.sun.xml.internal.ws.util.DOMUtil;
 import com.sun.xml.internal.ws.util.xml.XmlUtil;
-import com.sun.xml.internal.ws.model.JavaMethodImpl;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -174,9 +173,29 @@ public final class Packet extends DistributedPropertySet {
         this.handlerScopePropertyNames = that.handlerScopePropertyNames;
         this.contentNegotiation = that.contentNegotiation;
         this.wasTransportSecure = that.wasTransportSecure;
+        this.endpointAddress = that.endpointAddress;
         // copy other properties that need to be copied. is there any?
     }
 
+    /**
+     * Creates a copy of this {@link Packet}.
+     *
+     * @param copyMessage determines whether the {@link Message} from the original {@link Packet} should be copied as
+     *        well, or not. If the value is {@code false}, the {@link Message} in the copy of the {@link Packet} is {@code null}.
+     * @return copy of the original packet
+     */
+    public Packet copy(boolean copyMessage) {
+        // the copy constructor is originally designed for creating a response packet,
+        // but so far the implementation is usable for this purpose as well, so calling the copy constructor
+        // to avoid code dupliation.
+        Packet copy = new Packet(this);
+        if (copyMessage) {
+            copy.message = this.message.copy();
+        }
+
+        return copy;
+    }
+
     private Message message;
 
     /**
@@ -391,7 +410,7 @@ public final class Packet extends DistributedPropertySet {
      * <p>
      * This field can be null. While a message is being processed,
      * this field can be set explicitly to null, to prevent
-     * future pipes from closing a transport.
+     * future pipes from closing a transport (see {@link #keepTransportBackChannelOpen()})
      *
      * <p>
      * This property is set from the parameter
@@ -399,12 +418,25 @@ public final class Packet extends DistributedPropertySet {
      */
     public @Nullable TransportBackChannel transportBackChannel;
 
+    /**
+     * Keeps the transport back channel open (by seeting {@link #transportBackChannel} to null.)
+     *
+     * @return
+     *      The previous value of {@link #transportBackChannel}.
+     */
+    public TransportBackChannel keepTransportBackChannelOpen() {
+        TransportBackChannel r = transportBackChannel;
+        transportBackChannel = null;
+        return r;
+    }
+
     /**
      * The governing {@link WSEndpoint} in which this message is floating.
      *
      * <p>
      * This property is set if and only if this is on the server side.
      */
+    @Property(JAXWSProperties.WSENDPOINT)
     public WSEndpoint endpoint;
 
     /**
@@ -641,12 +673,12 @@ public final class Packet extends DistributedPropertySet {
             return r;
         }
         // if one-way, then dont populate any WS-A headers
-        if (message == null || (wsdlPort != null && message.isOneWay(wsdlPort)))
+        if (responseMessage == null || (wsdlPort != null && message.isOneWay(wsdlPort)))
             return r;
 
         // otherwise populate WS-Addressing headers
-        return populateAddressingHeaders(binding, r, wsdlPort,seiModel);
-
+        populateAddressingHeaders(binding, r, wsdlPort,seiModel);
+        return r;
     }
 
     /**
@@ -677,20 +709,32 @@ public final class Packet extends DistributedPropertySet {
             return responsePacket;
         }
 
-        return populateAddressingHeaders(responsePacket,
-                addressingVersion,
-                soapVersion,
-                action);
+        populateAddressingHeaders(responsePacket, addressingVersion, soapVersion, action);
+        return responsePacket;
     }
 
-    private Packet populateAddressingHeaders(Packet responsePacket, AddressingVersion av, SOAPVersion sv, String action) {
+    /**
+     * Overwrites the {@link Message} of the response packet ({@code this}) by the given {@link Message}.
+     * Unlike {@link #setMessage(Message)}, fill in the addressing headers correctly, and this process
+     * requires the access to the request packet.
+     *
+     * <p>
+     * This method is useful when the caller needs to swap a response message completely to a new one.
+     *
+     * @see #createServerResponse(Message, AddressingVersion, SOAPVersion, String)
+     */
+    public void setResponseMessage(@NotNull Packet request, @Nullable Message responseMessage, @NotNull AddressingVersion addressingVersion, @NotNull SOAPVersion soapVersion, @NotNull String action) {
+       Packet temp = request.createServerResponse(responseMessage, addressingVersion, soapVersion, action);
+       setMessage(temp.getMessage());
+    }
+
+    private void populateAddressingHeaders(Packet responsePacket, AddressingVersion av, SOAPVersion sv, String action) {
         // populate WS-A headers only if WS-A is enabled
-        if (av == null)
-            return responsePacket;
+        if (av == null) return;
 
         // if one-way, then dont populate any WS-A headers
         if (responsePacket.getMessage() == null)
-            return responsePacket;
+            return;
 
         HeaderList hl = responsePacket.getMessage().getHeaders();
 
@@ -700,19 +744,23 @@ public final class Packet extends DistributedPropertySet {
         replyTo = message.getHeaders().getReplyTo(av, sv);
         if (replyTo != null)
             hl.add(new StringHeader(av.toTag, replyTo.getAddress()));
-        } catch (InvalidMapException e) {
+        } catch (InvalidAddressingHeaderException e) {
             replyTo = null;
         }
 
-        // wsa:Action
-        hl.add(new StringHeader(av.actionTag, action));
+        // wsa:Action, add if the message doesn't already contain it,
+        // generally true for SEI case where there is SEIModel or WSDLModel
+        //           false for Provider with no wsdl, Expects User to set the coresponding header on the Message.
+        if(responsePacket.getMessage().getHeaders().getAction(av,sv) == null) {
+            //wsa:Action header is not set in the message, so use the wsa:Action  passed as the parameter.
+            hl.add(new StringHeader(av.actionTag, action));
+        }
 
         // wsa:MessageID
         hl.add(new StringHeader(av.messageIDTag, responsePacket.getMessage().getID(av, sv)));
 
         // wsa:RelatesTo
-        // TODO: this property is defined in WsaServerTube.REQUEST_MESSAGE_ID
-        String mid = (String)responsePacket.invocationProperties.get("com.sun.xml.internal.ws.addressing.request.messageID");
+        String mid = getMessage().getHeaders().getMessageID(av,sv);
         if (mid != null)
             hl.add(new RelatesToHeader(av.relatesToTag, mid));
 
@@ -732,22 +780,19 @@ public final class Packet extends DistributedPropertySet {
         if (refpEPR != null) {
             refpEPR.addReferenceParameters(hl);
         }
-
-        return responsePacket;
     }
 
-    private Packet populateAddressingHeaders(WSBinding binding, Packet responsePacket, WSDLPort wsdlPort, SEIModel seiModel) {
+    private void populateAddressingHeaders(WSBinding binding, Packet responsePacket, WSDLPort wsdlPort, SEIModel seiModel) {
         AddressingVersion addressingVersion = binding.getAddressingVersion();
 
-        if (addressingVersion == null)
-            return responsePacket;
+        if (addressingVersion == null)  return;
 
         WsaTubeHelper wsaHelper = addressingVersion.getWsaHelper(wsdlPort,seiModel, binding);
         String action = responsePacket.message.isFault() ?
                 wsaHelper.getFaultAction(this, responsePacket) :
                 wsaHelper.getOutputAction(this);
 
-        return populateAddressingHeaders(responsePacket, addressingVersion, binding.getSOAPVersion(), action);
+        populateAddressingHeaders(responsePacket, addressingVersion, binding.getSOAPVersion(), action);
     }
 
     // completes TypedMap
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java
index 91a384e0481..4ec4c3ddd36 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java
@@ -29,6 +29,7 @@ import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.api.model.soap.SOAPBinding;
 
+import javax.xml.namespace.QName;
 import java.lang.reflect.Method;
 
 /**
@@ -66,6 +67,7 @@ public interface JavaMethod {
      */
     @NotNull Method getMethod();
 
+
     /**
      * This should be used if you want to access annotations on WebMethod
      * Returns the SEI method if there is one.
@@ -119,4 +121,20 @@ public interface JavaMethod {
      */
     @Nullable String getResponseMessageName();
 
+    /**
+     * Gives soap:Body's first child's name for request message.
+     *
+     * @return
+     *      null if this operation doesn't have any request parameter bound to the body.
+     */
+    @Nullable QName getRequestPayloadName();
+
+    /**
+     * Gives soap:Body's first child's name for response message.
+     *
+     * @return
+     *      null if this operation doesn't have any response parameter bound to the body.
+     */
+    @Nullable QName getResponsePayloadName();
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java
new file mode 100644
index 00000000000..1f8ec3b2a8a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.model.wsdl;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Abstracts wsdl:binding/wsdl:operation/wsdl:fault
+ *
+ * @author Vivek Pandey
+ */
+public interface WSDLBoundFault extends WSDLObject, WSDLExtensible {
+
+    /**
+     * Gives the wsdl:binding/wsdl:operation/wsdl:fault@name value
+     */
+    public
+    @NotNull
+    String getName();
+
+    /**
+     * Gives the qualified name associated with the fault. the namespace URI of the bounded fault
+     * will be the one derived from wsdl:portType namespace.
+     *
+     * Maybe null if this method is called before the model is completely build (frozen), if a binding fault has no
+     * corresponding fault in abstractwsdl:portType/wsdl:operation then the namespace URI of the fault will be that of
+     * the WSDBoundPortType.
+     */
+    public @Nullable QName getQName();
+
+    /**
+     * Gives the associated abstract fault from
+     * wsdl:portType/wsdl:operation/wsdl:fault. It is only available after
+     * the WSDL parsing is complete and the entire model is frozen.
+     * <p/>
+     * Maybe null if a binding fault has no corresponding fault in abstract
+     * wsdl:portType/wsdl:operation
+     */
+    public
+    @Nullable
+    WSDLFault getFault();
+
+    /**
+     * Gives the owner {@link WSDLBoundOperation}
+     */
+    @NotNull WSDLBoundOperation getBoundOperation();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
index af6e9582fb4..e08c48d4697 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java
@@ -28,8 +28,9 @@ package com.sun.xml.internal.ws.api.model.wsdl;
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 
+import javax.jws.WebParam.Mode;
 import javax.xml.namespace.QName;
-import java.util.List;
+import java.util.Map;
 
 /**
  * Abstracts wsdl:binding/wsdl:operation. It can be used to determine the parts and their binding.
@@ -56,12 +57,49 @@ public interface WSDLBoundOperation extends WSDLObject, WSDLExtensible {
      */
     @NotNull WSDLOperation getOperation();
 
+    /**
+     * Gives the owner {@link WSDLBoundPortType}
+     */
+    @NotNull WSDLBoundPortType getBoundPortType();
+
     /**
      * Gets the soapbinding:binding/operation/wsaw:Anonymous. A default value of OPTIONAL is returned.
      *
      * @return Anonymous value of the operation
      */
-    public ANONYMOUS getAnonymous();
+    ANONYMOUS getAnonymous();
 
     enum ANONYMOUS { optional, required, prohibited }
+
+    /**
+     * Gets {@link WSDLPart} for the given wsdl:input or wsdl:output part
+     *
+     * @return null if no part is found
+     */
+    @Nullable WSDLPart getPart(@NotNull String partName, @NotNull Mode mode);
+
+    /**
+     * Gets all inbound {@link WSDLPart} by its {@link WSDLPart#getName() name}.
+     */
+    @NotNull Map<String,WSDLPart> getInParts();
+
+    /**
+     * Gets all outbound {@link WSDLPart} by its {@link WSDLPart#getName() name}.
+     */
+    @NotNull Map<String,WSDLPart> getOutParts();
+
+    /**
+     * Gets all the {@link WSDLFault} bound to this operation.
+     */
+    @NotNull Iterable<? extends WSDLBoundFault> getFaults();
+
+    /**
+     * Gets the payload QName of the request message.
+     *
+     * <p>
+     * It's possible for an operation to define no body part, in which case
+     * this method returns null.
+     */
+    @Nullable QName getReqPayloadName();
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
index 8398dc8b163..8306f7a7be6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java
@@ -30,6 +30,7 @@ import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.api.BindingID;
 import com.sun.xml.internal.ws.api.message.Message;
 
+import javax.jws.soap.SOAPBinding;
 import javax.xml.namespace.QName;
 
 /**
@@ -72,6 +73,14 @@ public interface WSDLBoundPortType extends WSDLFeaturedObject, WSDLExtensible {
      */
     Iterable<? extends WSDLBoundOperation> getBindingOperations();
 
+    /**
+     * Is this a document style or RPC style?
+     *
+     * Since we only support literal and not encoding, this means
+     * either doc/lit or rpc/lit.
+     */
+    @NotNull SOAPBinding.Style getStyle();
+
     /**
      * Returns the binding ID.
      * This would typically determined by the binding extension elements in wsdl:binding.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
index 423b8476741..8e739d30906 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java
@@ -53,7 +53,7 @@ public interface WSDLExtensible extends WSDLObject {
      *      The type of the extension to obtain. Must not be null.
      *
      * @return
-     *      Can be an empty collection but never null.
+     *      Can be an empty fromjava.collection but never null.
      */
     <T extends WSDLExtension> Iterable<T> getExtensions(Class<T> type);
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
index e435aa0ef66..9f8901fa64d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java
@@ -25,6 +25,10 @@
 
 package com.sun.xml.internal.ws.api.model.wsdl;
 
+import com.sun.istack.internal.NotNull;
+
+import javax.xml.namespace.QName;
+
 /**
  * Abstracts wsdl:portType/wsdl:operation/wsdl:fault
  *
@@ -45,4 +49,19 @@ public interface WSDLFault extends WSDLObject, WSDLExtensible {
      * @return Always returns null when called from inside WSDL extensions.
      */
     WSDLMessage getMessage();
+
+    /**
+     * Gives the owning {@link WSDLOperation}
+     */
+    @NotNull
+    WSDLOperation getOperation();
+
+    /**
+     * Gives qualified name of the wsdl:fault 'name' attribute value.
+     * <p/>
+     *
+     * The namespace uri is determined from the enclosing wsdl:operation.
+     */
+    @NotNull
+    QName getQName();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
index b2e0af81561..8b8f02590b6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java
@@ -25,6 +25,11 @@
 
 package com.sun.xml.internal.ws.api.model.wsdl;
 
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.namespace.QName;
+
 /**
  * Abstraction of wsdl:portType/wsdl:operation/wsdl:input
  *
@@ -58,4 +63,27 @@ public interface WSDLInput extends WSDLObject, WSDLExtensible {
      * @return Action
      */
     String getAction();
+
+    /**
+     * Gives the owning {@link WSDLOperation}
+     */
+    @NotNull
+    WSDLOperation getOperation();
+
+    /**
+     * Gives qualified name of the wsdl:input 'name' attribute value. If there is no name, then it computes the name from:
+     *
+     * If the wsdl:operation is oneway:
+     *
+     * wsdl:operation@name value, which is local name of {@link WSDLOperation#getName()}
+     * <p/>
+     * otherwise
+     *
+     * wsdl:operation@name+"Request", which is local name of {@link WSDLOperation#getName()} + "Request"
+     * <p/>
+     *
+     * The namespace uri is determined from the enclosing wsdl:operation.
+     */
+    @NotNull
+    QName getQName();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
index 2cba1354495..b2588eca9f3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java
@@ -37,4 +37,9 @@ public interface WSDLMessage extends WSDLObject, WSDLExtensible {
      * Gives wsdl:message@name value.
      */
     QName getName();
+
+    /**
+     * Gets all the parts.
+     */
+    Iterable<? extends WSDLPart> parts();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
index 7c948a11ea5..8b3cf0dd434 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java
@@ -27,6 +27,7 @@ package com.sun.xml.internal.ws.api.model.wsdl;
 
 
 import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.server.Container;
 import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
 import com.sun.xml.internal.ws.api.wsdl.parser.XMLEntityResolver;
 import com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser;
@@ -118,7 +119,24 @@ public interface WSDLModel extends WSDLExtensible {
          * @throws org.xml.sax.SAXException
          */
         public static @NotNull WSDLModel parse(XMLEntityResolver.Parser wsdlEntityParser, XMLEntityResolver resolver, boolean isClientSide, WSDLParserExtension... extensions) throws IOException, XMLStreamException, SAXException {
-            return RuntimeWSDLParser.parse(wsdlEntityParser, resolver, isClientSide, extensions);
+            return RuntimeWSDLParser.parse(wsdlEntityParser, resolver, isClientSide, Container.NONE, extensions);
+        }
+
+        /**
+         * Parses WSDL from the given wsdlLoc and gives a {@link WSDLModel} built from it.
+         *
+         * @param wsdlEntityParser  Works like an entityResolver to resolve WSDLs
+         * @param resolver  {@link XMLEntityResolver}, works at XML infoset level
+         * @param isClientSide  true - its invoked on the client, false means its invoked on the server
+         * @param container - container in which the parser is run
+         * @param extensions var args of {@link com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension}s
+         * @return A {@link WSDLModel} built from the given wsdlLocation}
+         * @throws java.io.IOException
+         * @throws javax.xml.stream.XMLStreamException
+         * @throws org.xml.sax.SAXException
+         */
+        public static @NotNull WSDLModel parse(XMLEntityResolver.Parser wsdlEntityParser, XMLEntityResolver resolver, boolean isClientSide, @NotNull Container container, WSDLParserExtension... extensions) throws IOException, XMLStreamException, SAXException {
+            return RuntimeWSDLParser.parse(wsdlEntityParser, resolver, isClientSide, container, extensions);
         }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
index 76a8ba3c9c9..f5aec05a605 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java
@@ -64,7 +64,7 @@ public interface WSDLOperation extends WSDLObject, WSDLExtensible {
     boolean isOneWay();
 
     /**
-     * Gets the {link WSDLFault} corresponding to wsdl:fault of this operation.
+     * Gets the {@link WSDLFault} corresponding to wsdl:fault of this operation.
      */
     Iterable<? extends WSDLFault> getFaults();
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
index a39cb2c91ab..ed892b1debd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java
@@ -25,6 +25,10 @@
 
 package com.sun.xml.internal.ws.api.model.wsdl;
 
+import com.sun.istack.internal.NotNull;
+
+import javax.xml.namespace.QName;
+
 /**
  * Abstraction of wsdl:portType/wsdl:operation/wsdl:output
  *
@@ -58,4 +62,21 @@ public interface WSDLOutput extends WSDLObject, WSDLExtensible {
      * @return Action
      */
     String getAction();
+
+    /**
+     * Gives the owning {@link WSDLOperation}
+     */
+    @NotNull
+    WSDLOperation getOperation();
+
+    /**
+     * Gives qualified name of the wsdl:output 'name' attribute value. If there is no name, then it computes the name from:
+     *
+     * wsdl:operation@name+"Response", which is local name of {@link WSDLOperation#getName()} + "Response"
+     * <p/>
+     *
+     * The namespace uri is determined from the enclosing wsdl:operation.
+     */
+    @NotNull
+    QName getQName();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
index 3407bc280c3..56221316077 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java
@@ -52,7 +52,7 @@ public interface WSDLPortType extends WSDLObject, WSDLExtensible {
 
 
     /**
-     * Gets {@link Iterable}<{$link WSDLOperation}>
+     * Gets {@link Iterable}<{@link WSDLOperation}>
      */
     public Iterable<? extends WSDLOperation> getOperations();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
index 4f6ed00c115..634c0ee63b2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java
@@ -78,6 +78,13 @@ public final class ClientPipeAssemblerContext extends ClientTubeAssemblerContext
         return PipeAdapter.adapt(super.createClientMUTube(PipeAdapter.adapt(next)));
     }
 
+    /**
+     * creates a {@link Pipe} that validates messages against schema
+     */
+    public Pipe createValidationPipe(Pipe next) {
+        return PipeAdapter.adapt(super.createValidationTube(PipeAdapter.adapt(next)));
+    }
+
     /**
      * Creates a {@link Pipe} that invokes protocol and logical handlers.
      */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
index da7cd48191a..831eb582848 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java
@@ -28,16 +28,24 @@ package com.sun.xml.internal.ws.api.pipe;
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.addressing.WsaClientTube;
+import com.sun.xml.internal.ws.addressing.W3CWsaServerTube;
+import com.sun.xml.internal.ws.addressing.W3CWsaClientTube;
+import com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionWsaServerTube;
+import com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionWsaClientTube;
 import com.sun.xml.internal.ws.api.EndpointAddress;
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.WSService;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
 import com.sun.xml.internal.ws.api.client.ClientPipelineHook;
+import com.sun.xml.internal.ws.api.model.SEIModel;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
 import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
 import com.sun.xml.internal.ws.api.server.Container;
 import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.client.ClientSchemaValidationTube;
+import com.sun.xml.internal.ws.developer.SchemaValidationFeature;
 import com.sun.xml.internal.ws.handler.ClientLogicalHandlerTube;
+import com.sun.xml.internal.ws.handler.ClientMessageHandlerTube;
 import com.sun.xml.internal.ws.handler.ClientSOAPHandlerTube;
 import com.sun.xml.internal.ws.handler.HandlerTube;
 import com.sun.xml.internal.ws.protocol.soap.ClientMUTube;
@@ -57,33 +65,42 @@ import java.io.PrintStream;
 public class ClientTubeAssemblerContext {
 
     private final @NotNull EndpointAddress address;
-    private final @NotNull WSDLPort wsdlModel;
+    private final @Nullable WSDLPort wsdlModel;
+    private final @Nullable SEIModel seiModel;
     private final @NotNull WSService rootOwner;
     private final @NotNull WSBinding binding;
     private final @NotNull Container container;
     private @NotNull Codec codec;
 
-    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @NotNull WSDLPort wsdlModel, @NotNull WSService rootOwner, @NotNull WSBinding binding) {
+    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @Nullable WSDLPort wsdlModel, @NotNull WSService rootOwner, @NotNull WSBinding binding) {
         this(address, wsdlModel, rootOwner, binding, Container.NONE);
     }
 
-    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @NotNull WSDLPort wsdlModel,
+    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @Nullable WSDLPort wsdlModel,
+                                      @NotNull WSService rootOwner, @NotNull WSBinding binding,
+                                      @NotNull Container container) {
+        // WSBinding is actually BindingImpl
+        this(address, wsdlModel, rootOwner, binding, container, ((BindingImpl)binding).createCodec() );
+    }
+
+    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @Nullable WSDLPort wsdlModel,
                                       @NotNull WSService rootOwner, @NotNull WSBinding binding,
                                       @NotNull Container container, Codec codec) {
+        this(address, wsdlModel, rootOwner, binding, container, codec, null);
+    }
+
+    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @Nullable WSDLPort wsdlModel,
+                                      @NotNull WSService rootOwner, @NotNull WSBinding binding,
+                                      @NotNull Container container, Codec codec, SEIModel seiModel) {
         this.address = address;
         this.wsdlModel = wsdlModel;
         this.rootOwner = rootOwner;
         this.binding = binding;
         this.container = container;
         this.codec = codec;
+        this.seiModel = seiModel;
     }
 
-    public ClientTubeAssemblerContext(@NotNull EndpointAddress address, @NotNull WSDLPort wsdlModel,
-                                      @NotNull WSService rootOwner, @NotNull WSBinding binding,
-                                      @NotNull Container container) {
-        // WSBinding is actually BindingImpl
-        this(address, wsdlModel, rootOwner, binding, container, ((BindingImpl)binding).createCodec() );
-    }
 
     /**
      * The endpoint address. Always non-null. This parameter is taken separately
@@ -119,6 +136,16 @@ public class ClientTubeAssemblerContext {
         return binding;
     }
 
+    /**
+     * The created pipeline will use seiModel to get java concepts for the endpoint
+     *
+     * @return Null if the service doesn't have SEI model e.g. Dispatch,
+     *         and otherwise non-null.
+     */
+    public @Nullable SEIModel getSEIModel() {
+        return seiModel;
+    }
+
     /**
      * Returns the Container in which the client is running
      *
@@ -153,7 +180,11 @@ public class ClientTubeAssemblerContext {
      */
     public Tube createWsaTube(Tube next) {
         if (binding instanceof SOAPBinding && AddressingVersion.isEnabled(binding) && wsdlModel!=null)
-            return new WsaClientTube(wsdlModel, binding, next);
+            if(AddressingVersion.fromBinding(binding) == AddressingVersion.MEMBER) {
+                return new MemberSubmissionWsaClientTube(wsdlModel, binding, next);
+            } else {
+                return new W3CWsaClientTube(wsdlModel, binding, next);
+            }
         else
             return next;
     }
@@ -162,13 +193,18 @@ public class ClientTubeAssemblerContext {
      * Creates a {@link Tube} that invokes protocol and logical handlers.
      */
     public Tube createHandlerTube(Tube next) {
-        HandlerTube soapHandlerTube = null;
+        HandlerTube cousinHandlerTube = null;
         //XML/HTTP Binding can have only LogicalHandlerPipe
         if (binding instanceof SOAPBinding) {
-            soapHandlerTube = new ClientSOAPHandlerTube(binding, wsdlModel, next);
-            next = soapHandlerTube;
+            //Add MessageHandlerTube
+            HandlerTube messageHandlerTube = new ClientMessageHandlerTube(seiModel, binding, wsdlModel, next);
+            next = cousinHandlerTube = messageHandlerTube;
+
+            //Add SOAPHandlerTuber
+            HandlerTube soapHandlerTube = new ClientSOAPHandlerTube(binding, next, cousinHandlerTube);
+            next = cousinHandlerTube = soapHandlerTube;
         }
-        return new ClientLogicalHandlerTube(binding, next, soapHandlerTube);
+        return new ClientLogicalHandlerTube(binding, next, cousinHandlerTube);
     }
 
     /**
@@ -182,25 +218,27 @@ public class ClientTubeAssemblerContext {
             return next;
     }
 
+    /**
+     * creates a {@link Tube} that validates messages against schema
+     */
+    public Tube createValidationTube(Tube next) {
+        if (binding instanceof SOAPBinding && binding.isFeatureEnabled(SchemaValidationFeature.class) && wsdlModel!=null)
+            return new ClientSchemaValidationTube(binding, wsdlModel, next);
+        else
+            return next;
+    }
+
     /**
      * Creates a transport pipe (for client), which becomes the terminal pipe.
      */
     public Tube createTransportTube() {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
 
-        // wsgen generates a WSDL with the address attribute that says "REPLACE_WITH_ACTUAL_URL".
-        // while it's technically correct to reject such address (since there's no transport registered
-        // with it), it's desirable to allow the user a benefit of doubt, and wait until the runtime
-        // to see if the user configures the endpoint address through request context.
+        // The application may configure the endpoint address through request context
+        // using {@link BindingProvider#ENDPOINT_ADDRESS_PROPERTY}. Let us
+        // defer the creation of actual transport until the service invocation,
         // DeferredTransportPipe is used for this purpose.
-        //
-        // Ideally, we shouldn't have @address at all for such cases, but due to the backward
-        // compatibility and the fact that this attribute is mandatory, we have no option but
-        // to check for REPLACE_WITH_ACTUAL_URL.
-        if(address.toString().equals("") || address.toString().equals("REPLACE_WITH_ACTUAL_URL"))
-            return new DeferredTransportPipe(cl,this);
-
-        return TransportTubeFactory.create(cl, this);
+        return new DeferredTransportPipe(cl,this);
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java
index 3830248366c..9b20411c38a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java
@@ -59,7 +59,7 @@ public class Engine {
     void addRunnable(Fiber fiber) {
         if(threadPool==null) {
             synchronized(this) {
-                threadPool = Executors.newFixedThreadPool(5, new DaemonThreadFactory());
+                threadPool = Executors.newCachedThreadPool(new DaemonThreadFactory());
             }
         }
         threadPool.execute(fiber);
@@ -79,12 +79,29 @@ public class Engine {
     }
 
     private static class DaemonThreadFactory implements ThreadFactory {
-        private final AtomicInteger threadNumber = new AtomicInteger(1);
+        static final AtomicInteger poolNumber = new AtomicInteger(1);
+        final ThreadGroup group;
+        final AtomicInteger threadNumber = new AtomicInteger(1);
+        final String namePrefix;
+
+        DaemonThreadFactory() {
+            SecurityManager s = System.getSecurityManager();
+            group = (s != null)? s.getThreadGroup() :
+                                 Thread.currentThread().getThreadGroup();
+            namePrefix = "jaxws-engine-" +
+                          poolNumber.getAndIncrement() +
+                         "-thread-";
+        }
 
         public Thread newThread(Runnable r) {
-            Thread daemonThread = new Thread(r, "JAXWS-Engine-"+threadNumber.getAndIncrement());
-            daemonThread.setDaemon(Boolean.TRUE);
-            return daemonThread;
+            Thread t = new Thread(group, r,
+                                  namePrefix + threadNumber.getAndIncrement(),
+                                  0);
+            if (!t.isDaemon())
+                t.setDaemon(true);
+            if (t.getPriority() != Thread.NORM_PRIORITY)
+                t.setPriority(Thread.NORM_PRIORITY);
+            return t;
         }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
index 99e46113707..8211dbaf917 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java
@@ -249,26 +249,29 @@ public final class Fiber implements Runnable {
      * Wakes up a suspended fiber.
      *
      * <p>
-     * If a fiber was suspended from the {@link Tube#processRequest(Packet)} method,
-     * then the execution will be resumed from the corresponding
-     * {@link Tube#processResponse(Packet)} method with the specified response packet
-     * as the parameter.
+     * If a fiber was suspended without specifying the next {@link Tube},
+     * then the execution will be resumed in the response processing direction,
+     * by calling the {@link Tube#processResponse(Packet)} method on the next/first
+     * {@link Tube} in the {@link Fiber}'s processing stack with the specified resume
+     * packet as the parameter.
      *
      * <p>
-     * If a fiber was suspended from the {@link Tube#processResponse(Packet)} method,
-     * then the execution will be resumed from the next tube's
-     * {@link Tube#processResponse(Packet)} method with the specified response packet
-     * as the parameter.
+     * If a fiber was suspended with specifying the next {@link Tube},
+     * then the execution will be resumed in the request processing direction,
+     * by calling the next tube's {@link Tube#processRequest(Packet)} method with the
+     * specified resume packet as the parameter.
      *
      * <p>
      * This method is implemented in a race-free way. Another thread can invoke
      * this method even before this fiber goes into the suspension mode. So the caller
      * need not worry about synchronizing {@link NextAction#suspend()} and this method.
+     *
+     * @param resumePacket packet used in the resumed processing
      */
-    public synchronized void resume(@NotNull Packet response) {
+    public synchronized void resume(@NotNull Packet resumePacket) {
         if(isTraceEnabled())
             LOGGER.fine(getName()+" resumed");
-        packet = response;
+        packet = resumePacket;
         if( --suspendedCount == 0 ) {
             if(synchronous) {
                 notifyAll();
@@ -618,7 +621,7 @@ public final class Fiber implements Runnable {
                         break;
                     case NextAction.SUSPEND:
                         pushCont(last);
-                        next = null;
+                        next = na.next;
                         suspend();
                         break;
                     default:
@@ -686,6 +689,7 @@ public final class Fiber implements Runnable {
         return "engine-"+owner.id+"fiber-"+id;
     }
 
+    @Override
     public String toString() {
         return getName();
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java
index bbd35d3555c..d720e9b71b8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java
@@ -110,6 +110,15 @@ public final class NextAction {
         set(SUSPEND, null, null, null);
     }
 
+    /**
+     * Indicates that the fiber should be suspended.
+     * Once {@link Fiber#resume(Packet) resumed}, resume with the
+     * {@link Tube#processRequest(Packet)} on the given next tube.
+     */
+    public void suspend(Tube next) {
+        set(SUSPEND, next, null, null);
+    }
+
     /**
      * Dumps the contents to assist debugging.
      */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
index 48af034d4b8..2024a26d768 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java
@@ -78,6 +78,13 @@ public final class ServerPipeAssemblerContext extends ServerTubeAssemblerContext
         return PipeAdapter.adapt(super.createSecurityTube(PipeAdapter.adapt(next)));
     }
 
+    /**
+     * creates a {@link Pipe} that validates messages against schema
+     */
+    public @NotNull Pipe createValidationPipe(@NotNull Pipe next) {
+       return PipeAdapter.adapt(super.createValidationTube(PipeAdapter.adapt(next)));
+    }
+
     /**
      * Creates a {@link Pipe} that invokes protocol and logical handlers.
      */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
index 4a0a325c8d3..161da005792 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java
@@ -28,6 +28,8 @@ package com.sun.xml.internal.ws.api.pipe;
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.addressing.WsaServerTube;
+import com.sun.xml.internal.ws.addressing.W3CWsaServerTube;
+import com.sun.xml.internal.ws.addressing.v200408.MemberSubmissionWsaServerTube;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
 import com.sun.xml.internal.ws.api.model.SEIModel;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
@@ -35,10 +37,13 @@ import com.sun.xml.internal.ws.api.pipe.helper.PipeAdapter;
 import com.sun.xml.internal.ws.api.server.ServerPipelineHook;
 import com.sun.xml.internal.ws.api.server.WSEndpoint;
 import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.developer.SchemaValidationFeature;
 import com.sun.xml.internal.ws.handler.HandlerTube;
 import com.sun.xml.internal.ws.handler.ServerLogicalHandlerTube;
+import com.sun.xml.internal.ws.handler.ServerMessageHandlerTube;
 import com.sun.xml.internal.ws.handler.ServerSOAPHandlerTube;
 import com.sun.xml.internal.ws.protocol.soap.ServerMUTube;
+import com.sun.xml.internal.ws.server.ServerSchemaValidationTube;
 import com.sun.xml.internal.ws.util.pipe.DumpTube;
 
 import javax.xml.ws.soap.SOAPBinding;
@@ -148,7 +153,11 @@ public class ServerTubeAssemblerContext {
             HandlerTube cousin = new ServerLogicalHandlerTube(binding, wsdlModel, next);
             next = cousin;
             if (binding instanceof SOAPBinding) {
-                return new ServerSOAPHandlerTube(binding, next, cousin);
+                //Add SOAPHandlerTube
+                next = cousin = new ServerSOAPHandlerTube(binding, next, cousin);
+
+                //Add MessageHandlerTube
+                next = new ServerMessageHandlerTube(seiModel, binding, next, cousin);
             }
         }
         return next;
@@ -186,13 +195,27 @@ public class ServerTubeAssemblerContext {
         return new DumpTube(name, out, next);
     }
 
+    /**
+     * creates a {@link Tube} that validates messages against schema
+     */
+    public Tube createValidationTube(Tube next) {
+        if (binding instanceof SOAPBinding && binding.isFeatureEnabled(SchemaValidationFeature.class) && wsdlModel!=null)
+            return new ServerSchemaValidationTube(endpoint, binding, next);
+        else
+            return next;
+    }
+
     /**
      * Creates WS-Addressing pipe
      */
     public Tube createWsaTube(Tube next) {
-        if (binding instanceof SOAPBinding && AddressingVersion.isEnabled(binding) && wsdlModel!=null)
-            return new WsaServerTube(wsdlModel, binding, next);
-        else
+        if (binding instanceof SOAPBinding && AddressingVersion.isEnabled(binding)) {
+            if(AddressingVersion.fromBinding(binding) == AddressingVersion.MEMBER) {
+                return new MemberSubmissionWsaServerTube(endpoint, wsdlModel, binding, next);
+            } else {
+                return new W3CWsaServerTube(endpoint, wsdlModel, binding, next);
+            }
+        } else
             return next;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
index 36f3b417c15..b58475296f4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java
@@ -27,6 +27,7 @@ package com.sun.xml.internal.ws.api.pipe;
 
 import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
 
 import javax.xml.stream.XMLStreamReader;
 
@@ -49,4 +50,14 @@ public interface StreamSOAPCodec extends Codec {
      * @return a {@link Message} for SOAP envelope
      */
     public @NotNull Message decode(@NotNull XMLStreamReader reader);
+
+    /**
+     * Reads events from {@link XMLStreamReader} and constructs a
+     * {@link Message} for SOAP envelope.
+     *
+     * @param reader that represents SOAP envelope infoset
+     * @param att attachments for the message
+     * @return a {@link Message} for SOAP envelope
+     */
+    public @NotNull Message decode(@NotNull XMLStreamReader reader, @NotNull AttachmentSet att);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
index cab59529532..357da4c6f53 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java
@@ -127,7 +127,7 @@ public abstract class TransportTubeFactory {
         String scheme = context.getAddress().getURI().getScheme();
         if (scheme != null) {
             if(scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https"))
-                return new HttpTransportPipe(context.getCodec());
+                return new HttpTransportPipe(context.getCodec(), context.getBinding());
         }
 
         throw new WebServiceException("Unsupported endpoint address: "+context.getAddress());    // TODO: i18n
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
index 3b8ed52735d..73e7bb8bfca 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java
@@ -50,7 +50,11 @@ public abstract class AbstractFilterTubeImpl extends AbstractTubeImpl {
 
     protected AbstractFilterTubeImpl(AbstractFilterTubeImpl that, TubeCloner cloner) {
         super(that, cloner);
-        this.next = cloner.copy(that.next);
+        if (that.next != null) {
+            this.next = cloner.copy(that.next);
+        } else {
+            this.next = null;
+        }
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
index 32a4cc72de0..1dbf627cca1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java
@@ -81,6 +81,12 @@ public abstract class AbstractTubeImpl implements Tube, Pipe {
         return na;
     }
 
+    protected final NextAction doSuspend(Tube next) {
+        NextAction na = new NextAction();
+        na.suspend(next);
+        return na;
+    }
+
     protected final NextAction doThrow(Throwable t) {
         NextAction na = new NextAction();
         na.throwException(t);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
index 2eb9cd7df3e..27e47f101e9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java
@@ -42,6 +42,8 @@ public interface BoundEndpoint {
      * <p>
      * Multiple {@link BoundEndpoint}s may point to the same {@link WSEndpoint},
      * if it's bound to multiple transports.
+     *
+     * @return the endpoint
      */
     @NotNull WSEndpoint getEndpoint();
 
@@ -52,6 +54,24 @@ public interface BoundEndpoint {
      * For example, if this endpoint is bound to a servlet endpoint
      * "http://foobar/myapp/myservice", then this method should
      * return that address.
+     *
+     * @return address of the endpoint
      */
     @NotNull URI getAddress();
+
+    /**
+     * The address of the bound endpoint using the base address. Often
+     * times, baseAddress is only avaialble during the request.
+     *
+     * <p>
+     * If the endpoint is bound to a servlet endpoint, the base address
+     * won't include the url-pattern, so the base address would be
+     * "http://host:port/context". This method would include url-pattern
+     * for the endpoint and return that address
+     * for e.g. "http://host:port/context/url-pattern"
+     *
+     * @param baseAddress that is used in computing the full address
+     * @return address of the endpoint
+     */
+    @NotNull URI getAddress(String baseAddress);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java
new file mode 100644
index 00000000000..4c8034f7eab
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+/**
+ * Interface that allows components around {@link WSEndpoint} to hook up
+ * with each other.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 2.1.2
+ * @see WSEndpoint#getComponentRegistry()
+ */
+public interface EndpointComponent {
+    /**
+     * Gets the specified SPI.
+     *
+     * <p>
+     * This method works as a kind of directory service
+     * for SPIs, allowing various components to define private contract
+     * and talk to each other.
+     *
+     * @return
+     *      null if such an SPI is not provided by this object.
+     */
+    @Nullable <T> T getSPI(@NotNull Class<T> spiType);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java
new file mode 100644
index 00000000000..795c002895f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.api.server;
+
+import com.sun.istack.internal.NotNull;
+
+/**
+ * Light-weight http server transport for {@link WSEndpoint}.
+ * It provides a way to start the transport at a local http address and
+ * to stop the transport.
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class HttpEndpoint {
+
+    /**
+     * Factory to deploy {@link WSEndpoint} on light-weight
+     * http server container.
+     *
+     * @param endpoint that needs to be deployed at http server
+     * @return transport object for the endpoint
+     */
+    public static HttpEndpoint create(@NotNull WSEndpoint endpoint) {
+        return new com.sun.xml.internal.ws.transport.http.server.HttpEndpoint(endpoint, null);
+    }
+
+    /**
+     * Publishes this endpoint at a localhost's http address.
+     *
+     * @param address endpoint's http address
+     *        for e.g http://localhost:8080/ctxt/pattern
+     */
+    public abstract void publish(@NotNull String address);
+
+    /**
+     * Stops the published endpoint
+     */
+    public abstract void stop();
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
index 9da551e612f..6e5432e2475 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java
@@ -82,7 +82,27 @@ public abstract class InstanceResolver<T> {
      *      Always non-null. Represents the request message to be served.
      *      The caller may not consume the {@link Message}.
      */
-    public abstract @NotNull T resolve(Packet request);
+    public abstract @NotNull T resolve(@NotNull Packet request);
+
+    /**
+     * Called by the default {@link Invoker} after the method call is done.
+     * This gives {@link InstanceResolver} a chance to do clean up.
+     *
+     * <p>
+     * Alternatively, one could override {@link #createInvoker()} to
+     * create a custom invoker to do this in more flexible way.
+     *
+     * <p>
+     * The default implementation is a no-op.
+     *
+     * @param request
+     *      The same request packet given to {@link #resolve(Packet)} method.
+     * @param servant
+     *      The object returned from the {@link #resolve(Packet)} method.
+     * @since 2.1.2
+     */
+    public void postInvoke(@NotNull Packet request, @NotNull T servant) {
+    }
 
     /**
      * Called by {@link WSEndpoint} when it's set up.
@@ -210,12 +230,22 @@ public abstract class InstanceResolver<T> {
 
             @Override
             public Object invoke(Packet p, Method m, Object... args) throws InvocationTargetException, IllegalAccessException {
-                return m.invoke( resolve(p), args );
+                T t = resolve(p);
+                try {
+                    return m.invoke(t, args );
+                } finally {
+                    postInvoke(p,t);
+                }
             }
 
             @Override
-            public <T> T invokeProvider(@NotNull Packet p, T arg) {
-                return ((Provider<T>)resolve(p)).invoke(arg);
+            public <U> U invokeProvider(@NotNull Packet p, U arg) {
+                T t = resolve(p);
+                try {
+                    return ((Provider<U>) t).invoke(arg);
+                } finally {
+                    postInvoke(p,t);
+                }
             }
 
             public String toString() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
index 20e863745bd..50fbfcffaec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java
@@ -59,4 +59,22 @@ public abstract class PortAddressResolver {
      *      is written as it is (without any patching).
      */
     public abstract @Nullable String getAddressFor(@NotNull QName serviceName, @NotNull String portName);
+
+    /**
+     * Gets the endpoint address for a WSDL port
+     *
+     * @param serviceName
+     *       WSDL service name(wsd:service in WSDL) for which address is needed. Always non-null.
+     * @param portName
+     *       WSDL port name(wsdl:port in WSDL) for which address is needed. Always non-null.
+     * @param currentAddress
+     *       Whatever current address specified for the port in the WSDL
+     * @return
+     *      The address needs to be put in WSDL for port element's location
+     *      attribute. Can be null. If it is null, existing port address
+     *      is written as it is (without any patching).
+     */
+    public @Nullable String getAddressFor(@NotNull QName serviceName, @NotNull String portName, String currentAddress) {
+        return getAddressFor(serviceName, portName);
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java
index ea50c4cc634..234ef25c2b1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java
@@ -32,6 +32,7 @@ import javax.xml.namespace.QName;
 import java.io.OutputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.util.Set;
 
 /**
  * Represents an individual document that forms a {@link ServiceDefinition}.
@@ -68,6 +69,11 @@ public interface SDDocument {
      */
     boolean isSchema();
 
+    /**
+     * returns the referenced documents
+     */
+    Set<String> getImports();
+
     /**
      * Gets the system ID of the document where it's taken from. Generated documents
      * use a fake URL that can be used to resolve relative URLs. So donot use this URL
@@ -150,5 +156,11 @@ public interface SDDocument {
          * TODO: does this info need to be exposed?
          */
         boolean hasService();
+
+        /**
+         * All &lt;service> names that were in this WSDL, or empty set if there was none.
+         * Used for error diagnostics.
+         */
+        Set<QName> getAllServices();
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
index 5a9e033156c..89575665bb5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java
@@ -31,6 +31,7 @@ import com.sun.xml.internal.ws.api.BindingID;
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.message.Message;
 import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.SEIModel;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
 import com.sun.xml.internal.ws.api.pipe.Codec;
 import com.sun.xml.internal.ws.api.pipe.Engine;
@@ -47,6 +48,7 @@ import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.WebServiceException;
 import java.net.URL;
 import java.util.Collection;
+import java.util.Set;
 import java.util.concurrent.Executor;
 
 /**
@@ -342,6 +344,37 @@ public abstract class WSEndpoint<T> {
      */
     public abstract @Nullable ServiceDefinition getServiceDefinition();
 
+    /**
+     * Gets the list of {@link EndpointComponent} that are associated
+     * with this endpoint.
+     *
+     * <p>
+     * Components (such as codec, tube, handler, etc) who wish to provide
+     * some service to other components in the endpoint can iterate the
+     * registry and call its {@link EndpointComponent#getSPI(Class)} to
+     * establish a private contract between components.
+     * <p>
+     * Components who wish to subscribe to such a service can add itself
+     * to this set.
+     *
+     * @return
+     *      always return the same set.
+     */
+    public abstract @NotNull Set<EndpointComponent> getComponentRegistry();
+
+    /**
+     * Gets the {@link com.sun.xml.internal.ws.api.model.SEIModel} that represents the relationship
+     * between WSDL and Java SEI.
+     *
+     * <p>
+     * This method returns a non-null value if and only if this
+     * endpoint is ultimately serving an application through an SEI.
+     *
+     * @return
+     *      maybe null. See above for more discussion.
+     *      Always the same value.
+     */
+    public abstract @Nullable SEIModel getSEIModel();
 
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
index 508c3f9a586..f86b7acd155 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java
@@ -35,11 +35,15 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.util.logging.Logger;
+import java.security.AccessController;
 
 /**
  * Factory for {@link XMLStreamReader}.
@@ -52,21 +56,20 @@ import java.net.URL;
  */
 public abstract class XMLStreamReaderFactory {
 
+    private static final Logger LOGGER = Logger.getLogger(XMLStreamReaderFactory.class.getName());
+
     /**
      * Singleton instance.
      */
     private static volatile @NotNull XMLStreamReaderFactory theInstance;
 
     static {
-        XMLInputFactory xif = XMLInputFactory.newInstance();
-        xif.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
-        xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
-
+        XMLInputFactory xif = getXMLInputFactory();
         XMLStreamReaderFactory f=null;
 
         // this system property can be used to disable the pooling altogether,
         // in case someone hits an issue with pooling in the production system.
-        if(!Boolean.getBoolean(XMLStreamReaderFactory.class.getName()+".noPool"))
+        if(!getProperty(XMLStreamReaderFactory.class.getName()+".noPool"))
             f = Zephyr.newInstance(xif);
 
         if(f==null) {
@@ -76,11 +79,30 @@ public abstract class XMLStreamReaderFactory {
         }
 
         if(f==null)
-            f = new Default(xif);
+            f = new Default();
 
         theInstance = f;
+        LOGGER.fine("XMLStreamReaderFactory instance is = "+theInstance);
     }
 
+    private static XMLInputFactory getXMLInputFactory() {
+        XMLInputFactory xif = null;
+        if (getProperty(XMLStreamReaderFactory.class.getName()+".woodstox")) {
+            try {
+                xif = (XMLInputFactory)Class.forName("com.ctc.wstx.stax.WstxInputFactory").newInstance();
+            } catch (Exception e) {
+                // Ignore and fallback to default XMLInputFactory
+            }
+        }
+        if (xif == null) {
+            xif = XMLInputFactory.newInstance();
+        }
+        xif.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, true);
+        xif.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+        return xif;
+    }
+
+
     /**
      * Overrides the singleton {@link XMLStreamReaderFactory} instance that
      * the JAX-WS RI uses.
@@ -117,6 +139,12 @@ public abstract class XMLStreamReaderFactory {
         return get().doCreate(systemId,in,rejectDTDs);
     }
 
+    public static XMLStreamReader create(@Nullable String systemId, InputStream in, @Nullable String encoding, boolean rejectDTDs) {
+        return (encoding == null)
+                ? create(systemId, in, rejectDTDs)
+                : get().doCreate(systemId,in,encoding,rejectDTDs);
+    }
+
     public static XMLStreamReader create(@Nullable String systemId, Reader reader, boolean rejectDTDs) {
         return get().doCreate(systemId,reader,rejectDTDs);
     }
@@ -152,6 +180,16 @@ public abstract class XMLStreamReaderFactory {
 
     public abstract XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs);
 
+    private XMLStreamReader doCreate(String systemId, InputStream in, @NotNull String encoding, boolean rejectDTDs) {
+        Reader reader;
+        try {
+            reader = new InputStreamReader(in, encoding);
+        } catch(UnsupportedEncodingException ue) {
+            throw new XMLReaderException("stax.cantCreate", ue);
+        }
+        return doCreate(systemId, reader, rejectDTDs);
+    }
+
     public abstract XMLStreamReader doCreate(String systemId, Reader reader, boolean rejectDTDs);
 
     public abstract void doRecycle(XMLStreamReader r);
@@ -200,10 +238,10 @@ public abstract class XMLStreamReaderFactory {
             // check if this is from Zephyr
             try {
                 Class<?> clazz = xif.createXMLStreamReader(new StringReader("<foo/>")).getClass();
-
-                if(!clazz.getName().startsWith("com.sun.xml.internal.stream."))
+                // JDK has different XMLStreamReader impl class. Even if we check for that,
+                // it doesn't have setInputSource(InputSource). Let it use Default
+                if(!(clazz.getName().startsWith("com.sun.xml.internal.stream.")) )
                     return null;    // nope
-
                 return new Zephyr(xif,clazz);
             } catch (NoSuchMethodException e) {
                 return null;    // this factory is not for zephyr
@@ -278,7 +316,11 @@ public abstract class XMLStreamReaderFactory {
             } catch (IllegalAccessException e) {
                 throw new XMLReaderException("stax.cantCreate",e);
             } catch (InvocationTargetException e) {
-                throw new XMLReaderException("stax.cantCreate",e);
+                Throwable cause = e.getCause();
+                if (cause == null) {
+                    cause = e;
+                }
+                throw new XMLReaderException("stax.cantCreate", cause);
             } catch (XMLStreamException e) {
                 throw new XMLReaderException("stax.cantCreate",e);
             }
@@ -295,21 +337,40 @@ public abstract class XMLStreamReaderFactory {
      * that can work with any {@link XMLInputFactory}.
      *
      * <p>
-     * {@link XMLInputFactory} is not required to be thread-safe, so the
-     * create method on this implementation is synchronized.
+     * {@link XMLInputFactory} is not required to be thread-safe, but
+     * if the create method on this implementation is synchronized,
+     * it may run into (see <a href="https://jax-ws.dev.java.net/issues/show_bug.cgi?id=555">
+     * race condition</a>). Hence, using a XMLInputFactory per theread.
      */
-    public static final class Default extends NoLock {
-        public Default(XMLInputFactory xif) {
-            super(xif);
+    public static final class Default extends XMLStreamReaderFactory {
+
+        private final ThreadLocal<XMLInputFactory> xif = new ThreadLocal<XMLInputFactory>() {
+            @Override
+            public XMLInputFactory initialValue() {
+                return getXMLInputFactory();
+            }
+        };
+
+        public XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
+            try {
+                return xif.get().createXMLStreamReader(systemId,in);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
         }
 
-        public synchronized XMLStreamReader doCreate(String systemId, InputStream in, boolean rejectDTDs) {
-            return super.doCreate(systemId, in, rejectDTDs);
+        public XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
+            try {
+                return xif.get().createXMLStreamReader(systemId,in);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
         }
 
-        public synchronized XMLStreamReader doCreate(String systemId, Reader in, boolean rejectDTDs) {
-            return super.doCreate(systemId, in, rejectDTDs);
+        public void doRecycle(XMLStreamReader r) {
+            // there's no way to recycle with the default StAX API.
         }
+
     }
 
     /**
@@ -364,4 +425,16 @@ public abstract class XMLStreamReaderFactory {
             return super.doCreate(systemId, in, rejectDTDs);
         }
     }
+
+    private static Boolean getProperty(final String prop) {
+        Boolean b = AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Boolean>() {
+                public Boolean run() {
+                    String value = System.getProperty(prop);
+                    return value != null ? Boolean.valueOf(value) : Boolean.FALSE;
+                }
+            }
+        );
+        return Boolean.FALSE;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
index a6b6054283d..179ea34435a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java
@@ -39,6 +39,7 @@ import java.io.OutputStream;
 import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.logging.Logger;
 
 /**
  * Factory for {@link XMLStreamWriter}.
@@ -51,6 +52,8 @@ import java.lang.reflect.Method;
  */
 public abstract class XMLStreamWriterFactory {
 
+    private static final Logger LOGGER = Logger.getLogger(XMLStreamWriterFactory.class.getName());
+
     /**
      * Singleton instance.
      */
@@ -58,7 +61,17 @@ public abstract class XMLStreamWriterFactory {
 
 
     static {
-        XMLOutputFactory xof = XMLOutputFactory.newInstance();
+        XMLOutputFactory  xof = null;
+        if (Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".woodstox")) {
+            try {
+                xof = (XMLOutputFactory)Class.forName("com.ctc.wstx.stax.WstxOutputFactory").newInstance();
+            } catch (Exception e) {
+                // Ignore and fallback to default XMLOutputFactory
+            }
+        }
+        if (xof == null) {
+            xof = XMLOutputFactory.newInstance();
+        }
 
         XMLStreamWriterFactory f=null;
 
@@ -66,10 +79,16 @@ public abstract class XMLStreamWriterFactory {
         // in case someone hits an issue with pooling in the production system.
         if(!Boolean.getBoolean(XMLStreamWriterFactory.class.getName()+".noPool"))
             f = Zephyr.newInstance(xof);
-        if(f==null)
+        if(f==null) {
+            // is this Woodstox?
+            if(xof.getClass().getName().equals("com.ctc.wstx.stax.WstxOutputFactory"))
+                f = new NoLock(xof);
+        }
+        if (f == null)
             f = new Default(xof);
 
         theInstance = f;
+        LOGGER.fine("XMLStreamWriterFactory instance is = "+theInstance);
     }
 
     /**
@@ -302,4 +321,33 @@ public abstract class XMLStreamWriterFactory {
                 ((RecycleAware)r).onRecycled();
         }
     }
+
+    /**
+     *
+     * For {@link javax.xml.stream.XMLOutputFactory} is thread safe.
+     */
+    public static final class NoLock extends XMLStreamWriterFactory {
+        private final XMLOutputFactory xof;
+
+        public NoLock(XMLOutputFactory xof) {
+            this.xof = xof;
+        }
+
+        public XMLStreamWriter doCreate(OutputStream out) {
+            return doCreate(out,"UTF-8");
+        }
+
+        public XMLStreamWriter doCreate(OutputStream out, String encoding) {
+            try {
+                return xof.createXMLStreamWriter(out,encoding);
+            } catch (XMLStreamException e) {
+                throw new XMLReaderException("stax.cantCreate",e);
+            }
+        }
+
+        public void doRecycle(XMLStreamWriter r) {
+            // no recycling
+        }
+
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
index eb2655614ec..a0cc45c5786 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java
@@ -26,19 +26,7 @@
 package com.sun.xml.internal.ws.api.wsdl.parser;
 
 import com.sun.xml.internal.ws.api.WSService;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundPortType;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLExtensible;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLExtension;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLFault;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLInput;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLMessage;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLOutput;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLPortType;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLService;
+import com.sun.xml.internal.ws.api.model.wsdl.*;
 import com.sun.xml.internal.ws.api.pipe.Tube;
 import com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser;
 
@@ -255,11 +243,11 @@ public abstract class WSDLParserExtension {
     public void bindingOperationOutputAttributes(WSDLBoundOperation operation, XMLStreamReader reader) {
     }
 
-    public boolean bindingOperationFaultElements(WSDLBoundOperation operation, XMLStreamReader reader) {
+    public boolean bindingOperationFaultElements(WSDLBoundFault fault, XMLStreamReader reader) {
         return false;
     }
 
-    public void bindingOperationFaultAttributes(WSDLBoundOperation operation, XMLStreamReader reader) {
+    public void bindingOperationFaultAttributes(WSDLBoundFault fault, XMLStreamReader reader) {
     }
 
     // TODO: complete the rest of the callback
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
index 20ce13e17ce..9ad7009c0a0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java
@@ -24,12 +24,15 @@
  */
 package com.sun.xml.internal.ws.api.wsdl.parser;
 
+import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
+import com.sun.xml.internal.ws.api.server.Container;
 
 /**
  * Provides contextual information for {@link WSDLParserExtension}s.
  *
  * @author Vivek Pandey
+ * @author Fabian Ritzmann
  */
 public interface WSDLParserExtensionContext {
     /**
@@ -43,4 +46,12 @@ public interface WSDLParserExtensionContext {
      * {@link WSDLParserExtension#finished(WSDLParserExtensionContext)} is called.
      */
     WSDLModel getWSDLModel();
+
+    /**
+     * Provides the {@link Container} in which this service or client is running.
+     * May return null.
+     *
+     * @return The container in which this service or client is running.
+     */
+    @NotNull Container getContainer();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java
index 239b6bbefd7..8d66e2e9223 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java
@@ -34,6 +34,7 @@ import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
 import com.sun.xml.internal.ws.api.pipe.Codec;
 import com.sun.xml.internal.ws.client.HandlerConfiguration;
 import com.sun.xml.internal.ws.developer.MemberSubmissionAddressingFeature;
+import com.sun.xml.internal.ws.developer.BindingTypeFeature;
 
 import javax.xml.ws.WebServiceFeature;
 import javax.xml.ws.soap.AddressingFeature;
@@ -134,6 +135,13 @@ public abstract class BindingImpl implements WSBinding {
     }
 
     public static BindingImpl create(@NotNull BindingID bindingId, WebServiceFeature[] features) {
+        // Override the BindingID from the features
+        for(WebServiceFeature feature : features) {
+            if (feature instanceof BindingTypeFeature) {
+                BindingTypeFeature f = (BindingTypeFeature)feature;
+                bindingId = BindingID.parse(f.getBindingId());
+            }
+        }
         if (bindingId.equals(BindingID.XML_HTTP))
             return new HTTPBindingImpl();
         else
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
index 97ef4bbbdad..5bb0dc93cf1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java
@@ -68,6 +68,6 @@ public class HTTPBindingImpl extends BindingImpl implements HTTPBinding {
         return new HandlerConfiguration(
                 Collections.<String>emptySet(),
                 Collections.<QName>emptySet(),
-                handlerChain,logicalHandlers,null,null);
+                handlerChain,logicalHandlers,null,null,null);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
index 2b6e7db1407..e349d37b1f2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java
@@ -28,6 +28,7 @@ package com.sun.xml.internal.ws.binding;
 import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.ws.api.BindingID;
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.handler.MessageHandler;
 import com.sun.xml.internal.ws.client.HandlerConfiguration;
 import com.sun.xml.internal.ws.encoding.soap.streaming.SOAP12NamespaceConstants;
 import com.sun.xml.internal.ws.handler.HandlerException;
@@ -43,11 +44,7 @@ import javax.xml.ws.handler.LogicalHandler;
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.soap.MTOMFeature;
 import javax.xml.ws.soap.SOAPBinding;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 
 /**
@@ -113,6 +110,7 @@ public final class SOAPBindingImpl extends BindingImpl implements SOAPBinding {
     protected HandlerConfiguration createHandlerConfig(List<Handler> handlerChain) {
         List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
         List<SOAPHandler> soapHandlers = new ArrayList<SOAPHandler>();
+        List<MessageHandler> messageHandlers = new ArrayList<MessageHandler>();
         Set<QName> handlerKnownHeaders = new HashSet<QName>();
 
         for (Handler handler : handlerChain) {
@@ -124,13 +122,19 @@ public final class SOAPBindingImpl extends BindingImpl implements SOAPBinding {
                 if (headers != null) {
                     handlerKnownHeaders.addAll(headers);
                 }
-            } else {
+            } else if (handler instanceof MessageHandler) {
+                messageHandlers.add((MessageHandler) handler);
+                Set<QName> headers = ((MessageHandler<?>) handler).getHeaders();
+                if (headers != null) {
+                    handlerKnownHeaders.addAll(headers);
+                }
+            }else {
                 throw new HandlerException("handler.not.valid.type",
                     handler.getClass());
             }
         }
         return new HandlerConfiguration(roles,portKnownHeaders,handlerChain,
-                logicalHandlers,soapHandlers,handlerKnownHeaders);
+                logicalHandlers,soapHandlers,messageHandlers,handlerKnownHeaders);
     }
 
     protected void addRequiredRoles() {
@@ -157,7 +161,7 @@ public final class SOAPBindingImpl extends BindingImpl implements SOAPBinding {
         addRequiredRoles();
         HandlerConfiguration oldConfig = getHandlerConfig();
         setHandlerConfig(new HandlerConfiguration(this.roles, portKnownHeaders, oldConfig.getHandlerChain(),
-                oldConfig.getLogicalHandlers(),oldConfig.getSoapHandlers(),
+                oldConfig.getLogicalHandlers(),oldConfig.getSoapHandlers(), oldConfig.getMessageHandlers(),
                 oldConfig.getHandlerKnownHeaders()));
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
index 76d40a4fcd0..6b694214a0d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.binding;
 
 import com.sun.istack.internal.NotNull;
@@ -264,6 +263,14 @@ public final class WebServiceFeatureList implements WSFeatureList {
         this.parent = parent;
     }
 
+    public static @Nullable <F extends WebServiceFeature> F getFeature(@NotNull WebServiceFeature[] features, @NotNull Class<F> featureType) {
+        for(WebServiceFeature f : features) {
+            if (f.getClass() == featureType)
+                return (F)f;
+        }
+        return null;
+    }
+
     /**
      * A Union of this WebServiceFeatureList and the parent.
      */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java
index 855bf738504..a06509e02d2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java
@@ -29,6 +29,8 @@ import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.pipe.Fiber.CompletionCallback;
 import com.sun.xml.internal.ws.api.pipe.Tube;
 
+import javax.xml.ws.WebServiceException;
+
 /**
  * Invokes {@link Tube}line asynchronously for the client's async API(for e.g.: Dispatch#invokeAsync}
  * The concrete classes need to call {@link Stub#processAsync(Packet, RequestContext, CompletionCallback)} in
@@ -47,4 +49,17 @@ public abstract class AsyncInvoker implements Runnable {
         this.responseImpl = responseImpl;
     }
 
+    public void run () {
+        try {
+            do_run();
+        }catch(WebServiceException e) {
+            throw e;
+        }catch(Throwable t) {
+            //Wrap it in WebServiceException
+            throw new WebServiceException(t);
+        }
+    }
+
+    public abstract void do_run();
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
index 86ecec2432e..8a90bbb1c4c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java
@@ -39,10 +39,6 @@ import java.util.concurrent.FutureTask;
  * request to Fiber and returns. When the Fiber finishes the execution, it sets
  * response in the {@link FutureTask}
  *
- * <p>
- * {@link ResponseImpl} executes things synchronously and waits for the return
- * parameter.
- *
  * @author Jitendra Kotamraju
  */
 public final class AsyncResponseImpl<T> extends FutureTask<T> implements Response<T>, ResponseContextReceiver {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java
index 427fe65402a..8074dfa2967 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java
@@ -42,10 +42,6 @@ public interface BindingProviderProperties extends JAXWSProperties{
         "com.sun.xml.internal.ws.server.OneWayOperation";
 
 
-    // Proprietary
-    public static final String REQUEST_TIMEOUT =
-        "com.sun.xml.internal.ws.request.timeout";
-
     //JAXWS 2.0
     public static final String JAXWS_HANDLER_CONFIG =
         "com.sun.xml.internal.ws.handler.config";
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java
new file mode 100644
index 00000000000..a21b3e0df89
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.client;
+
+import com.sun.xml.internal.ws.api.ResourceLoader;
+import com.sun.xml.internal.ws.api.server.Container;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+final class ClientContainer extends Container {
+
+    private final ResourceLoader loader = new ResourceLoader() {
+        public URL getResource(String resource) throws MalformedURLException {
+            ClassLoader cl = Thread.currentThread().getContextClassLoader();
+            if (cl == null) {
+                cl = this.getClass().getClassLoader();
+            }
+            return cl.getResource("META-INF/"+resource);
+        }
+    };
+
+    public <T> T getSPI(Class<T> spiType) {
+        if (spiType == ResourceLoader.class) {
+            return spiType.cast(loader);
+        }
+        return null;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java
new file mode 100644
index 00000000000..17ffcd6b2fb
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.client;
+
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractTubeImpl;
+import com.sun.xml.internal.ws.api.server.SDDocument;
+import com.sun.xml.internal.ws.api.server.SDDocumentSource;
+import com.sun.xml.internal.ws.util.MetadataUtil;
+import com.sun.xml.internal.ws.util.pipe.AbstractSchemaValidationTube;
+import com.sun.xml.internal.ws.util.xml.MetadataDocument;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import javax.xml.ws.WebServiceException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+/**
+ * {@link Tube} that does the schema validation on the client side.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class ClientSchemaValidationTube extends AbstractSchemaValidationTube {
+
+    private static final Logger LOGGER = Logger.getLogger(ClientSchemaValidationTube.class.getName());
+
+    private final Schema schema;
+    private final Validator validator;
+    private final boolean noValidation;
+    private final WSDLPort port;
+
+    public ClientSchemaValidationTube(WSBinding binding, WSDLPort port, Tube next) {
+        super(binding, next);
+        this.port = port;
+        Source[] sources = null;
+        if (port != null) {
+            String primaryWsdl = port.getOwner().getParent().getLocation().getSystemId();
+            sources = getSchemaSources(primaryWsdl);
+            for(Source source : sources) {
+                LOGGER.fine("Constructing validation Schema from = "+source.getSystemId());
+                //printDOM((DOMSource)source);
+            }
+        }
+        if (sources != null) {
+            noValidation = false;
+            SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            try {
+                schema = sf.newSchema(sources);
+            } catch(SAXException e) {
+                throw new WebServiceException(e);
+            }
+            validator = schema.newValidator();
+        } else {
+            noValidation = true;
+            schema = null;
+            validator = null;
+        }
+    }
+
+    private class MetadataResolverImpl implements MetadataUtil.MetadataResolver{
+
+        Map<String, SDDocument> docs = new HashMap<String, SDDocument>();
+
+        public SDDocument resolveEntity(String systemId) {
+            SDDocument sdi = docs.get(systemId);
+            if (sdi == null) {
+                SDDocumentSource sds;
+                try {
+                    sds = SDDocumentSource.create(new URL(systemId));
+                } catch(MalformedURLException e) {
+                    throw new WebServiceException(e);
+                }
+                sdi = MetadataDocument.create(sds, new QName(""), new QName(""));
+                docs.put(systemId, sdi);
+            }
+            return sdi;
+        }
+    }
+
+    private Source[] getSchemaSources(String primary) {
+
+        MetadataUtil.MetadataResolver mdresolver = new MetadataResolverImpl();
+        Map<String, SDDocument> docs = MetadataUtil.getMetadataClosure(primary, mdresolver, true);
+
+        List<Source> list = new ArrayList<Source>();
+        for(Map.Entry<String, SDDocument> entry : docs.entrySet()) {
+            SDDocument doc = entry.getValue();
+            // Add all xsd:schema fragments from all WSDLs. That should form a closure of schemas.
+            if (doc.isWSDL()) {
+                Document dom = createDOM(doc);
+                // Get xsd:schema node from WSDL's DOM
+                addSchemaFragmentSource(dom, doc.getURL().toExternalForm(), list);
+            } else if (doc.isSchema()) {
+                // If there are multiple schemas with the same targetnamespace,
+                // JAXP works only with the first one. Above, all schema fragments may have the same targetnamespace,
+                // and that means it will not include all the schemas. Since we have a list of schemas, just add them.
+                Document dom = createDOM(doc);
+                list.add(new DOMSource(dom, doc.getURL().toExternalForm()));
+            }
+        }
+        //addSchemaSource(list);
+        return list.toArray(new Source[list.size()]) ;
+    }
+
+    protected Validator getValidator() {
+        return validator;
+    }
+
+    protected boolean isNoValidation() {
+        return noValidation;
+    }
+
+    protected ClientSchemaValidationTube(ClientSchemaValidationTube that, TubeCloner cloner) {
+        super(that,cloner);
+        this.port = that.port;
+        this.schema = that.schema;
+        this.validator = schema.newValidator();
+        this.noValidation = that.noValidation;
+    }
+
+    public AbstractTubeImpl copy(TubeCloner cloner) {
+        return new ClientSchemaValidationTube(this,cloner);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java
index 9d86342bbd6..cc8d33e4e9f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java
@@ -24,15 +24,13 @@
  */
 package com.sun.xml.internal.ws.client;
 
+import com.sun.xml.internal.ws.api.handler.MessageHandler;
+
 import javax.xml.namespace.QName;
 import javax.xml.ws.handler.Handler;
 import javax.xml.ws.handler.LogicalHandler;
 import javax.xml.ws.handler.soap.SOAPHandler;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * This class holds the handler information on the BindingProvider.
@@ -54,6 +52,7 @@ public class HandlerConfiguration {
     private final List<Handler> handlerChain;
     private final List<LogicalHandler> logicalHandlers;
     private final List<SOAPHandler> soapHandlers;
+    private final List<MessageHandler> messageHandlers;
     private Set<QName> knownHeaders;
     private Set<QName> handlerKnownHeaders;
     /**
@@ -68,11 +67,13 @@ public class HandlerConfiguration {
     public HandlerConfiguration(Set<String> roles, Set<QName> portKnownHeaders,
                                 List<Handler> handlerChain,
                                 List<LogicalHandler> logicalHandlers, List<SOAPHandler> soapHandlers,
+                                List<MessageHandler> messageHandlers,
                                 Set<QName> handlerKnownHeaders) {
         this.roles = roles;
         this.handlerChain = handlerChain;
         this.logicalHandlers = logicalHandlers;
         this.soapHandlers = soapHandlers;
+        this.messageHandlers = messageHandlers;
         this.handlerKnownHeaders = handlerKnownHeaders;
         this.knownHeaders = new HashSet<QName>();
         if(portKnownHeaders != null)
@@ -104,6 +105,10 @@ public class HandlerConfiguration {
         return soapHandlers;
     }
 
+    public List<MessageHandler> getMessageHandlers() {
+        return messageHandlers;
+    }
+
     public Set<QName> getKnownHeaders() {
         return knownHeaders;
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java
deleted file mode 100644
index a48d8265f09..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.xml.internal.ws.client;
-
-import com.sun.xml.internal.ws.util.CompletedFuture;
-
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-
-/**
- * {@link Response} implementation.
- *
- * @author Kohsuke Kawaguchi
- * @author Kathy Walsh
- */
-public final class ResponseImpl<T> extends FutureTask<T> implements Response<T>, ResponseContextReceiver {
-
-    /**
-     * Optional {@link AsyncHandler} that gets invoked
-     * at the completion of the task.
-     */
-    private final AsyncHandler<T> handler;
-    private ResponseContext responseContext;
-
-    private final Callable<T> callable;
-
-    /**
-     *
-     * @param callable
-     *      This {@link Callable} is executed asynchronously.
-     * @param handler
-     *      Optional {@link AsyncHandler} to invoke at the end
-     *      of the processing. Can be null.
-     */
-    public ResponseImpl(Callable<T> callable, AsyncHandler<T> handler) {
-        super(callable);
-        this.callable = callable;
-        this.handler = handler;
-    }
-
-    @Override
-    public void run() {
-        // override so that we call set()
-        try {
-            set(callable.call(), null);
-        } catch (Throwable t) {
-            set(null, t);
-        }
-    }
-
-    protected void set(final T v, final Throwable t) {
-        // call the handler before we mark the future as 'done'
-        if (handler!=null) {
-            try {
-                /**
-                 * {@link Response} object passed into the callback.
-                 * We need a separate {@link Future} because we don't want {@link ResponseImpl}
-                 * to be marked as 'done' before the callback finishes execution.
-                 * (That would provide implicit synchronization between the application code
-                 * in the main thread and the callback code, and is compatible with the JAX-RI 2.0 FCS.
-                 */
-                class CallbackFuture<T> extends CompletedFuture<T> implements Response<T> {
-                    public CallbackFuture(T v, Throwable t) {
-                        super(v, t);
-                    }
-
-                    public Map<String, Object> getContext() {
-                        return ResponseImpl.this.getContext();
-                    }
-                }
-                handler.handleResponse(new CallbackFuture<T>(v, t));
-            } catch (Throwable e) {
-                super.setException(e);
-                return;
-            }
-        }
-        if (t != null) {
-            super.setException(t);
-        } else {
-            super.set(v);
-        }
-    }
-
-    public ResponseContext getContext() {
-        return responseContext;
-    }
-
-    public void setResponseContext(ResponseContext rc) {
-        responseContext = rc;
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/Stub.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/Stub.java
index a1c51601440..4f386c212a5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/Stub.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/Stub.java
@@ -27,7 +27,6 @@ package com.sun.xml.internal.ws.client;
 
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
-import com.sun.xml.internal.ws.Closeable;
 import com.sun.xml.internal.ws.model.wsdl.WSDLProperties;
 import com.sun.xml.internal.ws.api.EndpointAddress;
 import com.sun.xml.internal.ws.api.WSBinding;
@@ -70,7 +69,7 @@ import java.util.concurrent.Executor;
  *
  * @author Kohsuke Kawaguchi
  */
-public abstract class Stub implements WSBindingProvider, ResponseContextReceiver, Closeable {
+public abstract class Stub implements WSBindingProvider, ResponseContextReceiver  {
 
     /**
      * Reuse pipelines as it's expensive to create.
@@ -199,33 +198,7 @@ public abstract class Stub implements WSBindingProvider, ResponseContextReceiver
      *                       So we take a setter that abstracts that away.
      */
     protected final Packet process(Packet packet, RequestContext requestContext, ResponseContextReceiver receiver) {
-        {// fill in Packet
-            packet.proxy = this;
-            packet.handlerConfig = binding.getHandlerConfig();
-            requestContext.fill(packet);
-            if (wsdlProperties != null) {
-                packet.addSatellite(wsdlProperties);
-            }
-            if (addrVersion != null) {
-                // populate request WS-Addressing headers
-                HeaderList headerList = packet.getMessage().getHeaders();
-                headerList.fillRequestAddressingHeaders(wsdlPort, binding, packet);
-
-
-                // Spec is not clear on if ReferenceParameters are to be added when addressing is not enabled,
-                // but the EPR has ReferenceParameters.
-                // Current approach: Add ReferenceParameters only if addressing enabled.
-                if (endpointReference != null)
-                    endpointReference.addReferenceParameters(packet.getMessage().getHeaders());
-            }
-
-            // to make it multi-thread safe we need to first get a stable snapshot
-            Header[] hl = userOutboundHeaders;
-            if(hl!=null)
-                packet.getMessage().getHeaders().addAll(hl);
-        }
-
-
+        configureRequestPacket(packet, requestContext);
         Pool<Tube> pool = tubes;
         if (pool == null)
             throw new WebServiceException("close method has already been invoked"); // TODO: i18n
@@ -250,6 +223,33 @@ public abstract class Stub implements WSBindingProvider, ResponseContextReceiver
         }
     }
 
+    private void configureRequestPacket(Packet packet, RequestContext requestContext) {
+        // fill in Packet
+        packet.proxy = this;
+        packet.handlerConfig = binding.getHandlerConfig();
+        requestContext.fill(packet);
+        if (wsdlProperties != null) {
+            packet.addSatellite(wsdlProperties);
+        }
+        if (addrVersion != null) {
+            // populate request WS-Addressing headers
+            HeaderList headerList = packet.getMessage().getHeaders();
+            headerList.fillRequestAddressingHeaders(wsdlPort, binding, packet);
+
+
+            // Spec is not clear on if ReferenceParameters are to be added when addressing is not enabled,
+            // but the EPR has ReferenceParameters.
+            // Current approach: Add ReferenceParameters only if addressing enabled.
+            if (endpointReference != null)
+                endpointReference.addReferenceParameters(packet.getMessage().getHeaders());
+        }
+
+        // to make it multi-thread safe we need to first get a stable snapshot
+        Header[] hl = userOutboundHeaders;
+        if(hl!=null)
+                packet.getMessage().getHeaders().addAll(hl);
+    }
+
     /**
      * Passes a message through a {@link Tube}line for processing. The processing happens
      * asynchronously and when the response is available, Fiber.CompletionCallback is
@@ -269,16 +269,7 @@ public abstract class Stub implements WSBindingProvider, ResponseContextReceiver
      */
     protected final void processAsync(Packet request, RequestContext requestContext, final Fiber.CompletionCallback completionCallback) {
         // fill in Packet
-        request.proxy = this;
-        request.handlerConfig = binding.getHandlerConfig();
-        requestContext.fill(request);
-        if (wsdlProperties != null) {
-            request.addSatellite(wsdlProperties);
-        }
-        if (AddressingVersion.isEnabled(binding)) {
-            if(endpointReference!=null)
-                endpointReference.addReferenceParameters(request.getMessage().getHeaders());
-        }
+        configureRequestPacket(request, requestContext);
 
         final Pool<Tube> pool = tubes;
         if (pool == null)
@@ -403,4 +394,8 @@ public abstract class Stub implements WSBindingProvider, ResponseContextReceiver
         return Collections.unmodifiableList((HeaderList)
             responseContext.get(JAXWSProperties.INBOUND_HEADER_LIST_PROPERTY));
     }
+
+    public final void setAddress(String address) {
+        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
index f9f039304dc..c8ee78bae17 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java
@@ -35,7 +35,7 @@ import com.sun.xml.internal.ws.api.WSService;
 import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.client.ServiceInterceptor;
 import com.sun.xml.internal.ws.api.client.ServiceInterceptorFactory;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
+import com.sun.xml.internal.ws.api.model.SEIModel;
 import com.sun.xml.internal.ws.api.pipe.*;
 import com.sun.xml.internal.ws.api.server.Container;
 import com.sun.xml.internal.ws.api.server.ContainerResolver;
@@ -46,6 +46,7 @@ import com.sun.xml.internal.ws.client.HandlerConfigurator.AnnotationConfigurator
 import com.sun.xml.internal.ws.client.HandlerConfigurator.HandlerResolverImpl;
 import com.sun.xml.internal.ws.client.sei.SEIStub;
 import com.sun.xml.internal.ws.developer.WSBindingProvider;
+import com.sun.xml.internal.ws.developer.UsesJAXBContextFeature;
 import com.sun.xml.internal.ws.model.AbstractSEIModelImpl;
 import com.sun.xml.internal.ws.model.RuntimeModeler;
 import com.sun.xml.internal.ws.model.SOAPSEIModel;
@@ -55,6 +56,7 @@ import com.sun.xml.internal.ws.model.wsdl.WSDLServiceImpl;
 import com.sun.xml.internal.ws.resources.ClientMessages;
 import com.sun.xml.internal.ws.resources.DispatchMessages;
 import com.sun.xml.internal.ws.resources.ProviderApiMessages;
+import com.sun.xml.internal.ws.util.JAXWSUtils;
 import com.sun.xml.internal.ws.util.ServiceConfigurationError;
 import com.sun.xml.internal.ws.util.ServiceFinder;
 import static com.sun.xml.internal.ws.util.xml.XmlUtil.createDefaultCatalogResolver;
@@ -62,6 +64,7 @@ import com.sun.xml.internal.ws.wsdl.parser.RuntimeWSDLParser;
 import org.xml.sax.SAXException;
 
 import javax.jws.HandlerChain;
+import javax.jws.WebService;
 import javax.xml.bind.JAXBContext;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -172,9 +175,18 @@ public class WSServiceDelegate extends WSService {
         //we cant create a Service without serviceName
         if (serviceName == null)
             throw new WebServiceException(ClientMessages.INVALID_SERVICE_NAME_NULL(serviceName));
+
+        InitParams initParams = INIT_PARAMS.get();
+        INIT_PARAMS.set(null);  // mark it as consumed
+        if(initParams==null)    initParams = EMPTY_PARAMS;
+
         this.serviceName = serviceName;
         this.serviceClass = serviceClass;
-        this.container = ContainerResolver.getInstance().getContainer();
+        Container tContainer = initParams.getContainer()!=null ? initParams.getContainer() : ContainerResolver.getInstance().getContainer();
+        if (tContainer == Container.NONE) {
+            tContainer = new ClientContainer();
+        }
+        this.container = tContainer;
 
         // load interceptor
         ServiceInterceptor interceptor = ServiceInterceptorFactory.load(this, Thread.currentThread().getContextClassLoader());
@@ -185,6 +197,19 @@ public class WSServiceDelegate extends WSService {
         this.serviceInterceptor = interceptor;
 
 
+        //if wsdl is null, try and get it from the WebServiceClient.wsdlLocation
+        if(wsdl == null){
+            if(serviceClass != Service.class){
+                WebServiceClient wsClient = AccessController.doPrivileged(new PrivilegedAction<WebServiceClient>() {
+                        public WebServiceClient run() {
+                            return serviceClass.getAnnotation(WebServiceClient.class);
+                        }
+                    });
+                String wsdlLocation = wsClient.wsdlLocation();
+                wsdlLocation = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation));
+                wsdl = new StreamSource(wsdlLocation);
+            }
+        }
         WSDLServiceImpl service=null;
         if (wsdl != null) {
             try {
@@ -219,7 +244,7 @@ public class WSServiceDelegate extends WSService {
     }
 
     /**
-     * Parses the WSDL and builds {@link WSDLModel}.
+     * Parses the WSDL and builds {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLModel}.
      * @param wsdlDocumentLocation
      *      Either this or <tt>wsdl</tt> parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
@@ -227,7 +252,7 @@ public class WSServiceDelegate extends WSService {
     private WSDLModelImpl parseWSDL(URL wsdlDocumentLocation, Source wsdlSource) {
         try {
             return RuntimeWSDLParser.parse(wsdlDocumentLocation, wsdlSource, createDefaultCatalogResolver(),
-                true, ServiceFinder.find(WSDLParserExtension.class).toArray());
+                true, getContainer(), ServiceFinder.find(WSDLParserExtension.class).toArray());
         } catch (IOException e) {
             throw new WebServiceException(e);
         } catch (XMLStreamException e) {
@@ -273,8 +298,19 @@ public class WSServiceDelegate extends WSService {
     public <T> T getPort(QName portName, Class<T> portInterface, WebServiceFeature... features) {
         if (portName == null || portInterface == null)
             throw new IllegalArgumentException();
-        WSDLPortImpl portModel = getPortModel(portName);
-        return getPort(portModel.getEPR(),portName,portInterface,features);
+        WSDLServiceImpl tWsdlService = this.wsdlService;
+        if (tWsdlService == null) {
+            // assigning it to local variable and not setting it back to this.wsdlService intentionally
+            // as we don't want to include the service instance with information gathered from sei
+            tWsdlService = getWSDLModelfromSEI(portInterface);
+            //still null? throw error need wsdl metadata to create a proxy
+            if (tWsdlService == null) {
+                throw new WebServiceException(ProviderApiMessages.NO_WSDL_NO_PORT(portInterface.getName()));
+            }
+
+        }
+        WSDLPortImpl portModel = getPortModel(tWsdlService, portName);
+        return getPort(portModel.getEPR(), portName, portInterface, features);
     }
 
     public <T> T getPort(EndpointReference epr, Class<T> portInterface, WebServiceFeature... features) {
@@ -291,12 +327,22 @@ public class WSServiceDelegate extends WSService {
 
     private <T> T getPort(WSEndpointReference wsepr, QName portName, Class<T> portInterface,
                           WebServiceFeature... features) {
-        addSEI(portName, portInterface);
-        return createEndpointIFBaseProxy(wsepr,portName,portInterface,features);
+        SEIPortInfo spi = addSEI(portName, portInterface, features);
+        return createEndpointIFBaseProxy(wsepr,portName,portInterface,features, spi);
     }
     public <T> T getPort(Class<T> portInterface, WebServiceFeature... features) {
         //get the portType from SEI
         QName portTypeName = RuntimeModeler.getPortTypeName(portInterface);
+        WSDLServiceImpl wsdlService = this.wsdlService;
+        if(wsdlService == null) {
+            // assigning it to local variable and not setting it back to this.wsdlService intentionally
+            // as we don't want to include the service instance with information gathered from sei
+            wsdlService = getWSDLModelfromSEI(portInterface);
+            //still null? throw error need wsdl metadata to create a proxy
+            if(wsdlService == null) {
+                throw new WebServiceException(ProviderApiMessages.NO_WSDL_NO_PORT(portInterface.getName()));
+            }
+        }
         //get the first port corresponding to the SEI
         WSDLPortImpl port = wsdlService.getMatchingPort(portTypeName);
         if (port == null)
@@ -376,7 +422,10 @@ public class WSServiceDelegate extends WSService {
     private Tube createPipeline(PortInfo portInfo, WSBinding binding) {
         //Check all required WSDL extensions are understood
         checkAllWSDLExtensionsUnderstood(portInfo,binding);
-
+        SEIModel seiModel = null;
+        if(portInfo instanceof SEIPortInfo) {
+            seiModel = ((SEIPortInfo)portInfo).model;
+        }
         BindingID bindingId = portInfo.bindingId;
 
         TubelineAssembler assembler = TubelineAssemblerFactory.create(
@@ -387,7 +436,7 @@ public class WSServiceDelegate extends WSService {
                 new ClientTubeAssemblerContext(
                         portInfo.targetEndpoint,
                         portInfo.portModel,
-                        this, binding, container));
+                        this, binding, container,((BindingImpl)binding).createCodec(),seiModel));
     }
 
     /**
@@ -422,6 +471,11 @@ public class WSServiceDelegate extends WSService {
          return dispatch;
     }
 
+    @Override
+    public @NotNull Container getContainer() {
+        return container;
+    }
+
     public Dispatch<Object> createDispatch(QName portName, JAXBContext jaxbContext, Service.Mode mode, WebServiceFeature... webServiceFeatures) {
         WebServiceFeatureList featureList =  new WebServiceFeatureList(webServiceFeatures);
         WSEndpointReference wsepr = null;
@@ -445,7 +499,7 @@ public class WSServiceDelegate extends WSService {
         // TODO: what if it has different epr address?
         {
             PortInfo portInfo = new PortInfo(this, (wsepr.getAddress() == null) ? null : EndpointAddress.create(wsepr.getAddress()), eprPortName,
-                    getPortModel(eprPortName).getBinding().getBindingId());
+                    getPortModel(wsdlService, eprPortName).getBinding().getBindingId());
             if (!ports.containsKey(eprPortName)) {
                 ports.put(eprPortName, portInfo);
             }
@@ -506,6 +560,34 @@ public class WSServiceDelegate extends WSService {
         return portName;
 
     }
+
+    private WSDLServiceImpl getWSDLModelfromSEI(final Class sei) {
+        WebService ws = AccessController.doPrivileged(new PrivilegedAction<WebService>() {
+            public WebService run() {
+                return (WebService) sei.getAnnotation(WebService.class);
+            }
+        });
+        if (ws == null || ws.wsdlLocation().equals(""))
+            return null;
+        String wsdlLocation = ws.wsdlLocation();
+        wsdlLocation = JAXWSUtils.absolutize(JAXWSUtils.getFileOrURLName(wsdlLocation));
+        Source wsdl = new StreamSource(wsdlLocation);
+        WSDLServiceImpl service = null;
+
+        try {
+            URL url = wsdl.getSystemId() == null ? null : new URL(wsdl.getSystemId());
+            WSDLModelImpl model = parseWSDL(url, wsdl);
+            service = model.getService(this.serviceName);
+            if (service == null)
+                throw new WebServiceException(
+                        ClientMessages.INVALID_SERVICE_NAME(this.serviceName,
+                                buildNameList(model.getServices().keySet())));
+        } catch (MalformedURLException e) {
+            throw new WebServiceException(ClientMessages.INVALID_WSDL_URL(wsdl.getSystemId()));
+        }
+        return service;
+    }
+
     public QName getServiceName() {
         return serviceName;
     }
@@ -531,7 +613,8 @@ public class WSServiceDelegate extends WSService {
         }
     }
 
-    private <T> T createEndpointIFBaseProxy(@Nullable WSEndpointReference epr,QName portName, Class<T> portInterface, WebServiceFeature[] webServiceFeatures) {
+    private <T> T createEndpointIFBaseProxy(@Nullable WSEndpointReference epr,QName portName, Class<T> portInterface,
+                                            WebServiceFeature[] webServiceFeatures, SEIPortInfo eif) {
         //fail if service doesnt have WSDL
         if (wsdlService == null)
             throw new WebServiceException(ClientMessages.INVALID_SERVICE_NO_WSDL(serviceName));
@@ -541,8 +624,6 @@ public class WSServiceDelegate extends WSService {
                 ClientMessages.INVALID_PORT_NAME(portName,buildWsdlPortNames()));
         }
 
-        SEIPortInfo eif = seiContext.get(portName);
-
         BindingImpl binding = eif.createBinding(webServiceFeatures,portInterface);
         SEIStub pis = new SEIStub(this, binding, eif.model, createPipeline(eif, binding), epr);
 
@@ -569,11 +650,11 @@ public class WSServiceDelegate extends WSService {
      *
      * @return guaranteed to be non-null.
      */
-    public @NotNull WSDLPortImpl getPortModel(QName portName) {
+    private @NotNull WSDLPortImpl getPortModel(WSDLServiceImpl wsdlService, QName portName) {
         WSDLPortImpl port = wsdlService.get(portName);
         if (port == null)
             throw new WebServiceException(
-                ClientMessages.INVALID_PORT_NAME(portName,buildWsdlPortNames()));
+                    ClientMessages.INVALID_PORT_NAME(portName, buildWsdlPortNames()));
         return port;
     }
 
@@ -582,19 +663,33 @@ public class WSServiceDelegate extends WSService {
      * {@link SEIPortInfo} about a given SEI (linked from the {@link Service}-derived class.)
      */
     //todo: valid port in wsdl
-    private void addSEI(QName portName, Class portInterface) throws WebServiceException {
+    private SEIPortInfo addSEI(QName portName, Class portInterface, WebServiceFeature... features) throws WebServiceException {
+        boolean ownModel = useOwnSEIModel(features);
+        if (ownModel) {
+            // Create a new model and do not cache it
+            return createSEIPortInfo(portName, portInterface, features);
+        }
+
         SEIPortInfo spi = seiContext.get(portName);
-        if (spi != null) return;
-        WSDLPortImpl wsdlPort = getPortModel(portName);
-        RuntimeModeler modeler = new RuntimeModeler(portInterface, serviceName, wsdlPort);
+        if (spi == null) {
+            spi = createSEIPortInfo(portName, portInterface, features);
+            seiContext.put(spi.portName, spi);
+            ports.put(spi.portName, spi);
+        }
+        return spi;
+    }
+
+    private SEIPortInfo createSEIPortInfo(QName portName, Class portInterface, WebServiceFeature... features) {
+        WSDLPortImpl wsdlPort = getPortModel(wsdlService, portName);
+        RuntimeModeler modeler = new RuntimeModeler(portInterface, serviceName, wsdlPort, features);
+        modeler.setClassLoader(portInterface.getClassLoader());
         modeler.setPortName(portName);
         AbstractSEIModelImpl model = modeler.buildRuntimeModel();
+        return new SEIPortInfo(this, portInterface, (SOAPSEIModel) model, wsdlPort);
+    }
 
-        spi = new SEIPortInfo(this, portInterface, (SOAPSEIModel) model, wsdlPort);
-        seiContext.put(spi.portName, spi);
-        //seiContext.put(spi.sei, spi);
-        ports.put(spi.portName, spi);
-
+    private boolean useOwnSEIModel(WebServiceFeature... features) {
+        return WebServiceFeatureList.getFeature(features, UsesJAXBContextFeature.class) != null;
     }
 
     public WSDLServiceImpl getWsdlService() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java
index 18ee24b29d8..43eaa332761 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java
@@ -57,7 +57,7 @@ public class DataSourceDispatch extends DispatchImpl<DataSource> {
             case PAYLOAD:
                 throw new IllegalArgumentException("DataSource use is not allowed in Service.Mode.PAYLOAD\n");
             case MESSAGE:
-                return new Packet(XMLMessage.create(arg));
+                return new Packet(XMLMessage.create(arg, binding));
             default:
                 throw new WebServiceException("Unrecognized message mode");
         }
@@ -72,7 +72,7 @@ public class DataSourceDispatch extends DispatchImpl<DataSource> {
             // TODO Need to call hasUnconsumedDataSource()
             return hasDS.getDataSource();
         } else if (message instanceof PayloadSourceMessage) {
-            return XMLMessage.getDataSource(message);
+            return XMLMessage.getDataSource(message, binding);
         }
         return null;
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java
index 71ee098bfdc..cf7b2cd93cd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java
@@ -66,11 +66,10 @@ import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.http.HTTPBinding;
 import javax.xml.ws.soap.SOAPBinding;
 import javax.xml.ws.soap.SOAPFaultException;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLDecoder;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -179,12 +178,12 @@ public abstract class DispatchImpl<T> extends Stub implements Dispatch<T> {
         } catch (JAXBException e) {
             //TODO: i18nify
             throw new DeserializationException(DispatchMessages.INVALID_RESPONSE_DESERIALIZATION(),e);
-        } catch(RuntimeException e){
-            //it could be a WebServiceException or a ProtocolException or any RuntimeException
-            // resulting due to some internal bug.
+        } catch(WebServiceException e){
+            //it could be a WebServiceException or a ProtocolException
             throw e;
         } catch(Throwable e){
-            //its some other exception resulting from user error, wrap it in
+            // it could be a RuntimeException resulting due to some internal bug or
+            // its some other exception resulting from user error, wrap it in
             // WebServiceException
             throw new WebServiceException(e);
         }
@@ -197,12 +196,21 @@ public abstract class DispatchImpl<T> extends Stub implements Dispatch<T> {
     }
 
     public final void invokeOneWay(T in) {
+        try {
+            checkNullAllowed(in, requestContext, binding, mode);
 
-        checkNullAllowed(in, requestContext, binding, mode);
-
-        Packet request = createPacket(in);
-        setProperties(request,false);
-        Packet response = process(request,requestContext,this);
+            Packet request = createPacket(in);
+            setProperties(request,false);
+            Packet response = process(request,requestContext,this);
+        } catch(WebServiceException e){
+            //it could be a WebServiceException or a ProtocolException
+            throw e;
+        } catch(Throwable e){
+            // it could be a RuntimeException resulting due to some internal bug or
+            // its some other exception resulting from user error, wrap it in
+            // WebServiceException
+            throw new WebServiceException(e);
+        }
     }
 
     void setProperties(Packet packet, boolean expectReply) {
@@ -310,11 +318,27 @@ public abstract class DispatchImpl<T> extends Stub implements Dispatch<T> {
 
         final String path = (pathInfo != null) ? pathInfo : endpointURI.getPath();
         try {
-            final URI temp = new URI(null, null, path, query, fragment);
-            return endpointURI.resolve(temp).toURL().toExternalForm();
-        } catch (URISyntaxException e) {
-            throw new WebServiceException(DispatchMessages.INVALID_URI_PATH_QUERY(path ,query));
-        } catch (MalformedURLException e) {
+            //final URI temp = new URI(null, null, path, query, fragment);
+            //return endpointURI.resolve(temp).toURL().toExternalForm();
+            // Using the following HACK instead of the above to avoid double encoding of
+            // the query. Application's QUERY_STRING is encoded using URLEncoder.encode().
+            // If we use that query in URI's constructor, it is encoded again.
+            // URLEncoder's encoding is not the same as URI's encoding of the query.
+            // See {@link URL}
+            StringBuilder spec = new StringBuilder();
+            if (path != null) {
+                spec.append(path);
+            }
+            if (query != null) {
+                spec.append("?");
+                spec.append(query);
+            }
+            if (fragment != null) {
+                spec.append("#");
+                spec.append(fragment);
+            }
+            return new URL(endpointURI.toURL(), spec.toString()).toExternalForm();
+       } catch (MalformedURLException e) {
             throw new WebServiceException(DispatchMessages.INVALID_URI_RESOLUTION(path));
         }
     }
@@ -402,7 +426,7 @@ public abstract class DispatchImpl<T> extends Stub implements Dispatch<T> {
             this.param = param;
         }
 
-        public void run () {
+        public void do_run () {
             checkNullAllowed(param, rc, binding, mode);
             Packet message = createPacket(param);
             resolveEndpointAddress(message, rc);
@@ -422,18 +446,25 @@ public abstract class DispatchImpl<T> extends Stub implements Dispatch<T> {
                     } catch (JAXBException e) {
                         //TODO: i18nify
                         responseImpl.set(null, new DeserializationException(DispatchMessages.INVALID_RESPONSE_DESERIALIZATION(),e));
-                    } catch(RuntimeException e){
-                        //it could be a WebServiceException or a ProtocolException or any RuntimeException
-                        // resulting due to some internal bug.
+                    } catch(WebServiceException e){
+                        //it could be a WebServiceException or a ProtocolException
                         responseImpl.set(null, e);
                     } catch(Throwable e){
-                        //its some other exception resulting from user error, wrap it in
+                        // It could be any RuntimeException resulting due to some internal bug.
+                        // or its some other exception resulting from user error, wrap it in
                         // WebServiceException
                         responseImpl.set(null, new WebServiceException(e));
                     }
                 }
                 public void onCompletion(@NotNull Throwable error) {
-                    responseImpl.set(null, error);
+                    if (error instanceof WebServiceException) {
+                        responseImpl.set(null, error);
+
+                    } else {
+                        //its RuntimeException or some other exception resulting from user error, wrap it in
+                        // WebServiceException
+                        responseImpl.set(null, new WebServiceException(error));
+                    }
                 }
             };
             processAsync(message,rc, callback);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java
index 58478dcb356..cb8fe45864c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java
@@ -60,7 +60,7 @@ final class RESTSourceDispatch extends DispatchImpl<Source> {
     Source toReturnValue(Packet response) {
         Message msg = response.getMessage();
         try {
-            return new StreamSource(XMLMessage.getDataSource(msg).getInputStream());
+            return new StreamSource(XMLMessage.getDataSource(msg, binding).getInputStream());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java
index ac2405efc27..f61f75a3222 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java
@@ -32,20 +32,17 @@ import com.sun.xml.internal.ws.binding.BindingImpl;
 import com.sun.xml.internal.ws.client.WSServiceDelegate;
 import com.sun.xml.internal.ws.message.saaj.SAAJMessage;
 import com.sun.xml.internal.ws.resources.DispatchMessages;
+import com.sun.xml.internal.ws.transport.Headers;
 
 import javax.xml.namespace.QName;
 import javax.xml.soap.MimeHeader;
-import javax.xml.soap.MimeHeaders;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.ws.Service;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.handler.MessageContext;
-import java.util.ArrayList;
-import java.util.HashMap;
+
 import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 /**
  * The <code>SOAPMessageDispatch</code> class provides support
@@ -63,26 +60,14 @@ public class SOAPMessageDispatch extends com.sun.xml.internal.ws.client.dispatch
     }
 
     Packet createPacket(SOAPMessage arg) {
-
-        if (arg == null && !isXMLHttp(binding))
-           throw new WebServiceException(DispatchMessages.INVALID_NULLARG_SOAP_MSGMODE(mode.name(), Service.Mode.PAYLOAD.toString()));
-
-        MimeHeaders mhs = arg.getMimeHeaders();
-        // TODO: these two lines seem dangerous. It should be left up to the transport and codec
-        // to decide how they are sent. remove after 2.1 FCS - KK.
-        mhs.addHeader("Content-Type", "text/xml");
-        mhs.addHeader("Content-Transfer-Encoding", "binary");
-        Map<String, List<String>> ch = new HashMap<String, List<String>>();
-        for (Iterator iter = arg.getMimeHeaders().getAllHeaders(); iter.hasNext();)
-        {
+        Iterator iter = arg.getMimeHeaders().getAllHeaders();
+        Headers ch = new Headers();
+        while(iter.hasNext()) {
             MimeHeader mh = (MimeHeader) iter.next();
-            List<String> h = new ArrayList<String>();
-            h.add(mh.getValue());
-            ch.put(mh.getName(), h);
+            ch.add(mh.getName(), mh.getValue());
         }
-
         Packet packet = new Packet(new SAAJMessage(arg));
-        packet.invocationProperties.put(MessageContext.HTTP_REQUEST_HEADERS,ch);
+        packet.invocationProperties.put(MessageContext.HTTP_REQUEST_HEADERS, ch);
         return packet;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java
deleted file mode 100644
index 1a9d937cc85..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.xml.internal.ws.client.sei;
-
-import com.sun.xml.internal.bind.api.AccessorException;
-import com.sun.xml.internal.bind.api.Bridge;
-import com.sun.xml.internal.bind.api.CompositeStructure;
-import com.sun.xml.internal.bind.api.RawAccessor;
-import com.sun.xml.internal.ws.api.SOAPVersion;
-import com.sun.xml.internal.ws.api.message.Message;
-import com.sun.xml.internal.ws.api.message.Messages;
-import com.sun.xml.internal.ws.api.model.SEIModel;
-import com.sun.xml.internal.ws.model.ParameterImpl;
-import com.sun.xml.internal.ws.model.WrapperParameter;
-import com.sun.xml.internal.ws.message.jaxb.JAXBMessage;
-import java.util.Collection;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceException;
-import java.util.List;
-
-/**
- * Builds Async bean
- *
- * @see MessageFiller
- * @author Jitendra Kotamraju
- */
-abstract class AsyncBuilder {
-
-    abstract Object fillAsyncBean(Object[] methodArgs, Object returnValue, Object bean);
-
-    /**
-     * Used to create a payload JAXB object just by taking
-     * one of the parameters.
-     */
-    final static class Bare extends AsyncBuilder {
-        /**
-         * The index of the method invocation parameters that goes into the payload.
-         */
-        private final int methodPos;
-        private final ValueGetter getter;
-        private final RawAccessor accessor;
-
-        /**
-         * Creates a {@link BodyBuilder} from a bare parameter.
-         */
-        Bare(Class wrapper, ParameterImpl p) {
-            this.methodPos = p.getIndex();
-            this.getter = ValueGetter.get(p);
-            QName name = p.getName();
-            try {
-                accessor = p.getOwner().getJAXBContext().getElementPropertyAccessor(
-                        wrapper, name.getNamespaceURI(), name.getLocalPart() );
-            } catch (JAXBException e) {
-                throw new WebServiceException(  // TODO: i18n
-                    wrapper+" do not have a property of the name "+name,e);
-            }
-        }
-
-        /**
-         * Picks up an object from the method arguments and uses it.
-         */
-        Object fillAsyncBean(Object[] methodArgs, Object returnValue, Object bean) {
-            Object obj = (methodPos == -1) ? returnValue : getter.get(methodArgs[methodPos]);
-            try {
-                accessor.set(bean, obj);
-            } catch (Exception e) {
-                throw new WebServiceException(e);    // TODO:i18n
-            }
-            return bean;
-        }
-    }
-
-    final static class Filler extends AsyncBuilder {
-        /**
-         * The index of the method invocation parameters that goes into the payload.
-         */
-        private final int methodPos;
-        private final ValueGetter getter;
-
-        /**
-         * Creates a {@link BodyBuilder} from a bare parameter.
-         */
-        Filler(ParameterImpl p) {
-            this.methodPos = p.getIndex();
-            this.getter = ValueGetter.get(p);
-        }
-
-        /**
-         * Picks up an object from the method arguments and uses it.
-         */
-        Object fillAsyncBean(Object[] methodArgs, Object returnValue, Object bean) {
-            return (methodPos == -1) ? returnValue : getter.get(methodArgs[methodPos]);
-        }
-    }
-
-    public static AsyncBuilder NONE = new None();
-
-    static final class None extends AsyncBuilder {
-        Object fillAsyncBean(Object[] methodArgs, Object returnValue, Object bean) {
-            return bean;
-        }
-    }
-
-    static final class Composite extends AsyncBuilder {
-        private final AsyncBuilder[] builders;
-        private final Class beanClass;
-
-        public Composite(AsyncBuilder[] builders, Class beanClass) {
-            this.builders = builders;
-            this.beanClass = beanClass;
-        }
-
-
-        public Composite(Collection<? extends AsyncBuilder> builders, Class beanClass) {
-            this(builders.toArray(new AsyncBuilder[builders.size()]), beanClass);
-        }
-
-        Object fillAsyncBean(Object[] methodArgs, Object returnValue, Object bean) {
-            try {
-                bean = beanClass.newInstance();
-            } catch (Exception ex) {
-                throw new WebServiceException(ex);
-            }
-            for (AsyncBuilder builder : builders) {
-                builder.fillAsyncBean(methodArgs, returnValue, bean);
-            }
-            return bean;
-        }
-    }
-
-
-    /**
-     * Used to handle a 'wrapper' style request.
-     * Common part of rpc/lit and doc/lit.
-     */
-    abstract static class Wrapped extends AsyncBuilder {
-
-        /**
-         * Where in the method argument list do they come from?
-         */
-        protected final int[] indices;
-
-        /**
-         * Abstracts away the {@link Holder} handling when touching method arguments.
-         */
-        protected final ValueGetter[] getters;
-
-        protected Wrapped(WrapperParameter wp) {
-
-            List<ParameterImpl> children = wp.getWrapperChildren();
-
-            indices = new int[children.size()];
-            getters = new ValueGetter[children.size()];
-            for( int i=0; i<indices.length; i++ ) {
-                ParameterImpl p = children.get(i);
-                indices[i] = p.getIndex();
-                getters[i] = ValueGetter.get(p);
-            }
-        }
-    }
-
-    /**
-     * Used to create a payload JAXB object by wrapping
-     * multiple parameters into one "wrapper bean".
-     */
-    final static class DocLit extends Wrapped {
-        /**
-         * How does each wrapped parameter binds to XML?
-         */
-        private final RawAccessor[] accessors;
-
-        /**
-         * Wrapper bean.
-         */
-        private final Class wrapper;
-
-        /**
-         * Creates a {@link BodyBuilder} from a {@link WrapperParameter}.
-         */
-        DocLit(Class wrapper, WrapperParameter wp) {
-            super(wp);
-            this.wrapper = wrapper;
-
-            List<ParameterImpl> children = wp.getWrapperChildren();
-
-            accessors = new RawAccessor[children.size()];
-            for( int i=0; i<accessors.length; i++ ) {
-                ParameterImpl p = children.get(i);
-                QName name = p.getName();
-                try {
-                    accessors[i] = p.getOwner().getJAXBContext().getElementPropertyAccessor(
-                        wrapper, name.getNamespaceURI(), name.getLocalPart() );
-                } catch (JAXBException e) {
-                    throw new WebServiceException(  // TODO: i18n
-                        wrapper+" do not have a property of the name "+name,e);
-                }
-            }
-
-        }
-
-        /**
-         * Packs a bunch of arguments into a {@link CompositeStructure}.
-         */
-        Object fillAsyncBean(Object[] methodArgs, Object returnValue, Object bean) {
-            try {
-                // fill in wrapped parameters from methodArgs
-                for( int i=indices.length-1; i>=0; i-- ) {
-                    Object obj = (indices[i] == -1) ? returnValue : methodArgs[indices[i]];
-                    accessors[i].set(bean,getters[i].get(obj));
-                }
-            } catch (Exception e) {
-                throw new WebServiceException(e);    // TODO:i18n
-            }
-            return bean;
-        }
-    }
-
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java
index 8910ef96cfd..c6004a06121 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java
@@ -27,22 +27,25 @@ package com.sun.xml.internal.ws.client.sei;
 
 //import com.sun.tools.internal.ws.wsdl.document.soap.SOAPBinding;
 
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
+import com.sun.xml.internal.ws.client.AsyncInvoker;
+import com.sun.xml.internal.ws.client.AsyncResponseImpl;
 import com.sun.xml.internal.ws.client.RequestContext;
-import com.sun.xml.internal.ws.client.ResponseContextReceiver;
-import com.sun.xml.internal.ws.client.ResponseImpl;
+import com.sun.xml.internal.ws.client.ResponseContext;
+import com.sun.xml.internal.ws.fault.SOAPFaultBuilder;
 import com.sun.xml.internal.ws.model.JavaMethodImpl;
 import com.sun.xml.internal.ws.model.ParameterImpl;
 import com.sun.xml.internal.ws.model.WrapperParameter;
 
 import javax.jws.soap.SOAPBinding.Style;
 import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Holder;
 import javax.xml.ws.Response;
 import javax.xml.ws.WebServiceException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Callable;
 
 /**
  * Common part between {@link CallbackMethodHandler} and {@link PollingMethodHandler}.
@@ -50,61 +53,26 @@ import java.util.concurrent.Callable;
  * @author Kohsuke Kawaguchi
  * @author Jitendra Kotamraju
  */
-abstract class AsyncMethodHandler extends MethodHandler {
+abstract class AsyncMethodHandler extends SEIMethodHandler {
 
-    private final JavaMethodImpl jm;
-    private final AsyncBuilder asyncBuilder;
-    private final SyncMethodHandler core;
+    private final ResponseBuilder responseBuilder;
     /**
-     * Async Wrapper bean.
+     * Async bean class that has setters for all out parameters
      */
-    //private final Class wrapper;
+    private final @Nullable Class asyncBeanClass;
 
-    protected AsyncMethodHandler(SEIStub owner, JavaMethodImpl jm, SyncMethodHandler core) {
-        super(owner);
-        this.jm = jm;
-        this.core = core;
+    AsyncMethodHandler(SEIStub owner, JavaMethodImpl jm, JavaMethodImpl sync) {
+        super(owner, sync);
 
-        List<ParameterImpl> rp = jm.getResponseParameters();
-
-
-
-        Class tempWrap = null;
-        for(ParameterImpl param : rp) {
-            if (param.isWrapperStyle()) {
-                WrapperParameter wrapParam = (WrapperParameter)param;
-                if (core.getJavaMethod().getBinding().getStyle() == Style.DOCUMENT) {
-                    // doc/wrapper style
-                    tempWrap = (Class)wrapParam.getTypeReference().type;
-                    break;
-                }
-                for(ParameterImpl p : wrapParam.getWrapperChildren()) {
-                    if (p.getIndex() == -1) {
-                        tempWrap = (Class)p.getTypeReference().type;
-                        break;
-                    }
-                }
-                if (tempWrap != null) {
-                    break;
-                }
-            } else {
-                if (param.getIndex() == -1) {
-                    tempWrap = (Class)param.getTypeReference().type;
-                    break;
-                }
-            }
-        }
-        Class wrapper = tempWrap;
-
-        rp = core.getJavaMethod().getResponseParameters();
+        List<ParameterImpl> rp = sync.getResponseParameters();
         int size = 0;
         for( ParameterImpl param : rp ) {
             if (param.isWrapperStyle()) {
                 WrapperParameter wrapParam = (WrapperParameter)param;
                 size += wrapParam.getWrapperChildren().size();
-                if (core.getJavaMethod().getBinding().getStyle() == Style.DOCUMENT) {
-                    // doc/wrapper - wrapper bean is in async signature
-                    // Add 2 so that it is considered as async bean case
+                if (sync.getBinding().getStyle() == Style.DOCUMENT) {
+                    // doc/asyncBeanClass - asyncBeanClass bean is in async signature
+                    // Add 2 or more so that it is considered as async bean case
                     size += 2;
                 }
             } else {
@@ -112,132 +80,128 @@ abstract class AsyncMethodHandler extends MethodHandler {
             }
         }
 
-        List<AsyncBuilder> builders = new ArrayList<AsyncBuilder>();
-        if (size == 0) {
-            // no mapping
-        } else if (size == 1) {
-            ParameterImpl single = null;
-            for( ParameterImpl param : rp ) {
+        Class tempWrap = null;
+        if (size > 1) {
+            rp = jm.getResponseParameters();
+            for(ParameterImpl param : rp) {
                 if (param.isWrapperStyle()) {
                     WrapperParameter wrapParam = (WrapperParameter)param;
+                    if (sync.getBinding().getStyle() == Style.DOCUMENT) {
+                        // doc/asyncBeanClass style
+                        tempWrap = (Class)wrapParam.getTypeReference().type;
+                        break;
+                    }
                     for(ParameterImpl p : wrapParam.getWrapperChildren()) {
-                        single = p;
+                        if (p.getIndex() == -1) {
+                            tempWrap = (Class)p.getTypeReference().type;
+                            break;
+                        }
+                    }
+                    if (tempWrap != null) {
                         break;
                     }
-                    if (single != null)
-                        break;
                 } else {
-                    single = param;
-                    break;
-                }
-            }
-            assert single != null;
-            builders.add(new AsyncBuilder.Filler(single));
-        } else {
-            for( ParameterImpl param : rp ) {
-                switch(param.getOutBinding().kind) {
-                case BODY:
-                    if(param.isWrapperStyle()) {
-                        if(param.getParent().getBinding().isRpcLit())
-                            builders.add(new AsyncBuilder.DocLit(wrapper, (WrapperParameter)param));
-                        else
-                            builders.add(new AsyncBuilder.DocLit(wrapper, (WrapperParameter)param));
-                    } else {
-                        builders.add(new AsyncBuilder.Bare(wrapper, param));
+                    if (param.getIndex() == -1) {
+                        tempWrap = (Class)param.getTypeReference().type;
+                        break;
                     }
-                    break;
-                case HEADER:
-                    builders.add(new AsyncBuilder.Bare(wrapper, param));
-                    break;
-                case ATTACHMENT:
-                    builders.add(new AsyncBuilder.Bare(wrapper, param));
-                    break;
-                case UNBOUND:
-                    /*
-                    builders.add(new AsyncBuilder.NullSetter(setter,
-                        ResponseBuilder.getVMUninitializedValue(param.getTypeReference().type)));
-                     */
-                    break;
-                default:
-                    throw new AssertionError();
                 }
             }
-
         }
-        switch(size) {      // Use size, since Composite is creating async bean
-        case 0:
-            asyncBuilder = AsyncBuilder.NONE;
-            break;
-        case 1:
-            asyncBuilder = builders.get(0);
-            break;
-        default:
-            asyncBuilder = new AsyncBuilder.Composite(builders, wrapper);
+        asyncBeanClass = tempWrap;
+
+        switch(size) {
+            case 0 :
+                responseBuilder = buildResponseBuilder(sync, ValueSetterFactory.NONE);
+                break;
+            case 1 :
+                responseBuilder = buildResponseBuilder(sync, ValueSetterFactory.SINGLE);
+                break;
+            default :
+                responseBuilder = buildResponseBuilder(sync, new ValueSetterFactory.AsyncBeanValueSetterFactory(asyncBeanClass));
         }
 
     }
 
     protected final Response<Object> doInvoke(Object proxy, Object[] args, AsyncHandler handler) {
 
-        AsyncMethodHandler.Invoker invoker = new Invoker(proxy, args);
-        ResponseImpl<Object> ft = new ResponseImpl<Object>(invoker,handler);
+        AsyncInvoker invoker = new SEIAsyncInvoker(proxy, args);
+        AsyncResponseImpl<Object> ft = new AsyncResponseImpl<Object>(invoker,handler);
         invoker.setReceiver(ft);
-
+        // TODO: Do we set this executor on Engine and run the AsyncInvoker in this thread ?
         owner.getExecutor().execute(ft);
         return ft;
     }
 
-    private class Invoker implements Callable<Object> {
-        private final Object proxy;
+    private class SEIAsyncInvoker extends AsyncInvoker {
+        // snapshot the context now. this is necessary to avoid concurrency issue,
+        // and is required by the spec
+        private final RequestContext rc = owner.requestContext.copy();
         private final Object[] args;
-        // need to take a copy. required by the spec
-        private final RequestContext snapshot = owner.requestContext.copy();
-        /**
-         * Because of the object instantiation order,
-         * we can't take this as a constructor parameter.
-         */
-        private ResponseContextReceiver receiver;
 
-        public Invoker(Object proxy, Object[] args) {
-            this.proxy = proxy;
+        SEIAsyncInvoker(Object proxy, Object[] args) {
             this.args = args;
         }
 
-        public Object call() throws Exception {
-            assert receiver!=null;
-            try {
-                // TODO: Calling the sync method has this overhead
-                Object[] newArgs;
-                Method method = core.getJavaMethod().getMethod();
-                int noOfArgs = method.getParameterTypes().length;
-                newArgs = new Object[noOfArgs];
-                for(int i=0; i < noOfArgs; i++) {
-                    if (method.getParameterTypes()[i].isAssignableFrom(Holder.class)) {
-                        Holder holder = new Holder();
-                        if (i < args.length) {
-                            holder.value = args[i];
-                        }
-                        newArgs[i] = holder;
-                    } else {
-                        newArgs[i] = args[i];
-                    }
-                }
-                Object returnValue = core.invoke(proxy,newArgs,snapshot,receiver);
-                return asyncBuilder.fillAsyncBean(newArgs, returnValue, null);
-            } catch (Throwable t) {
-                if (t instanceof RuntimeException) {
-                    if (t instanceof WebServiceException) {
-                        throw (WebServiceException)t;
-                    }
-                }  else if (t instanceof Exception) {
-                    throw (Exception)t;
-                }
-                throw new WebServiceException(t);
-            }
-        }
+        public void do_run () {
+            Packet req = new Packet(createRequestMessage(args));
+            req.soapAction = soapAction;
+            req.expectReply = !isOneWay;
+            req.getMessage().assertOneWay(isOneWay);
 
-        void setReceiver(ResponseContextReceiver receiver) {
-            this.receiver = receiver;
+            Fiber.CompletionCallback callback = new Fiber.CompletionCallback() {
+
+                public void onCompletion(@NotNull Packet response) {
+                    responseImpl.setResponseContext(new ResponseContext(response));
+                    Message msg = response.getMessage();
+                    if (msg == null) {
+                        return;
+                    }
+                    try {
+                        if(msg.isFault()) {
+                            SOAPFaultBuilder faultBuilder = SOAPFaultBuilder.create(msg);
+                            throw faultBuilder.createException(checkedExceptions);
+                        } else {
+                            Object[] rargs = new Object[1];
+                            if (asyncBeanClass != null) {
+                                rargs[0] = asyncBeanClass.newInstance();
+                            }
+                            responseBuilder.readResponse(msg, rargs);
+                            responseImpl.set(rargs[0], null);
+                        }
+                   } catch (Throwable t) {
+                        if (t instanceof RuntimeException) {
+                            if (t instanceof WebServiceException) {
+                                responseImpl.set(null, t);
+                                return;
+                            }
+                        }  else if (t instanceof Exception) {
+                            responseImpl.set(null, t);
+                            return;
+                        }
+                        //its RuntimeException or some other exception resulting from user error, wrap it in
+                        // WebServiceException
+                        responseImpl.set(null, new WebServiceException(t));
+                    }
+                }
+
+
+                public void onCompletion(@NotNull Throwable error) {
+                    if (error instanceof WebServiceException) {
+                        responseImpl.set(null, error);
+                    } else {
+                        //its RuntimeException or some other exception resulting from user error, wrap it in
+                        // WebServiceException
+                        responseImpl.set(null, new WebServiceException(error));
+                    }
+                }
+            };
+            owner.doProcessAsync(req, rc, callback);
         }
     }
+
+    ValueGetterFactory getValueGetterFactory() {
+        return ValueGetterFactory.ASYNC;
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java
index 8aab945b288..86f7eb7754d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java
@@ -109,10 +109,10 @@ abstract class BodyBuilder {
         /**
          * Creates a {@link BodyBuilder} from a bare parameter.
          */
-        Bare(ParameterImpl p, SOAPVersion soapVersion) {
+        Bare(ParameterImpl p, SOAPVersion soapVersion, ValueGetter getter) {
             super(p.getBridge(), soapVersion);
             this.methodPos = p.getIndex();
-            this.getter = ValueGetter.get(p);
+            this.getter = getter;
         }
 
         /**
@@ -140,7 +140,7 @@ abstract class BodyBuilder {
          */
         protected final ValueGetter[] getters;
 
-        protected Wrapped(WrapperParameter wp, SOAPVersion soapVersion) {
+        protected Wrapped(WrapperParameter wp, SOAPVersion soapVersion, ValueGetterFactory getter) {
             super(wp.getBridge(), soapVersion);
 
             List<ParameterImpl> children = wp.getWrapperChildren();
@@ -150,7 +150,7 @@ abstract class BodyBuilder {
             for( int i=0; i<indices.length; i++ ) {
                 ParameterImpl p = children.get(i);
                 indices[i] = p.getIndex();
-                getters[i] = ValueGetter.get(p);
+                getters[i] = getter.get(p);
             }
         }
     }
@@ -173,8 +173,8 @@ abstract class BodyBuilder {
         /**
          * Creates a {@link BodyBuilder} from a {@link WrapperParameter}.
          */
-        DocLit(WrapperParameter wp, SOAPVersion soapVersion) {
-            super(wp, soapVersion);
+        DocLit(WrapperParameter wp, SOAPVersion soapVersion, ValueGetterFactory getter) {
+            super(wp, soapVersion, getter);
 
             wrapper = (Class)wp.getBridge().getTypeReference().type;
 
@@ -249,8 +249,8 @@ abstract class BodyBuilder {
         /**
          * Creates a {@link BodyBuilder} from a {@link WrapperParameter}.
          */
-        RpcLit(WrapperParameter wp, SOAPVersion soapVersion) {
-            super(wp, soapVersion);
+        RpcLit(WrapperParameter wp, SOAPVersion soapVersion, ValueGetterFactory getter) {
+            super(wp, soapVersion, getter);
             // we'll use CompositeStructure to pack requests
             assert wp.getTypeReference().type==CompositeStructure.class;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java
index db8ec118421..20d69c90c23 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java
@@ -42,12 +42,12 @@ final class CallbackMethodHandler extends AsyncMethodHandler {
      */
     private final int handlerPos;
 
-    public CallbackMethodHandler(SEIStub owner, JavaMethodImpl jm, SyncMethodHandler core, int handlerPos) {
+    CallbackMethodHandler(SEIStub owner, JavaMethodImpl jm, JavaMethodImpl core, int handlerPos) {
         super(owner,jm,core);
         this.handlerPos = handlerPos;
     }
 
-    public Future<?> invoke(Object proxy, Object[] args) throws WebServiceException {
+    Future<?> invoke(Object proxy, Object[] args) throws WebServiceException {
         // the spec requires the last argument
         final AsyncHandler handler = (AsyncHandler)args[handlerPos];
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java
index eb4f4ba072e..b28e3d66676 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java
@@ -172,7 +172,7 @@ abstract class MessageFiller {
     }
 
     private static boolean isXMLMimeType(String mimeType){
-        return (mimeType.equals("text/xml") || mimeType.equals("application/xml")) ? true : false;
+        return (mimeType.equals("text/xml") || mimeType.equals("application/xml"));
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java
index 6dce5a8b0bd..3799e119a7b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java
@@ -63,5 +63,5 @@ public abstract class MethodHandler {
      * @throws Throwable
      *      some faults are reported in terms of checked exceptions.
      */
-    public abstract Object invoke(Object proxy, Object[] args) throws WebServiceException, Throwable;
+    abstract Object invoke(Object proxy, Object[] args) throws WebServiceException, Throwable;
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java
index 3830a19895f..2d6e42ddb9d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java
@@ -35,11 +35,11 @@ import javax.xml.ws.WebServiceException;
  */
 final class PollingMethodHandler extends AsyncMethodHandler {
 
-    public PollingMethodHandler(SEIStub owner, JavaMethodImpl jm, SyncMethodHandler core) {
+    PollingMethodHandler(SEIStub owner, JavaMethodImpl jm, JavaMethodImpl core) {
         super(owner, jm, core);
     }
 
-    public Response<?> invoke(Object proxy, Object[] args) throws WebServiceException {
+    Response<?> invoke(Object proxy, Object[] args) throws WebServiceException {
         return doInvoke(proxy,args,null);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java
index a5539c8af33..5ca052e7d44 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java
@@ -49,6 +49,7 @@ import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFault;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
 import javax.xml.transform.Source;
 import javax.xml.ws.Holder;
 import javax.xml.ws.WebServiceException;
@@ -229,7 +230,7 @@ abstract class ResponseBuilder {
             } else if(isXMLMimeType(param.getBinding().getMimeType())) {
                 return new JAXBBuilder(param, setter);
             } else {
-                throw new UnsupportedOperationException("Attachment is not mapped");
+                throw new UnsupportedOperationException("Unexpected Attachment type ="+type);
             }
         }
 
@@ -287,10 +288,20 @@ abstract class ResponseBuilder {
 
         Object mapAttachment(Attachment att, Object[] args) {
             Image image;
+            InputStream is = null;
             try {
-                image = ImageIO.read(att.asInputStream());
+                is = att.asInputStream();
+                image = ImageIO.read(is);
             } catch(IOException ioe) {
                 throw new WebServiceException(ioe);
+            } finally {
+                if (is != null) {
+                    try {
+                        is.close();
+                    } catch(IOException ioe) {
+                        throw new WebServiceException(ioe);
+                    }
+                }
             }
             return setter.put(image, args);
         }
@@ -462,7 +473,7 @@ abstract class ResponseBuilder {
 
         private final QName wrapperName;
 
-        public DocLit(WrapperParameter wp) {
+        public DocLit(WrapperParameter wp, ValueSetterFactory setterFactory) {
             wrapperName = wp.getName();
             wrapper = wp.getBridge();
             Class wrapperType = (Class) wrapper.getTypeReference().type;
@@ -480,7 +491,7 @@ abstract class ResponseBuilder {
                             wrapperType,
                             name.getNamespaceURI(),
                             p.getName().getLocalPart()),
-                        ValueSetter.get(p)
+                        setterFactory.get(p)
                     ));
                     // wrapper parameter itself always bind to body, and
                     // so do all its children
@@ -497,7 +508,7 @@ abstract class ResponseBuilder {
         public Object readResponse(Message msg, Object[] args) throws JAXBException, XMLStreamException {
             Object retVal = null;
 
-            if(parts.length>0) {
+            if (parts.length>0) {
                 XMLStreamReader reader = msg.readPayload();
                 XMLStreamReaderUtil.verifyTag(reader,wrapperName);
                 Object wrapperBean = wrapper.unmarshal(reader, (msg.getAttachments() != null) ?
@@ -521,6 +532,8 @@ abstract class ResponseBuilder {
                 // we are done with the body
                 reader.close();
                 XMLStreamReaderFactory.recycle(reader);
+            } else {
+                msg.consume();
             }
 
             return retVal;
@@ -567,14 +580,14 @@ abstract class ResponseBuilder {
 
         private QName wrapperName;
 
-        public RpcLit(WrapperParameter wp) {
+        public RpcLit(WrapperParameter wp, ValueSetterFactory setterFactory) {
             assert wp.getTypeReference().type== CompositeStructure.class;
 
             wrapperName = wp.getName();
             List<ParameterImpl> children = wp.getWrapperChildren();
             for (ParameterImpl p : children) {
                 parts.put( p.getName(), new PartBuilder(
-                    p.getBridge(), ValueSetter.get(p)
+                    p.getBridge(), setterFactory.get(p)
                 ));
                 // wrapper parameter itself always bind to body, and
                 // so do all its children
@@ -606,6 +619,11 @@ abstract class ResponseBuilder {
                         retVal = o;
                     }
                 }
+                // skip any whitespace
+                if (reader.getEventType() != XMLStreamConstants.START_ELEMENT &&
+                        reader.getEventType() != XMLStreamConstants.END_ELEMENT) {
+                    XMLStreamReaderUtil.nextElementContent(reader);
+                }
             }
 
             // we are done with the body
@@ -644,6 +662,6 @@ abstract class ResponseBuilder {
     }
 
     private static boolean isXMLMimeType(String mimeType){
-        return (mimeType.equals("text/xml") || mimeType.equals("application/xml")) ? true : false;
+        return mimeType.equals("text/xml") || mimeType.equals("application/xml");
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java
new file mode 100644
index 00000000000..07e04169db6
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.client.sei;
+
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.model.CheckedExceptionImpl;
+import com.sun.xml.internal.ws.model.JavaMethodImpl;
+import com.sun.xml.internal.ws.model.ParameterImpl;
+import com.sun.xml.internal.ws.model.WrapperParameter;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link com.sun.xml.internal.ws.client.sei.MethodHandler} that handles synchronous method invocations.
+ *
+ * <p>
+ * This class mainly performs the following two tasks:
+ * <ol>
+ *  <li>Accepts Object[] that represents arguments for a Java method,
+ *      and creates {@link com.sun.xml.internal.ws.message.jaxb.JAXBMessage} that represents a request message.
+ *  <li>Takes a {@link com.sun.xml.internal.ws.api.message.Message] that represents a response,
+ *      and extracts the return value (and updates {@link javax.xml.ws.Holder }s.)
+ * </ol>
+ *
+ * <h2>Creating {@link com.sun.xml.internal.ws.message.jaxb.JAXBMessage }</h2>
+ * <p>
+ * At the construction time, we prepare {@link com.sun.xml.internal.ws.client.sei.BodyBuilder} and {@link com.sun.xml.internal.ws.client.sei.MessageFiller}s
+ * that know how to move arguments into a {@link com.sun.xml.internal.ws.api.message.Message }.
+ * Some arguments go to the payload, some go to headers, still others go to attachments.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+abstract class SEIMethodHandler extends MethodHandler {
+
+    // these objects together create a message from method parameters
+    private final BodyBuilder bodyBuilder;
+    private final MessageFiller[] inFillers;
+
+    protected final String soapAction;
+
+    protected final boolean isOneWay;
+
+    protected final JavaMethodImpl javaMethod;
+
+    protected final Map<QName, CheckedExceptionImpl> checkedExceptions;
+
+    SEIMethodHandler(SEIStub owner, JavaMethodImpl method) {
+        super(owner);
+
+        //keep all the CheckedException model for the detail qname
+        this.checkedExceptions = new HashMap<QName, CheckedExceptionImpl>();
+        for(CheckedExceptionImpl ce : method.getCheckedExceptions()){
+            checkedExceptions.put(ce.getBridge().getTypeReference().tagName, ce);
+        }
+        //If a non-"" soapAction is specified, wsa:action the SOAPAction
+        if(method.getInputAction() != null && !method.getBinding().getSOAPAction().equals("") ) {
+            this.soapAction = method.getInputAction();
+        } else {
+            this.soapAction = method.getBinding().getSOAPAction();
+        }
+        this.javaMethod = method;
+
+        {// prepare objects for creating messages
+            List<ParameterImpl> rp = method.getRequestParameters();
+
+            BodyBuilder bodyBuilder = null;
+            List<MessageFiller> fillers = new ArrayList<MessageFiller>();
+
+            for (ParameterImpl param : rp) {
+                ValueGetter getter = getValueGetterFactory().get(param);
+
+                switch(param.getInBinding().kind) {
+                case BODY:
+                    if(param.isWrapperStyle()) {
+                        if(param.getParent().getBinding().isRpcLit())
+                            bodyBuilder = new BodyBuilder.RpcLit((WrapperParameter)param, owner.soapVersion, getValueGetterFactory());
+                        else
+                            bodyBuilder = new BodyBuilder.DocLit((WrapperParameter)param, owner.soapVersion, getValueGetterFactory());
+                    } else {
+                        bodyBuilder = new BodyBuilder.Bare(param, owner.soapVersion, getter);
+                    }
+                    break;
+                case HEADER:
+                    fillers.add(new MessageFiller.Header(
+                        param.getIndex(),
+                        param.getBridge(),
+                        getter ));
+                    break;
+                case ATTACHMENT:
+                    fillers.add(MessageFiller.AttachmentFiller.createAttachmentFiller(param, getter));
+                    break;
+                case UNBOUND:
+                    break;
+                default:
+                    throw new AssertionError(); // impossible
+                }
+            }
+
+            if(bodyBuilder==null) {
+                // no parameter binds to body. we create an empty message
+                switch(owner.soapVersion) {
+                case SOAP_11:
+                    bodyBuilder = BodyBuilder.EMPTY_SOAP11;
+                    break;
+                case SOAP_12:
+                    bodyBuilder = BodyBuilder.EMPTY_SOAP12;
+                    break;
+                default:
+                    throw new AssertionError();
+                }
+            }
+
+            this.bodyBuilder = bodyBuilder;
+            this.inFillers = fillers.toArray(new MessageFiller[fillers.size()]);
+        }
+
+        this.isOneWay = method.getMEP().isOneWay();
+    }
+
+    ResponseBuilder buildResponseBuilder(JavaMethodImpl method, ValueSetterFactory setterFactory) {
+        // prepare objects for processing response
+        List<ParameterImpl> rp = method.getResponseParameters();
+        List<ResponseBuilder> builders = new ArrayList<ResponseBuilder>();
+
+        for( ParameterImpl param : rp ) {
+            ValueSetter setter;
+            switch(param.getOutBinding().kind) {
+            case BODY:
+                if(param.isWrapperStyle()) {
+                    if(param.getParent().getBinding().isRpcLit())
+                        builders.add(new ResponseBuilder.RpcLit((WrapperParameter)param, setterFactory));
+                    else
+                        builders.add(new ResponseBuilder.DocLit((WrapperParameter)param, setterFactory));
+                } else {
+                    setter = setterFactory.get(param);
+                    builders.add(new ResponseBuilder.Body(param.getBridge(),setter));
+                }
+                break;
+            case HEADER:
+                setter = setterFactory.get(param);
+                builders.add(new ResponseBuilder.Header(owner.soapVersion, param, setter));
+                break;
+            case ATTACHMENT:
+                setter = setterFactory.get(param);
+                builders.add(ResponseBuilder.AttachmentBuilder.createAttachmentBuilder(param, setter));
+                break;
+            case UNBOUND:
+                setter = setterFactory.get(param);
+                builders.add(new ResponseBuilder.NullSetter(setter,
+                    ResponseBuilder.getVMUninitializedValue(param.getTypeReference().type)));
+                break;
+            default:
+                throw new AssertionError();
+            }
+        }
+        ResponseBuilder rb;
+        switch(builders.size()) {
+        case 0:
+            rb = ResponseBuilder.NONE;
+            break;
+        case 1:
+            rb = builders.get(0);
+            break;
+        default:
+            rb = new ResponseBuilder.Composite(builders);
+        }
+        return rb;
+    }
+
+
+    /**
+     * Creates a request {@link com.sun.xml.internal.ws.message.jaxb.JAXBMessage} from method arguments.
+     * @param args proxy invocation arguments
+     * @return Message for the arguments
+     */
+    Message createRequestMessage(Object[] args) {
+        Message msg = bodyBuilder.createMessage(args);
+
+        for (MessageFiller filler : inFillers)
+            filler.fillIn(args,msg);
+
+        return msg;
+    }
+
+    abstract ValueGetterFactory getValueGetterFactory();
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
index 56dc2d1a5d2..d08440bb185 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java
@@ -34,6 +34,7 @@ import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.model.MEP;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
 import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.Fiber;
 import com.sun.xml.internal.ws.binding.BindingImpl;
 import com.sun.xml.internal.ws.client.RequestContext;
 import com.sun.xml.internal.ws.client.ResponseContextReceiver;
@@ -61,20 +62,20 @@ public final class SEIStub extends Stub implements InvocationHandler {
         this.seiModel = seiModel;
         this.soapVersion = binding.getSOAPVersion();
 
-        Map<WSDLBoundOperation, SyncMethodHandler> syncs = new HashMap<WSDLBoundOperation, SyncMethodHandler>();
+        Map<WSDLBoundOperation, JavaMethodImpl> syncs = new HashMap<WSDLBoundOperation, JavaMethodImpl>();
 
         // fill in methodHandlers.
         // first fill in sychronized versions
         for (JavaMethodImpl m : seiModel.getJavaMethods()) {
             if (!m.getMEP().isAsync) {
                 SyncMethodHandler handler = new SyncMethodHandler(this, m);
-                syncs.put(m.getOperation(), handler);
+                syncs.put(m.getOperation(), m);
                 methodHandlers.put(m.getMethod(), handler);
             }
         }
 
         for (JavaMethodImpl jm : seiModel.getJavaMethods()) {
-            SyncMethodHandler sync = syncs.get(jm.getOperation());
+            JavaMethodImpl sync = syncs.get(jm.getOperation());
             if (jm.getMEP() == MEP.ASYNC_CALLBACK) {
                 Method m = jm.getMethod();
                 CallbackMethodHandler handler = new CallbackMethodHandler(
@@ -123,6 +124,10 @@ public final class SEIStub extends Stub implements InvocationHandler {
         return super.process(request, rc, receiver);
     }
 
+    public final void doProcessAsync(Packet request, RequestContext rc, Fiber.CompletionCallback callback) {
+        super.processAsync(request, rc, callback);
+    }
+
     protected final @NotNull QName getPortName() {
         return wsdlPort.getName();
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java
index 3c35974f009..e559aed99d6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java
@@ -66,150 +66,15 @@ import java.util.Map;
  *
  * @author Kohsuke Kawaguchi
  */
-final class SyncMethodHandler extends MethodHandler {
-
-    // these objects together create a message from method parameters
-    private final BodyBuilder bodyBuilder;
-    private final MessageFiller[] inFillers;
-
-    private final String soapAction;
-
-    private final boolean isOneWay;
-
-    private final JavaMethodImpl javaMethod;
-
-    /**
-     * Used to get a value from method invocation parameter.
-     *
-     * valueGetters[i] is for methodArgs[i], and so on.
-     */
-    /*package*/ final ValueGetter[] valueGetters;
-
+final class SyncMethodHandler extends SEIMethodHandler {
     private final ResponseBuilder responseBuilder;
-    private final Map<QName, CheckedExceptionImpl> checkedExceptions;
 
-    public SyncMethodHandler(SEIStub owner, JavaMethodImpl method) {
-        super(owner);
-
-        //keep all the CheckedException model for the detail qname
-        this.checkedExceptions = new HashMap<QName, CheckedExceptionImpl>();
-        for(CheckedExceptionImpl ce : method.getCheckedExceptions()){
-            checkedExceptions.put(ce.getBridge().getTypeReference().tagName, ce);
-        }
-        //If a non-"" soapAction is specified, wsa:action the SOAPAction
-        if(method.getInputAction() != null && !method.getBinding().getSOAPAction().equals("") ) {
-            this.soapAction = method.getInputAction();
-        } else {
-            this.soapAction = method.getBinding().getSOAPAction();
-        }
-        this.javaMethod = method;
-
-        {// prepare objects for creating messages
-            List<ParameterImpl> rp = method.getRequestParameters();
-
-            BodyBuilder bodyBuilder = null;
-            List<MessageFiller> fillers = new ArrayList<MessageFiller>();
-            valueGetters = new ValueGetter[rp.size()];
-
-            for (ParameterImpl param : rp) {
-                ValueGetter getter = ValueGetter.get(param);
-
-                switch(param.getInBinding().kind) {
-                case BODY:
-                    if(param.isWrapperStyle()) {
-                        if(param.getParent().getBinding().isRpcLit())
-                            bodyBuilder = new BodyBuilder.RpcLit((WrapperParameter)param, owner.soapVersion);
-                        else
-                            bodyBuilder = new BodyBuilder.DocLit((WrapperParameter)param, owner.soapVersion);
-                    } else {
-                        bodyBuilder = new BodyBuilder.Bare(param, owner.soapVersion);
-                    }
-                    break;
-                case HEADER:
-                    fillers.add(new MessageFiller.Header(
-                        param.getIndex(),
-                        param.getBridge(),
-                        getter ));
-                    break;
-                case ATTACHMENT:
-                    fillers.add(MessageFiller.AttachmentFiller.createAttachmentFiller(param, getter));
-                    break;
-                case UNBOUND:
-                    break;
-                default:
-                    throw new AssertionError(); // impossible
-                }
-            }
-
-            if(bodyBuilder==null) {
-                // no parameter binds to body. we create an empty message
-                switch(owner.soapVersion) {
-                case SOAP_11:
-                    bodyBuilder = BodyBuilder.EMPTY_SOAP11;
-                    break;
-                case SOAP_12:
-                    bodyBuilder = BodyBuilder.EMPTY_SOAP12;
-                    break;
-                default:
-                    throw new AssertionError();
-                }
-            }
-
-            this.bodyBuilder = bodyBuilder;
-            this.inFillers = fillers.toArray(new MessageFiller[fillers.size()]);
-        }
-
-        {// prepare objects for processing response
-            List<ParameterImpl> rp = method.getResponseParameters();
-            List<ResponseBuilder> builders = new ArrayList<ResponseBuilder>();
-
-            for( ParameterImpl param : rp ) {
-                ValueSetter setter = ValueSetter.get(param);
-                switch(param.getOutBinding().kind) {
-                case BODY:
-                    if(param.isWrapperStyle()) {
-                        if(param.getParent().getBinding().isRpcLit())
-                            builders.add(new ResponseBuilder.RpcLit((WrapperParameter)param));
-                        else
-                            builders.add(new ResponseBuilder.DocLit((WrapperParameter)param));
-                    } else {
-                        builders.add(new ResponseBuilder.Body(param.getBridge(),setter));
-                    }
-                    break;
-                case HEADER:
-                    builders.add(new ResponseBuilder.Header(owner.soapVersion, param, setter));
-                    break;
-                case ATTACHMENT:
-                    builders.add(ResponseBuilder.AttachmentBuilder.createAttachmentBuilder(param, setter));
-                    break;
-                case UNBOUND:
-                    builders.add(new ResponseBuilder.NullSetter(setter,
-                        ResponseBuilder.getVMUninitializedValue(param.getTypeReference().type)));
-                    break;
-                default:
-                    throw new AssertionError();
-                }
-            }
-
-            switch(builders.size()) {
-            case 0:
-                responseBuilder = ResponseBuilder.NONE;
-                break;
-            case 1:
-                responseBuilder = builders.get(0);
-                break;
-            default:
-                responseBuilder = new ResponseBuilder.Composite(builders);
-            }
-        }
-        this.isOneWay = method.getMEP().isOneWay();
+    SyncMethodHandler(SEIStub owner, JavaMethodImpl method) {
+        super(owner, method);
+        responseBuilder = buildResponseBuilder(method, ValueSetterFactory.SYNC);
     }
 
-    public JavaMethodImpl getJavaMethod() {
-        return javaMethod;
-    }
-
-    public Object invoke(Object proxy, Object[] args) throws Throwable {
+    Object invoke(Object proxy, Object[] args) throws Throwable {
         return invoke(proxy,args,owner.requestContext,owner);
     }
 
@@ -222,7 +87,7 @@ final class SyncMethodHandler extends MethodHandler {
      *      We take this as a separate parameter because of the async invocation
      *      handling, which requires a separate copy.
      */
-    public Object invoke(Object proxy, Object[] args, RequestContext rc, ResponseContextReceiver receiver) throws Throwable {
+    Object invoke(Object proxy, Object[] args, RequestContext rc, ResponseContextReceiver receiver) throws Throwable {
         Packet req = new Packet(createRequestMessage(args));
 
         req.soapAction = soapAction;
@@ -251,16 +116,8 @@ final class SyncMethodHandler extends MethodHandler {
         }
     }
 
-    /**
-     * Creates a request {@link JAXBMessage} from method arguments.
-     *
-     */
-    private Message createRequestMessage(Object[] args) {
-        Message msg = bodyBuilder.createMessage(args);
-
-        for (MessageFiller filler : inFillers)
-            filler.fillIn(args,msg);
-
-        return msg;
+    ValueGetterFactory getValueGetterFactory() {
+        return ValueGetterFactory.SYNC;
     }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java
index d76da3e17f8..4442453f5a3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java
@@ -25,8 +25,6 @@
 
 package com.sun.xml.internal.ws.client.sei;
 
-import com.sun.xml.internal.ws.model.ParameterImpl;
-
 import javax.jws.WebParam.Mode;
 import javax.xml.ws.Holder;
 
@@ -74,17 +72,9 @@ enum ValueGetter {
 
     /**
      * Gets the value to be sent, from a parameter given as a method argument.
+     * @param parameter that is passed by proxy
+     * @return if it holder then its value, otherise parameter itself
      */
     abstract Object get(Object parameter);
 
-    /**
-     * Returns a {@link ValueGetter} suitable for the given {@link Parameter}.
-     */
-    static ValueGetter get(ParameterImpl p) {
-        // return value is always PLAIN
-        if(p.getMode()== Mode.IN || p.getIndex() == -1)
-            return PLAIN;
-        else
-            return HOLDER;
-    }
 }
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassConverter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java
similarity index 59%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassConverter.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java
index ca59d1aac7f..3c06965c8ff 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassConverter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java
@@ -22,32 +22,36 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.synthmodel.jibxhelpers;
+package com.sun.xml.internal.ws.client.sei;
+
+import com.sun.xml.internal.ws.model.ParameterImpl;
+
+import javax.jws.WebParam;
 
 /**
- * ClassConverter
+ * {@link ValueGetterFactory} is used to create {@link ValueGetter} objects.
  *
- * @author Created by Jasper Potts (Jul 16, 2007)
+ * @author Jitendra Kotamraju
  */
-public class ClassConverter {
+abstract class ValueGetterFactory {
 
-    public static String classToString(Class c) {
-        return c == null ? "" : c.getName();
-    }
+    abstract ValueGetter get(ParameterImpl p);
 
-    public static Class stringToClass(String className) {
-        if (className == null || className.length() == 0) {
-            return null;
+    static final ValueGetterFactory SYNC = new ValueGetterFactory() {
+        ValueGetter get(ParameterImpl p) {
+            return (p.getMode()== WebParam.Mode.IN || p.getIndex() == -1)
+                    ? ValueGetter.PLAIN : ValueGetter.HOLDER;
         }
-        try {
-            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-            if (classLoader == null) classLoader = ClassConverter.class.getClassLoader();
-            return classLoader.loadClass(className);
-        } catch (ClassNotFoundException e) {
-            System.err.println("Failed to find class with name [" + className + "] in ClassConverter");
-            e.printStackTrace();
-            return null;
+    };
+
+    /**
+     * In case of SEI async signatures, there are no holders. The OUT
+     * parameters go in async bean class
+     */
+    static final ValueGetterFactory ASYNC = new ValueGetterFactory() {
+        ValueGetter get(ParameterImpl p) {
+            return ValueGetter.PLAIN;
         }
-    }
+    };
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java
index 7533178bf71..f2ee07135c4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java
@@ -27,8 +27,12 @@ package com.sun.xml.internal.ws.client.sei;
 
 import com.sun.xml.internal.ws.api.model.Parameter;
 import com.sun.xml.internal.ws.model.ParameterImpl;
+import com.sun.xml.internal.bind.api.RawAccessor;
 
 import javax.xml.ws.Holder;
+import javax.xml.ws.WebServiceException;
+import javax.xml.namespace.QName;
+import javax.xml.bind.JAXBException;
 
 /**
  * Moves a Java value unmarshalled from a response message
@@ -82,7 +86,7 @@ abstract class ValueSetter {
     /**
      * Returns a {@link ValueSetter} suitable for the given {@link Parameter}.
      */
-    public static ValueSetter get(ParameterImpl p) {
+    static ValueSetter getSync(ParameterImpl p) {
         int idx = p.getIndex();
 
         if(idx==-1)
@@ -93,6 +97,7 @@ abstract class ValueSetter {
             return new Param(idx);
     }
 
+
     private static final class ReturnValue extends ValueSetter {
         Object put(Object obj, Object[] args) {
             return obj;
@@ -125,4 +130,64 @@ abstract class ValueSetter {
             return null;
         }
     }
+
+    /**
+     * Singleton instance.
+     */
+    static final ValueSetter SINGLE_VALUE = new SingleValue();
+
+    /**
+     * Used in case of async invocation, where there is only one OUT parameter
+     */
+    private static final class SingleValue extends ValueSetter {
+        /**
+         * Set args[0] as the value
+         */
+        Object put(Object obj, Object[] args) {
+            args[0] = obj;
+            return null;
+        }
+    }
+
+    /**
+     * OUT parameters are set in async bean
+     */
+    static final class AsyncBeanValueSetter extends ValueSetter {
+
+        private final RawAccessor accessor;
+
+        AsyncBeanValueSetter(ParameterImpl p, Class wrapper) {
+            QName name = p.getName();
+            try {
+                accessor = p.getOwner().getJAXBContext().getElementPropertyAccessor(
+                            wrapper, name.getNamespaceURI(), name.getLocalPart() );
+            } catch (JAXBException e) {
+                    throw new WebServiceException(  // TODO: i18n
+                        wrapper+" do not have a property of the name "+name,e);
+            }
+        }
+
+        /**
+         * Sets the property in async bean instance
+         *
+         * @param obj property in async bean
+         * @param args args[0] contains async bean instance
+         * @return null always
+         */
+        Object put(Object obj, Object[] args) {
+            assert args != null;
+            assert args.length == 1;
+            assert args[0] != null;
+
+            Object bean = args[0];
+            try {
+                accessor.set(bean, obj);
+            } catch (Exception e) {
+                throw new WebServiceException(e);    // TODO:i18n
+            }
+            return null;
+        }
+
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java
new file mode 100644
index 00000000000..5ac7bbf42b1
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.client.sei;
+
+import com.sun.xml.internal.ws.model.ParameterImpl;
+
+import javax.xml.ws.WebServiceException;
+
+/**
+ * {@link ValueSetterFactory} is used to create {@link ValueSetter}.
+ *
+ * @author Jitendra Kotamraju
+ */
+abstract class ValueSetterFactory {
+
+    abstract ValueSetter get(ParameterImpl p);
+
+    static final ValueSetterFactory SYNC = new ValueSetterFactory() {
+        ValueSetter get(ParameterImpl p) {
+            return ValueSetter.getSync(p);
+        }
+    };
+
+    static final ValueSetterFactory NONE = new ValueSetterFactory() {
+        ValueSetter get(ParameterImpl p) {
+            throw new WebServiceException("This shouldn't happen. No response parameters.");
+        }
+    };
+
+    static final ValueSetterFactory SINGLE = new ValueSetterFactory() {
+        ValueSetter get(ParameterImpl p) {
+            return ValueSetter.SINGLE_VALUE;
+        }
+    };
+
+    static final class AsyncBeanValueSetterFactory extends ValueSetterFactory {
+        private Class asyncBean;
+
+        AsyncBeanValueSetterFactory(Class asyncBean) {
+            this.asyncBean = asyncBean;
+        }
+
+        ValueSetter get(ParameterImpl p) {
+            return new ValueSetter.AsyncBeanValueSetter(p, asyncBean);
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/pacakge-info.java
similarity index 100%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/client/sei/pacakge-info.java
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java
new file mode 100644
index 00000000000..fb9a02c90d5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import com.sun.xml.internal.ws.api.BindingID;
+
+import javax.xml.ws.WebServiceFeature;
+
+/**
+ * Using this feature, the application could override the binding used by
+ * the runtime(usually determined from WSDL).
+ *
+ * @author Jitendra Kotamraju
+ */
+public final class BindingTypeFeature extends WebServiceFeature {
+
+    public static final String ID = "http://jax-ws.dev.java.net/features/binding";
+
+    private final String bindingId;
+
+    public BindingTypeFeature(String bindingId) {
+        this.bindingId = bindingId;
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    public String getBindingId() {
+        return bindingId;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java
new file mode 100644
index 00000000000..a5dffbabce9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.bind.api.TypeReference;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import java.util.List;
+
+/**
+ * Factory to create {@link JAXBContext}.
+ *
+ * <p>
+ * JAX-WS uses JAXB to perform databinding when you use the service endpoint interface, and normally
+ * the JAX-WS RI drives JAXB and creates a necessary {@link JAXBContext} automatically.
+ *
+ * <p>
+ * This annotation is a JAX-WS RI vendor-specific feature, which lets applications create {@link JAXBRIContext}
+ * (which is the JAXB RI's {@link JAXBContext} implementation.)
+ * Combined with the JAXB RI vendor extensions defined in {@link JAXBRIContext}, appliation can use this to
+ * fine-tune how the databinding happens, such as by adding more classes to the binding context,
+ * by controlling the namespace mappings, and so on.
+ *
+ * <p>
+ * Applications should either use {@link UsesJAXBContextFeature} or {@link UsesJAXBContext} to instruct
+ * the JAX-WS runtime to use a custom factory.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 2.1.5
+ */
+public interface JAXBContextFactory {
+    /**
+     * Called by the JAX-WS runtime to create a {@link JAXBRIContext} for the given SEI.
+     *
+     * @param sei
+     *      The {@link SEIModel} object being constructed. This object provides you access to
+     *      what SEI is being processed, and therefore useful if you are writing a generic
+     *      {@link JAXBContextFactory} that can work with arbitrary SEI classes.
+     *
+     * @param classesToBind
+     *      List of classes that needs to be bound by JAXB. This value is computed according to
+     *      the JAX-WS spec and given to you.
+     *
+     *      The calling JAX-WS runtime expects the returned {@link JAXBRIContext} to be capable of
+     *      handling all these classes, but you can add more (which is more common), or remove some
+     *      (if you know what you are doing.)
+     *
+     *      The callee is free to mutate this list.
+     *
+     * @param typeReferences
+     *      List of {@link TypeReference}s, which is also a part of the input to the JAXB RI to control
+     *      how the databinding happens. Most likely this will be just a pass-through to the
+     *      {@link JAXBRIContext#newInstance} method.
+     *
+     * @return
+     *      A non-null valid {@link JAXBRIContext} object.
+     *
+     * @throws JAXBException
+     *      If the callee encounters a fatal problem and wants to abort the JAX-WS runtime processing
+     *      of the given SEI, throw a {@link JAXBException}. This will cause the port instantiation
+     *      to fail (if on client), or the application deployment to fail (if on server.)
+     */
+    @NotNull JAXBRIContext createJAXBContext(@NotNull SEIModel sei, @NotNull List<Class> classesToBind, @NotNull List<TypeReference> typeReferences) throws JAXBException;
+
+    /**
+     * The default implementation that creates {@link JAXBRIContext} according to the standard behavior.
+     */
+    public static final JAXBContextFactory DEFAULT = new JAXBContextFactory() {
+        @NotNull
+        public JAXBRIContext createJAXBContext(@NotNull SEIModel sei, @NotNull List<Class> classesToBind, @NotNull List<TypeReference> typeReferences) throws JAXBException {
+            return JAXBRIContext.newInstance(classesToBind.toArray(new Class[classesToBind.size()]),
+                    typeReferences, null, sei.getTargetNamespace(), false, null);
+        }
+    };
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java
index 058ed0ba625..38ed2841f26 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java
@@ -25,12 +25,16 @@
 package com.sun.xml.internal.ws.developer;
 
 import com.sun.xml.internal.ws.api.message.HeaderList;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.WebServiceContext;
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.HostnameVerifier;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.http.HTTPBinding;
 import java.net.HttpURLConnection;
 
 public interface JAXWSProperties {
@@ -42,13 +46,37 @@ public interface JAXWSProperties {
     public static final String MTOM_THRESHOLOD_VALUE =  "com.sun.xml.internal.ws.common.MtomThresholdValue";
     public static final String HTTP_EXCHANGE = "com.sun.xml.internal.ws.http.exchange";
 
+    /**
+     * Set this property on the {@link BindingProvider#getRequestContext()} to
+     * enable {@link HttpURLConnection#setConnectTimeout(int)}
+     *
+     *<p>
+     * int timeout = ...;
+     * Map<String, Object> ctxt = ((BindingProvider)proxy).getRequestContext();
+     * ctxt.put(CONNECT_TIMEOUT, timeout);
+     */
+    public static final String CONNECT_TIMEOUT =
+        "com.sun.xml.internal.ws.connect.timeout";
+
+    /**
+     * Set this property on the {@link BindingProvider#getRequestContext()} to
+     * enable {@link HttpURLConnection#httpConnection.setReadTimeout(int)}
+     *
+     *<p>
+     * int timeout = ...;
+     * Map<String, Object> ctxt = ((BindingProvider)proxy).getRequestContext();
+     * ctxt.put(REQUEST_TIMEOUT, timeout);
+     */
+     public static final String REQUEST_TIMEOUT =
+        "com.sun.xml.internal.ws.request.timeout";
+
     /**
      * Set this property on the {@link BindingProvider#getRequestContext()} to
      * enable {@link HttpURLConnection#setChunkedStreamingMode(int)}
      *
      *<p>
      * int chunkSize = ...;
-     * Map<String, Object> ctxt = (BindingProvider)proxy).getRequestContext();
+     * Map<String, Object> ctxt = ((BindingProvider)proxy).getRequestContext();
      * ctxt.put(HTTP_CLIENT_STREAMING_CHUNK_SIZE, chunkSize);
      */
     public static final String HTTP_CLIENT_STREAMING_CHUNK_SIZE = "com.sun.xml.internal.ws.transport.http.client.streaming.chunk.size";
@@ -61,7 +89,7 @@ public interface JAXWSProperties {
      *
      * <p>
      * HostNameVerifier hostNameVerifier = ...;
-     * Map<String, Object> ctxt = (BindingProvider)proxy).getRequestContext();
+     * Map<String, Object> ctxt = ((BindingProvider)proxy).getRequestContext();
      * ctxt.put(HOSTNAME_VERIFIER, hostNameVerifier);
      *
      * <p>
@@ -76,7 +104,7 @@ public interface JAXWSProperties {
      *
      * <p>
      * SSLSocketFactory sslFactory = ...;
-     * Map<String, Object> ctxt = (BindingProvider)proxy).getRequestContext();
+     * Map<String, Object> ctxt = ((BindingProvider)proxy).getRequestContext();
      * ctxt.put(SSL_SOCKET_FACTORY, sslFactory);
      *
      * <p>
@@ -101,4 +129,105 @@ public interface JAXWSProperties {
      * <b>THIS PROPERTY IS EXPERIMENTAL AND IS SUBJECT TO CHANGE WITHOUT NOTICE IN FUTURE.</b>
      */
     public static final String INBOUND_HEADER_LIST_PROPERTY = "com.sun.xml.internal.ws.api.message.HeaderList";
+
+    /**
+     * Access the {@link WSEndpoint} object that delivered the request.
+     *
+     * <p>
+     * {@link WSEndpoint} is the root of the objects that are together
+     * responsible for delivering requests to the application SEI object.
+     * One can look up this {@link WSEndpoint} from {@link WebServiceContext},
+     * and from there access many parts of the JAX-WS RI runtime.
+     *
+     * <p>
+     * <b>THIS PROPERTY IS EXPERIMENTAL AND IS SUBJECT TO CHANGE WITHOUT NOTICE IN FUTURE.</b>
+     *
+     * @since 2.1.2
+     */
+    public static final String WSENDPOINT = "com.sun.xml.internal.ws.api.server.WSEndpoint";
+
+    /**
+     * Gets the <tt>wsa:To</tt> header.
+     *
+     * The propery value is available on incoming SOAP message. The type of the value
+     * is {@link WSEndpointReference}.
+     *
+     * Null if the incoming SOAP message didn't have the header.
+     *
+     * @since 2.1.3
+     */
+    public static final String ADDRESSING_TO = "com.sun.xml.internal.ws.api.addressing.to";
+
+    /**
+     * Gets the <tt>wsa:From</tt> header.
+     *
+     * The propery value is available on incoming SOAP message. The type of the value
+     * is {@link WSEndpointReference}.
+     *
+     * Null if the incoming SOAP message didn't have the header.
+     *
+     * @since 2.1.3
+     */
+    public static final String ADDRESSING_FROM = "com.sun.xml.internal.ws.api.addressing.from";
+
+    /**
+     * Gets the <tt>wsa:Action</tt> header value.
+     *
+     * The propery value is available on incoming SOAP message. The type of the value
+     * is {@link String}.
+     *
+     * Null if the incoming SOAP message didn't have the header.
+     *
+     * @since 2.1.3
+     */
+    public static final String ADDRESSING_ACTION = "com.sun.xml.internal.ws.api.addressing.action";
+
+    /**
+     * Gets the <tt>wsa:MessageID</tt> header value.
+     *
+     * The propery value is available on incoming SOAP message. The type of the value
+     * is {@link String}.
+     *
+     * Null if the incoming SOAP message didn't have the header.
+     *
+     * @since 2.1.3
+     */
+    public static final String ADDRESSING_MESSAGEID = "com.sun.xml.internal.ws.api.addressing.messageId";
+
+    /**
+     * Reconstructs the URL the client used to make the request. The returned URL
+     * contains a protocol, server name, port number, and server path, but it does
+     * not include query string parameters.
+     * <p>
+     * The property value is available on incoming SOAP message on servlet transport.
+     *
+     * @since 2.1.3
+     */
+    public static final String HTTP_REQUEST_URL = "com.sun.xml.internal.ws.transport.http.servlet.requestURL";
+
+    /**
+     * Binding to represent RESTful services. {@link HTTPBinding#HTTP_BINDING} works
+     * only for Dispatch/Provider services, but this binding works with even SEI based
+     * services. It would be XML, NOT SOAP on the wire. Hence, the SEI parameters
+     * shouldn't be mapped to headers.
+     *
+     * <p>
+     * Note that, this only solves limited RESTful usecases.
+     *
+     * <p>To enable restful binding on the service, specify the binding id via
+     * {@link BindingType} or DD
+     * <pre>
+     * &#64;WebService
+     * &#64;BindingType(JAXWSProperties.REST_BINDING)
+     * </pre>
+     *
+     * <p>To enable restful binding on the client side, specify the binding id via
+     * {@link BindingTypeFeature}
+     * <pre>
+     * proxy = echoImplService.getEchoImplPort(new BindingTypeFeature(JAXWSProperties.REST_BINDING));
+     * </pre>
+     *
+     * @since 2.1.4
+     */
+    public static final String REST_BINDING = "http://jax-ws.dev.java.net/rest";
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java
index 24f2fffd970..40285f3ddbc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.developer;
 
 import java.lang.annotation.Documented;
@@ -90,4 +89,15 @@ public @interface MemberSubmissionAddressing {
      * <code>wsaw:UsingAddressing</code> element in the WSDL.
      */
     boolean required() default false;
+
+    /**
+     * Property to determine if the incoming messsages should be checked for conformance
+     * with MemberSubmission version of WS-Addressing.
+     *
+     * If Validation.LAX, then some WS-Adressing headers are not strictly checked.
+     */
+    public enum Validation { LAX, STRICT };
+
+    Validation validation() default Validation.LAX;
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java
index 4e85d511fb2..ef2d0692a2a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java
@@ -23,12 +23,10 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.developer;
 
 import com.sun.xml.internal.ws.api.FeatureConstructor;
 
-import javax.xml.ws.soap.AddressingFeature;
 import javax.xml.ws.WebServiceFeature;
 
 /**
@@ -77,12 +75,31 @@ public class MemberSubmissionAddressingFeature extends WebServiceFeature {
      * for the <code>required</code> attribute on the
      * <code>wsaw:UsingAddressing</code> element.
      */
-    @FeatureConstructor({"enabled","required"})
     public MemberSubmissionAddressingFeature(boolean enabled, boolean required) {
         this.enabled = enabled;
         this.required = required;
     }
 
+    /**
+     * Create an <code>MemberSubmissionAddressingFeature</code>
+     *
+     * @param enabled specifies whether this feature should
+     * be enabled or not.
+     * @param required specifies the value that will be used
+     * for the <code>required</code> attribute on the
+     * <code>wsaw:UsingAddressing</code> element.
+     * @param validation specifies the value that will be used
+     * for validation for the incoming messages. If LAX, messages are not strictly checked for conformance with  the spec.
+     */
+    @FeatureConstructor({"enabled","required","validation"})
+    public MemberSubmissionAddressingFeature(boolean enabled, boolean required, MemberSubmissionAddressing.Validation validation) {
+        this.enabled = enabled;
+        this.required = required;
+        this.validation = validation;
+    }
+
+
+
     public String getID() {
         return ID;
     }
@@ -94,4 +111,14 @@ public class MemberSubmissionAddressingFeature extends WebServiceFeature {
     public void setRequired(boolean required) {
         this.required = required;
     }
+
+    private MemberSubmissionAddressing.Validation validation = MemberSubmissionAddressing.Validation.LAX;
+    public void setValidation(MemberSubmissionAddressing.Validation validation) {
+        this.validation = validation;
+
+    }
+
+    public MemberSubmissionAddressing.Validation getValidation() {
+        return validation;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java
index bc36da9ccf6..dc96195b519 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java
@@ -62,7 +62,7 @@ import java.util.Map;
 
 @XmlRootElement(name = "EndpointReference", namespace = MemberSubmissionEndpointReference.MSNS)
 @XmlType(name = "EndpointReferenceType", namespace = MemberSubmissionEndpointReference.MSNS)
-public class MemberSubmissionEndpointReference extends EndpointReference implements MemberSubmissionAddressingConstants {
+public final class MemberSubmissionEndpointReference extends EndpointReference implements MemberSubmissionAddressingConstants {
 
     private final static JAXBContext msjc = MemberSubmissionEndpointReference.getMSJaxbContext();
 
@@ -105,7 +105,7 @@ public class MemberSubmissionEndpointReference extends EndpointReference impleme
     public void writeTo(Result result) {
         try {
             Marshaller marshaller = MemberSubmissionEndpointReference.msjc.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
+            //marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
             marshaller.marshal(this, result);
         } catch (JAXBException e) {
             throw new WebServiceException("Error marshalling W3CEndpointReference. ", e);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java
new file mode 100644
index 00000000000..4b83f4aa757
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import com.sun.xml.internal.ws.server.DraconianValidationErrorHandler;
+
+import javax.jws.WebService;
+import javax.xml.transform.Source;
+import javax.xml.validation.Schema;
+import javax.xml.ws.spi.WebServiceFeatureAnnotation;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * Validates all request and response messages payload(SOAP:Body) for a {@link WebService}
+ * against the XML schema. To use this feature, annotate the endpoint class with
+ * this annotation.
+ *
+ * <pre>
+ * for e.g.:
+ *
+ * &#64;WebService
+ * &#64;SchemaValidation
+ * public class HelloImpl {
+ *   ...
+ * }
+ * </pre>
+ *
+ * At present, schema validation works for doc/lit web services only.
+ *
+ * @since JAX-WS 2.1.3
+ * @author Jitendra Kotamraju
+ * @see SchemaValidationFeature
+ */
+@Retention(RUNTIME)
+@Target(TYPE)
+@Documented
+@WebServiceFeatureAnnotation(id = SchemaValidationFeature.ID, bean = SchemaValidationFeature.class)
+public @interface SchemaValidation {
+
+    /**
+     * Configure the validation behaviour w.r.t error handling. The default handler
+     * just rejects any invalid schema intances. If the application want to change
+     * this default behaviour(say just log the errors), it can do so by providing
+     * a custom implementation of {@link ValidationErrorHandler}.
+     */
+    Class<? extends ValidationErrorHandler> handler() default DraconianValidationErrorHandler.class;
+
+    /**
+     * Does validation for bound headers in a SOAP message.
+     *
+    boolean headers() default false;
+     */
+
+    /**
+     * Additional schema documents that are used to create {@link Schema} object. Useful
+     * when the application adds additional SOAP headers to the message. This is a list
+     * of system-ids, that are used to create {@link Source} objects and used in creation
+     * of {@link Schema} object
+     *
+     * for e.g.:
+     * @SchemaValidation(schemaLocations={"http://bar.foo/b.xsd", "http://foo.bar/a.xsd"}
+     *
+    String[] schemaLocations() default {};
+     */
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java
new file mode 100644
index 00000000000..69c18a6b4f0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import com.sun.xml.internal.ws.api.FeatureConstructor;
+import com.sun.xml.internal.ws.server.DraconianValidationErrorHandler;
+
+import javax.xml.ws.WebServiceFeature;
+
+
+/**
+ * {@link WebServiceFeature} for schema validation.
+ *
+ * @since JAX-WS 2.1.3
+ * @author Jitendra Kotamraju
+ * @see SchemaValidation
+ */
+public class SchemaValidationFeature extends WebServiceFeature {
+    /**
+     * Constant value identifying the SchemaValidationFeature
+     */
+    public static final String ID = "http://jax-ws.dev.java.net/features/schema-validation";
+
+    private Class<? extends ValidationErrorHandler> clazz;
+
+    public SchemaValidationFeature() {
+        this(DraconianValidationErrorHandler.class);
+    }
+
+    /**
+     * Create an <code>SchemaValidationFeature</code>.
+     * The instance created will be enabled.
+     */
+    @FeatureConstructor({"handler"})
+    public SchemaValidationFeature(Class<? extends ValidationErrorHandler> clazz) {
+        this.enabled = true;
+        this.clazz = clazz;
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    /**
+     * Invalid schema instances are rejected, a SOAP fault message is created
+     * for any invalid request and response message. If it is set to false, schema
+     * validation messages are just logged.
+     */
+    public Class<? extends ValidationErrorHandler> getErrorHandler() {
+        return clazz;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java
index 5552c47c3b4..f484a559442 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.developer;
 
 import com.sun.xml.internal.ws.api.FeatureConstructor;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java
new file mode 100644
index 00000000000..7e52832c0ea
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import javax.xml.ws.spi.WebServiceFeatureAnnotation;
+import java.lang.annotation.*;
+import java.io.File;
+
+/**
+ * This feature represents the use of StreamingAttachment attachments with a
+ * web service.
+ *
+ * <p>
+ * for e.g.: To keep all MIME attachments in memory, do the following
+ *
+ * <pre>
+ * &#64;WebService
+ * &#64;MIME(memoryThreshold=-1L)
+ * public class HelloService {
+ * }
+ * </pre>
+ *
+ * @see StreamingAttachmentFeature
+ *
+ * @author Jitendra Kotamraju
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Documented
+@WebServiceFeatureAnnotation(id = StreamingAttachmentFeature.ID, bean = StreamingAttachmentFeature.class)
+public @interface StreamingAttachment {
+
+    /**
+     * Directory in which large attachments are stored. {@link File#createTempFile}
+     * methods are used to create temp files for storing attachments. This
+     * value is used in {@link File#createTempFile}, if specified. If a file
+     * cannot be created in this dir, then all the content is kept in memory.
+     */
+    String dir() default "";
+
+    /**
+     * MIME message is parsed eagerly.
+     */
+    boolean parseEagerly() default false;
+
+    /**
+     * After this threshold(no of bytes per attachment), large attachment is
+     * written to file system.
+     *
+     * If the value is -1, then all the attachment content is kept in memory.
+     */
+    long memoryThreshold() default 1048576L;
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java
new file mode 100644
index 00000000000..5b8acb398d4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import com.sun.xml.internal.ws.api.FeatureConstructor;
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.ws.WebServiceFeature;
+
+import com.sun.xml.internal.org.jvnet.mimepull.MIMEConfig;
+
+/**
+ * Proxy needs to be created with this feature to configure StreamingAttachment
+ * attachments behaviour.
+ *
+ * <pre>
+ * for e.g.: To configure all StreamingAttachment attachments to be kept in memory
+ * <p>
+ *
+ * StreamingAttachmentFeature feature = new StreamingAttachmentFeature();
+ * feature.setAllMemory(true);
+ *
+ * proxy = HelloService().getHelloPort(feature);
+ *
+ * </pre>
+ *
+ * @author Jitendra Kotamraju
+ */
+public final class StreamingAttachmentFeature extends WebServiceFeature {
+    /**
+     * Constant value identifying the {@link @StreamingAttachment} feature.
+     */
+    public static final String ID = "http://jax-ws.dev.java.net/features/mime";
+
+    private MIMEConfig config;
+
+    private String dir;
+    private boolean parseEagerly;
+    private long memoryThreshold;
+
+    public StreamingAttachmentFeature() {
+    }
+
+    @FeatureConstructor({"dir","parseEagerly","memoryThreshold"})
+    public StreamingAttachmentFeature(@Nullable String dir, boolean parseEagerly, long memoryThreshold) {
+        this.enabled = true;
+        this.dir = dir;
+        this.parseEagerly = parseEagerly;
+        this.memoryThreshold = memoryThreshold;
+    }
+
+    public String getID() {
+        return ID;
+    }
+
+    /**
+     * Returns the configuration object. Once this is called, you cannot
+     * change the configuration.
+     *
+     * @return
+     */
+    public MIMEConfig getConfig() {
+        if (config == null) {
+            config = new MIMEConfig();
+            config.setDir(dir);
+            config.setParseEagerly(parseEagerly);
+            config.setMemoryThreshold(memoryThreshold);
+            config.validate();
+        }
+        return config;
+    }
+
+    /**
+     * Directory in which large attachments are stored
+     */
+    public void setDir(String dir) {
+        this.dir = dir;
+    }
+
+    /**
+     * StreamingAttachment message is parsed eagerly
+     */
+    public void setParseEagerly(boolean parseEagerly) {
+        this.parseEagerly = parseEagerly;
+    }
+
+    /**
+     * After this threshold(no of bytes), large attachments are
+     * written to file system
+     */
+    public void setMemoryThreshold(int memoryThreshold) {
+        this.memoryThreshold = memoryThreshold;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java
new file mode 100644
index 00000000000..3fe3d72acac
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import com.sun.xml.internal.org.jvnet.mimepull.MIMEPart;
+
+import javax.activation.DataSource;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.File;
+import java.net.URL;
+
+/**
+ * Implementation of {@link com.sun.xml.internal.org.jvnet.staxex.StreamingDataHandler} to access MIME
+ * attachments efficiently. Applications can use the additional methods and decide
+ * on how to access the attachment data in JAX-WS applications.
+ *
+ * <p>
+ * for e.g.:
+ *
+ * DataHandler dh = proxy.getData();
+ * StreamingDataHandler sdh = (StreamingDataHandler)dh;
+ * // readOnce() doesn't store attachment on the disk in some cases
+ * // for e.g when only one huge attachment after soap envelope part in MIME message
+ * InputStream in = sdh.readOnce();
+ * ...
+ * in.close();
+ * sdh.close();
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class StreamingDataHandler extends com.sun.xml.internal.org.jvnet.staxex.StreamingDataHandler {
+
+    public StreamingDataHandler(Object o, String s) {
+        super(o, s);
+    }
+
+    public StreamingDataHandler(URL url) {
+        super(url);
+    }
+
+    public StreamingDataHandler(DataSource dataSource) {
+        super(dataSource);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java
new file mode 100644
index 00000000000..9db5690cb4a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import javax.xml.ws.spi.WebServiceFeatureAnnotation;
+import javax.xml.bind.JAXBContext;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This feature instructs that the specified {@link JAXBContextFactory} be used for performing
+ * data-binding for the SEI.
+ *
+ * <p>
+ * For example,
+ * <pre>
+ * &#64;WebService
+ * &#64;UsesJAXBContext(MyJAXBContextFactory.class)
+ * public class HelloService {
+ *   ...
+ * }
+ * </pre>
+ *
+ * <p>
+ * If your {@link JAXBContextFactory} needs to carry some state from your calling application,
+ * you can use {@link UsesJAXBContextFeature} to pass in an instance of {@link JAXBContextFactory},
+ * instead of using this to specify the type.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 2.1.5
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@WebServiceFeatureAnnotation(id=UsesJAXBContextFeature.ID,bean=UsesJAXBContextFeature.class)
+public @interface UsesJAXBContext {
+    /**
+     * Designates the {@link JAXBContextFactory} to be used to create the {@link JAXBContext} object,
+     * which in turn will be used by the JAX-WS runtime to marshal/unmarshal parameters and return
+     * values to/from XML.
+     */
+    Class<? extends JAXBContextFactory> value();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java
new file mode 100644
index 00000000000..21b6f402857
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import com.sun.xml.internal.ws.api.FeatureConstructor;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.bind.api.TypeReference;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+/**
+ * A {@link WebServiceFeature} that instructs the JAX-WS runtime to use a specific {@link JAXBContextFactory}
+ * instance of creating {@link JAXBContext}.
+ *
+ * @see UsesJAXBContext
+ * @since 2.1.5
+ * @author Kohsuke Kawaguchi
+ */
+public class UsesJAXBContextFeature extends WebServiceFeature {
+    /**
+     * Constant value identifying the {@link UsesJAXBContext} feature.
+     */
+    public static final String ID = "http://jax-ws.dev.java.net/features/uses-jaxb-context";
+
+    private final JAXBContextFactory factory;
+
+    /**
+     * Creates {@link UsesJAXBContextFeature}.
+     *
+     * @param factoryClass
+     *      This class has to have a public no-arg constructor, which will be invoked to create
+     *      a new instance. {@link JAXBContextFactory#createJAXBContext(SEIModel, List, List)} will
+     *      be then called to create {@link JAXBContext}.
+     */
+    @FeatureConstructor("value")
+    public UsesJAXBContextFeature(@NotNull Class<? extends JAXBContextFactory> factoryClass) {
+        try {
+            factory = factoryClass.getConstructor().newInstance();
+        } catch (InstantiationException e) {
+            Error x = new InstantiationError(e.getMessage());
+            x.initCause(e);
+            throw x;
+        } catch (IllegalAccessException e) {
+            Error x = new IllegalAccessError(e.getMessage());
+            x.initCause(e);
+            throw x;
+        } catch (InvocationTargetException e) {
+            Error x = new InstantiationError(e.getMessage());
+            x.initCause(e);
+            throw x;
+        } catch (NoSuchMethodException e) {
+            Error x = new NoSuchMethodError(e.getMessage());
+            x.initCause(e);
+            throw x;
+        }
+    }
+
+    /**
+     * Creates {@link UsesJAXBContextFeature}.
+     * This version allows {@link JAXBContextFactory} to carry application specific state.
+     *
+     * @param factory
+     *      Uses a specific instance of {@link JAXBContextFactory} to create {@link JAXBContext}.
+     */
+    public UsesJAXBContextFeature(@Nullable JAXBContextFactory factory) {
+        this.factory = factory;
+    }
+
+    /**
+     * Creates {@link UsesJAXBContextFeature}.
+     * This version allows you to create {@link JAXBRIContext} upfront and uses it.
+     */
+    public UsesJAXBContextFeature(@Nullable final JAXBRIContext context) {
+        this.factory = new JAXBContextFactory() {
+            @NotNull
+            public JAXBRIContext createJAXBContext(@NotNull SEIModel sei, @NotNull List<Class> classesToBind, @NotNull List<TypeReference> typeReferences) throws JAXBException {
+                return context;
+            }
+        };
+    }
+
+    /**
+     * Gets the {@link JAXBContextFactory} instance to be used for creating {@link JAXBContext} for SEI.
+     *
+     * @return
+     *      null if the default {@link JAXBContext} shall be used.
+     */
+    public @Nullable JAXBContextFactory getFactory() {
+        return factory;
+    }
+
+    public String getID() {
+        return ID;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java
new file mode 100644
index 00000000000..abff2785bab
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.developer;
+
+import com.sun.xml.internal.ws.api.message.Packet;
+import org.xml.sax.ErrorHandler;
+
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.validation.Validator;
+
+/**
+ * An {@link ErrorHandler} to receive errors encountered during the
+ * {@link Validator#validate} method invocation. Specify
+ * a custom handler in {@link SchemaValidation}, {@link SchemaValidationFeature}
+ * to customize the error handling process during validaiton.
+ *
+ * @see SchemaValidation
+ * @author Jitendra Kotamraju
+ */
+public abstract class ValidationErrorHandler implements ErrorHandler {
+    protected Packet packet;
+
+    /**
+     * Use it to communicate validation errors with the application.
+     *
+     * For e.g validation exceptions can be stored in {@link Packet#invocationProperties}
+     * during request processing and can be accessed in the endpoint
+     * via {@link MessageContext}
+     *
+     * @param packet for request or response message
+     */
+    public void setPacket(Packet packet) {
+        this.packet = packet;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java
index ba929034d2d..3a77fce0aaf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java
@@ -35,6 +35,7 @@ import javax.xml.ws.Dispatch;
 import javax.xml.ws.Service;
 import javax.xml.ws.Service.Mode;
 import java.util.List;
+import java.io.Closeable;
 
 /**
  * {@link BindingProvider} with JAX-WS RI's extension methods.
@@ -43,7 +44,7 @@ import java.util.List;
  * @author Jitendra Kotamraju
  * @since 2.1EA3
  */
-public interface WSBindingProvider extends BindingProvider {
+public interface WSBindingProvider extends BindingProvider, Closeable {
     /**
      * Sets the out-bound headers to be added to messages sent from
      * this {@link BindingProvider}.
@@ -99,4 +100,21 @@ public interface WSBindingProvider extends BindingProvider {
     void setOutboundHeaders(Object... headers);
 
     List<Header> getInboundHeaders();
+
+    /**
+     * Sets the endpoint address for all the invocations that happen
+     * from {@link BindingProvider}. Instead of doing the following
+     *
+     * <p>
+     * ((BindingProvider)proxy).getRequestContext().put(
+     *      BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "...")
+     * <p>
+     * you could do this:
+     *
+     * <p>
+     * ((WSBindingProvider)proxy).setAddress("...");
+     *
+     * @param address Address of the service
+     */
+    void setAddress(String address);
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java
deleted file mode 100644
index 09524d81ac1..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.xml.internal.ws.encoding;
-
-import com.sun.istack.internal.XMLStreamException2;
-import com.sun.xml.internal.ws.util.ByteArrayBuffer;
-import com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx;
-
-import javax.activation.DataHandler;
-import javax.xml.stream.XMLStreamException;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Partial default implementation of {@link XMLStreamWriterEx}.
- *
- * TODO: find a good home for this class.
- *
- * @author Kohsuke Kawaguchi
- */
-public abstract class AbstractXMLStreamWriterExImpl implements XMLStreamWriterEx {
-
-    private StreamImpl stream;
-
-    public void writeBinary(DataHandler data) throws XMLStreamException {
-        try {
-            StreamImpl stream = _writeBinary(data.getContentType());
-            stream.write(data.getInputStream());
-            stream.close();
-        } catch (IOException e) {
-            throw new XMLStreamException2(e);
-        }
-    }
-    public OutputStream writeBinary(String contentType) throws XMLStreamException {
-        return _writeBinary(contentType);
-    }
-
-    private StreamImpl _writeBinary(String contentType) {
-        if(stream==null)
-            stream = new StreamImpl();
-        else
-            stream.reset();
-        stream.contentType = contentType;
-        return stream;
-    }
-
-    private final class StreamImpl extends ByteArrayBuffer {
-        private String contentType;
-        public void close() throws IOException {
-            super.close();
-            try {
-                writeBinary(buf,0,size(),contentType);
-            } catch (XMLStreamException e) {
-                IOException x = new IOException();
-                x.initCause(e);
-                throw x;
-            }
-        }
-    }
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java
new file mode 100644
index 00000000000..4525ff7ce54
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/*
+ * @(#)ContentType.java       1.7 02/03/27
+ */
+
+
+
+package com.sun.xml.internal.ws.encoding;
+
+import javax.xml.ws.WebServiceException;
+
+/**
+ * This class represents a MIME ContentType value. It provides
+ * methods to parse a ContentType string into individual components
+ * and to generate a MIME style ContentType string.
+ *
+ * @version 1.7, 02/03/27
+ * @author  John Mani
+ */
+public final class ContentType {
+
+    private String primaryType; // primary type
+    private String subType;     // subtype
+    private ParameterList list; // parameter list
+
+    /**
+     * Constructor that takes a Content-Type string. The String
+     * is parsed into its constituents: primaryType, subType
+     * and parameters. A ParseException is thrown if the parse fails.
+     *
+     * @param   s       the Content-Type string.
+     * @exception WebServiceException if the parse fails.
+     */
+    public ContentType(String s) throws WebServiceException {
+        HeaderTokenizer h = new HeaderTokenizer(s, HeaderTokenizer.MIME);
+        HeaderTokenizer.Token tk;
+
+        // First "type" ..
+        tk = h.next();
+        if (tk.getType() != HeaderTokenizer.Token.ATOM)
+            throw new WebServiceException();
+        primaryType = tk.getValue();
+
+        // The '/' separator ..
+        tk = h.next();
+        if ((char)tk.getType() != '/')
+            throw new WebServiceException();
+
+        // Then "subType" ..
+        tk = h.next();
+        if (tk.getType() != HeaderTokenizer.Token.ATOM)
+            throw new WebServiceException();
+        subType = tk.getValue();
+
+        // Finally parameters ..
+        String rem = h.getRemainder();
+        if (rem != null)
+            list = new ParameterList(rem);
+    }
+
+
+    /**
+     * Return the primary type.
+     * @return the primary type
+     */
+    public String getPrimaryType() {
+            return primaryType;
+    }
+
+    /**
+     * Return the subType.
+     * @return the subType
+     */
+    public String getSubType() {
+            return subType;
+    }
+
+    /**
+     * Return the MIME type string, without the parameters.
+     * The returned value is basically the concatenation of
+     * the primaryType, the '/' character and the secondaryType.
+     *
+     * @return the type
+     */
+    public String getBaseType() {
+            return primaryType + '/' + subType;
+    }
+
+    /**
+     * Return the specified parameter value. Returns <code>null</code>
+     * if this parameter is absent.
+     *
+     * @param name parameter name
+     * @return  parameter value
+     */
+    public String getParameter(String name) {
+        if (list == null)
+            return null;
+
+        return list.get(name);
+    }
+
+    /**
+     * Return a ParameterList object that holds all the available
+     * parameters. Returns null if no parameters are available.
+     *
+     * @return  ParameterList
+     */
+    public ParameterList getParameterList() {
+            return list;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java
index 8d75ec40c8d..c95880dadc8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java
@@ -25,32 +25,46 @@
 
 package com.sun.xml.internal.ws.encoding;
 
-import com.sun.xml.internal.ws.api.pipe.ContentType;
+import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.NotNull;
 
 /**
  * @author Vivek Pandey
  */
-public final class ContentTypeImpl implements ContentType {
-    private final String contentType;
-    private final String soapAction;
-    private final String accept;
+public final class ContentTypeImpl implements com.sun.xml.internal.ws.api.pipe.ContentType {
+    private final @NotNull String contentType;
+    private final @NotNull String soapAction;
+    private final @Nullable String accept;
+    private final @Nullable String charset;
 
     public ContentTypeImpl(String contentType) {
-        this.contentType = contentType;
-        this.soapAction = null;
-        this.accept = null;
+        this(contentType, null, null);
     }
 
-    public ContentTypeImpl(String contentType, String soapAction) {
-        this.contentType = contentType;
-        this.soapAction = getQuotedSOAPAction(soapAction);
-        this.accept = null;
+    public ContentTypeImpl(String contentType, @Nullable String soapAction) {
+        this(contentType, soapAction, null);
     }
 
-    public ContentTypeImpl(String contentType, String soapAction, String accept) {
+    public ContentTypeImpl(String contentType, @Nullable String soapAction, @Nullable String accept) {
         this.contentType = contentType;
         this.accept = accept;
         this.soapAction = getQuotedSOAPAction(soapAction);
+        String tmpCharset = null;
+        try {
+            tmpCharset = new ContentType(contentType).getParameter("charset");
+        } catch(Exception e) {
+            //Ignore the parsing exception.
+        }
+        charset = tmpCharset;
+    }
+
+    /**
+     * Returns the character set encoding.
+     *
+     * @return returns the character set encoding.
+     */
+    public @Nullable String getCharSet() {
+        return charset;
     }
 
     /** BP 1.1 R1109 requires SOAPAction too be a quoted value **/
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java
new file mode 100644
index 00000000000..c31a946d46f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.encoding;
+
+import com.sun.xml.internal.org.jvnet.mimepull.MIMEPart;
+
+import javax.activation.DataSource;
+import java.io.*;
+
+import com.sun.xml.internal.ws.developer.StreamingDataHandler;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+public class DataSourceStreamingDataHandler extends StreamingDataHandler {
+
+    public DataSourceStreamingDataHandler(DataSource ds) {
+        super(ds);
+    }
+
+    public InputStream readOnce() throws IOException {
+        return getInputStream();
+    }
+
+    public void moveTo(File file) throws IOException {
+        InputStream in = getInputStream();
+        OutputStream os = new FileOutputStream(file);
+        byte[] temp = new byte[8192];
+        int len;
+        while((len=in.read(temp)) != -1) {
+            os.write(temp, 0, len);
+        }
+        in.close();
+        os.close();
+    }
+
+    public void close() throws IOException {
+        // nothing to do here
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java
new file mode 100644
index 00000000000..1772595b3df
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java
@@ -0,0 +1,382 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/*
+ * @(#)HeaderTokenizer.java   1.9 02/03/27
+ */
+
+
+
+package com.sun.xml.internal.ws.encoding;
+
+import javax.xml.ws.WebServiceException;
+
+/**
+ * This class tokenizes RFC822 and MIME headers into the basic
+ * symbols specified by RFC822 and MIME. <p>
+ *
+ * This class handles folded headers (ie headers with embedded
+ * CRLF SPACE sequences). The folds are removed in the returned
+ * tokens.
+ *
+ * @version 1.9, 02/03/27
+ * @author  John Mani
+ */
+
+class HeaderTokenizer {
+
+    /**
+     * The Token class represents tokens returned by the
+     * HeaderTokenizer.
+     */
+    static class Token {
+
+        private int type;
+        private String value;
+
+        /**
+         * Token type indicating an ATOM.
+         */
+        public static final int ATOM            = -1;
+
+        /**
+         * Token type indicating a quoted string. The value
+         * field contains the string without the quotes.
+         */
+        public static final int QUOTEDSTRING    = -2;
+
+        /**
+         * Token type indicating a comment. The value field
+         * contains the comment string without the comment
+         * start and end symbols.
+         */
+        public static final int COMMENT         = -3;
+
+        /**
+         * Token type indicating end of input.
+         */
+        public static final int  EOF            = -4;
+
+        /**
+         * Constructor.
+         * @param       type    Token type
+         * @param       value   Token value
+         */
+        public Token(int type, String value) {
+             this.type = type;
+             this.value = value;
+        }
+
+        /**
+         * Return the type of the token. If the token represents a
+         * delimiter or a control character, the type is that character
+         * itself, converted to an integer. Otherwise, it's value is
+         * one of the following:
+         * <ul>
+         * <li><code>ATOM</code> A sequence of ASCII characters
+         *      delimited by either SPACE, CTL, "(", <"> or the
+         *      specified SPECIALS
+         * <li><code>QUOTEDSTRING</code> A sequence of ASCII characters
+         *      within quotes
+         * <li><code>COMMENT</code> A sequence of ASCII characters
+         *      within "(" and ")".
+         * <li><code>EOF</code> End of header
+         * </ul>
+         */
+        public int getType() {
+            return type;
+        }
+
+        /**
+         * Returns the value of the token just read. When the current
+         * token is a quoted string, this field contains the body of the
+         * string, without the quotes. When the current token is a comment,
+         * this field contains the body of the comment.
+         *
+         * @return      token value
+         */
+        public String getValue() {
+            return value;
+        }
+    }
+
+    private String string; // the string to be tokenized
+    private boolean skipComments; // should comments be skipped ?
+    private String delimiters; // delimiter string
+    private int currentPos; // current parse position
+    private int maxPos; // string length
+    private int nextPos; // track start of next Token for next()
+    private int peekPos; // track start of next Token for peek()
+
+    /**
+     * RFC822 specials
+     */
+    private final static String RFC822 = "()<>@,;:\\\"\t .[]";
+
+    /**
+     * MIME specials
+     */
+    final static String MIME = "()<>@,;:\\\"\t []/?=";
+
+    // The EOF Token
+    private final static Token EOFToken = new Token(Token.EOF, null);
+
+    /**
+     * Constructor that takes a rfc822 style header.
+     *
+     * @param   header  The rfc822 header to be tokenized
+     * @param   delimiters      Set of delimiter characters
+     *                          to be used to delimit ATOMS. These
+     *                          are usually <code>RFC822</code> or
+     *                          <code>MIME</code>
+     * @param   skipComments  If true, comments are skipped and
+     *                          not returned as tokens
+     */
+    HeaderTokenizer(String header, String delimiters,
+                           boolean skipComments) {
+        string = (header == null) ? "" : header; // paranoia ?!
+        this.skipComments = skipComments;
+        this.delimiters = delimiters;
+        currentPos = nextPos = peekPos = 0;
+        maxPos = string.length();
+    }
+
+    /**
+     * Constructor. Comments are ignored and not returned as tokens
+     *
+     * @param   header  The header that is tokenized
+     * @param   delimiters  The delimiters to be used
+     */
+    HeaderTokenizer(String header, String delimiters) {
+            this(header, delimiters, true);
+    }
+
+    /**
+     * Constructor. The RFC822 defined delimiters - RFC822 - are
+     * used to delimit ATOMS. Also comments are skipped and not
+     * returned as tokens
+     */
+    HeaderTokenizer(String header)  {
+            this(header, RFC822);
+    }
+
+    /**
+     * Parses the next token from this String. <p>
+     *
+     * Clients sit in a loop calling next() to parse successive
+     * tokens until an EOF Token is returned.
+     *
+     * @return          the next Token
+     * @exception WebServiceException if the parse fails
+     */
+    Token next() throws WebServiceException {
+        Token tk;
+
+        currentPos = nextPos; // setup currentPos
+        tk = getNext();
+        nextPos = peekPos = currentPos; // update currentPos and peekPos
+        return tk;
+    }
+
+    /**
+     * Peek at the next token, without actually removing the token
+     * from the parse stream. Invoking this method multiple times
+     * will return successive tokens, until <code>next()</code> is
+     * called. <p>
+     *
+     * @return          the next Token
+     * @exception       WebServiceException if the parse fails
+     */
+    Token peek() throws WebServiceException {
+        Token tk;
+
+        currentPos = peekPos; // setup currentPos
+        tk = getNext();
+        peekPos = currentPos; // update peekPos
+        return tk;
+    }
+
+    /**
+     * Return the rest of the Header.
+     *
+     * @return String   rest of header. null is returned if we are
+     *                  already at end of header
+     */
+    String getRemainder() {
+            return string.substring(nextPos);
+    }
+
+    /*
+     * Return the next token starting from 'currentPos'. After the
+     * parse, 'currentPos' is updated to point to the start of the
+     * next token.
+     */
+    private Token getNext() throws WebServiceException {
+        // If we're already at end of string, return EOF
+        if (currentPos >= maxPos)
+            return EOFToken;
+
+        // Skip white-space, position currentPos beyond the space
+        if (skipWhiteSpace() == Token.EOF)
+            return EOFToken;
+
+        char c;
+        int start;
+        boolean filter = false;
+
+        c = string.charAt(currentPos);
+
+        // Check or Skip comments and position currentPos
+        // beyond the comment
+        while (c == '(') {
+            // Parsing comment ..
+            int nesting;
+            for (start = ++currentPos, nesting = 1;
+             nesting > 0 && currentPos < maxPos;
+             currentPos++) {
+            c = string.charAt(currentPos);
+            if (c == '\\') {  // Escape sequence
+                currentPos++; // skip the escaped character
+                filter = true;
+            } else if (c == '\r')
+                filter = true;
+            else if (c == '(')
+                nesting++;
+            else if (c == ')')
+                nesting--;
+            }
+            if (nesting != 0)
+            throw new WebServiceException("Unbalanced comments");
+
+            if (!skipComments) {
+            // Return the comment, if we are asked to.
+            // Note that the comment start & end markers are ignored.
+            String s;
+            if (filter) // need to go thru the token again.
+                s = filterToken(string, start, currentPos-1);
+            else
+                s = string.substring(start,currentPos-1);
+
+            return new Token(Token.COMMENT, s);
+            }
+
+            // Skip any whitespace after the comment.
+            if (skipWhiteSpace() == Token.EOF)
+            return EOFToken;
+            c = string.charAt(currentPos);
+        }
+
+        // Check for quoted-string and position currentPos
+        //  beyond the terminating quote
+        if (c == '"') {
+            for (start = ++currentPos; currentPos < maxPos; currentPos++) {
+            c = string.charAt(currentPos);
+            if (c == '\\') { // Escape sequence
+                currentPos++;
+                filter = true;
+            } else if (c == '\r')
+                filter = true;
+            else if (c == '"') {
+                currentPos++;
+                String s;
+
+                if (filter)
+                s = filterToken(string, start, currentPos-1);
+                else
+                s = string.substring(start,currentPos-1);
+
+                return new Token(Token.QUOTEDSTRING, s);
+            }
+            }
+            throw new WebServiceException("Unbalanced quoted string");
+        }
+
+        // Check for SPECIAL or CTL
+        if (c < 040 || c >= 0177 || delimiters.indexOf(c) >= 0) {
+            currentPos++; // re-position currentPos
+            char ch[] = new char[1];
+            ch[0] = c;
+            return new Token((int)c, new String(ch));
+        }
+
+        // Check for ATOM
+        for (start = currentPos; currentPos < maxPos; currentPos++) {
+            c = string.charAt(currentPos);
+            // ATOM is delimited by either SPACE, CTL, "(", <">
+            // or the specified SPECIALS
+            if (c < 040 || c >= 0177 || c == '(' || c == ' ' ||
+            c == '"' || delimiters.indexOf(c) >= 0)
+            break;
+        }
+        return new Token(Token.ATOM, string.substring(start, currentPos));
+        }
+
+        // Skip SPACE, HT, CR and NL
+        private int skipWhiteSpace() {
+        char c;
+        for (; currentPos < maxPos; currentPos++)
+            if (((c = string.charAt(currentPos)) != ' ') &&
+            (c != '\t') && (c != '\r') && (c != '\n'))
+            return currentPos;
+        return Token.EOF;
+    }
+
+    /* Process escape sequences and embedded LWSPs from a comment or
+     * quoted string.
+     */
+    private static String filterToken(String s, int start, int end) {
+        StringBuffer sb = new StringBuffer();
+        char c;
+        boolean gotEscape = false;
+        boolean gotCR = false;
+
+        for (int i = start; i < end; i++) {
+            c = s.charAt(i);
+            if (c == '\n' && gotCR) {
+            // This LF is part of an unescaped
+            // CRLF sequence (i.e, LWSP). Skip it.
+            gotCR = false;
+            continue;
+            }
+
+            gotCR = false;
+            if (!gotEscape) {
+            // Previous character was NOT '\'
+            if (c == '\\') // skip this character
+                gotEscape = true;
+            else if (c == '\r') // skip this character
+                gotCR = true;
+            else // append this character
+                sb.append(c);
+            } else {
+            // Previous character was '\'. So no need to
+            // bother with any special processing, just
+            // append this character
+            sb.append(c);
+            gotEscape = false;
+            }
+        }
+        return sb.toString();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java
new file mode 100644
index 00000000000..80f2f476263
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+package com.sun.xml.internal.ws.encoding;
+
+import javax.activation.DataContentHandler;
+import javax.activation.ActivationDataFlavor;
+import javax.activation.DataSource;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.awt.datatransfer.DataFlavor;
+import java.util.logging.Logger;
+import java.util.Iterator;
+import java.io.IOException;
+import java.io.BufferedInputStream;
+import java.io.OutputStream;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+
+public class ImageDataContentHandler extends Component
+    implements DataContentHandler {
+
+    private static final Logger log = Logger.getLogger(ImageDataContentHandler.class.getName());
+    private final DataFlavor[] flavor;
+
+    public ImageDataContentHandler() {
+        String[] mimeTypes = ImageIO.getReaderMIMETypes();
+        flavor = new DataFlavor[mimeTypes.length];
+        for(int i=0; i < mimeTypes.length; i++) {
+            flavor[i] = new ActivationDataFlavor(Image.class, mimeTypes[i], "Image");
+        }
+    }
+
+    /**
+     * Returns an array of DataFlavor objects indicating the flavors the
+     * data can be provided in. The array should be ordered according to
+     * preference for providing the data (from most richly descriptive to
+     * least descriptive).
+     *
+     * @return The DataFlavors.
+     */
+    public DataFlavor[] getTransferDataFlavors() {
+        return flavor;
+    }
+
+    /**
+     * Returns an object which represents the data to be transferred.
+     * The class of the object returned is defined by the representation class
+     * of the flavor.
+     *
+     * @param df The DataFlavor representing the requested type.
+     * @param ds The DataSource representing the data to be converted.
+     * @return The constructed Object.
+     */
+    public Object getTransferData(DataFlavor df, DataSource ds)
+        throws IOException {
+        for (DataFlavor aFlavor : flavor) {
+            if (aFlavor.equals(df)) {
+                return getContent(ds);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Return an object representing the data in its most preferred form.
+     * Generally this will be the form described by the first DataFlavor
+     * returned by the <code>getTransferDataFlavors</code> method.
+     *
+     * @param ds The DataSource representing the data to be converted.
+     * @return The constructed Object.
+     */
+    public Object getContent(DataSource ds) throws IOException {
+        return ImageIO.read(new BufferedInputStream(ds.getInputStream()));
+    }
+
+    /**
+     * Convert the object to a byte stream of the specified MIME type
+     * and write it to the output stream.
+     *
+     * @param obj   The object to be converted.
+     * @param type  The requested MIME type of the resulting byte stream.
+     * @param os    The output stream into which to write the converted
+     *          byte stream.
+     */
+
+    public void writeTo(Object obj, String type, OutputStream os)
+        throws IOException {
+
+        try {
+            BufferedImage bufImage;
+            if (obj instanceof BufferedImage) {
+                bufImage = (BufferedImage)obj;
+            } else if (obj instanceof Image) {
+                bufImage = render((Image)obj);
+            } else {
+                throw new IOException(
+                    "ImageDataContentHandler requires Image object, "
+                    + "was given object of type "
+                    + obj.getClass().toString());
+            }
+            ImageWriter writer = null;
+            Iterator<ImageWriter> i = ImageIO.getImageWritersByMIMEType(type);
+            if (i.hasNext()) {
+                writer = i.next();
+            }
+            if (writer != null) {
+                ImageOutputStream stream = ImageIO.createImageOutputStream(os);
+                writer.setOutput(stream);
+                writer.write(bufImage);
+                writer.dispose();
+                stream.close();
+            } else {
+                throw new IOException("Unsupported mime type:"+ type);
+            }
+        } catch (Exception e) {
+            throw new IOException("Unable to encode the image to a stream "
+                + e.getMessage());
+        }
+    }
+
+
+    private BufferedImage render(Image img) throws InterruptedException {
+
+        MediaTracker tracker = new MediaTracker(this);
+        tracker.addImage(img, 0);
+        tracker.waitForAll();
+        BufferedImage bufImage = new BufferedImage(img.getWidth(null),
+            img.getHeight(null), BufferedImage.TYPE_INT_RGB);
+        Graphics g = bufImage.createGraphics();
+        g.drawImage(img, 0, 0, null);
+        g.dispose();
+        return bufImage;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java
new file mode 100644
index 00000000000..76560ec3185
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.encoding;
+
+import com.sun.xml.internal.org.jvnet.mimepull.MIMEPart;
+
+import javax.activation.DataSource;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.File;
+
+import com.sun.xml.internal.ws.developer.StreamingDataHandler;
+
+/**
+ * Implementation of {@link StreamingDataHandler} to access MIME
+ * attachments efficiently. Applications can use the additional methods and decide
+ * on how to access the attachment data in JAX-WS applications.
+ *
+ * <p>
+ * for e.g.:
+ *
+ * DataHandler dh = proxy.getData();
+ * StreamingDataHandler sdh = (StreamingDataHandler)dh;
+ * // readOnce() doesn't store attachment on the disk in some cases
+ * // for e.g when only one huge attachment after soap envelope part in MIME message
+ * InputStream in = sdh.readOnce();
+ * ...
+ * in.close();
+ * sdh.close();
+ *
+ * @author Jitendra Kotamraju
+ */
+public class MIMEPartStreamingDataHandler extends StreamingDataHandler {
+    private final StreamingDataSource ds;
+
+    public MIMEPartStreamingDataHandler(MIMEPart part) {
+        super(new StreamingDataSource(part));
+        ds = (StreamingDataSource)getDataSource();
+    }
+
+    public InputStream readOnce() throws IOException {
+        return ds.readOnce();
+    }
+
+    public void moveTo(File file) throws IOException {
+        ds.moveTo(file);
+    }
+
+    public void close() throws IOException {
+        ds.close();
+    }
+
+    private static final class StreamingDataSource implements DataSource {
+        private final MIMEPart part;
+
+        StreamingDataSource(MIMEPart part) {
+            this.part = part;
+        }
+
+        public InputStream getInputStream() throws IOException {
+            return part.read();             //readOnce() ??
+        }
+
+        InputStream readOnce() throws IOException {
+            try {
+                return part.readOnce();
+            } catch(Exception e) {
+                throw new MyIOException(e);
+            }
+        }
+
+        void moveTo(File file) throws IOException {
+            part.moveTo(file);
+        }
+
+        public OutputStream getOutputStream() throws IOException {
+            return null;
+        }
+
+        public String getContentType() {
+            return part.getContentType();
+        }
+
+        public String getName() {
+            return "";
+        }
+
+        public void close() throws IOException {
+            part.close();
+        }
+    }
+
+    private static final class MyIOException extends IOException {
+        private final Exception linkedException;
+
+        MyIOException(Exception linkedException) {
+            this.linkedException = linkedException;
+        }
+
+        @Override
+        public Throwable getCause() {
+            return linkedException;
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java
index 7a481255b2a..b06168cf967 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java
@@ -25,14 +25,17 @@
 
 package com.sun.xml.internal.ws.encoding;
 
-import com.sun.xml.internal.messaging.saaj.packaging.mime.util.OutputUtil;
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.api.message.Message;
 import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.pipe.Codec;
 import com.sun.xml.internal.ws.api.pipe.ContentType;
+import com.sun.xml.internal.ws.developer.StreamingAttachmentFeature;
 
+import javax.activation.CommandMap;
+import javax.activation.MailcapCommandMap;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -57,6 +60,28 @@ import java.util.UUID;
  * @author Kohsuke Kawaguchi
  */
 abstract class MimeCodec implements Codec {
+
+    static {
+        // DataHandler.writeTo() may search for DCH. So adding some default ones.
+        try {
+            CommandMap map = CommandMap.getDefaultCommandMap();
+            if (map instanceof MailcapCommandMap) {
+                MailcapCommandMap mailMap = (MailcapCommandMap) map;
+                String hndlrStr = ";;x-java-content-handler=";
+                mailMap.addMailcap(
+                    "text/xml" + hndlrStr + XmlDataContentHandler.class.getName());
+                mailMap.addMailcap(
+                    "application/xml" + hndlrStr + XmlDataContentHandler.class.getName());
+                mailMap.addMailcap(
+                    "image/*" + hndlrStr + ImageDataContentHandler.class.getName());
+                mailMap.addMailcap(
+                    "text/plain" + hndlrStr + StringDataContentHandler.class.getName());
+            }
+        } catch (Throwable t) {
+            // ignore the exception.
+        }
+    }
+
     public static final String MULTIPART_RELATED_MIME_TYPE = "multipart/related";
 
     private String boundary;
@@ -64,9 +89,11 @@ abstract class MimeCodec implements Codec {
     private boolean hasAttachments;
     protected Codec rootCodec;
     protected final SOAPVersion version;
+    protected final WSBinding binding;
 
-    protected MimeCodec(SOAPVersion version) {
+    protected MimeCodec(SOAPVersion version, WSBinding binding) {
         this.version = version;
+        this.binding = binding;
     }
 
     public String getMimeType() {
@@ -82,31 +109,31 @@ abstract class MimeCodec implements Codec {
         }
 
         if (hasAttachments) {
-            OutputUtil.writeln("--"+boundary, out);
-            OutputUtil.writeln("Content-Type: " + rootCodec.getMimeType(), out);
-            OutputUtil.writeln(out);
+            writeln("--"+boundary, out);
+            writeln("Content-Type: " + rootCodec.getMimeType(), out);
+            writeln(out);
         }
         ContentType primaryCt = rootCodec.encode(packet, out);
 
         if (hasAttachments) {
-            OutputUtil.writeln(out);
+            writeln(out);
             // Encode all the attchments
             for (Attachment att : msg.getAttachments()) {
-                OutputUtil.writeln("--"+boundary, out);
+                writeln("--"+boundary, out);
                 //SAAJ's AttachmentPart.getContentId() returns content id already enclosed with
                 //angle brackets. For now put angle bracket only if its not there
                 String cid = att.getContentId();
                 if(cid != null && cid.length() >0 && cid.charAt(0) != '<')
                     cid = '<' + cid + '>';
-                OutputUtil.writeln("Content-Id:" + cid, out);
-                OutputUtil.writeln("Content-Type: " + att.getContentType(), out);
-                OutputUtil.writeln("Content-Transfer-Encoding: binary", out);
-                OutputUtil.writeln(out);                    // write \r\n
+                writeln("Content-Id:" + cid, out);
+                writeln("Content-Type: " + att.getContentType(), out);
+                writeln("Content-Transfer-Encoding: binary", out);
+                writeln(out);                    // write \r\n
                 att.writeTo(out);
-                OutputUtil.writeln(out);                    // write \r\n
+                writeln(out);                    // write \r\n
             }
-            OutputUtil.writeAsAscii("--"+boundary, out);
-            OutputUtil.writeAsAscii("--", out);
+            writeAsAscii("--"+boundary, out);
+            writeAsAscii("--", out);
         }
         // TODO not returing correct multipart/related type(no boundary)
         return hasAttachments ? new ContentTypeImpl(messageContentType, packet.soapAction, null) : primaryCt;
@@ -134,10 +161,11 @@ abstract class MimeCodec implements Codec {
      */
     protected MimeCodec(MimeCodec that) {
         this.version = that.version;
+        this.binding = that.binding;
     }
 
     public void decode(InputStream in, String contentType, Packet packet) throws IOException {
-        MimeMultipartParser parser = new MimeMultipartParser(in, contentType);
+        MimeMultipartParser parser = new MimeMultipartParser(in, contentType, binding.getFeature(StreamingAttachmentFeature.class));
         decode(parser,packet);
     }
 
@@ -151,4 +179,24 @@ abstract class MimeCodec implements Codec {
     protected abstract void decode(MimeMultipartParser mpp, Packet packet) throws IOException;
 
     public abstract MimeCodec copy();
+
+
+    public static void writeln(String s,OutputStream out) throws IOException {
+        writeAsAscii(s,out);
+        writeln(out);
+    }
+
+    /**
+     * Writes a string as ASCII string.
+     */
+    public static void writeAsAscii(String s,OutputStream out) throws IOException {
+        int len = s.length();
+        for( int i=0; i<len; i++ )
+            out.write((byte)s.charAt(i));
+    }
+
+    public static void writeln(OutputStream out) throws IOException {
+        out.write('\r');
+        out.write('\n');
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java
index 6e63cd06196..2b8609bbbaf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java
@@ -28,73 +28,61 @@ package com.sun.xml.internal.ws.encoding;
 
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.MessagingException;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.ContentType;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.InternetHeaders;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.ParseException;
-import com.sun.xml.internal.ws.message.stream.StreamAttachment;
-import com.sun.xml.internal.ws.util.ASCIIUtility;
+import com.sun.xml.internal.ws.api.message.Attachment;
+import com.sun.xml.internal.ws.developer.StreamingAttachmentFeature;
+import com.sun.xml.internal.ws.developer.StreamingDataHandler;
 import com.sun.xml.internal.ws.util.ByteArrayBuffer;
+import com.sun.xml.internal.ws.util.ByteArrayDataSource;
+import com.sun.xml.internal.org.jvnet.mimepull.MIMEMessage;
+import com.sun.xml.internal.org.jvnet.mimepull.MIMEPart;
 
+import javax.activation.DataHandler;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.WebServiceException;
-import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.BitSet;
+import java.io.OutputStream;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
  * Parses Mime multipart message into primary part and attachment parts. It
  * parses the stream lazily as and when required.
  *
- * TODO need a list to keep all the attachments so that even if Content-Id is
- * not there it is accounted
- *
  * @author Vivek Pandey
  * @author Jitendra Kotamraju
  */
 public final class MimeMultipartParser {
 
-    private final InputStream in;
     private final String start;
-    private final byte[] boundaryBytes;
+    private final MIMEMessage message;
+    private Attachment root;
 
-    private final BitSet lastPartFound = new BitSet(1);
-    // current stream position, set to -1 on EOF
-    private int b = 0;
-    private final int[] bcs = new int[256];
-    private int[] gss;
-    private static final int BUFFER_SIZE = 4096;
-    private byte[] buffer = new byte[BUFFER_SIZE];
-    private byte[] prevBuffer = new byte[BUFFER_SIZE];
-    private boolean firstPart = true;
+    // Attachments without root part
+    private final Map<String, Attachment> attachments = new HashMap<String, Attachment>();
 
-    private final Map<String, StreamAttachment> attachments = new HashMap<String, StreamAttachment>();
-    private StreamAttachment root;
+    private boolean gotAll;
 
-    private int cidCounter = 0;
-
-    public MimeMultipartParser(InputStream in, String contentType) {
-        try {
-            ContentType ct = new ContentType(contentType);
-            String boundary = ct.getParameter("boundary");
-            if (boundary == null || boundary.equals("")) {
-                throw new WebServiceException("MIME boundary parameter not found" + contentType);
-            }
-            String bnd = "--" + boundary;
-            boundaryBytes = ASCIIUtility.getBytes(bnd);
-            start = ct.getParameter("start");
-        } catch (ParseException e) {
-            throw new WebServiceException(e);
+    public MimeMultipartParser(InputStream in, String contentType, StreamingAttachmentFeature feature) {
+        ContentType ct = new ContentType(contentType);
+        String boundary = ct.getParameter("boundary");
+        if (boundary == null || boundary.equals("")) {
+            throw new WebServiceException("MIME boundary parameter not found" + contentType);
         }
-
-        //InputStream MUST support mark()
-        if (!in.markSupported()) {
-            this.in = new BufferedInputStream(in);
-        } else {
-            this.in = in;
+        message = (feature != null)
+                ? new MIMEMessage(in, boundary, feature.getConfig())
+                : new MIMEMessage(in, boundary);
+        // Strip <...> from root part's Content-ID
+        String st = ct.getParameter("start");
+        if (st != null && st.length() > 2 && st.charAt(0) == '<' && st.charAt(st.length()-1) == '>') {
+            st = st.substring(1, st.length()-1);
         }
+        start = st;
     }
 
     /**
@@ -106,12 +94,9 @@ public final class MimeMultipartParser {
      *         null if root part cannot be found
      *
      */
-    public @Nullable StreamAttachment getRootPart() {
-        if (root != null) {
-            return root;
-        }
-        while(!lastBodyPartFound() && (b != -1) && root == null) {
-            getNextPart();
+    public @Nullable Attachment getRootPart() {
+        if (root == null) {
+            root = new PartAttachment((start != null) ? message.getPart(start) : message.getPart(0));
         }
         return root;
     }
@@ -121,9 +106,17 @@ public final class MimeMultipartParser {
      *
      * @return Map<String, StreamAttachment> for all attachment parts
      */
-    public @NotNull Map<String, StreamAttachment> getAttachmentParts() {
-        while(!lastBodyPartFound() && (b != -1)) {
-            getNextPart();
+    public @NotNull Map<String, Attachment> getAttachmentParts() {
+        if (!gotAll) {
+            MIMEPart rootPart = (start != null) ? message.getPart(start) : message.getPart(0);
+            List<MIMEPart> parts = message.getAttachments();
+            for(MIMEPart part : parts) {
+                if (part != rootPart) {
+                    PartAttachment attach = new PartAttachment(part);
+                    attachments.put(attach.getContentId(), attach);
+                }
+            }
+            gotAll = true;
         }
         return attachments;
     }
@@ -135,346 +128,81 @@ public final class MimeMultipartParser {
      * @return StreamAttachment attachment for contentId
      *         null if there is no attachment for contentId
      */
-    public @Nullable StreamAttachment getAttachmentPart(String contentId) throws IOException {
+    public @Nullable Attachment getAttachmentPart(String contentId) throws IOException {
         //first see if this attachment is already parsed, if so return it
-        StreamAttachment streamAttach = attachments.get(contentId);
-        if (streamAttach != null) {
-            return streamAttach;
+        Attachment attach = attachments.get(contentId);
+        if (attach == null) {
+            MIMEPart part = message.getPart(contentId);
+            attach = new PartAttachment(part);
+            attachments.put(contentId, attach);
         }
-        //else parse the MIME parts till we get what we want
-        while (!lastBodyPartFound() && (b != -1)) {
-            streamAttach = getNextPart();
-            String newContentId = streamAttach.getContentId();
-            if (newContentId != null && newContentId.equals(contentId)){
-                return streamAttach;
-            }
-        }
-        return null;            // Attachment is not found
+        return attach;
     }
 
-    /**
-     * Parses the stream and returns next available MIME part. This shouldn't
-     * be called if there are no MIME parts in the stream. Attachment
-     * part(not root part) is cached in the {@link Map}<{@link String},{@link StreamAttachment}>
-     * before returning the MIME part. It also finds the root part of the MIME
-     * package and assigns root variable.
-     *
-     * @return StreamAttachment next available MIME part
-     *
-     */
-    private StreamAttachment getNextPart() {
-        assert !lastBodyPartFound();
+    static class PartAttachment implements Attachment {
 
-        try {
-            if (firstPart) {
-                compileBoundaryPattern();
-                // skip the first boundary of the MIME package
-                if (!skipPreamble()) {
-                    throw new WebServiceException("Missing Start Boundary, or boundary does not start on a new line");
+        final MIMEPart part;
+        byte[] buf;
+
+        PartAttachment(MIMEPart part) {
+            this.part = part;
+        }
+
+        public @NotNull String getContentId() {
+            return part.getContentId();
+        }
+
+        public @NotNull String getContentType() {
+            return part.getContentType();
+        }
+
+        public byte[] asByteArray() {
+            if (buf == null) {
+                ByteArrayBuffer baf = new ByteArrayBuffer();
+                try {
+                    baf.write(part.readOnce());
+                } catch(IOException ioe) {
+                    throw new WebServiceException(ioe);
                 }
+                buf = baf.toByteArray();
             }
-            InternetHeaders ih = new InternetHeaders(in);
-            String[] contentTypes = ih.getHeader("content-type");
-            String contentType = (contentTypes != null) ? contentTypes[0] : "application/octet-stream";
-            String [] contentIds = ih.getHeader("content-id");
-            String mimeContentId = (contentIds != null) ? contentIds[0] : null;
-            String contentId = mimeContentId;
-            if(mimeContentId!=null && mimeContentId.length()>2) {
-                if(contentId.charAt(0)=='<')   contentId=mimeContentId.substring(1,mimeContentId.length()-1);
-            }
+            return buf;
+        }
 
-            ByteArrayBuffer bos = new ByteArrayBuffer();
-            b = readBody(bos);
-            StreamAttachment as = new StreamAttachment(bos, contentId, contentType);
-            if (start == null && firstPart) {
-                root = as;      // Taking first part as root part
-            } else if (mimeContentId != null && start != null && start.equals(mimeContentId)) {
-                root = as;      // root part as identified by start parameter
-            } else if (contentId != null) {
-                attachments.put(contentId, as);     // Attachment part
+        public DataHandler asDataHandler() {
+            return (buf != null)
+                ? new DataSourceStreamingDataHandler(new ByteArrayDataSource(buf,getContentType()))
+                : new MIMEPartStreamingDataHandler(part);
+        }
+
+        public Source asSource() {
+            return (buf != null)
+                ? new StreamSource(new ByteArrayInputStream(buf))
+                : new StreamSource(part.read());
+        }
+
+        public InputStream asInputStream() {
+            return (buf != null)
+                ? new ByteArrayInputStream(buf) : part.read();
+        }
+
+        public void writeTo(OutputStream os) throws IOException {
+            if (buf != null) {
+                os.write(buf);
             } else {
-                ++cidCounter;
-                attachments.put(""+cidCounter, as);
+                InputStream in = part.read();
+                byte[] temp = new byte[8192];
+                int len;
+                while((len=in.read(temp)) != -1) {
+                    os.write(temp, 0, len);
+                }
+                in.close();
             }
-            firstPart = false;
-            return as;
-        } catch(IOException ioe) {
-            throw new WebServiceException(ioe);
-        } catch(MessagingException me) {
-            throw new WebServiceException(me);
+        }
+
+        public void writeTo(SOAPMessage saaj) throws SOAPException {
+            saaj.createAttachmentPart().setDataHandler(asDataHandler());
         }
     }
 
-    private int readBody(ByteArrayBuffer baos) throws IOException {
-        if (!findMimeBody(baos)) {
-            //TODO: i18n
-            throw new WebServiceException("Missing boundary delimitier ");
-        }
-        return b;
-    }
-
-    private boolean findMimeBody(ByteArrayBuffer out) throws IOException {
-        int i;
-        int l = boundaryBytes.length;
-        int lx = l - 1;
-        int bufferLength;
-        int s = 0;
-        byte[] tmp;
-
-        boolean first = true;
-        BitSet eof = new BitSet(1);
-
-        while (true) {
-            in.mark(l);
-            if (!first) {
-                tmp = prevBuffer;
-                prevBuffer = buffer;
-                buffer = tmp;
-            }
-            bufferLength = readNext(in, l, eof);
-
-            if (bufferLength == -1) {
-                b = -1;
-                if ((s == l)) {
-                    out.write(prevBuffer, 0, s);
-                }
-                return true;
-            }
-
-            if (bufferLength < l) {
-                out.write(buffer, 0, bufferLength);
-                b = -1;
-                return true;
-            }
-
-            for (i = lx; i >= 0; i--) {
-                if (buffer[i] != boundaryBytes[i]) {
-                    break;
-                }
-            }
-
-            if (i < 0) {
-                if (s > 0) {
-                    // so if s == 1 : it must be an LF
-                    // if s == 2 : it must be a CR LF
-                    if (s <= 2) {
-                        String crlf = new String(prevBuffer, 0, s);
-                        if (!"\n".equals(crlf) && !"\r\n".equals(crlf)) {
-                            throw new WebServiceException(
-                                    "Boundary characters encountered in part Body " +
-                                            "without a preceeding CRLF");
-                        }
-                    } else if (s > 2) {
-                        if ((prevBuffer[s - 2] == '\r') && (prevBuffer[s - 1] == '\n')) {
-                            out.write(prevBuffer, 0, s - 2);
-                        } else if (prevBuffer[s - 1] == '\n') {
-                            out.write(prevBuffer, 0, s - 1);
-                        } else {
-                            throw new WebServiceException(
-                                    "Boundary characters encountered in part Body " +
-                                            "without a preceeding CRLF");
-                        }
-                    }
-                }
-                // found the boundary, skip *LWSP-char and CRLF
-                if (!skipLWSPAndCRLF(in)) {
-                    //throw new Exception(
-                    //   "Boundary does not terminate with CRLF");
-                }
-                return true;
-            }
-
-            if ((s > 0)) {
-                if (prevBuffer[s - 1] == (byte) 13) {
-                    // if buffer[0] == (byte)10
-                    if (buffer[0] == (byte) 10) {
-                        int j;
-                        for (j = lx - 1; j > 0; j--) {
-                            if (buffer[j + 1] != boundaryBytes[j]) {
-                                break;
-                            }
-                        }
-                        if (j == 0) {
-                            // matched the boundaryBytes excluding the last char of the boundaryBytes
-                            // so dont write the CR into stream
-                            out.write(prevBuffer, 0, s - 1);
-                        } else {
-                            out.write(prevBuffer, 0, s);
-                        }
-                    } else {
-                        out.write(prevBuffer, 0, s);
-                    }
-                } else {
-                    out.write(prevBuffer, 0, s);
-                }
-            }
-
-            s = Math.max(i + 1 - bcs[buffer[i] & 0x7f], gss[i]);
-            in.reset();
-            in.skip(s);
-            if (first) {
-                first = false;
-            }
-        }
-    }
-
-
-    private boolean lastBodyPartFound() {
-        return lastPartFound.get(0);
-    }
-
-    private void compileBoundaryPattern() {
-        int l = boundaryBytes.length;
-
-        int i;
-        int j;
-
-        // Copied from J2SE 1.4 regex code
-        // java.util.regex.Pattern.java
-
-        // Initialise Bad Character Shift table
-        for (i = 0; i < l; i++) {
-            bcs[boundaryBytes[i]] = i + 1;
-        }
-
-        // Initialise Good Suffix Shift table
-        gss = new int[l];
-
-        NEXT:
-        for (i = l; i > 0; i--) {
-            // j is the beginning index of suffix being considered
-            for (j = l - 1; j >= i; j--) {
-                // Testing for good suffix
-                if (boundaryBytes[j] == boundaryBytes[j - i]) {
-                    // boundaryBytes[j..len] is a good suffix
-                    gss[j - 1] = i;
-                } else {
-                    // No match. The array has already been
-                    // filled up with correct values before.
-                    continue NEXT;
-                }
-            }
-            while (j > 0) {
-                gss[--j] = i;
-            }
-        }
-        gss[l - 1] = 1;
-    }
-
-    private boolean skipPreamble() throws IOException {
-        if (!findBoundary()) {
-            return false;
-        }
-        if (lastPartFound.get(0)) {
-            throw new WebServiceException("Found closing boundary delimiter while trying to skip preamble");
-        }
-        return true;
-    }
-
-    private boolean findBoundary() throws IOException {
-        int i;
-        int l = boundaryBytes.length;
-        int lx = l - 1;
-        BitSet eof = new BitSet(1);
-
-        while (true) {
-            in.mark(l);
-            readNext(in, l, eof);
-            if (eof.get(0)) {
-                // End of stream
-                return false;
-            }
-
-            for (i = lx; i >= 0; i--) {
-                if (buffer[i] != boundaryBytes[i]) {
-                    break;
-                }
-            }
-
-            if (i < 0) {
-                // found the boundary, skip *LWSP-char and CRLF
-                if (!skipLWSPAndCRLF(in)) {
-                    throw new WebServiceException("Boundary does not terminate with CRLF");
-                }
-                return true;
-            }
-
-            int s = Math.max(i + 1 - bcs[buffer[i] & 0x7f], gss[i]);
-            in.reset();
-            in.skip(s);
-        }
-    }
-
-    private boolean skipLWSPAndCRLF(InputStream is) throws IOException {
-
-        b = is.read();
-        //looks like old impl allowed just a \n as well
-        if (b == '\n') {
-            return true;
-        }
-
-        if (b == '\r') {
-            b = is.read();
-            if (b == '\n') {
-                return true;
-            } else {
-                throw new WebServiceException(
-                        "transport padding after a Mime Boundary  should end in a CRLF, found CR only");
-            }
-        }
-
-        if (b == '-') {
-            b = is.read();
-            if (b != '-') {
-                throw new WebServiceException(
-                        "Unexpected singular '-' character after Mime Boundary");
-            } else {
-                lastPartFound.flip(0);
-                // read the next char
-                b = is.read();
-            }
-        }
-
-        while ((b != -1) && ((b == ' ') || (b == '\t'))) {
-            b = is.read();
-            if (b == '\r') {
-                b = is.read();
-                if (b == '\n') {
-                    return true;
-                }
-            }
-        }
-
-        if (b == -1) {
-            // the last boundary need not have CRLF
-            if (!lastPartFound.get(0)) {
-                throw new WebServiceException(
-                        "End of Multipart Stream before encountering  closing boundary delimiter");
-            }
-            return true;
-        }
-        return false;
-    }
-
-
-    private int readNext(InputStream is, int patternLength, BitSet eof) throws IOException {
-        int bufferLength = is.read(buffer, 0, patternLength);
-        if (bufferLength == -1) {
-            eof.flip(0);
-        } else if (bufferLength < patternLength) {
-            //repeatedly read patternLength - bufferLength
-            int temp ;
-            int i = bufferLength;
-            for (; i < patternLength; i++) {
-                temp = is.read();
-                if (temp == -1) {
-                    eof.flip(0);
-                    break;
-                }
-                buffer[i] = (byte) temp;
-            }
-            bufferLength = i;
-        }
-        return bufferLength;
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java
index b53d61b2fc9..c49581de968 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java
@@ -28,8 +28,8 @@ package com.sun.xml.internal.ws.encoding;
 import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.bind.DatatypeConverterImpl;
 import com.sun.xml.internal.bind.v2.runtime.output.Encoded;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.util.OutputUtil;
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.api.message.AttachmentSet;
 import com.sun.xml.internal.ws.api.message.Packet;
@@ -38,10 +38,11 @@ import com.sun.xml.internal.ws.api.pipe.StreamSOAPCodec;
 import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
 import com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory;
 import com.sun.xml.internal.ws.message.MimeAttachmentSet;
-import com.sun.xml.internal.ws.message.stream.StreamAttachment;
 import com.sun.xml.internal.ws.util.ByteArrayDataSource;
 import com.sun.xml.internal.ws.util.xml.XMLStreamReaderFilter;
 import com.sun.xml.internal.ws.util.xml.XMLStreamWriterFilter;
+import com.sun.xml.internal.ws.streaming.MtomStreamWriter;
+import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
 import com.sun.xml.internal.org.jvnet.staxex.Base64Data;
 import com.sun.xml.internal.org.jvnet.staxex.NamespaceContextEx;
 import com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx;
@@ -56,21 +57,23 @@ import javax.xml.stream.XMLStreamWriter;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.WebServiceFeature;
 import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.bind.attachment.AttachmentMarshaller;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.nio.channels.WritableByteChannel;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 /**
  * Mtom messge Codec. It can be used even for non-soap message's mtom encoding.
  *
  * @author Vivek Pandey
+ * @author Jitendra Kotamraju
  */
 public class MtomCodec extends MimeCodec {
     public static final String XOP_XML_MIME_TYPE = "application/xop+xml";
@@ -79,15 +82,13 @@ public class MtomCodec extends MimeCodec {
 
     // encoding related parameters
     private String boundary;
+    private String rootId;
     private final String soapXopContentType;
     private String messageContentType;
     private final MTOMFeature mtomFeature;
 
-    //This is the mtom attachment stream, we should write it just after the root part for decoder
-    private final List<ByteArrayBuffer> mtomAttachmentStream = new ArrayList<ByteArrayBuffer>();
-
-    MtomCodec(SOAPVersion version, StreamSOAPCodec codec, WebServiceFeature mtomFeature){
-        super(version);
+    MtomCodec(SOAPVersion version, StreamSOAPCodec codec, WSBinding binding, WebServiceFeature mtomFeature){
+        super(version, binding);
         this.codec = codec;
         createConteTypeHeader();
         this.soapXopContentType = XOP_XML_MIME_TYPE +";charset=utf-8;type=\""+version.contentType+"\"";
@@ -98,9 +99,12 @@ public class MtomCodec extends MimeCodec {
     }
 
     private void createConteTypeHeader(){
-        boundary = "uuid:" + UUID.randomUUID().toString();
+        String uuid = UUID.randomUUID().toString();
+        boundary = "uuid:" + uuid;
+        rootId = "<rootpart*"+uuid+"@example.jaxws.sun.com>";
         String boundaryParameter = "boundary=\"" + boundary +"\"";
         messageContentType = MULTIPART_RELATED_MIME_TYPE +
+                ";start=\""+rootId +"\"" +
                 ";type=\"" + XOP_XML_MIME_TYPE + "\";" +
                 boundaryParameter +
                 ";start-info=\"" + version.contentType + "\"";
@@ -131,21 +135,24 @@ public class MtomCodec extends MimeCodec {
 
     public ContentType encode(Packet packet, OutputStream out) throws IOException {
         //get the current boundary thaat will be reaturned from this method
-        mtomAttachmentStream.clear();
         ContentType contentType = getContentType(packet);
 
         if(packet.getMessage() != null){
             try {
-                OutputUtil.writeln("--"+boundary, out);
-                OutputUtil.writeln("Content-Type: "+ soapXopContentType,  out);
-                OutputUtil.writeln("Content-Transfer-Encoding: binary", out);
-                OutputUtil.writeln(out);
-                MtomStreamWriter writer = new MtomStreamWriter(XMLStreamWriterFactory.create(out),out);
+                writeln("--"+boundary, out);
+                writeln("Content-Id: " + rootId, out);
+                writeln("Content-Type: "+ soapXopContentType,  out);
+                writeln("Content-Transfer-Encoding: binary", out);
+                writeln(out);
+
+                //mtom attachments that need to be written after the root part
+                List<ByteArrayBuffer> mtomAttachments = new ArrayList<ByteArrayBuffer>();
+                MtomStreamWriterImpl writer = new MtomStreamWriterImpl(XMLStreamWriterFactory.create(out),out, mtomAttachments);
                 packet.getMessage().writeTo(writer);
                 XMLStreamWriterFactory.recycle(writer);
-                OutputUtil.writeln(out);
+                writeln(out);
 
-                for(ByteArrayBuffer bos : mtomAttachmentStream){
+                for(ByteArrayBuffer bos : mtomAttachments){
                     bos.write(out);
                 }
 
@@ -153,8 +160,8 @@ public class MtomCodec extends MimeCodec {
                 writeAttachments(packet.getMessage().getAttachments(),out);
 
                 //write out the end boundary
-                OutputUtil.writeAsAscii("--"+boundary, out);
-                OutputUtil.writeAsAscii("--", out);
+                writeAsAscii("--"+boundary, out);
+                writeAsAscii("--", out);
 
             } catch (XMLStreamException e) {
                 throw new WebServiceException(e);
@@ -177,30 +184,30 @@ public class MtomCodec extends MimeCodec {
 
         void write(OutputStream os) throws IOException {
             //build attachment frame
-            OutputUtil.writeln("--"+boundary, os);
+            writeln("--"+boundary, os);
             writeMimeHeaders(dh.getContentType(), contentId, os);
             dh.writeTo(os);
-            OutputUtil.writeln(os);
+            writeln(os);
         }
     }
 
     private void writeMimeHeaders(String contentType, String contentId, OutputStream out) throws IOException {
-        OutputUtil.writeln("Content-Type: " + contentType, out);
         String cid = contentId;
         if(cid != null && cid.length() >0 && cid.charAt(0) != '<')
             cid = '<' + cid + '>';
-        OutputUtil.writeln("Content-Id: " + cid, out);
-        OutputUtil.writeln("Content-Transfer-Encoding: binary", out);
-        OutputUtil.writeln(out);
+        writeln("Content-Id: " + cid, out);
+        writeln("Content-Type: " + contentType, out);
+        writeln("Content-Transfer-Encoding: binary", out);
+        writeln(out);
     }
 
     private void writeAttachments(AttachmentSet attachments, OutputStream out) throws IOException {
         for(Attachment att : attachments){
             //build attachment frame
-            OutputUtil.writeln("--"+boundary, out);
+            writeln("--"+boundary, out);
             writeMimeHeaders(att.getContentType(), att.getContentId(), out);
             att.writeTo(out);
-            OutputUtil.writeln(out);                    // write \r\n
+            writeln(out);                    // write \r\n
         }
     }
 
@@ -209,7 +216,7 @@ public class MtomCodec extends MimeCodec {
     }
 
     public MtomCodec copy() {
-        return new MtomCodec(version, (StreamSOAPCodec)codec.copy(), mtomFeature);
+        return new MtomCodec(version, (StreamSOAPCodec)codec.copy(), binding, mtomFeature);
     }
 
     private String encodeCid(){
@@ -227,22 +234,20 @@ public class MtomCodec extends MimeCodec {
             XMLStreamReaderFactory.create(null, mpp.getRootPart().asInputStream(), true)
         );
 
-        //TODO: remove this code after {@link StreamSOAPCodec#decode} is modified to
-        //take AttachmentSet.
-        if(codec instanceof com.sun.xml.internal.ws.encoding.StreamSOAPCodec){
-            packet.setMessage(((com.sun.xml.internal.ws.encoding.StreamSOAPCodec)codec).decode(mtomReader, new MimeAttachmentSet(mpp)));
-        }else{
-            packet.setMessage(codec.decode(mtomReader));
-        }
+        packet.setMessage(codec.decode(mtomReader, new MimeAttachmentSet(mpp)));
+
     }
 
-    private class MtomStreamWriter extends XMLStreamWriterFilter implements XMLStreamWriterEx {
+    private class MtomStreamWriterImpl extends XMLStreamWriterFilter implements XMLStreamWriterEx,
+            MtomStreamWriter {
         private final OutputStream out;
         private final Encoded encoded = new Encoded();
+        private final List<ByteArrayBuffer> mtomAttachments;
 
-        public MtomStreamWriter(XMLStreamWriter w, OutputStream out) {
+        public MtomStreamWriterImpl(XMLStreamWriter w, OutputStream out, List<ByteArrayBuffer> mtomAttachments) {
             super(w);
             this.out = out;
+            this.mtomAttachments = mtomAttachments;
         }
 
         public void writeBinary(byte[] data, int start, int len, String contentType) throws XMLStreamException {
@@ -256,9 +261,8 @@ public class MtomCodec extends MimeCodec {
         }
 
         public void writeBinary(DataHandler dataHandler) throws XMLStreamException {
-            Base64Data data  = new Base64Data();
-            data.set(dataHandler);
-            writeBinary(new ByteArrayBuffer(data.getDataHandler()));
+            // TODO how do we check threshold and if less inline the data
+            writeBinary(new ByteArrayBuffer(dataHandler));
         }
 
         public OutputStream writeBinary(String contentType) throws XMLStreamException {
@@ -278,17 +282,15 @@ public class MtomCodec extends MimeCodec {
 
         private void writeBinary(ByteArrayBuffer bab) {
             try {
-                mtomAttachmentStream.add(bab);
+                mtomAttachments.add(bab);
 
                 writer.writeCharacters("");   // Force completion of open elems
                 writer.flush();
                 //flush the underlying writer to write-out any cached data to the underlying
                 // stream before writing directly to it
                 //write out the xop reference
-                out.write(XOP_PREF);
-                encoded.set(bab.contentId);
+                encoded.set(XOP_PREF+bab.contentId+XOP_SUFF);
                 out.write(encoded.buf,0,encoded.len);
-                out.write(XOP_SUFF);
             } catch (IOException e) {
                 throw new WebServiceException(e);
             } catch (XMLStreamException e) {
@@ -296,6 +298,57 @@ public class MtomCodec extends MimeCodec {
             }
         }
 
+        @Override
+        public Object getProperty(String name) throws IllegalArgumentException {
+            // Hack for JDK6's SJSXP
+            if (name.equals("sjsxp-outputstream") && writer instanceof Map) {
+                Object obj = ((Map) writer).get("sjsxp-outputstream");
+                if (obj != null) {
+                    return obj;
+                }
+            }
+            return super.getProperty(name);
+        }
+
+        /**
+         * JAXBMessage writes envelope directly to the OutputStream(for SJSXP, woodstox).
+         * While writing, it calls the AttachmentMarshaller methods for adding attachments.
+         * JAXB writes xop:Include in this case.
+         */
+        public AttachmentMarshaller getAttachmentMarshaller() {
+            return new AttachmentMarshaller() {
+
+                public String addMtomAttachment(DataHandler data, String elementNamespace, String elementLocalName) {
+                    // Should we do the threshold processing on DataHandler ? But that would be
+                    // expensive as DataHolder need to read the data again from its source
+                    ByteArrayBuffer bab = new ByteArrayBuffer(data);
+                    mtomAttachments.add(bab);
+                    return "cid:"+bab.contentId;
+                }
+
+                public String addMtomAttachment(byte[] data, int offset, int length, String mimeType, String elementNamespace, String elementLocalName) {
+                    // inline the data based on the threshold
+                    if (mtomFeature.getThreshold() > length) {
+                        return null;                // JAXB inlines the attachment data
+                    }
+                    ByteArrayBuffer bab = new ByteArrayBuffer(new DataHandler(new ByteArrayDataSource(data, offset, length, mimeType)));
+                    mtomAttachments.add(bab);
+                    return "cid:"+bab.contentId;
+                }
+
+                public String addSwaRefAttachment(DataHandler data) {
+                    ByteArrayBuffer bab = new ByteArrayBuffer(data);
+                    mtomAttachments.add(bab);
+                    return "cid:"+bab.contentId;
+                }
+
+                @Override
+                public boolean isXOPPackage() {
+                    return true;
+                }
+            };
+        }
+
         private class MtomNamespaceContextEx implements NamespaceContextEx {
             private NamespaceContext nsContext;
 
@@ -320,6 +373,7 @@ public class MtomCodec extends MimeCodec {
             }
         }
 
+        @Override
         public NamespaceContextEx getNamespaceContext() {
             NamespaceContext nsContext = writer.getNamespaceContext();
             return new MtomNamespaceContextEx(nsContext);
@@ -335,10 +389,6 @@ public class MtomCodec extends MimeCodec {
         private boolean xopReferencePresent = false;
         private Base64Data base64AttData;
 
-        //values that will set to whether mtom or not as caller can call getPcData or getTextCharacters
-        private int textLength;
-        private int textStart;
-
         //To be used with #getTextCharacters
         private char[] base64EncodedText;
 
@@ -357,15 +407,13 @@ public class MtomCodec extends MimeCodec {
         public NamespaceContextEx getNamespaceContext() {
             NamespaceContext nsContext = reader.getNamespaceContext();
             return new MtomNamespaceContextEx(nsContext);
-
-
         }
 
         public String getElementTextTrim() throws XMLStreamException {
             throw new UnsupportedOperationException();
         }
 
-        private class MtomNamespaceContextEx implements NamespaceContextEx {
+        private static class MtomNamespaceContextEx implements NamespaceContextEx {
             private NamespaceContext nsContext;
 
             public MtomNamespaceContextEx(NamespaceContext nsContext) {
@@ -391,15 +439,16 @@ public class MtomCodec extends MimeCodec {
         }
 
         public int getTextLength() {
-            if (xopReferencePresent)
-                return textLength;
+            if (xopReferencePresent) {
+                return base64AttData.length();
+            }
             return reader.getTextLength();
         }
 
         public int getTextStart() {
-            //TODO: check if this is correct
-            if (xopReferencePresent)
+            if (xopReferencePresent) {
                 return 0;
+            }
             return reader.getTextStart();
         }
 
@@ -411,33 +460,25 @@ public class MtomCodec extends MimeCodec {
 
         public int next() throws XMLStreamException {
             int event = reader.next();
-            if ((event == XMLStreamConstants.START_ELEMENT) && reader.getLocalName().equals(XOP_LOCALNAME) && reader.getNamespaceURI().equals(XOP_NAMESPACEURI))
-            {
+            if (event == XMLStreamConstants.START_ELEMENT && reader.getLocalName().equals(XOP_LOCALNAME) && reader.getNamespaceURI().equals(XOP_NAMESPACEURI)) {
                 //its xop reference, take the URI reference
                 String href = reader.getAttributeValue(null, "href");
                 try {
-                    StreamAttachment att = getAttachment(href);
+                    Attachment att = getAttachment(href);
                     if(att != null){
-                        base64AttData = att.asBase64Data();
-                        textLength = base64AttData.getDataLen();
+                        base64AttData = new Base64Data();
+                        base64AttData.set(att.asDataHandler());
                     }
-                    textStart = 0;
                     xopReferencePresent = true;
                 } catch (IOException e) {
                     throw new WebServiceException(e);
                 }
                 //move to the </xop:Include>
-                try {
-                    reader.next();
-                } catch (XMLStreamException e) {
-                    throw new WebServiceException(e);
-                }
+                XMLStreamReaderUtil.nextElementContent(reader);
                 return XMLStreamConstants.CHARACTERS;
             }
             if(xopReferencePresent){
                 xopReferencePresent = false;
-                textStart = 0;
-                textLength = 0;
                 base64EncodedText = null;
             }
             return event;
@@ -448,43 +489,24 @@ public class MtomCodec extends MimeCodec {
                 cid = URLDecoder.decode(cid, "utf-8");
             } catch (UnsupportedEncodingException e) {
                 //on recceiving side lets not fail now, try to look for it
-                return cid;
             }
             return cid;
         }
 
-        private boolean needToDecode(String cid){
-            int numChars = cid.length();
-            int i=0;
-            char c;
-            while (i < numChars) {
-                c = cid.charAt(i++);
-                switch (c) {
-                    case '%':
-                        return true;
-                }
-            }
-            return false;
-        }
-
-
-        private StreamAttachment getAttachment(String cid) throws IOException {
+        private Attachment getAttachment(String cid) throws IOException {
             if (cid.startsWith("cid:"))
                 cid = cid.substring(4, cid.length());
-            StreamAttachment att = mimeMP.getAttachmentPart(cid);
-            if(att == null && needToDecode(cid)){
-                //try not be url decoding it - this is required for Indigo interop, they write content-id without escaping
+            if (cid.indexOf('%') != -1) {
                 cid = decodeCid(cid);
                 return mimeMP.getAttachmentPart(cid);
             }
-            return att;
+            return mimeMP.getAttachmentPart(cid);
         }
 
         public char[] getTextCharacters() {
             if (xopReferencePresent) {
                 char[] chars = new char[base64AttData.length()];
                 base64AttData.writeTo(chars, 0);
-                textLength = chars.length;
                 return chars;
             }
             return reader.getTextCharacters();
@@ -492,12 +514,6 @@ public class MtomCodec extends MimeCodec {
 
         public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) throws XMLStreamException {
             if(xopReferencePresent){
-                int event = reader.getEventType();
-                if(event != XMLStreamConstants.CHARACTERS){
-                    //its invalid state - delegate it to underlying reader to throw the corrrect exception so that user
-                    // always sees the uniform exception from the XMLStreamReader
-                    throw new XMLStreamException("Invalid state: Expected CHARACTERS found :");
-                }
                 if(target == null){
                     throw new NullPointerException("target char array can't be null") ;
                 }
@@ -507,26 +523,17 @@ public class MtomCodec extends MimeCodec {
                     throw new IndexOutOfBoundsException();
                 }
 
-                if(base64EncodedText != null){
-                    base64EncodedText = new char[base64AttData.length()];
-                    base64AttData.writeTo(base64EncodedText, 0);
-                    textLength = base64EncodedText.length;
-                    textStart = 0;
-                }
-
-                if((textStart + sourceStart) > textLength)
+                int textLength = base64AttData.length();
+                if(sourceStart > textLength)
                     throw new IndexOutOfBoundsException();
 
-                int available = textLength - sourceStart;
-                if(available < 0){
-                    throw new IndexOutOfBoundsException("sourceStart is greater than" +
-                            "number of characters associated with this event");
+                if(base64EncodedText == null){
+                    base64EncodedText = new char[base64AttData.length()];
+                    base64AttData.writeTo(base64EncodedText, 0);
                 }
 
-                int copiedLength = Math.min(available,length);
-
-                System.arraycopy(base64EncodedText, getTextStart() + sourceStart , target, targetStart, copiedLength);
-                textStart = sourceStart;
+                int copiedLength = Math.min(textLength - sourceStart, length);
+                System.arraycopy(base64EncodedText, sourceStart , target, targetStart, copiedLength);
                 return copiedLength;
             }
             return reader.getTextCharacters(sourceStart, target, targetStart, length);
@@ -534,27 +541,15 @@ public class MtomCodec extends MimeCodec {
 
         public String getText() {
             if (xopReferencePresent) {
-                String text =  base64AttData.toString();
-                textLength = text.length();
+                return base64AttData.toString();
             }
             return reader.getText();
         }
     }
 
-    private static final byte[] XOP_PREF = encode("<Include xmlns=\"http://www.w3.org/2004/08/xop/include\" href=\"cid:");
-
-    private static byte[] encode(String str) {
-        try {
-            return str.getBytes("UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new Error(e);
-        }
-    }
-
-    private static final byte[] XOP_SUFF = encode("\"/>");
+    private static final String XOP_PREF = "<Include xmlns=\"http://www.w3.org/2004/08/xop/include\" href=\"cid:";
+    private static final String XOP_SUFF = "\"/>";
     private static final String XOP_LOCALNAME = "Include";
     private static final String XOP_NAMESPACEURI = "http://www.w3.org/2004/08/xop/include";
 
-
-    private static final Charset UTF8 = Charset.forName("UTF-8");
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java
new file mode 100644
index 00000000000..0c342bc3782
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.encoding;
+
+
+
+
+/*
+ * @(#)ParameterList.java     1.10 03/02/12
+ */
+
+
+import javax.xml.ws.WebServiceException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * This class holds MIME parameters (attribute-value pairs).
+ *
+ * @version 1.10, 03/02/12
+ * @author  John Mani
+ */
+
+final class ParameterList {
+
+    private final Map<String, String> list;
+
+    /**
+     * Constructor that takes a parameter-list string. The String
+     * is parsed and the parameters are collected and stored internally.
+     * A ParseException is thrown if the parse fails.
+     * Note that an empty parameter-list string is valid and will be
+     * parsed into an empty ParameterList.
+     *
+     * @param   s       the parameter-list string.
+     * @exception WebServiceException if the parse fails.
+     */
+    ParameterList(String s) {
+        HeaderTokenizer h = new HeaderTokenizer(s, HeaderTokenizer.MIME);
+        HeaderTokenizer.Token tk;
+        int type;
+        String name;
+
+        list = new HashMap<String, String>();
+        while (true) {
+            tk = h.next();
+            type = tk.getType();
+
+            if (type == HeaderTokenizer.Token.EOF) // done
+            return;
+
+            if ((char)type == ';') {
+                // expect parameter name
+                tk = h.next();
+                // tolerate trailing semicolon, even though it violates the spec
+                if (tk.getType() == HeaderTokenizer.Token.EOF)
+                    return;
+                // parameter name must be a MIME Atom
+                if (tk.getType() != HeaderTokenizer.Token.ATOM)
+                    throw new WebServiceException();
+                name = tk.getValue().toLowerCase();
+
+                // expect '='
+                tk = h.next();
+                if ((char)tk.getType() != '=')
+                    throw new WebServiceException();
+
+                // expect parameter value
+                tk = h.next();
+                type = tk.getType();
+                // parameter value must be a MIME Atom or Quoted String
+                if (type != HeaderTokenizer.Token.ATOM &&
+                    type != HeaderTokenizer.Token.QUOTEDSTRING)
+                    throw new WebServiceException();
+
+                list.put(name, tk.getValue());
+            } else
+                throw new WebServiceException();
+        }
+    }
+
+    /**
+     * Return the number of parameters in this list.
+     *
+     * @return  number of parameters.
+     */
+    int size() {
+            return list.size();
+    }
+
+    /**
+     * Returns the value of the specified parameter. Note that
+     * parameter names are case-insensitive.
+     *
+     * @param name      parameter name.
+     * @return          Value of the parameter. Returns
+     *                  <code>null</code> if the parameter is not
+     *                  present.
+     */
+    String get(String name) {
+            return list.get(name.trim().toLowerCase());
+    }
+
+
+    /**
+     * Return an enumeration of the names of all parameters in this
+     * list.
+     *
+     * @return Enumeration of all parameter names in this list.
+     */
+    Iterator<String> getNames() {
+            return list.keySet().iterator();
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java
new file mode 100644
index 00000000000..4e8c1f19a7a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.encoding;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.ReadableByteChannel;
+
+/**
+ * {@link Codec} that works only on the root part of the MIME/multipart.
+ * It doesn't work on the attachment parts, so it takes {@link AttachmentSet}
+ * as an argument and creates a corresponding {@link Message}. This enables
+ * attachments to be parsed lazily by wrapping the mimepull parser into an
+ * {@link AttachmentSet}
+ *
+ * @author Jitendra Kotamraju
+ */
+public interface RootOnlyCodec extends Codec {
+
+    /**
+     * Reads root part bytes from {@link InputStream} and constructs a {@link Message}
+     * along with the given attachments.
+     *
+     * @param in root part's data
+     *
+     * @param contentType root part's MIME content type (like "application/xml")
+     *
+     * @param packet the new created {@link Message} is set in this packet
+     *
+     * @param att attachments
+     *
+     * @throws IOException
+     *      if {@link InputStream} throws an exception.
+     */
+    void decode(@NotNull InputStream in, @NotNull String contentType, @NotNull Packet packet, @NotNull AttachmentSet att)
+            throws IOException;
+
+    /**
+     *
+     * @see #decode(InputStream, String, Packet, AttachmentSet)
+     */
+    void decode(@NotNull ReadableByteChannel in, @NotNull String contentType, @NotNull Packet packet, @NotNull AttachmentSet att);
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java
index e69b35dc384..c280ce5901a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java
@@ -25,6 +25,26 @@
 
 package com.sun.xml.internal.ws.encoding;
 
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.client.SelectOptimalEncodingFeature;
+import com.sun.xml.internal.ws.api.fastinfoset.FastInfosetFeature;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.message.ExceptionHasMessage;
+import com.sun.xml.internal.ws.api.pipe.Codec;
+import com.sun.xml.internal.ws.api.pipe.Codecs;
+import com.sun.xml.internal.ws.api.pipe.ContentType;
+import com.sun.xml.internal.ws.api.pipe.StreamSOAPCodec;
+import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
+import com.sun.xml.internal.ws.client.ContentNegotiation;
+import com.sun.xml.internal.ws.protocol.soap.MessageCreationException;
+import com.sun.xml.internal.ws.resources.StreamingMessages;
+import com.sun.xml.internal.ws.server.UnsupportedMediaException;
+
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.soap.MTOMFeature;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -33,33 +53,6 @@ import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.util.StringTokenizer;
 
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
-import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.soap.MTOMFeature;
-
-import com.sun.xml.internal.ws.api.SOAPVersion;
-import com.sun.xml.internal.ws.api.WSBinding;
-import com.sun.xml.internal.ws.api.client.SelectOptimalEncodingFeature;
-import com.sun.xml.internal.ws.api.fastinfoset.FastInfosetFeature;
-import com.sun.xml.internal.ws.api.message.Header;
-import com.sun.xml.internal.ws.api.message.HeaderList;
-import com.sun.xml.internal.ws.api.message.Message;
-import com.sun.xml.internal.ws.api.message.Messages;
-import com.sun.xml.internal.ws.api.message.Packet;
-import com.sun.xml.internal.ws.api.pipe.Codec;
-import com.sun.xml.internal.ws.api.pipe.ContentType;
-import com.sun.xml.internal.ws.api.pipe.StreamSOAPCodec;
-import com.sun.xml.internal.ws.api.pipe.Codecs;
-import com.sun.xml.internal.ws.binding.SOAPBindingImpl;
-import com.sun.xml.internal.ws.client.ContentNegotiation;
-import com.sun.xml.internal.ws.resources.ServerMessages;
-import com.sun.xml.internal.ws.resources.StreamingMessages;
-import com.sun.xml.internal.ws.server.ServerRtException;
-import com.sun.xml.internal.ws.server.UnsupportedMediaException;
-import com.sun.xml.internal.ws.transport.http.WSHTTPConnection;
-
 /**
  * SOAP binding {@link Codec} that can handle MTOM, SwA, and SOAP messages
  * encoded using XML or Fast Infoset.
@@ -178,14 +171,14 @@ public class SOAPBindingCodec extends MimeCodec implements com.sun.xml.internal.
     }
 
     public SOAPBindingCodec(WSBinding binding, StreamSOAPCodec xmlSoapCodec) {
-        super(binding.getSOAPVersion());
+        super(binding.getSOAPVersion(), binding);
 
         this.xmlSoapCodec = xmlSoapCodec;
         xmlMimeType = xmlSoapCodec.getMimeType();
 
-        xmlMtomCodec = new MtomCodec(version, xmlSoapCodec, binding.getFeature(MTOMFeature.class));
+        xmlMtomCodec = new MtomCodec(version, xmlSoapCodec, binding, binding.getFeature(MTOMFeature.class));
 
-        xmlSwaCodec = new SwACodec(version, xmlSoapCodec);
+        xmlSwaCodec = new SwACodec(version, binding, xmlSoapCodec);
 
         String clientAcceptedContentTypes = xmlSoapCodec.getMimeType() + ", " +
                 xmlMtomCodec.getMimeType() + ", " +
@@ -197,7 +190,7 @@ public class SOAPBindingCodec extends MimeCodec implements com.sun.xml.internal.
             fiSoapCodec = getFICodec(xmlSoapCodec, version);
             if (fiSoapCodec != null) {
                 fiMimeType = fiSoapCodec.getMimeType();
-                fiSwaCodec = new SwACodec(version, fiSoapCodec);
+                fiSwaCodec = new SwACodec(version, binding, fiSoapCodec);
                 connegXmlAccept = fiMimeType + ", " + clientAcceptedContentTypes;
 
                 /**
@@ -238,6 +231,8 @@ public class SOAPBindingCodec extends MimeCodec implements com.sun.xml.internal.
 
         xmlAccept = clientAcceptedContentTypes;
 
+        if(!(binding instanceof SOAPBindingImpl))
+            throw new WebServiceException("Expecting a SOAP binding but found "+binding);
         this.binding = (SOAPBindingImpl)binding;
     }
 
@@ -269,19 +264,25 @@ public class SOAPBindingCodec extends MimeCodec implements com.sun.xml.internal.
          */
         if (packet.contentNegotiation == null)
             useFastInfosetForEncoding = false;
+        try {
+            if(isMultipartRelated(contentType))
+                // parse the multipart portion and then decide whether it's MTOM or SwA
+                super.decode(in, contentType, packet);
+            else if(isFastInfoset(contentType)) {
+                if (!ignoreContentNegotiationProperty && packet.contentNegotiation == ContentNegotiation.none)
+                    throw noFastInfosetForDecoding();
 
-        if(isMultipartRelated(contentType))
-            // parse the multipart portion and then decide whether it's MTOM or SwA
-            super.decode(in, contentType, packet);
-        else if(isFastInfoset(contentType)) {
-            if (!ignoreContentNegotiationProperty && packet.contentNegotiation == ContentNegotiation.none)
-                throw noFastInfosetForDecoding();
-
-            useFastInfosetForEncoding = true;
-            fiSoapCodec.decode(in, contentType, packet);
-        } else
-            xmlSoapCodec.decode(in, contentType, packet);
-
+                useFastInfosetForEncoding = true;
+                fiSoapCodec.decode(in, contentType, packet);
+            } else
+                xmlSoapCodec.decode(in, contentType, packet);
+        } catch(RuntimeException we) {
+            if (we instanceof ExceptionHasMessage || we instanceof UnsupportedMediaException) {
+                throw we;
+            } else {
+                throw new MessageCreationException(binding.getSOAPVersion(), we);
+            }
+        }
         if (!useFastInfosetForEncoding) {
             useFastInfosetForEncoding = isFastInfosetAcceptable(packet.acceptableMimeTypes);
         }
@@ -297,19 +298,24 @@ public class SOAPBindingCodec extends MimeCodec implements com.sun.xml.internal.
          */
         if (packet.contentNegotiation == null)
             useFastInfosetForEncoding = false;
+        try {
+            if(isMultipartRelated(contentType))
+                super.decode(in, contentType, packet);
+            else if(isFastInfoset(contentType)) {
+                if (packet.contentNegotiation == ContentNegotiation.none)
+                    throw noFastInfosetForDecoding();
 
-        if(isMultipartRelated(contentType))
-            super.decode(in, contentType, packet);
-        else if(isFastInfoset(contentType)) {
-            if (packet.contentNegotiation == ContentNegotiation.none)
-                throw noFastInfosetForDecoding();
-
-            useFastInfosetForEncoding = true;
-            fiSoapCodec.decode(in, contentType, packet);
-        } else
-            xmlSoapCodec.decode(in, contentType, packet);
-
-//        checkDuplicateKnownHeaders(packet);
+                useFastInfosetForEncoding = true;
+                fiSoapCodec.decode(in, contentType, packet);
+            } else
+                xmlSoapCodec.decode(in, contentType, packet);
+        } catch(RuntimeException we) {
+            if (we instanceof ExceptionHasMessage || we instanceof UnsupportedMediaException) {
+                throw we;
+            } else {
+                throw new MessageCreationException(binding.getSOAPVersion(), we);
+            }
+        }
         if (!useFastInfosetForEncoding) {
             useFastInfosetForEncoding = isFastInfosetAcceptable(packet.acceptableMimeTypes);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java
index 3d24ee2f21c..82aa670ff7f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java
@@ -42,7 +42,7 @@ import java.util.List;
  */
 final class StreamSOAP11Codec extends StreamSOAPCodec {
     public static final String SOAP11_MIME_TYPE = "text/xml";
-    public static final String SOAP11_CONTENT_TYPE = SOAP11_MIME_TYPE+"; charset=utf-8";
+    public static final String SOAP11_CONTENT_TYPE = SOAP11_MIME_TYPE+";charset=\"utf-8\"";
 
     private static final List<String> expectedContentTypes = Collections.singletonList(SOAP11_MIME_TYPE);
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java
index 4c69ca0ae1b..ba866877f97 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java
@@ -42,7 +42,7 @@ import java.util.List;
  */
 final class StreamSOAP12Codec extends StreamSOAPCodec {
     public static final String SOAP12_MIME_TYPE = "application/soap+xml";
-    public static final String SOAP12_CONTENT_TYPE = SOAP12_MIME_TYPE+"; charset=utf-8";
+    public static final String SOAP12_CONTENT_TYPE = SOAP12_MIME_TYPE+";charset=\"utf-8\"";
 
     private static final List<String> expectedContentTypes = Collections.singletonList(SOAP12_MIME_TYPE);
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java
index 9c297de1b28..083719bbbfe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java
@@ -56,6 +56,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -66,7 +67,7 @@ import java.util.Map;
  * @author Paul Sandoz
  */
 @SuppressWarnings({"StringEquality"})
-public abstract class StreamSOAPCodec implements com.sun.xml.internal.ws.api.pipe.StreamSOAPCodec {
+public abstract class StreamSOAPCodec implements com.sun.xml.internal.ws.api.pipe.StreamSOAPCodec, RootOnlyCodec {
 
     private static final String SOAP_ENVELOPE = "Envelope";
     private static final String SOAP_HEADER = "Header";
@@ -114,14 +115,7 @@ public abstract class StreamSOAPCodec implements com.sun.xml.internal.ws.api.pip
     protected abstract List<String> getExpectedContentTypes();
 
     public void decode(InputStream in, String contentType, Packet packet) throws IOException {
-        List<String> expectedContentTypes = getExpectedContentTypes();
-        if (contentType != null && !isContentTypeSupported(contentType,expectedContentTypes)) {
-            throw new UnsupportedMediaException(contentType, expectedContentTypes);
-        }
-        // TODO: we should definitely let Decode owns one XMLStreamReader instance
-        // instead of going to this generic factory
-        XMLStreamReader reader = new TidyXMLStreamReader(XMLStreamReaderFactory.create(null, in, true), in);
-        packet.setMessage(decode(reader));
+        decode(in, contentType, packet, new AttachmentSetImpl());
     }
 
     /*
@@ -178,6 +172,9 @@ public abstract class StreamSOAPCodec implements com.sun.xml.internal.ws.api.pip
 
         // Collect namespaces on soap:Envelope
         Map<String,String> namespaces = new HashMap<String,String>();
+        for(int i=0; i< reader.getNamespaceCount();i++){
+                namespaces.put(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));
+        }
 
         // Move to next element
         XMLStreamReaderUtil.nextElementContent(reader);
@@ -281,6 +278,23 @@ public abstract class StreamSOAPCodec implements com.sun.xml.internal.ws.api.pip
         return new MutableXMLStreamBuffer();
     }
 
+    public void decode(InputStream in, String contentType, Packet packet, AttachmentSet att ) throws IOException {
+        List<String> expectedContentTypes = getExpectedContentTypes();
+        if (contentType != null && !isContentTypeSupported(contentType,expectedContentTypes)) {
+            throw new UnsupportedMediaException(contentType, expectedContentTypes);
+        }
+        String charset = new ContentTypeImpl(contentType).getCharSet();
+        if (charset != null && !Charset.isSupported(charset)) {
+            throw new UnsupportedMediaException(charset);
+        }
+        XMLStreamReader reader = XMLStreamReaderFactory.create(null, in, charset, true);
+        reader =  new TidyXMLStreamReader(reader, in);
+        packet.setMessage(decode(reader, att));
+    }
+
+    public void decode(ReadableByteChannel in, String contentType, Packet response, AttachmentSet att ) {
+        throw new UnsupportedOperationException();
+    }
 
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java
new file mode 100644
index 00000000000..b4048c92fb2
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.encoding;
+
+import javax.activation.ActivationDataFlavor;
+import javax.activation.DataSource;
+import javax.activation.DataContentHandler;
+import java.awt.datatransfer.DataFlavor;
+import java.io.*;
+
+/**
+ * JAF data content handler for text/plain --> String
+ *
+ * @author Anil Vijendran
+ */
+public class StringDataContentHandler implements DataContentHandler {
+
+    /**
+     * return the DataFlavors for this <code>DataContentHandler</code>
+     * @return The DataFlavors.
+     */
+    public DataFlavor[] getTransferDataFlavors() { // throws Exception;
+        DataFlavor flavors[] = new DataFlavor[2];
+        flavors[0] =  new ActivationDataFlavor(String.class, "text/plain", "text string");
+        flavors[1] = new DataFlavor("text/plain", "Plain Text");
+        return flavors;
+    }
+
+    /**
+     * return the Transfer Data of type DataFlavor from InputStream
+     * @param df The DataFlavor.
+     * @param ds The InputStream corresponding to the data.
+     * @return The constructed Object.
+     */
+    public Object getTransferData(DataFlavor df, DataSource ds) {
+
+        // this is sort of hacky, but will work for the
+        // sake of testing...
+        if (df.getMimeType().startsWith("text/plain")) {
+            if (df
+                .getRepresentationClass()
+                .getName()
+                .equals("java.lang.String")) {
+                // spit out String
+                StringBuffer buf = new StringBuffer();
+                char data[] = new char[1024];
+                // InputStream is = null;
+                InputStreamReader isr = null;
+                int bytes_read = 0;
+                int total_bytes = 0;
+
+                try {
+                    isr = new InputStreamReader(ds.getInputStream());
+
+                    while (true) {
+                        bytes_read = isr.read(data);
+                        if (bytes_read > 0)
+                            buf.append(data, 0, bytes_read);
+                        else
+                            break;
+                        total_bytes += bytes_read;
+                    }
+                } catch (Exception e) {
+                }
+
+                return buf.toString();
+
+            } else if (
+                df.getRepresentationClass().getName().equals(
+                    "java.io.InputStream")) {
+                // spit out InputStream
+                try {
+                    return ds.getInputStream();
+                } catch (Exception e) {
+                }
+            }
+
+        }
+        return null;
+    }
+
+    /**
+     *
+     */
+    public Object getContent(DataSource ds) { // throws Exception;
+        StringBuffer buf = new StringBuffer();
+        char data[] = new char[1024];
+        // InputStream is = null;
+        InputStreamReader isr = null;
+        int bytes_read = 0;
+        int total_bytes = 0;
+
+        try {
+            isr = new InputStreamReader(ds.getInputStream());
+
+            while (true) {
+                bytes_read = isr.read(data);
+                if (bytes_read > 0)
+                    buf.append(data, 0, bytes_read);
+                else
+                    break;
+                total_bytes += bytes_read;
+            }
+        } catch (Exception e) {
+        }
+
+        return buf.toString();
+    }
+    /**
+     * construct an object from a byte stream
+     * (similar semantically to previous method, we are deciding
+     *  which one to support)
+     */
+    public void writeTo(Object obj, String mimeType, OutputStream os)
+        throws IOException {
+        if (!mimeType.startsWith("text/plain"))
+            throw new IOException(
+                "Invalid type \"" + mimeType + "\" on StringDCH");
+
+        Writer out = new OutputStreamWriter(os);
+        out.write((String) obj);
+        out.flush();
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java
index e5c80595bc5..b7102999bcd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java
@@ -26,10 +26,13 @@
 package com.sun.xml.internal.ws.encoding;
 
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.api.pipe.Codec;
 import com.sun.xml.internal.ws.api.pipe.ContentType;
 import com.sun.xml.internal.ws.message.stream.StreamAttachment;
+import com.sun.xml.internal.ws.message.MimeAttachmentSet;
 
 import java.io.IOException;
 import java.nio.channels.WritableByteChannel;
@@ -42,8 +45,8 @@ import java.util.Map;
  */
 public final class SwACodec extends MimeCodec {
 
-    public SwACodec(SOAPVersion version, Codec rootCodec) {
-        super(version);
+    public SwACodec(SOAPVersion version, WSBinding binding, Codec rootCodec) {
+        super(version, binding);
         this.rootCodec = rootCodec;
     }
 
@@ -55,11 +58,15 @@ public final class SwACodec extends MimeCodec {
     @Override
     protected void decode(MimeMultipartParser mpp, Packet packet) throws IOException {
         // TODO: handle attachments correctly
-        StreamAttachment root = mpp.getRootPart();
-        rootCodec.decode(root.asInputStream(),root.getContentType(),packet);
-        Map<String, StreamAttachment> atts = mpp.getAttachmentParts();
-        for(Map.Entry<String, StreamAttachment> att : atts.entrySet()) {
-            packet.getMessage().getAttachments().add(att.getValue());
+        Attachment root = mpp.getRootPart();
+        if (rootCodec instanceof RootOnlyCodec) {
+            ((RootOnlyCodec)rootCodec).decode(root.asInputStream(),root.getContentType(),packet, new MimeAttachmentSet(mpp));
+        } else {
+            rootCodec.decode(root.asInputStream(),root.getContentType(),packet);
+            Map<String, Attachment> atts = mpp.getAttachmentParts();
+            for(Map.Entry<String, Attachment> att : atts.entrySet()) {
+                packet.getMessage().getAttachments().add(att.getValue());
+            }
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java
index a6d07fa59db..61ae8545714 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java
@@ -59,6 +59,8 @@ public final class TagInfoset {
     /**
      * Namespace declarations on this tag. Read-only.
      *
+     * This is an array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }.
+     *
      * URIs/prefixes can be null (StAX-style)
      */
     public final @NotNull String[] ns;
@@ -169,12 +171,15 @@ public final class TagInfoset {
      * Writes the start element event.
      */
     public void writeStart(XMLStreamWriter w) throws XMLStreamException {
-        // write start tag. Arrrgggghhh!!
+        // write start tag.
         if(prefix==null) {
             if(nsUri==null)
                 w.writeStartElement(localName);
-            else
-                w.writeStartElement(nsUri,localName);
+            else {
+                //fix Null prefix. otherwise throws XMLStreamException,
+                // if the namespace URI has not been bound to a prefix
+                w.writeStartElement("",localName,nsUri);
+            }
         } else {
             w.writeStartElement(prefix,localName,nsUri);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java
index 59c51bdf2f1..a75babe3b62 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java
@@ -25,19 +25,20 @@
 
 package com.sun.xml.internal.ws.encoding;
 
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.message.Packet;
-import com.sun.xml.internal.ws.api.message.Messages;
 import com.sun.xml.internal.ws.api.pipe.Codec;
 import com.sun.xml.internal.ws.api.pipe.ContentType;
 import com.sun.xml.internal.ws.client.ContentNegotiation;
+import com.sun.xml.internal.ws.developer.StreamingAttachmentFeature;
 import com.sun.xml.internal.ws.encoding.xml.XMLCodec;
 import com.sun.xml.internal.ws.encoding.xml.XMLMessage;
 import com.sun.xml.internal.ws.encoding.xml.XMLMessage.MessageDataSource;
 import com.sun.xml.internal.ws.encoding.xml.XMLMessage.UnknownContent;
 import com.sun.xml.internal.ws.encoding.xml.XMLMessage.XMLMultiPart;
 import com.sun.xml.internal.ws.resources.StreamingMessages;
+import com.sun.xml.internal.ws.util.ByteArrayBuffer;
 
 import javax.activation.DataSource;
 import javax.xml.ws.WebServiceException;
@@ -125,10 +126,10 @@ public final class XMLHTTPBindingCodec extends MimeCodec {
 
     private AcceptContentType _adaptingContentType = new AcceptContentType();
 
-    public XMLHTTPBindingCodec() {
-        super(SOAPVersion.SOAP_11);
+    public XMLHTTPBindingCodec(WSBinding binding) {
+        super(SOAPVersion.SOAP_11, binding);
 
-        xmlCodec = new XMLCodec();
+        xmlCodec = new XMLCodec(binding);
 
         fiCodec = getFICodec();
 
@@ -192,7 +193,7 @@ public final class XMLHTTPBindingCodec extends MimeCodec {
         if (contentType == null) {
             xmlCodec.decode(in, contentType, packet);
         } else if (isMultipartRelated(contentType)) {
-            packet.setMessage(new XMLMultiPart(contentType, in));
+            packet.setMessage(new XMLMultiPart(contentType, in, binding.getFeature(StreamingAttachmentFeature.class)));
         } else if(isFastInfoset(contentType)) {
             if (fiCodec == null) {
                 throw new RuntimeException(StreamingMessages.FASTINFOSET_NO_IMPLEMENTATION());
@@ -216,7 +217,7 @@ public final class XMLHTTPBindingCodec extends MimeCodec {
     }
 
     public MimeCodec copy() {
-        return new XMLHTTPBindingCodec();
+        return new XMLHTTPBindingCodec(binding);
     }
 
     private boolean isMultipartRelated(String contentType) {
@@ -274,7 +275,7 @@ public final class XMLHTTPBindingCodec extends MimeCodec {
             final boolean isFastInfoset = XMLMessage.isFastInfoset(
                     mds.getDataSource().getContentType());
             DataSource ds = transformDataSource(mds.getDataSource(),
-                    isFastInfoset, useFastInfosetForEncoding);
+                    isFastInfoset, useFastInfosetForEncoding, binding);
 
             InputStream is = ds.getInputStream();
             byte[] buf = new byte[1024];
@@ -313,23 +314,23 @@ public final class XMLHTTPBindingCodec extends MimeCodec {
     }
 
     public static DataSource transformDataSource(DataSource in,
-            boolean isFastInfoset, boolean useFastInfoset) {
+            boolean isFastInfoset, boolean useFastInfoset, WSBinding binding) {
         try {
             if (isFastInfoset && !useFastInfoset) {
                 // Convert from Fast Infoset to XML
-                Codec codec = new XMLHTTPBindingCodec();
+                Codec codec = new XMLHTTPBindingCodec(binding);
                 Packet p = new Packet();
                 codec.decode(in.getInputStream(), in.getContentType(), p);
 
                 p.getMessage().getAttachments();
                 codec.getStaticContentType(p);
 
-                ByteOutputStream bos = new ByteOutputStream();
+                ByteArrayBuffer bos = new ByteArrayBuffer();
                 ContentType ct = codec.encode(p, bos);
                 return XMLMessage.createDataSource(ct.getContentType(), bos.newInputStream());
             } else if (!isFastInfoset && useFastInfoset) {
                 // Convert from XML to Fast Infoset
-                Codec codec = new XMLHTTPBindingCodec();
+                Codec codec = new XMLHTTPBindingCodec(binding);
                 Packet p = new Packet();
                 codec.decode(in.getInputStream(), in.getContentType(), p);
 
@@ -337,7 +338,7 @@ public final class XMLHTTPBindingCodec extends MimeCodec {
                 p.getMessage().getAttachments();
                 codec.getStaticContentType(p);
 
-                ByteOutputStream bos = new ByteOutputStream();
+                ByteArrayBuffer bos = new ByteArrayBuffer();
                 com.sun.xml.internal.ws.api.pipe.ContentType ct = codec.encode(p, bos);
                 return XMLMessage.createDataSource(ct.getContentType(), bos.newInputStream());
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java
new file mode 100644
index 00000000000..115666324c0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.encoding;
+
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+
+import javax.activation.ActivationDataFlavor;
+import javax.activation.DataContentHandler;
+import javax.activation.DataSource;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.awt.datatransfer.DataFlavor;
+import java.io.IOException;
+import java.io.OutputStream;
+
+
+/**
+ * JAF data handler for XML content
+ *
+ * @author Anil Vijendran
+ */
+public class XmlDataContentHandler implements DataContentHandler {
+
+    private final DataFlavor[] flavors;
+
+    public XmlDataContentHandler() throws ClassNotFoundException {
+        flavors = new DataFlavor[2];
+        flavors[0] = new ActivationDataFlavor(StreamSource.class, "text/xml", "XML");
+        flavors[1] = new ActivationDataFlavor(StreamSource.class, "application/xml", "XML");
+    }
+
+    /**
+     * return the DataFlavors for this <code>DataContentHandler</code>
+     * @return The DataFlavors.
+     */
+    public DataFlavor[] getTransferDataFlavors() { // throws Exception;
+        return flavors;
+    }
+
+    /**
+     * return the Transfer Data of type DataFlavor from InputStream
+     * @param df The DataFlavor.
+     * @param ds The InputStream corresponding to the data.
+     * @return The constructed Object.
+     */
+    public Object getTransferData(DataFlavor df, DataSource ds)
+        throws IOException {
+
+        for (DataFlavor aFlavor : flavors) {
+            if (aFlavor.equals(df)) {
+                return getContent(ds);
+            }
+        }
+        return null;
+    }
+
+    /**
+     *
+     */
+    public Object getContent(DataSource dataSource) throws IOException {
+        return new StreamSource(dataSource.getInputStream());
+    }
+
+    /**
+     * construct an object from a byte stream
+     * (similar semantically to previous method, we are deciding
+     *  which one to support)
+     */
+    public void writeTo(Object obj, String mimeType, OutputStream os)
+        throws IOException {
+        if (!mimeType.equals("text/xml") && !mimeType.equals("application/xml"))
+            throw new IOException(
+                "Invalid content type \"" + mimeType + "\" for XmlDCH");
+
+        try {
+            Transformer transformer = XmlUtil.newTransformer();
+            StreamResult result = new StreamResult(os);
+            if (obj instanceof DataSource) {
+                // Streaming transform applies only to javax.xml.transform.StreamSource
+                transformer.transform((Source) getContent((DataSource)obj), result);
+            } else {
+                transformer.transform((Source) obj, result);
+            }
+        } catch (Exception ex) {
+            throw new IOException(
+                "Unable to run the JAXP transformer on a stream "
+                    + ex.getMessage());
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java
index aac45182785..98739d878ec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java
@@ -47,7 +47,6 @@ import java.io.IOException;
 import java.nio.channels.WritableByteChannel;
 import java.nio.channels.ReadableByteChannel;
 import com.sun.xml.internal.org.jvnet.fastinfoset.FastInfosetSource;
-import com.sun.xml.internal.org.jvnet.fastinfoset.stax.FastInfosetStreamReader;
 
 /**
  * A codec for encoding/decoding XML infosets to/from fast
@@ -196,8 +195,10 @@ public class FastInfosetCodec implements Codec {
              */
             SerializerVocabulary vocabulary = new SerializerVocabulary();
             serializer.setVocabulary(vocabulary);
-            serializer.setAttributeValueSizeLimit(indexedStringSizeLimit);
-            serializer.setCharacterContentChunkSizeLimit(indexedStringSizeLimit);
+            serializer.setMinAttributeValueSize(0);
+            serializer.setMaxAttributeValueSize(indexedStringSizeLimit);
+            serializer.setMinCharacterContentChunkSize(0);
+            serializer.setMaxCharacterContentChunkSize(indexedStringSizeLimit);
             serializer.setAttributeValueMapMemoryLimit(stringsMemoryLimit);
             serializer.setCharacterContentChunkMapMemoryLimit(stringsMemoryLimit);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java
index f8bf5ab257f..a1162380ea2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java
@@ -30,6 +30,7 @@ import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.pipe.Codec;
 import com.sun.xml.internal.ws.api.pipe.ContentType;
 import com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory;
+import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.encoding.ContentTypeImpl;
 
 import javax.xml.stream.XMLStreamException;
@@ -48,6 +49,12 @@ public final class XMLCodec implements Codec {
 
     private static final ContentType contentType = new ContentTypeImpl(XML_TEXT_MIME_TYPE);
 
+    private final WSBinding binding;
+
+    public XMLCodec(WSBinding binding) {
+        this.binding = binding;
+    }
+
     public String getMimeType() {
         return XML_APPLICATION_MIME_TYPE;
     }
@@ -79,7 +86,7 @@ public final class XMLCodec implements Codec {
     }
 
     public void decode(InputStream in, String contentType, Packet packet) throws IOException {
-        Message message = XMLMessage.create(contentType, in);
+        Message message = XMLMessage.create(contentType, in, binding);
         packet.setMessage(message);
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java
index 691a0e7bf19..8458edd0667 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java
@@ -26,25 +26,24 @@
 package com.sun.xml.internal.ws.encoding.xml;
 
 import com.sun.istack.internal.NotNull;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.ContentType;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.internet.MimeMultipart;
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
 import com.sun.xml.internal.ws.api.SOAPVersion;
-import com.sun.xml.internal.ws.api.message.Attachment;
-import com.sun.xml.internal.ws.api.message.AttachmentSet;
-import com.sun.xml.internal.ws.api.message.HeaderList;
-import com.sun.xml.internal.ws.api.message.Message;
-import com.sun.xml.internal.ws.api.message.Messages;
-import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.*;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
 import com.sun.xml.internal.ws.api.pipe.Codec;
 import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
 import com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory;
+import com.sun.xml.internal.ws.developer.StreamingAttachmentFeature;
 import com.sun.xml.internal.ws.encoding.MimeMultipartParser;
 import com.sun.xml.internal.ws.encoding.XMLHTTPBindingCodec;
+import com.sun.xml.internal.ws.encoding.ContentType;
 import com.sun.xml.internal.ws.message.AbstractMessageImpl;
 import com.sun.xml.internal.ws.message.EmptyMessageImpl;
+import com.sun.xml.internal.ws.message.MimeAttachmentSet;
+import com.sun.xml.internal.ws.message.source.PayloadSourceMessage;
 import com.sun.xml.internal.ws.util.xml.XMLStreamReaderToXMLStreamWriter;
+import com.sun.xml.internal.ws.util.ByteArrayBuffer;
+import com.sun.xml.internal.bind.api.Bridge;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -56,13 +55,11 @@ import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.WebServiceException;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.JAXBException;
+import java.io.*;
 
 /**
  *
@@ -70,11 +67,6 @@ import java.util.Map;
  */
 public final class XMLMessage {
 
-    // So that SAAJ registers DCHs for MIME types
-    static {
-        new com.sun.xml.internal.messaging.saaj.soap.AttachmentPartImpl();
-    }
-
     private static final int PLAIN_XML_FLAG      = 1;       // 00001
     private static final int MIME_MULTIPART_FLAG = 2;       // 00010
     private static final int FI_ENCODED_FLAG     = 16;      // 10000
@@ -107,23 +99,21 @@ public final class XMLMessage {
     /**
      * Construct a message given a content type and an input stream.
      */
-    public static Message create(final String ct, InputStream in) {
+    public static Message create(final String ct, InputStream in, WSBinding binding) {
         Message data;
         try {
             in = hasSomeData(in);
             if (in == null) {
-                data = Messages.createEmpty(SOAPVersion.SOAP_11);
-                return data;
+                return Messages.createEmpty(SOAPVersion.SOAP_11);
             }
 
             if (ct != null) {
                 final ContentType contentType = new ContentType(ct);
                 final int contentTypeId = identifyContentType(contentType);
                 if ((contentTypeId & MIME_MULTIPART_FLAG) != 0) {
-                    data = new XMLMultiPart(ct, in);
+                    data = new XMLMultiPart(ct, in, binding.getFeature(StreamingAttachmentFeature.class));
                 } else if ((contentTypeId & PLAIN_XML_FLAG) != 0) {
-                    data = Messages.createUsingPayload(new StreamSource(in),
-                            SOAPVersion.SOAP_11);
+                    data = new XmlContent(ct, in);
                 } else {
                     data = new UnknownContent(ct, in);
                 }
@@ -143,11 +133,11 @@ public final class XMLMessage {
             Messages.createUsingPayload(source, SOAPVersion.SOAP_11);
     }
 
-    public static Message create(DataSource ds) {
+    public static Message create(DataSource ds, WSBinding binding) {
         try {
             return (ds == null) ?
                 Messages.createEmpty(SOAPVersion.SOAP_11) :
-                create(ds.getContentType(), ds.getInputStream());
+                create(ds.getContentType(), ds.getInputStream(), binding);
         } catch(IOException ioe) {
             throw new WebServiceException(ioe);
         }
@@ -252,26 +242,145 @@ public final class XMLMessage {
         DataSource getDataSource();
     }
 
+    /**
+     * It's conent-type is some XML type
+     *
+     */
+    private static class XmlContent extends AbstractMessageImpl implements MessageDataSource {
+        private final DataSource dataSource;
+        private boolean consumed;
+        private Message delegate;
+        private final HeaderList headerList;
+
+        public XmlContent(String ct, InputStream in) {
+            super(SOAPVersion.SOAP_11);
+            dataSource = createDataSource(ct, in);
+            this.headerList = new HeaderList();
+        }
+
+        private Message getMessage() {
+            if (delegate == null) {
+                assert !consumed;
+                InputStream in = null;
+                try {
+                    in = dataSource.getInputStream();
+                } catch(IOException ioe) {
+                    // shouldn't happen;
+                }
+                assert in != null;
+                delegate = Messages.createUsingPayload(new StreamSource(in), SOAPVersion.SOAP_11);
+                consumed = true;
+            }
+            return delegate;
+        }
+
+        public boolean hasUnconsumedDataSource() {
+            return !consumed;
+        }
+
+        public DataSource getDataSource() {
+            consumed = true;
+            return dataSource;
+        }
+
+        public boolean hasHeaders() {
+            return false;
+        }
+
+        public @NotNull HeaderList getHeaders() {
+            return headerList;
+        }
+
+        public String getPayloadLocalPart() {
+            return getMessage().getPayloadLocalPart();
+        }
+
+        public String getPayloadNamespaceURI() {
+            return getMessage().getPayloadNamespaceURI();
+        }
+
+        public boolean hasPayload() {
+            return true;
+        }
+
+        public boolean isFault() {
+            return false;
+        }
+
+        public Source readEnvelopeAsSource() {
+            return getMessage().readEnvelopeAsSource();
+        }
+
+        public Source readPayloadAsSource() {
+            return getMessage().readPayloadAsSource();
+        }
+
+        public SOAPMessage readAsSOAPMessage() throws SOAPException {
+            return getMessage().readAsSOAPMessage();
+        }
+
+        public SOAPMessage readAsSOAPMessage(Packet packet, boolean inbound) throws SOAPException {
+            return getMessage().readAsSOAPMessage(packet, inbound);
+        }
+
+        public <T> T readPayloadAsJAXB(Unmarshaller unmarshaller) throws JAXBException {
+            return (T)getMessage().readPayloadAsJAXB(unmarshaller);
+        }
+
+        public <T> T readPayloadAsJAXB(Bridge<T> bridge) throws JAXBException {
+            return getMessage().readPayloadAsJAXB(bridge);
+        }
+
+        public XMLStreamReader readPayload() throws XMLStreamException {
+            return getMessage().readPayload();
+        }
+
+
+        public void writePayloadTo(XMLStreamWriter sw) throws XMLStreamException {
+            getMessage().writePayloadTo(sw);
+        }
+
+        public void writeTo(XMLStreamWriter sw) throws XMLStreamException {
+            getMessage().writeTo(sw);
+        }
+
+        public void writeTo(ContentHandler contentHandler, ErrorHandler errorHandler) throws SAXException {
+            getMessage().writeTo(contentHandler, errorHandler);
+        }
+
+        public Message copy() {
+            throw new UnsupportedOperationException();
+        }
+
+        protected void writePayloadTo(ContentHandler contentHandler, ErrorHandler errorHandler, boolean fragment) throws SAXException {
+            throw new UnsupportedOperationException();
+        }
+
+    }
+
+
 
     /**
      * Data represented as a multi-part MIME message.
      * <p>
-     * The root part may be an XML or an FI document.
-     *
-     * This class parses {@link MimeMultipart} lazily.
+     * The root part may be an XML or an FI document. This class
+     * parses MIME message lazily.
      */
     public static final class XMLMultiPart extends AbstractMessageImpl implements MessageDataSource {
         private final DataSource dataSource;
         private MimeMultipartParser mpp;
+        private final StreamingAttachmentFeature feature;
 
-        public XMLMultiPart(final String contentType, final InputStream is) {
+        public XMLMultiPart(final String contentType, final InputStream is, StreamingAttachmentFeature feature) {
             super(SOAPVersion.SOAP_11);
             dataSource = createDataSource(contentType, is);
+            this.feature = feature;
         }
 
-        public XMLMultiPart(DataSource dataSource) {
+        public XMLMultiPart(DataSource dataSource, StreamingAttachmentFeature feature) {
             super(SOAPVersion.SOAP_11);
             this.dataSource = dataSource;
+            this.feature = feature;
         }
 
         public DataSource getDataSource() {
@@ -284,7 +393,7 @@ public final class XMLMessage {
                 try {
                     mpp = new MimeMultipartParser(
                             dataSource.getInputStream(),
-                            dataSource.getContentType());
+                            dataSource.getContentType(), feature);
                 } catch(IOException ioe) {
                     throw new WebServiceException(ioe);
                 }
@@ -311,7 +420,7 @@ public final class XMLMessage {
         @Override
         public AttachmentSet getAttachments() {
             convertDataSourceToMessage();
-            return new XMLAttachmentSet(mpp);
+            return new MimeAttachmentSet(mpp);
         }
 
         public String getPayloadLocalPart() {
@@ -363,45 +472,6 @@ public final class XMLMessage {
 
     }
 
-    private static final class XMLAttachmentSet implements AttachmentSet {
-
-        private final Map<String, Attachment> attMap;
-
-        public XMLAttachmentSet(MimeMultipartParser mpp) {
-            // TODO
-            attMap = new HashMap<String, Attachment>();
-            attMap.putAll(mpp.getAttachmentParts());
-        }
-
-        /**
-         * Gets the attachment by the content ID.
-         *
-         * @return null
-         *         if no such attachment exist.
-         */
-        public Attachment get(String contentId) {
-            return attMap.get(contentId);
-        }
-
-        public boolean isEmpty() {
-            return attMap.isEmpty();
-        }
-
-        /**
-         * Returns an iterator over a set of elements of type T.
-         *
-         * @return an Iterator.
-         */
-        public Iterator<Attachment> iterator() {
-            return attMap.values().iterator();
-        }
-
-        public void add(Attachment att) {
-            attMap.put(att.getContentId(), att);
-        }
-
-    }
-
     private static class FaultMessage extends EmptyMessageImpl {
 
         public FaultMessage(SOAPVersion version) {
@@ -500,15 +570,15 @@ public final class XMLMessage {
 
     }
 
-    public static DataSource getDataSource(Message msg) {
+    public static DataSource getDataSource(Message msg, WSBinding binding) {
         if (msg instanceof MessageDataSource) {
             return ((MessageDataSource)msg).getDataSource();
         } else {
             AttachmentSet atts = msg.getAttachments();
             if (atts != null && !atts.isEmpty()) {
-                final ByteOutputStream bos = new ByteOutputStream();
+                final ByteArrayBuffer bos = new ByteArrayBuffer();
                 try {
-                    Codec codec = new XMLHTTPBindingCodec();
+                    Codec codec = new XMLHTTPBindingCodec(binding);
                     com.sun.xml.internal.ws.api.pipe.ContentType ct = codec.getStaticContentType(new Packet(msg));
                     codec.encode(new Packet(msg), bos);
                     return createDataSource(ct.getContentType(), bos.newInputStream());
@@ -517,7 +587,7 @@ public final class XMLMessage {
                 }
 
             } else {
-                final ByteOutputStream bos = new ByteOutputStream();
+                final ByteArrayBuffer bos = new ByteArrayBuffer();
                 XMLStreamWriter writer = XMLStreamWriterFactory.create(bos);
                 try {
                     msg.writePayloadTo(writer);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java
index 7536c377457..32c3877e776 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java
@@ -30,17 +30,14 @@ import com.sun.xml.internal.ws.util.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.*;
 import javax.xml.namespace.QName;
 import javax.xml.soap.Detail;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFault;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.soap.SOAPFaultException;
+import java.util.Iterator;
 
 /**
  * This class represents SOAP1.1 Fault. This class will be used to marshall/unmarshall a soap fault using JAXB.
@@ -121,7 +118,12 @@ class SOAP11Fault extends SOAPFaultBuilder {
         this.faultstring = fault.getFaultString();
         this.faultactor = fault.getFaultActor();
         if (fault.getDetail() != null) {
-            detail = new DetailType(fault.getDetail());
+            detail = new DetailType();
+            Iterator iter = fault.getDetail().getDetailEntries();
+            while(iter.hasNext()){
+                Element fd = (Element)iter.next();
+                detail.getDetails().add(fd);
+            }
         }
     }
 
@@ -165,10 +167,12 @@ class SOAP11Fault extends SOAPFaultBuilder {
     protected Throwable getProtocolException() {
         try {
             SOAPFault fault = SOAPVersion.SOAP_11.saajSoapFactory.createFault(faultstring, faultcode);
-            if(detail != null && detail.getDetail(0) != null) {
-                Node n = fault.getOwnerDocument().importNode(detail.getDetail(0), true);
+            if(detail != null){
                 Detail d = fault.addDetail();
-                d.appendChild(n);
+                for(Element det : detail.getDetails()){
+                    Node n = fault.getOwnerDocument().importNode(det, true);
+                    d.appendChild(n);
+                }
             }
             fault.setFaultActor(faultactor);
             return new SOAPFaultException(fault);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java
index 1b4c697436f..161075cb81b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java
@@ -27,6 +27,7 @@ package com.sun.xml.internal.ws.fault;
 
 
 import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.util.DOMUtil;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -111,6 +112,23 @@ class SOAP12Fault extends SOAPFaultBuilder {
         this.detail = detail;
     }
 
+    SOAP12Fault(CodeType code, ReasonType reason, String node, String role, Element detailObject) {
+        this.code = code;
+        this.reason = reason;
+        this.node = node;
+        this.role = role;
+        if (detailObject != null) {
+            if(detailObject.getNamespaceURI().equals(ns) && detailObject.getLocalName().equals("Detail")){
+                detail = new DetailType();
+                for(Element detailEntry : DOMUtil.getChildElements(detailObject)){
+                    detail.getDetails().add(detailEntry);
+                }
+            }else{
+                detail = new DetailType(detailObject);
+            }
+        }
+    }
+
     SOAP12Fault(SOAPFault fault) {
         code = new CodeType(fault.getFaultCodeAsQName());
         try {
@@ -121,14 +139,19 @@ class SOAP12Fault extends SOAPFaultBuilder {
 
         reason = new ReasonType(fault.getFaultString());
         role = fault.getFaultRole();
-        detail = new DetailType(fault.getDetail());
+        node = fault.getFaultNode();
+        if (fault.getDetail() != null) {
+            detail = new DetailType();
+            Iterator iter = fault.getDetail().getDetailEntries();
+            while(iter.hasNext()){
+                Element fd = (Element)iter.next();
+                detail.getDetails().add(fd);
+            }
+        }
     }
 
     SOAP12Fault(QName code, String reason, Element detailObject) {
-        this.code = new CodeType(code);
-        this.reason = new ReasonType(reason);
-        if(detailObject != null)
-            detail = new DetailType(detailObject);
+        this(new CodeType(code), new ReasonType(reason), null, null, detailObject);
     }
 
     CodeType getCode() {
@@ -164,7 +187,18 @@ class SOAP12Fault extends SOAPFaultBuilder {
 
      protected Throwable getProtocolException() {
         try {
-            SOAPFault fault = SOAPVersion.SOAP_12.saajSoapFactory.createFault(reason.texts().get(0).getText(), (code != null)? code.getValue():null);
+            SOAPFault fault = SOAPVersion.SOAP_12.saajSoapFactory.createFault();;
+            if(reason != null){
+                for(TextType tt : reason.texts()){
+                    fault.setFaultString(tt.getText());
+                }
+            }
+
+            if(code != null){
+                fault.setFaultCode(code.getValue());
+                fillFaultSubCodes(fault, code.getSubcode());
+            }
+
             if(detail != null && detail.getDetail(0) != null){
                 javax.xml.soap.Detail detail = fault.addDetail();
                 for(Node obj: this.detail.getDetails()){
@@ -172,8 +206,6 @@ class SOAP12Fault extends SOAPFaultBuilder {
                     detail.appendChild(n);
                 }
             }
-            if(code != null)
-                fillFaultSubCodes(fault, code.getSubcode());
 
             return new SOAPFaultException(fault);
         } catch (SOAPException e) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
index 8cff65271ac..8baa8d59055 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
@@ -37,6 +37,7 @@ import com.sun.xml.internal.ws.encoding.soap.SOAP12Constants;
 import com.sun.xml.internal.ws.encoding.soap.SOAPConstants;
 import com.sun.xml.internal.ws.encoding.soap.SerializationException;
 import com.sun.xml.internal.ws.message.jaxb.JAXBMessage;
+import com.sun.xml.internal.ws.message.FaultMessage;
 import com.sun.xml.internal.ws.model.CheckedExceptionImpl;
 import com.sun.xml.internal.ws.model.JavaMethodImpl;
 import com.sun.xml.internal.ws.util.DOMUtil;
@@ -49,6 +50,8 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPFault;
+import javax.xml.soap.Detail;
+import javax.xml.soap.DetailEntry;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.ws.ProtocolException;
 import javax.xml.ws.WebServiceException;
@@ -77,6 +80,17 @@ public abstract class SOAPFaultBuilder {
 
     abstract void setDetail(DetailType detailType);
 
+    public @Nullable QName getFirstDetailEntryName() {
+        DetailType dt = getDetail();
+        if (dt != null) {
+            Node entry = dt.getDetail(0);
+            if (entry != null) {
+                return new QName(entry.getNamespaceURI(), entry.getLocalName());
+            }
+        }
+        return null;
+    }
+
     /**
      * gives the fault string that can be used to create an {@link Exception}
      */
@@ -267,17 +281,18 @@ public abstract class SOAPFaultBuilder {
 
     private Exception createUserDefinedException(CheckedExceptionImpl ce) {
         Class exceptionClass = ce.getExceptionClass();
-        try {
-            Constructor constructor = exceptionClass.getConstructor(String.class);
-            Object exception = constructor.newInstance(getFaultString());
-            Node detail = getDetail().getDetails().get(0);
-            Object jaxbDetail = getJAXBObject(detail, ce);
-            Field[] fields = jaxbDetail.getClass().getFields();
-            for (Field f : fields) {
-                Method m = exceptionClass.getMethod(getWriteMethod(f));
-                m.invoke(exception, f.get(jaxbDetail));
+        Class detailBean = ce.getDetailBean();
+        try{
+            Node detailNode = getDetail().getDetails().get(0);
+            Object jaxbDetail = getJAXBObject(detailNode, ce);
+            Constructor exConstructor;
+            try{
+                exConstructor = exceptionClass.getConstructor(String.class, detailBean);
+                return (Exception) exConstructor.newInstance(getFaultString(), jaxbDetail);
+            }catch(NoSuchMethodException e){
+                exConstructor = exceptionClass.getConstructor(String.class);
+                return (Exception) exConstructor.newInstance(getFaultString());
             }
-            throw (Exception) exception;
         } catch (Exception e) {
             throw new WebServiceException(e);
         }
@@ -308,8 +323,14 @@ public abstract class SOAPFaultBuilder {
             Object detail = detailBean.newInstance();
             for (Field f : fields) {
                 Method em = exception.getClass().getMethod(getReadMethod(f));
-                Method sm = detailBean.getMethod(getWriteMethod(f), em.getReturnType());
-                sm.invoke(detail, em.invoke(exception));
+                try {
+                    Method sm = detailBean.getMethod(getWriteMethod(f), em.getReturnType());
+                    sm.invoke(detail, em.invoke(exception));
+                } catch(NoSuchMethodException ne) {
+                    // Try to use exception bean's public field to populate the value.
+                    Field sf = detailBean.getField(f.getName());
+                    sf.set(detail, em.invoke(exception));
+                }
             }
             return detail;
         } catch (Exception e) {
@@ -353,13 +374,16 @@ public abstract class SOAPFaultBuilder {
             }
         }
         Element detailNode = null;
+        QName firstEntry = null;
         if (detail == null && soapFaultException != null) {
             detailNode = soapFaultException.getFault().getDetail();
+            firstEntry = getFirstDetailEntryName((Detail)detailNode);
         } else if(ce != null){
             try {
                 DOMResult dr = new DOMResult();
                 ce.getBridge().marshal(detail,dr);
                 detailNode = (Element)dr.getNode().getFirstChild();
+                firstEntry = getFirstDetailEntryName(detailNode);
             } catch (JAXBException e1) {
                 //Should we throw Internal Server Error???
                 faultString = e.getMessage();
@@ -369,7 +393,23 @@ public abstract class SOAPFaultBuilder {
         SOAP11Fault soap11Fault = new SOAP11Fault(faultCode, faultString, faultActor, detailNode);
         soap11Fault.captureStackTrace(e);
 
-        return JAXBMessage.create(JAXB_CONTEXT, soap11Fault, soapVersion);
+        Message msg = JAXBMessage.create(JAXB_CONTEXT, soap11Fault, soapVersion);
+        return new FaultMessage(msg, firstEntry);
+    }
+
+    private static @Nullable QName getFirstDetailEntryName(@Nullable Detail detail) {
+        if (detail != null) {
+            Iterator<DetailEntry> it = detail.getDetailEntries();
+            if (it.hasNext()) {
+                DetailEntry entry = it.next();
+                return getFirstDetailEntryName(entry);
+            }
+        }
+        return null;
+    }
+
+    private static @NotNull QName getFirstDetailEntryName(@NotNull Element entry) {
+        return new QName(entry.getNamespaceURI(), entry.getLocalName());
     }
 
     private static Message createSOAP12Fault(SOAPVersion soapVersion, Throwable e, Object detail, CheckedExceptionImpl ce, QName faultCode) {
@@ -424,26 +464,28 @@ public abstract class SOAPFaultBuilder {
 
         ReasonType reason = new ReasonType(faultString);
         Element detailNode = null;
+        QName firstEntry = null;
         if (detail == null && soapFaultException != null) {
             detailNode = soapFaultException.getFault().getDetail();
+            firstEntry = getFirstDetailEntryName((Detail)detailNode);
         } else if(detail != null){
             try {
                 DOMResult dr = new DOMResult();
                 ce.getBridge().marshal(detail, dr);
                 detailNode = (Element)dr.getNode().getFirstChild();
+                firstEntry = getFirstDetailEntryName(detailNode);
             } catch (JAXBException e1) {
                 //Should we throw Internal Server Error???
                 faultString = e.getMessage();
                 faultCode = getDefaultFaultCode(soapVersion);
             }
         }
-        DetailType detailType = null;
-        if(detailNode != null)
-            detailType = new DetailType(detailNode);
-        SOAP12Fault soap12Fault = new SOAP12Fault(code, reason, null, faultRole, detailType);
+
+        SOAP12Fault soap12Fault = new SOAP12Fault(code, reason, null, faultRole, detailNode);
         soap12Fault.captureStackTrace(e);
 
-        return JAXBMessage.create(JAXB_CONTEXT, soap12Fault, soapVersion);
+        Message msg = JAXBMessage.create(JAXB_CONTEXT, soap12Fault, soapVersion);
+        return new FaultMessage(msg, firstEntry);
     }
 
     private static SubcodeType fillSubcodes(SubcodeType parent, QName value){
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java
index 5f362094e90..84d388dfc0a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.handler;
 
 import com.sun.xml.internal.ws.api.WSBinding;
@@ -36,6 +35,7 @@ import com.sun.xml.internal.ws.binding.BindingImpl;
 
 import javax.xml.ws.handler.LogicalHandler;
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.Handler;
 import javax.xml.ws.WebServiceException;
 import java.util.List;
 import java.util.ArrayList;
@@ -47,7 +47,6 @@ import java.util.ArrayList;
 public class ClientLogicalHandlerTube extends HandlerTube {
 
     private WSBinding binding;
-    private List<LogicalHandler> logicalHandlers;
 
     /**
      * Creates a new instance of LogicalHandlerTube
@@ -78,55 +77,11 @@ public class ClientLogicalHandlerTube extends HandlerTube {
         this.binding = that.binding;
     }
 
-    boolean isHandlerChainEmpty() {
-        return logicalHandlers.isEmpty();
-    }
-
-    /**
-     * Close SOAPHandlers first and then LogicalHandlers on Client
-     * Close LogicalHandlers first and then SOAPHandlers on Server
-     */
-    public void close(MessageContext msgContext) {
-        //assuming cousinTube is called if requestProcessingSucessful is true
-        if (requestProcessingSucessful) {
-            //cousinTube is null in XML/HTTP Binding
-            if (cousinTube != null) {
-                // Close SOAPHandlerTube
-                cousinTube.closeCall(msgContext);
-            }
-        }
-        if (processor != null)
-            closeLogicalHandlers(msgContext);
-
-    }
-
-    /**
-     * This is called from cousinTube.
-     * Close this Tubes's handlers.
-     */
-    public void closeCall(MessageContext msgContext) {
-        closeLogicalHandlers(msgContext);
-    }
-
-    //TODO:
-    private void closeLogicalHandlers(MessageContext msgContext) {
-        if (processor == null)
-            return;
-        if (remedyActionTaken) {
-            //Close only invoked handlers in the chain
-
-            //CLIENT-SIDE
-            processor.closeHandlers(msgContext, processor.getIndex(), 0);
-            processor.setIndex(-1);
-            //reset remedyActionTaken
-            remedyActionTaken = false;
-        } else {
-            //Close all handlers in the chain
-
-            //CLIENT-SIDE
-            processor.closeHandlers(msgContext, logicalHandlers.size() - 1, 0);
-
-        }
+    //should be overridden by DriverHandlerTubes
+    @Override
+    protected void initiateClosing(MessageContext mc) {
+      close(mc);
+      super.initiateClosing(mc);
     }
 
     public AbstractFilterTubeImpl copy(TubeCloner cloner) {
@@ -136,16 +91,16 @@ public class ClientLogicalHandlerTube extends HandlerTube {
     void setUpProcessor() {
         // Take a snapshot, User may change chain after invocation, Same chain
         // should be used for the entire MEP
-        logicalHandlers = new ArrayList<LogicalHandler>();
+        handlers = new ArrayList<Handler>();
         List<LogicalHandler> logicalSnapShot= ((BindingImpl) binding).getHandlerConfig().getLogicalHandlers();
         if (!logicalSnapShot.isEmpty()) {
-            logicalHandlers.addAll(logicalSnapShot);
+            handlers.addAll(logicalSnapShot);
             if (binding.getSOAPVersion() == null) {
                 processor = new XMLHandlerProcessor(this, binding,
-                        logicalHandlers);
+                        handlers);
             } else {
                 processor = new SOAPHandlerProcessor(true, this, binding,
-                        logicalHandlers);
+                        handlers);
             }
         }
     }
@@ -193,4 +148,8 @@ public class ClientLogicalHandlerTube extends HandlerTube {
 
         }
     }
+    void closeHandlers(MessageContext mc) {
+        closeClientsideHandlers(mc);
+
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java
new file mode 100644
index 00000000000..d46c7f66fff
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.handler;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.handler.MessageHandler;
+import com.sun.xml.internal.ws.api.message.Attachment;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterTubeImpl;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.client.HandlerConfiguration;
+import com.sun.xml.internal.ws.message.DataHandlerAttachment;
+
+import javax.activation.DataHandler;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.Handler;
+import java.util.*;
+
+/**
+ * @author Rama Pulavarthi
+ */
+public class ClientMessageHandlerTube extends HandlerTube {
+    private SEIModel seiModel;
+    private WSBinding binding;
+    private Set<String> roles;
+
+    /**
+     * Creates a new instance of MessageHandlerTube
+     */
+    public ClientMessageHandlerTube(@Nullable SEIModel seiModel, WSBinding binding, WSDLPort port, Tube next) {
+        super(next, port);
+        this.seiModel = seiModel;
+        this.binding = binding;
+    }
+
+    /**
+     * Copy constructor for {@link com.sun.xml.internal.ws.api.pipe.Tube#copy(com.sun.xml.internal.ws.api.pipe.TubeCloner)}.
+     */
+    private ClientMessageHandlerTube(ClientMessageHandlerTube that, TubeCloner cloner) {
+        super(that, cloner);
+        this.seiModel = that.seiModel;
+        this.binding = that.binding;
+    }
+
+    public AbstractFilterTubeImpl copy(TubeCloner cloner) {
+        return new ClientMessageHandlerTube(this, cloner);
+    }
+
+    void callHandlersOnResponse(MessageUpdatableContext context, boolean handleFault) {
+        try {
+            //CLIENT-SIDE
+            processor.callHandlersResponse(HandlerProcessor.Direction.INBOUND, context, handleFault);
+
+        } catch (WebServiceException wse) {
+            //no rewrapping
+            throw wse;
+        } catch (RuntimeException re) {
+            throw new WebServiceException(re);
+        }
+    }
+
+    boolean callHandlersOnRequest(MessageUpdatableContext context, boolean isOneWay) {
+        boolean handlerResult;
+
+        //Lets copy all the MessageContext.OUTBOUND_ATTACHMENT_PROPERTY to the message
+        Map<String, DataHandler> atts = (Map<String, DataHandler>) context.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
+        AttachmentSet attSet = packet.getMessage().getAttachments();
+        for(String cid : atts.keySet()){
+            if (attSet.get(cid) == null) {  // Otherwise we would be adding attachments twice
+                Attachment att = new DataHandlerAttachment(cid, atts.get(cid));
+                attSet.add(att);
+            }
+        }
+
+        try {
+            //CLIENT-SIDE
+            handlerResult = processor.callHandlersRequest(HandlerProcessor.Direction.OUTBOUND, context, !isOneWay);
+        } catch (WebServiceException wse) {
+            remedyActionTaken = true;
+            //no rewrapping
+            throw wse;
+        } catch (RuntimeException re) {
+            remedyActionTaken = true;
+
+            throw new WebServiceException(re);
+
+        }
+        if (!handlerResult) {
+            remedyActionTaken = true;
+        }
+        return handlerResult;
+    }
+
+    void closeHandlers(MessageContext mc) {
+        closeClientsideHandlers(mc);
+
+    }
+
+    void setUpProcessor() {
+       // Take a snapshot, User may change chain after invocation, Same chain
+        // should be used for the entire MEP
+        handlers = new ArrayList<Handler>();
+        HandlerConfiguration handlerConfig = ((BindingImpl) binding).getHandlerConfig();
+        List<MessageHandler> msgHandlersSnapShot= handlerConfig.getMessageHandlers();
+        if (!msgHandlersSnapShot.isEmpty()) {
+            handlers.addAll(msgHandlersSnapShot);
+            roles = new HashSet<String>();
+            roles.addAll(handlerConfig.getRoles());
+            processor = new SOAPHandlerProcessor(true, this, binding, handlers);
+        }
+    }
+
+
+
+    MessageUpdatableContext getContext(Packet p) {
+        MessageHandlerContextImpl context = new MessageHandlerContextImpl(seiModel, binding, port, packet,roles);
+        return context;
+    }
+
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java
index 718b64472d9..d9dc1a43144 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.handler;
 
 import com.sun.xml.internal.ws.api.WSBinding;
@@ -40,6 +39,7 @@ import com.sun.xml.internal.ws.message.DataHandlerAttachment;
 
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.Handler;
 import javax.xml.ws.WebServiceException;
 import javax.activation.DataHandler;
 import java.util.*;
@@ -51,7 +51,6 @@ import java.util.*;
 public class ClientSOAPHandlerTube extends HandlerTube {
 
     private WSBinding binding;
-    private List<SOAPHandler> soapHandlers;
     private Set<String> roles;
 
     /**
@@ -87,67 +86,26 @@ public class ClientSOAPHandlerTube extends HandlerTube {
         this.binding = that.binding;
     }
 
-    boolean isHandlerChainEmpty() {
-        return soapHandlers.isEmpty();
-    }
-
-    /**
-     * Close SOAPHandlers first and then LogicalHandlers on Client
-     * Close LogicalHandlers first and then SOAPHandlers on Server
-     */
-    public void close(MessageContext msgContext) {
-
-    }
-
-    /**
-     * This is called from cousinTube.
-     * Close this Tube's handlers.
-     */
-    public void closeCall(MessageContext msgContext) {
-        closeSOAPHandlers(msgContext);
-    }
-
-    //TODO:
-    private void closeSOAPHandlers(MessageContext msgContext) {
-        if (processor == null)
-            return;
-        if (remedyActionTaken) {
-            //Close only invoked handlers in the chain
-
-            //CLIENT-SIDE
-            processor.closeHandlers(msgContext, processor.getIndex(), 0);
-            processor.setIndex(-1);
-            //reset remedyActionTaken
-            remedyActionTaken = false;
-        } else {
-            //Close all handlers in the chain
-
-            //CLIENT-SIDE
-            processor.closeHandlers(msgContext, soapHandlers.size() - 1, 0);
-        }
-    }
-
-    public AbstractFilterTubeImpl copy(TubeCloner cloner) {
+   public AbstractFilterTubeImpl copy(TubeCloner cloner) {
         return new ClientSOAPHandlerTube(this, cloner);
     }
 
     void setUpProcessor() {
         // Take a snapshot, User may change chain after invocation, Same chain
         // should be used for the entire MEP
-        soapHandlers = new ArrayList<SOAPHandler>();
+        handlers = new ArrayList<Handler>();
         HandlerConfiguration handlerConfig = ((BindingImpl) binding).getHandlerConfig();
         List<SOAPHandler> soapSnapShot= handlerConfig.getSoapHandlers();
         if (!soapSnapShot.isEmpty()) {
-            soapHandlers.addAll(soapSnapShot);
+            handlers.addAll(soapSnapShot);
             roles = new HashSet<String>();
             roles.addAll(handlerConfig.getRoles());
-            processor = new SOAPHandlerProcessor(true, this, binding, soapHandlers);
+            processor = new SOAPHandlerProcessor(true, this, binding, handlers);
         }
     }
 
     MessageUpdatableContext getContext(Packet packet) {
-        SOAPMessageContextImpl context = new SOAPMessageContextImpl(binding, packet);
-        context.setRoles(roles);
+        SOAPMessageContextImpl context = new SOAPMessageContextImpl(binding, packet,roles);
         return context;
     }
 
@@ -158,8 +116,10 @@ public class ClientSOAPHandlerTube extends HandlerTube {
         Map<String, DataHandler> atts = (Map<String, DataHandler>) context.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
         AttachmentSet attSet = packet.getMessage().getAttachments();
         for(String cid : atts.keySet()){
-            Attachment att = new DataHandlerAttachment(cid, atts.get(cid));
-            attSet.add(att);
+            if (attSet.get(cid) == null) {  // Otherwise we would be adding attachments twice
+                Attachment att = new DataHandlerAttachment(cid, atts.get(cid));
+                attSet.add(att);
+            }
         }
 
         try {
@@ -194,4 +154,9 @@ public class ClientSOAPHandlerTube extends HandlerTube {
             throw new WebServiceException(re);
         }
     }
+
+    void closeHandlers(MessageContext mc) {
+        closeClientsideHandlers(mc);
+
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java
index 1cc19e79609..b4db081d048 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java
@@ -32,20 +32,22 @@ import com.sun.xml.internal.ws.api.pipe.*;
 import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterTubeImpl;
 
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.Handler;
+import java.util.List;
 
 /**
  * @author WS Development team
  */
 
 public abstract class HandlerTube extends AbstractFilterTubeImpl {
-
     /**
      * handle hold reference to other Tube for inter-tube communication
      */
     HandlerTube cousinTube;
+    protected List<Handler> handlers;
     HandlerProcessor processor;
     boolean remedyActionTaken = false;
-    private final @Nullable WSDLPort port;
+    protected final @Nullable WSDLPort port;
     // flag used to decide whether to call close on cousinTube
     boolean requestProcessingSucessful = false;
 
@@ -123,7 +125,7 @@ public abstract class HandlerTube extends AbstractFilterTubeImpl {
                 throw re;
         } finally {
             if(!requestProcessingSucessful) {
-                cleanUpState(context.getMessageContext());
+                initiateClosing(context.getMessageContext());
             }
         }
 
@@ -147,7 +149,7 @@ public abstract class HandlerTube extends AbstractFilterTubeImpl {
                 callHandlersOnResponse(context, isFault);
             }
         } finally {
-            cleanUpState(context.getMessageContext());
+            initiateClosing(context.getMessageContext());
         }
         //Update Packet with user modifications
         context.updatePacket();
@@ -162,7 +164,7 @@ public abstract class HandlerTube extends AbstractFilterTubeImpl {
             return doThrow(t);
         } finally {
             MessageUpdatableContext context = getContext(packet);
-            cleanUpState(context.getMessageContext());
+            initiateClosing(context.getMessageContext());
             /* TODO revisit: commented this out as the modified packet is no longer used
                     In future if the message is propagated even when an exception
                     occurs, then uncomment context.updatePacket();
@@ -174,17 +176,99 @@ public abstract class HandlerTube extends AbstractFilterTubeImpl {
         }
     }
 
+    /**
+     * Must be overridden by HandlerTube that drives other handler tubes for processing a message.
+     * On Client-side: ClientLogicalHandlerTube drives the Handler Processing.
+     * On Server-side: In case SOAP Binding, ServerMessageHandlerTube drives the Handler Processing.
+     *                 In case XML/HTTP Binding, ServerLogicalHandlerTube drives the Handler Processing.
+     *
+     *
+     * If its a top HandlerTube, should override by calling #close(MessaggeContext);
+     *
+     */
+
+    protected void initiateClosing(MessageContext mc) {
+        // Do nothing
+
+    }
+
     /**
      * Calls close on previously invoked handlers.
      * Also, Cleans up any state left over in the Tube instance from the current
      * invocation, as Tube instances can be reused after the completion of MEP.
      *
+     * On Client, SOAPHandlers are closed first and then LogicalHandlers
+     * On Server, LogicalHandlers are closed first and then SOAPHandlers
      */
-    private void cleanUpState(MessageContext mc) {
-        close(mc);
+    final public void close(MessageContext msgContext) {
+        //assuming cousinTube is called if requestProcessingSucessful is true
+        if (requestProcessingSucessful) {
+            if (cousinTube != null) {
+                cousinTube.close(msgContext);
+            }
+
+        }
+        if (processor != null)
+            closeHandlers(msgContext);
+
         // Clean up the exchange for next invocation.
         exchange = null;
         requestProcessingSucessful = false;
+
+    }
+
+    /**
+     * On Client, Override by calling #closeClientHandlers(MessageContext mc)
+     * On Server, Override by calling #closeServerHandlers(MessageContext mc)
+     *      The difference is the order in which they are closed.
+     * @param mc
+     */
+    abstract void closeHandlers(MessageContext mc);
+
+    /**
+     * Called by close(MessageContext mc) in a Client Handlertube
+     */
+    protected void closeClientsideHandlers(MessageContext msgContext) {
+         if (processor == null)
+            return;
+        if (remedyActionTaken) {
+            //Close only invoked handlers in the chain
+
+            //CLIENT-SIDE
+            processor.closeHandlers(msgContext, processor.getIndex(), 0);
+            processor.setIndex(-1);
+            //reset remedyActionTaken
+            remedyActionTaken = false;
+        } else {
+            //Close all handlers in the chain
+
+            //CLIENT-SIDE
+            processor.closeHandlers(msgContext, handlers.size() - 1, 0);
+
+        }
+    }
+
+    /**
+     * Called by close(MessageContext mc) in a Server Handlertube
+     */
+    protected void closeServersideHandlers(MessageContext msgContext) {
+        if (processor == null)
+            return;
+        if (remedyActionTaken) {
+            //Close only invoked handlers in the chain
+
+            //SERVER-SIDE
+            processor.closeHandlers(msgContext, processor.getIndex(), handlers.size() - 1);
+            processor.setIndex(-1);
+            //reset remedyActionTaken
+            remedyActionTaken = false;
+        } else {
+            //Close all handlers in the chain
+
+            //SERVER-SIDE
+            processor.closeHandlers(msgContext, 0, handlers.size() - 1);
+
+        }
     }
 
     abstract void callHandlersOnResponse(MessageUpdatableContext context, boolean handleFault);
@@ -200,26 +284,16 @@ public abstract class HandlerTube extends AbstractFilterTubeImpl {
               otherwise use this value as an approximation, since this carries
               the appliation's intention --- whether it was invokeOneway vs invoke,etc.
              */
-            return (packet.expectReply != null && packet.expectReply);
+            return !(packet.expectReply != null && packet.expectReply);
         }
     }
 
     abstract void setUpProcessor();
-    abstract boolean isHandlerChainEmpty();
+    final public boolean isHandlerChainEmpty() {
+        return handlers.isEmpty();
+    }
     abstract MessageUpdatableContext getContext(Packet p);
 
-    /**
-     * Close SOAPHandlers first and then LogicalHandlers on Client
-     * Close LogicalHandlers first and then SOAPHandlers on Server
-     */
-    protected abstract void close(MessageContext msgContext);
-
-    /**
-     * This is called from cousinTube.
-     * Close this Tube's handlers.
-     */
-    protected abstract void closeCall(MessageContext msgContext);
-
     private boolean isHandleFault(Packet packet) {
         if (cousinTube != null) {
             return exchange.isHandleFault();
@@ -248,6 +322,11 @@ public abstract class HandlerTube extends AbstractFilterTubeImpl {
             if(cousinTube != null) {
                 cousinTube.exchange = exchange;
             }
+        } else {
+            if(cousinTube != null) {
+                cousinTube.exchange = exchange;
+            }
+
         }
     }
     private HandlerTubeExchange exchange;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java
new file mode 100644
index 00000000000..f0d452a1eb5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.handler;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.handler.MessageHandlerContext;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
+
+import java.util.Set;
+
+/**
+ * @author Rama Pulavarthi
+ */
+public class MessageHandlerContextImpl extends MessageUpdatableContext implements MessageHandlerContext {
+    private @Nullable SEIModel seiModel;
+    private Set<String> roles;
+    private WSBinding binding;
+    private @Nullable WSDLPort wsdlModel;
+
+    public MessageHandlerContextImpl(@Nullable SEIModel seiModel, WSBinding binding, @Nullable WSDLPort wsdlModel, Packet packet, Set<String> roles) {
+        super(packet);
+        this.seiModel = seiModel;
+        this.binding = binding;
+        this.wsdlModel = wsdlModel;
+        this.roles = roles;
+    }
+    public Message getMessage() {
+        return packet.getMessage();
+    }
+
+    public void setMessage(Message message) {
+        packet.setMessage(message);
+    }
+
+    public Set<String> getRoles() {
+        return roles;
+    }
+
+    public WSBinding getWSBinding() {
+        return binding;
+    }
+
+    public @Nullable SEIModel getSEIModel() {
+        return seiModel;
+    }
+
+    public @Nullable WSDLPort getPort() {
+        return wsdlModel;
+    }
+
+    void updateMessage() {
+       // Do Nothing
+    }
+
+    void setPacketMessage(Message newMessage) {
+        setMessage(newMessage);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java
index 5ceb07a098a..a7075d38bc1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java
@@ -56,9 +56,10 @@ class SOAPMessageContextImpl extends MessageUpdatableContext implements SOAPMess
     private SOAPMessage soapMsg = null;
     private WSBinding binding;
 
-    public SOAPMessageContextImpl(WSBinding binding, Packet packet) {
+    public SOAPMessageContextImpl(WSBinding binding, Packet packet,Set<String> roles) {
         super(packet);
         this.binding = binding;
+        this.roles = roles;
     }
 
     public SOAPMessage getMessage() {
@@ -125,8 +126,4 @@ class SOAPMessageContextImpl extends MessageUpdatableContext implements SOAPMess
     public Set<String> getRoles() {
         return roles;
     }
-
-    void setRoles(Set<String> roles) {
-        this.roles = roles;
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java
index 81883210cf3..4df14d1f5f2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.handler;
 
 import com.sun.xml.internal.ws.api.WSBinding;
@@ -39,6 +38,7 @@ import com.sun.xml.internal.ws.message.DataHandlerAttachment;
 
 import javax.xml.ws.handler.LogicalHandler;
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.Handler;
 import javax.xml.ws.WebServiceException;
 import javax.activation.DataHandler;
 import java.util.List;
@@ -52,7 +52,6 @@ import java.util.Map;
 public class ServerLogicalHandlerTube extends HandlerTube {
 
     private WSBinding binding;
-    private List<LogicalHandler> logicalHandlers;
 
     /**
      * Creates a new instance of LogicalHandlerTube
@@ -60,7 +59,7 @@ public class ServerLogicalHandlerTube extends HandlerTube {
     public ServerLogicalHandlerTube(WSBinding binding, WSDLPort port, Tube next) {
         super(next, port);
         this.binding = binding;
-        setUpProcessorOnce();
+        setUpHandlersOnce();
     }
 
     /**
@@ -73,7 +72,7 @@ public class ServerLogicalHandlerTube extends HandlerTube {
     public ServerLogicalHandlerTube(WSBinding binding, Tube next, HandlerTube cousinTube) {
         super(next, cousinTube);
         this.binding = binding;
-        setUpProcessorOnce();
+        setUpHandlersOnce();
     }
 
     /**
@@ -83,76 +82,41 @@ public class ServerLogicalHandlerTube extends HandlerTube {
     private ServerLogicalHandlerTube(ServerLogicalHandlerTube that, TubeCloner cloner) {
         super(that, cloner);
         this.binding = that.binding;
-        setUpProcessorOnce();
+        this.handlers = that.handlers;
     }
 
-    boolean isHandlerChainEmpty() {
-        return logicalHandlers.isEmpty();
-    }
-
-    /**
-     * Close SOAPHandlers first and then LogicalHandlers on Client
-     * Close LogicalHandlers first and then SOAPHandlers on Server
-     */
-    public void close(MessageContext msgContext) {
-
-        if (binding.getSOAPVersion() != null) {
-            //SOAPHandlerTube will drive the closing of LogicalHandlerTube
+    //should be overridden by DriverHandlerTubes
+    @Override
+    protected void initiateClosing(MessageContext mc) {
+         if (binding.getSOAPVersion() != null) {
+            super.initiateClosing(mc);
         } else {
-            if (processor != null)
-                closeLogicalHandlers(msgContext);
-        }
-
-    }
-
-    /**
-     * This is called from cousinTube.
-     * Close this Tube's handlers.
-     */
-    public void closeCall(MessageContext msgContext) {
-        closeLogicalHandlers(msgContext);
-    }
-
-    //TODO:
-    private void closeLogicalHandlers(MessageContext msgContext) {
-        if (processor == null)
-            return;
-        if (remedyActionTaken) {
-            //Close only invoked handlers in the chain
-            //SERVER-SIDE
-            processor.closeHandlers(msgContext, processor.getIndex(), logicalHandlers.size() - 1);
-            processor.setIndex(-1);
-            //reset remedyActionTaken
-            remedyActionTaken = false;
-        } else {
-            //Close all handlers in the chain
-            //SERVER-SIDE
-            processor.closeHandlers(msgContext, 0, logicalHandlers.size() - 1);
-
+            close(mc);
+            super.initiateClosing(mc);
         }
     }
 
-    public AbstractFilterTubeImpl copy(TubeCloner cloner) {
+   public AbstractFilterTubeImpl copy(TubeCloner cloner) {
         return new ServerLogicalHandlerTube(this, cloner);
     }
 
-    private void setUpProcessorOnce() {
-        logicalHandlers = new ArrayList<LogicalHandler>();
+    private void setUpHandlersOnce() {
+        handlers = new ArrayList<Handler>();
         List<LogicalHandler> logicalSnapShot= ((BindingImpl) binding).getHandlerConfig().getLogicalHandlers();
         if (!logicalSnapShot.isEmpty()) {
-            logicalHandlers.addAll(logicalSnapShot);
-            if (binding.getSOAPVersion() == null) {
-                processor = new XMLHandlerProcessor(this, binding,
-                        logicalHandlers);
-            } else {
-                processor = new SOAPHandlerProcessor(false, this, binding,
-                        logicalHandlers);
-            }
+            handlers.addAll(logicalSnapShot);
         }
     }
 
     void setUpProcessor() {
-     // Do nothing, Processor is setup in the constructor.
+        if (!handlers.isEmpty()) {
+            if (binding.getSOAPVersion() == null) {
+                processor = new XMLHandlerProcessor(this, binding,
+                        handlers);
+            } else {
+                processor = new SOAPHandlerProcessor(false, this, binding, handlers);
+            }
+        }
     }
 
     MessageUpdatableContext getContext(Packet packet) {
@@ -196,4 +160,9 @@ public class ServerLogicalHandlerTube extends HandlerTube {
             throw re;
         }
     }
+
+    void closeHandlers(MessageContext mc) {
+        closeServersideHandlers(mc);
+
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java
new file mode 100644
index 00000000000..0d0b3bbf2e5
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.handler;
+
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.handler.MessageHandler;
+import com.sun.xml.internal.ws.api.message.Attachment;
+import com.sun.xml.internal.ws.api.message.AttachmentSet;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.model.SEIModel;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterTubeImpl;
+import com.sun.xml.internal.ws.binding.BindingImpl;
+import com.sun.xml.internal.ws.client.HandlerConfiguration;
+import com.sun.xml.internal.ws.message.DataHandlerAttachment;
+
+import javax.activation.DataHandler;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.Handler;
+import java.util.*;
+
+/**
+ * @author Rama Pulavarthi
+ */
+public class ServerMessageHandlerTube extends HandlerTube{
+    private SEIModel seiModel;
+    private WSBinding binding;
+    private Set<String> roles;
+
+    public ServerMessageHandlerTube(SEIModel seiModel, WSBinding binding, Tube next, HandlerTube cousinTube) {
+        super(next, cousinTube);
+        this.seiModel = seiModel;
+        this.binding = binding;
+        setUpHandlersOnce();
+    }
+
+    /**
+     * Copy constructor for {@link com.sun.xml.internal.ws.api.pipe.Tube#copy(com.sun.xml.internal.ws.api.pipe.TubeCloner)}.
+     */
+    private ServerMessageHandlerTube(ServerMessageHandlerTube that, TubeCloner cloner) {
+        super(that, cloner);
+        this.seiModel = that.seiModel;
+        this.binding = that.binding;
+        this.handlers = that.handlers;
+        this.roles = that.roles;
+    }
+
+    private void setUpHandlersOnce() {
+        handlers = new ArrayList<Handler>();
+        HandlerConfiguration handlerConfig = ((BindingImpl) binding).getHandlerConfig();
+        List<MessageHandler> msgHandlersSnapShot= handlerConfig.getMessageHandlers();
+        if (!msgHandlersSnapShot.isEmpty()) {
+            handlers.addAll(msgHandlersSnapShot);
+            roles = new HashSet<String>();
+            roles.addAll(handlerConfig.getRoles());
+        }
+    }
+
+    void callHandlersOnResponse(MessageUpdatableContext context, boolean handleFault) {
+        //Lets copy all the MessageContext.OUTBOUND_ATTACHMENT_PROPERTY to the message
+        Map<String, DataHandler> atts = (Map<String, DataHandler>) context.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
+        AttachmentSet attSet = packet.getMessage().getAttachments();
+        for(String cid : atts.keySet()){
+            if (attSet.get(cid) == null) { // Otherwise we would be adding attachments twice
+                Attachment att = new DataHandlerAttachment(cid, atts.get(cid));
+                attSet.add(att);
+            }
+        }
+
+        try {
+            //SERVER-SIDE
+            processor.callHandlersResponse(HandlerProcessor.Direction.OUTBOUND, context, handleFault);
+
+        } catch (WebServiceException wse) {
+            //no rewrapping
+            throw wse;
+        } catch (RuntimeException re) {
+            throw re;
+
+        }
+    }
+
+    boolean callHandlersOnRequest(MessageUpdatableContext context, boolean isOneWay) {
+        boolean handlerResult;
+        try {
+            //SERVER-SIDE
+            handlerResult = processor.callHandlersRequest(HandlerProcessor.Direction.INBOUND, context, !isOneWay);
+
+        } catch (RuntimeException re) {
+            remedyActionTaken = true;
+            throw re;
+
+        }
+        if (!handlerResult) {
+            remedyActionTaken = true;
+        }
+        return handlerResult;
+    }
+
+    void setUpProcessor() {
+        if(!handlers.isEmpty()) {
+            processor = new SOAPHandlerProcessor(false, this, binding, handlers);
+        }
+    }
+
+    void closeHandlers(MessageContext mc) {
+        closeServersideHandlers(mc);
+
+    }
+    MessageUpdatableContext getContext(Packet packet) {
+       MessageHandlerContextImpl context = new MessageHandlerContextImpl(seiModel, binding, port, packet, roles);
+       return context;
+    }
+
+    //should be overridden by DriverHandlerTubes
+    @Override
+    protected void initiateClosing(MessageContext mc) {
+      close(mc);
+      super.initiateClosing(mc);
+    }
+
+   public AbstractFilterTubeImpl copy(TubeCloner cloner) {
+        return new ServerMessageHandlerTube(this, cloner);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java
index 069ddaf5b4d..18228a35b08 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java
@@ -23,7 +23,6 @@
  * have any questions.
  */
 
-
 package com.sun.xml.internal.ws.handler;
 
 import com.sun.xml.internal.ws.api.WSBinding;
@@ -40,6 +39,7 @@ import com.sun.xml.internal.ws.message.DataHandlerAttachment;
 
 import javax.xml.ws.handler.soap.SOAPHandler;
 import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.Handler;
 import javax.xml.ws.WebServiceException;
 import javax.activation.DataHandler;
 import java.util.*;
@@ -51,7 +51,6 @@ import java.util.*;
 public class ServerSOAPHandlerTube extends HandlerTube {
 
     private WSBinding binding;
-    private List<SOAPHandler> soapHandlers;
     private Set<String> roles;
 
     /**
@@ -64,7 +63,7 @@ public class ServerSOAPHandlerTube extends HandlerTube {
             // TODO: throw Exception
         }
         this.binding = binding;
-        setUpProcessorOnce();
+        setUpHandlersOnce();
     }
 
     // Handle to LogicalHandlerTube means its used on SERVER-SIDE
@@ -78,7 +77,7 @@ public class ServerSOAPHandlerTube extends HandlerTube {
     public ServerSOAPHandlerTube(WSBinding binding, Tube next, HandlerTube cousinTube) {
         super(next, cousinTube);
         this.binding = binding;
-        setUpProcessorOnce();
+        setUpHandlersOnce();
     }
 
     /**
@@ -87,79 +86,32 @@ public class ServerSOAPHandlerTube extends HandlerTube {
     private ServerSOAPHandlerTube(ServerSOAPHandlerTube that, TubeCloner cloner) {
         super(that, cloner);
         this.binding = that.binding;
-        setUpProcessorOnce();
+        this.handlers = that.handlers;
+        this.roles = that.roles;
     }
 
-    boolean isHandlerChainEmpty() {
-        return soapHandlers.isEmpty();
-    }
-
-    /**
-     * Close SOAPHandlers first and then LogicalHandlers on Client
-     * Close LogicalHandlers first and then SOAPHandlers on Server
-     */
-    public void close(MessageContext msgContext) {
-        //assuming cousinTube is called if requestProcessingSucessful is true
-        if (requestProcessingSucessful) {
-            if (cousinTube != null) {
-                // Close LogicalHandlerTube
-                cousinTube.closeCall(msgContext);
-            }
-        }
-        if (processor != null)
-            closeSOAPHandlers(msgContext);
-
-    }
-
-    /**
-     * This is called from cousinTube.
-     * Close this Tube's handlers.
-     */
-    public void closeCall(MessageContext msgContext) {
-        closeSOAPHandlers(msgContext);
-    }
-
-    //TODO:
-    private void closeSOAPHandlers(MessageContext msgContext) {
-        if (processor == null)
-            return;
-        if (remedyActionTaken) {
-            //Close only invoked handlers in the chain
-            //SERVER-SIDE
-            processor.closeHandlers(msgContext, processor.getIndex(), soapHandlers.size() - 1);
-            processor.setIndex(-1);
-            //reset remedyActionTaken
-            remedyActionTaken = false;
-        } else {
-            //Close all handlers in the chain
-            //SERVER-SIDE
-            processor.closeHandlers(msgContext, 0, soapHandlers.size() - 1);
-
-        }
-    }
 
     public AbstractFilterTubeImpl copy(TubeCloner cloner) {
         return new ServerSOAPHandlerTube(this, cloner);
     }
 
-    private void setUpProcessorOnce() {
-        soapHandlers = new ArrayList<SOAPHandler>();
+    private void setUpHandlersOnce() {
+        handlers = new ArrayList<Handler>();
         HandlerConfiguration handlerConfig = ((BindingImpl) binding).getHandlerConfig();
         List<SOAPHandler> soapSnapShot= handlerConfig.getSoapHandlers();
         if (!soapSnapShot.isEmpty()) {
-            soapHandlers.addAll(soapSnapShot);
+            handlers.addAll(soapSnapShot);
             roles = new HashSet<String>();
             roles.addAll(handlerConfig.getRoles());
-            processor = new SOAPHandlerProcessor(false, this, binding, soapHandlers);
         }
     }
 
     void setUpProcessor() {
-        // Do nothing, Processor is setup in the constructor.
+        if(!handlers.isEmpty())
+            processor = new SOAPHandlerProcessor(false, this, binding, handlers);
     }
     MessageUpdatableContext getContext(Packet packet) {
-        SOAPMessageContextImpl context = new SOAPMessageContextImpl(binding, packet);
-        context.setRoles(roles);
+        SOAPMessageContextImpl context = new SOAPMessageContextImpl(binding, packet,roles);
         return context;
     }
 
@@ -187,8 +139,10 @@ public class ServerSOAPHandlerTube extends HandlerTube {
         Map<String, DataHandler> atts = (Map<String, DataHandler>) context.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
         AttachmentSet attSet = packet.getMessage().getAttachments();
         for(String cid : atts.keySet()){
-            Attachment att = new DataHandlerAttachment(cid, atts.get(cid));
-            attSet.add(att);
+            if (attSet.get(cid) == null) { // Otherwise we would be adding attachments twice
+                Attachment att = new DataHandlerAttachment(cid, atts.get(cid));
+                attSet.add(att);
+            }
         }
 
         try {
@@ -203,4 +157,9 @@ public class ServerSOAPHandlerTube extends HandlerTube {
 
         }
     }
+
+    void closeHandlers(MessageContext mc) {
+        closeServersideHandlers(mc);
+
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java
index 206b2181e7a..d24366a46c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java
@@ -74,9 +74,4 @@ public final class AttachmentUnmarshallerImpl extends AttachmentUnmarshaller {
         return cid;
     }
 
-    // TODO fix the hack
-    // So that SAAJ registers DCHs for MIME types
-    static {
-        new com.sun.xml.internal.messaging.saaj.soap.AttachmentPartImpl();
-    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java
index 46562bf9921..305f68efc37 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java
@@ -28,6 +28,8 @@ package com.sun.xml.internal.ws.message;
 import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.util.ByteArrayDataSource;
+import com.sun.xml.internal.ws.encoding.DataSourceStreamingDataHandler;
+
 import java.io.ByteArrayInputStream;
 
 import javax.activation.DataHandler;
@@ -36,8 +38,6 @@ import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.WebServiceException;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -85,7 +85,7 @@ public final class ByteArrayAttachment implements Attachment {
     }
 
     public DataHandler asDataHandler() {
-        return new DataHandler(new ByteArrayDataSource(data,start,len,getContentType()));
+        return new DataSourceStreamingDataHandler(new ByteArrayDataSource(data,start,len,getContentType()));
     }
 
     public Source asSource() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java
index d06f3efdd00..1ef31d6257a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java
@@ -26,9 +26,7 @@
 package com.sun.xml.internal.ws.message;
 
 import com.sun.xml.internal.bind.api.Bridge;
-import com.sun.xml.internal.bind.api.BridgeContext;
 import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
-import com.sun.xml.internal.messaging.saaj.packaging.mime.Header;
 import com.sun.xml.internal.ws.streaming.DOMStreamReader;
 import com.sun.xml.internal.ws.util.DOMUtil;
 import org.w3c.dom.Element;
@@ -47,7 +45,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 /**
- * {@link Header} implementation for a DOM.
+ * {@link com.sun.xml.internal.ws.api.message.Header} implementation for a DOM.
  *
  * @author Kohsuke Kawaguchi
  */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java
index 7153b446ebd..bd0a9c44b69 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java
@@ -45,11 +45,6 @@ import java.io.ByteArrayOutputStream;
  * @author Jitendra Kotamraju
  */
 public final class DataHandlerAttachment implements Attachment {
-    // TODO fix the hack
-    // So that SAAJ registers DCHs for MIME types
-    static {
-        new com.sun.xml.internal.messaging.saaj.soap.AttachmentPartImpl();
-    }
 
     private final DataHandler dh;
     private final String contentId;
@@ -101,7 +96,7 @@ public final class DataHandlerAttachment implements Attachment {
     }
 
     public void writeTo(OutputStream os) throws IOException {
-        os.write(asByteArray());
+        dh.writeTo(os);
     }
 
     public void writeTo(SOAPMessage saaj) throws SOAPException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java
new file mode 100644
index 00000000000..56810d0c38f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.message;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.FilterMessageImpl;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLFault;
+
+import javax.xml.namespace.QName;
+
+/**
+ * SOAP Fault message. It has optimized implementation to get
+ * first detail entry's name. This is useful to identify the
+ * corresponding {@link WSDLFault}
+ *
+ * @author Jitendra Kotamraju
+ */
+public class FaultMessage extends FilterMessageImpl {
+
+    private final @Nullable QName detailEntryName;
+
+    public FaultMessage(Message delegate, @Nullable QName detailEntryName) {
+        super(delegate);
+        this.detailEntryName = detailEntryName;
+    }
+
+    @Override
+    public @Nullable QName getFirstDetailEntryName() {
+        return detailEntryName;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java
index 48c874c6f16..ef4af4d09d8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java
@@ -27,11 +27,10 @@ package com.sun.xml.internal.ws.message;
 
 import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.bind.api.Bridge;
-import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
 import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.util.ASCIIUtility;
-import com.sun.xml.internal.ws.util.ByteArrayDataSource;
-import java.io.ByteArrayInputStream;
+import com.sun.xml.internal.ws.util.ByteArrayBuffer;
+import com.sun.xml.internal.ws.encoding.DataSourceStreamingDataHandler;
 
 import javax.activation.DataHandler;
 import javax.activation.DataSource;
@@ -41,10 +40,10 @@ import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.WebServiceException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import javax.xml.ws.WebServiceException;
 
 /**
  * @author Jitendra Kotamraju
@@ -80,7 +79,7 @@ public final class JAXBAttachment implements Attachment, DataSource {
     }
 
     public DataHandler asDataHandler() {
-        return new DataHandler(this);
+        return new DataSourceStreamingDataHandler(this);
     }
 
     public Source asSource() {
@@ -88,13 +87,13 @@ public final class JAXBAttachment implements Attachment, DataSource {
     }
 
     public InputStream asInputStream() {
-        ByteOutputStream bos = new ByteOutputStream();
+        ByteArrayBuffer bab = new ByteArrayBuffer();
         try {
-            writeTo(bos);
+            writeTo(bab);
         } catch (IOException e) {
             throw new WebServiceException(e);
         }
-        return bos.newInputStream();
+        return bab.newInputStream();
     }
 
     public void writeTo(OutputStream os) throws IOException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java
index fba308a0a12..a39de738405 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java
@@ -24,13 +24,11 @@
  */
 
 
-
 package com.sun.xml.internal.ws.message;
 
 import com.sun.xml.internal.ws.api.message.AttachmentSet;
 import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.encoding.MimeMultipartParser;
-import com.sun.xml.internal.ws.message.stream.StreamAttachment;
 import com.sun.xml.internal.ws.resources.EncodingMessages;
 import com.sun.istack.internal.Nullable;
 
@@ -99,8 +97,8 @@ public final class MimeAttachmentSet implements AttachmentSet {
          * Browse thru all the attachments in the mpp, add them to #atts,
          * then return whether its empty.
          */
-        Map<String, StreamAttachment> attachments = mpp.getAttachmentParts();
-        for(Map.Entry<String, StreamAttachment> att : attachments.entrySet()) {
+        Map<String, Attachment> attachments = mpp.getAttachmentParts();
+        for(Map.Entry<String, Attachment> att : attachments.entrySet()) {
             if(atts.get(att.getKey()) == null){
                 atts.put(att.getKey(), att.getValue());
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java
index 579341a0d6e..b7728d558ec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java
@@ -51,7 +51,6 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import java.io.OutputStream;
-import java.util.Map;
 
 /**
  * {@link Header} whose physical data representation is a JAXB bean.
@@ -151,9 +150,16 @@ public final class JAXBHeader extends AbstractHeaderImpl {
     }
 
     public <T> T readAsJAXB(Unmarshaller unmarshaller) throws JAXBException {
-        JAXBResult r = new JAXBResult(unmarshaller);
-        bridge.marshal(jaxbObject,r);
-        return (T)r.getResult();
+        try {
+            JAXBResult r = new JAXBResult(unmarshaller);
+            // bridge marshals a fragment, so we need to add start/endDocument by ourselves
+            r.getHandler().startDocument();
+            bridge.marshal(jaxbObject,r);
+            r.getHandler().endDocument();
+            return (T)r.getResult();
+        } catch (SAXException e) {
+            throw new JAXBException(e);
+        }
     }
 
     public <T> T readAsJAXB(Bridge<T> bridge) throws JAXBException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
index f6232263b67..e0c6c39b4e5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java
@@ -40,6 +40,8 @@ import com.sun.xml.internal.ws.message.AttachmentSetImpl;
 import com.sun.xml.internal.ws.message.RootElementSniffer;
 import com.sun.xml.internal.ws.message.stream.StreamMessage;
 import com.sun.xml.internal.ws.streaming.XMLStreamWriterUtil;
+import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
+import com.sun.xml.internal.ws.streaming.MtomStreamWriter;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -48,12 +50,14 @@ import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.attachment.AttachmentMarshaller;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.util.JAXBResult;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
+import static javax.xml.stream.XMLStreamConstants.START_DOCUMENT;
 import javax.xml.transform.Source;
 import javax.xml.ws.WebServiceException;
 import java.io.OutputStream;
@@ -265,7 +269,10 @@ public final class JAXBMessage extends AbstractMessageImpl {
                 bridge.marshal(jaxbObject,sbr);
                 infoset = sbr.getXMLStreamBuffer();
             }
-            return infoset.readAsXMLStreamReader();
+            XMLStreamReader reader = infoset.readAsXMLStreamReader();
+            if(reader.getEventType()== START_DOCUMENT)
+                XMLStreamReaderUtil.nextElementContent(reader);
+            return reader;
         } catch (JAXBException e) {
            // bug 6449684, spec 4.3.4
            throw new WebServiceException(e);
@@ -292,7 +299,11 @@ public final class JAXBMessage extends AbstractMessageImpl {
 
     public void writePayloadTo(XMLStreamWriter sw) throws XMLStreamException {
         try {
-            AttachmentMarshallerImpl am = new AttachmentMarshallerImpl(attachmentSet);
+            // MtomCodec sets its own AttachmentMarshaller
+            AttachmentMarshaller am = (sw instanceof MtomStreamWriter)
+                    ? ((MtomStreamWriter)sw).getAttachmentMarshaller()
+                    : new AttachmentMarshallerImpl(attachmentSet);
+
             // Get output stream and use JAXB UTF-8 writer
             OutputStream os = XMLStreamWriterUtil.getOutputStream(sw);
             if (os != null) {
@@ -300,7 +311,8 @@ public final class JAXBMessage extends AbstractMessageImpl {
             } else {
                 bridge.marshal(jaxbObject,sw,am);
             }
-            am.cleanup();
+            //cleanup() is not needed since JAXB doesn't keep ref to AttachmentMarshaller
+            //am.cleanup();
         } catch (JAXBException e) {
             // bug 6449684, spec 4.3.4
             throw new WebServiceException(e);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java
index d41d1556aa5..70c540a10b9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java
@@ -26,8 +26,8 @@
 package com.sun.xml.internal.ws.message.jaxb;
 
 import com.sun.xml.internal.bind.api.Bridge;
-import com.sun.xml.internal.bind.api.TypeReference;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.bind.api.TypeReference;
 import com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl;
 import com.sun.xml.internal.bind.v2.runtime.MarshallerImpl;
 import org.w3c.dom.Node;
@@ -66,7 +66,7 @@ final class MarshallerBridge extends Bridge {
     public void marshal(Marshaller m, Object object, OutputStream output, NamespaceContext nsContext) throws JAXBException {
         m.setProperty(Marshaller.JAXB_FRAGMENT,true);
         try {
-            m.marshal(object,output);
+            ((MarshallerImpl)m).marshal(object,output,nsContext);
         } finally {
             m.setProperty(Marshaller.JAXB_FRAGMENT,false);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java
index cdb198edc0b..fb758cc0b15 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java
@@ -26,15 +26,15 @@ package com.sun.xml.internal.ws.message.saaj;
 
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.XMLStreamException2;
+import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.FragmentContentHandler;
 import com.sun.xml.internal.bind.api.Bridge;
 import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
 import com.sun.xml.internal.ws.api.SOAPVersion;
-import com.sun.xml.internal.ws.api.message.Attachment;
-import com.sun.xml.internal.ws.api.message.AttachmentSet;
-import com.sun.xml.internal.ws.api.message.HeaderList;
-import com.sun.xml.internal.ws.api.message.Message;
-import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.message.*;
 import com.sun.xml.internal.ws.message.AttachmentUnmarshallerImpl;
+import com.sun.xml.internal.ws.message.AbstractMessageImpl;
+import com.sun.xml.internal.ws.message.AttachmentSetImpl;
 import com.sun.xml.internal.ws.streaming.DOMStreamReader;
 import com.sun.xml.internal.ws.util.DOMUtil;
 import org.w3c.dom.Element;
@@ -42,6 +42,8 @@ import org.w3c.dom.Node;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.LocatorImpl;
 
 import javax.activation.DataHandler;
 import javax.xml.bind.JAXBException;
@@ -60,6 +62,7 @@ import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.WebServiceException;
+import javax.xml.ws.soap.SOAPFaultException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -72,217 +75,287 @@ import java.util.Map;
  * {@link Message} implementation backed by {@link SOAPMessage}.
  *
  * @author Vivek Pandey
+ * @author Rama Pulavarthi
  */
 public class SAAJMessage extends Message {
+    // flag to switch between representations
+    private boolean parsedMessage;
+    // flag to check if Message API is exercised;
+    private boolean accessedMessage;
     private final SOAPMessage sm;
+
     private HeaderList headers;
-    private String payloadLocalName;
-    private String payloadNamspace;
     private List<Element> bodyParts;
     private Element payload;
 
-    private boolean parsedHeader;
+    private String payloadLocalName;
+    private String payloadNamespace;
+    private SOAPVersion soapVersion;
 
     public SAAJMessage(SOAPMessage sm) {
         this.sm = sm;
-
-        try {
-            Node body = sm.getSOAPBody();
-            //cature all the body elements
-            bodyParts = DOMUtil.getChildElements(body);
-
-            //we treat payload as the first body part
-            payload = bodyParts.size() > 0? bodyParts.get(0):null;
-            // hope this is correct. Caching the localname and namespace of the payload should be fine
-            // but what about if a Handler replaces the payload with something else? Weel, may be it
-            // will be error condition anyway
-            if (payload != null) {
-                payloadLocalName = payload.getLocalName();
-                payloadNamspace = payload.getNamespaceURI();
-            }
-        } catch (SOAPException e) {
-            throw new WebServiceException(e);
-        }
     }
 
     /**
      * This constructor is a convenience and called by the {@link #copy}
+     *
      * @param headers
      * @param sm
      */
     private SAAJMessage(HeaderList headers, AttachmentSet as, SOAPMessage sm) {
-        this(sm);
+        this.sm = sm;
+        this.parse();
+        if(headers == null)
+            headers = new HeaderList();
         this.headers = headers;
         this.attachmentSet = as;
     }
 
-    public boolean hasHeaders() {
-        return getHeaders().size() > 0;
+    private void parse() {
+        if (!parsedMessage) {
+            try {
+                access();
+                if (headers == null)
+                    headers = new HeaderList();
+                SOAPHeader header = sm.getSOAPHeader();
+                if (header != null) {
+                    Iterator iter = header.examineAllHeaderElements();
+                    while (iter.hasNext()) {
+                        headers.add(new SAAJHeader((SOAPHeaderElement) iter.next()));
+                    }
+                }
+                attachmentSet = new SAAJAttachmentSet(sm);
+
+                parsedMessage = true;
+            } catch (SOAPException e) {
+                throw new WebServiceException(e);
+            }
+        }
     }
 
-    /**
-     * Gets all the headers of this message.
-     *
-     * @return always return the same non-null object.
-     */
-    public HeaderList getHeaders() {
-        if (parsedHeader)
-            return headers;
-
-        if (headers == null)
-            headers = new HeaderList();
-
-        try {
-            SOAPHeader header = sm.getSOAPHeader();
-            if(header!=null) {
-                Iterator iter = header.examineAllHeaderElements();
-                while (iter.hasNext()) {
-                    headers.add(new SAAJHeader((SOAPHeaderElement) iter.next()));
+    private void access() {
+        if (!accessedMessage) {
+            try {
+                Node body = sm.getSOAPBody();
+                soapVersion = SOAPVersion.fromNsUri(body.getNamespaceURI());
+                //cature all the body elements
+                bodyParts = DOMUtil.getChildElements(body);
+                //we treat payload as the first body part
+                payload = bodyParts.size() > 0 ? bodyParts.get(0) : null;
+                // hope this is correct. Caching the localname and namespace of the payload should be fine
+                // but what about if a Handler replaces the payload with something else? Weel, may be it
+                // will be error condition anyway
+                if (payload != null) {
+                    payloadLocalName = payload.getLocalName();
+                    payloadNamespace = payload.getNamespaceURI();
                 }
+                accessedMessage = true;
+            } catch (SOAPException e) {
+                throw new WebServiceException(e);
             }
-            parsedHeader = true;
-        } catch (SOAPException e) {
-            e.printStackTrace();
         }
+    }
+
+    public boolean hasHeaders() {
+        parse();
+        return headers.size() > 0;
+    }
+
+    public @NotNull HeaderList getHeaders() {
+        parse();
         return headers;
     }
-
     /**
      * Gets the attachments of this message
      * (attachments live outside a message.)
      */
     @Override
-    @NotNull
-    public AttachmentSet getAttachments() {
-        if (attachmentSet == null)
-            attachmentSet = new SAAJAttachmentSet(sm);
+    public @NotNull AttachmentSet getAttachments() {
+        parse();
         return attachmentSet;
     }
 
+    /**
+     * Optimization hint for the derived class to check
+     * if we may have some attachments.
+     */
+    @Override
     protected boolean hasAttachments() {
-        return !getAttachments().isEmpty();
+        parse();
+        return attachmentSet!=null;
     }
 
-    /**
-     * Gets the local name of the payload element.
-     */
-    public String getPayloadLocalPart() {
+    public @Nullable String getPayloadLocalPart() {
+        access();
         return payloadLocalName;
     }
 
-    /**
-     * Gets the namespace URI of the payload element.
-     */
     public String getPayloadNamespaceURI() {
-        return payloadNamspace;
+        access();
+        return payloadNamespace;
     }
 
     public boolean hasPayload() {
-        return payloadNamspace!=null;
+        access();
+        return payloadNamespace != null;
     }
 
-    /**
-     * Consumes this message including the envelope.
-     * returns it as a {@link javax.xml.transform.Source} object.
-     */
     public Source readEnvelopeAsSource() {
         try {
-            SOAPEnvelope se = sm .getSOAPPart().getEnvelope();
-            return new DOMSource(se);
+            if (!parsedMessage) {
+                SOAPEnvelope se = sm.getSOAPPart().getEnvelope();
+                return new DOMSource(se);
+
+            } else {
+                SOAPMessage msg = soapVersion.saajMessageFactory.createMessage();
+                SOAPBody newBody = msg.getSOAPPart().getEnvelope().getBody();
+                for (Element part : bodyParts) {
+                    Node n = newBody.getOwnerDocument().importNode(part, true);
+                    newBody.appendChild(n);
+                }
+                for (Header header : headers) {
+                    header.writeTo(msg);
+                }
+                SOAPEnvelope se = msg.getSOAPPart().getEnvelope();
+                return new DOMSource(se);
+            }
         } catch (SOAPException e) {
             throw new WebServiceException(e);
         }
     }
 
-    /**
-     * Returns the payload as a {@link javax.xml.transform.Source} object.
-     *
-     * Can't really give all the body parts inside soapenv:Body as Source
-     * cant take only one part.
-     *
-     * <p/>
-     * This consumes the message.
-     */
+    public SOAPMessage readAsSOAPMessage() throws SOAPException {
+        if (!parsedMessage) {
+            return sm;
+        } else {
+            SOAPMessage msg = soapVersion.saajMessageFactory.createMessage();
+            SOAPBody newBody = msg.getSOAPPart().getEnvelope().getBody();
+            for (Element part : bodyParts) {
+                Node n = newBody.getOwnerDocument().importNode(part, true);
+                newBody.appendChild(n);
+            }
+            for (Header header : headers) {
+                header.writeTo(msg);
+            }
+            for (Attachment att : getAttachments()) {
+                AttachmentPart part = msg.createAttachmentPart();
+                part.setDataHandler(att.asDataHandler());
+                part.setContentId('<' + att.getContentId() + '>');
+                msg.addAttachmentPart(part);
+            }
+            msg.saveChanges();
+            return msg;
+        }
+    }
+
     public Source readPayloadAsSource() {
+        access();
         return (payload != null) ? new DOMSource(payload) : null;
     }
 
-    /**
-     * Creates the equivalent {@link javax.xml.soap.SOAPMessage} from this message.
-     * <p/>
-     * This consumes the message.
-     */
-    public SOAPMessage readAsSOAPMessage() {
-        return sm;
-    }
-
-    public SOAPMessage readAsSOAPMessage(Packet packet, boolean inbound) throws SOAPException {
-        return sm;
-    }
-
-    /**
-     * Reads the payload as a JAXB object by using the given unmarshaller.
-     * <p/>
-     * This consumes the message.
-     */
     public <T> T readPayloadAsJAXB(Unmarshaller unmarshaller) throws JAXBException {
-        try {
-            Node pn = sm.getSOAPBody().getFirstChild();
-            if (pn != null)
-                return (T) unmarshaller.unmarshal(pn);
-            return null;
-        } catch (SOAPException e) {
-            throw new WebServiceException(e);
+        access();
+        if (payload != null) {
+            if(hasAttachments())
+                unmarshaller.setAttachmentUnmarshaller(new AttachmentUnmarshallerImpl(getAttachments()));
+            return (T) unmarshaller.unmarshal(payload);
+
         }
+        return null;
     }
 
     public <T> T readPayloadAsJAXB(Bridge<T> bridge) throws JAXBException {
-        try {
-            Node pn = sm.getSOAPBody().getFirstChild();
-            if (pn != null)
-                return bridge.unmarshal(pn,
-                    new AttachmentUnmarshallerImpl(getAttachments()));
-            return null;
-        } catch (SOAPException e) {
-            throw new WebServiceException(e);
-        }
+        access();
+        if (payload != null)
+            return bridge.unmarshal(payload,hasAttachments()? new AttachmentUnmarshallerImpl(getAttachments()) : null);
+        return null;
     }
 
-    /**
-     * Reads the payload as a {@link javax.xml.stream.XMLStreamReader}
-     * <p/>
-     * This consumes the message.
-     */
     public XMLStreamReader readPayload() throws XMLStreamException {
-        if(payload==null)
-            return null;
-
-        DOMStreamReader dss = new DOMStreamReader();
-        dss.setCurrentNode(payload);
-        dss.nextTag();
-        assert dss.getEventType()==XMLStreamReader.START_ELEMENT;
-        return dss;
+        access();
+        if (payload != null) {
+            DOMStreamReader dss = new DOMStreamReader();
+            dss.setCurrentNode(payload);
+            dss.nextTag();
+            assert dss.getEventType() == XMLStreamReader.START_ELEMENT;
+            return dss;
+        }
+        return null;
     }
 
-    /**
-     * Writes the payload to StAX.
-     * <p/>
-     * This method writes just the payload of the message to the writer.
-     * This consumes the message.
-     */
-    public void writePayloadTo(XMLStreamWriter sw) {
+    public void writePayloadTo(XMLStreamWriter sw) throws XMLStreamException {
+        access();
         try {
-            for(Element part: bodyParts)
+            for (Element part : bodyParts)
                 DOMUtil.serializeNode(part, sw);
         } catch (XMLStreamException e) {
             throw new WebServiceException(e);
         }
     }
 
+    public void writeTo(XMLStreamWriter writer) throws XMLStreamException {
+        try {
+            writer.writeStartDocument();
+            if (!parsedMessage) {
+                DOMUtil.serializeNode(sm.getSOAPPart().getEnvelope(), writer);
+            } else {
+                SOAPEnvelope env = sm.getSOAPPart().getEnvelope();
+                DOMUtil.writeTagWithAttributes(env, writer);
+                if (hasHeaders()) {
+                    writer.writeStartElement(env.getPrefix(), "Header", env.getNamespaceURI());
+                    int len = headers.size();
+                    for (int i = 0; i < len; i++) {
+                        headers.get(i).writeTo(writer);
+                    }
+                    writer.writeEndElement();
+                }
+
+                DOMUtil.serializeNode(sm.getSOAPBody(), writer);
+                writer.writeEndElement();
+            }
+            writer.writeEndDocument();
+            writer.flush();
+        } catch (SOAPException ex) {
+            throw new XMLStreamException2(ex);
+            //for now. ask jaxws team what to do.
+        }
+    }
+
     public void writeTo(ContentHandler contentHandler, ErrorHandler errorHandler) throws SAXException {
+        String soapNsUri = soapVersion.nsUri;
+        if (!parsedMessage) {
+            DOMScanner ds = new DOMScanner();
+            ds.setContentHandler(contentHandler);
+            ds.scan(sm.getSOAPPart());
+        } else {
+            contentHandler.setDocumentLocator(NULL_LOCATOR);
+            contentHandler.startDocument();
+            contentHandler.startPrefixMapping("S", soapNsUri);
+            contentHandler.startElement(soapNsUri, "Envelope", "S:Envelope", EMPTY_ATTS);
+            if (hasHeaders()) {
+                contentHandler.startElement(soapNsUri, "Header", "S:Header", EMPTY_ATTS);
+                HeaderList headers = getHeaders();
+                int len = headers.size();
+                for (int i = 0; i < len; i++) {
+                    // shouldn't JDK be smart enough to use array-style indexing for this foreach!?
+                    headers.get(i).writeTo(contentHandler, errorHandler);
+                }
+                contentHandler.endElement(soapNsUri, "Header", "S:Header");
+            }
+            // write the body
+            contentHandler.startElement(soapNsUri, "Body", "S:Body", EMPTY_ATTS);
+            writePayloadTo(contentHandler, errorHandler, true);
+            contentHandler.endElement(soapNsUri, "Body", "S:Body");
+            contentHandler.endElement(soapNsUri, "Envelope", "S:Envelope");
+        }
+    }
+
+    private void writePayloadTo(ContentHandler contentHandler, ErrorHandler errorHandler, boolean fragment) throws SAXException {
+        if(fragment)
+            contentHandler = new FragmentContentHandler(contentHandler);
         DOMScanner ds = new DOMScanner();
         ds.setContentHandler(contentHandler);
-        ds.scan(sm.getSOAPPart());
+        ds.scan(payload);
     }
 
     /**
@@ -308,23 +381,27 @@ public class SAAJMessage extends Message {
      */
     public Message copy() {
         try {
-            SOAPBody sb = sm.getSOAPPart().getEnvelope().getBody();
-            SOAPMessage msg = SOAPVersion.fromNsUri(sb.getNamespaceURI()).saajMessageFactory.createMessage();
-            SOAPBody newBody = msg.getSOAPPart().getEnvelope().getBody();
-            for(Element part: bodyParts){
-                Node n = newBody.getOwnerDocument().importNode(part, true);
-                newBody.appendChild(n);
+            if (!parsedMessage) {
+                return new SAAJMessage(readAsSOAPMessage());
+            } else {
+                SOAPMessage msg = soapVersion.saajMessageFactory.createMessage();
+                SOAPBody newBody = msg.getSOAPPart().getEnvelope().getBody();
+                for (Element part : bodyParts) {
+                    Node n = newBody.getOwnerDocument().importNode(part, true);
+                    newBody.appendChild(n);
+                }
+                return new SAAJMessage(getHeaders(), getAttachments(), msg);
             }
-            return new SAAJMessage(getHeaders(), getAttachments(), msg);
         } catch (SOAPException e) {
             throw new WebServiceException(e);
         }
     }
-
+    private static final AttributesImpl EMPTY_ATTS = new AttributesImpl();
+    private static final LocatorImpl NULL_LOCATOR = new LocatorImpl();
 
     private class SAAJAttachment implements Attachment {
 
-        AttachmentPart ap;
+        final AttachmentPart ap;
 
         public SAAJAttachment(AttachmentPart part) {
             this.ap = part;
@@ -475,30 +552,4 @@ public class SAAJMessage extends Message {
         }
     }
 
-
-    public void writeTo( XMLStreamWriter writer ) throws XMLStreamException {
-        try {
-            writer.writeStartDocument();
-            SOAPEnvelope env = sm.getSOAPPart().getEnvelope();
-            DOMUtil.writeTagWithAttributes(env, writer);
-            if(hasHeaders()) {
-                writer.writeStartElement(env.getPrefix(),"Header",env.getNamespaceURI());
-                int len = headers.size();
-                for( int i=0; i<len; i++ ) {
-                    headers.get(i).writeTo(writer);
-                }
-                writer.writeEndElement();
-            }
-
-            DOMUtil.serializeNode(sm.getSOAPBody(),writer);
-            writer.writeEndElement();
-            writer.writeEndDocument();
-            writer.flush();
-        } catch (SOAPException ex) {
-            throw new XMLStreamException2(ex);
-            //for now. ask jaxws team what to do.
-        }
-
-    }
-
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java
index 777d93bd513..33e97ab5a3d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java
@@ -28,6 +28,7 @@ package com.sun.xml.internal.ws.message.stream;
 import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.util.ByteArrayDataSource;
 import com.sun.xml.internal.ws.util.ByteArrayBuffer;
+import com.sun.xml.internal.ws.encoding.DataSourceStreamingDataHandler;
 
 import javax.activation.DataHandler;
 import javax.xml.transform.Source;
@@ -77,7 +78,7 @@ public class StreamAttachment implements Attachment {
     }
 
     public DataHandler asDataHandler() {
-        return new DataHandler(new ByteArrayDataSource(data,0,len,getContentType()));
+        return new DataSourceStreamingDataHandler(new ByteArrayDataSource(data,0,len,getContentType()));
     }
 
     public Source asSource() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java
index 49ff57843cc..a1451ae5859 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java
@@ -181,8 +181,10 @@ public abstract class StreamHeader extends AbstractHeaderImpl {
     }
 
     public void writeTo(XMLStreamWriter w) throws XMLStreamException {
-        // TODO what about in-scope namespaces
-        _mark.writeToXMLStreamWriter(w);
+        if(_mark.getInscopeNamespaces().size() > 0)
+            _mark.writeToXMLStreamWriter(w,true);
+        else
+            _mark.writeToXMLStreamWriter(w);
     }
 
     public void writeTo(SOAPMessage saaj) throws SOAPException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java
index 9fd530fd8f6..851d97ad37a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java
@@ -61,10 +61,10 @@ public class StreamHeader11 extends StreamHeader {
             final String namespaceURI = reader.getAttributeNamespace(i);
             final String value = reader.getAttributeValue(i);
 
-            if (namespaceURI == SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE) {
-                if (localName == SOAP_1_1_MUST_UNDERSTAND) {
+            if (SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(namespaceURI)) {
+                if (SOAP_1_1_MUST_UNDERSTAND.equals(localName)) {
                     _isMustUnderstand = Util.parseBool(value);
-                } else if (localName == SOAP_1_1_ROLE) {
+                } else if (SOAP_1_1_ROLE.equals(localName)) {
                     if (value != null && value.length() > 0) {
                         _role = value;
                     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java
index 7d8bc4a64ce..642813ad0e7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java
@@ -63,14 +63,14 @@ public class StreamHeader12 extends StreamHeader {
             final String namespaceURI = reader.getAttributeNamespace(i);
             final String value = reader.getAttributeValue(i);
 
-            if (namespaceURI == SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE) {
-                if (localName == SOAP_1_2_MUST_UNDERSTAND) {
+            if (SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(namespaceURI)) {
+                if (SOAP_1_2_MUST_UNDERSTAND.equals(localName)) {
                     _isMustUnderstand = Util.parseBool(value);
-                } else if (localName == SOAP_1_2_ROLE) {
+                } else if (SOAP_1_2_ROLE.equals(localName)) {
                     if (value != null && value.length() > 0) {
                         _role = value;
                     }
-                } else if (localName == SOAP_1_2_RELAY) {
+                } else if (SOAP_1_2_RELAY.equals(localName)) {
                     _isRelay = Util.parseBool(value);
                 }
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java
index 2659fad5b98..1fea66a175c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java
@@ -47,18 +47,19 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.NamespaceSupport;
 
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.*;
 import static javax.xml.stream.XMLStreamConstants.START_DOCUMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Source;
 import javax.xml.ws.WebServiceException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
 
 /**
  * {@link Message} implementation backed by {@link XMLStreamReader}.
@@ -190,11 +191,40 @@ public final class StreamMessage extends AbstractMessageImpl {
     public Source readPayloadAsSource() {
         if(hasPayload()) {
             assert unconsumed();
-            return new StAXSource(reader, true);
+            return new StAXSource(reader, true, getInscopeNamespaces());
         } else
             return null;
     }
 
+    /**
+     * There is no way to enumerate inscope namespaces for XMLStreamReader. That means
+     * namespaces declared in envelope, and body tags need to be computed using their
+     * {@link TagInfoset}s.
+     *
+     * @return array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }
+     */
+    private String[] getInscopeNamespaces() {
+        NamespaceSupport nss = new NamespaceSupport();
+
+        nss.pushContext();
+        for(int i=0; i < envelopeTag.ns.length; i+=2) {
+            nss.declarePrefix(envelopeTag.ns[i], envelopeTag.ns[i+1]);
+        }
+
+        nss.pushContext();
+        for(int i=0; i < bodyTag.ns.length; i+=2) {
+            nss.declarePrefix(bodyTag.ns[i], bodyTag.ns[i+1]);
+        }
+
+        List<String> inscope = new ArrayList<String>();
+        for( Enumeration en = nss.getPrefixes(); en.hasMoreElements(); ) {
+            String prefix = (String)en.nextElement();
+            inscope.add(prefix);
+            inscope.add(nss.getURI(prefix));
+        }
+        return inscope.toArray(new String[inscope.size()]);
+    }
+
     public Object readPayloadAsJAXB(Unmarshaller unmarshaller) throws JAXBException {
         if(!hasPayload())
             return null;
@@ -206,6 +236,7 @@ public final class StreamMessage extends AbstractMessageImpl {
             return unmarshaller.unmarshal(reader);
         } finally{
             unmarshaller.setAttachmentUnmarshaller(null);
+            XMLStreamReaderUtil.readRest(reader);
             XMLStreamReaderUtil.close(reader);
             XMLStreamReaderFactory.recycle(reader);
         }
@@ -217,6 +248,7 @@ public final class StreamMessage extends AbstractMessageImpl {
         assert unconsumed();
         T r = bridge.unmarshal(reader,
             hasAttachments() ? new AttachmentUnmarshallerImpl(getAttachments()) : null);
+        XMLStreamReaderUtil.readRest(reader);
         XMLStreamReaderUtil.close(reader);
         XMLStreamReaderFactory.recycle(reader);
         return r;
@@ -225,6 +257,8 @@ public final class StreamMessage extends AbstractMessageImpl {
     @Override
     public void consume() {
         assert unconsumed();
+        XMLStreamReaderUtil.readRest(reader);
+        XMLStreamReaderUtil.close(reader);
         XMLStreamReaderFactory.recycle(reader);
     }
 
@@ -259,7 +293,8 @@ public final class StreamMessage extends AbstractMessageImpl {
                 break;
             conv.bridge(reader,writer);
         }
-        reader.close();
+        XMLStreamReaderUtil.readRest(reader);
+        XMLStreamReaderUtil.close(reader);
         XMLStreamReaderFactory.recycle(reader);
     }
 
@@ -322,7 +357,8 @@ public final class StreamMessage extends AbstractMessageImpl {
 
                 conv.bridge();
             }
-            reader.close();
+            XMLStreamReaderUtil.readRest(reader);
+            XMLStreamReaderUtil.close(reader);
             XMLStreamReaderFactory.recycle(reader);
         } catch (XMLStreamException e) {
             Location loc = e.getLocation();
@@ -346,17 +382,31 @@ public final class StreamMessage extends AbstractMessageImpl {
                 //the boolean value tells the first body part is written.
                 //based on this we do the right thing
                 StreamReaderBufferCreator c = new StreamReaderBufferCreator(xsb);
+
+                // preserving inscope namespaces from envelope, and body. Other option
+                // would be to create a filtering XMLStreamReader from reader+envelopeTag+bodyTag
+                c.storeElement(envelopeTag.nsUri, envelopeTag.localName, envelopeTag.prefix, envelopeTag.ns);
+                c.storeElement(bodyTag.nsUri, bodyTag.localName, bodyTag.prefix, bodyTag.ns);
+
+                // Loop all the way for multi payload case
                 while(reader.getEventType() != XMLStreamConstants.END_DOCUMENT){
                     String name = reader.getLocalName();
                     String nsUri = reader.getNamespaceURI();
                     if(name.equals("Body") && nsUri.equals(soapVersion.nsUri) || (reader.getEventType() == XMLStreamConstants.END_DOCUMENT))
                         break;
                     c.create(reader);
+                    // Skip whitespaces in between payload and </Body> or between elements
+                    if (reader.isWhiteSpace()) {
+                        XMLStreamReaderUtil.nextElementContent(reader);
+                    }
                 }
+                XMLStreamReaderUtil.readRest(reader);
+                XMLStreamReaderUtil.close(reader);
                 XMLStreamReaderFactory.recycle(reader);
 
                 reader = xsb.readAsXMLStreamReader();
                 clone = xsb.readAsXMLStreamReader();
+
                 // advance to the start tag of the first element
                 proceedToRootElement(reader);
                 proceedToRootElement(clone);
@@ -375,6 +425,8 @@ public final class StreamMessage extends AbstractMessageImpl {
     private void proceedToRootElement(XMLStreamReader xsr) throws XMLStreamException {
         assert xsr.getEventType()==START_DOCUMENT;
         xsr.nextTag();
+        xsr.nextTag();
+        xsr.nextTag();
         assert xsr.getEventType()==START_ELEMENT;
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java
index 8a52414b4c2..6b6da0d7ad6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java
@@ -28,6 +28,7 @@ import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.bind.api.Bridge;
 import com.sun.xml.internal.bind.api.JAXBRIContext;
 import com.sun.xml.internal.bind.api.TypeReference;
+import com.sun.xml.internal.ws.api.model.JavaMethod;
 import com.sun.xml.internal.ws.api.model.ParameterBinding;
 import com.sun.xml.internal.ws.api.model.SEIModel;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
@@ -40,24 +41,40 @@ import com.sun.xml.internal.ws.model.wsdl.WSDLPartImpl;
 import com.sun.xml.internal.ws.model.wsdl.WSDLPortImpl;
 import com.sun.xml.internal.ws.resources.ModelerMessages;
 import com.sun.xml.internal.ws.util.Pool;
+import com.sun.xml.internal.ws.developer.UsesJAXBContextFeature;
+import com.sun.xml.internal.ws.developer.JAXBContextFactory;
+import com.sun.xml.internal.ws.binding.WebServiceFeatureList;
 
 import javax.jws.WebParam.Mode;
+import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.namespace.QName;
 import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
 import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * model of the web service.  Used by the runtime marshall/unmarshall
  * web service invocations
  *
- * $author: JAXWS Development Team
+ * @author JAXWS Development Team
  */
 public abstract class AbstractSEIModelImpl implements SEIModel {
 
+    protected AbstractSEIModelImpl(WebServiceFeature[] features) {
+        this.features = features;
+    }
+
     void postProcess() {
         // should be called only once.
         if (jaxbContext != null)
@@ -111,22 +128,24 @@ public abstract class AbstractSEIModelImpl implements SEIModel {
 
     private JAXBRIContext createJAXBContext() {
         final List<TypeReference> types = getAllTypeReferences();
-        final Class[] cls = new Class[types.size() + additionalClasses.size()];
-        int i = 0;
-        for(Class additionalClass:additionalClasses){
-            cls[i++] = additionalClass;
-        }
+        final List<Class> cls = new ArrayList<Class>(types.size() + additionalClasses.size());
 
-        for (TypeReference type : types) {
-            cls[i++] = (Class) type.type;
-        }
+        cls.addAll(additionalClasses);
+        for (TypeReference type : types)
+            cls.add((Class) type.type);
 
         try {
             //jaxbContext = JAXBRIContext.newInstance(cls, types, targetNamespace, false);
             // Need to avoid doPriv block once JAXB is fixed. Afterwards, use the above
             jaxbContext = AccessController.doPrivileged(new PrivilegedExceptionAction<JAXBRIContext>() {
                 public JAXBRIContext run() throws Exception {
-                    return JAXBRIContext.newInstance(cls, types, null, targetNamespace, false, null);
+                    if(LOGGER.isLoggable(Level.FINE)) {
+                        LOGGER.log(Level.FINE,"Creating JAXBContext with classes="+cls+" and types="+types);
+                    }
+                    UsesJAXBContextFeature f = WebServiceFeatureList.getFeature(features, UsesJAXBContextFeature.class);
+                    JAXBContextFactory factory = f!=null ? f.getFactory() : null;
+                    if(factory==null)   factory=JAXBContextFactory.DEFAULT;
+                    return factory.createJAXBContext(AbstractSEIModelImpl.this,cls,types);
                 }
             });
             createBridgeMap(types);
@@ -222,7 +241,10 @@ public abstract class AbstractSEIModelImpl implements SEIModel {
 
     /**
      * @return the <code>QName</code> associated with the
-     * JavaMethod jm
+     * JavaMethod jm.
+     *
+     * @deprecated
+     *      Use {@link JavaMethod#getOperationName()}.
      */
     public QName getQNameForJM(JavaMethodImpl jm) {
         for (QName key : nameToJM.keySet()) {
@@ -462,13 +484,12 @@ public abstract class AbstractSEIModelImpl implements SEIModel {
     }
 
     /**
-     * Sets additional classes obtained from {@link javax.xml.bind.annotation.XmlSeeAlso} annotation. In starting
+     * Adds additional classes obtained from {@link XmlSeeAlso} annotation. In starting
      * from wsdl case these classes would most likely be JAXB ObjectFactory that references other classes.
      */
-    public void setAdditionalClasses(Class[] additionalClasses) {
-        for(Class cls:additionalClasses){
+    public void addAdditionalClasses(Class... additionalClasses) {
+        for(Class cls : additionalClasses)
             this.additionalClasses.add(cls);
-        }
     }
 
     private List<Class> additionalClasses = new ArrayList<Class>();
@@ -480,6 +501,9 @@ public abstract class AbstractSEIModelImpl implements SEIModel {
     private QName portName;
     private QName portTypeName;
     private Map<Method,JavaMethodImpl> methodToJM = new HashMap<Method, JavaMethodImpl>();
+    /**
+     * Payload QName to the method that handles it.
+     */
     private Map<QName,JavaMethodImpl> nameToJM = new HashMap<QName, JavaMethodImpl>();
     private List<JavaMethodImpl> javaMethods = new ArrayList<JavaMethodImpl>();
     private final Map<TypeReference, Bridge> bridgeMap = new HashMap<TypeReference, Bridge>();
@@ -487,4 +511,7 @@ public abstract class AbstractSEIModelImpl implements SEIModel {
     private String targetNamespace = "";
     private List<String> knownNamespaceURIs = null;
     private WSDLPortImpl port;
+    private final WebServiceFeature[] features;
+
+    private static final Logger LOGGER = Logger.getLogger(AbstractSEIModelImpl.class.getName());
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java
new file mode 100644
index 00000000000..57f4e11dea6
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.model;
+
+import java.util.*;
+import java.util.logging.Logger;
+import java.lang.reflect.*;
+
+/**
+ * Creates vm signature string from Type
+ *
+ * TypeSignature: Z | C | B | S | I | F | J | D | FieldTypeSignature
+ * FieldTypeSignature: ClassTypeSignature | [ TypeSignature | TypeVar
+ * ClassTypeSignature: L Id ( / Id )* TypeArgs? ( . Id TypeArgs? )* ;
+ * TypeArgs: < TypeArg+ >
+ * TypeArg: * | ( + | - )? FieldTypeSignature
+ * TypeVar: T Id ;
+ *
+ * @author Jitendra Kotamraju
+ */
+public class FieldSignature {
+
+    static String vms(Type t) {
+        if (t instanceof Class || t instanceof ParameterizedType) {
+            return "L"+fqcn(t)+";";
+        } else if (t instanceof GenericArrayType) {
+            return "["+vms(((GenericArrayType)t).getGenericComponentType());
+        } else if (t instanceof TypeVariable) {
+            // While creating wrapper bean fields, it doesn't create with TypeVariables
+            // Otherwise, the type variable need to be declared in the wrapper bean class
+            // return "T"+((TypeVariable)t).getName()+";";
+            return "Ljava/lang/Object;";        // TODO bounds ??
+        } else if (t instanceof WildcardType) {
+            WildcardType w = (WildcardType)t;
+            if (w.getLowerBounds().length > 0) {
+                return "-"+vms(w.getLowerBounds()[0]);
+            } else if (w.getUpperBounds().length > 0) {
+                Type wt = w.getUpperBounds()[0];
+                if (wt.equals(Object.class)) {
+                    return "*";
+                } else {
+                    return "+"+vms(wt);
+                }
+            }
+        }
+        throw new IllegalArgumentException("Illegal vms arg " + t);
+    }
+
+    private static String fqcn(Type t) {
+        if (t instanceof Class) {
+            Class c = (Class)t;
+            if (c.getDeclaringClass() == null) {
+                return c.getName().replace('.', '/');
+            } else {
+                return fqcn(c.getDeclaringClass())+"."+c.getSimpleName();
+            }
+        } else if (t instanceof ParameterizedType) {
+            ParameterizedType p = (ParameterizedType)t;
+            if (p.getOwnerType() == null) {
+                return fqcn(p.getRawType())+args(p);
+            } else {
+                assert p.getRawType() instanceof Class;
+                return fqcn(p.getOwnerType())+"."+
+                        ((Class)p.getRawType()).getSimpleName()+args(p);
+            }
+        }
+        throw new IllegalArgumentException("Illegal fqcn arg = "+t);
+    }
+
+    private static String args(ParameterizedType p) {
+        String sig = "<";
+        for(Type t : p.getActualTypeArguments()) {
+            sig += vms(t);
+        }
+        return sig+">";
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/Injector.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/Injector.java
new file mode 100644
index 00000000000..76aa0338f2f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/Injector.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.model;
+
+import com.sun.xml.internal.bind.Util;
+import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+import java.util.Collections;
+import java.util.WeakHashMap;
+import java.util.HashMap;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * A {@link ClassLoader} used to "inject" optimized accessor classes
+ * into the VM.
+ *
+ * <p>
+ * Its parent class loader needs to be set to the one that can see the user
+ * class.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+final class Injector {
+
+    /**
+     * {@link Injector}s keyed by their parent {@link ClassLoader}.
+     *
+     * We only need one injector per one user class loader.
+     */
+    private static final Map<ClassLoader,WeakReference<Injector>> injectors =
+        Collections.synchronizedMap(new WeakHashMap<ClassLoader,WeakReference<Injector>>());
+
+    private static final Logger logger = Util.getClassLogger();
+
+    /**
+     * Injects a new class into the given class loader.
+     *
+     * @return null
+     *      if it fails to inject.
+     */
+    static Class inject( ClassLoader cl, String className, byte[] image ) {
+        Injector injector = get(cl);
+        if(injector!=null)
+            return injector.inject(className,image);
+        else
+            return null;
+    }
+
+    /**
+     * Returns the already injected class, or null.
+     */
+    static Class find( ClassLoader cl, String className ) {
+        Injector injector = get(cl);
+        if(injector!=null)
+            return injector.find(className);
+        else
+            return null;
+    }
+
+    /**
+     * Gets or creates an {@link Injector} for the given class loader.
+     *
+     * @return null
+     *      if it fails.
+     */
+    private static Injector get(ClassLoader cl) {
+        Injector injector = null;
+        WeakReference<Injector> wr = injectors.get(cl);
+        if(wr!=null)
+            injector = wr.get();
+        if(injector==null)
+            try {
+                injectors.put(cl,new WeakReference<Injector>(injector = new Injector(cl)));
+            } catch (SecurityException e) {
+                logger.log(Level.FINE,"Unable to set up a back-door for the injector",e);
+                return null;
+            }
+        return injector;
+    }
+
+    /**
+     * Injected classes keyed by their names.
+     */
+    private final Map<String,Class> classes = new HashMap<String,Class>();
+
+    private final ClassLoader parent;
+
+    /**
+     * True if this injector is capable of injecting accessors.
+     * False otherwise, which happens if this classloader can't see {@link com.sun.xml.internal.bind.v2.runtime.reflect.Accessor}.
+     */
+    private final boolean loadable;
+
+    private static final Method defineClass;
+    private static final Method resolveClass;
+
+    static {
+        try {
+            defineClass = ClassLoader.class.getDeclaredMethod("defineClass",String.class,byte[].class,Integer.TYPE,Integer.TYPE);
+            resolveClass = ClassLoader.class.getDeclaredMethod("resolveClass",Class.class);
+        } catch (NoSuchMethodException e) {
+            // impossible
+            throw new NoSuchMethodError(e.getMessage());
+        }
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            public Void run() {
+                // TODO: check security implication
+                // do these setAccessible allow anyone to call these methods freely?s
+                defineClass.setAccessible(true);
+                resolveClass.setAccessible(true);
+                return null;
+            }
+        });
+    }
+
+    private Injector(ClassLoader parent) {
+        this.parent = parent;
+        assert parent!=null;
+
+        boolean loadable = false;
+
+        try {
+            loadable = parent.loadClass(Accessor.class.getName())==Accessor.class;
+        } catch (ClassNotFoundException e) {
+            ; // not loadable
+        }
+
+        this.loadable = loadable;
+    }
+
+
+    private synchronized Class inject(String className, byte[] image) {
+        if(!loadable)   // this injector cannot inject anything
+            return null;
+
+        Class c = classes.get(className);
+        if(c==null) {
+            // we need to inject a class into the
+            try {
+                c = (Class)defineClass.invoke(parent,className.replace('/','.'),image,0,image.length);
+                resolveClass.invoke(parent,c);
+            } catch (IllegalAccessException e) {
+                logger.log(Level.FINE,"Unable to inject "+className,e);
+                return null;
+            } catch (InvocationTargetException e) {
+                logger.log(Level.FINE,"Unable to inject "+className,e);
+                return null;
+            } catch (SecurityException e) {
+                logger.log(Level.FINE,"Unable to inject "+className,e);
+                return null;
+            } catch (LinkageError e) {
+                logger.log(Level.FINE,"Unable to inject "+className,e);
+                return null;
+            }
+            classes.put(className,c);
+        }
+        return c;
+    }
+
+    private synchronized Class find(String className) {
+        return classes.get(className);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java
index 127ee87e2ba..54e63bed484 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java
@@ -24,6 +24,7 @@
  */
 package com.sun.xml.internal.ws.model;
 
+import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.bind.api.TypeReference;
 import com.sun.xml.internal.ws.api.model.JavaMethod;
 import com.sun.xml.internal.ws.api.model.MEP;
@@ -32,7 +33,7 @@ import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
 import com.sun.xml.internal.ws.model.soap.SOAPBindingImpl;
 import com.sun.xml.internal.ws.model.wsdl.WSDLBoundOperationImpl;
 import com.sun.xml.internal.ws.model.wsdl.WSDLPortImpl;
-import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.Action;
@@ -47,6 +48,7 @@ import java.util.List;
  * @author Vivek Pandey
  */
 public final class JavaMethodImpl implements JavaMethod {
+
     private String inputAction;
     private String outputAction;
     private final List<CheckedExceptionImpl> exceptions = new ArrayList<CheckedExceptionImpl>();
@@ -161,6 +163,20 @@ public final class JavaMethodImpl implements JavaMethod {
         return operationName+"Response";
     }
 
+    /**
+     * @return soap:Body's first child name for request message.
+     */
+    public @Nullable QName getRequestPayloadName() {
+        return wsdlOperation.getReqPayloadName();
+    }
+
+    /**
+     * @return soap:Body's first child name for response message.
+     */
+    public @Nullable QName getResponsePayloadName() {
+        return (mep == MEP.ONE_WAY) ? null : wsdlOperation.getResPayloadName();
+    }
+
     /**
      * @return returns unmodifiable list of request parameters
      */
@@ -252,14 +268,6 @@ public final class JavaMethodImpl implements JavaMethod {
         return null;
     }
 
-    public QName getPayloadName(){
-        if(payloadName != null)
-            return payloadName;
-        payloadName = wsdlOperation.getPayloadName();
-        return payloadName;
-    }
-
-    private QName payloadName;
 
     /**
      * @return a list of checked Exceptions thrown by this method
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java
index 9502b5ebe24..e09ecaa0d19 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java
@@ -35,10 +35,12 @@ import com.sun.xml.internal.ws.api.model.MEP;
 import com.sun.xml.internal.ws.api.model.Parameter;
 import com.sun.xml.internal.ws.api.model.ParameterBinding;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPart;
+import com.sun.xml.internal.ws.model.soap.SOAPBindingImpl;
 import com.sun.xml.internal.ws.model.wsdl.WSDLBoundOperationImpl;
-import com.sun.xml.internal.ws.model.wsdl.WSDLPortImpl;
 import com.sun.xml.internal.ws.model.wsdl.WSDLInputImpl;
+import com.sun.xml.internal.ws.model.wsdl.WSDLPortImpl;
 import com.sun.xml.internal.ws.resources.ModelerMessages;
+import com.sun.xml.internal.ws.resources.ServerMessages;
 import com.sun.xml.internal.ws.util.localization.Localizable;
 
 import javax.jws.Oneway;
@@ -48,17 +50,11 @@ import javax.jws.WebParam.Mode;
 import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
+import static javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED;
 import javax.jws.soap.SOAPBinding.Style;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Action;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.Response;
-import javax.xml.ws.ResponseWrapper;
-import javax.xml.ws.WebFault;
+import javax.xml.ws.*;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -72,6 +68,7 @@ import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.concurrent.Future;
+import java.util.logging.Logger;
 
 /**
  * Creates a runtime model of a SEI (portClass).
@@ -79,10 +76,11 @@ import java.util.concurrent.Future;
  * @author WS Developement Team
  */
 public class RuntimeModeler {
+    private final WebServiceFeature[] features;
     private BindingID bindingId;
     private Class portClass;
     private AbstractSEIModelImpl model;
-    private com.sun.xml.internal.ws.model.soap.SOAPBindingImpl defaultBinding;
+    private SOAPBindingImpl defaultBinding;
     // can be empty but never null
     private String packageName;
     private String targetNamespace;
@@ -118,10 +116,15 @@ public class RuntimeModeler {
      * @param bindingId The binding identifier to be used when modeling the <code>portClass</code>.
      */
     public RuntimeModeler(@NotNull Class portClass, @NotNull QName serviceName, @NotNull BindingID bindingId) {
+        this(portClass, serviceName, bindingId, new WebServiceFeature[0]);
+    }
+
+    public RuntimeModeler(@NotNull Class portClass, @NotNull QName serviceName, @NotNull BindingID bindingId, @NotNull WebServiceFeature... features) {
         this.portClass = portClass;
         this.serviceName = serviceName;
         this.binding = null;
         this.bindingId = bindingId;
+        this.features = features;
     }
 
     /**
@@ -131,18 +134,12 @@ public class RuntimeModeler {
      * @param serviceName The ServiceName to use instead of one calculated from the implementation class
      * @param wsdlPort {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLPort}
      */
-    public RuntimeModeler(@NotNull Class sei, @NotNull QName serviceName, @NotNull WSDLPortImpl wsdlPort){
+    public RuntimeModeler(@NotNull Class sei, @NotNull QName serviceName, @NotNull WSDLPortImpl wsdlPort, @NotNull WebServiceFeature... features){
         this.portClass = sei;
         this.serviceName = serviceName;
         this.bindingId = wsdlPort.getBinding().getBindingId();
-
-        //If the bindingId is null lets default to SOAP 1.1 binding id. As it looks like this bindingId
-        //is used latter on from model to generate binding on the WSDL. So defaulting to SOAP 1.1 maybe
-        // safe to do.
-        if(this.bindingId == null)
-            this.bindingId = BindingID.SOAP11_HTTP;
-
         this.binding = wsdlPort;
+        this.features = features;
     }
 
     /**
@@ -186,6 +183,10 @@ public class RuntimeModeler {
         });
     }
 
+    private static final Logger logger =
+        Logger.getLogger(
+            com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".server");
+
     //currently has many local vars which will be eliminated after debugging issues
     //first draft
     /**
@@ -193,7 +194,7 @@ public class RuntimeModeler {
      * @return the runtime model for the <code>portClass</code>.
      */
     public AbstractSEIModelImpl buildRuntimeModel() {
-        model = new SOAPSEIModel();
+        model = new SOAPSEIModel(features);
         Class clazz = portClass;
         WebService webService = getPrivClassAnnotation(portClass, WebService.class);
         if (webService == null) {
@@ -207,6 +208,15 @@ public class RuntimeModeler {
                 throw new RuntimeModelerException("runtime.modeler.endpoint.interface.no.webservice",
                     webService.endpointInterface());
             }
+
+            //check if @SOAPBinding is defined on the impl class
+            SOAPBinding sbPortClass = getPrivClassAnnotation(portClass, SOAPBinding.class);
+            SOAPBinding sbSei = getPrivClassAnnotation(clazz, SOAPBinding.class);
+            if(sbPortClass != null){
+                if(sbSei == null || sbSei.style() != sbPortClass.style()|| sbSei.use() != sbPortClass.use()){
+                    logger.warning(ServerMessages.RUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL("@SOAPBinding", portClass.getName(), clazz.getName()));
+                }
+            }
         }
         if (serviceName == null)
             serviceName = getServiceName(portClass);
@@ -260,6 +270,46 @@ public class RuntimeModeler {
         }
     }
 
+    private Class getRequestWrapperClass(String className, Method method, QName reqElemName) {
+        ClassLoader loader =  (classLoader == null) ? Thread.currentThread().getContextClassLoader() : classLoader;
+        try {
+            return loader.loadClass(className);
+        } catch (ClassNotFoundException e) {
+            if (generateWrapperBeans) {
+                logger.info("Dynamically creating request wrapper Class " + className);
+                return WrapperBeanGenerator.createRequestWrapperBean(className, method, reqElemName, loader);
+            }
+            throw new RuntimeModelerException(e);
+        }
+    }
+
+    private Class getResponseWrapperClass(String className, Method method, QName resElemName) {
+        ClassLoader loader =  (classLoader == null) ? Thread.currentThread().getContextClassLoader() : classLoader;
+        try {
+            return loader.loadClass(className);
+        } catch (ClassNotFoundException e) {
+            if (generateWrapperBeans) {
+                logger.info("Dynamically creating response wrapper bean Class " + className);
+                return WrapperBeanGenerator.createResponseWrapperBean(className, method, resElemName, loader);
+            }
+            throw new RuntimeModelerException(e);
+        }
+    }
+
+
+    private Class getExceptionBeanClass(String className, Class exception, String name, String namespace) {
+        ClassLoader loader =  (classLoader == null) ? Thread.currentThread().getContextClassLoader() : classLoader;
+        try {
+            return loader.loadClass(className);
+        } catch (ClassNotFoundException e) {
+            if (generateWrapperBeans) {
+                logger.info("Dynamically creating exception bean Class " + className);
+                return WrapperBeanGenerator.createExceptionBean(className, exception, targetNamespace, name, namespace, loader);
+            }
+            throw new RuntimeModelerException(e);
+        }
+    }
+
     protected void setUsesWebMethod(Class clazz, Boolean usesWebMethod) {
 //        System.out.println("class: "+clazz.getName()+" uses WebMethod: "+usesWebMethod);
         classUsesWebMethod.put(clazz, usesWebMethod);
@@ -309,10 +359,9 @@ public class RuntimeModeler {
         model.setPortTypeName(portTypeName);
         model.setWSDLLocation(webService.wsdlLocation());
 
-        javax.jws.soap.SOAPBinding soapBinding = getPrivClassAnnotation(clazz, javax.jws.soap.SOAPBinding.class);
+        SOAPBinding soapBinding = getPrivClassAnnotation(clazz, SOAPBinding.class);
         if (soapBinding != null) {
-            isWrapped = soapBinding.parameterStyle().equals(
-                javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED);
+            isWrapped = soapBinding.parameterStyle()== WRAPPED;
         }
         defaultBinding = createBinding(soapBinding);
         /*
@@ -335,9 +384,17 @@ public class RuntimeModeler {
         }*/
 
         for (Method method : clazz.getMethods()) {
-            if (method.getDeclaringClass()==Object.class ||
-                !isWebMethod(method, clazz)) {
-                continue;
+            if (!clazz.isInterface()) {     // if clazz is SEI, then all methods are web methods
+                if (!legacyWebMethod) {
+                    if (!isWebMethodBySpec(method, clazz)) {
+                        continue;
+                    }
+                } else {
+                    if (method.getDeclaringClass()==Object.class ||
+                        !isWebMethod(method, clazz)) {
+                        continue;
+                    }
+                }
             }
             // TODO: binding can be null. We need to figure out how to post-process
             // RuntimeModel to link to WSDLModel
@@ -346,9 +403,48 @@ public class RuntimeModeler {
         //Add additional jaxb classes referenced by {@link XmlSeeAlso}
         XmlSeeAlso xmlSeeAlso = getPrivClassAnnotation(clazz, XmlSeeAlso.class);
         if(xmlSeeAlso != null)
-            model.setAdditionalClasses(xmlSeeAlso.value());
+            model.addAdditionalClasses(xmlSeeAlso.value());
     }
 
+    /*
+     * Section 3.3 of spec
+     * Otherwise, the class implicitly defines a service endpoint interface (SEI) which
+     * comprises all of the public methods that satisfy one of the following conditions:
+     *  1. They are annotated with the javax.jws.WebMethod annotation with the exclude element set to
+     *     false or missing (since false is the default for this annotation element).
+     *  2. They are not annotated with the javax.jws.WebMethod annotation but their declaring class has a
+     *     javax.jws.WebService annotation.
+     *
+     * also the method should non-static or non-final
+     */
+    private boolean isWebMethodBySpec(Method method, Class clazz) {
+
+        int modifiers = method.getModifiers();
+        boolean staticFinal = Modifier.isStatic(modifiers) || Modifier.isFinal(modifiers);
+
+        assert Modifier.isPublic(modifiers);
+        assert !clazz.isInterface();
+
+        WebMethod webMethod = getPrivMethodAnnotation(method, WebMethod.class);
+        if (webMethod != null) {
+            if (webMethod.exclude()) {
+                return false;       // @WebMethod(exclude="true")
+            }
+            if (staticFinal) {
+                throw new RuntimeModelerException(ModelerMessages.localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(method));
+            }
+            return true;            // @WebMethod
+        }
+
+        if (staticFinal) {
+            return false;
+        }
+
+        Class declClass = method.getDeclaringClass();
+        return getPrivClassAnnotation(declClass, WebService.class) != null;
+    }
+
+
     protected boolean isWebMethod(Method method, Class clazz) {
         if (clazz.isInterface()) {
             return true;
@@ -369,9 +465,8 @@ public class RuntimeModeler {
      * @param soapBinding the <code>javax.jws.soap.SOAPBinding</code> to model
      * @return returns the runtime model SOAPBinding corresponding to <code>soapBinding</code>
      */
-    protected com.sun.xml.internal.ws.model.soap.SOAPBindingImpl createBinding(javax.jws.soap.SOAPBinding soapBinding) {
-        com.sun.xml.internal.ws.model.soap.SOAPBindingImpl rtSOAPBinding =
-            new com.sun.xml.internal.ws.model.soap.SOAPBindingImpl();
+    protected SOAPBindingImpl createBinding(SOAPBinding soapBinding) {
+        SOAPBindingImpl rtSOAPBinding = new SOAPBindingImpl();
         Style style = soapBinding!=null ? soapBinding.style() : Style.DOCUMENT;
         rtSOAPBinding.setStyle(style);
         assert bindingId != null;
@@ -500,7 +595,7 @@ public class RuntimeModeler {
             if (action != null)
                 mySOAPBinding.setSOAPAction(action);
             methodIsWrapped = methodBinding.parameterStyle().equals(
-                javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED);
+                WRAPPED);
             javaMethod.setBinding(mySOAPBinding);
         } else {
             com.sun.xml.internal.ws.model.soap.SOAPBindingImpl sb = new com.sun.xml.internal.ws.model.soap.SOAPBindingImpl(defaultBinding);
@@ -567,8 +662,6 @@ public class RuntimeModeler {
             responseClassName = beanPackage + capitalize(method.getName()) + RESPONSE;
         }
 
-        Class requestClass = getClass(requestClassName, ModelerMessages.localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(requestClassName));
-
         String reqName = operationName;
         String reqNamespace = targetNamespace;
         if (reqWrapper != null) {
@@ -578,20 +671,22 @@ public class RuntimeModeler {
                 reqName = reqWrapper.localName();
         }
         QName reqElementName = new QName(reqNamespace, reqName);
+        Class requestClass = getRequestWrapperClass(requestClassName, method, reqElementName);
 
         Class responseClass = null;
         String resName = operationName+"Response";
         String resNamespace = targetNamespace;
+        QName resElementName = null;
         if (!isOneway) {
-            responseClass = getClass(responseClassName, ModelerMessages.localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(responseClassName));
             if (resWrapper != null) {
                 if (resWrapper.targetNamespace().length() > 0)
                     resNamespace = resWrapper.targetNamespace();
                 if (resWrapper.localName().length() > 0)
                     resName = resWrapper.localName();
             }
+            resElementName = new QName(resNamespace, resName);
+            responseClass = getResponseWrapperClass(responseClassName, method, resElementName);
         }
-        QName resElementName = new QName(resNamespace, resName);
 
         TypeReference typeRef =
                 new TypeReference(reqElementName, requestClass);
@@ -977,7 +1072,7 @@ public class RuntimeModeler {
                     namespace = webFault.targetNamespace();
             }
             if (faultInfoMethod == null)  {
-                exceptionBean = getClass(className, ModelerMessages.localizableRUNTIME_MODELER_WRAPPER_NOT_FOUND(className));
+                exceptionBean = getExceptionBeanClass(className, exception, name, namespace);
                 exceptionType = ExceptionType.UserDefined;
                 anns = exceptionBean.getAnnotations();
             } else {
@@ -1096,13 +1191,15 @@ public class RuntimeModeler {
             for (Annotation annotation : pannotations[pos]) {
                 if (annotation.annotationType() == javax.jws.WebParam.class) {
                     javax.jws.WebParam webParam = (javax.jws.WebParam) annotation;
+                    isHeader = webParam.header();
+                    if(isHeader)
+                        paramName = "arg"+pos;
                     if (webParam.name().length() > 0)
                         paramName = webParam.name();
                     partName = webParam.partName();
                     if (!webParam.targetNamespace().equals("")) {
                         requestNamespace = webParam.targetNamespace();
                     }
-                    isHeader = webParam.header();
                     paramMode = webParam.mode();
                     if (isHolder && paramMode == Mode.IN)
                         paramMode = Mode.INOUT;
@@ -1327,4 +1424,40 @@ public class RuntimeModeler {
         }
         return null;
     }
+
+    private static Boolean getProperty(final String prop) {
+        Boolean b = AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Boolean>() {
+                public Boolean run() {
+                    String value = System.getProperty(prop);
+                    return value != null ? Boolean.valueOf(value) : Boolean.FALSE;
+                }
+            }
+        );
+        return Boolean.FALSE;
+    }
+
+    /**
+     * Support for legacy WebMethod computation.
+     */
+    public static final boolean legacyWebMethod = getProperty(RuntimeModeler.class.getName()+".legacyWebMethod");
+
+
+    /**
+     * Controls whether wrapper beans should be generated dynamically.
+     *
+     * By default in JDK, they are not generated.
+     */
+    public static final boolean generateWrapperBeans;
+    static {
+        boolean wrapperGeneratorExists = false;
+        try {
+            Class.forName("com.sun.xml.internal." + "ws.model.WrapperBeanGenerator");
+            wrapperGeneratorExists = true;
+        } catch (ClassNotFoundException cnfe) {
+            wrapperGeneratorExists = getProperty(RuntimeModeler.class.getName()+".generateWrappers");
+        }
+        generateWrapperBeans = wrapperGeneratorExists;
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java
index 6ae27f4a7e4..8963818e581 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java
@@ -28,6 +28,7 @@ import com.sun.xml.internal.ws.api.model.ParameterBinding;
 
 import javax.jws.WebParam.Mode;
 import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceFeature;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -39,6 +40,10 @@ import java.util.Set;
  */
 public class SOAPSEIModel extends AbstractSEIModelImpl {
 
+    public SOAPSEIModel(WebServiceFeature[] features) {
+        super(features);
+    }
+
     @Override
     protected void populateMaps() {
         int emptyBodyCount = 0;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
new file mode 100644
index 00000000000..b6c0fd83526
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java
@@ -0,0 +1,659 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.model;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.bind.api.JAXBRIContext;
+import com.sun.xml.internal.ws.util.StringUtils;
+import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.*;
+import com.sun.xml.internal.ws.org.objectweb.asm.Type;
+import com.sun.xml.internal.ws.org.objectweb.asm.*;
+
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.xml.bind.annotation.XmlAttachmentRef;
+import javax.xml.bind.annotation.XmlList;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.ws.Holder;
+import javax.xml.ws.WebServiceException;
+import javax.xml.namespace.QName;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+/**
+ * Byte code generator for request,response wrapper and exception beans
+ *
+ * @author Jitendra Kotamraju
+ */
+public class WrapperBeanGenerator {
+
+    private static final Logger LOGGER = Logger.getLogger(WrapperBeanGenerator.class.getName());
+
+    public static final String PD                           = ".";
+    public static final String JAXWS                        = "jaxws";
+    public static final String JAXWS_PACKAGE_PD             = JAXWS+PD;
+    public static final String PD_JAXWS_PACKAGE_PD          = PD+JAXWS+PD;
+
+    // Creates class's bytes
+    private static byte[] createBeanImage(String className,
+                               String rootName, String rootNS,
+                               String typeName, String typeNS, String[] propOrder,
+                               List<Field> fields) throws Exception {
+
+        ClassWriter cw = new ClassWriter(0);
+        //org.objectweb.asm.util.TraceClassVisitor cw = new org.objectweb.asm.util.TraceClassVisitor(actual, new java.io.PrintWriter(System.out));
+
+        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, replaceDotWithSlash(className), null, "java/lang/Object", null);
+
+        AnnotationVisitor root = cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlRootElement;", true);
+        root.visit("name", rootName);
+        root.visit("namespace", rootNS);
+        root.visitEnd();
+
+        AnnotationVisitor type = cw.visitAnnotation("Ljavax/xml/bind/annotation/XmlType;", true);
+        type.visit("name", typeName);
+        type.visit("namespace", typeNS);
+        if (propOrder.length > 1) {
+            AnnotationVisitor propVisitor = type.visitArray("propOrder");
+            for(String prop : propOrder) {
+                propVisitor.visit("propOrder", prop);
+            }
+            propVisitor.visitEnd();
+        }
+        type.visitEnd();
+
+        for(Field field : fields) {
+            FieldVisitor fv = cw.visitField(ACC_PUBLIC, field.fieldName, field.asmType.getDescriptor(), field.getSignature(), null);
+
+            if (!field.noXmlElem) { // Exception fields do not have any @XmlElement
+                AnnotationVisitor elem = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlElement;", true);
+                elem.visit("name", field.elementName);
+                elem.visit("namespace", field.elementNS);
+                if (field.reflectType instanceof GenericArrayType) {
+                    elem.visit("nillable", true);
+                }
+                elem.visitEnd();
+            }
+
+            for(Annotation ann : field.jaxbAnnotations) {
+                if (ann instanceof XmlMimeType) {
+                    AnnotationVisitor mime = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlMimeType;", true);
+                    mime.visit("value", ((XmlMimeType)ann).value());
+                    mime.visitEnd();
+                } else if (ann instanceof XmlJavaTypeAdapter) {
+                    AnnotationVisitor ada = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlJavaTypeAdapter;", true);
+                    ada.visit("value", ((XmlJavaTypeAdapter)ann).value());
+                    ada.visit("type", ((XmlJavaTypeAdapter)ann).type());
+                    ada.visitEnd();
+                } else if (ann instanceof XmlAttachmentRef) {
+                    AnnotationVisitor att = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlAttachmentRef;", true);
+                    att.visitEnd();
+                } else if (ann instanceof XmlList) {
+                    AnnotationVisitor list = fv.visitAnnotation("Ljavax/xml/bind/annotation/XmlList;", true);
+                    list.visitEnd();
+                } else {
+                    throw new WebServiceException("Unknown JAXB annotation " + ann);
+                }
+            }
+
+            fv.visitEnd();
+        }
+
+        MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+        mv.visitCode();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
+        mv.visitInsn(RETURN);
+        mv.visitMaxs(1, 1);
+        mv.visitEnd();
+
+        cw.visitEnd();
+
+        if (LOGGER.isLoggable(Level.INFO)) {
+            // Class's @XmlRootElement
+            StringBuilder sb = new StringBuilder();
+            sb.append("\n");
+            sb.append("@XmlRootElement(name=");
+            sb.append(rootName);
+            sb.append(", namespace=");
+            sb.append(rootNS);
+            sb.append(")");
+
+            // Class's @XmlType
+            sb.append("\n");
+            sb.append("@XmlType(name=");
+            sb.append(typeName);
+            sb.append(", namespace=");
+            sb.append(typeNS);
+            if (propOrder.length > 1) {
+                sb.append(", propOrder={");
+                for(int i=0; i < propOrder.length; i++) {
+                    if (i != 0) {
+                        sb.append(", ");
+                    }
+                    sb.append(propOrder[i]);
+                }
+                sb.append("}");
+            }
+            sb.append(")");
+
+            // class declaration
+            sb.append("\n");
+            sb.append("public class ");
+            sb.append(className);
+            sb.append(" {");
+
+            // fields declaration
+            for(Field field : fields) {
+                sb.append("\n");
+
+                // Field's @XmlRootElement decl
+                if (!field.noXmlElem) {
+                    sb.append("\n    ");
+                    sb.append("@XmlRootElement(name=");
+                    sb.append(field.elementName);
+                    sb.append(", namespace=");
+                    sb.append(field.elementNS);
+                    if (field.reflectType instanceof GenericArrayType) {
+                        sb.append("nillable=true");
+                    }
+                    sb.append(")");
+                }
+
+                // Field's other JAXB annotations
+                for(Annotation ann : field.jaxbAnnotations) {
+                    sb.append("\n    ");
+
+                    if (ann instanceof XmlMimeType) {
+                        sb.append("@XmlMimeType(value=");
+                        sb.append(((XmlMimeType)ann).value());
+                        sb.append(")");
+                    } else if (ann instanceof XmlJavaTypeAdapter) {
+                        sb.append("@XmlJavaTypeAdapter(value=");
+                        sb.append(((XmlMimeType)ann).value());
+                        sb.append(", type=");
+                        sb.append(((XmlJavaTypeAdapter)ann).type());
+                        sb.append(")");
+                    } else if (ann instanceof XmlAttachmentRef) {
+                        sb.append("@XmlAttachmentRef");
+                    } else if (ann instanceof XmlList) {
+                        sb.append("@XmlList");
+                    } else {
+                        throw new WebServiceException("Unknown JAXB annotation " + ann);
+                    }
+                }
+
+                // Field declaration
+                sb.append("\n    ");
+                sb.append("public ");
+                if (field.getSignature() == null) {
+                    sb.append(field.asmType.getDescriptor());
+                } else {
+                    sb.append(field.getSignature());
+                }
+                sb.append(" ");
+                sb.append(field.fieldName);
+            }
+
+            sb.append("\n\n}");
+            LOGGER.fine(sb.toString());
+        }
+
+        return cw.toByteArray();
+    }
+
+    private static String replaceDotWithSlash(String name) {
+        return name.replace('.', '/');
+    }
+
+    static Class createRequestWrapperBean(String className, Method method, QName reqElemName, ClassLoader cl) {
+
+        LOGGER.fine("Request Wrapper Class : "+className);
+
+        List<Field> fields = collectRequestWrapperMembers(method);
+
+        String[] propOrder = getPropOrder(fields);
+
+        byte[] image;
+        try {
+            image = createBeanImage(className, reqElemName.getLocalPart(), reqElemName.getNamespaceURI(),
+                reqElemName.getLocalPart(), reqElemName.getNamespaceURI(), propOrder,
+                fields);
+        } catch(Exception e) {
+            throw new WebServiceException(e);
+        }
+
+        return Injector.inject(cl, className, image);
+    }
+
+    static Class createResponseWrapperBean(String className, Method method, QName resElemName, ClassLoader cl) {
+
+        LOGGER.fine("Response Wrapper Class : "+className);
+
+        List<Field> fields = collectResponseWrapperMembers(method);
+
+        String[] propOrder = getPropOrder(fields);
+
+        byte[] image;
+        try {
+            image = createBeanImage(className, resElemName.getLocalPart(), resElemName.getNamespaceURI(),
+                resElemName.getLocalPart(), resElemName.getNamespaceURI(), propOrder,
+                fields);
+        } catch(Exception e) {
+            throw new WebServiceException(e);
+        }
+
+        return Injector.inject(cl, className, image);
+    }
+
+    private static String[] getPropOrder(List<Field> fields) {
+        String[] propOrder = new String[fields.size()];
+        for(int i=0; i < fields.size(); i++) {
+            propOrder[i] = fields.get(i).fieldName;
+        }
+        return propOrder;
+    }
+
+    private static List<Field> collectRequestWrapperMembers(Method method) {
+
+        List<Field> fields = new ArrayList<Field>();
+        Annotation[][] paramAnns = method.getParameterAnnotations();
+        java.lang.reflect.Type[] paramTypes = method.getGenericParameterTypes();
+        Type[] asmTypes = Type.getArgumentTypes(method);
+        for(int i=0; i < paramTypes.length; i++) {
+            WebParam webParam = findAnnotation(paramAnns[i], WebParam.class);
+            if (webParam != null && webParam.header()) {
+                continue;
+            }
+            List<Annotation> jaxb = collectJAXBAnnotations(paramAnns[i]);
+
+            java.lang.reflect.Type paramType =  getHolderValueType(paramTypes[i]);
+            Type asmType = isHolder(paramTypes[i]) ? getASMType(paramType) : asmTypes[i];
+
+            String paramNamespace = "";
+            String paramName =  "arg"+i;
+            WebParam.Mode mode = WebParam.Mode.IN;
+            if (webParam != null) {
+                mode = webParam.mode();
+                if (webParam.name().length() > 0)
+                    paramName = webParam.name();
+                if (webParam.targetNamespace().length() > 0)
+                    paramNamespace = webParam.targetNamespace();
+            }
+
+            String fieldName = JAXBRIContext.mangleNameToVariableName(paramName);
+            //We wont have to do this if JAXBRIContext.mangleNameToVariableName() takes
+            //care of mangling java reserved keywords
+            fieldName = getJavaReservedVarialbeName(fieldName);
+
+            Field memInfo = new Field(fieldName, paramType, asmType, paramName, paramNamespace, jaxb);
+
+            if (mode.equals(WebParam.Mode.IN) || mode.equals(WebParam.Mode.INOUT)) {
+                fields.add(memInfo);
+            }
+
+        }
+        return fields;
+    }
+
+    private static List<Field> collectResponseWrapperMembers(Method method) {
+
+        List<Field> fields = new ArrayList<Field>();
+
+        // Collect all OUT, INOUT parameters as fields
+        Annotation[][] paramAnns = method.getParameterAnnotations();
+        java.lang.reflect.Type[] paramTypes = method.getGenericParameterTypes();
+        Type[] asmTypes = Type.getArgumentTypes(method);
+        for(int i=0; i < paramTypes.length; i++) {
+            WebParam webParam = findAnnotation(paramAnns[i], WebParam.class);
+            if (webParam != null) {
+                if (webParam.header() || webParam.mode() == WebParam.Mode.IN) {
+                    continue;
+                }
+            }
+            if (!isHolder(paramTypes[i])) {
+                continue;
+            }
+
+            List<Annotation> jaxb = collectJAXBAnnotations(paramAnns[i]);
+
+            java.lang.reflect.Type paramType = getHolderValueType(paramTypes[i]);
+            Type asmType = getASMType(paramType);
+
+            String paramNamespace = "";
+            String paramName =  "arg"+i;
+
+            if (webParam != null) {
+                if (webParam.name().length() > 0)
+                    paramName = webParam.name();
+                if (webParam.targetNamespace().length() > 0)
+                    paramNamespace = webParam.targetNamespace();
+            }
+
+            String fieldName = JAXBRIContext.mangleNameToVariableName(paramName);
+            //We wont have to do this if JAXBRIContext.mangleNameToVariableName() takes
+            //care of mangling java reserved keywords
+            fieldName = getJavaReservedVarialbeName(fieldName);
+
+            fields.add(new Field(fieldName, paramType, asmType, paramName, paramNamespace, jaxb));
+        }
+
+        WebResult webResult = method.getAnnotation(WebResult.class);
+        java.lang.reflect.Type returnType = method.getGenericReturnType();
+        Type asmType = Type.getReturnType(method);
+        if (!((webResult != null && webResult.header()) || returnType == Void.TYPE)) {
+            String fieldElementName = "return";
+            String fieldName = "_return";
+            String fieldNamespace = "";
+
+            if (webResult != null) {
+                if (webResult.name().length() > 0) {
+                    fieldElementName = webResult.name();
+                    fieldName = JAXBRIContext.mangleNameToVariableName(webResult.name());
+                    //We wont have to do this if JAXBRIContext.mangleNameToVariableName() takes
+                    //care of mangling java identifiers
+                    fieldName = getJavaReservedVarialbeName(fieldName);
+                }
+                if (webResult.targetNamespace().length() > 1) {
+                    fieldNamespace = webResult.targetNamespace();
+                }
+            }
+
+            List<Annotation> jaxb = collectJAXBAnnotations(method.getAnnotations());
+
+            fields.add(new Field(fieldName, returnType, asmType, fieldElementName, fieldNamespace, jaxb));
+        }
+        return fields;
+    }
+
+    private static boolean isHolder(java.lang.reflect.Type type) {
+        if (type instanceof ParameterizedType) {
+            ParameterizedType p = (ParameterizedType)type;
+            if (p.getRawType().equals(Holder.class)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static Type getASMType(java.lang.reflect.Type t) {
+        assert t!=null;
+
+        if (t instanceof Class) {
+            return Type.getType((Class)t);
+        }
+
+        if (t instanceof ParameterizedType) {
+            ParameterizedType pt = (ParameterizedType)t;
+            if (pt.getRawType() instanceof Class) {
+                return Type.getType((Class)pt.getRawType());
+            }
+        }
+        if (t instanceof GenericArrayType) {
+            // TODO
+        }
+
+        if (t instanceof WildcardType) {
+            // TODO
+        }
+        if (t instanceof TypeVariable) {
+            TypeVariable tv = (TypeVariable)t;
+            if (tv.getBounds()[0] instanceof Class) {
+                return Type.getType((Class)tv.getBounds()[0]);
+            }
+        }
+
+        // covered all the cases
+        assert false;
+        throw new IllegalArgumentException("Not creating ASM Type for type = "+t);
+    }
+
+    private static java.lang.reflect.Type getHolderValueType(java.lang.reflect.Type paramType) {
+        if (paramType instanceof ParameterizedType) {
+            ParameterizedType p = (ParameterizedType)paramType;
+            if (p.getRawType().equals(Holder.class)) {
+                return p.getActualTypeArguments()[0];
+            }
+        }
+        return paramType;
+    }
+
+    private static <T extends Annotation> T findAnnotation(Annotation[] anns, Class<T> annotationClass) {
+        for(Annotation a : anns) {
+            if (a.annotationType() == annotationClass) {
+                return (T)a;
+            }
+        }
+        return null;
+    }
+
+    static Class createExceptionBean(String className, Class exception, String typeNS, String elemName, String elemNS, ClassLoader cl) {
+
+        List<Field> fields = collectExceptionProperties(exception);
+        String[] propOrder = getPropOrder(fields);
+
+        byte[] image;
+        try {
+            image = createBeanImage(className, elemName, elemNS,
+                exception.getSimpleName(), typeNS, propOrder,
+                fields);
+        } catch(Exception e) {
+            throw new WebServiceException(e);
+        }
+
+        return Injector.inject(cl, className, image);
+    }
+
+    private static List<Field> collectExceptionProperties(Class exception) {
+        List<Field> fields = new ArrayList<Field>();
+
+        Method[] methods = exception.getMethods();
+        for (Method method : methods) {
+            int mod = method.getModifiers();
+            if (!Modifier.isPublic(mod)
+                || (Modifier.isFinal(mod) && Modifier.isStatic(mod))
+                || Modifier.isTransient(mod)) { // no final static, transient, non-public
+                continue;
+            }
+            String name = method.getName();
+            if (!(name.startsWith("get") || name.startsWith("is")) || skipProperties.contains(name) ||
+                name.equals("get") || name.equals("is")) {
+                // Don't bother with invalid propertyNames.
+                continue;
+            }
+
+            java.lang.reflect.Type[] paramTypes = method.getGenericParameterTypes();
+            java.lang.reflect.Type returnType = method.getGenericReturnType();
+            Type asmType = Type.getReturnType(method);
+            if (paramTypes.length == 0) {
+                if (name.startsWith("get")) {
+                    String fieldName = StringUtils.decapitalize(name.substring(3));
+                    Field field = new Field(fieldName, returnType, asmType, true, Collections.<Annotation>emptyList());
+                    fields.add(field);
+                } else {
+                    String fieldName = StringUtils.decapitalize(name.substring(2));
+                    Field field = new Field(fieldName, returnType, asmType, true, Collections.<Annotation>emptyList());
+                    fields.add(field);
+                }
+            }
+        }
+        Collections.sort(fields);
+        return fields;
+    }
+
+
+    private static List<Annotation> collectJAXBAnnotations(Annotation[] anns) {
+        Class[] known = { XmlAttachmentRef.class, XmlMimeType.class, XmlJavaTypeAdapter.class, XmlList.class };
+        List<Annotation> jaxbAnnotation = new ArrayList<Annotation>();
+        for(Class c : known) {
+            Annotation a = findAnnotation(anns, c);
+            if (a != null) {
+                jaxbAnnotation.add(a);
+            }
+        }
+        return jaxbAnnotation;
+    }
+
+
+    private List<Annotation> collectJAXBAnnotations(Method method) {
+        Class[] known = { XmlAttachmentRef.class, XmlMimeType.class, XmlJavaTypeAdapter.class, XmlList.class };
+        List<Annotation> jaxbAnnotation = new ArrayList<Annotation>();
+        for(Class c : known) {
+            Annotation ann = method.getAnnotation(c);
+            if(ann != null) {
+                jaxbAnnotation.add(ann);
+            }
+        }
+        return jaxbAnnotation;
+    }
+
+    private static class Field implements Comparable<Field> {
+        private final java.lang.reflect.Type reflectType;
+        private final Type asmType;
+        private final String fieldName;
+        private final String elementName;
+        private final String elementNS;
+        private final List<Annotation> jaxbAnnotations;
+        private final boolean noXmlElem;
+
+        Field(String paramName, java.lang.reflect.Type paramType, Type asmType, String elementName,
+              String elementNS, List<Annotation> jaxbAnnotations) {
+            this(paramName, paramType, asmType, false, elementName, elementNS, jaxbAnnotations);
+        }
+
+        Field(String paramName, java.lang.reflect.Type paramType, Type asmType, boolean noXmlElem,
+              List<Annotation> jaxbAnnotations) {
+            this(paramName, paramType, asmType, noXmlElem, null,null, jaxbAnnotations);
+        }
+
+        Field(String paramName, java.lang.reflect.Type paramType, Type asmType, boolean noXmlElem,
+              String elementName, String elementNS, List<Annotation> jaxbAnnotations) {
+            this.reflectType = paramType;
+            this.asmType = asmType;
+            this.fieldName = paramName;
+            this.noXmlElem = noXmlElem;
+            this.elementName = elementName;
+            this.elementNS = elementNS;
+            this.jaxbAnnotations = jaxbAnnotations;
+        }
+
+        String getSignature() {
+            if (reflectType instanceof Class) {
+                return null;
+            }
+            if (reflectType instanceof TypeVariable) {
+                return null;
+            }
+            return FieldSignature.vms(reflectType);
+        }
+
+        public int compareTo(Field o) {
+            return fieldName.compareTo(o.fieldName);
+        }
+
+    }
+
+    // TODO MOVE Names to runtime (instead of doing the following)
+
+    /**
+     * See if its a java keyword name, if so then mangle the name
+     */
+    private static @NotNull String getJavaReservedVarialbeName(@NotNull String name) {
+        String reservedName = reservedWords.get(name);
+        return reservedName == null ? name : reservedName;
+    }
+
+    private static final Map<String, String> reservedWords;
+
+    static {
+        reservedWords = new HashMap<String, String>();
+        reservedWords.put("abstract", "_abstract");
+        reservedWords.put("assert", "_assert");
+        reservedWords.put("boolean", "_boolean");
+        reservedWords.put("break", "_break");
+        reservedWords.put("byte", "_byte");
+        reservedWords.put("case", "_case");
+        reservedWords.put("catch", "_catch");
+        reservedWords.put("char", "_char");
+        reservedWords.put("class", "_class");
+        reservedWords.put("const", "_const");
+        reservedWords.put("continue", "_continue");
+        reservedWords.put("default", "_default");
+        reservedWords.put("do", "_do");
+        reservedWords.put("double", "_double");
+        reservedWords.put("else", "_else");
+        reservedWords.put("extends", "_extends");
+        reservedWords.put("false", "_false");
+        reservedWords.put("final", "_final");
+        reservedWords.put("finally", "_finally");
+        reservedWords.put("float", "_float");
+        reservedWords.put("for", "_for");
+        reservedWords.put("goto", "_goto");
+        reservedWords.put("if", "_if");
+        reservedWords.put("implements", "_implements");
+        reservedWords.put("import", "_import");
+        reservedWords.put("instanceof", "_instanceof");
+        reservedWords.put("int", "_int");
+        reservedWords.put("interface", "_interface");
+        reservedWords.put("long", "_long");
+        reservedWords.put("native", "_native");
+        reservedWords.put("new", "_new");
+        reservedWords.put("null", "_null");
+        reservedWords.put("package", "_package");
+        reservedWords.put("private", "_private");
+        reservedWords.put("protected", "_protected");
+        reservedWords.put("public", "_public");
+        reservedWords.put("return", "_return");
+        reservedWords.put("short", "_short");
+        reservedWords.put("static", "_static");
+        reservedWords.put("strictfp", "_strictfp");
+        reservedWords.put("super", "_super");
+        reservedWords.put("switch", "_switch");
+        reservedWords.put("synchronized", "_synchronized");
+        reservedWords.put("this", "_this");
+        reservedWords.put("throw", "_throw");
+        reservedWords.put("throws", "_throws");
+        reservedWords.put("transient", "_transient");
+        reservedWords.put("true", "_true");
+        reservedWords.put("try", "_try");
+        reservedWords.put("void", "_void");
+        reservedWords.put("volatile", "_volatile");
+        reservedWords.put("while", "_while");
+        reservedWords.put("enum", "_enum");
+    }
+
+    private static final Set<String> skipProperties = new HashSet<String>();
+    static{
+        skipProperties.add("getCause");
+        skipProperties.add("getLocalizedMessage");
+        skipProperties.add("getClass");
+        skipProperties.add("getStackTrace");
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java
new file mode 100644
index 00000000000..4e947cc777c
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.model.wsdl;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundFault;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLFault;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
+
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.namespace.QName;
+
+/**
+ * @author Vivek Pandey
+ */
+public class WSDLBoundFaultImpl extends AbstractExtensibleImpl implements WSDLBoundFault {
+    private final String name;
+    private WSDLFault fault;
+    private WSDLBoundOperationImpl owner;
+
+    public WSDLBoundFaultImpl(XMLStreamReader xsr, String name, WSDLBoundOperationImpl owner) {
+        super(xsr);
+        this.name = name;
+        this.owner = owner;
+    }
+
+    public
+    @NotNull
+    String getName() {
+        return name;
+    }
+
+    public QName getQName() {
+        if(owner.getOperation() != null){
+            return new QName(owner.getOperation().getName().getNamespaceURI(), name);
+        }
+        return null;
+    }
+
+    public WSDLFault getFault() {
+        return fault;
+    }
+
+    @NotNull
+    public WSDLBoundOperation getBoundOperation() {
+        return owner;
+    }
+
+    void freeze(WSDLBoundOperationImpl root) {
+        assert root != null;
+        WSDLOperation op = root.getOperation();
+        if (op != null) {
+            for (WSDLFault f : op.getFaults()) {
+                if (f.getName().equals(name)) {
+                    this.fault = f;
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java
index 2d54c35f2fd..55110997e8b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java
@@ -25,16 +25,15 @@
 package com.sun.xml.internal.ws.model.wsdl;
 
 import com.sun.istack.internal.Nullable;
+import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.ws.api.model.ParameterBinding;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+import com.sun.xml.internal.ws.api.model.wsdl.*;
 
 import javax.jws.WebParam.Mode;
 import javax.jws.soap.SOAPBinding.Style;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Implementation of {@link WSDLBoundOperation}
@@ -63,6 +62,7 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
     private final Map<String, WSDLPartImpl> inParts;
     private final Map<String, WSDLPartImpl> outParts;
     private final Map<String, WSDLPartImpl> fltParts;
+    private final List<WSDLBoundFaultImpl> wsdlBoundFaults;
     private WSDLOperationImpl operation;
     private String soapAction;
     private ANONYMOUS anonymous;
@@ -85,6 +85,7 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
         inParts = new HashMap<String, WSDLPartImpl>();
         outParts = new HashMap<String, WSDLPartImpl>();
         fltParts = new HashMap<String, WSDLPartImpl>();
+        wsdlBoundFaults = new ArrayList<WSDLBoundFaultImpl>();
         this.owner = owner;
     }
 
@@ -100,14 +101,7 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
         this.soapAction = soapAction!=null?soapAction:"";
     }
 
-    /**
-     * Gets {@link com.sun.xml.internal.ws.api.model.wsdl.WSDLPart} for the given wsdl:input or wsdl:output part
-     *
-     * @param partName must be non-null
-     * @param mode     must be non-null
-     * @return null if no part is found
-     */
-    public WSDLPartImpl getPart(String partName, Mode mode){
+    public WSDLPartImpl getPart(String partName, Mode mode) {
         if(mode==Mode.IN){
             return inParts.get(partName);
         }else if(mode==Mode.OUT){
@@ -150,6 +144,25 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
         return faultParts;
     }
 
+    // TODO: what's the difference between this and inputParts/outputParts?
+    public Map<String,WSDLPart> getInParts() {
+        return Collections.<String,WSDLPart>unmodifiableMap(inParts);
+    }
+
+    public Map<String,WSDLPart> getOutParts() {
+        return Collections.<String,WSDLPart>unmodifiableMap(outParts);
+    }
+
+    @NotNull
+    public List<WSDLBoundFaultImpl> getFaults() {
+        return wsdlBoundFaults;
+    }
+
+    public void addFault(@NotNull WSDLBoundFaultImpl fault){
+        wsdlBoundFaults.add(fault);
+    }
+
+
     /**
      * Map of mime:content@part and the mime type from mime:content@type for wsdl:output
      *
@@ -280,6 +293,11 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
         return operation;
     }
 
+
+    public WSDLBoundPortType getBoundPortType() {
+        return owner;
+    }
+
     public void setInputExplicitBodyParts(boolean b) {
         explicitInputSOAPBodyParts = b;
     }
@@ -297,33 +315,65 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
         this.style = style;
     }
 
-    public @Nullable QName getPayloadName() {
+    public @Nullable QName getReqPayloadName() {
+        if (emptyRequestPayload)
+            return null;
+
+        if (requestPayloadName != null)
+            return requestPayloadName;
+
         if(style.equals(Style.RPC)){
-            return name;
+            String ns = getRequestNamespace() != null ? getRequestNamespace() : name.getNamespaceURI();
+            requestPayloadName = new QName(ns, name.getLocalPart());
+            return requestPayloadName;
         }else{
-            if(emptyPayload)
-                return null;
-
-            if(payloadName != null)
-                return payloadName;
-
             QName inMsgName = operation.getInput().getMessage().getName();
             WSDLMessageImpl message = messages.get(inMsgName);
             for(WSDLPartImpl part:message.parts()){
                 ParameterBinding binding = getInputBinding(part.getName());
                 if(binding.isBody()){
-                    payloadName = part.getDescriptor().name();
-                    return payloadName;
+                    requestPayloadName = part.getDescriptor().name();
+                    return requestPayloadName;
                 }
             }
 
             //Its empty payload
-            emptyPayload = true;
+            emptyRequestPayload = true;
         }
         //empty body
         return null;
     }
 
+    public @Nullable QName getResPayloadName() {
+        if (emptyResponsePayload)
+            return null;
+
+        if (responsePayloadName != null)
+            return responsePayloadName;
+
+        if(style.equals(Style.RPC)){
+            String ns = getResponseNamespace() != null ? getResponseNamespace() : name.getNamespaceURI();
+            responsePayloadName = new QName(ns, name.getLocalPart()+"Response");
+            return responsePayloadName;
+        }else{
+            QName outMsgName = operation.getOutput().getMessage().getName();
+            WSDLMessageImpl message = messages.get(outMsgName);
+            for(WSDLPartImpl part:message.parts()){
+                ParameterBinding binding = getOutputBinding(part.getName());
+                if(binding.isBody()){
+                    responsePayloadName = part.getDescriptor().name();
+                    return responsePayloadName;
+                }
+            }
+
+            //Its empty payload
+            emptyResponsePayload = true;
+        }
+        //empty body
+        return null;
+    }
+
+
     private String reqNamespace;
     private String respNamespace;
 
@@ -334,7 +384,7 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
      * @see com.sun.xml.internal.ws.model.RuntimeModeler#processRpcMethod(com.sun.xml.internal.ws.model.JavaMethodImpl, String, javax.jws.WebMethod, String, java.lang.reflect.Method, javax.jws.WebService)
      */
     public String getRequestNamespace(){
-        return reqNamespace;
+        return (reqNamespace != null)?reqNamespace:name.getNamespaceURI();
     }
 
     public void setRequestNamespace(String ns){
@@ -349,7 +399,7 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
      *      * @see com.sun.xml.internal.ws.modeler.RuntimeModeler#processRpcMethod(com.sun.xml.internal.ws.model.JavaMethod, String, javax.jws.WebMethod, String, java.lang.reflect.Method, javax.jws.WebService)
      */
     public String getResponseNamespace(){
-        return respNamespace;
+        return (respNamespace!=null)?respNamespace:name.getNamespaceURI();
     }
 
     public void setResponseNamespace(String ns){
@@ -360,13 +410,18 @@ public final class WSDLBoundOperationImpl extends AbstractExtensibleImpl impleme
         return owner;
     }
 
-    private QName payloadName;
-    private boolean emptyPayload;
+    private QName requestPayloadName;
+    private QName responsePayloadName;
+    private boolean emptyRequestPayload;
+    private boolean emptyResponsePayload;
     private Map<QName, WSDLMessageImpl> messages;
 
     void freeze(WSDLModelImpl parent) {
         messages = parent.getMessages();
         operation = owner.getPortType().get(name.getLocalPart());
+        for(WSDLBoundFaultImpl bf : wsdlBoundFaults){
+            bf.freeze(this);
+        }
     }
 
     public void setAnonymous(ANONYMOUS anonymous) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java
index d249696d29b..4152295eed4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java
@@ -30,9 +30,9 @@ import com.sun.xml.internal.ws.api.SOAPVersion;
 import com.sun.xml.internal.ws.api.model.ParameterBinding;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundPortType;
+import com.sun.xml.internal.ws.resources.ClientMessages;
 import com.sun.xml.internal.ws.util.QNameMap;
 import com.sun.xml.internal.ws.util.exception.LocatableWebServiceException;
-import com.sun.xml.internal.ws.resources.ClientMessages;
 
 import javax.jws.WebParam.Mode;
 import javax.jws.soap.SOAPBinding;
@@ -52,7 +52,6 @@ public final class WSDLBoundPortTypeImpl extends AbstractFeaturedObjectImpl impl
     private WSDLPortTypeImpl portType;
     private BindingID bindingId;
     private final @NotNull WSDLModelImpl owner;
-    private boolean finalized = false;
     private final QNameMap<WSDLBoundOperationImpl> bindingOperations = new QNameMap<WSDLBoundOperationImpl>();
 
     /**
@@ -209,21 +208,20 @@ public final class WSDLBoundPortTypeImpl extends AbstractFeaturedObjectImpl impl
         }
 
         freezePayloadMap();
-        if(style == Style.RPC){
-            owner.finalizeRpcLitBinding(this);
-        }
+        owner.finalizeRpcLitBinding(this);
     }
 
     private void freezePayloadMap() {
         if(style== Style.RPC) {
-            // If the style is rpc then the tag name should be
-            // same as operation name so return the operation that matches the tag name.
-            payloadMap = bindingOperations;
+            payloadMap = new QNameMap<WSDLBoundOperationImpl>();
+            for(WSDLBoundOperationImpl op : bindingOperations.values()){
+                payloadMap.put(op.getReqPayloadName(), op);
+            }
         } else {
             payloadMap = new QNameMap<WSDLBoundOperationImpl>();
             // For doclit The tag will be the operation that has the same input part descriptor value
             for(WSDLBoundOperationImpl op : bindingOperations.values()){
-                QName name = op.getPayloadName();
+                QName name = op.getReqPayloadName();
                 if(name == null){
                     //empty payload
                     emptyPayloadOperation = op;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java
index c5f0fe55436..37ccd90a468 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java
@@ -26,6 +26,8 @@
 package com.sun.xml.internal.ws.model.wsdl;
 
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLFault;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+import com.sun.istack.internal.NotNull;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
@@ -37,11 +39,13 @@ public final class WSDLFaultImpl extends AbstractExtensibleImpl implements WSDLF
     private final String name;
     private final QName messageName;
     private WSDLMessageImpl message;
+    private WSDLOperationImpl operation;
 
-    public WSDLFaultImpl(XMLStreamReader xsr,String name, QName messageName) {
+    public WSDLFaultImpl(XMLStreamReader xsr, String name, QName messageName, WSDLOperationImpl operation) {
         super(xsr);
         this.name = name;
         this.messageName = messageName;
+        this.operation = operation;
     }
 
     public String getName() {
@@ -52,6 +56,16 @@ public final class WSDLFaultImpl extends AbstractExtensibleImpl implements WSDLF
         return message;
     }
 
+    @NotNull
+    public WSDLOperation getOperation() {
+        return operation;
+    }
+
+    @NotNull
+    public QName getQName() {
+        return new QName(operation.getName().getNamespaceURI(), name);
+    }
+
     void freeze(WSDLModelImpl root){
         message = root.getMessage(messageName);
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java
index e66dcd6ea4f..ba6f85bbdee 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java
@@ -27,6 +27,9 @@ package com.sun.xml.internal.ws.model.wsdl;
 
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLInput;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLMessage;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
@@ -64,6 +67,15 @@ public final class WSDLInputImpl extends AbstractExtensibleImpl implements WSDLI
         return action;
     }
 
+    @NotNull
+    public WSDLOperation getOperation() {
+        return operation;
+    }
+
+    public QName getQName() {
+        return new QName(operation.getName().getNamespaceURI(), getName());
+    }
+
     public void setAction(String action) {
         this.action = action;
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java
index 43f0a0fa7aa..3ee0c69dbd9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java
@@ -55,7 +55,7 @@ public final class WSDLMessageImpl extends AbstractExtensibleImpl implements WSD
         parts.add(part);
     }
 
-    Iterable<WSDLPartImpl> parts(){
+    public Iterable<WSDLPartImpl> parts(){
         return parts;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java
index c2cff55d0da..9d65fb5d831 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java
@@ -27,6 +27,8 @@ package com.sun.xml.internal.ws.model.wsdl;
 
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLMessage;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLOutput;
+import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
+import com.sun.istack.internal.NotNull;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
@@ -60,6 +62,16 @@ public final class WSDLOutputImpl extends AbstractExtensibleImpl implements WSDL
         return action;
     }
 
+    @NotNull
+    public WSDLOperation getOperation() {
+        return operation;
+    }
+
+    @NotNull
+    public QName getQName() {
+        return new QName(operation.getName().getNamespaceURI(), getName());
+    }
+
     public void setAction(String action) {
         this.action = action;
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java
new file mode 100644
index 00000000000..09238c2ccfd
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java annotation. The methods of this interface must be
+ * called in the following order: (<tt>visit<tt> | <tt>visitEnum<tt> |
+ * <tt>visitAnnotation<tt> | <tt>visitArray<tt>)* <tt>visitEnd<tt>.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public interface AnnotationVisitor {
+
+    /**
+     * Visits a primitive value of the annotation.
+     *
+     * @param name the value name.
+     * @param value the actual value, whose type must be {@link Byte},
+     *        {@link Boolean}, {@link Character}, {@link Short},
+     *        {@link Integer}, {@link Long}, {@link Float}, {@link Double},
+     *        {@link String} or {@link Type}. This value can also be an array
+     *        of byte, boolean, short, char, int, long, float or double values
+     *        (this is equivalent to using {@link #visitArray visitArray} and
+     *        visiting each array element in turn, but is more convenient).
+     */
+    void visit(String name, Object value);
+
+    /**
+     * Visits an enumeration value of the annotation.
+     *
+     * @param name the value name.
+     * @param desc the class descriptor of the enumeration class.
+     * @param value the actual enumeration value.
+     */
+    void visitEnum(String name, String desc, String value);
+
+    /**
+     * Visits a nested annotation value of the annotation.
+     *
+     * @param name the value name.
+     * @param desc the class descriptor of the nested annotation class.
+     * @return a visitor to visit the actual nested annotation value, or
+     *         <tt>null</tt> if this visitor is not interested in visiting
+     *         this nested annotation. <i>The nested annotation value must be
+     *         fully visited before calling other methods on this annotation
+     *         visitor</i>.
+     */
+    AnnotationVisitor visitAnnotation(String name, String desc);
+
+    /**
+     * Visits an array value of the annotation. Note that arrays of primitive
+     * types (such as byte, boolean, short, char, int, long, float or double)
+     * can be passed as value to {@link #visit visit}. This is what
+     * {@link ClassReader} does.
+     *
+     * @param name the value name.
+     * @return a visitor to visit the actual array value elements, or
+     *         <tt>null</tt> if this visitor is not interested in visiting
+     *         these values. The 'name' parameters passed to the methods of this
+     *         visitor are ignored. <i>All the array values must be visited
+     *         before calling other methods on this annotation visitor</i>.
+     */
+    AnnotationVisitor visitArray(String name);
+
+    /**
+     * Visits the end of the annotation.
+     */
+    void visitEnd();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java
new file mode 100644
index 00000000000..e308bd86fc3
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * An {@link AnnotationVisitor} that generates annotations in bytecode form.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+final class AnnotationWriter implements AnnotationVisitor {
+
+    /**
+     * The class writer to which this annotation must be added.
+     */
+    private final ClassWriter cw;
+
+    /**
+     * The number of values in this annotation.
+     */
+    private int size;
+
+    /**
+     * <tt>true<tt> if values are named, <tt>false</tt> otherwise. Annotation
+     * writers used for annotation default and annotation arrays use unnamed
+     * values.
+     */
+    private final boolean named;
+
+    /**
+     * The annotation values in bytecode form. This byte vector only contains
+     * the values themselves, i.e. the number of values must be stored as a
+     * unsigned short just before these bytes.
+     */
+    private final ByteVector bv;
+
+    /**
+     * The byte vector to be used to store the number of values of this
+     * annotation. See {@link #bv}.
+     */
+    private final ByteVector parent;
+
+    /**
+     * Where the number of values of this annotation must be stored in
+     * {@link #parent}.
+     */
+    private final int offset;
+
+    /**
+     * Next annotation writer. This field is used to store annotation lists.
+     */
+    AnnotationWriter next;
+
+    /**
+     * Previous annotation writer. This field is used to store annotation lists.
+     */
+    AnnotationWriter prev;
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new {@link AnnotationWriter}.
+     *
+     * @param cw the class writer to which this annotation must be added.
+     * @param named <tt>true<tt> if values are named, <tt>false</tt> otherwise.
+     * @param bv where the annotation values must be stored.
+     * @param parent where the number of annotation values must be stored.
+     * @param offset where in <tt>parent</tt> the number of annotation values must
+     *      be stored.
+     */
+    AnnotationWriter(
+        final ClassWriter cw,
+        final boolean named,
+        final ByteVector bv,
+        final ByteVector parent,
+        final int offset)
+    {
+        this.cw = cw;
+        this.named = named;
+        this.bv = bv;
+        this.parent = parent;
+        this.offset = offset;
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the AnnotationVisitor interface
+    // ------------------------------------------------------------------------
+
+    public void visit(final String name, final Object value) {
+        ++size;
+        if (named) {
+            bv.putShort(cw.newUTF8(name));
+        }
+        if (value instanceof String) {
+            bv.put12('s', cw.newUTF8((String) value));
+        } else if (value instanceof Byte) {
+            bv.put12('B', cw.newInteger(((Byte) value).byteValue()).index);
+        } else if (value instanceof Boolean) {
+            int v = ((Boolean) value).booleanValue() ? 1 : 0;
+            bv.put12('Z', cw.newInteger(v).index);
+        } else if (value instanceof Character) {
+            bv.put12('C', cw.newInteger(((Character) value).charValue()).index);
+        } else if (value instanceof Short) {
+            bv.put12('S', cw.newInteger(((Short) value).shortValue()).index);
+        } else if (value instanceof Type) {
+            bv.put12('c', cw.newUTF8(((Type) value).getDescriptor()));
+        } else if (value instanceof byte[]) {
+            byte[] v = (byte[]) value;
+            bv.put12('[', v.length);
+            for (int i = 0; i < v.length; i++) {
+                bv.put12('B', cw.newInteger(v[i]).index);
+            }
+        } else if (value instanceof boolean[]) {
+            boolean[] v = (boolean[]) value;
+            bv.put12('[', v.length);
+            for (int i = 0; i < v.length; i++) {
+                bv.put12('Z', cw.newInteger(v[i] ? 1 : 0).index);
+            }
+        } else if (value instanceof short[]) {
+            short[] v = (short[]) value;
+            bv.put12('[', v.length);
+            for (int i = 0; i < v.length; i++) {
+                bv.put12('S', cw.newInteger(v[i]).index);
+            }
+        } else if (value instanceof char[]) {
+            char[] v = (char[]) value;
+            bv.put12('[', v.length);
+            for (int i = 0; i < v.length; i++) {
+                bv.put12('C', cw.newInteger(v[i]).index);
+            }
+        } else if (value instanceof int[]) {
+            int[] v = (int[]) value;
+            bv.put12('[', v.length);
+            for (int i = 0; i < v.length; i++) {
+                bv.put12('I', cw.newInteger(v[i]).index);
+            }
+        } else if (value instanceof long[]) {
+            long[] v = (long[]) value;
+            bv.put12('[', v.length);
+            for (int i = 0; i < v.length; i++) {
+                bv.put12('J', cw.newLong(v[i]).index);
+            }
+        } else if (value instanceof float[]) {
+            float[] v = (float[]) value;
+            bv.put12('[', v.length);
+            for (int i = 0; i < v.length; i++) {
+                bv.put12('F', cw.newFloat(v[i]).index);
+            }
+        } else if (value instanceof double[]) {
+            double[] v = (double[]) value;
+            bv.put12('[', v.length);
+            for (int i = 0; i < v.length; i++) {
+                bv.put12('D', cw.newDouble(v[i]).index);
+            }
+        } else {
+            Item i = cw.newConstItem(value);
+            bv.put12(".s.IFJDCS".charAt(i.type), i.index);
+        }
+    }
+
+    public void visitEnum(
+        final String name,
+        final String desc,
+        final String value)
+    {
+        ++size;
+        if (named) {
+            bv.putShort(cw.newUTF8(name));
+        }
+        bv.put12('e', cw.newUTF8(desc)).putShort(cw.newUTF8(value));
+    }
+
+    public AnnotationVisitor visitAnnotation(
+        final String name,
+        final String desc)
+    {
+        ++size;
+        if (named) {
+            bv.putShort(cw.newUTF8(name));
+        }
+        // write tag and type, and reserve space for values count
+        bv.put12('@', cw.newUTF8(desc)).putShort(0);
+        return new AnnotationWriter(cw, true, bv, bv, bv.length - 2);
+    }
+
+    public AnnotationVisitor visitArray(final String name) {
+        ++size;
+        if (named) {
+            bv.putShort(cw.newUTF8(name));
+        }
+        // write tag, and reserve space for array size
+        bv.put12('[', 0);
+        return new AnnotationWriter(cw, false, bv, bv, bv.length - 2);
+    }
+
+    public void visitEnd() {
+        if (parent != null) {
+            byte[] data = parent.data;
+            data[offset] = (byte) (size >>> 8);
+            data[offset + 1] = (byte) size;
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the size of this annotation writer list.
+     *
+     * @return the size of this annotation writer list.
+     */
+    int getSize() {
+        int size = 0;
+        AnnotationWriter aw = this;
+        while (aw != null) {
+            size += aw.bv.length;
+            aw = aw.next;
+        }
+        return size;
+    }
+
+    /**
+     * Puts the annotations of this annotation writer list into the given byte
+     * vector.
+     *
+     * @param out where the annotations must be put.
+     */
+    void put(final ByteVector out) {
+        int n = 0;
+        int size = 2;
+        AnnotationWriter aw = this;
+        AnnotationWriter last = null;
+        while (aw != null) {
+            ++n;
+            size += aw.bv.length;
+            aw.visitEnd(); // in case user forgot to call visitEnd
+            aw.prev = last;
+            last = aw;
+            aw = aw.next;
+        }
+        out.putInt(size);
+        out.putShort(n);
+        aw = last;
+        while (aw != null) {
+            out.putByteArray(aw.bv.data, 0, aw.bv.length);
+            aw = aw.prev;
+        }
+    }
+
+    /**
+     * Puts the given annotation lists into the given byte vector.
+     *
+     * @param panns an array of annotation writer lists.
+     * @param off index of the first annotation to be written.
+     * @param out where the annotations must be put.
+     */
+    static void put(
+        final AnnotationWriter[] panns,
+        final int off,
+        final ByteVector out)
+    {
+        int size = 1 + 2 * (panns.length - off);
+        for (int i = off; i < panns.length; ++i) {
+            size += panns[i] == null ? 0 : panns[i].getSize();
+        }
+        out.putInt(size).putByte(panns.length - off);
+        for (int i = off; i < panns.length; ++i) {
+            AnnotationWriter aw = panns[i];
+            AnnotationWriter last = null;
+            int n = 0;
+            while (aw != null) {
+                ++n;
+                aw.visitEnd(); // in case user forgot to call visitEnd
+                aw.prev = last;
+                last = aw;
+                aw = aw.next;
+            }
+            out.putShort(n);
+            aw = last;
+            while (aw != null) {
+                out.putByteArray(aw.bv.data, 0, aw.bv.length);
+                aw = aw.prev;
+            }
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java
new file mode 100644
index 00000000000..4af11181769
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A non standard class, field, method or code attribute.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public class Attribute {
+
+    /**
+     * The type of this attribute.
+     */
+    public final String type;
+
+    /**
+     * The raw value of this attribute, used only for unknown attributes.
+     */
+    byte[] value;
+
+    /**
+     * The next attribute in this attribute list. May be <tt>null</tt>.
+     */
+    Attribute next;
+
+    /**
+     * Constructs a new empty attribute.
+     *
+     * @param type the type of the attribute.
+     */
+    protected Attribute(final String type) {
+        this.type = type;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this type of attribute is unknown. The default
+     * implementation of this method always returns <tt>true</tt>.
+     *
+     * @return <tt>true</tt> if this type of attribute is unknown.
+     */
+    public boolean isUnknown() {
+        return true;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this type of attribute is a code attribute.
+     *
+     * @return <tt>true</tt> if this type of attribute is a code attribute.
+     */
+    public boolean isCodeAttribute() {
+        return false;
+    }
+
+    /**
+     * Returns the labels corresponding to this attribute.
+     *
+     * @return the labels corresponding to this attribute, or <tt>null</tt> if
+     *         this attribute is not a code attribute that contains labels.
+     */
+    protected Label[] getLabels() {
+        return null;
+    }
+
+    /**
+     * Reads a {@link #type type} attribute. This method must return a <i>new</i>
+     * {@link Attribute} object, of type {@link #type type}, corresponding to
+     * the <tt>len</tt> bytes starting at the given offset, in the given class
+     * reader.
+     *
+     * @param cr the class that contains the attribute to be read.
+     * @param off index of the first byte of the attribute's content in {@link
+     *        ClassReader#b cr.b}. The 6 attribute header bytes, containing the
+     *        type and the length of the attribute, are not taken into account
+     *        here.
+     * @param len the length of the attribute's content.
+     * @param buf buffer to be used to call
+     *        {@link ClassReader#readUTF8 readUTF8},
+     *        {@link ClassReader#readClass(int,char[]) readClass} or
+     *        {@link ClassReader#readConst readConst}.
+     * @param codeOff index of the first byte of code's attribute content in
+     *        {@link ClassReader#b cr.b}, or -1 if the attribute to be read is
+     *        not a code attribute. The 6 attribute header bytes, containing the
+     *        type and the length of the attribute, are not taken into account
+     *        here.
+     * @param labels the labels of the method's code, or <tt>null</tt> if the
+     *        attribute to be read is not a code attribute.
+     * @return a <i>new</i> {@link Attribute} object corresponding to the given
+     *         bytes.
+     */
+    protected Attribute read(
+        final ClassReader cr,
+        final int off,
+        final int len,
+        final char[] buf,
+        final int codeOff,
+        final Label[] labels)
+    {
+        Attribute attr = new Attribute(type);
+        attr.value = new byte[len];
+        System.arraycopy(cr.b, off, attr.value, 0, len);
+        return attr;
+    }
+
+    /**
+     * Returns the byte array form of this attribute.
+     *
+     * @param cw the class to which this attribute must be added. This parameter
+     *        can be used to add to the constant pool of this class the items
+     *        that corresponds to this attribute.
+     * @param code the bytecode of the method corresponding to this code
+     *        attribute, or <tt>null</tt> if this attribute is not a code
+     *        attributes.
+     * @param len the length of the bytecode of the method corresponding to this
+     *        code attribute, or <tt>null</tt> if this attribute is not a code
+     *        attribute.
+     * @param maxStack the maximum stack size of the method corresponding to
+     *        this code attribute, or -1 if this attribute is not a code
+     *        attribute.
+     * @param maxLocals the maximum number of local variables of the method
+     *        corresponding to this code attribute, or -1 if this attribute is
+     *        not a code attribute.
+     * @return the byte array form of this attribute.
+     */
+    protected ByteVector write(
+        final ClassWriter cw,
+        final byte[] code,
+        final int len,
+        final int maxStack,
+        final int maxLocals)
+    {
+        ByteVector v = new ByteVector();
+        v.data = value;
+        v.length = value.length;
+        return v;
+    }
+
+    /**
+     * Returns the length of the attribute list that begins with this attribute.
+     *
+     * @return the length of the attribute list that begins with this attribute.
+     */
+    final int getCount() {
+        int count = 0;
+        Attribute attr = this;
+        while (attr != null) {
+            count += 1;
+            attr = attr.next;
+        }
+        return count;
+    }
+
+    /**
+     * Returns the size of all the attributes in this attribute list.
+     *
+     * @param cw the class writer to be used to convert the attributes into byte
+     *        arrays, with the {@link #write write} method.
+     * @param code the bytecode of the method corresponding to these code
+     *        attributes, or <tt>null</tt> if these attributes are not code
+     *        attributes.
+     * @param len the length of the bytecode of the method corresponding to
+     *        these code attributes, or <tt>null</tt> if these attributes are
+     *        not code attributes.
+     * @param maxStack the maximum stack size of the method corresponding to
+     *        these code attributes, or -1 if these attributes are not code
+     *        attributes.
+     * @param maxLocals the maximum number of local variables of the method
+     *        corresponding to these code attributes, or -1 if these attributes
+     *        are not code attributes.
+     * @return the size of all the attributes in this attribute list. This size
+     *         includes the size of the attribute headers.
+     */
+    final int getSize(
+        final ClassWriter cw,
+        final byte[] code,
+        final int len,
+        final int maxStack,
+        final int maxLocals)
+    {
+        Attribute attr = this;
+        int size = 0;
+        while (attr != null) {
+            cw.newUTF8(attr.type);
+            size += attr.write(cw, code, len, maxStack, maxLocals).length + 6;
+            attr = attr.next;
+        }
+        return size;
+    }
+
+    /**
+     * Writes all the attributes of this attribute list in the given byte
+     * vector.
+     *
+     * @param cw the class writer to be used to convert the attributes into byte
+     *        arrays, with the {@link #write write} method.
+     * @param code the bytecode of the method corresponding to these code
+     *        attributes, or <tt>null</tt> if these attributes are not code
+     *        attributes.
+     * @param len the length of the bytecode of the method corresponding to
+     *        these code attributes, or <tt>null</tt> if these attributes are
+     *        not code attributes.
+     * @param maxStack the maximum stack size of the method corresponding to
+     *        these code attributes, or -1 if these attributes are not code
+     *        attributes.
+     * @param maxLocals the maximum number of local variables of the method
+     *        corresponding to these code attributes, or -1 if these attributes
+     *        are not code attributes.
+     * @param out where the attributes must be written.
+     */
+    final void put(
+        final ClassWriter cw,
+        final byte[] code,
+        final int len,
+        final int maxStack,
+        final int maxLocals,
+        final ByteVector out)
+    {
+        Attribute attr = this;
+        while (attr != null) {
+            ByteVector b = attr.write(cw, code, len, maxStack, maxLocals);
+            out.putShort(cw.newUTF8(attr.type)).putInt(b.length);
+            out.putByteArray(b.data, 0, b.length);
+            attr = attr.next;
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java
new file mode 100644
index 00000000000..0c834ecb2dc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java
@@ -0,0 +1,323 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A dynamically extensible vector of bytes. This class is roughly equivalent to
+ * a DataOutputStream on top of a ByteArrayOutputStream, but is more efficient.
+ *
+ * @author Eric Bruneton
+ */
+public class ByteVector {
+
+    /**
+     * The content of this vector.
+     */
+    byte[] data;
+
+    /**
+     * Actual number of bytes in this vector.
+     */
+    int length;
+
+    /**
+     * Constructs a new {@link ByteVector ByteVector} with a default initial
+     * size.
+     */
+    public ByteVector() {
+        data = new byte[64];
+    }
+
+    /**
+     * Constructs a new {@link ByteVector ByteVector} with the given initial
+     * size.
+     *
+     * @param initialSize the initial size of the byte vector to be constructed.
+     */
+    public ByteVector(final int initialSize) {
+        data = new byte[initialSize];
+    }
+
+    /**
+     * Puts a byte into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     *
+     * @param b a byte.
+     * @return this byte vector.
+     */
+    public ByteVector putByte(final int b) {
+        int length = this.length;
+        if (length + 1 > data.length) {
+            enlarge(1);
+        }
+        data[length++] = (byte) b;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts two bytes into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     *
+     * @param b1 a byte.
+     * @param b2 another byte.
+     * @return this byte vector.
+     */
+    ByteVector put11(final int b1, final int b2) {
+        int length = this.length;
+        if (length + 2 > data.length) {
+            enlarge(2);
+        }
+        byte[] data = this.data;
+        data[length++] = (byte) b1;
+        data[length++] = (byte) b2;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts a short into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     *
+     * @param s a short.
+     * @return this byte vector.
+     */
+    public ByteVector putShort(final int s) {
+        int length = this.length;
+        if (length + 2 > data.length) {
+            enlarge(2);
+        }
+        byte[] data = this.data;
+        data[length++] = (byte) (s >>> 8);
+        data[length++] = (byte) s;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts a byte and a short into this byte vector. The byte vector is
+     * automatically enlarged if necessary.
+     *
+     * @param b a byte.
+     * @param s a short.
+     * @return this byte vector.
+     */
+    ByteVector put12(final int b, final int s) {
+        int length = this.length;
+        if (length + 3 > data.length) {
+            enlarge(3);
+        }
+        byte[] data = this.data;
+        data[length++] = (byte) b;
+        data[length++] = (byte) (s >>> 8);
+        data[length++] = (byte) s;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts an int into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     *
+     * @param i an int.
+     * @return this byte vector.
+     */
+    public ByteVector putInt(final int i) {
+        int length = this.length;
+        if (length + 4 > data.length) {
+            enlarge(4);
+        }
+        byte[] data = this.data;
+        data[length++] = (byte) (i >>> 24);
+        data[length++] = (byte) (i >>> 16);
+        data[length++] = (byte) (i >>> 8);
+        data[length++] = (byte) i;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts a long into this byte vector. The byte vector is automatically
+     * enlarged if necessary.
+     *
+     * @param l a long.
+     * @return this byte vector.
+     */
+    public ByteVector putLong(final long l) {
+        int length = this.length;
+        if (length + 8 > data.length) {
+            enlarge(8);
+        }
+        byte[] data = this.data;
+        int i = (int) (l >>> 32);
+        data[length++] = (byte) (i >>> 24);
+        data[length++] = (byte) (i >>> 16);
+        data[length++] = (byte) (i >>> 8);
+        data[length++] = (byte) i;
+        i = (int) l;
+        data[length++] = (byte) (i >>> 24);
+        data[length++] = (byte) (i >>> 16);
+        data[length++] = (byte) (i >>> 8);
+        data[length++] = (byte) i;
+        this.length = length;
+        return this;
+    }
+
+    /**
+     * Puts an UTF8 string into this byte vector. The byte vector is
+     * automatically enlarged if necessary.
+     *
+     * @param s a String.
+     * @return this byte vector.
+     */
+    public ByteVector putUTF8(final String s) {
+        int charLength = s.length();
+        if (length + 2 + charLength > data.length) {
+            enlarge(2 + charLength);
+        }
+        int len = length;
+        byte[] data = this.data;
+        // optimistic algorithm: instead of computing the byte length and then
+        // serializing the string (which requires two loops), we assume the byte
+        // length is equal to char length (which is the most frequent case), and
+        // we start serializing the string right away. During the serialization,
+        // if we find that this assumption is wrong, we continue with the
+        // general method.
+        data[len++] = (byte) (charLength >>> 8);
+        data[len++] = (byte) charLength;
+        for (int i = 0; i < charLength; ++i) {
+            char c = s.charAt(i);
+            if (c >= '\001' && c <= '\177') {
+                data[len++] = (byte) c;
+            } else {
+                int byteLength = i;
+                for (int j = i; j < charLength; ++j) {
+                    c = s.charAt(j);
+                    if (c >= '\001' && c <= '\177') {
+                        byteLength++;
+                    } else if (c > '\u07FF') {
+                        byteLength += 3;
+                    } else {
+                        byteLength += 2;
+                    }
+                }
+                data[length] = (byte) (byteLength >>> 8);
+                data[length + 1] = (byte) byteLength;
+                if (length + 2 + byteLength > data.length) {
+                    length = len;
+                    enlarge(2 + byteLength);
+                    data = this.data;
+                }
+                for (int j = i; j < charLength; ++j) {
+                    c = s.charAt(j);
+                    if (c >= '\001' && c <= '\177') {
+                        data[len++] = (byte) c;
+                    } else if (c > '\u07FF') {
+                        data[len++] = (byte) (0xE0 | c >> 12 & 0xF);
+                        data[len++] = (byte) (0x80 | c >> 6 & 0x3F);
+                        data[len++] = (byte) (0x80 | c & 0x3F);
+                    } else {
+                        data[len++] = (byte) (0xC0 | c >> 6 & 0x1F);
+                        data[len++] = (byte) (0x80 | c & 0x3F);
+                    }
+                }
+                break;
+            }
+        }
+        length = len;
+        return this;
+    }
+
+    /**
+     * Puts an array of bytes into this byte vector. The byte vector is
+     * automatically enlarged if necessary.
+     *
+     * @param b an array of bytes. May be <tt>null</tt> to put <tt>len</tt>
+     *        null bytes into this byte vector.
+     * @param off index of the fist byte of b that must be copied.
+     * @param len number of bytes of b that must be copied.
+     * @return this byte vector.
+     */
+    public ByteVector putByteArray(final byte[] b, final int off, final int len)
+    {
+        if (length + len > data.length) {
+            enlarge(len);
+        }
+        if (b != null) {
+            System.arraycopy(b, off, data, length, len);
+        }
+        length += len;
+        return this;
+    }
+
+    /**
+     * Enlarge this byte vector so that it can receive n more bytes.
+     *
+     * @param size number of additional bytes that this byte vector should be
+     *        able to receive.
+     */
+    private void enlarge(final int size) {
+        int length1 = 2 * data.length;
+        int length2 = length + size;
+        byte[] newData = new byte[length1 > length2 ? length1 : length2];
+        System.arraycopy(data, 0, newData, 0, length);
+        data = newData;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java
new file mode 100644
index 00000000000..532fe079e96
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java
@@ -0,0 +1,2039 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * A Java class parser to make a {@link ClassVisitor} visit an existing class.
+ * This class parses a byte array conforming to the Java class file format and
+ * calls the appropriate visit methods of a given class visitor for each field,
+ * method and bytecode instruction encountered.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public class ClassReader {
+
+    /**
+     * True to enable signatures support.
+     */
+    static final boolean SIGNATURES = true;
+
+    /**
+     * True to enable annotations support.
+     */
+    static final boolean ANNOTATIONS = true;
+
+    /**
+     * True to enable stack map frames support.
+     */
+    static final boolean FRAMES = true;
+
+    /**
+     * True to enable bytecode writing support.
+     */
+    static final boolean WRITER = true;
+
+    /**
+     * True to enable JSR_W and GOTO_W support.
+     */
+    static final boolean RESIZE = true;
+
+    /**
+     * Flag to skip method code. If this class is set <code>CODE</code>
+     * attribute won't be visited. This can be used, for example, to retrieve
+     * annotations for methods and method parameters.
+     */
+    public static final int SKIP_CODE = 1;
+
+    /**
+     * Flag to skip the debug information in the class. If this flag is set the
+     * debug information of the class is not visited, i.e. the
+     * {@link MethodVisitor#visitLocalVariable visitLocalVariable} and
+     * {@link MethodVisitor#visitLineNumber visitLineNumber} methods will not be
+     * called.
+     */
+    public static final int SKIP_DEBUG = 2;
+
+    /**
+     * Flag to skip the stack map frames in the class. If this flag is set the
+     * stack map frames of the class is not visited, i.e. the
+     * {@link MethodVisitor#visitFrame visitFrame} method will not be called.
+     * This flag is useful when the {@link ClassWriter#COMPUTE_FRAMES} option is
+     * used: it avoids visiting frames that will be ignored and recomputed from
+     * scratch in the class writer.
+     */
+    public static final int SKIP_FRAMES = 4;
+
+    /**
+     * Flag to expand the stack map frames. By default stack map frames are
+     * visited in their original format (i.e. "expanded" for classes whose
+     * version is less than V1_6, and "compressed" for the other classes). If
+     * this flag is set, stack map frames are always visited in expanded format
+     * (this option adds a decompression/recompression step in ClassReader and
+     * ClassWriter which degrades performances quite a lot).
+     */
+    public static final int EXPAND_FRAMES = 8;
+
+    /**
+     * The class to be parsed. <i>The content of this array must not be
+     * modified. This field is intended for {@link Attribute} sub classes, and
+     * is normally not needed by class generators or adapters.</i>
+     */
+    public final byte[] b;
+
+    /**
+     * The start index of each constant pool item in {@link #b b}, plus one.
+     * The one byte offset skips the constant pool item tag that indicates its
+     * type.
+     */
+    private final int[] items;
+
+    /**
+     * The String objects corresponding to the CONSTANT_Utf8 items. This cache
+     * avoids multiple parsing of a given CONSTANT_Utf8 constant pool item,
+     * which GREATLY improves performances (by a factor 2 to 3). This caching
+     * strategy could be extended to all constant pool items, but its benefit
+     * would not be so great for these items (because they are much less
+     * expensive to parse than CONSTANT_Utf8 items).
+     */
+    private final String[] strings;
+
+    /**
+     * Maximum length of the strings contained in the constant pool of the
+     * class.
+     */
+    private final int maxStringLength;
+
+    /**
+     * Start index of the class header information (access, name...) in
+     * {@link #b b}.
+     */
+    public final int header;
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new {@link ClassReader} object.
+     *
+     * @param b the bytecode of the class to be read.
+     */
+    public ClassReader(final byte[] b) {
+        this(b, 0, b.length);
+    }
+
+    /**
+     * Constructs a new {@link ClassReader} object.
+     *
+     * @param b the bytecode of the class to be read.
+     * @param off the start offset of the class data.
+     * @param len the length of the class data.
+     */
+    public ClassReader(final byte[] b, final int off, final int len) {
+        this.b = b;
+        // parses the constant pool
+        items = new int[readUnsignedShort(off + 8)];
+        int n = items.length;
+        strings = new String[n];
+        int max = 0;
+        int index = off + 10;
+        for (int i = 1; i < n; ++i) {
+            items[i] = index + 1;
+            int size;
+            switch (b[index]) {
+                case ClassWriter.FIELD:
+                case ClassWriter.METH:
+                case ClassWriter.IMETH:
+                case ClassWriter.INT:
+                case ClassWriter.FLOAT:
+                case ClassWriter.NAME_TYPE:
+                    size = 5;
+                    break;
+                case ClassWriter.LONG:
+                case ClassWriter.DOUBLE:
+                    size = 9;
+                    ++i;
+                    break;
+                case ClassWriter.UTF8:
+                    size = 3 + readUnsignedShort(index + 1);
+                    if (size > max) {
+                        max = size;
+                    }
+                    break;
+                // case ClassWriter.CLASS:
+                // case ClassWriter.STR:
+                default:
+                    size = 3;
+                    break;
+            }
+            index += size;
+        }
+        maxStringLength = max;
+        // the class header information starts just after the constant pool
+        header = index;
+    }
+
+    /**
+     * Returns the class's access flags (see {@link Opcodes}). This value may
+     * not reflect Deprecated and Synthetic flags when bytecode is before 1.5
+     * and those flags are represented by attributes.
+     *
+     * @return the class access flags
+     *
+     * @see ClassVisitor#visit(int, int, String, String, String, String[])
+     */
+    public int getAccess() {
+        return readUnsignedShort(header);
+    }
+
+    /**
+     * Returns the internal name of the class (see
+     * {@link Type#getInternalName() getInternalName}).
+     *
+     * @return the internal class name
+     *
+     * @see ClassVisitor#visit(int, int, String, String, String, String[])
+     */
+    public String getClassName() {
+        return readClass(header + 2, new char[maxStringLength]);
+    }
+
+    /**
+     * Returns the internal of name of the super class (see
+     * {@link Type#getInternalName() getInternalName}). For interfaces, the
+     * super class is {@link Object}.
+     *
+     * @return the internal name of super class, or <tt>null</tt> for
+     *         {@link Object} class.
+     *
+     * @see ClassVisitor#visit(int, int, String, String, String, String[])
+     */
+    public String getSuperName() {
+        int n = items[readUnsignedShort(header + 4)];
+        return n == 0 ? null : readUTF8(n, new char[maxStringLength]);
+    }
+
+    /**
+     * Returns the internal names of the class's interfaces (see
+     * {@link Type#getInternalName() getInternalName}).
+     *
+     * @return the array of internal names for all implemented interfaces or
+     *         <tt>null</tt>.
+     *
+     * @see ClassVisitor#visit(int, int, String, String, String, String[])
+     */
+    public String[] getInterfaces() {
+        int index = header + 6;
+        int n = readUnsignedShort(index);
+        String[] interfaces = new String[n];
+        if (n > 0) {
+            char[] buf = new char[maxStringLength];
+            for (int i = 0; i < n; ++i) {
+                index += 2;
+                interfaces[i] = readClass(index, buf);
+            }
+        }
+        return interfaces;
+    }
+
+    /**
+     * Copies the constant pool data into the given {@link ClassWriter}. Should
+     * be called before the {@link #accept(ClassVisitor,int)} method.
+     *
+     * @param classWriter the {@link ClassWriter} to copy constant pool into.
+     */
+    void copyPool(final ClassWriter classWriter) {
+        char[] buf = new char[maxStringLength];
+        int ll = items.length;
+        Item[] items2 = new Item[ll];
+        for (int i = 1; i < ll; i++) {
+            int index = items[i];
+            int tag = b[index - 1];
+            Item item = new Item(i);
+            int nameType;
+            switch (tag) {
+                case ClassWriter.FIELD:
+                case ClassWriter.METH:
+                case ClassWriter.IMETH:
+                    nameType = items[readUnsignedShort(index + 2)];
+                    item.set(tag,
+                            readClass(index, buf),
+                            readUTF8(nameType, buf),
+                            readUTF8(nameType + 2, buf));
+                    break;
+
+                case ClassWriter.INT:
+                    item.set(readInt(index));
+                    break;
+
+                case ClassWriter.FLOAT:
+                    item.set(Float.intBitsToFloat(readInt(index)));
+                    break;
+
+                case ClassWriter.NAME_TYPE:
+                    item.set(tag,
+                            readUTF8(index, buf),
+                            readUTF8(index + 2, buf),
+                            null);
+                    break;
+
+                case ClassWriter.LONG:
+                    item.set(readLong(index));
+                    ++i;
+                    break;
+
+                case ClassWriter.DOUBLE:
+                    item.set(Double.longBitsToDouble(readLong(index)));
+                    ++i;
+                    break;
+
+                case ClassWriter.UTF8: {
+                    String s = strings[i];
+                    if (s == null) {
+                        index = items[i];
+                        s = strings[i] = readUTF(index + 2,
+                                readUnsignedShort(index),
+                                buf);
+                    }
+                    item.set(tag, s, null, null);
+                }
+                    break;
+
+                // case ClassWriter.STR:
+                // case ClassWriter.CLASS:
+                default:
+                    item.set(tag, readUTF8(index, buf), null, null);
+                    break;
+            }
+
+            int index2 = item.hashCode % items2.length;
+            item.next = items2[index2];
+            items2[index2] = item;
+        }
+
+        int off = items[1] - 1;
+        classWriter.pool.putByteArray(b, off, header - off);
+        classWriter.items = items2;
+        classWriter.threshold = (int) (0.75d * ll);
+        classWriter.index = ll;
+    }
+
+    /**
+     * Constructs a new {@link ClassReader} object.
+     *
+     * @param is an input stream from which to read the class.
+     * @throws IOException if a problem occurs during reading.
+     */
+    public ClassReader(final InputStream is) throws IOException {
+        this(readClass(is));
+    }
+
+    /**
+     * Constructs a new {@link ClassReader} object.
+     *
+     * @param name the fully qualified name of the class to be read.
+     * @throws IOException if an exception occurs during reading.
+     */
+    public ClassReader(final String name) throws IOException {
+        this(ClassLoader.getSystemResourceAsStream(name.replace('.', '/')
+                + ".class"));
+    }
+
+    /**
+     * Reads the bytecode of a class.
+     *
+     * @param is an input stream from which to read the class.
+     * @return the bytecode read from the given input stream.
+     * @throws IOException if a problem occurs during reading.
+     */
+    private static byte[] readClass(final InputStream is) throws IOException {
+        if (is == null) {
+            throw new IOException("Class not found");
+        }
+        byte[] b = new byte[is.available()];
+        int len = 0;
+        while (true) {
+            int n = is.read(b, len, b.length - len);
+            if (n == -1) {
+                if (len < b.length) {
+                    byte[] c = new byte[len];
+                    System.arraycopy(b, 0, c, 0, len);
+                    b = c;
+                }
+                return b;
+            }
+            len += n;
+            if (len == b.length) {
+                byte[] c = new byte[b.length + 1000];
+                System.arraycopy(b, 0, c, 0, len);
+                b = c;
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Public methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Makes the given visitor visit the Java class of this {@link ClassReader}.
+     * This class is the one specified in the constructor (see
+     * {@link #ClassReader(byte[]) ClassReader}).
+     *
+     * @param classVisitor the visitor that must visit this class.
+     * @param flags option flags that can be used to modify the default behavior
+     *        of this class. See {@link #SKIP_DEBUG}, {@link #EXPAND_FRAMES},
+     *        {@link #SKIP_FRAMES}, {@link #SKIP_CODE}.
+     */
+    public void accept(final ClassVisitor classVisitor, final int flags) {
+        accept(classVisitor, new Attribute[0], flags);
+    }
+
+    /**
+     * Makes the given visitor visit the Java class of this {@link ClassReader}.
+     * This class is the one specified in the constructor (see
+     * {@link #ClassReader(byte[]) ClassReader}).
+     *
+     * @param classVisitor the visitor that must visit this class.
+     * @param attrs prototypes of the attributes that must be parsed during the
+     *        visit of the class. Any attribute whose type is not equal to the
+     *        type of one the prototypes will not be parsed: its byte array
+     *        value will be passed unchanged to the ClassWriter. <i>This may
+     *        corrupt it if this value contains references to the constant pool,
+     *        or has syntactic or semantic links with a class element that has
+     *        been transformed by a class adapter between the reader and the
+     *        writer</i>.
+     * @param flags option flags that can be used to modify the default behavior
+     *        of this class. See {@link #SKIP_DEBUG}, {@link #EXPAND_FRAMES},
+     *        {@link #SKIP_FRAMES}, {@link #SKIP_CODE}.
+     */
+    public void accept(
+        final ClassVisitor classVisitor,
+        final Attribute[] attrs,
+        final int flags)
+    {
+        byte[] b = this.b; // the bytecode array
+        char[] c = new char[maxStringLength]; // buffer used to read strings
+        int i, j, k; // loop variables
+        int u, v, w; // indexes in b
+        Attribute attr;
+
+        int access;
+        String name;
+        String desc;
+        String attrName;
+        String signature;
+        int anns = 0;
+        int ianns = 0;
+        Attribute cattrs = null;
+
+        // visits the header
+        u = header;
+        access = readUnsignedShort(u);
+        name = readClass(u + 2, c);
+        v = items[readUnsignedShort(u + 4)];
+        String superClassName = v == 0 ? null : readUTF8(v, c);
+        String[] implementedItfs = new String[readUnsignedShort(u + 6)];
+        w = 0;
+        u += 8;
+        for (i = 0; i < implementedItfs.length; ++i) {
+            implementedItfs[i] = readClass(u, c);
+            u += 2;
+        }
+
+        boolean skipCode = (flags & SKIP_CODE) != 0;
+        boolean skipDebug = (flags & SKIP_DEBUG) != 0;
+        boolean unzip = (flags & EXPAND_FRAMES) != 0;
+
+        // skips fields and methods
+        v = u;
+        i = readUnsignedShort(v);
+        v += 2;
+        for (; i > 0; --i) {
+            j = readUnsignedShort(v + 6);
+            v += 8;
+            for (; j > 0; --j) {
+                v += 6 + readInt(v + 2);
+            }
+        }
+        i = readUnsignedShort(v);
+        v += 2;
+        for (; i > 0; --i) {
+            j = readUnsignedShort(v + 6);
+            v += 8;
+            for (; j > 0; --j) {
+                v += 6 + readInt(v + 2);
+            }
+        }
+        // reads the class's attributes
+        signature = null;
+        String sourceFile = null;
+        String sourceDebug = null;
+        String enclosingOwner = null;
+        String enclosingName = null;
+        String enclosingDesc = null;
+
+        i = readUnsignedShort(v);
+        v += 2;
+        for (; i > 0; --i) {
+            attrName = readUTF8(v, c);
+            // tests are sorted in decreasing frequency order
+            // (based on frequencies observed on typical classes)
+            if ("SourceFile".equals(attrName)) {
+                sourceFile = readUTF8(v + 6, c);
+            } else if ("InnerClasses".equals(attrName)) {
+                w = v + 6;
+            } else if ("EnclosingMethod".equals(attrName)) {
+                enclosingOwner = readClass(v + 6, c);
+                int item = readUnsignedShort(v + 8);
+                if (item != 0) {
+                    enclosingName = readUTF8(items[item], c);
+                    enclosingDesc = readUTF8(items[item] + 2, c);
+                }
+            } else if (SIGNATURES && "Signature".equals(attrName)) {
+                signature = readUTF8(v + 6, c);
+            } else if (ANNOTATIONS && "RuntimeVisibleAnnotations".equals(attrName)) {
+                anns = v + 6;
+            } else if ("Deprecated".equals(attrName)) {
+                access |= Opcodes.ACC_DEPRECATED;
+            } else if ("Synthetic".equals(attrName)) {
+                access |= Opcodes.ACC_SYNTHETIC;
+            } else if ("SourceDebugExtension".equals(attrName)) {
+                int len = readInt(v + 2);
+                sourceDebug = readUTF(v + 6, len, new char[len]);
+            } else if (ANNOTATIONS && "RuntimeInvisibleAnnotations".equals(attrName)) {
+                ianns = v + 6;
+            } else {
+                attr = readAttribute(attrs,
+                        attrName,
+                        v + 6,
+                        readInt(v + 2),
+                        c,
+                        -1,
+                        null);
+                if (attr != null) {
+                    attr.next = cattrs;
+                    cattrs = attr;
+                }
+            }
+            v += 6 + readInt(v + 2);
+        }
+        // calls the visit method
+        classVisitor.visit(readInt(4),
+                access,
+                name,
+                signature,
+                superClassName,
+                implementedItfs);
+
+        // calls the visitSource method
+        if (!skipDebug && (sourceFile != null || sourceDebug != null)) {
+            classVisitor.visitSource(sourceFile, sourceDebug);
+        }
+
+        // calls the visitOuterClass method
+        if (enclosingOwner != null) {
+            classVisitor.visitOuterClass(enclosingOwner,
+                    enclosingName,
+                    enclosingDesc);
+        }
+
+        // visits the class annotations
+        if (ANNOTATIONS) {
+            for (i = 1; i >= 0; --i) {
+                v = i == 0 ? ianns : anns;
+                if (v != 0) {
+                    j = readUnsignedShort(v);
+                    v += 2;
+                    for (; j > 0; --j) {
+                        v = readAnnotationValues(v + 2,
+                                c,
+                                true,
+                                classVisitor.visitAnnotation(readUTF8(v, c), i != 0));
+                    }
+                }
+            }
+        }
+
+        // visits the class attributes
+        while (cattrs != null) {
+            attr = cattrs.next;
+            cattrs.next = null;
+            classVisitor.visitAttribute(cattrs);
+            cattrs = attr;
+        }
+
+        // calls the visitInnerClass method
+        if (w != 0) {
+            i = readUnsignedShort(w);
+            w += 2;
+            for (; i > 0; --i) {
+                classVisitor.visitInnerClass(readUnsignedShort(w) == 0
+                        ? null
+                        : readClass(w, c), readUnsignedShort(w + 2) == 0
+                        ? null
+                        : readClass(w + 2, c), readUnsignedShort(w + 4) == 0
+                        ? null
+                        : readUTF8(w + 4, c), readUnsignedShort(w + 6));
+                w += 8;
+            }
+        }
+
+        // visits the fields
+        i = readUnsignedShort(u);
+        u += 2;
+        for (; i > 0; --i) {
+            access = readUnsignedShort(u);
+            name = readUTF8(u + 2, c);
+            desc = readUTF8(u + 4, c);
+            // visits the field's attributes and looks for a ConstantValue
+            // attribute
+            int fieldValueItem = 0;
+            signature = null;
+            anns = 0;
+            ianns = 0;
+            cattrs = null;
+
+            j = readUnsignedShort(u + 6);
+            u += 8;
+            for (; j > 0; --j) {
+                attrName = readUTF8(u, c);
+                // tests are sorted in decreasing frequency order
+                // (based on frequencies observed on typical classes)
+                if ("ConstantValue".equals(attrName)) {
+                    fieldValueItem = readUnsignedShort(u + 6);
+                } else if (SIGNATURES && "Signature".equals(attrName)) {
+                    signature = readUTF8(u + 6, c);
+                } else if ("Deprecated".equals(attrName)) {
+                    access |= Opcodes.ACC_DEPRECATED;
+                } else if ("Synthetic".equals(attrName)) {
+                    access |= Opcodes.ACC_SYNTHETIC;
+                } else if (ANNOTATIONS && "RuntimeVisibleAnnotations".equals(attrName)) {
+                    anns = u + 6;
+                } else if (ANNOTATIONS && "RuntimeInvisibleAnnotations".equals(attrName)) {
+                    ianns = u + 6;
+                } else {
+                    attr = readAttribute(attrs,
+                            attrName,
+                            u + 6,
+                            readInt(u + 2),
+                            c,
+                            -1,
+                            null);
+                    if (attr != null) {
+                        attr.next = cattrs;
+                        cattrs = attr;
+                    }
+                }
+                u += 6 + readInt(u + 2);
+            }
+            // visits the field
+            FieldVisitor fv = classVisitor.visitField(access,
+                    name,
+                    desc,
+                    signature,
+                    fieldValueItem == 0 ? null : readConst(fieldValueItem, c));
+            // visits the field annotations and attributes
+            if (fv != null) {
+                if (ANNOTATIONS) {
+                    for (j = 1; j >= 0; --j) {
+                        v = j == 0 ? ianns : anns;
+                        if (v != 0) {
+                            k = readUnsignedShort(v);
+                            v += 2;
+                            for (; k > 0; --k) {
+                                v = readAnnotationValues(v + 2,
+                                        c,
+                                        true,
+                                        fv.visitAnnotation(readUTF8(v, c), j != 0));
+                            }
+                        }
+                    }
+                }
+                while (cattrs != null) {
+                    attr = cattrs.next;
+                    cattrs.next = null;
+                    fv.visitAttribute(cattrs);
+                    cattrs = attr;
+                }
+                fv.visitEnd();
+            }
+        }
+
+        // visits the methods
+        i = readUnsignedShort(u);
+        u += 2;
+        for (; i > 0; --i) {
+            int u0 = u + 6;
+            access = readUnsignedShort(u);
+            name = readUTF8(u + 2, c);
+            desc = readUTF8(u + 4, c);
+            signature = null;
+            anns = 0;
+            ianns = 0;
+            int dann = 0;
+            int mpanns = 0;
+            int impanns = 0;
+            cattrs = null;
+            v = 0;
+            w = 0;
+
+            // looks for Code and Exceptions attributes
+            j = readUnsignedShort(u + 6);
+            u += 8;
+            for (; j > 0; --j) {
+                attrName = readUTF8(u, c);
+                int attrSize = readInt(u + 2);
+                u += 6;
+                // tests are sorted in decreasing frequency order
+                // (based on frequencies observed on typical classes)
+                if ("Code".equals(attrName)) {
+                    if (!skipCode) {
+                        v = u;
+                    }
+                } else if ("Exceptions".equals(attrName)) {
+                    w = u;
+                } else if (SIGNATURES && "Signature".equals(attrName)) {
+                    signature = readUTF8(u, c);
+                } else if ("Deprecated".equals(attrName)) {
+                    access |= Opcodes.ACC_DEPRECATED;
+                } else if (ANNOTATIONS && "RuntimeVisibleAnnotations".equals(attrName)) {
+                    anns = u;
+                } else if (ANNOTATIONS && "AnnotationDefault".equals(attrName)) {
+                    dann = u;
+                } else if ("Synthetic".equals(attrName)) {
+                    access |= Opcodes.ACC_SYNTHETIC;
+                } else if (ANNOTATIONS && "RuntimeInvisibleAnnotations".equals(attrName)) {
+                    ianns = u;
+                } else if (ANNOTATIONS && "RuntimeVisibleParameterAnnotations".equals(attrName))
+                {
+                    mpanns = u;
+                } else if (ANNOTATIONS && "RuntimeInvisibleParameterAnnotations".equals(attrName))
+                {
+                    impanns = u;
+                } else {
+                    attr = readAttribute(attrs,
+                            attrName,
+                            u,
+                            attrSize,
+                            c,
+                            -1,
+                            null);
+                    if (attr != null) {
+                        attr.next = cattrs;
+                        cattrs = attr;
+                    }
+                }
+                u += attrSize;
+            }
+            // reads declared exceptions
+            String[] exceptions;
+            if (w == 0) {
+                exceptions = null;
+            } else {
+                exceptions = new String[readUnsignedShort(w)];
+                w += 2;
+                for (j = 0; j < exceptions.length; ++j) {
+                    exceptions[j] = readClass(w, c);
+                    w += 2;
+                }
+            }
+
+            // visits the method's code, if any
+            MethodVisitor mv = classVisitor.visitMethod(access,
+                    name,
+                    desc,
+                    signature,
+                    exceptions);
+
+            if (mv != null) {
+                /*
+                 * if the returned MethodVisitor is in fact a MethodWriter, it
+                 * means there is no method adapter between the reader and the
+                 * writer. If, in addition, the writer's constant pool was
+                 * copied from this reader (mw.cw.cr == this), and the signature
+                 * and exceptions of the method have not been changed, then it
+                 * is possible to skip all visit events and just copy the
+                 * original code of the method to the writer (the access, name
+                 * and descriptor can have been changed, this is not important
+                 * since they are not copied as is from the reader).
+                 */
+                if (WRITER && mv instanceof MethodWriter) {
+                    MethodWriter mw = (MethodWriter) mv;
+                    if (mw.cw.cr == this) {
+                        if (signature == mw.signature) {
+                            boolean sameExceptions = false;
+                            if (exceptions == null) {
+                                sameExceptions = mw.exceptionCount == 0;
+                            } else {
+                                if (exceptions.length == mw.exceptionCount) {
+                                    sameExceptions = true;
+                                    for (j = exceptions.length - 1; j >= 0; --j)
+                                    {
+                                        w -= 2;
+                                        if (mw.exceptions[j] != readUnsignedShort(w))
+                                        {
+                                            sameExceptions = false;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            if (sameExceptions) {
+                                /*
+                                 * we do not copy directly the code into
+                                 * MethodWriter to save a byte array copy
+                                 * operation. The real copy will be done in
+                                 * ClassWriter.toByteArray().
+                                 */
+                                mw.classReaderOffset = u0;
+                                mw.classReaderLength = u - u0;
+                                continue;
+                            }
+                        }
+                    }
+                }
+
+                if (ANNOTATIONS && dann != 0) {
+                    AnnotationVisitor dv = mv.visitAnnotationDefault();
+                    readAnnotationValue(dann, c, null, dv);
+                    if (dv != null) {
+                        dv.visitEnd();
+                    }
+                }
+                if (ANNOTATIONS) {
+                    for (j = 1; j >= 0; --j) {
+                        w = j == 0 ? ianns : anns;
+                        if (w != 0) {
+                            k = readUnsignedShort(w);
+                            w += 2;
+                            for (; k > 0; --k) {
+                                w = readAnnotationValues(w + 2,
+                                        c,
+                                        true,
+                                        mv.visitAnnotation(readUTF8(w, c), j != 0));
+                            }
+                        }
+                    }
+                }
+                if (ANNOTATIONS && mpanns != 0) {
+                    readParameterAnnotations(mpanns, desc, c, true, mv);
+                }
+                if (ANNOTATIONS && impanns != 0) {
+                    readParameterAnnotations(impanns, desc, c, false, mv);
+                }
+                while (cattrs != null) {
+                    attr = cattrs.next;
+                    cattrs.next = null;
+                    mv.visitAttribute(cattrs);
+                    cattrs = attr;
+                }
+            }
+
+            if (mv != null && v != 0) {
+                int maxStack = readUnsignedShort(v);
+                int maxLocals = readUnsignedShort(v + 2);
+                int codeLength = readInt(v + 4);
+                v += 8;
+
+                int codeStart = v;
+                int codeEnd = v + codeLength;
+
+                mv.visitCode();
+
+                // 1st phase: finds the labels
+                int label;
+                Label[] labels = new Label[codeLength + 2];
+                readLabel(codeLength + 1, labels);
+                while (v < codeEnd) {
+                    w = v - codeStart;
+                    int opcode = b[v] & 0xFF;
+                    switch (ClassWriter.TYPE[opcode]) {
+                        case ClassWriter.NOARG_INSN:
+                        case ClassWriter.IMPLVAR_INSN:
+                            v += 1;
+                            break;
+                        case ClassWriter.LABEL_INSN:
+                            readLabel(w + readShort(v + 1), labels);
+                            v += 3;
+                            break;
+                        case ClassWriter.LABELW_INSN:
+                            readLabel(w + readInt(v + 1), labels);
+                            v += 5;
+                            break;
+                        case ClassWriter.WIDE_INSN:
+                            opcode = b[v + 1] & 0xFF;
+                            if (opcode == Opcodes.IINC) {
+                                v += 6;
+                            } else {
+                                v += 4;
+                            }
+                            break;
+                        case ClassWriter.TABL_INSN:
+                            // skips 0 to 3 padding bytes*
+                            v = v + 4 - (w & 3);
+                            // reads instruction
+                            readLabel(w + readInt(v), labels);
+                            j = readInt(v + 8) - readInt(v + 4) + 1;
+                            v += 12;
+                            for (; j > 0; --j) {
+                                readLabel(w + readInt(v), labels);
+                                v += 4;
+                            }
+                            break;
+                        case ClassWriter.LOOK_INSN:
+                            // skips 0 to 3 padding bytes*
+                            v = v + 4 - (w & 3);
+                            // reads instruction
+                            readLabel(w + readInt(v), labels);
+                            j = readInt(v + 4);
+                            v += 8;
+                            for (; j > 0; --j) {
+                                readLabel(w + readInt(v + 4), labels);
+                                v += 8;
+                            }
+                            break;
+                        case ClassWriter.VAR_INSN:
+                        case ClassWriter.SBYTE_INSN:
+                        case ClassWriter.LDC_INSN:
+                            v += 2;
+                            break;
+                        case ClassWriter.SHORT_INSN:
+                        case ClassWriter.LDCW_INSN:
+                        case ClassWriter.FIELDORMETH_INSN:
+                        case ClassWriter.TYPE_INSN:
+                        case ClassWriter.IINC_INSN:
+                            v += 3;
+                            break;
+                        case ClassWriter.ITFMETH_INSN:
+                            v += 5;
+                            break;
+                        // case MANA_INSN:
+                        default:
+                            v += 4;
+                            break;
+                    }
+                }
+                // parses the try catch entries
+                j = readUnsignedShort(v);
+                v += 2;
+                for (; j > 0; --j) {
+                    Label start = readLabel(readUnsignedShort(v), labels);
+                    Label end = readLabel(readUnsignedShort(v + 2), labels);
+                    Label handler = readLabel(readUnsignedShort(v + 4), labels);
+                    int type = readUnsignedShort(v + 6);
+                    if (type == 0) {
+                        mv.visitTryCatchBlock(start, end, handler, null);
+                    } else {
+                        mv.visitTryCatchBlock(start,
+                                end,
+                                handler,
+                                readUTF8(items[type], c));
+                    }
+                    v += 8;
+                }
+                // parses the local variable, line number tables, and code
+                // attributes
+                int varTable = 0;
+                int varTypeTable = 0;
+                int stackMap = 0;
+                int frameCount = 0;
+                int frameMode = 0;
+                int frameOffset = 0;
+                int frameLocalCount = 0;
+                int frameLocalDiff = 0;
+                int frameStackCount = 0;
+                Object[] frameLocal = null;
+                Object[] frameStack = null;
+                boolean zip = true;
+                cattrs = null;
+                j = readUnsignedShort(v);
+                v += 2;
+                for (; j > 0; --j) {
+                    attrName = readUTF8(v, c);
+                    if ("LocalVariableTable".equals(attrName)) {
+                        if (!skipDebug) {
+                            varTable = v + 6;
+                            k = readUnsignedShort(v + 6);
+                            w = v + 8;
+                            for (; k > 0; --k) {
+                                label = readUnsignedShort(w);
+                                if (labels[label] == null) {
+                                    readLabel(label, labels).status |= Label.DEBUG;
+                                }
+                                label += readUnsignedShort(w + 2);
+                                if (labels[label] == null) {
+                                    readLabel(label, labels).status |= Label.DEBUG;
+                                }
+                                w += 10;
+                            }
+                        }
+                    } else if ("LocalVariableTypeTable".equals(attrName)) {
+                        varTypeTable = v + 6;
+                    } else if ("LineNumberTable".equals(attrName)) {
+                        if (!skipDebug) {
+                            k = readUnsignedShort(v + 6);
+                            w = v + 8;
+                            for (; k > 0; --k) {
+                                label = readUnsignedShort(w);
+                                if (labels[label] == null) {
+                                    readLabel(label, labels).status |= Label.DEBUG;
+                                }
+                                labels[label].line = readUnsignedShort(w + 2);
+                                w += 4;
+                            }
+                        }
+                    } else if (FRAMES && "StackMapTable".equals(attrName)) {
+                        if ((flags & SKIP_FRAMES) == 0) {
+                            stackMap = v + 8;
+                            frameCount = readUnsignedShort(v + 6);
+                        }
+                        /*
+                         * here we do not extract the labels corresponding to
+                         * the attribute content. This would require a full
+                         * parsing of the attribute, which would need to be
+                         * repeated in the second phase (see below). Instead the
+                         * content of the attribute is read one frame at a time
+                         * (i.e. after a frame has been visited, the next frame
+                         * is read), and the labels it contains are also
+                         * extracted one frame at a time. Thanks to the ordering
+                         * of frames, having only a "one frame lookahead" is not
+                         * a problem, i.e. it is not possible to see an offset
+                         * smaller than the offset of the current insn and for
+                         * which no Label exist.
+                         */
+                        // TODO true for frame offsets,
+                        // but for UNINITIALIZED type offsets?
+                    } else if (FRAMES && "StackMap".equals(attrName)) {
+                        if ((flags & SKIP_FRAMES) == 0) {
+                            stackMap = v + 8;
+                            frameCount = readUnsignedShort(v + 6);
+                            zip = false;
+                        }
+                        /*
+                         * IMPORTANT! here we assume that the frames are
+                         * ordered, as in the StackMapTable attribute, although
+                         * this is not guaranteed by the attribute format.
+                         */
+                    } else {
+                        for (k = 0; k < attrs.length; ++k) {
+                            if (attrs[k].type.equals(attrName)) {
+                                attr = attrs[k].read(this,
+                                        v + 6,
+                                        readInt(v + 2),
+                                        c,
+                                        codeStart - 8,
+                                        labels);
+                                if (attr != null) {
+                                    attr.next = cattrs;
+                                    cattrs = attr;
+                                }
+                            }
+                        }
+                    }
+                    v += 6 + readInt(v + 2);
+                }
+
+                // 2nd phase: visits each instruction
+                if (FRAMES && stackMap != 0) {
+                    // creates the very first (implicit) frame from the method
+                    // descriptor
+                    frameLocal = new Object[maxLocals];
+                    frameStack = new Object[maxStack];
+                    if (unzip) {
+                        int local = 0;
+                        if ((access & Opcodes.ACC_STATIC) == 0) {
+                            if ("<init>".equals(name)) {
+                                frameLocal[local++] = Opcodes.UNINITIALIZED_THIS;
+                            } else {
+                                frameLocal[local++] = readClass(header + 2, c);
+                            }
+                        }
+                        j = 1;
+                        loop: while (true) {
+                            k = j;
+                            switch (desc.charAt(j++)) {
+                                case 'Z':
+                                case 'C':
+                                case 'B':
+                                case 'S':
+                                case 'I':
+                                    frameLocal[local++] = Opcodes.INTEGER;
+                                    break;
+                                case 'F':
+                                    frameLocal[local++] = Opcodes.FLOAT;
+                                    break;
+                                case 'J':
+                                    frameLocal[local++] = Opcodes.LONG;
+                                    break;
+                                case 'D':
+                                    frameLocal[local++] = Opcodes.DOUBLE;
+                                    break;
+                                case '[':
+                                    while (desc.charAt(j) == '[') {
+                                        ++j;
+                                    }
+                                    if (desc.charAt(j) == 'L') {
+                                        ++j;
+                                        while (desc.charAt(j) != ';') {
+                                            ++j;
+                                        }
+                                    }
+                                    frameLocal[local++] = desc.substring(k, ++j);
+                                    break;
+                                case 'L':
+                                    while (desc.charAt(j) != ';') {
+                                        ++j;
+                                    }
+                                    frameLocal[local++] = desc.substring(k + 1,
+                                            j++);
+                                    break;
+                                default:
+                                    break loop;
+                            }
+                        }
+                        frameLocalCount = local;
+                    }
+                    /*
+                     * for the first explicit frame the offset is not
+                     * offset_delta + 1 but only offset_delta; setting the
+                     * implicit frame offset to -1 allow the use of the
+                     * "offset_delta + 1" rule in all cases
+                     */
+                    frameOffset = -1;
+                }
+                v = codeStart;
+                Label l;
+                while (v < codeEnd) {
+                    w = v - codeStart;
+
+                    l = labels[w];
+                    if (l != null) {
+                        mv.visitLabel(l);
+                        if (!skipDebug && l.line > 0) {
+                            mv.visitLineNumber(l.line, l);
+                        }
+                    }
+
+                    while (FRAMES && frameLocal != null
+                            && (frameOffset == w || frameOffset == -1))
+                    {
+                        // if there is a frame for this offset,
+                        // makes the visitor visit it,
+                        // and reads the next frame if there is one.
+                        if (!zip || unzip) {
+                            mv.visitFrame(Opcodes.F_NEW,
+                                    frameLocalCount,
+                                    frameLocal,
+                                    frameStackCount,
+                                    frameStack);
+                        } else if (frameOffset != -1) {
+                            mv.visitFrame(frameMode,
+                                    frameLocalDiff,
+                                    frameLocal,
+                                    frameStackCount,
+                                    frameStack);
+                        }
+
+                        if (frameCount > 0) {
+                            int tag, delta, n;
+                            if (zip) {
+                                tag = b[stackMap++] & 0xFF;
+                            } else {
+                                tag = MethodWriter.FULL_FRAME;
+                                frameOffset = -1;
+                            }
+                            frameLocalDiff = 0;
+                            if (tag < MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME)
+                            {
+                                delta = tag;
+                                frameMode = Opcodes.F_SAME;
+                                frameStackCount = 0;
+                            } else if (tag < MethodWriter.RESERVED) {
+                                delta = tag
+                                        - MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME;
+                                stackMap = readFrameType(frameStack,
+                                        0,
+                                        stackMap,
+                                        c,
+                                        labels);
+                                frameMode = Opcodes.F_SAME1;
+                                frameStackCount = 1;
+                            } else {
+                                delta = readUnsignedShort(stackMap);
+                                stackMap += 2;
+                                if (tag == MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
+                                {
+                                    stackMap = readFrameType(frameStack,
+                                            0,
+                                            stackMap,
+                                            c,
+                                            labels);
+                                    frameMode = Opcodes.F_SAME1;
+                                    frameStackCount = 1;
+                                } else if (tag >= MethodWriter.CHOP_FRAME
+                                        && tag < MethodWriter.SAME_FRAME_EXTENDED)
+                                {
+                                    frameMode = Opcodes.F_CHOP;
+                                    frameLocalDiff = MethodWriter.SAME_FRAME_EXTENDED
+                                            - tag;
+                                    frameLocalCount -= frameLocalDiff;
+                                    frameStackCount = 0;
+                                } else if (tag == MethodWriter.SAME_FRAME_EXTENDED)
+                                {
+                                    frameMode = Opcodes.F_SAME;
+                                    frameStackCount = 0;
+                                } else if (tag < MethodWriter.FULL_FRAME) {
+                                    j = unzip ? frameLocalCount : 0;
+                                    for (k = tag
+                                            - MethodWriter.SAME_FRAME_EXTENDED; k > 0; k--)
+                                    {
+                                        stackMap = readFrameType(frameLocal,
+                                                j++,
+                                                stackMap,
+                                                c,
+                                                labels);
+                                    }
+                                    frameMode = Opcodes.F_APPEND;
+                                    frameLocalDiff = tag
+                                            - MethodWriter.SAME_FRAME_EXTENDED;
+                                    frameLocalCount += frameLocalDiff;
+                                    frameStackCount = 0;
+                                } else { // if (tag == FULL_FRAME) {
+                                    frameMode = Opcodes.F_FULL;
+                                    n = frameLocalDiff = frameLocalCount = readUnsignedShort(stackMap);
+                                    stackMap += 2;
+                                    for (j = 0; n > 0; n--) {
+                                        stackMap = readFrameType(frameLocal,
+                                                j++,
+                                                stackMap,
+                                                c,
+                                                labels);
+                                    }
+                                    n = frameStackCount = readUnsignedShort(stackMap);
+                                    stackMap += 2;
+                                    for (j = 0; n > 0; n--) {
+                                        stackMap = readFrameType(frameStack,
+                                                j++,
+                                                stackMap,
+                                                c,
+                                                labels);
+                                    }
+                                }
+                            }
+                            frameOffset += delta + 1;
+                            readLabel(frameOffset, labels);
+
+                            --frameCount;
+                        } else {
+                            frameLocal = null;
+                        }
+                    }
+
+                    int opcode = b[v] & 0xFF;
+                    switch (ClassWriter.TYPE[opcode]) {
+                        case ClassWriter.NOARG_INSN:
+                            mv.visitInsn(opcode);
+                            v += 1;
+                            break;
+                        case ClassWriter.IMPLVAR_INSN:
+                            if (opcode > Opcodes.ISTORE) {
+                                opcode -= 59; // ISTORE_0
+                                mv.visitVarInsn(Opcodes.ISTORE + (opcode >> 2),
+                                        opcode & 0x3);
+                            } else {
+                                opcode -= 26; // ILOAD_0
+                                mv.visitVarInsn(Opcodes.ILOAD + (opcode >> 2),
+                                        opcode & 0x3);
+                            }
+                            v += 1;
+                            break;
+                        case ClassWriter.LABEL_INSN:
+                            mv.visitJumpInsn(opcode, labels[w
+                                    + readShort(v + 1)]);
+                            v += 3;
+                            break;
+                        case ClassWriter.LABELW_INSN:
+                            mv.visitJumpInsn(opcode - 33, labels[w
+                                    + readInt(v + 1)]);
+                            v += 5;
+                            break;
+                        case ClassWriter.WIDE_INSN:
+                            opcode = b[v + 1] & 0xFF;
+                            if (opcode == Opcodes.IINC) {
+                                mv.visitIincInsn(readUnsignedShort(v + 2),
+                                        readShort(v + 4));
+                                v += 6;
+                            } else {
+                                mv.visitVarInsn(opcode,
+                                        readUnsignedShort(v + 2));
+                                v += 4;
+                            }
+                            break;
+                        case ClassWriter.TABL_INSN:
+                            // skips 0 to 3 padding bytes
+                            v = v + 4 - (w & 3);
+                            // reads instruction
+                            label = w + readInt(v);
+                            int min = readInt(v + 4);
+                            int max = readInt(v + 8);
+                            v += 12;
+                            Label[] table = new Label[max - min + 1];
+                            for (j = 0; j < table.length; ++j) {
+                                table[j] = labels[w + readInt(v)];
+                                v += 4;
+                            }
+                            mv.visitTableSwitchInsn(min,
+                                    max,
+                                    labels[label],
+                                    table);
+                            break;
+                        case ClassWriter.LOOK_INSN:
+                            // skips 0 to 3 padding bytes
+                            v = v + 4 - (w & 3);
+                            // reads instruction
+                            label = w + readInt(v);
+                            j = readInt(v + 4);
+                            v += 8;
+                            int[] keys = new int[j];
+                            Label[] values = new Label[j];
+                            for (j = 0; j < keys.length; ++j) {
+                                keys[j] = readInt(v);
+                                values[j] = labels[w + readInt(v + 4)];
+                                v += 8;
+                            }
+                            mv.visitLookupSwitchInsn(labels[label],
+                                    keys,
+                                    values);
+                            break;
+                        case ClassWriter.VAR_INSN:
+                            mv.visitVarInsn(opcode, b[v + 1] & 0xFF);
+                            v += 2;
+                            break;
+                        case ClassWriter.SBYTE_INSN:
+                            mv.visitIntInsn(opcode, b[v + 1]);
+                            v += 2;
+                            break;
+                        case ClassWriter.SHORT_INSN:
+                            mv.visitIntInsn(opcode, readShort(v + 1));
+                            v += 3;
+                            break;
+                        case ClassWriter.LDC_INSN:
+                            mv.visitLdcInsn(readConst(b[v + 1] & 0xFF, c));
+                            v += 2;
+                            break;
+                        case ClassWriter.LDCW_INSN:
+                            mv.visitLdcInsn(readConst(readUnsignedShort(v + 1),
+                                    c));
+                            v += 3;
+                            break;
+                        case ClassWriter.FIELDORMETH_INSN:
+                        case ClassWriter.ITFMETH_INSN:
+                            int cpIndex = items[readUnsignedShort(v + 1)];
+                            String iowner = readClass(cpIndex, c);
+                            cpIndex = items[readUnsignedShort(cpIndex + 2)];
+                            String iname = readUTF8(cpIndex, c);
+                            String idesc = readUTF8(cpIndex + 2, c);
+                            if (opcode < Opcodes.INVOKEVIRTUAL) {
+                                mv.visitFieldInsn(opcode, iowner, iname, idesc);
+                            } else {
+                                mv.visitMethodInsn(opcode, iowner, iname, idesc);
+                            }
+                            if (opcode == Opcodes.INVOKEINTERFACE) {
+                                v += 5;
+                            } else {
+                                v += 3;
+                            }
+                            break;
+                        case ClassWriter.TYPE_INSN:
+                            mv.visitTypeInsn(opcode, readClass(v + 1, c));
+                            v += 3;
+                            break;
+                        case ClassWriter.IINC_INSN:
+                            mv.visitIincInsn(b[v + 1] & 0xFF, b[v + 2]);
+                            v += 3;
+                            break;
+                        // case MANA_INSN:
+                        default:
+                            mv.visitMultiANewArrayInsn(readClass(v + 1, c),
+                                    b[v + 3] & 0xFF);
+                            v += 4;
+                            break;
+                    }
+                }
+                l = labels[codeEnd - codeStart];
+                if (l != null) {
+                    mv.visitLabel(l);
+                }
+                // visits the local variable tables
+                if (!skipDebug && varTable != 0) {
+                    int[] typeTable = null;
+                    if (varTypeTable != 0) {
+                        k = readUnsignedShort(varTypeTable) * 3;
+                        w = varTypeTable + 2;
+                        typeTable = new int[k];
+                        while (k > 0) {
+                            typeTable[--k] = w + 6; // signature
+                            typeTable[--k] = readUnsignedShort(w + 8); // index
+                            typeTable[--k] = readUnsignedShort(w); // start
+                            w += 10;
+                        }
+                    }
+                    k = readUnsignedShort(varTable);
+                    w = varTable + 2;
+                    for (; k > 0; --k) {
+                        int start = readUnsignedShort(w);
+                        int length = readUnsignedShort(w + 2);
+                        int index = readUnsignedShort(w + 8);
+                        String vsignature = null;
+                        if (typeTable != null) {
+                            for (int a = 0; a < typeTable.length; a += 3) {
+                                if (typeTable[a] == start
+                                        && typeTable[a + 1] == index)
+                                {
+                                    vsignature = readUTF8(typeTable[a + 2], c);
+                                    break;
+                                }
+                            }
+                        }
+                        mv.visitLocalVariable(readUTF8(w + 4, c),
+                                readUTF8(w + 6, c),
+                                vsignature,
+                                labels[start],
+                                labels[start + length],
+                                index);
+                        w += 10;
+                    }
+                }
+                // visits the other attributes
+                while (cattrs != null) {
+                    attr = cattrs.next;
+                    cattrs.next = null;
+                    mv.visitAttribute(cattrs);
+                    cattrs = attr;
+                }
+                // visits the max stack and max locals values
+                mv.visitMaxs(maxStack, maxLocals);
+            }
+
+            if (mv != null) {
+                mv.visitEnd();
+            }
+        }
+
+        // visits the end of the class
+        classVisitor.visitEnd();
+    }
+
+    /**
+     * Reads parameter annotations and makes the given visitor visit them.
+     *
+     * @param v start offset in {@link #b b} of the annotations to be read.
+     * @param desc the method descriptor.
+     * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
+     *        {@link #readClass(int,char[]) readClass} or
+     *        {@link #readConst readConst}.
+     * @param visible <tt>true</tt> if the annotations to be read are visible
+     *        at runtime.
+     * @param mv the visitor that must visit the annotations.
+     */
+    private void readParameterAnnotations(
+        int v,
+        final String desc,
+        final char[] buf,
+        final boolean visible,
+        final MethodVisitor mv)
+    {
+        int i;
+        int n = b[v++] & 0xFF;
+        // workaround for a bug in javac (javac compiler generates a parameter
+        // annotation array whose size is equal to the number of parameters in
+        // the Java source file, while it should generate an array whose size is
+        // equal to the number of parameters in the method descriptor - which
+        // includes the synthetic parameters added by the compiler). This work-
+        // around supposes that the synthetic parameters are the first ones.
+        int synthetics = Type.getArgumentTypes(desc).length - n;
+        AnnotationVisitor av;
+        for (i = 0; i < synthetics; ++i) {
+            // virtual annotation to detect synthetic parameters in MethodWriter
+            av = mv.visitParameterAnnotation(i, "Ljava/lang/Synthetic;", false);
+            if (av != null) {
+                av.visitEnd();
+            }
+        }
+        for (; i < n + synthetics; ++i) {
+            int j = readUnsignedShort(v);
+            v += 2;
+            for (; j > 0; --j) {
+                av = mv.visitParameterAnnotation(i, readUTF8(v, buf), visible);
+                v = readAnnotationValues(v + 2, buf, true, av);
+            }
+        }
+    }
+
+    /**
+     * Reads the values of an annotation and makes the given visitor visit them.
+     *
+     * @param v the start offset in {@link #b b} of the values to be read
+     *        (including the unsigned short that gives the number of values).
+     * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
+     *        {@link #readClass(int,char[]) readClass} or
+     *        {@link #readConst readConst}.
+     * @param named if the annotation values are named or not.
+     * @param av the visitor that must visit the values.
+     * @return the end offset of the annotation values.
+     */
+    private int readAnnotationValues(
+        int v,
+        final char[] buf,
+        final boolean named,
+        final AnnotationVisitor av)
+    {
+        int i = readUnsignedShort(v);
+        v += 2;
+        if (named) {
+            for (; i > 0; --i) {
+                v = readAnnotationValue(v + 2, buf, readUTF8(v, buf), av);
+            }
+        } else {
+            for (; i > 0; --i) {
+                v = readAnnotationValue(v, buf, null, av);
+            }
+        }
+        if (av != null) {
+            av.visitEnd();
+        }
+        return v;
+    }
+
+    /**
+     * Reads a value of an annotation and makes the given visitor visit it.
+     *
+     * @param v the start offset in {@link #b b} of the value to be read (<i>not
+     *        including the value name constant pool index</i>).
+     * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
+     *        {@link #readClass(int,char[]) readClass} or
+     *        {@link #readConst readConst}.
+     * @param name the name of the value to be read.
+     * @param av the visitor that must visit the value.
+     * @return the end offset of the annotation value.
+     */
+    private int readAnnotationValue(
+        int v,
+        final char[] buf,
+        final String name,
+        final AnnotationVisitor av)
+    {
+        int i;
+        if (av == null) {
+            switch (b[v] & 0xFF) {
+                case 'e': // enum_const_value
+                    return v + 5;
+                case '@': // annotation_value
+                    return readAnnotationValues(v + 3, buf, true, null);
+                case '[': // array_value
+                    return readAnnotationValues(v + 1, buf, false, null);
+                default:
+                    return v + 3;
+            }
+        }
+        switch (b[v++] & 0xFF) {
+            case 'I': // pointer to CONSTANT_Integer
+            case 'J': // pointer to CONSTANT_Long
+            case 'F': // pointer to CONSTANT_Float
+            case 'D': // pointer to CONSTANT_Double
+                av.visit(name, readConst(readUnsignedShort(v), buf));
+                v += 2;
+                break;
+            case 'B': // pointer to CONSTANT_Byte
+                av.visit(name,
+                        new Byte((byte) readInt(items[readUnsignedShort(v)])));
+                v += 2;
+                break;
+            case 'Z': // pointer to CONSTANT_Boolean
+                av.visit(name, readInt(items[readUnsignedShort(v)]) == 0
+                        ? Boolean.FALSE
+                        : Boolean.TRUE);
+                v += 2;
+                break;
+            case 'S': // pointer to CONSTANT_Short
+                av.visit(name,
+                        new Short((short) readInt(items[readUnsignedShort(v)])));
+                v += 2;
+                break;
+            case 'C': // pointer to CONSTANT_Char
+                av.visit(name,
+                        new Character((char) readInt(items[readUnsignedShort(v)])));
+                v += 2;
+                break;
+            case 's': // pointer to CONSTANT_Utf8
+                av.visit(name, readUTF8(v, buf));
+                v += 2;
+                break;
+            case 'e': // enum_const_value
+                av.visitEnum(name, readUTF8(v, buf), readUTF8(v + 2, buf));
+                v += 4;
+                break;
+            case 'c': // class_info
+                av.visit(name, Type.getType(readUTF8(v, buf)));
+                v += 2;
+                break;
+            case '@': // annotation_value
+                v = readAnnotationValues(v + 2,
+                        buf,
+                        true,
+                        av.visitAnnotation(name, readUTF8(v, buf)));
+                break;
+            case '[': // array_value
+                int size = readUnsignedShort(v);
+                v += 2;
+                if (size == 0) {
+                    return readAnnotationValues(v - 2,
+                            buf,
+                            false,
+                            av.visitArray(name));
+                }
+                switch (this.b[v++] & 0xFF) {
+                    case 'B':
+                        byte[] bv = new byte[size];
+                        for (i = 0; i < size; i++) {
+                            bv[i] = (byte) readInt(items[readUnsignedShort(v)]);
+                            v += 3;
+                        }
+                        av.visit(name, bv);
+                        --v;
+                        break;
+                    case 'Z':
+                        boolean[] zv = new boolean[size];
+                        for (i = 0; i < size; i++) {
+                            zv[i] = readInt(items[readUnsignedShort(v)]) != 0;
+                            v += 3;
+                        }
+                        av.visit(name, zv);
+                        --v;
+                        break;
+                    case 'S':
+                        short[] sv = new short[size];
+                        for (i = 0; i < size; i++) {
+                            sv[i] = (short) readInt(items[readUnsignedShort(v)]);
+                            v += 3;
+                        }
+                        av.visit(name, sv);
+                        --v;
+                        break;
+                    case 'C':
+                        char[] cv = new char[size];
+                        for (i = 0; i < size; i++) {
+                            cv[i] = (char) readInt(items[readUnsignedShort(v)]);
+                            v += 3;
+                        }
+                        av.visit(name, cv);
+                        --v;
+                        break;
+                    case 'I':
+                        int[] iv = new int[size];
+                        for (i = 0; i < size; i++) {
+                            iv[i] = readInt(items[readUnsignedShort(v)]);
+                            v += 3;
+                        }
+                        av.visit(name, iv);
+                        --v;
+                        break;
+                    case 'J':
+                        long[] lv = new long[size];
+                        for (i = 0; i < size; i++) {
+                            lv[i] = readLong(items[readUnsignedShort(v)]);
+                            v += 3;
+                        }
+                        av.visit(name, lv);
+                        --v;
+                        break;
+                    case 'F':
+                        float[] fv = new float[size];
+                        for (i = 0; i < size; i++) {
+                            fv[i] = Float.intBitsToFloat(readInt(items[readUnsignedShort(v)]));
+                            v += 3;
+                        }
+                        av.visit(name, fv);
+                        --v;
+                        break;
+                    case 'D':
+                        double[] dv = new double[size];
+                        for (i = 0; i < size; i++) {
+                            dv[i] = Double.longBitsToDouble(readLong(items[readUnsignedShort(v)]));
+                            v += 3;
+                        }
+                        av.visit(name, dv);
+                        --v;
+                        break;
+                    default:
+                        v = readAnnotationValues(v - 3,
+                                buf,
+                                false,
+                                av.visitArray(name));
+                }
+        }
+        return v;
+    }
+
+    private int readFrameType(
+        final Object[] frame,
+        final int index,
+        int v,
+        final char[] buf,
+        final Label[] labels)
+    {
+        int type = b[v++] & 0xFF;
+        switch (type) {
+            case 0:
+                frame[index] = Opcodes.TOP;
+                break;
+            case 1:
+                frame[index] = Opcodes.INTEGER;
+                break;
+            case 2:
+                frame[index] = Opcodes.FLOAT;
+                break;
+            case 3:
+                frame[index] = Opcodes.DOUBLE;
+                break;
+            case 4:
+                frame[index] = Opcodes.LONG;
+                break;
+            case 5:
+                frame[index] = Opcodes.NULL;
+                break;
+            case 6:
+                frame[index] = Opcodes.UNINITIALIZED_THIS;
+                break;
+            case 7: // Object
+                frame[index] = readClass(v, buf);
+                v += 2;
+                break;
+            default: // Uninitialized
+                frame[index] = readLabel(readUnsignedShort(v), labels);
+                v += 2;
+        }
+        return v;
+    }
+
+    /**
+     * Returns the label corresponding to the given offset. The default
+     * implementation of this method creates a label for the given offset if it
+     * has not been already created.
+     *
+     * @param offset a bytecode offset in a method.
+     * @param labels the already created labels, indexed by their offset. If a
+     *        label already exists for offset this method must not create a new
+     *        one. Otherwise it must store the new label in this array.
+     * @return a non null Label, which must be equal to labels[offset].
+     */
+    protected Label readLabel(int offset, Label[] labels) {
+        if (labels[offset] == null) {
+            labels[offset] = new Label();
+        }
+        return labels[offset];
+    }
+
+    /**
+     * Reads an attribute in {@link #b b}.
+     *
+     * @param attrs prototypes of the attributes that must be parsed during the
+     *        visit of the class. Any attribute whose type is not equal to the
+     *        type of one the prototypes is ignored (i.e. an empty
+     *        {@link Attribute} instance is returned).
+     * @param type the type of the attribute.
+     * @param off index of the first byte of the attribute's content in
+     *        {@link #b b}. The 6 attribute header bytes, containing the type
+     *        and the length of the attribute, are not taken into account here
+     *        (they have already been read).
+     * @param len the length of the attribute's content.
+     * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
+     *        {@link #readClass(int,char[]) readClass} or
+     *        {@link #readConst readConst}.
+     * @param codeOff index of the first byte of code's attribute content in
+     *        {@link #b b}, or -1 if the attribute to be read is not a code
+     *        attribute. The 6 attribute header bytes, containing the type and
+     *        the length of the attribute, are not taken into account here.
+     * @param labels the labels of the method's code, or <tt>null</tt> if the
+     *        attribute to be read is not a code attribute.
+     * @return the attribute that has been read, or <tt>null</tt> to skip this
+     *         attribute.
+     */
+    private Attribute readAttribute(
+        final Attribute[] attrs,
+        final String type,
+        final int off,
+        final int len,
+        final char[] buf,
+        final int codeOff,
+        final Label[] labels)
+    {
+        for (int i = 0; i < attrs.length; ++i) {
+            if (attrs[i].type.equals(type)) {
+                return attrs[i].read(this, off, len, buf, codeOff, labels);
+            }
+        }
+        return new Attribute(type).read(this, off, len, null, -1, null);
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: low level parsing
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the start index of the constant pool item in {@link #b b}, plus
+     * one. <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     *
+     * @param item the index a constant pool item.
+     * @return the start index of the constant pool item in {@link #b b}, plus
+     *         one.
+     */
+    public int getItem(final int item) {
+        return items[item];
+    }
+
+    /**
+     * Reads a byte value in {@link #b b}. <i>This method is intended for
+     * {@link Attribute} sub classes, and is normally not needed by class
+     * generators or adapters.</i>
+     *
+     * @param index the start index of the value to be read in {@link #b b}.
+     * @return the read value.
+     */
+    public int readByte(final int index) {
+        return b[index] & 0xFF;
+    }
+
+    /**
+     * Reads an unsigned short value in {@link #b b}. <i>This method is
+     * intended for {@link Attribute} sub classes, and is normally not needed by
+     * class generators or adapters.</i>
+     *
+     * @param index the start index of the value to be read in {@link #b b}.
+     * @return the read value.
+     */
+    public int readUnsignedShort(final int index) {
+        byte[] b = this.b;
+        return ((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF);
+    }
+
+    /**
+     * Reads a signed short value in {@link #b b}. <i>This method is intended
+     * for {@link Attribute} sub classes, and is normally not needed by class
+     * generators or adapters.</i>
+     *
+     * @param index the start index of the value to be read in {@link #b b}.
+     * @return the read value.
+     */
+    public short readShort(final int index) {
+        byte[] b = this.b;
+        return (short) (((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF));
+    }
+
+    /**
+     * Reads a signed int value in {@link #b b}. <i>This method is intended for
+     * {@link Attribute} sub classes, and is normally not needed by class
+     * generators or adapters.</i>
+     *
+     * @param index the start index of the value to be read in {@link #b b}.
+     * @return the read value.
+     */
+    public int readInt(final int index) {
+        byte[] b = this.b;
+        return ((b[index] & 0xFF) << 24) | ((b[index + 1] & 0xFF) << 16)
+                | ((b[index + 2] & 0xFF) << 8) | (b[index + 3] & 0xFF);
+    }
+
+    /**
+     * Reads a signed long value in {@link #b b}. <i>This method is intended
+     * for {@link Attribute} sub classes, and is normally not needed by class
+     * generators or adapters.</i>
+     *
+     * @param index the start index of the value to be read in {@link #b b}.
+     * @return the read value.
+     */
+    public long readLong(final int index) {
+        long l1 = readInt(index);
+        long l0 = readInt(index + 4) & 0xFFFFFFFFL;
+        return (l1 << 32) | l0;
+    }
+
+    /**
+     * Reads an UTF8 string constant pool item in {@link #b b}. <i>This method
+     * is intended for {@link Attribute} sub classes, and is normally not needed
+     * by class generators or adapters.</i>
+     *
+     * @param index the start index of an unsigned short value in {@link #b b},
+     *        whose value is the index of an UTF8 constant pool item.
+     * @param buf buffer to be used to read the item. This buffer must be
+     *        sufficiently large. It is not automatically resized.
+     * @return the String corresponding to the specified UTF8 item.
+     */
+    public String readUTF8(int index, final char[] buf) {
+        int item = readUnsignedShort(index);
+        String s = strings[item];
+        if (s != null) {
+            return s;
+        }
+        index = items[item];
+        return strings[item] = readUTF(index + 2, readUnsignedShort(index), buf);
+    }
+
+    /**
+     * Reads UTF8 string in {@link #b b}.
+     *
+     * @param index start offset of the UTF8 string to be read.
+     * @param utfLen length of the UTF8 string to be read.
+     * @param buf buffer to be used to read the string. This buffer must be
+     *        sufficiently large. It is not automatically resized.
+     * @return the String corresponding to the specified UTF8 string.
+     */
+    private String readUTF(int index, final int utfLen, final char[] buf) {
+        int endIndex = index + utfLen;
+        byte[] b = this.b;
+        int strLen = 0;
+        int c, d, e;
+        while (index < endIndex) {
+            c = b[index++] & 0xFF;
+            switch (c >> 4) {
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                    // 0xxxxxxx
+                    buf[strLen++] = (char) c;
+                    break;
+                case 12:
+                case 13:
+                    // 110x xxxx 10xx xxxx
+                    d = b[index++];
+                    buf[strLen++] = (char) (((c & 0x1F) << 6) | (d & 0x3F));
+                    break;
+                default:
+                    // 1110 xxxx 10xx xxxx 10xx xxxx
+                    d = b[index++];
+                    e = b[index++];
+                    buf[strLen++] = (char) (((c & 0x0F) << 12)
+                            | ((d & 0x3F) << 6) | (e & 0x3F));
+                    break;
+            }
+        }
+        return new String(buf, 0, strLen);
+    }
+
+    /**
+     * Reads a class constant pool item in {@link #b b}. <i>This method is
+     * intended for {@link Attribute} sub classes, and is normally not needed by
+     * class generators or adapters.</i>
+     *
+     * @param index the start index of an unsigned short value in {@link #b b},
+     *        whose value is the index of a class constant pool item.
+     * @param buf buffer to be used to read the item. This buffer must be
+     *        sufficiently large. It is not automatically resized.
+     * @return the String corresponding to the specified class item.
+     */
+    public String readClass(final int index, final char[] buf) {
+        // computes the start index of the CONSTANT_Class item in b
+        // and reads the CONSTANT_Utf8 item designated by
+        // the first two bytes of this CONSTANT_Class item
+        return readUTF8(items[readUnsignedShort(index)], buf);
+    }
+
+    /**
+     * Reads a numeric or string constant pool item in {@link #b b}. <i>This
+     * method is intended for {@link Attribute} sub classes, and is normally not
+     * needed by class generators or adapters.</i>
+     *
+     * @param item the index of a constant pool item.
+     * @param buf buffer to be used to read the item. This buffer must be
+     *        sufficiently large. It is not automatically resized.
+     * @return the {@link Integer}, {@link Float}, {@link Long},
+     *         {@link Double}, {@link String} or {@link Type} corresponding to
+     *         the given constant pool item.
+     */
+    public Object readConst(final int item, final char[] buf) {
+        int index = items[item];
+        switch (b[index - 1]) {
+            case ClassWriter.INT:
+                return new Integer(readInt(index));
+            case ClassWriter.FLOAT:
+                return new Float(Float.intBitsToFloat(readInt(index)));
+            case ClassWriter.LONG:
+                return new Long(readLong(index));
+            case ClassWriter.DOUBLE:
+                return new Double(Double.longBitsToDouble(readLong(index)));
+            case ClassWriter.CLASS:
+                return Type.getObjectType(readUTF8(index, buf));
+                // case ClassWriter.STR:
+            default:
+                return readUTF8(index, buf);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java
new file mode 100644
index 00000000000..be0303af3e0
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java class. The methods of this interface must be called
+ * in the following order: <tt>visit</tt> [ <tt>visitSource</tt> ] [
+ * <tt>visitOuterClass</tt> ] ( <tt>visitAnnotation</tt> |
+ * <tt>visitAttribute</tt> )* (<tt>visitInnerClass</tt> |
+ * <tt>visitField</tt> | <tt>visitMethod</tt> )* <tt>visitEnd</tt>.
+ *
+ * @author Eric Bruneton
+ */
+public interface ClassVisitor {
+
+    /**
+     * Visits the header of the class.
+     *
+     * @param version the class version.
+     * @param access the class's access flags (see {@link Opcodes}). This
+     *        parameter also indicates if the class is deprecated.
+     * @param name the internal name of the class (see
+     *        {@link Type#getInternalName() getInternalName}).
+     * @param signature the signature of this class. May be <tt>null</tt> if
+     *        the class is not a generic one, and does not extend or implement
+     *        generic classes or interfaces.
+     * @param superName the internal of name of the super class (see
+     *        {@link Type#getInternalName() getInternalName}). For interfaces,
+     *        the super class is {@link Object}. May be <tt>null</tt>, but
+     *        only for the {@link Object} class.
+     * @param interfaces the internal names of the class's interfaces (see
+     *        {@link Type#getInternalName() getInternalName}). May be
+     *        <tt>null</tt>.
+     */
+    void visit(
+        int version,
+        int access,
+        String name,
+        String signature,
+        String superName,
+        String[] interfaces);
+
+    /**
+     * Visits the source of the class.
+     *
+     * @param source the name of the source file from which the class was
+     *        compiled. May be <tt>null</tt>.
+     * @param debug additional debug information to compute the correspondance
+     *        between source and compiled elements of the class. May be
+     *        <tt>null</tt>.
+     */
+    void visitSource(String source, String debug);
+
+    /**
+     * Visits the enclosing class of the class. This method must be called only
+     * if the class has an enclosing class.
+     *
+     * @param owner internal name of the enclosing class of the class.
+     * @param name the name of the method that contains the class, or
+     *        <tt>null</tt> if the class is not enclosed in a method of its
+     *        enclosing class.
+     * @param desc the descriptor of the method that contains the class, or
+     *        <tt>null</tt> if the class is not enclosed in a method of its
+     *        enclosing class.
+     */
+    void visitOuterClass(String owner, String name, String desc);
+
+    /**
+     * Visits an annotation of the class.
+     *
+     * @param desc the class descriptor of the annotation class.
+     * @param visible <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *         this visitor is not interested in visiting this annotation.
+     */
+    AnnotationVisitor visitAnnotation(String desc, boolean visible);
+
+    /**
+     * Visits a non standard attribute of the class.
+     *
+     * @param attr an attribute.
+     */
+    void visitAttribute(Attribute attr);
+
+    /**
+     * Visits information about an inner class. This inner class is not
+     * necessarily a member of the class being visited.
+     *
+     * @param name the internal name of an inner class (see
+     *        {@link Type#getInternalName() getInternalName}).
+     * @param outerName the internal name of the class to which the inner class
+     *        belongs (see {@link Type#getInternalName() getInternalName}). May
+     *        be <tt>null</tt> for not member classes.
+     * @param innerName the (simple) name of the inner class inside its
+     *        enclosing class. May be <tt>null</tt> for anonymous inner
+     *        classes.
+     * @param access the access flags of the inner class as originally declared
+     *        in the enclosing class.
+     */
+    void visitInnerClass(
+        String name,
+        String outerName,
+        String innerName,
+        int access);
+
+    /**
+     * Visits a field of the class.
+     *
+     * @param access the field's access flags (see {@link Opcodes}). This
+     *        parameter also indicates if the field is synthetic and/or
+     *        deprecated.
+     * @param name the field's name.
+     * @param desc the field's descriptor (see {@link Type Type}).
+     * @param signature the field's signature. May be <tt>null</tt> if the
+     *        field's type does not use generic types.
+     * @param value the field's initial value. This parameter, which may be
+     *        <tt>null</tt> if the field does not have an initial value, must
+     *        be an {@link Integer}, a {@link Float}, a {@link Long}, a
+     *        {@link Double} or a {@link String} (for <tt>int</tt>,
+     *        <tt>float</tt>, <tt>long</tt> or <tt>String</tt> fields
+     *        respectively). <i>This parameter is only used for static fields</i>.
+     *        Its value is ignored for non static fields, which must be
+     *        initialized through bytecode instructions in constructors or
+     *        methods.
+     * @return a visitor to visit field annotations and attributes, or
+     *         <tt>null</tt> if this class visitor is not interested in
+     *         visiting these annotations and attributes.
+     */
+    FieldVisitor visitField(
+        int access,
+        String name,
+        String desc,
+        String signature,
+        Object value);
+
+    /**
+     * Visits a method of the class. This method <i>must</i> return a new
+     * {@link MethodVisitor} instance (or <tt>null</tt>) each time it is
+     * called, i.e., it should not return a previously returned visitor.
+     *
+     * @param access the method's access flags (see {@link Opcodes}). This
+     *        parameter also indicates if the method is synthetic and/or
+     *        deprecated.
+     * @param name the method's name.
+     * @param desc the method's descriptor (see {@link Type Type}).
+     * @param signature the method's signature. May be <tt>null</tt> if the
+     *        method parameters, return type and exceptions do not use generic
+     *        types.
+     * @param exceptions the internal names of the method's exception classes
+     *        (see {@link Type#getInternalName() getInternalName}). May be
+     *        <tt>null</tt>.
+     * @return an object to visit the byte code of the method, or <tt>null</tt>
+     *         if this class visitor is not interested in visiting the code of
+     *         this method.
+     */
+    MethodVisitor visitMethod(
+        int access,
+        String name,
+        String desc,
+        String signature,
+        String[] exceptions);
+
+    /**
+     * Visits the end of the class. This method, which is the last one to be
+     * called, is used to inform the visitor that all the fields and methods of
+     * the class have been visited.
+     */
+    void visitEnd();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java
new file mode 100644
index 00000000000..4a8e3b91c90
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java
@@ -0,0 +1,1374 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A {@link ClassVisitor} that generates classes in bytecode form. More
+ * precisely this visitor generates a byte array conforming to the Java class
+ * file format. It can be used alone, to generate a Java class "from scratch",
+ * or with one or more {@link ClassReader ClassReader} and adapter class visitor
+ * to generate a modified class from one or more existing Java classes.
+ *
+ * @author Eric Bruneton
+ */
+public class ClassWriter implements ClassVisitor {
+
+    /**
+     * Flag to automatically compute the maximum stack size and the maximum
+     * number of local variables of methods. If this flag is set, then the
+     * arguments of the {@link MethodVisitor#visitMaxs visitMaxs} method of the
+     * {@link MethodVisitor} returned by the {@link #visitMethod visitMethod}
+     * method will be ignored, and computed automatically from the signature and
+     * the bytecode of each method.
+     *
+     * @see #ClassWriter(int)
+     */
+    public static final int COMPUTE_MAXS = 1;
+
+    /**
+     * Flag to automatically compute the stack map frames of methods from
+     * scratch. If this flag is set, then the calls to the
+     * {@link MethodVisitor#visitFrame} method are ignored, and the stack map
+     * frames are recomputed from the methods bytecode. The arguments of the
+     * {@link MethodVisitor#visitMaxs visitMaxs} method are also ignored and
+     * recomputed from the bytecode. In other words, computeFrames implies
+     * computeMaxs.
+     *
+     * @see #ClassWriter(int)
+     */
+    public static final int COMPUTE_FRAMES = 2;
+
+    /**
+     * The type of instructions without any argument.
+     */
+    static final int NOARG_INSN = 0;
+
+    /**
+     * The type of instructions with an signed byte argument.
+     */
+    static final int SBYTE_INSN = 1;
+
+    /**
+     * The type of instructions with an signed short argument.
+     */
+    static final int SHORT_INSN = 2;
+
+    /**
+     * The type of instructions with a local variable index argument.
+     */
+    static final int VAR_INSN = 3;
+
+    /**
+     * The type of instructions with an implicit local variable index argument.
+     */
+    static final int IMPLVAR_INSN = 4;
+
+    /**
+     * The type of instructions with a type descriptor argument.
+     */
+    static final int TYPE_INSN = 5;
+
+    /**
+     * The type of field and method invocations instructions.
+     */
+    static final int FIELDORMETH_INSN = 6;
+
+    /**
+     * The type of the INVOKEINTERFACE instruction.
+     */
+    static final int ITFMETH_INSN = 7;
+
+    /**
+     * The type of instructions with a 2 bytes bytecode offset label.
+     */
+    static final int LABEL_INSN = 8;
+
+    /**
+     * The type of instructions with a 4 bytes bytecode offset label.
+     */
+    static final int LABELW_INSN = 9;
+
+    /**
+     * The type of the LDC instruction.
+     */
+    static final int LDC_INSN = 10;
+
+    /**
+     * The type of the LDC_W and LDC2_W instructions.
+     */
+    static final int LDCW_INSN = 11;
+
+    /**
+     * The type of the IINC instruction.
+     */
+    static final int IINC_INSN = 12;
+
+    /**
+     * The type of the TABLESWITCH instruction.
+     */
+    static final int TABL_INSN = 13;
+
+    /**
+     * The type of the LOOKUPSWITCH instruction.
+     */
+    static final int LOOK_INSN = 14;
+
+    /**
+     * The type of the MULTIANEWARRAY instruction.
+     */
+    static final int MANA_INSN = 15;
+
+    /**
+     * The type of the WIDE instruction.
+     */
+    static final int WIDE_INSN = 16;
+
+    /**
+     * The instruction types of all JVM opcodes.
+     */
+    static final byte[] TYPE;
+
+    /**
+     * The type of CONSTANT_Class constant pool items.
+     */
+    static final int CLASS = 7;
+
+    /**
+     * The type of CONSTANT_Fieldref constant pool items.
+     */
+    static final int FIELD = 9;
+
+    /**
+     * The type of CONSTANT_Methodref constant pool items.
+     */
+    static final int METH = 10;
+
+    /**
+     * The type of CONSTANT_InterfaceMethodref constant pool items.
+     */
+    static final int IMETH = 11;
+
+    /**
+     * The type of CONSTANT_String constant pool items.
+     */
+    static final int STR = 8;
+
+    /**
+     * The type of CONSTANT_Integer constant pool items.
+     */
+    static final int INT = 3;
+
+    /**
+     * The type of CONSTANT_Float constant pool items.
+     */
+    static final int FLOAT = 4;
+
+    /**
+     * The type of CONSTANT_Long constant pool items.
+     */
+    static final int LONG = 5;
+
+    /**
+     * The type of CONSTANT_Double constant pool items.
+     */
+    static final int DOUBLE = 6;
+
+    /**
+     * The type of CONSTANT_NameAndType constant pool items.
+     */
+    static final int NAME_TYPE = 12;
+
+    /**
+     * The type of CONSTANT_Utf8 constant pool items.
+     */
+    static final int UTF8 = 1;
+
+    /**
+     * Normal type Item stored in the ClassWriter {@link ClassWriter#typeTable},
+     * instead of the constant pool, in order to avoid clashes with normal
+     * constant pool items in the ClassWriter constant pool's hash table.
+     */
+    static final int TYPE_NORMAL = 13;
+
+    /**
+     * Uninitialized type Item stored in the ClassWriter
+     * {@link ClassWriter#typeTable}, instead of the constant pool, in order to
+     * avoid clashes with normal constant pool items in the ClassWriter constant
+     * pool's hash table.
+     */
+    static final int TYPE_UNINIT = 14;
+
+    /**
+     * Merged type Item stored in the ClassWriter {@link ClassWriter#typeTable},
+     * instead of the constant pool, in order to avoid clashes with normal
+     * constant pool items in the ClassWriter constant pool's hash table.
+     */
+    static final int TYPE_MERGED = 15;
+
+    /**
+     * The class reader from which this class writer was constructed, if any.
+     */
+    ClassReader cr;
+
+    /**
+     * Minor and major version numbers of the class to be generated.
+     */
+    int version;
+
+    /**
+     * Index of the next item to be added in the constant pool.
+     */
+    int index;
+
+    /**
+     * The constant pool of this class.
+     */
+    final ByteVector pool;
+
+    /**
+     * The constant pool's hash table data.
+     */
+    Item[] items;
+
+    /**
+     * The threshold of the constant pool's hash table.
+     */
+    int threshold;
+
+    /**
+     * A reusable key used to look for items in the {@link #items} hash table.
+     */
+    final Item key;
+
+    /**
+     * A reusable key used to look for items in the {@link #items} hash table.
+     */
+    final Item key2;
+
+    /**
+     * A reusable key used to look for items in the {@link #items} hash table.
+     */
+    final Item key3;
+
+    /**
+     * A type table used to temporarily store internal names that will not
+     * necessarily be stored in the constant pool. This type table is used by
+     * the control flow and data flow analysis algorithm used to compute stack
+     * map frames from scratch. This array associates to each index <tt>i</tt>
+     * the Item whose index is <tt>i</tt>. All Item objects stored in this
+     * array are also stored in the {@link #items} hash table. These two arrays
+     * allow to retrieve an Item from its index or, conversely, to get the index
+     * of an Item from its value. Each Item stores an internal name in its
+     * {@link Item#strVal1} field.
+     */
+    Item[] typeTable;
+
+    /**
+     * Number of elements in the {@link #typeTable} array.
+     */
+    private short typeCount;
+
+    /**
+     * The access flags of this class.
+     */
+    private int access;
+
+    /**
+     * The constant pool item that contains the internal name of this class.
+     */
+    private int name;
+
+    /**
+     * The internal name of this class.
+     */
+    String thisName;
+
+    /**
+     * The constant pool item that contains the signature of this class.
+     */
+    private int signature;
+
+    /**
+     * The constant pool item that contains the internal name of the super class
+     * of this class.
+     */
+    private int superName;
+
+    /**
+     * Number of interfaces implemented or extended by this class or interface.
+     */
+    private int interfaceCount;
+
+    /**
+     * The interfaces implemented or extended by this class or interface. More
+     * precisely, this array contains the indexes of the constant pool items
+     * that contain the internal names of these interfaces.
+     */
+    private int[] interfaces;
+
+    /**
+     * The index of the constant pool item that contains the name of the source
+     * file from which this class was compiled.
+     */
+    private int sourceFile;
+
+    /**
+     * The SourceDebug attribute of this class.
+     */
+    private ByteVector sourceDebug;
+
+    /**
+     * The constant pool item that contains the name of the enclosing class of
+     * this class.
+     */
+    private int enclosingMethodOwner;
+
+    /**
+     * The constant pool item that contains the name and descriptor of the
+     * enclosing method of this class.
+     */
+    private int enclosingMethod;
+
+    /**
+     * The runtime visible annotations of this class.
+     */
+    private AnnotationWriter anns;
+
+    /**
+     * The runtime invisible annotations of this class.
+     */
+    private AnnotationWriter ianns;
+
+    /**
+     * The non standard attributes of this class.
+     */
+    private Attribute attrs;
+
+    /**
+     * The number of entries in the InnerClasses attribute.
+     */
+    private int innerClassesCount;
+
+    /**
+     * The InnerClasses attribute.
+     */
+    private ByteVector innerClasses;
+
+    /**
+     * The fields of this class. These fields are stored in a linked list of
+     * {@link FieldWriter} objects, linked to each other by their
+     * {@link FieldWriter#next} field. This field stores the first element of
+     * this list.
+     */
+    FieldWriter firstField;
+
+    /**
+     * The fields of this class. These fields are stored in a linked list of
+     * {@link FieldWriter} objects, linked to each other by their
+     * {@link FieldWriter#next} field. This field stores the last element of
+     * this list.
+     */
+    FieldWriter lastField;
+
+    /**
+     * The methods of this class. These methods are stored in a linked list of
+     * {@link MethodWriter} objects, linked to each other by their
+     * {@link MethodWriter#next} field. This field stores the first element of
+     * this list.
+     */
+    MethodWriter firstMethod;
+
+    /**
+     * The methods of this class. These methods are stored in a linked list of
+     * {@link MethodWriter} objects, linked to each other by their
+     * {@link MethodWriter#next} field. This field stores the last element of
+     * this list.
+     */
+    MethodWriter lastMethod;
+
+    /**
+     * <tt>true</tt> if the maximum stack size and number of local variables
+     * must be automatically computed.
+     */
+    private final boolean computeMaxs;
+
+    /**
+     * <tt>true</tt> if the stack map frames must be recomputed from scratch.
+     */
+    private final boolean computeFrames;
+
+    /**
+     * <tt>true</tt> if the stack map tables of this class are invalid. The
+     * {@link MethodWriter#resizeInstructions} method cannot transform existing
+     * stack map tables, and so produces potentially invalid classes when it is
+     * executed. In this case the class is reread and rewritten with the
+     * {@link #COMPUTE_FRAMES} option (the resizeInstructions method can resize
+     * stack map tables when this option is used).
+     */
+    boolean invalidFrames;
+
+    // ------------------------------------------------------------------------
+    // Static initializer
+    // ------------------------------------------------------------------------
+
+    /**
+     * Computes the instruction types of JVM opcodes.
+     */
+    static {
+        int i;
+        byte[] b = new byte[220];
+        String s = "AAAAAAAAAAAAAAAABCKLLDDDDDEEEEEEEEEEEEEEEEEEEEAAAAAAAADD"
+                + "DDDEEEEEEEEEEEEEEEEEEEEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+                + "AAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAIIIIIIIIIIIIIIIIDNOAA"
+                + "AAAAGGGGGGGHAFBFAAFFAAQPIIJJIIIIIIIIIIIIIIIIII";
+        for (i = 0; i < b.length; ++i) {
+            b[i] = (byte) (s.charAt(i) - 'A');
+        }
+        TYPE = b;
+
+        // code to generate the above string
+        //
+        // // SBYTE_INSN instructions
+        // b[Constants.NEWARRAY] = SBYTE_INSN;
+        // b[Constants.BIPUSH] = SBYTE_INSN;
+        //
+        // // SHORT_INSN instructions
+        // b[Constants.SIPUSH] = SHORT_INSN;
+        //
+        // // (IMPL)VAR_INSN instructions
+        // b[Constants.RET] = VAR_INSN;
+        // for (i = Constants.ILOAD; i <= Constants.ALOAD; ++i) {
+        // b[i] = VAR_INSN;
+        // }
+        // for (i = Constants.ISTORE; i <= Constants.ASTORE; ++i) {
+        // b[i] = VAR_INSN;
+        // }
+        // for (i = 26; i <= 45; ++i) { // ILOAD_0 to ALOAD_3
+        // b[i] = IMPLVAR_INSN;
+        // }
+        // for (i = 59; i <= 78; ++i) { // ISTORE_0 to ASTORE_3
+        // b[i] = IMPLVAR_INSN;
+        // }
+        //
+        // // TYPE_INSN instructions
+        // b[Constants.NEW] = TYPE_INSN;
+        // b[Constants.ANEWARRAY] = TYPE_INSN;
+        // b[Constants.CHECKCAST] = TYPE_INSN;
+        // b[Constants.INSTANCEOF] = TYPE_INSN;
+        //
+        // // (Set)FIELDORMETH_INSN instructions
+        // for (i = Constants.GETSTATIC; i <= Constants.INVOKESTATIC; ++i) {
+        // b[i] = FIELDORMETH_INSN;
+        // }
+        // b[Constants.INVOKEINTERFACE] = ITFMETH_INSN;
+        //
+        // // LABEL(W)_INSN instructions
+        // for (i = Constants.IFEQ; i <= Constants.JSR; ++i) {
+        // b[i] = LABEL_INSN;
+        // }
+        // b[Constants.IFNULL] = LABEL_INSN;
+        // b[Constants.IFNONNULL] = LABEL_INSN;
+        // b[200] = LABELW_INSN; // GOTO_W
+        // b[201] = LABELW_INSN; // JSR_W
+        // // temporary opcodes used internally by ASM - see Label and
+        // MethodWriter
+        // for (i = 202; i < 220; ++i) {
+        // b[i] = LABEL_INSN;
+        // }
+        //
+        // // LDC(_W) instructions
+        // b[Constants.LDC] = LDC_INSN;
+        // b[19] = LDCW_INSN; // LDC_W
+        // b[20] = LDCW_INSN; // LDC2_W
+        //
+        // // special instructions
+        // b[Constants.IINC] = IINC_INSN;
+        // b[Constants.TABLESWITCH] = TABL_INSN;
+        // b[Constants.LOOKUPSWITCH] = LOOK_INSN;
+        // b[Constants.MULTIANEWARRAY] = MANA_INSN;
+        // b[196] = WIDE_INSN; // WIDE
+        //
+        // for (i = 0; i < b.length; ++i) {
+        // System.err.print((char)('A' + b[i]));
+        // }
+        // System.err.println();
+    }
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new {@link ClassWriter} object.
+     *
+     * @param flags option flags that can be used to modify the default behavior
+     *        of this class. See {@link #COMPUTE_MAXS}, {@link #COMPUTE_FRAMES}.
+     */
+    public ClassWriter(final int flags) {
+        index = 1;
+        pool = new ByteVector();
+        items = new Item[256];
+        threshold = (int) (0.75d * items.length);
+        key = new Item();
+        key2 = new Item();
+        key3 = new Item();
+        this.computeMaxs = (flags & COMPUTE_MAXS) != 0;
+        this.computeFrames = (flags & COMPUTE_FRAMES) != 0;
+    }
+
+    /**
+     * Constructs a new {@link ClassWriter} object and enables optimizations for
+     * "mostly add" bytecode transformations. These optimizations are the
+     * following:
+     *
+     * <ul> <li>The constant pool from the original class is copied as is in
+     * the new class, which saves time. New constant pool entries will be added
+     * at the end if necessary, but unused constant pool entries <i>won't be
+     * removed</i>.</li> <li>Methods that are not transformed are copied as
+     * is in the new class, directly from the original class bytecode (i.e.
+     * without emitting visit events for all the method instructions), which
+     * saves a <i>lot</i> of time. Untransformed methods are detected by the
+     * fact that the {@link ClassReader} receives {@link MethodVisitor} objects
+     * that come from a {@link ClassWriter} (and not from a custom
+     * {@link ClassAdapter} or any other {@link ClassVisitor} instance).</li>
+     * </ul>
+     *
+     * @param classReader the {@link ClassReader} used to read the original
+     *        class. It will be used to copy the entire constant pool from the
+     *        original class and also to copy other fragments of original
+     *        bytecode where applicable.
+     * @param flags option flags that can be used to modify the default behavior
+     *        of this class. See {@link #COMPUTE_MAXS}, {@link #COMPUTE_FRAMES}.
+     */
+    public ClassWriter(final ClassReader classReader, final int flags) {
+        this(flags);
+        classReader.copyPool(this);
+        this.cr = classReader;
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the ClassVisitor interface
+    // ------------------------------------------------------------------------
+
+    public void visit(
+        final int version,
+        final int access,
+        final String name,
+        final String signature,
+        final String superName,
+        final String[] interfaces)
+    {
+        this.version = version;
+        this.access = access;
+        this.name = newClass(name);
+        thisName = name;
+        if (ClassReader.SIGNATURES && signature != null) {
+            this.signature = newUTF8(signature);
+        }
+        this.superName = superName == null ? 0 : newClass(superName);
+        if (interfaces != null && interfaces.length > 0) {
+            interfaceCount = interfaces.length;
+            this.interfaces = new int[interfaceCount];
+            for (int i = 0; i < interfaceCount; ++i) {
+                this.interfaces[i] = newClass(interfaces[i]);
+            }
+        }
+    }
+
+    public void visitSource(final String file, final String debug) {
+        if (file != null) {
+            sourceFile = newUTF8(file);
+        }
+        if (debug != null) {
+            sourceDebug = new ByteVector().putUTF8(debug);
+        }
+    }
+
+    public void visitOuterClass(
+        final String owner,
+        final String name,
+        final String desc)
+    {
+        enclosingMethodOwner = newClass(owner);
+        if (name != null && desc != null) {
+            enclosingMethod = newNameType(name, desc);
+        }
+    }
+
+    public AnnotationVisitor visitAnnotation(
+        final String desc,
+        final boolean visible)
+    {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        ByteVector bv = new ByteVector();
+        // write type, and reserve space for values count
+        bv.putShort(newUTF8(desc)).putShort(0);
+        AnnotationWriter aw = new AnnotationWriter(this, true, bv, bv, 2);
+        if (visible) {
+            aw.next = anns;
+            anns = aw;
+        } else {
+            aw.next = ianns;
+            ianns = aw;
+        }
+        return aw;
+    }
+
+    public void visitAttribute(final Attribute attr) {
+        attr.next = attrs;
+        attrs = attr;
+    }
+
+    public void visitInnerClass(
+        final String name,
+        final String outerName,
+        final String innerName,
+        final int access)
+    {
+        if (innerClasses == null) {
+            innerClasses = new ByteVector();
+        }
+        ++innerClassesCount;
+        innerClasses.putShort(name == null ? 0 : newClass(name));
+        innerClasses.putShort(outerName == null ? 0 : newClass(outerName));
+        innerClasses.putShort(innerName == null ? 0 : newUTF8(innerName));
+        innerClasses.putShort(access);
+    }
+
+    public FieldVisitor visitField(
+        final int access,
+        final String name,
+        final String desc,
+        final String signature,
+        final Object value)
+    {
+        return new FieldWriter(this, access, name, desc, signature, value);
+    }
+
+    public MethodVisitor visitMethod(
+        final int access,
+        final String name,
+        final String desc,
+        final String signature,
+        final String[] exceptions)
+    {
+        return new MethodWriter(this,
+                access,
+                name,
+                desc,
+                signature,
+                exceptions,
+                computeMaxs,
+                computeFrames);
+    }
+
+    public void visitEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Other public methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the bytecode of the class that was build with this class writer.
+     *
+     * @return the bytecode of the class that was build with this class writer.
+     */
+    public byte[] toByteArray() {
+        // computes the real size of the bytecode of this class
+        int size = 24 + 2 * interfaceCount;
+        int nbFields = 0;
+        FieldWriter fb = firstField;
+        while (fb != null) {
+            ++nbFields;
+            size += fb.getSize();
+            fb = fb.next;
+        }
+        int nbMethods = 0;
+        MethodWriter mb = firstMethod;
+        while (mb != null) {
+            ++nbMethods;
+            size += mb.getSize();
+            mb = mb.next;
+        }
+        int attributeCount = 0;
+        if (ClassReader.SIGNATURES && signature != 0) {
+            ++attributeCount;
+            size += 8;
+            newUTF8("Signature");
+        }
+        if (sourceFile != 0) {
+            ++attributeCount;
+            size += 8;
+            newUTF8("SourceFile");
+        }
+        if (sourceDebug != null) {
+            ++attributeCount;
+            size += sourceDebug.length + 4;
+            newUTF8("SourceDebugExtension");
+        }
+        if (enclosingMethodOwner != 0) {
+            ++attributeCount;
+            size += 10;
+            newUTF8("EnclosingMethod");
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            ++attributeCount;
+            size += 6;
+            newUTF8("Deprecated");
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0
+                && (version & 0xffff) < Opcodes.V1_5)
+        {
+            ++attributeCount;
+            size += 6;
+            newUTF8("Synthetic");
+        }
+        if (innerClasses != null) {
+            ++attributeCount;
+            size += 8 + innerClasses.length;
+            newUTF8("InnerClasses");
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            ++attributeCount;
+            size += 8 + anns.getSize();
+            newUTF8("RuntimeVisibleAnnotations");
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            ++attributeCount;
+            size += 8 + ianns.getSize();
+            newUTF8("RuntimeInvisibleAnnotations");
+        }
+        if (attrs != null) {
+            attributeCount += attrs.getCount();
+            size += attrs.getSize(this, null, 0, -1, -1);
+        }
+        size += pool.length;
+        // allocates a byte vector of this size, in order to avoid unnecessary
+        // arraycopy operations in the ByteVector.enlarge() method
+        ByteVector out = new ByteVector(size);
+        out.putInt(0xCAFEBABE).putInt(version);
+        out.putShort(index).putByteArray(pool.data, 0, pool.length);
+        out.putShort(access).putShort(name).putShort(superName);
+        out.putShort(interfaceCount);
+        for (int i = 0; i < interfaceCount; ++i) {
+            out.putShort(interfaces[i]);
+        }
+        out.putShort(nbFields);
+        fb = firstField;
+        while (fb != null) {
+            fb.put(out);
+            fb = fb.next;
+        }
+        out.putShort(nbMethods);
+        mb = firstMethod;
+        while (mb != null) {
+            mb.put(out);
+            mb = mb.next;
+        }
+        out.putShort(attributeCount);
+        if (ClassReader.SIGNATURES && signature != 0) {
+            out.putShort(newUTF8("Signature")).putInt(2).putShort(signature);
+        }
+        if (sourceFile != 0) {
+            out.putShort(newUTF8("SourceFile")).putInt(2).putShort(sourceFile);
+        }
+        if (sourceDebug != null) {
+            int len = sourceDebug.length - 2;
+            out.putShort(newUTF8("SourceDebugExtension")).putInt(len);
+            out.putByteArray(sourceDebug.data, 2, len);
+        }
+        if (enclosingMethodOwner != 0) {
+            out.putShort(newUTF8("EnclosingMethod")).putInt(4);
+            out.putShort(enclosingMethodOwner).putShort(enclosingMethod);
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            out.putShort(newUTF8("Deprecated")).putInt(0);
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0
+                && (version & 0xffff) < Opcodes.V1_5)
+        {
+            out.putShort(newUTF8("Synthetic")).putInt(0);
+        }
+        if (innerClasses != null) {
+            out.putShort(newUTF8("InnerClasses"));
+            out.putInt(innerClasses.length + 2).putShort(innerClassesCount);
+            out.putByteArray(innerClasses.data, 0, innerClasses.length);
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            out.putShort(newUTF8("RuntimeVisibleAnnotations"));
+            anns.put(out);
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            out.putShort(newUTF8("RuntimeInvisibleAnnotations"));
+            ianns.put(out);
+        }
+        if (attrs != null) {
+            attrs.put(this, null, 0, -1, -1, out);
+        }
+        if (invalidFrames) {
+            ClassWriter cw = new ClassWriter(COMPUTE_FRAMES);
+            new ClassReader(out.data).accept(cw, ClassReader.SKIP_FRAMES);
+            return cw.toByteArray();
+        }
+        return out.data;
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: constant pool management
+    // ------------------------------------------------------------------------
+
+    /**
+     * Adds a number or string constant to the constant pool of the class being
+     * build. Does nothing if the constant pool already contains a similar item.
+     *
+     * @param cst the value of the constant to be added to the constant pool.
+     *        This parameter must be an {@link Integer}, a {@link Float}, a
+     *        {@link Long}, a {@link Double}, a {@link String} or a
+     *        {@link Type}.
+     * @return a new or already existing constant item with the given value.
+     */
+    Item newConstItem(final Object cst) {
+        if (cst instanceof Integer) {
+            int val = ((Integer) cst).intValue();
+            return newInteger(val);
+        } else if (cst instanceof Byte) {
+            int val = ((Byte) cst).intValue();
+            return newInteger(val);
+        } else if (cst instanceof Character) {
+            int val = ((Character) cst).charValue();
+            return newInteger(val);
+        } else if (cst instanceof Short) {
+            int val = ((Short) cst).intValue();
+            return newInteger(val);
+        } else if (cst instanceof Boolean) {
+            int val = ((Boolean) cst).booleanValue() ? 1 : 0;
+            return newInteger(val);
+        } else if (cst instanceof Float) {
+            float val = ((Float) cst).floatValue();
+            return newFloat(val);
+        } else if (cst instanceof Long) {
+            long val = ((Long) cst).longValue();
+            return newLong(val);
+        } else if (cst instanceof Double) {
+            double val = ((Double) cst).doubleValue();
+            return newDouble(val);
+        } else if (cst instanceof String) {
+            return newString((String) cst);
+        } else if (cst instanceof Type) {
+            Type t = (Type) cst;
+            return newClassItem(t.getSort() == Type.OBJECT
+                    ? t.getInternalName()
+                    : t.getDescriptor());
+        } else {
+            throw new IllegalArgumentException("value " + cst);
+        }
+    }
+
+    /**
+     * Adds a number or string constant to the constant pool of the class being
+     * build. Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     *
+     * @param cst the value of the constant to be added to the constant pool.
+     *        This parameter must be an {@link Integer}, a {@link Float}, a
+     *        {@link Long}, a {@link Double} or a {@link String}.
+     * @return the index of a new or already existing constant item with the
+     *         given value.
+     */
+    public int newConst(final Object cst) {
+        return newConstItem(cst).index;
+    }
+
+    /**
+     * Adds an UTF8 string to the constant pool of the class being build. Does
+     * nothing if the constant pool already contains a similar item. <i>This
+     * method is intended for {@link Attribute} sub classes, and is normally not
+     * needed by class generators or adapters.</i>
+     *
+     * @param value the String value.
+     * @return the index of a new or already existing UTF8 item.
+     */
+    public int newUTF8(final String value) {
+        key.set(UTF8, value, null, null);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(UTF8).putUTF8(value);
+            result = new Item(index++, key);
+            put(result);
+        }
+        return result.index;
+    }
+
+    /**
+     * Adds a class reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     *
+     * @param value the internal name of the class.
+     * @return a new or already existing class reference item.
+     */
+    Item newClassItem(final String value) {
+        key2.set(CLASS, value, null, null);
+        Item result = get(key2);
+        if (result == null) {
+            pool.put12(CLASS, newUTF8(value));
+            result = new Item(index++, key2);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a class reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     *
+     * @param value the internal name of the class.
+     * @return the index of a new or already existing class reference item.
+     */
+    public int newClass(final String value) {
+        return newClassItem(value).index;
+    }
+
+    /**
+     * Adds a field reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     *
+     * @param owner the internal name of the field's owner class.
+     * @param name the field's name.
+     * @param desc the field's descriptor.
+     * @return a new or already existing field reference item.
+     */
+    Item newFieldItem(final String owner, final String name, final String desc)
+    {
+        key3.set(FIELD, owner, name, desc);
+        Item result = get(key3);
+        if (result == null) {
+            put122(FIELD, newClass(owner), newNameType(name, desc));
+            result = new Item(index++, key3);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a field reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     *
+     * @param owner the internal name of the field's owner class.
+     * @param name the field's name.
+     * @param desc the field's descriptor.
+     * @return the index of a new or already existing field reference item.
+     */
+    public int newField(final String owner, final String name, final String desc)
+    {
+        return newFieldItem(owner, name, desc).index;
+    }
+
+    /**
+     * Adds a method reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     *
+     * @param owner the internal name of the method's owner class.
+     * @param name the method's name.
+     * @param desc the method's descriptor.
+     * @param itf <tt>true</tt> if <tt>owner</tt> is an interface.
+     * @return a new or already existing method reference item.
+     */
+    Item newMethodItem(
+        final String owner,
+        final String name,
+        final String desc,
+        final boolean itf)
+    {
+        int type = itf ? IMETH : METH;
+        key3.set(type, owner, name, desc);
+        Item result = get(key3);
+        if (result == null) {
+            put122(type, newClass(owner), newNameType(name, desc));
+            result = new Item(index++, key3);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a method reference to the constant pool of the class being build.
+     * Does nothing if the constant pool already contains a similar item.
+     * <i>This method is intended for {@link Attribute} sub classes, and is
+     * normally not needed by class generators or adapters.</i>
+     *
+     * @param owner the internal name of the method's owner class.
+     * @param name the method's name.
+     * @param desc the method's descriptor.
+     * @param itf <tt>true</tt> if <tt>owner</tt> is an interface.
+     * @return the index of a new or already existing method reference item.
+     */
+    public int newMethod(
+        final String owner,
+        final String name,
+        final String desc,
+        final boolean itf)
+    {
+        return newMethodItem(owner, name, desc, itf).index;
+    }
+
+    /**
+     * Adds an integer to the constant pool of the class being build. Does
+     * nothing if the constant pool already contains a similar item.
+     *
+     * @param value the int value.
+     * @return a new or already existing int item.
+     */
+    Item newInteger(final int value) {
+        key.set(value);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(INT).putInt(value);
+            result = new Item(index++, key);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a float to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item.
+     *
+     * @param value the float value.
+     * @return a new or already existing float item.
+     */
+    Item newFloat(final float value) {
+        key.set(value);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(FLOAT).putInt(key.intVal);
+            result = new Item(index++, key);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a long to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item.
+     *
+     * @param value the long value.
+     * @return a new or already existing long item.
+     */
+    Item newLong(final long value) {
+        key.set(value);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(LONG).putLong(value);
+            result = new Item(index, key);
+            put(result);
+            index += 2;
+        }
+        return result;
+    }
+
+    /**
+     * Adds a double to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item.
+     *
+     * @param value the double value.
+     * @return a new or already existing double item.
+     */
+    Item newDouble(final double value) {
+        key.set(value);
+        Item result = get(key);
+        if (result == null) {
+            pool.putByte(DOUBLE).putLong(key.longVal);
+            result = new Item(index, key);
+            put(result);
+            index += 2;
+        }
+        return result;
+    }
+
+    /**
+     * Adds a string to the constant pool of the class being build. Does nothing
+     * if the constant pool already contains a similar item.
+     *
+     * @param value the String value.
+     * @return a new or already existing string item.
+     */
+    private Item newString(final String value) {
+        key2.set(STR, value, null, null);
+        Item result = get(key2);
+        if (result == null) {
+            pool.put12(STR, newUTF8(value));
+            result = new Item(index++, key2);
+            put(result);
+        }
+        return result;
+    }
+
+    /**
+     * Adds a name and type to the constant pool of the class being build. Does
+     * nothing if the constant pool already contains a similar item. <i>This
+     * method is intended for {@link Attribute} sub classes, and is normally not
+     * needed by class generators or adapters.</i>
+     *
+     * @param name a name.
+     * @param desc a type descriptor.
+     * @return the index of a new or already existing name and type item.
+     */
+    public int newNameType(final String name, final String desc) {
+        key2.set(NAME_TYPE, name, desc, null);
+        Item result = get(key2);
+        if (result == null) {
+            put122(NAME_TYPE, newUTF8(name), newUTF8(desc));
+            result = new Item(index++, key2);
+            put(result);
+        }
+        return result.index;
+    }
+
+    /**
+     * Adds the given internal name to {@link #typeTable} and returns its index.
+     * Does nothing if the type table already contains this internal name.
+     *
+     * @param type the internal name to be added to the type table.
+     * @return the index of this internal name in the type table.
+     */
+    int addType(final String type) {
+        key.set(TYPE_NORMAL, type, null, null);
+        Item result = get(key);
+        if (result == null) {
+            result = addType(key);
+        }
+        return result.index;
+    }
+
+    /**
+     * Adds the given "uninitialized" type to {@link #typeTable} and returns its
+     * index. This method is used for UNINITIALIZED types, made of an internal
+     * name and a bytecode offset.
+     *
+     * @param type the internal name to be added to the type table.
+     * @param offset the bytecode offset of the NEW instruction that created
+     *        this UNINITIALIZED type value.
+     * @return the index of this internal name in the type table.
+     */
+    int addUninitializedType(final String type, final int offset) {
+        key.type = TYPE_UNINIT;
+        key.intVal = offset;
+        key.strVal1 = type;
+        key.hashCode = 0x7FFFFFFF & (TYPE_UNINIT + type.hashCode() + offset);
+        Item result = get(key);
+        if (result == null) {
+            result = addType(key);
+        }
+        return result.index;
+    }
+
+    /**
+     * Adds the given Item to {@link #typeTable}.
+     *
+     * @param item the value to be added to the type table.
+     * @return the added Item, which a new Item instance with the same value as
+     *         the given Item.
+     */
+    private Item addType(final Item item) {
+        ++typeCount;
+        Item result = new Item(typeCount, key);
+        put(result);
+        if (typeTable == null) {
+            typeTable = new Item[16];
+        }
+        if (typeCount == typeTable.length) {
+            Item[] newTable = new Item[2 * typeTable.length];
+            System.arraycopy(typeTable, 0, newTable, 0, typeTable.length);
+            typeTable = newTable;
+        }
+        typeTable[typeCount] = result;
+        return result;
+    }
+
+    /**
+     * Returns the index of the common super type of the two given types. This
+     * method calls {@link #getCommonSuperClass} and caches the result in the
+     * {@link #items} hash table to speedup future calls with the same
+     * parameters.
+     *
+     * @param type1 index of an internal name in {@link #typeTable}.
+     * @param type2 index of an internal name in {@link #typeTable}.
+     * @return the index of the common super type of the two given types.
+     */
+    int getMergedType(final int type1, final int type2) {
+        key2.type = TYPE_MERGED;
+        key2.longVal = type1 | (((long) type2) << 32);
+        key2.hashCode = 0x7FFFFFFF & (TYPE_MERGED + type1 + type2);
+        Item result = get(key2);
+        if (result == null) {
+            String t = typeTable[type1].strVal1;
+            String u = typeTable[type2].strVal1;
+            key2.intVal = addType(getCommonSuperClass(t, u));
+            result = new Item((short) 0, key2);
+            put(result);
+        }
+        return result.intVal;
+    }
+
+    /**
+     * Returns the common super type of the two given types. The default
+     * implementation of this method <i>loads<i> the two given classes and uses
+     * the java.lang.Class methods to find the common super class. It can be
+     * overridden to compute this common super type in other ways, in particular
+     * without actually loading any class, or to take into account the class
+     * that is currently being generated by this ClassWriter, which can of
+     * course not be loaded since it is under construction.
+     *
+     * @param type1 the internal name of a class.
+     * @param type2 the internal name of another class.
+     * @return the internal name of the common super class of the two given
+     *         classes.
+     */
+    protected String getCommonSuperClass(final String type1, final String type2)
+    {
+        Class c, d;
+        try {
+            c = Class.forName(type1.replace('/', '.'));
+            d = Class.forName(type2.replace('/', '.'));
+        } catch (Exception e) {
+            throw new RuntimeException(e.toString());
+        }
+        if (c.isAssignableFrom(d)) {
+            return type1;
+        }
+        if (d.isAssignableFrom(c)) {
+            return type2;
+        }
+        if (c.isInterface() || d.isInterface()) {
+            return "java/lang/Object";
+        } else {
+            do {
+                c = c.getSuperclass();
+            } while (!c.isAssignableFrom(d));
+            return c.getName().replace('.', '/');
+        }
+    }
+
+    /**
+     * Returns the constant pool's hash table item which is equal to the given
+     * item.
+     *
+     * @param key a constant pool item.
+     * @return the constant pool's hash table item which is equal to the given
+     *         item, or <tt>null</tt> if there is no such item.
+     */
+    private Item get(final Item key) {
+        Item i = items[key.hashCode % items.length];
+        while (i != null && !key.isEqualTo(i)) {
+            i = i.next;
+        }
+        return i;
+    }
+
+    /**
+     * Puts the given item in the constant pool's hash table. The hash table
+     * <i>must</i> not already contains this item.
+     *
+     * @param i the item to be added to the constant pool's hash table.
+     */
+    private void put(final Item i) {
+        if (index > threshold) {
+            int ll = items.length;
+            int nl = ll * 2 + 1;
+            Item[] newItems = new Item[nl];
+            for (int l = ll - 1; l >= 0; --l) {
+                Item j = items[l];
+                while (j != null) {
+                    int index = j.hashCode % newItems.length;
+                    Item k = j.next;
+                    j.next = newItems[index];
+                    newItems[index] = j;
+                    j = k;
+                }
+            }
+            items = newItems;
+            threshold = (int) (nl * 0.75);
+        }
+        int index = i.hashCode % items.length;
+        i.next = items[index];
+        items[index] = i;
+    }
+
+    /**
+     * Puts one byte and two shorts into the constant pool.
+     *
+     * @param b a byte.
+     * @param s1 a short.
+     * @param s2 another short.
+     */
+    private void put122(final int b, final int s1, final int s2) {
+        pool.put12(b, s1).putShort(s2);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java
new file mode 100644
index 00000000000..ec8547331bf
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * An edge in the control flow graph of a method body. See {@link Label Label}.
+ *
+ * @author Eric Bruneton
+ */
+class Edge {
+
+    /**
+     * Denotes a normal control flow graph edge.
+     */
+    static final int NORMAL = 0;
+
+    /**
+     * Denotes a control flow graph edge corresponding to an exception handler.
+     * More precisely any {@link Edge} whose {@link #info} is strictly positive
+     * corresponds to an exception handler. The actual value of {@link #info} is
+     * the index, in the {@link ClassWriter} type table, of the exception that
+     * is catched.
+     */
+    static final int EXCEPTION = 0x7FFFFFFF;
+
+    /**
+     * Information about this control flow graph edge. If
+     * {@link ClassWriter#COMPUTE_MAXS} is used this field is the (relative)
+     * stack size in the basic block from which this edge originates. This size
+     * is equal to the stack size at the "jump" instruction to which this edge
+     * corresponds, relatively to the stack size at the beginning of the
+     * originating basic block. If {@link ClassWriter#COMPUTE_FRAMES} is used,
+     * this field is the kind of this control flow graph edge (i.e. NORMAL or
+     * EXCEPTION).
+     */
+    int info;
+
+    /**
+     * The successor block of the basic block from which this edge originates.
+     */
+    Label successor;
+
+    /**
+     * The next edge in the list of successors of the originating basic block.
+     * See {@link Label#successors successors}.
+     */
+    Edge next;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java
new file mode 100644
index 00000000000..155041b30a9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java field. The methods of this interface must be called
+ * in the following order: ( <tt>visitAnnotation</tt> |
+ * <tt>visitAttribute</tt> )* <tt>visitEnd</tt>.
+ *
+ * @author Eric Bruneton
+ */
+public interface FieldVisitor {
+
+    /**
+     * Visits an annotation of the field.
+     *
+     * @param desc the class descriptor of the annotation class.
+     * @param visible <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *         this visitor is not interested in visiting this annotation.
+     */
+    AnnotationVisitor visitAnnotation(String desc, boolean visible);
+
+    /**
+     * Visits a non standard attribute of the field.
+     *
+     * @param attr an attribute.
+     */
+    void visitAttribute(Attribute attr);
+
+    /**
+     * Visits the end of the field. This method, which is the last one to be
+     * called, is used to inform the visitor that all the annotations and
+     * attributes of the field have been visited.
+     */
+    void visitEnd();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java
new file mode 100644
index 00000000000..5fb322b3677
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * An {@link FieldVisitor} that generates Java fields in bytecode form.
+ *
+ * @author Eric Bruneton
+ */
+final class FieldWriter implements FieldVisitor {
+
+    /**
+     * Next field writer (see {@link ClassWriter#firstField firstField}).
+     */
+    FieldWriter next;
+
+    /**
+     * The class writer to which this field must be added.
+     */
+    private final ClassWriter cw;
+
+    /**
+     * Access flags of this field.
+     */
+    private final int access;
+
+    /**
+     * The index of the constant pool item that contains the name of this
+     * method.
+     */
+    private final int name;
+
+    /**
+     * The index of the constant pool item that contains the descriptor of this
+     * field.
+     */
+    private final int desc;
+
+    /**
+     * The index of the constant pool item that contains the signature of this
+     * field.
+     */
+    private int signature;
+
+    /**
+     * The index of the constant pool item that contains the constant value of
+     * this field.
+     */
+    private int value;
+
+    /**
+     * The runtime visible annotations of this field. May be <tt>null</tt>.
+     */
+    private AnnotationWriter anns;
+
+    /**
+     * The runtime invisible annotations of this field. May be <tt>null</tt>.
+     */
+    private AnnotationWriter ianns;
+
+    /**
+     * The non standard attributes of this field. May be <tt>null</tt>.
+     */
+    private Attribute attrs;
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new {@link FieldWriter}.
+     *
+     * @param cw the class writer to which this field must be added.
+     * @param access the field's access flags (see {@link Opcodes}).
+     * @param name the field's name.
+     * @param desc the field's descriptor (see {@link Type}).
+     * @param signature the field's signature. May be <tt>null</tt>.
+     * @param value the field's constant value. May be <tt>null</tt>.
+     */
+    FieldWriter(
+        final ClassWriter cw,
+        final int access,
+        final String name,
+        final String desc,
+        final String signature,
+        final Object value)
+    {
+        if (cw.firstField == null) {
+            cw.firstField = this;
+        } else {
+            cw.lastField.next = this;
+        }
+        cw.lastField = this;
+        this.cw = cw;
+        this.access = access;
+        this.name = cw.newUTF8(name);
+        this.desc = cw.newUTF8(desc);
+        if (ClassReader.SIGNATURES && signature != null) {
+            this.signature = cw.newUTF8(signature);
+        }
+        if (value != null) {
+            this.value = cw.newConstItem(value).index;
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the FieldVisitor interface
+    // ------------------------------------------------------------------------
+
+    public AnnotationVisitor visitAnnotation(
+        final String desc,
+        final boolean visible)
+    {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        ByteVector bv = new ByteVector();
+        // write type, and reserve space for values count
+        bv.putShort(cw.newUTF8(desc)).putShort(0);
+        AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+        if (visible) {
+            aw.next = anns;
+            anns = aw;
+        } else {
+            aw.next = ianns;
+            ianns = aw;
+        }
+        return aw;
+    }
+
+    public void visitAttribute(final Attribute attr) {
+        attr.next = attrs;
+        attrs = attr;
+    }
+
+    public void visitEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the size of this field.
+     *
+     * @return the size of this field.
+     */
+    int getSize() {
+        int size = 8;
+        if (value != 0) {
+            cw.newUTF8("ConstantValue");
+            size += 8;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0
+                && (cw.version & 0xffff) < Opcodes.V1_5)
+        {
+            cw.newUTF8("Synthetic");
+            size += 6;
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            cw.newUTF8("Deprecated");
+            size += 6;
+        }
+        if (ClassReader.SIGNATURES && signature != 0) {
+            cw.newUTF8("Signature");
+            size += 8;
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            cw.newUTF8("RuntimeVisibleAnnotations");
+            size += 8 + anns.getSize();
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            cw.newUTF8("RuntimeInvisibleAnnotations");
+            size += 8 + ianns.getSize();
+        }
+        if (attrs != null) {
+            size += attrs.getSize(cw, null, 0, -1, -1);
+        }
+        return size;
+    }
+
+    /**
+     * Puts the content of this field into the given byte vector.
+     *
+     * @param out where the content of this field must be put.
+     */
+    void put(final ByteVector out) {
+        out.putShort(access).putShort(name).putShort(desc);
+        int attributeCount = 0;
+        if (value != 0) {
+            ++attributeCount;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0
+                && (cw.version & 0xffff) < Opcodes.V1_5)
+        {
+            ++attributeCount;
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            ++attributeCount;
+        }
+        if (ClassReader.SIGNATURES && signature != 0) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            ++attributeCount;
+        }
+        if (attrs != null) {
+            attributeCount += attrs.getCount();
+        }
+        out.putShort(attributeCount);
+        if (value != 0) {
+            out.putShort(cw.newUTF8("ConstantValue"));
+            out.putInt(2).putShort(value);
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0
+                && (cw.version & 0xffff) < Opcodes.V1_5)
+        {
+            out.putShort(cw.newUTF8("Synthetic")).putInt(0);
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            out.putShort(cw.newUTF8("Deprecated")).putInt(0);
+        }
+        if (ClassReader.SIGNATURES && signature != 0) {
+            out.putShort(cw.newUTF8("Signature"));
+            out.putInt(2).putShort(signature);
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            out.putShort(cw.newUTF8("RuntimeVisibleAnnotations"));
+            anns.put(out);
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations"));
+            ianns.put(out);
+        }
+        if (attrs != null) {
+            attrs.put(cw, null, 0, -1, -1, out);
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java
new file mode 100644
index 00000000000..4c6f598bd9a
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java
@@ -0,0 +1,1432 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * Information about the input and output stack map frames of a basic block.
+ *
+ * @author Eric Bruneton
+ */
+final class Frame {
+
+    /*
+     * Frames are computed in a two steps process: during the visit of each
+     * instruction, the state of the frame at the end of current basic block is
+     * updated by simulating the action of the instruction on the previous state
+     * of this so called "output frame". In visitMaxs, a fix point algorithm is
+     * used to compute the "input frame" of each basic block, i.e. the stack map
+     * frame at the begining of the basic block, starting from the input frame
+     * of the first basic block (which is computed from the method descriptor),
+     * and by using the previously computed output frames to compute the input
+     * state of the other blocks.
+     *
+     * All output and input frames are stored as arrays of integers. Reference
+     * and array types are represented by an index into a type table (which is
+     * not the same as the constant pool of the class, in order to avoid adding
+     * unnecessary constants in the pool - not all computed frames will end up
+     * being stored in the stack map table). This allows very fast type
+     * comparisons.
+     *
+     * Output stack map frames are computed relatively to the input frame of the
+     * basic block, which is not yet known when output frames are computed. It
+     * is therefore necessary to be able to represent abstract types such as
+     * "the type at position x in the input frame locals" or "the type at
+     * position x from the top of the input frame stack" or even "the type at
+     * position x in the input frame, with y more (or less) array dimensions".
+     * This explains the rather complicated type format used in output frames.
+     *
+     * This format is the following: DIM KIND VALUE (4, 4 and 24 bits). DIM is a
+     * signed number of array dimensions (from -8 to 7). KIND is either BASE,
+     * LOCAL or STACK. BASE is used for types that are not relative to the input
+     * frame. LOCAL is used for types that are relative to the input local
+     * variable types. STACK is used for types that are relative to the input
+     * stack types. VALUE depends on KIND. For LOCAL types, it is an index in
+     * the input local variable types. For STACK types, it is a position
+     * relatively to the top of input frame stack. For BASE types, it is either
+     * one of the constants defined in FrameVisitor, or for OBJECT and
+     * UNINITIALIZED types, a tag and an index in the type table.
+     *
+     * Output frames can contain types of any kind and with a positive or
+     * negative dimension (and even unassigned types, represented by 0 - which
+     * does not correspond to any valid type value). Input frames can only
+     * contain BASE types of positive or null dimension. In all cases the type
+     * table contains only internal type names (array type descriptors are
+     * forbidden - dimensions must be represented through the DIM field).
+     *
+     * The LONG and DOUBLE types are always represented by using two slots (LONG +
+     * TOP or DOUBLE + TOP), for local variable types as well as in the operand
+     * stack. This is necessary to be able to simulate DUPx_y instructions,
+     * whose effect would be dependent on the actual type values if types were
+     * always represented by a single slot in the stack (and this is not
+     * possible, since actual type values are not always known - cf LOCAL and
+     * STACK type kinds).
+     */
+
+    /**
+     * Mask to get the dimension of a frame type. This dimension is a signed
+     * integer between -8 and 7.
+     */
+    static final int DIM = 0xF0000000;
+
+    /**
+     * Constant to be added to a type to get a type with one more dimension.
+     */
+    static final int ARRAY_OF = 0x10000000;
+
+    /**
+     * Constant to be added to a type to get a type with one less dimension.
+     */
+    static final int ELEMENT_OF = 0xF0000000;
+
+    /**
+     * Mask to get the kind of a frame type.
+     *
+     * @see #BASE
+     * @see #LOCAL
+     * @see #STACK
+     */
+    static final int KIND = 0xF000000;
+
+    /**
+     * Mask to get the value of a frame type.
+     */
+    static final int VALUE = 0xFFFFFF;
+
+    /**
+     * Mask to get the kind of base types.
+     */
+    static final int BASE_KIND = 0xFF00000;
+
+    /**
+     * Mask to get the value of base types.
+     */
+    static final int BASE_VALUE = 0xFFFFF;
+
+    /**
+     * Kind of the types that are not relative to an input stack map frame.
+     */
+    static final int BASE = 0x1000000;
+
+    /**
+     * Base kind of the base reference types. The BASE_VALUE of such types is an
+     * index into the type table.
+     */
+    static final int OBJECT = BASE | 0x700000;
+
+    /**
+     * Base kind of the uninitialized base types. The BASE_VALUE of such types
+     * in an index into the type table (the Item at that index contains both an
+     * instruction offset and an internal class name).
+     */
+    static final int UNINITIALIZED = BASE | 0x800000;
+
+    /**
+     * Kind of the types that are relative to the local variable types of an
+     * input stack map frame. The value of such types is a local variable index.
+     */
+    private static final int LOCAL = 0x2000000;
+
+    /**
+     * Kind of the the types that are relative to the stack of an input stack
+     * map frame. The value of such types is a position relatively to the top of
+     * this stack.
+     */
+    private static final int STACK = 0x3000000;
+
+    /**
+     * The TOP type. This is a BASE type.
+     */
+    static final int TOP = BASE | 0;
+
+    /**
+     * The BOOLEAN type. This is a BASE type mainly used for array types.
+     */
+    static final int BOOLEAN = BASE | 9;
+
+    /**
+     * The BYTE type. This is a BASE type mainly used for array types.
+     */
+    static final int BYTE = BASE | 10;
+
+    /**
+     * The CHAR type. This is a BASE type mainly used for array types.
+     */
+    static final int CHAR = BASE | 11;
+
+    /**
+     * The SHORT type. This is a BASE type mainly used for array types.
+     */
+    static final int SHORT = BASE | 12;
+
+    /**
+     * The INTEGER type. This is a BASE type.
+     */
+    static final int INTEGER = BASE | 1;
+
+    /**
+     * The FLOAT type. This is a BASE type.
+     */
+    static final int FLOAT = BASE | 2;
+
+    /**
+     * The DOUBLE type. This is a BASE type.
+     */
+    static final int DOUBLE = BASE | 3;
+
+    /**
+     * The LONG type. This is a BASE type.
+     */
+    static final int LONG = BASE | 4;
+
+    /**
+     * The NULL type. This is a BASE type.
+     */
+    static final int NULL = BASE | 5;
+
+    /**
+     * The UNINITIALIZED_THIS type. This is a BASE type.
+     */
+    static final int UNINITIALIZED_THIS = BASE | 6;
+
+    /**
+     * The stack size variation corresponding to each JVM instruction. This
+     * stack variation is equal to the size of the values produced by an
+     * instruction, minus the size of the values consumed by this instruction.
+     */
+    static final int[] SIZE;
+
+    /**
+     * Computes the stack size variation corresponding to each JVM instruction.
+     */
+    static {
+        int i;
+        int[] b = new int[202];
+        String s = "EFFFFFFFFGGFFFGGFFFEEFGFGFEEEEEEEEEEEEEEEEEEEEDEDEDDDDD"
+                + "CDCDEEEEEEEEEEEEEEEEEEEEBABABBBBDCFFFGGGEDCDCDCDCDCDCDCDCD"
+                + "CDCEEEEDDDDDDDCDCDCEFEFDDEEFFDEDEEEBDDBBDDDDDDCCCCCCCCEFED"
+                + "DDCDCDEEEEEEEEEEFEEEEEEDDEEDDEE";
+        for (i = 0; i < b.length; ++i) {
+            b[i] = s.charAt(i) - 'E';
+        }
+        SIZE = b;
+
+        // code to generate the above string
+        //
+        // int NA = 0; // not applicable (unused opcode or variable size opcode)
+        //
+        // b = new int[] {
+        // 0, //NOP, // visitInsn
+        // 1, //ACONST_NULL, // -
+        // 1, //ICONST_M1, // -
+        // 1, //ICONST_0, // -
+        // 1, //ICONST_1, // -
+        // 1, //ICONST_2, // -
+        // 1, //ICONST_3, // -
+        // 1, //ICONST_4, // -
+        // 1, //ICONST_5, // -
+        // 2, //LCONST_0, // -
+        // 2, //LCONST_1, // -
+        // 1, //FCONST_0, // -
+        // 1, //FCONST_1, // -
+        // 1, //FCONST_2, // -
+        // 2, //DCONST_0, // -
+        // 2, //DCONST_1, // -
+        // 1, //BIPUSH, // visitIntInsn
+        // 1, //SIPUSH, // -
+        // 1, //LDC, // visitLdcInsn
+        // NA, //LDC_W, // -
+        // NA, //LDC2_W, // -
+        // 1, //ILOAD, // visitVarInsn
+        // 2, //LLOAD, // -
+        // 1, //FLOAD, // -
+        // 2, //DLOAD, // -
+        // 1, //ALOAD, // -
+        // NA, //ILOAD_0, // -
+        // NA, //ILOAD_1, // -
+        // NA, //ILOAD_2, // -
+        // NA, //ILOAD_3, // -
+        // NA, //LLOAD_0, // -
+        // NA, //LLOAD_1, // -
+        // NA, //LLOAD_2, // -
+        // NA, //LLOAD_3, // -
+        // NA, //FLOAD_0, // -
+        // NA, //FLOAD_1, // -
+        // NA, //FLOAD_2, // -
+        // NA, //FLOAD_3, // -
+        // NA, //DLOAD_0, // -
+        // NA, //DLOAD_1, // -
+        // NA, //DLOAD_2, // -
+        // NA, //DLOAD_3, // -
+        // NA, //ALOAD_0, // -
+        // NA, //ALOAD_1, // -
+        // NA, //ALOAD_2, // -
+        // NA, //ALOAD_3, // -
+        // -1, //IALOAD, // visitInsn
+        // 0, //LALOAD, // -
+        // -1, //FALOAD, // -
+        // 0, //DALOAD, // -
+        // -1, //AALOAD, // -
+        // -1, //BALOAD, // -
+        // -1, //CALOAD, // -
+        // -1, //SALOAD, // -
+        // -1, //ISTORE, // visitVarInsn
+        // -2, //LSTORE, // -
+        // -1, //FSTORE, // -
+        // -2, //DSTORE, // -
+        // -1, //ASTORE, // -
+        // NA, //ISTORE_0, // -
+        // NA, //ISTORE_1, // -
+        // NA, //ISTORE_2, // -
+        // NA, //ISTORE_3, // -
+        // NA, //LSTORE_0, // -
+        // NA, //LSTORE_1, // -
+        // NA, //LSTORE_2, // -
+        // NA, //LSTORE_3, // -
+        // NA, //FSTORE_0, // -
+        // NA, //FSTORE_1, // -
+        // NA, //FSTORE_2, // -
+        // NA, //FSTORE_3, // -
+        // NA, //DSTORE_0, // -
+        // NA, //DSTORE_1, // -
+        // NA, //DSTORE_2, // -
+        // NA, //DSTORE_3, // -
+        // NA, //ASTORE_0, // -
+        // NA, //ASTORE_1, // -
+        // NA, //ASTORE_2, // -
+        // NA, //ASTORE_3, // -
+        // -3, //IASTORE, // visitInsn
+        // -4, //LASTORE, // -
+        // -3, //FASTORE, // -
+        // -4, //DASTORE, // -
+        // -3, //AASTORE, // -
+        // -3, //BASTORE, // -
+        // -3, //CASTORE, // -
+        // -3, //SASTORE, // -
+        // -1, //POP, // -
+        // -2, //POP2, // -
+        // 1, //DUP, // -
+        // 1, //DUP_X1, // -
+        // 1, //DUP_X2, // -
+        // 2, //DUP2, // -
+        // 2, //DUP2_X1, // -
+        // 2, //DUP2_X2, // -
+        // 0, //SWAP, // -
+        // -1, //IADD, // -
+        // -2, //LADD, // -
+        // -1, //FADD, // -
+        // -2, //DADD, // -
+        // -1, //ISUB, // -
+        // -2, //LSUB, // -
+        // -1, //FSUB, // -
+        // -2, //DSUB, // -
+        // -1, //IMUL, // -
+        // -2, //LMUL, // -
+        // -1, //FMUL, // -
+        // -2, //DMUL, // -
+        // -1, //IDIV, // -
+        // -2, //LDIV, // -
+        // -1, //FDIV, // -
+        // -2, //DDIV, // -
+        // -1, //IREM, // -
+        // -2, //LREM, // -
+        // -1, //FREM, // -
+        // -2, //DREM, // -
+        // 0, //INEG, // -
+        // 0, //LNEG, // -
+        // 0, //FNEG, // -
+        // 0, //DNEG, // -
+        // -1, //ISHL, // -
+        // -1, //LSHL, // -
+        // -1, //ISHR, // -
+        // -1, //LSHR, // -
+        // -1, //IUSHR, // -
+        // -1, //LUSHR, // -
+        // -1, //IAND, // -
+        // -2, //LAND, // -
+        // -1, //IOR, // -
+        // -2, //LOR, // -
+        // -1, //IXOR, // -
+        // -2, //LXOR, // -
+        // 0, //IINC, // visitIincInsn
+        // 1, //I2L, // visitInsn
+        // 0, //I2F, // -
+        // 1, //I2D, // -
+        // -1, //L2I, // -
+        // -1, //L2F, // -
+        // 0, //L2D, // -
+        // 0, //F2I, // -
+        // 1, //F2L, // -
+        // 1, //F2D, // -
+        // -1, //D2I, // -
+        // 0, //D2L, // -
+        // -1, //D2F, // -
+        // 0, //I2B, // -
+        // 0, //I2C, // -
+        // 0, //I2S, // -
+        // -3, //LCMP, // -
+        // -1, //FCMPL, // -
+        // -1, //FCMPG, // -
+        // -3, //DCMPL, // -
+        // -3, //DCMPG, // -
+        // -1, //IFEQ, // visitJumpInsn
+        // -1, //IFNE, // -
+        // -1, //IFLT, // -
+        // -1, //IFGE, // -
+        // -1, //IFGT, // -
+        // -1, //IFLE, // -
+        // -2, //IF_ICMPEQ, // -
+        // -2, //IF_ICMPNE, // -
+        // -2, //IF_ICMPLT, // -
+        // -2, //IF_ICMPGE, // -
+        // -2, //IF_ICMPGT, // -
+        // -2, //IF_ICMPLE, // -
+        // -2, //IF_ACMPEQ, // -
+        // -2, //IF_ACMPNE, // -
+        // 0, //GOTO, // -
+        // 1, //JSR, // -
+        // 0, //RET, // visitVarInsn
+        // -1, //TABLESWITCH, // visiTableSwitchInsn
+        // -1, //LOOKUPSWITCH, // visitLookupSwitch
+        // -1, //IRETURN, // visitInsn
+        // -2, //LRETURN, // -
+        // -1, //FRETURN, // -
+        // -2, //DRETURN, // -
+        // -1, //ARETURN, // -
+        // 0, //RETURN, // -
+        // NA, //GETSTATIC, // visitFieldInsn
+        // NA, //PUTSTATIC, // -
+        // NA, //GETFIELD, // -
+        // NA, //PUTFIELD, // -
+        // NA, //INVOKEVIRTUAL, // visitMethodInsn
+        // NA, //INVOKESPECIAL, // -
+        // NA, //INVOKESTATIC, // -
+        // NA, //INVOKEINTERFACE, // -
+        // NA, //UNUSED, // NOT VISITED
+        // 1, //NEW, // visitTypeInsn
+        // 0, //NEWARRAY, // visitIntInsn
+        // 0, //ANEWARRAY, // visitTypeInsn
+        // 0, //ARRAYLENGTH, // visitInsn
+        // NA, //ATHROW, // -
+        // 0, //CHECKCAST, // visitTypeInsn
+        // 0, //INSTANCEOF, // -
+        // -1, //MONITORENTER, // visitInsn
+        // -1, //MONITOREXIT, // -
+        // NA, //WIDE, // NOT VISITED
+        // NA, //MULTIANEWARRAY, // visitMultiANewArrayInsn
+        // -1, //IFNULL, // visitJumpInsn
+        // -1, //IFNONNULL, // -
+        // NA, //GOTO_W, // -
+        // NA, //JSR_W, // -
+        // };
+        // for (i = 0; i < b.length; ++i) {
+        // System.err.print((char)('E' + b[i]));
+        // }
+        // System.err.println();
+    }
+
+    /**
+     * The label (i.e. basic block) to which these input and output stack map
+     * frames correspond.
+     */
+    Label owner;
+
+    /**
+     * The input stack map frame locals.
+     */
+    int[] inputLocals;
+
+    /**
+     * The input stack map frame stack.
+     */
+    int[] inputStack;
+
+    /**
+     * The output stack map frame locals.
+     */
+    private int[] outputLocals;
+
+    /**
+     * The output stack map frame stack.
+     */
+    private int[] outputStack;
+
+    /**
+     * Relative size of the output stack. The exact semantics of this field
+     * depends on the algorithm that is used.
+     *
+     * When only the maximum stack size is computed, this field is the size of
+     * the output stack relatively to the top of the input stack.
+     *
+     * When the stack map frames are completely computed, this field is the
+     * actual number of types in {@link #outputStack}.
+     */
+    private int outputStackTop;
+
+    /**
+     * Number of types that are initialized in the basic block.
+     *
+     * @see #initializations
+     */
+    private int initializationCount;
+
+    /**
+     * The types that are initialized in the basic block. A constructor
+     * invocation on an UNINITIALIZED or UNINITIALIZED_THIS type must replace
+     * <i>every occurence</i> of this type in the local variables and in the
+     * operand stack. This cannot be done during the first phase of the
+     * algorithm since, during this phase, the local variables and the operand
+     * stack are not completely computed. It is therefore necessary to store the
+     * types on which constructors are invoked in the basic block, in order to
+     * do this replacement during the second phase of the algorithm, where the
+     * frames are fully computed. Note that this array can contain types that
+     * are relative to input locals or to the input stack (see below for the
+     * description of the algorithm).
+     */
+    private int[] initializations;
+
+    /**
+     * Returns the output frame local variable type at the given index.
+     *
+     * @param local the index of the local that must be returned.
+     * @return the output frame local variable type at the given index.
+     */
+    private int get(final int local) {
+        if (outputLocals == null || local >= outputLocals.length) {
+            // this local has never been assigned in this basic block,
+            // so it is still equal to its value in the input frame
+            return LOCAL | local;
+        } else {
+            int type = outputLocals[local];
+            if (type == 0) {
+                // this local has never been assigned in this basic block,
+                // so it is still equal to its value in the input frame
+                type = outputLocals[local] = LOCAL | local;
+            }
+            return type;
+        }
+    }
+
+    /**
+     * Sets the output frame local variable type at the given index.
+     *
+     * @param local the index of the local that must be set.
+     * @param type the value of the local that must be set.
+     */
+    private void set(final int local, final int type) {
+        // creates and/or resizes the output local variables array if necessary
+        if (outputLocals == null) {
+            outputLocals = new int[10];
+        }
+        int n = outputLocals.length;
+        if (local >= n) {
+            int[] t = new int[Math.max(local + 1, 2 * n)];
+            System.arraycopy(outputLocals, 0, t, 0, n);
+            outputLocals = t;
+        }
+        // sets the local variable
+        outputLocals[local] = type;
+    }
+
+    /**
+     * Pushes a new type onto the output frame stack.
+     *
+     * @param type the type that must be pushed.
+     */
+    private void push(final int type) {
+        // creates and/or resizes the output stack array if necessary
+        if (outputStack == null) {
+            outputStack = new int[10];
+        }
+        int n = outputStack.length;
+        if (outputStackTop >= n) {
+            int[] t = new int[Math.max(outputStackTop + 1, 2 * n)];
+            System.arraycopy(outputStack, 0, t, 0, n);
+            outputStack = t;
+        }
+        // pushes the type on the output stack
+        outputStack[outputStackTop++] = type;
+        // updates the maximun height reached by the output stack, if needed
+        int top = owner.inputStackTop + outputStackTop;
+        if (top > owner.outputStackMax) {
+            owner.outputStackMax = top;
+        }
+    }
+
+    /**
+     * Pushes a new type onto the output frame stack.
+     *
+     * @param cw the ClassWriter to which this label belongs.
+     * @param desc the descriptor of the type to be pushed. Can also be a method
+     *        descriptor (in this case this method pushes its return type onto
+     *        the output frame stack).
+     */
+    private void push(final ClassWriter cw, final String desc) {
+        int type = type(cw, desc);
+        if (type != 0) {
+            push(type);
+            if (type == LONG || type == DOUBLE) {
+                push(TOP);
+            }
+        }
+    }
+
+    /**
+     * Returns the int encoding of the given type.
+     *
+     * @param cw the ClassWriter to which this label belongs.
+     * @param desc a type descriptor.
+     * @return the int encoding of the given type.
+     */
+    private static int type(final ClassWriter cw, final String desc) {
+        String t;
+        int index = desc.charAt(0) == '(' ? desc.indexOf(')') + 1 : 0;
+        switch (desc.charAt(index)) {
+            case 'V':
+                return 0;
+            case 'Z':
+            case 'C':
+            case 'B':
+            case 'S':
+            case 'I':
+                return INTEGER;
+            case 'F':
+                return FLOAT;
+            case 'J':
+                return LONG;
+            case 'D':
+                return DOUBLE;
+            case 'L':
+                // stores the internal name, not the descriptor!
+                t = desc.substring(index + 1, desc.length() - 1);
+                return OBJECT | cw.addType(t);
+                // case '[':
+            default:
+                // extracts the dimensions and the element type
+                int data;
+                int dims = index + 1;
+                while (desc.charAt(dims) == '[') {
+                    ++dims;
+                }
+                switch (desc.charAt(dims)) {
+                    case 'Z':
+                        data = BOOLEAN;
+                        break;
+                    case 'C':
+                        data = CHAR;
+                        break;
+                    case 'B':
+                        data = BYTE;
+                        break;
+                    case 'S':
+                        data = SHORT;
+                        break;
+                    case 'I':
+                        data = INTEGER;
+                        break;
+                    case 'F':
+                        data = FLOAT;
+                        break;
+                    case 'J':
+                        data = LONG;
+                        break;
+                    case 'D':
+                        data = DOUBLE;
+                        break;
+                    // case 'L':
+                    default:
+                        // stores the internal name, not the descriptor
+                        t = desc.substring(dims + 1, desc.length() - 1);
+                        data = OBJECT | cw.addType(t);
+                }
+                return (dims - index) << 28 | data;
+        }
+    }
+
+    /**
+     * Pops a type from the output frame stack and returns its value.
+     *
+     * @return the type that has been popped from the output frame stack.
+     */
+    private int pop() {
+        if (outputStackTop > 0) {
+            return outputStack[--outputStackTop];
+        } else {
+            // if the output frame stack is empty, pops from the input stack
+            return STACK | -(--owner.inputStackTop);
+        }
+    }
+
+    /**
+     * Pops the given number of types from the output frame stack.
+     *
+     * @param elements the number of types that must be popped.
+     */
+    private void pop(final int elements) {
+        if (outputStackTop >= elements) {
+            outputStackTop -= elements;
+        } else {
+            // if the number of elements to be popped is greater than the number
+            // of elements in the output stack, clear it, and pops the remaining
+            // elements from the input stack.
+            owner.inputStackTop -= elements - outputStackTop;
+            outputStackTop = 0;
+        }
+    }
+
+    /**
+     * Pops a type from the output frame stack.
+     *
+     * @param desc the descriptor of the type to be popped. Can also be a method
+     *        descriptor (in this case this method pops the types corresponding
+     *        to the method arguments).
+     */
+    private void pop(final String desc) {
+        char c = desc.charAt(0);
+        if (c == '(') {
+            pop((MethodWriter.getArgumentsAndReturnSizes(desc) >> 2) - 1);
+        } else if (c == 'J' || c == 'D') {
+            pop(2);
+        } else {
+            pop(1);
+        }
+    }
+
+    /**
+     * Adds a new type to the list of types on which a constructor is invoked in
+     * the basic block.
+     *
+     * @param var a type on a which a constructor is invoked.
+     */
+    private void init(final int var) {
+        // creates and/or resizes the initializations array if necessary
+        if (initializations == null) {
+            initializations = new int[2];
+        }
+        int n = initializations.length;
+        if (initializationCount >= n) {
+            int[] t = new int[Math.max(initializationCount + 1, 2 * n)];
+            System.arraycopy(initializations, 0, t, 0, n);
+            initializations = t;
+        }
+        // stores the type to be initialized
+        initializations[initializationCount++] = var;
+    }
+
+    /**
+     * Replaces the given type with the appropriate type if it is one of the
+     * types on which a constructor is invoked in the basic block.
+     *
+     * @param cw the ClassWriter to which this label belongs.
+     * @param t a type
+     * @return t or, if t is one of the types on which a constructor is invoked
+     *         in the basic block, the type corresponding to this constructor.
+     */
+    private int init(final ClassWriter cw, final int t) {
+        int s;
+        if (t == UNINITIALIZED_THIS) {
+            s = OBJECT | cw.addType(cw.thisName);
+        } else if ((t & (DIM | BASE_KIND)) == UNINITIALIZED) {
+            String type = cw.typeTable[t & BASE_VALUE].strVal1;
+            s = OBJECT | cw.addType(type);
+        } else {
+            return t;
+        }
+        for (int j = 0; j < initializationCount; ++j) {
+            int u = initializations[j];
+            int dim = u & DIM;
+            int kind = u & KIND;
+            if (kind == LOCAL) {
+                u = dim + inputLocals[u & VALUE];
+            } else if (kind == STACK) {
+                u = dim + inputStack[inputStack.length - (u & VALUE)];
+            }
+            if (t == u) {
+                return s;
+            }
+        }
+        return t;
+    }
+
+    /**
+     * Initializes the input frame of the first basic block from the method
+     * descriptor.
+     *
+     * @param cw the ClassWriter to which this label belongs.
+     * @param access the access flags of the method to which this label belongs.
+     * @param args the formal parameter types of this method.
+     * @param maxLocals the maximum number of local variables of this method.
+     */
+    void initInputFrame(
+        final ClassWriter cw,
+        final int access,
+        final Type[] args,
+        final int maxLocals)
+    {
+        inputLocals = new int[maxLocals];
+        inputStack = new int[0];
+        int i = 0;
+        if ((access & Opcodes.ACC_STATIC) == 0) {
+            if ((access & MethodWriter.ACC_CONSTRUCTOR) == 0) {
+                inputLocals[i++] = OBJECT | cw.addType(cw.thisName);
+            } else {
+                inputLocals[i++] = UNINITIALIZED_THIS;
+            }
+        }
+        for (int j = 0; j < args.length; ++j) {
+            int t = type(cw, args[j].getDescriptor());
+            inputLocals[i++] = t;
+            if (t == LONG || t == DOUBLE) {
+                inputLocals[i++] = TOP;
+            }
+        }
+        while (i < maxLocals) {
+            inputLocals[i++] = TOP;
+        }
+    }
+
+    /**
+     * Simulates the action of the given instruction on the output stack frame.
+     *
+     * @param opcode the opcode of the instruction.
+     * @param arg the operand of the instruction, if any.
+     * @param cw the class writer to which this label belongs.
+     * @param item the operand of the instructions, if any.
+     */
+    void execute(
+        final int opcode,
+        final int arg,
+        final ClassWriter cw,
+        final Item item)
+    {
+        int t1, t2, t3, t4;
+        switch (opcode) {
+            case Opcodes.NOP:
+            case Opcodes.INEG:
+            case Opcodes.LNEG:
+            case Opcodes.FNEG:
+            case Opcodes.DNEG:
+            case Opcodes.I2B:
+            case Opcodes.I2C:
+            case Opcodes.I2S:
+            case Opcodes.GOTO:
+            case Opcodes.RETURN:
+                break;
+            case Opcodes.ACONST_NULL:
+                push(NULL);
+                break;
+            case Opcodes.ICONST_M1:
+            case Opcodes.ICONST_0:
+            case Opcodes.ICONST_1:
+            case Opcodes.ICONST_2:
+            case Opcodes.ICONST_3:
+            case Opcodes.ICONST_4:
+            case Opcodes.ICONST_5:
+            case Opcodes.BIPUSH:
+            case Opcodes.SIPUSH:
+            case Opcodes.ILOAD:
+                push(INTEGER);
+                break;
+            case Opcodes.LCONST_0:
+            case Opcodes.LCONST_1:
+            case Opcodes.LLOAD:
+                push(LONG);
+                push(TOP);
+                break;
+            case Opcodes.FCONST_0:
+            case Opcodes.FCONST_1:
+            case Opcodes.FCONST_2:
+            case Opcodes.FLOAD:
+                push(FLOAT);
+                break;
+            case Opcodes.DCONST_0:
+            case Opcodes.DCONST_1:
+            case Opcodes.DLOAD:
+                push(DOUBLE);
+                push(TOP);
+                break;
+            case Opcodes.LDC:
+                switch (item.type) {
+                    case ClassWriter.INT:
+                        push(INTEGER);
+                        break;
+                    case ClassWriter.LONG:
+                        push(LONG);
+                        push(TOP);
+                        break;
+                    case ClassWriter.FLOAT:
+                        push(FLOAT);
+                        break;
+                    case ClassWriter.DOUBLE:
+                        push(DOUBLE);
+                        push(TOP);
+                        break;
+                    case ClassWriter.CLASS:
+                        push(OBJECT | cw.addType("java/lang/Class"));
+                        break;
+                    // case ClassWriter.STR:
+                    default:
+                        push(OBJECT | cw.addType("java/lang/String"));
+                }
+                break;
+            case Opcodes.ALOAD:
+                push(get(arg));
+                break;
+            case Opcodes.IALOAD:
+            case Opcodes.BALOAD:
+            case Opcodes.CALOAD:
+            case Opcodes.SALOAD:
+                pop(2);
+                push(INTEGER);
+                break;
+            case Opcodes.LALOAD:
+            case Opcodes.D2L:
+                pop(2);
+                push(LONG);
+                push(TOP);
+                break;
+            case Opcodes.FALOAD:
+                pop(2);
+                push(FLOAT);
+                break;
+            case Opcodes.DALOAD:
+            case Opcodes.L2D:
+                pop(2);
+                push(DOUBLE);
+                push(TOP);
+                break;
+            case Opcodes.AALOAD:
+                pop(1);
+                t1 = pop();
+                push(ELEMENT_OF + t1);
+                break;
+            case Opcodes.ISTORE:
+            case Opcodes.FSTORE:
+            case Opcodes.ASTORE:
+                t1 = pop();
+                set(arg, t1);
+                if (arg > 0) {
+                    t2 = get(arg - 1);
+                    // if t2 is of kind STACK or LOCAL we cannot know its size!
+                    if (t2 == LONG || t2 == DOUBLE) {
+                        set(arg - 1, TOP);
+                    }
+                }
+                break;
+            case Opcodes.LSTORE:
+            case Opcodes.DSTORE:
+                pop(1);
+                t1 = pop();
+                set(arg, t1);
+                set(arg + 1, TOP);
+                if (arg > 0) {
+                    t2 = get(arg - 1);
+                    // if t2 is of kind STACK or LOCAL we cannot know its size!
+                    if (t2 == LONG || t2 == DOUBLE) {
+                        set(arg - 1, TOP);
+                    }
+                }
+                break;
+            case Opcodes.IASTORE:
+            case Opcodes.BASTORE:
+            case Opcodes.CASTORE:
+            case Opcodes.SASTORE:
+            case Opcodes.FASTORE:
+            case Opcodes.AASTORE:
+                pop(3);
+                break;
+            case Opcodes.LASTORE:
+            case Opcodes.DASTORE:
+                pop(4);
+                break;
+            case Opcodes.POP:
+            case Opcodes.IFEQ:
+            case Opcodes.IFNE:
+            case Opcodes.IFLT:
+            case Opcodes.IFGE:
+            case Opcodes.IFGT:
+            case Opcodes.IFLE:
+            case Opcodes.IRETURN:
+            case Opcodes.FRETURN:
+            case Opcodes.ARETURN:
+            case Opcodes.TABLESWITCH:
+            case Opcodes.LOOKUPSWITCH:
+            case Opcodes.ATHROW:
+            case Opcodes.MONITORENTER:
+            case Opcodes.MONITOREXIT:
+            case Opcodes.IFNULL:
+            case Opcodes.IFNONNULL:
+                pop(1);
+                break;
+            case Opcodes.POP2:
+            case Opcodes.IF_ICMPEQ:
+            case Opcodes.IF_ICMPNE:
+            case Opcodes.IF_ICMPLT:
+            case Opcodes.IF_ICMPGE:
+            case Opcodes.IF_ICMPGT:
+            case Opcodes.IF_ICMPLE:
+            case Opcodes.IF_ACMPEQ:
+            case Opcodes.IF_ACMPNE:
+            case Opcodes.LRETURN:
+            case Opcodes.DRETURN:
+                pop(2);
+                break;
+            case Opcodes.DUP:
+                t1 = pop();
+                push(t1);
+                push(t1);
+                break;
+            case Opcodes.DUP_X1:
+                t1 = pop();
+                t2 = pop();
+                push(t1);
+                push(t2);
+                push(t1);
+                break;
+            case Opcodes.DUP_X2:
+                t1 = pop();
+                t2 = pop();
+                t3 = pop();
+                push(t1);
+                push(t3);
+                push(t2);
+                push(t1);
+                break;
+            case Opcodes.DUP2:
+                t1 = pop();
+                t2 = pop();
+                push(t2);
+                push(t1);
+                push(t2);
+                push(t1);
+                break;
+            case Opcodes.DUP2_X1:
+                t1 = pop();
+                t2 = pop();
+                t3 = pop();
+                push(t2);
+                push(t1);
+                push(t3);
+                push(t2);
+                push(t1);
+                break;
+            case Opcodes.DUP2_X2:
+                t1 = pop();
+                t2 = pop();
+                t3 = pop();
+                t4 = pop();
+                push(t2);
+                push(t1);
+                push(t4);
+                push(t3);
+                push(t2);
+                push(t1);
+                break;
+            case Opcodes.SWAP:
+                t1 = pop();
+                t2 = pop();
+                push(t1);
+                push(t2);
+                break;
+            case Opcodes.IADD:
+            case Opcodes.ISUB:
+            case Opcodes.IMUL:
+            case Opcodes.IDIV:
+            case Opcodes.IREM:
+            case Opcodes.IAND:
+            case Opcodes.IOR:
+            case Opcodes.IXOR:
+            case Opcodes.ISHL:
+            case Opcodes.ISHR:
+            case Opcodes.IUSHR:
+            case Opcodes.L2I:
+            case Opcodes.D2I:
+            case Opcodes.FCMPL:
+            case Opcodes.FCMPG:
+                pop(2);
+                push(INTEGER);
+                break;
+            case Opcodes.LADD:
+            case Opcodes.LSUB:
+            case Opcodes.LMUL:
+            case Opcodes.LDIV:
+            case Opcodes.LREM:
+            case Opcodes.LAND:
+            case Opcodes.LOR:
+            case Opcodes.LXOR:
+                pop(4);
+                push(LONG);
+                push(TOP);
+                break;
+            case Opcodes.FADD:
+            case Opcodes.FSUB:
+            case Opcodes.FMUL:
+            case Opcodes.FDIV:
+            case Opcodes.FREM:
+            case Opcodes.L2F:
+            case Opcodes.D2F:
+                pop(2);
+                push(FLOAT);
+                break;
+            case Opcodes.DADD:
+            case Opcodes.DSUB:
+            case Opcodes.DMUL:
+            case Opcodes.DDIV:
+            case Opcodes.DREM:
+                pop(4);
+                push(DOUBLE);
+                push(TOP);
+                break;
+            case Opcodes.LSHL:
+            case Opcodes.LSHR:
+            case Opcodes.LUSHR:
+                pop(3);
+                push(LONG);
+                push(TOP);
+                break;
+            case Opcodes.IINC:
+                set(arg, INTEGER);
+                break;
+            case Opcodes.I2L:
+            case Opcodes.F2L:
+                pop(1);
+                push(LONG);
+                push(TOP);
+                break;
+            case Opcodes.I2F:
+                pop(1);
+                push(FLOAT);
+                break;
+            case Opcodes.I2D:
+            case Opcodes.F2D:
+                pop(1);
+                push(DOUBLE);
+                push(TOP);
+                break;
+            case Opcodes.F2I:
+            case Opcodes.ARRAYLENGTH:
+            case Opcodes.INSTANCEOF:
+                pop(1);
+                push(INTEGER);
+                break;
+            case Opcodes.LCMP:
+            case Opcodes.DCMPL:
+            case Opcodes.DCMPG:
+                pop(4);
+                push(INTEGER);
+                break;
+            case Opcodes.JSR:
+            case Opcodes.RET:
+                throw new RuntimeException("JSR/RET are not supported with computeFrames option");
+            case Opcodes.GETSTATIC:
+                push(cw, item.strVal3);
+                break;
+            case Opcodes.PUTSTATIC:
+                pop(item.strVal3);
+                break;
+            case Opcodes.GETFIELD:
+                pop(1);
+                push(cw, item.strVal3);
+                break;
+            case Opcodes.PUTFIELD:
+                pop(item.strVal3);
+                pop();
+                break;
+            case Opcodes.INVOKEVIRTUAL:
+            case Opcodes.INVOKESPECIAL:
+            case Opcodes.INVOKESTATIC:
+            case Opcodes.INVOKEINTERFACE:
+                pop(item.strVal3);
+                if (opcode != Opcodes.INVOKESTATIC) {
+                    t1 = pop();
+                    if (opcode == Opcodes.INVOKESPECIAL
+                            && item.strVal2.charAt(0) == '<')
+                    {
+                        init(t1);
+                    }
+                }
+                push(cw, item.strVal3);
+                break;
+            case Opcodes.NEW:
+                push(UNINITIALIZED | cw.addUninitializedType(item.strVal1, arg));
+                break;
+            case Opcodes.NEWARRAY:
+                pop();
+                switch (arg) {
+                    case Opcodes.T_BOOLEAN:
+                        push(ARRAY_OF | BOOLEAN);
+                        break;
+                    case Opcodes.T_CHAR:
+                        push(ARRAY_OF | CHAR);
+                        break;
+                    case Opcodes.T_BYTE:
+                        push(ARRAY_OF | BYTE);
+                        break;
+                    case Opcodes.T_SHORT:
+                        push(ARRAY_OF | SHORT);
+                        break;
+                    case Opcodes.T_INT:
+                        push(ARRAY_OF | INTEGER);
+                        break;
+                    case Opcodes.T_FLOAT:
+                        push(ARRAY_OF | FLOAT);
+                        break;
+                    case Opcodes.T_DOUBLE:
+                        push(ARRAY_OF | DOUBLE);
+                        break;
+                    // case Opcodes.T_LONG:
+                    default:
+                        push(ARRAY_OF | LONG);
+                        break;
+                }
+                break;
+            case Opcodes.ANEWARRAY:
+                String s = item.strVal1;
+                pop();
+                if (s.charAt(0) == '[') {
+                    push(cw, '[' + s);
+                } else {
+                    push(ARRAY_OF | OBJECT | cw.addType(s));
+                }
+                break;
+            case Opcodes.CHECKCAST:
+                s = item.strVal1;
+                pop();
+                if (s.charAt(0) == '[') {
+                    push(cw, s);
+                } else {
+                    push(OBJECT | cw.addType(s));
+                }
+                break;
+            // case Opcodes.MULTIANEWARRAY:
+            default:
+                pop(arg);
+                push(cw, item.strVal1);
+                break;
+        }
+    }
+
+    /**
+     * Merges the input frame of the given basic block with the input and output
+     * frames of this basic block. Returns <tt>true</tt> if the input frame of
+     * the given label has been changed by this operation.
+     *
+     * @param cw the ClassWriter to which this label belongs.
+     * @param frame the basic block whose input frame must be updated.
+     * @param edge the kind of the {@link Edge} between this label and 'label'.
+     *        See {@link Edge#info}.
+     * @return <tt>true</tt> if the input frame of the given label has been
+     *         changed by this operation.
+     */
+    boolean merge(final ClassWriter cw, final Frame frame, final int edge) {
+        boolean changed = false;
+        int i, s, dim, kind, t;
+
+        int nLocal = inputLocals.length;
+        int nStack = inputStack.length;
+        if (frame.inputLocals == null) {
+            frame.inputLocals = new int[nLocal];
+            changed = true;
+        }
+
+        for (i = 0; i < nLocal; ++i) {
+            if (outputLocals != null && i < outputLocals.length) {
+                s = outputLocals[i];
+                if (s == 0) {
+                    t = inputLocals[i];
+                } else {
+                    dim = s & DIM;
+                    kind = s & KIND;
+                    if (kind == LOCAL) {
+                        t = dim + inputLocals[s & VALUE];
+                    } else if (kind == STACK) {
+                        t = dim + inputStack[nStack - (s & VALUE)];
+                    } else {
+                        t = s;
+                    }
+                }
+            } else {
+                t = inputLocals[i];
+            }
+            if (initializations != null) {
+                t = init(cw, t);
+            }
+            changed |= merge(cw, t, frame.inputLocals, i);
+        }
+
+        if (edge > 0) {
+            for (i = 0; i < nLocal; ++i) {
+                t = inputLocals[i];
+                changed |= merge(cw, t, frame.inputLocals, i);
+            }
+            if (frame.inputStack == null) {
+                frame.inputStack = new int[1];
+                changed = true;
+            }
+            changed |= merge(cw, edge, frame.inputStack, 0);
+            return changed;
+        }
+
+        int nInputStack = inputStack.length + owner.inputStackTop;
+        if (frame.inputStack == null) {
+            frame.inputStack = new int[nInputStack + outputStackTop];
+            changed = true;
+        }
+
+        for (i = 0; i < nInputStack; ++i) {
+            t = inputStack[i];
+            if (initializations != null) {
+                t = init(cw, t);
+            }
+            changed |= merge(cw, t, frame.inputStack, i);
+        }
+        for (i = 0; i < outputStackTop; ++i) {
+            s = outputStack[i];
+            dim = s & DIM;
+            kind = s & KIND;
+            if (kind == LOCAL) {
+                t = dim + inputLocals[s & VALUE];
+            } else if (kind == STACK) {
+                t = dim + inputStack[nStack - (s & VALUE)];
+            } else {
+                t = s;
+            }
+            if (initializations != null) {
+                t = init(cw, t);
+            }
+            changed |= merge(cw, t, frame.inputStack, nInputStack + i);
+        }
+        return changed;
+    }
+
+    /**
+     * Merges the type at the given index in the given type array with the given
+     * type. Returns <tt>true</tt> if the type array has been modified by this
+     * operation.
+     *
+     * @param cw the ClassWriter to which this label belongs.
+     * @param t the type with which the type array element must be merged.
+     * @param types an array of types.
+     * @param index the index of the type that must be merged in 'types'.
+     * @return <tt>true</tt> if the type array has been modified by this
+     *         operation.
+     */
+    private static boolean merge(
+        final ClassWriter cw,
+        int t,
+        final int[] types,
+        final int index)
+    {
+        int u = types[index];
+        if (u == t) {
+            // if the types are equal, merge(u,t)=u, so there is no change
+            return false;
+        }
+        if ((t & ~DIM) == NULL) {
+            if (u == NULL) {
+                return false;
+            }
+            t = NULL;
+        }
+        if (u == 0) {
+            // if types[index] has never been assigned, merge(u,t)=t
+            types[index] = t;
+            return true;
+        }
+        int v;
+        if ((u & BASE_KIND) == OBJECT || (u & DIM) != 0) {
+            // if u is a reference type of any dimension
+            if (t == NULL) {
+                // if t is the NULL type, merge(u,t)=u, so there is no change
+                return false;
+            } else if ((t & (DIM | BASE_KIND)) == (u & (DIM | BASE_KIND))) {
+                if ((u & BASE_KIND) == OBJECT) {
+                    // if t is also a reference type, and if u and t have the
+                    // same dimension merge(u,t) = dim(t) | common parent of the
+                    // element types of u and t
+                    v = (t & DIM) | OBJECT
+                            | cw.getMergedType(t & BASE_VALUE, u & BASE_VALUE);
+                } else {
+                    // if u and t are array types, but not with the same element
+                    // type, merge(u,t)=java/lang/Object
+                    v = OBJECT | cw.addType("java/lang/Object");
+                }
+            } else if ((t & BASE_KIND) == OBJECT || (t & DIM) != 0) {
+                // if t is any other reference or array type,
+                // merge(u,t)=java/lang/Object
+                v = OBJECT | cw.addType("java/lang/Object");
+            } else {
+                // if t is any other type, merge(u,t)=TOP
+                v = TOP;
+            }
+        } else if (u == NULL) {
+            // if u is the NULL type, merge(u,t)=t,
+            // or TOP if t is not a reference type
+            v = (t & BASE_KIND) == OBJECT || (t & DIM) != 0 ? t : TOP;
+        } else {
+            // if u is any other type, merge(u,t)=TOP whatever t
+            v = TOP;
+        }
+        if (u != v) {
+            types[index] = v;
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java
new file mode 100644
index 00000000000..55474d597c8
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * Information about an exception handler block.
+ *
+ * @author Eric Bruneton
+ */
+class Handler {
+
+    /**
+     * Beginning of the exception handler's scope (inclusive).
+     */
+    Label start;
+
+    /**
+     * End of the exception handler's scope (exclusive).
+     */
+    Label end;
+
+    /**
+     * Beginning of the exception handler's code.
+     */
+    Label handler;
+
+    /**
+     * Internal name of the type of exceptions handled by this handler, or
+     * <tt>null</tt> to catch any exceptions.
+     */
+    String desc;
+
+    /**
+     * Constant pool index of the internal name of the type of exceptions
+     * handled by this handler, or 0 to catch any exceptions.
+     */
+    int type;
+
+    /**
+     * Next exception handler block info.
+     */
+    Handler next;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java
new file mode 100644
index 00000000000..f6ecad11744
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A constant pool item. Constant pool items can be created with the 'newXXX'
+ * methods in the {@link ClassWriter} class.
+ *
+ * @author Eric Bruneton
+ */
+final class Item {
+
+    /**
+     * Index of this item in the constant pool.
+     */
+    int index;
+
+    /**
+     * Type of this constant pool item. A single class is used to represent all
+     * constant pool item types, in order to minimize the bytecode size of this
+     * package. The value of this field is one of {@link ClassWriter#INT},
+     * {@link ClassWriter#LONG}, {@link ClassWriter#FLOAT},
+     * {@link ClassWriter#DOUBLE}, {@link ClassWriter#UTF8},
+     * {@link ClassWriter#STR}, {@link ClassWriter#CLASS},
+     * {@link ClassWriter#NAME_TYPE}, {@link ClassWriter#FIELD},
+     * {@link ClassWriter#METH}, {@link ClassWriter#IMETH}.
+     *
+     * Special Item types are used for Items that are stored in the ClassWriter
+     * {@link ClassWriter#typeTable}, instead of the constant pool, in order to
+     * avoid clashes with normal constant pool items in the ClassWriter constant
+     * pool's hash table. These special item types are
+     * {@link ClassWriter#TYPE_NORMAL}, {@link ClassWriter#TYPE_UNINIT} and
+     * {@link ClassWriter#TYPE_MERGED}.
+     */
+    int type;
+
+    /**
+     * Value of this item, for an integer item.
+     */
+    int intVal;
+
+    /**
+     * Value of this item, for a long item.
+     */
+    long longVal;
+
+    /**
+     * First part of the value of this item, for items that do not hold a
+     * primitive value.
+     */
+    String strVal1;
+
+    /**
+     * Second part of the value of this item, for items that do not hold a
+     * primitive value.
+     */
+    String strVal2;
+
+    /**
+     * Third part of the value of this item, for items that do not hold a
+     * primitive value.
+     */
+    String strVal3;
+
+    /**
+     * The hash code value of this constant pool item.
+     */
+    int hashCode;
+
+    /**
+     * Link to another constant pool item, used for collision lists in the
+     * constant pool's hash table.
+     */
+    Item next;
+
+    /**
+     * Constructs an uninitialized {@link Item}.
+     */
+    Item() {
+    }
+
+    /**
+     * Constructs an uninitialized {@link Item} for constant pool element at
+     * given position.
+     *
+     * @param index index of the item to be constructed.
+     */
+    Item(final int index) {
+        this.index = index;
+    }
+
+    /**
+     * Constructs a copy of the given item.
+     *
+     * @param index index of the item to be constructed.
+     * @param i the item that must be copied into the item to be constructed.
+     */
+    Item(final int index, final Item i) {
+        this.index = index;
+        type = i.type;
+        intVal = i.intVal;
+        longVal = i.longVal;
+        strVal1 = i.strVal1;
+        strVal2 = i.strVal2;
+        strVal3 = i.strVal3;
+        hashCode = i.hashCode;
+    }
+
+    /**
+     * Sets this item to an integer item.
+     *
+     * @param intVal the value of this item.
+     */
+    void set(final int intVal) {
+        this.type = ClassWriter.INT;
+        this.intVal = intVal;
+        this.hashCode = 0x7FFFFFFF & (type + intVal);
+    }
+
+    /**
+     * Sets this item to a long item.
+     *
+     * @param longVal the value of this item.
+     */
+    void set(final long longVal) {
+        this.type = ClassWriter.LONG;
+        this.longVal = longVal;
+        this.hashCode = 0x7FFFFFFF & (type + (int) longVal);
+    }
+
+    /**
+     * Sets this item to a float item.
+     *
+     * @param floatVal the value of this item.
+     */
+    void set(final float floatVal) {
+        this.type = ClassWriter.FLOAT;
+        this.intVal = Float.floatToRawIntBits(floatVal);
+        this.hashCode = 0x7FFFFFFF & (type + (int) floatVal);
+    }
+
+    /**
+     * Sets this item to a double item.
+     *
+     * @param doubleVal the value of this item.
+     */
+    void set(final double doubleVal) {
+        this.type = ClassWriter.DOUBLE;
+        this.longVal = Double.doubleToRawLongBits(doubleVal);
+        this.hashCode = 0x7FFFFFFF & (type + (int) doubleVal);
+    }
+
+    /**
+     * Sets this item to an item that do not hold a primitive value.
+     *
+     * @param type the type of this item.
+     * @param strVal1 first part of the value of this item.
+     * @param strVal2 second part of the value of this item.
+     * @param strVal3 third part of the value of this item.
+     */
+    void set(
+        final int type,
+        final String strVal1,
+        final String strVal2,
+        final String strVal3)
+    {
+        this.type = type;
+        this.strVal1 = strVal1;
+        this.strVal2 = strVal2;
+        this.strVal3 = strVal3;
+        switch (type) {
+            case ClassWriter.UTF8:
+            case ClassWriter.STR:
+            case ClassWriter.CLASS:
+            case ClassWriter.TYPE_NORMAL:
+                hashCode = 0x7FFFFFFF & (type + strVal1.hashCode());
+                return;
+            case ClassWriter.NAME_TYPE:
+                hashCode = 0x7FFFFFFF & (type + strVal1.hashCode()
+                        * strVal2.hashCode());
+                return;
+                // ClassWriter.FIELD:
+                // ClassWriter.METH:
+                // ClassWriter.IMETH:
+            default:
+                hashCode = 0x7FFFFFFF & (type + strVal1.hashCode()
+                        * strVal2.hashCode() * strVal3.hashCode());
+        }
+    }
+
+    /**
+     * Indicates if the given item is equal to this one.
+     *
+     * @param i the item to be compared to this one.
+     * @return <tt>true</tt> if the given item if equal to this one,
+     *         <tt>false</tt> otherwise.
+     */
+    boolean isEqualTo(final Item i) {
+        if (i.type == type) {
+            switch (type) {
+                case ClassWriter.INT:
+                case ClassWriter.FLOAT:
+                    return i.intVal == intVal;
+                case ClassWriter.TYPE_MERGED:
+                case ClassWriter.LONG:
+                case ClassWriter.DOUBLE:
+                    return i.longVal == longVal;
+                case ClassWriter.UTF8:
+                case ClassWriter.STR:
+                case ClassWriter.CLASS:
+                case ClassWriter.TYPE_NORMAL:
+                    return i.strVal1.equals(strVal1);
+                case ClassWriter.TYPE_UNINIT:
+                    return i.intVal == intVal && i.strVal1.equals(strVal1);
+                case ClassWriter.NAME_TYPE:
+                    return i.strVal1.equals(strVal1)
+                            && i.strVal2.equals(strVal2);
+                    // ClassWriter.FIELD:
+                    // ClassWriter.METH:
+                    // ClassWriter.IMETH:
+                default:
+                    return i.strVal1.equals(strVal1)
+                            && i.strVal2.equals(strVal2)
+                            && i.strVal3.equals(strVal3);
+            }
+        }
+        return false;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java
new file mode 100644
index 00000000000..43e7deb5118
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java
@@ -0,0 +1,556 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A label represents a position in the bytecode of a method. Labels are used
+ * for jump, goto, and switch instructions, and for try catch blocks.
+ *
+ * @author Eric Bruneton
+ */
+public class Label {
+
+    /**
+     * Indicates if this label is only used for debug attributes. Such a label
+     * is not the start of a basic block, the target of a jump instruction, or
+     * an exception handler. It can be safely ignored in control flow graph
+     * analysis algorithms (for optimization purposes).
+     */
+    static final int DEBUG = 1;
+
+    /**
+     * Indicates if the position of this label is known.
+     */
+    static final int RESOLVED = 2;
+
+    /**
+     * Indicates if this label has been updated, after instruction resizing.
+     */
+    static final int RESIZED = 4;
+
+    /**
+     * Indicates if this basic block has been pushed in the basic block stack.
+     * See {@link MethodWriter#visitMaxs visitMaxs}.
+     */
+    static final int PUSHED = 8;
+
+    /**
+     * Indicates if this label is the target of a jump instruction, or the start
+     * of an exception handler.
+     */
+    static final int TARGET = 16;
+
+    /**
+     * Indicates if a stack map frame must be stored for this label.
+     */
+    static final int STORE = 32;
+
+    /**
+     * Indicates if this label corresponds to a reachable basic block.
+     */
+    static final int REACHABLE = 64;
+
+    /**
+     * Indicates if this basic block ends with a JSR instruction.
+     */
+    static final int JSR = 128;
+
+    /**
+     * Indicates if this basic block ends with a RET instruction.
+     */
+    static final int RET = 256;
+
+    /**
+     * Indicates if this basic block is the start of a subroutine.
+     */
+    static final int SUBROUTINE = 512;
+
+    /**
+     * Indicates if this subroutine basic block has been visited.
+     */
+    static final int VISITED = 1024;
+
+    /**
+     * Field used to associate user information to a label. Warning: this field
+     * is used by the ASM tree package. In order to use it with the ASM tree
+     * package you must override the {@link
+     * com.sun.xml.internal.ws.org.objectweb.asm.tree.MethodNode#getLabelNode} method.
+     */
+    public Object info;
+
+    /**
+     * Flags that indicate the status of this label.
+     *
+     * @see #DEBUG
+     * @see #RESOLVED
+     * @see #RESIZED
+     * @see #PUSHED
+     * @see #TARGET
+     * @see #STORE
+     * @see #REACHABLE
+     * @see #JSR
+     * @see #RET
+     */
+    int status;
+
+    /**
+     * The line number corresponding to this label, if known.
+     */
+    int line;
+
+    /**
+     * The position of this label in the code, if known.
+     */
+    int position;
+
+    /**
+     * Number of forward references to this label, times two.
+     */
+    private int referenceCount;
+
+    /**
+     * Informations about forward references. Each forward reference is
+     * described by two consecutive integers in this array: the first one is the
+     * position of the first byte of the bytecode instruction that contains the
+     * forward reference, while the second is the position of the first byte of
+     * the forward reference itself. In fact the sign of the first integer
+     * indicates if this reference uses 2 or 4 bytes, and its absolute value
+     * gives the position of the bytecode instruction. This array is also used
+     * as a bitset to store the subroutines to which a basic block belongs. This
+     * information is needed in {@linked  MethodWriter#visitMaxs}, after all
+     * forward references have been resolved. Hence the same array can be used
+     * for both purposes without problems.
+     */
+    private int[] srcAndRefPositions;
+
+    // ------------------------------------------------------------------------
+
+    /*
+     * Fields for the control flow and data flow graph analysis algorithms (used
+     * to compute the maximum stack size or the stack map frames). A control
+     * flow graph contains one node per "basic block", and one edge per "jump"
+     * from one basic block to another. Each node (i.e., each basic block) is
+     * represented by the Label object that corresponds to the first instruction
+     * of this basic block. Each node also stores the list of its successors in
+     * the graph, as a linked list of Edge objects.
+     *
+     * The control flow analysis algorithms used to compute the maximum stack
+     * size or the stack map frames are similar and use two steps. The first
+     * step, during the visit of each instruction, builds information about the
+     * state of the local variables and the operand stack at the end of each
+     * basic block, called the "output frame", <i>relatively</i> to the frame
+     * state at the beginning of the basic block, which is called the "input
+     * frame", and which is <i>unknown</i> during this step. The second step,
+     * in {@link MethodWriter#visitMaxs}, is a fix point algorithm that
+     * computes information about the input frame of each basic block, from the
+     * input state of the first basic block (known from the method signature),
+     * and by the using the previously computed relative output frames.
+     *
+     * The algorithm used to compute the maximum stack size only computes the
+     * relative output and absolute input stack heights, while the algorithm
+     * used to compute stack map frames computes relative output frames and
+     * absolute input frames.
+     */
+
+    /**
+     * Start of the output stack relatively to the input stack. The exact
+     * semantics of this field depends on the algorithm that is used.
+     *
+     * When only the maximum stack size is computed, this field is the number of
+     * elements in the input stack.
+     *
+     * When the stack map frames are completely computed, this field is the
+     * offset of the first output stack element relatively to the top of the
+     * input stack. This offset is always negative or null. A null offset means
+     * that the output stack must be appended to the input stack. A -n offset
+     * means that the first n output stack elements must replace the top n input
+     * stack elements, and that the other elements must be appended to the input
+     * stack.
+     */
+    int inputStackTop;
+
+    /**
+     * Maximum height reached by the output stack, relatively to the top of the
+     * input stack. This maximum is always positive or null.
+     */
+    int outputStackMax;
+
+    /**
+     * Information about the input and output stack map frames of this basic
+     * block. This field is only used when {@link ClassWriter#COMPUTE_FRAMES}
+     * option is used.
+     */
+    Frame frame;
+
+    /**
+     * The successor of this label, in the order they are visited. This linked
+     * list does not include labels used for debug info only. If
+     * {@link ClassWriter#COMPUTE_FRAMES} option is used then, in addition, it
+     * does not contain successive labels that denote the same bytecode position
+     * (in this case only the first label appears in this list).
+     */
+    Label successor;
+
+    /**
+     * The successors of this node in the control flow graph. These successors
+     * are stored in a linked list of {@link Edge Edge} objects, linked to each
+     * other by their {@link Edge#next} field.
+     */
+    Edge successors;
+
+    /**
+     * The next basic block in the basic block stack. This stack is used in the
+     * main loop of the fix point algorithm used in the second step of the
+     * control flow analysis algorithms.
+     *
+     * @see MethodWriter#visitMaxs
+     */
+    Label next;
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new label.
+     */
+    public Label() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Methods to compute offsets and to manage forward references
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the offset corresponding to this label. This offset is computed
+     * from the start of the method's bytecode. <i>This method is intended for
+     * {@link Attribute} sub classes, and is normally not needed by class
+     * generators or adapters.</i>
+     *
+     * @return the offset corresponding to this label.
+     * @throws IllegalStateException if this label is not resolved yet.
+     */
+    public int getOffset() {
+        if ((status & RESOLVED) == 0) {
+            throw new IllegalStateException("Label offset position has not been resolved yet");
+        }
+        return position;
+    }
+
+    /**
+     * Puts a reference to this label in the bytecode of a method. If the
+     * position of the label is known, the offset is computed and written
+     * directly. Otherwise, a null offset is written and a new forward reference
+     * is declared for this label.
+     *
+     * @param owner the code writer that calls this method.
+     * @param out the bytecode of the method.
+     * @param source the position of first byte of the bytecode instruction that
+     *        contains this label.
+     * @param wideOffset <tt>true</tt> if the reference must be stored in 4
+     *        bytes, or <tt>false</tt> if it must be stored with 2 bytes.
+     * @throws IllegalArgumentException if this label has not been created by
+     *         the given code writer.
+     */
+    void put(
+        final MethodWriter owner,
+        final ByteVector out,
+        final int source,
+        final boolean wideOffset)
+    {
+        if ((status & RESOLVED) == 0) {
+            if (wideOffset) {
+                addReference(-1 - source, out.length);
+                out.putInt(-1);
+            } else {
+                addReference(source, out.length);
+                out.putShort(-1);
+            }
+        } else {
+            if (wideOffset) {
+                out.putInt(position - source);
+            } else {
+                out.putShort(position - source);
+            }
+        }
+    }
+
+    /**
+     * Adds a forward reference to this label. This method must be called only
+     * for a true forward reference, i.e. only if this label is not resolved
+     * yet. For backward references, the offset of the reference can be, and
+     * must be, computed and stored directly.
+     *
+     * @param sourcePosition the position of the referencing instruction. This
+     *        position will be used to compute the offset of this forward
+     *        reference.
+     * @param referencePosition the position where the offset for this forward
+     *        reference must be stored.
+     */
+    private void addReference(
+        final int sourcePosition,
+        final int referencePosition)
+    {
+        if (srcAndRefPositions == null) {
+            srcAndRefPositions = new int[6];
+        }
+        if (referenceCount >= srcAndRefPositions.length) {
+            int[] a = new int[srcAndRefPositions.length + 6];
+            System.arraycopy(srcAndRefPositions,
+                    0,
+                    a,
+                    0,
+                    srcAndRefPositions.length);
+            srcAndRefPositions = a;
+        }
+        srcAndRefPositions[referenceCount++] = sourcePosition;
+        srcAndRefPositions[referenceCount++] = referencePosition;
+    }
+
+    /**
+     * Resolves all forward references to this label. This method must be called
+     * when this label is added to the bytecode of the method, i.e. when its
+     * position becomes known. This method fills in the blanks that where left
+     * in the bytecode by each forward reference previously added to this label.
+     *
+     * @param owner the code writer that calls this method.
+     * @param position the position of this label in the bytecode.
+     * @param data the bytecode of the method.
+     * @return <tt>true</tt> if a blank that was left for this label was to
+     *         small to store the offset. In such a case the corresponding jump
+     *         instruction is replaced with a pseudo instruction (using unused
+     *         opcodes) using an unsigned two bytes offset. These pseudo
+     *         instructions will need to be replaced with true instructions with
+     *         wider offsets (4 bytes instead of 2). This is done in
+     *         {@link MethodWriter#resizeInstructions}.
+     * @throws IllegalArgumentException if this label has already been resolved,
+     *         or if it has not been created by the given code writer.
+     */
+    boolean resolve(
+        final MethodWriter owner,
+        final int position,
+        final byte[] data)
+    {
+        boolean needUpdate = false;
+        this.status |= RESOLVED;
+        this.position = position;
+        int i = 0;
+        while (i < referenceCount) {
+            int source = srcAndRefPositions[i++];
+            int reference = srcAndRefPositions[i++];
+            int offset;
+            if (source >= 0) {
+                offset = position - source;
+                if (offset < Short.MIN_VALUE || offset > Short.MAX_VALUE) {
+                    /*
+                     * changes the opcode of the jump instruction, in order to
+                     * be able to find it later (see resizeInstructions in
+                     * MethodWriter). These temporary opcodes are similar to
+                     * jump instruction opcodes, except that the 2 bytes offset
+                     * is unsigned (and can therefore represent values from 0 to
+                     * 65535, which is sufficient since the size of a method is
+                     * limited to 65535 bytes).
+                     */
+                    int opcode = data[reference - 1] & 0xFF;
+                    if (opcode <= Opcodes.JSR) {
+                        // changes IFEQ ... JSR to opcodes 202 to 217
+                        data[reference - 1] = (byte) (opcode + 49);
+                    } else {
+                        // changes IFNULL and IFNONNULL to opcodes 218 and 219
+                        data[reference - 1] = (byte) (opcode + 20);
+                    }
+                    needUpdate = true;
+                }
+                data[reference++] = (byte) (offset >>> 8);
+                data[reference] = (byte) offset;
+            } else {
+                offset = position + source + 1;
+                data[reference++] = (byte) (offset >>> 24);
+                data[reference++] = (byte) (offset >>> 16);
+                data[reference++] = (byte) (offset >>> 8);
+                data[reference] = (byte) offset;
+            }
+        }
+        return needUpdate;
+    }
+
+    /**
+     * Returns the first label of the series to which this label belongs. For an
+     * isolated label or for the first label in a series of successive labels,
+     * this method returns the label itself. For other labels it returns the
+     * first label of the series.
+     *
+     * @return the first label of the series to which this label belongs.
+     */
+    Label getFirst() {
+        return !ClassReader.FRAMES || frame == null ? this : frame.owner;
+    }
+
+    // ------------------------------------------------------------------------
+    // Methods related to subroutines
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns true is this basic block belongs to the given subroutine.
+     *
+     * @param id a subroutine id.
+     * @return true is this basic block belongs to the given subroutine.
+     */
+    boolean inSubroutine(final long id) {
+        if ((status & Label.VISITED) != 0) {
+            return (srcAndRefPositions[(int) (id >>> 32)] & (int) id) != 0;
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if this basic block and the given one belong to a common
+     * subroutine.
+     *
+     * @param block another basic block.
+     * @return true if this basic block and the given one belong to a common
+     *         subroutine.
+     */
+    boolean inSameSubroutine(final Label block) {
+        for (int i = 0; i < srcAndRefPositions.length; ++i) {
+            if ((srcAndRefPositions[i] & block.srcAndRefPositions[i]) != 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Marks this basic block as belonging to the given subroutine.
+     *
+     * @param id a subroutine id.
+     * @param nbSubroutines the total number of subroutines in the method.
+     */
+    void addToSubroutine(final long id, final int nbSubroutines) {
+        if ((status & VISITED) == 0) {
+            status |= VISITED;
+            srcAndRefPositions = new int[(nbSubroutines - 1) / 32 + 1];
+        }
+        srcAndRefPositions[(int) (id >>> 32)] |= (int) id;
+    }
+
+    /**
+     * Finds the basic blocks that belong to a given subroutine, and marks these
+     * blocks as belonging to this subroutine. This recursive method follows the
+     * control flow graph to find all the blocks that are reachable from the
+     * current block WITHOUT following any JSR target.
+     *
+     * @param JSR a JSR block that jumps to this subroutine. If this JSR is not
+     *        null it is added to the successor of the RET blocks found in the
+     *        subroutine.
+     * @param id the id of this subroutine.
+     * @param nbSubroutines the total number of subroutines in the method.
+     */
+    void visitSubroutine(final Label JSR, final long id, final int nbSubroutines)
+    {
+        if (JSR != null) {
+            if ((status & VISITED) != 0) {
+                return;
+            }
+            status |= VISITED;
+            // adds JSR to the successors of this block, if it is a RET block
+            if ((status & RET) != 0) {
+                if (!inSameSubroutine(JSR)) {
+                    Edge e = new Edge();
+                    e.info = inputStackTop;
+                    e.successor = JSR.successors.successor;
+                    e.next = successors;
+                    successors = e;
+                }
+            }
+        } else {
+            // if this block already belongs to subroutine 'id', returns
+            if (inSubroutine(id)) {
+                return;
+            }
+            // marks this block as belonging to subroutine 'id'
+            addToSubroutine(id, nbSubroutines);
+        }
+        // calls this method recursively on each successor, except JSR targets
+        Edge e = successors;
+        while (e != null) {
+            // if this block is a JSR block, then 'successors.next' leads
+            // to the JSR target (see {@link #visitJumpInsn}) and must therefore
+            // not be followed
+            if ((status & Label.JSR) == 0 || e != successors.next) {
+                e.successor.visitSubroutine(JSR, id, nbSubroutines);
+            }
+            e = e.next;
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Overriden Object methods
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns a string representation of this label.
+     *
+     * @return a string representation of this label.
+     */
+    public String toString() {
+        return "L" + System.identityHashCode(this);
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java
new file mode 100644
index 00000000000..7917f7bf512
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java
@@ -0,0 +1,425 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A visitor to visit a Java method. The methods of this interface must be
+ * called in the following order: [ <tt>visitAnnotationDefault</tt> ] (
+ * <tt>visitAnnotation</tt> | <tt>visitParameterAnnotation</tt> |
+ * <tt>visitAttribute</tt> )* [ <tt>visitCode</tt> ( <tt>visitFrame</tt> |
+ * <tt>visit</tt><i>X</i>Insn</tt> | <tt>visitLabel</tt> | <tt>visitTryCatchBlock</tt> |
+ * <tt>visitLocalVariable</tt> | <tt>visitLineNumber</tt>)* <tt>visitMaxs</tt> ]
+ * <tt>visitEnd</tt>. In addition, the <tt>visit</tt><i>X</i>Insn</tt>
+ * and <tt>visitLabel</tt> methods must be called in the sequential order of
+ * the bytecode instructions of the visited code, <tt>visitTryCatchBlock</tt>
+ * must be called <i>before</i> the labels passed as arguments have been
+ * visited, and the <tt>visitLocalVariable</tt> and <tt>visitLineNumber</tt>
+ * methods must be called <i>after</i> the labels passed as arguments have been
+ * visited.
+ *
+ * @author Eric Bruneton
+ */
+public interface MethodVisitor {
+
+    // -------------------------------------------------------------------------
+    // Annotations and non standard attributes
+    // -------------------------------------------------------------------------
+
+    /**
+     * Visits the default value of this annotation interface method.
+     *
+     * @return a visitor to the visit the actual default value of this
+     *         annotation interface method, or <tt>null</tt> if this visitor
+     *         is not interested in visiting this default value. The 'name'
+     *         parameters passed to the methods of this annotation visitor are
+     *         ignored. Moreover, exacly one visit method must be called on this
+     *         annotation visitor, followed by visitEnd.
+     */
+    AnnotationVisitor visitAnnotationDefault();
+
+    /**
+     * Visits an annotation of this method.
+     *
+     * @param desc the class descriptor of the annotation class.
+     * @param visible <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *         this visitor is not interested in visiting this annotation.
+     */
+    AnnotationVisitor visitAnnotation(String desc, boolean visible);
+
+    /**
+     * Visits an annotation of a parameter this method.
+     *
+     * @param parameter the parameter index.
+     * @param desc the class descriptor of the annotation class.
+     * @param visible <tt>true</tt> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *         this visitor is not interested in visiting this annotation.
+     */
+    AnnotationVisitor visitParameterAnnotation(
+        int parameter,
+        String desc,
+        boolean visible);
+
+    /**
+     * Visits a non standard attribute of this method.
+     *
+     * @param attr an attribute.
+     */
+    void visitAttribute(Attribute attr);
+
+    /**
+     * Starts the visit of the method's code, if any (i.e. non abstract method).
+     */
+    void visitCode();
+
+    /**
+     * Visits the current state of the local variables and operand stack
+     * elements. This method must(*) be called <i>just before</i> any
+     * instruction <b>i</b> that follows an unconditionnal branch instruction
+     * such as GOTO or THROW, that is the target of a jump instruction, or that
+     * starts an exception handler block. The visited types must describe the
+     * values of the local variables and of the operand stack elements <i>just
+     * before</i> <b>i</b> is executed. <br> <br> (*) this is mandatory only
+     * for classes whose version is greater than or equal to
+     * {@link Opcodes#V1_6 V1_6}. <br> <br> Packed frames are basically
+     * "deltas" from the state of the previous frame (very first frame is
+     * implicitly defined by the method's parameters and access flags): <ul>
+     * <li>{@link Opcodes#F_SAME} representing frame with exactly the same
+     * locals as the previous frame and with the empty stack.</li> <li>{@link Opcodes#F_SAME1}
+     * representing frame with exactly the same locals as the previous frame and
+     * with single value on the stack (<code>nStack</code> is 1 and
+     * <code>stack[0]</code> contains value for the type of the stack item).</li>
+     * <li>{@link Opcodes#F_APPEND} representing frame with current locals are
+     * the same as the locals in the previous frame, except that additional
+     * locals are defined (<code>nLocal</code> is 1, 2 or 3 and
+     * <code>local</code> elements contains values representing added types).</li>
+     * <li>{@link Opcodes#F_CHOP} representing frame with current locals are
+     * the same as the locals in the previous frame, except that the last 1-3
+     * locals are absent and with the empty stack (<code>nLocals</code> is 1,
+     * 2 or 3). </li> <li>{@link Opcodes#F_FULL} representing complete frame
+     * data.</li> </li> </ul>
+     *
+     * @param type the type of this stack map frame. Must be
+     *        {@link Opcodes#F_NEW} for expanded frames, or
+     *        {@link Opcodes#F_FULL}, {@link Opcodes#F_APPEND},
+     *        {@link Opcodes#F_CHOP}, {@link Opcodes#F_SAME} or
+     *        {@link Opcodes#F_APPEND}, {@link Opcodes#F_SAME1} for compressed
+     *        frames.
+     * @param nLocal the number of local variables in the visited frame.
+     * @param local the local variable types in this frame. This array must not
+     *        be modified. Primitive types are represented by
+     *        {@link Opcodes#TOP}, {@link Opcodes#INTEGER},
+     *        {@link Opcodes#FLOAT}, {@link Opcodes#LONG},
+     *        {@link Opcodes#DOUBLE},{@link Opcodes#NULL} or
+     *        {@link Opcodes#UNINITIALIZED_THIS} (long and double are
+     *        represented by a single element). Reference types are represented
+     *        by String objects (representing internal names), and uninitialized
+     *        types by Label objects (this label designates the NEW instruction
+     *        that created this uninitialized value).
+     * @param nStack the number of operand stack elements in the visited frame.
+     * @param stack the operand stack types in this frame. This array must not
+     *        be modified. Its content has the same format as the "local" array.
+     */
+    void visitFrame(
+        int type,
+        int nLocal,
+        Object[] local,
+        int nStack,
+        Object[] stack);
+
+    // -------------------------------------------------------------------------
+    // Normal instructions
+    // -------------------------------------------------------------------------
+
+    /**
+     * Visits a zero operand instruction.
+     *
+     * @param opcode the opcode of the instruction to be visited. This opcode is
+     *        either NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, ICONST_2,
+     *        ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1, FCONST_0,
+     *        FCONST_1, FCONST_2, DCONST_0, DCONST_1, IALOAD, LALOAD, FALOAD,
+     *        DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, IASTORE, LASTORE, FASTORE,
+     *        DASTORE, AASTORE, BASTORE, CASTORE, SASTORE, POP, POP2, DUP,
+     *        DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, SWAP, IADD, LADD, FADD,
+     *        DADD, ISUB, LSUB, FSUB, DSUB, IMUL, LMUL, FMUL, DMUL, IDIV, LDIV,
+     *        FDIV, DDIV, IREM, LREM, FREM, DREM, INEG, LNEG, FNEG, DNEG, ISHL,
+     *        LSHL, ISHR, LSHR, IUSHR, LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR,
+     *        I2L, I2F, I2D, L2I, L2F, L2D, F2I, F2L, F2D, D2I, D2L, D2F, I2B,
+     *        I2C, I2S, LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IRETURN, LRETURN,
+     *        FRETURN, DRETURN, ARETURN, RETURN, ARRAYLENGTH, ATHROW,
+     *        MONITORENTER, or MONITOREXIT.
+     */
+    void visitInsn(int opcode);
+
+    /**
+     * Visits an instruction with a single int operand.
+     *
+     * @param opcode the opcode of the instruction to be visited. This opcode is
+     *        either BIPUSH, SIPUSH or NEWARRAY.
+     * @param operand the operand of the instruction to be visited.<br> When
+     *        opcode is BIPUSH, operand value should be between Byte.MIN_VALUE
+     *        and Byte.MAX_VALUE.<br> When opcode is SIPUSH, operand value
+     *        should be between Short.MIN_VALUE and Short.MAX_VALUE.<br> When
+     *        opcode is NEWARRAY, operand value should be one of
+     *        {@link Opcodes#T_BOOLEAN}, {@link Opcodes#T_CHAR},
+     *        {@link Opcodes#T_FLOAT}, {@link Opcodes#T_DOUBLE},
+     *        {@link Opcodes#T_BYTE}, {@link Opcodes#T_SHORT},
+     *        {@link Opcodes#T_INT} or {@link Opcodes#T_LONG}.
+     */
+    void visitIntInsn(int opcode, int operand);
+
+    /**
+     * Visits a local variable instruction. A local variable instruction is an
+     * instruction that loads or stores the value of a local variable.
+     *
+     * @param opcode the opcode of the local variable instruction to be visited.
+     *        This opcode is either ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE,
+     *        LSTORE, FSTORE, DSTORE, ASTORE or RET.
+     * @param var the operand of the instruction to be visited. This operand is
+     *        the index of a local variable.
+     */
+    void visitVarInsn(int opcode, int var);
+
+    /**
+     * Visits a type instruction. A type instruction is an instruction that
+     * takes the internal name of a class as parameter.
+     *
+     * @param opcode the opcode of the type instruction to be visited. This
+     *        opcode is either NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
+     * @param type the operand of the instruction to be visited. This operand
+     *        must be the internal name of an object or array class (see {@link
+     *        Type#getInternalName() getInternalName}).
+     */
+    void visitTypeInsn(int opcode, String type);
+
+    /**
+     * Visits a field instruction. A field instruction is an instruction that
+     * loads or stores the value of a field of an object.
+     *
+     * @param opcode the opcode of the type instruction to be visited. This
+     *        opcode is either GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
+     * @param owner the internal name of the field's owner class (see {@link
+     *        Type#getInternalName() getInternalName}).
+     * @param name the field's name.
+     * @param desc the field's descriptor (see {@link Type Type}).
+     */
+    void visitFieldInsn(int opcode, String owner, String name, String desc);
+
+    /**
+     * Visits a method instruction. A method instruction is an instruction that
+     * invokes a method.
+     *
+     * @param opcode the opcode of the type instruction to be visited. This
+     *        opcode is either INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or
+     *        INVOKEINTERFACE.
+     * @param owner the internal name of the method's owner class (see {@link
+     *        Type#getInternalName() getInternalName}).
+     * @param name the method's name.
+     * @param desc the method's descriptor (see {@link Type Type}).
+     */
+    void visitMethodInsn(int opcode, String owner, String name, String desc);
+
+    /**
+     * Visits a jump instruction. A jump instruction is an instruction that may
+     * jump to another instruction.
+     *
+     * @param opcode the opcode of the type instruction to be visited. This
+     *        opcode is either IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
+     *        IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ,
+     *        IF_ACMPNE, GOTO, JSR, IFNULL or IFNONNULL.
+     * @param label the operand of the instruction to be visited. This operand
+     *        is a label that designates the instruction to which the jump
+     *        instruction may jump.
+     */
+    void visitJumpInsn(int opcode, Label label);
+
+    /**
+     * Visits a label. A label designates the instruction that will be visited
+     * just after it.
+     *
+     * @param label a {@link Label Label} object.
+     */
+    void visitLabel(Label label);
+
+    // -------------------------------------------------------------------------
+    // Special instructions
+    // -------------------------------------------------------------------------
+
+    /**
+     * Visits a LDC instruction.
+     *
+     * @param cst the constant to be loaded on the stack. This parameter must be
+     *        a non null {@link Integer}, a {@link Float}, a {@link Long}, a
+     *        {@link Double} a {@link String} (or a {@link Type} for
+     *        <tt>.class</tt> constants, for classes whose version is 49.0 or
+     *        more).
+     */
+    void visitLdcInsn(Object cst);
+
+    /**
+     * Visits an IINC instruction.
+     *
+     * @param var index of the local variable to be incremented.
+     * @param increment amount to increment the local variable by.
+     */
+    void visitIincInsn(int var, int increment);
+
+    /**
+     * Visits a TABLESWITCH instruction.
+     *
+     * @param min the minimum key value.
+     * @param max the maximum key value.
+     * @param dflt beginning of the default handler block.
+     * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is
+     *        the beginning of the handler block for the <tt>min + i</tt> key.
+     */
+    void visitTableSwitchInsn(int min, int max, Label dflt, Label[] labels);
+
+    /**
+     * Visits a LOOKUPSWITCH instruction.
+     *
+     * @param dflt beginning of the default handler block.
+     * @param keys the values of the keys.
+     * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is
+     *        the beginning of the handler block for the <tt>keys[i]</tt> key.
+     */
+    void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels);
+
+    /**
+     * Visits a MULTIANEWARRAY instruction.
+     *
+     * @param desc an array type descriptor (see {@link Type Type}).
+     * @param dims number of dimensions of the array to allocate.
+     */
+    void visitMultiANewArrayInsn(String desc, int dims);
+
+    // -------------------------------------------------------------------------
+    // Exceptions table entries, debug information, max stack and max locals
+    // -------------------------------------------------------------------------
+
+    /**
+     * Visits a try catch block.
+     *
+     * @param start beginning of the exception handler's scope (inclusive).
+     * @param end end of the exception handler's scope (exclusive).
+     * @param handler beginning of the exception handler's code.
+     * @param type internal name of the type of exceptions handled by the
+     *        handler, or <tt>null</tt> to catch any exceptions (for "finally"
+     *        blocks).
+     * @throws IllegalArgumentException if one of the labels has already been
+     *         visited by this visitor (by the {@link #visitLabel visitLabel}
+     *         method).
+     */
+    void visitTryCatchBlock(Label start, Label end, Label handler, String type);
+
+    /**
+     * Visits a local variable declaration.
+     *
+     * @param name the name of a local variable.
+     * @param desc the type descriptor of this local variable.
+     * @param signature the type signature of this local variable. May be
+     *        <tt>null</tt> if the local variable type does not use generic
+     *        types.
+     * @param start the first instruction corresponding to the scope of this
+     *        local variable (inclusive).
+     * @param end the last instruction corresponding to the scope of this local
+     *        variable (exclusive).
+     * @param index the local variable's index.
+     * @throws IllegalArgumentException if one of the labels has not already
+     *         been visited by this visitor (by the
+     *         {@link #visitLabel visitLabel} method).
+     */
+    void visitLocalVariable(
+        String name,
+        String desc,
+        String signature,
+        Label start,
+        Label end,
+        int index);
+
+    /**
+     * Visits a line number declaration.
+     *
+     * @param line a line number. This number refers to the source file from
+     *        which the class was compiled.
+     * @param start the first instruction corresponding to this line number.
+     * @throws IllegalArgumentException if <tt>start</tt> has not already been
+     *         visited by this visitor (by the {@link #visitLabel visitLabel}
+     *         method).
+     */
+    void visitLineNumber(int line, Label start);
+
+    /**
+     * Visits the maximum stack size and the maximum number of local variables
+     * of the method.
+     *
+     * @param maxStack maximum stack size of the method.
+     * @param maxLocals maximum number of local variables for the method.
+     */
+    void visitMaxs(int maxStack, int maxLocals);
+
+    /**
+     * Visits the end of the method. This method, which is the last one to be
+     * called, is used to inform the visitor that all the annotations and
+     * attributes of the method have been visited.
+     */
+    void visitEnd();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java
new file mode 100644
index 00000000000..51743cd85a7
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java
@@ -0,0 +1,2631 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * A {@link MethodVisitor} that generates methods in bytecode form. Each visit
+ * method of this class appends the bytecode corresponding to the visited
+ * instruction to a byte vector, in the order these methods are called.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+class MethodWriter implements MethodVisitor {
+
+    /**
+     * Pseudo access flag used to denote constructors.
+     */
+    static final int ACC_CONSTRUCTOR = 262144;
+
+    /**
+     * Frame has exactly the same locals as the previous stack map frame and
+     * number of stack items is zero.
+     */
+    static final int SAME_FRAME = 0; // to 63 (0-3f)
+
+    /**
+     * Frame has exactly the same locals as the previous stack map frame and
+     * number of stack items is 1
+     */
+    static final int SAME_LOCALS_1_STACK_ITEM_FRAME = 64; // to 127 (40-7f)
+
+    /**
+     * Reserved for future use
+     */
+    static final int RESERVED = 128;
+
+    /**
+     * Frame has exactly the same locals as the previous stack map frame and
+     * number of stack items is 1. Offset is bigger then 63;
+     */
+    static final int SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED = 247; // f7
+
+    /**
+     * Frame where current locals are the same as the locals in the previous
+     * frame, except that the k last locals are absent. The value of k is given
+     * by the formula 251-frame_type.
+     */
+    static final int CHOP_FRAME = 248; // to 250 (f8-fA)
+
+    /**
+     * Frame has exactly the same locals as the previous stack map frame and
+     * number of stack items is zero. Offset is bigger then 63;
+     */
+    static final int SAME_FRAME_EXTENDED = 251; // fb
+
+    /**
+     * Frame where current locals are the same as the locals in the previous
+     * frame, except that k additional locals are defined. The value of k is
+     * given by the formula frame_type-251.
+     */
+    static final int APPEND_FRAME = 252; // to 254 // fc-fe
+
+    /**
+     * Full frame
+     */
+    static final int FULL_FRAME = 255; // ff
+
+    /**
+     * Indicates that the stack map frames must be recomputed from scratch. In
+     * this case the maximum stack size and number of local variables is also
+     * recomputed from scratch.
+     *
+     * @see #compute
+     */
+    private static final int FRAMES = 0;
+
+    /**
+     * Indicates that the maximum stack size and number of local variables must
+     * be automatically computed.
+     *
+     * @see #compute
+     */
+    private static final int MAXS = 1;
+
+    /**
+     * Indicates that nothing must be automatically computed.
+     *
+     * @see #compute
+     */
+    private static final int NOTHING = 2;
+
+    /**
+     * Next method writer (see {@link ClassWriter#firstMethod firstMethod}).
+     */
+    MethodWriter next;
+
+    /**
+     * The class writer to which this method must be added.
+     */
+    final ClassWriter cw;
+
+    /**
+     * Access flags of this method.
+     */
+    private int access;
+
+    /**
+     * The index of the constant pool item that contains the name of this
+     * method.
+     */
+    private final int name;
+
+    /**
+     * The index of the constant pool item that contains the descriptor of this
+     * method.
+     */
+    private final int desc;
+
+    /**
+     * The descriptor of this method.
+     */
+    private final String descriptor;
+
+    /**
+     * The signature of this method.
+     */
+    String signature;
+
+    /**
+     * If not zero, indicates that the code of this method must be copied from
+     * the ClassReader associated to this writer in <code>cw.cr</code>. More
+     * precisely, this field gives the index of the first byte to copied from
+     * <code>cw.cr.b</code>.
+     */
+    int classReaderOffset;
+
+    /**
+     * If not zero, indicates that the code of this method must be copied from
+     * the ClassReader associated to this writer in <code>cw.cr</code>. More
+     * precisely, this field gives the number of bytes to copied from
+     * <code>cw.cr.b</code>.
+     */
+    int classReaderLength;
+
+    /**
+     * Number of exceptions that can be thrown by this method.
+     */
+    int exceptionCount;
+
+    /**
+     * The exceptions that can be thrown by this method. More precisely, this
+     * array contains the indexes of the constant pool items that contain the
+     * internal names of these exception classes.
+     */
+    int[] exceptions;
+
+    /**
+     * The annotation default attribute of this method. May be <tt>null</tt>.
+     */
+    private ByteVector annd;
+
+    /**
+     * The runtime visible annotations of this method. May be <tt>null</tt>.
+     */
+    private AnnotationWriter anns;
+
+    /**
+     * The runtime invisible annotations of this method. May be <tt>null</tt>.
+     */
+    private AnnotationWriter ianns;
+
+    /**
+     * The runtime visible parameter annotations of this method. May be
+     * <tt>null</tt>.
+     */
+    private AnnotationWriter[] panns;
+
+    /**
+     * The runtime invisible parameter annotations of this method. May be
+     * <tt>null</tt>.
+     */
+    private AnnotationWriter[] ipanns;
+
+    /**
+     * The number of synthetic parameters of this method.
+     */
+    private int synthetics;
+
+    /**
+     * The non standard attributes of the method.
+     */
+    private Attribute attrs;
+
+    /**
+     * The bytecode of this method.
+     */
+    private ByteVector code = new ByteVector();
+
+    /**
+     * Maximum stack size of this method.
+     */
+    private int maxStack;
+
+    /**
+     * Maximum number of local variables for this method.
+     */
+    private int maxLocals;
+
+    /**
+     * Number of stack map frames in the StackMapTable attribute.
+     */
+    private int frameCount;
+
+    /**
+     * The StackMapTable attribute.
+     */
+    private ByteVector stackMap;
+
+    /**
+     * The offset of the last frame that was written in the StackMapTable
+     * attribute.
+     */
+    private int previousFrameOffset;
+
+    /**
+     * The last frame that was written in the StackMapTable attribute.
+     *
+     * @see #frame
+     */
+    private int[] previousFrame;
+
+    /**
+     * Index of the next element to be added in {@link #frame}.
+     */
+    private int frameIndex;
+
+    /**
+     * The current stack map frame. The first element contains the offset of the
+     * instruction to which the frame corresponds, the second element is the
+     * number of locals and the third one is the number of stack elements. The
+     * local variables start at index 3 and are followed by the operand stack
+     * values. In summary frame[0] = offset, frame[1] = nLocal, frame[2] =
+     * nStack, frame[3] = nLocal. All types are encoded as integers, with the
+     * same format as the one used in {@link Label}, but limited to BASE types.
+     */
+    private int[] frame;
+
+    /**
+     * Number of elements in the exception handler list.
+     */
+    private int handlerCount;
+
+    /**
+     * The first element in the exception handler list.
+     */
+    private Handler firstHandler;
+
+    /**
+     * The last element in the exception handler list.
+     */
+    private Handler lastHandler;
+
+    /**
+     * Number of entries in the LocalVariableTable attribute.
+     */
+    private int localVarCount;
+
+    /**
+     * The LocalVariableTable attribute.
+     */
+    private ByteVector localVar;
+
+    /**
+     * Number of entries in the LocalVariableTypeTable attribute.
+     */
+    private int localVarTypeCount;
+
+    /**
+     * The LocalVariableTypeTable attribute.
+     */
+    private ByteVector localVarType;
+
+    /**
+     * Number of entries in the LineNumberTable attribute.
+     */
+    private int lineNumberCount;
+
+    /**
+     * The LineNumberTable attribute.
+     */
+    private ByteVector lineNumber;
+
+    /**
+     * The non standard attributes of the method's code.
+     */
+    private Attribute cattrs;
+
+    /**
+     * Indicates if some jump instructions are too small and need to be resized.
+     */
+    private boolean resize;
+
+    /**
+     * The number of subroutines in this method.
+     */
+    private int subroutines;
+
+    // ------------------------------------------------------------------------
+
+    /*
+     * Fields for the control flow graph analysis algorithm (used to compute the
+     * maximum stack size). A control flow graph contains one node per "basic
+     * block", and one edge per "jump" from one basic block to another. Each
+     * node (i.e., each basic block) is represented by the Label object that
+     * corresponds to the first instruction of this basic block. Each node also
+     * stores the list of its successors in the graph, as a linked list of Edge
+     * objects.
+     */
+
+    /**
+     * Indicates what must be automatically computed.
+     *
+     * @see #FRAMES
+     * @see #MAXS
+     * @see #NOTHING
+     */
+    private final int compute;
+
+    /**
+     * A list of labels. This list is the list of basic blocks in the method,
+     * i.e. a list of Label objects linked to each other by their
+     * {@link Label#successor} field, in the order they are visited by
+     * {@link MethodVisitor#visitLabel}, and starting with the first basic block.
+     */
+    private Label labels;
+
+    /**
+     * The previous basic block.
+     */
+    private Label previousBlock;
+
+    /**
+     * The current basic block.
+     */
+    private Label currentBlock;
+
+    /**
+     * The (relative) stack size after the last visited instruction. This size
+     * is relative to the beginning of the current basic block, i.e., the true
+     * stack size after the last visited instruction is equal to the
+     * {@link Label#inputStackTop beginStackSize} of the current basic block
+     * plus <tt>stackSize</tt>.
+     */
+    private int stackSize;
+
+    /**
+     * The (relative) maximum stack size after the last visited instruction.
+     * This size is relative to the beginning of the current basic block, i.e.,
+     * the true maximum stack size after the last visited instruction is equal
+     * to the {@link Label#inputStackTop beginStackSize} of the current basic
+     * block plus <tt>stackSize</tt>.
+     */
+    private int maxStackSize;
+
+    // ------------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a new {@link MethodWriter}.
+     *
+     * @param cw the class writer in which the method must be added.
+     * @param access the method's access flags (see {@link Opcodes}).
+     * @param name the method's name.
+     * @param desc the method's descriptor (see {@link Type}).
+     * @param signature the method's signature. May be <tt>null</tt>.
+     * @param exceptions the internal names of the method's exceptions. May be
+     *        <tt>null</tt>.
+     * @param computeMaxs <tt>true</tt> if the maximum stack size and number
+     *        of local variables must be automatically computed.
+     * @param computeFrames <tt>true</tt> if the stack map tables must be
+     *        recomputed from scratch.
+     */
+    MethodWriter(
+        final ClassWriter cw,
+        final int access,
+        final String name,
+        final String desc,
+        final String signature,
+        final String[] exceptions,
+        final boolean computeMaxs,
+        final boolean computeFrames)
+    {
+        if (cw.firstMethod == null) {
+            cw.firstMethod = this;
+        } else {
+            cw.lastMethod.next = this;
+        }
+        cw.lastMethod = this;
+        this.cw = cw;
+        this.access = access;
+        this.name = cw.newUTF8(name);
+        this.desc = cw.newUTF8(desc);
+        this.descriptor = desc;
+        if (ClassReader.SIGNATURES) {
+            this.signature = signature;
+        }
+        if (exceptions != null && exceptions.length > 0) {
+            exceptionCount = exceptions.length;
+            this.exceptions = new int[exceptionCount];
+            for (int i = 0; i < exceptionCount; ++i) {
+                this.exceptions[i] = cw.newClass(exceptions[i]);
+            }
+        }
+        this.compute = computeFrames ? FRAMES : (computeMaxs ? MAXS : NOTHING);
+        if (computeMaxs || computeFrames) {
+            if (computeFrames && "<init>".equals(name)) {
+                this.access |= ACC_CONSTRUCTOR;
+            }
+            // updates maxLocals
+            int size = getArgumentsAndReturnSizes(descriptor) >> 2;
+            if ((access & Opcodes.ACC_STATIC) != 0) {
+                --size;
+            }
+            maxLocals = size;
+            // creates and visits the label for the first basic block
+            labels = new Label();
+            labels.status |= Label.PUSHED;
+            visitLabel(labels);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Implementation of the MethodVisitor interface
+    // ------------------------------------------------------------------------
+
+    public AnnotationVisitor visitAnnotationDefault() {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        annd = new ByteVector();
+        return new AnnotationWriter(cw, false, annd, null, 0);
+    }
+
+    public AnnotationVisitor visitAnnotation(
+        final String desc,
+        final boolean visible)
+    {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        ByteVector bv = new ByteVector();
+        // write type, and reserve space for values count
+        bv.putShort(cw.newUTF8(desc)).putShort(0);
+        AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+        if (visible) {
+            aw.next = anns;
+            anns = aw;
+        } else {
+            aw.next = ianns;
+            ianns = aw;
+        }
+        return aw;
+    }
+
+    public AnnotationVisitor visitParameterAnnotation(
+        final int parameter,
+        final String desc,
+        final boolean visible)
+    {
+        if (!ClassReader.ANNOTATIONS) {
+            return null;
+        }
+        ByteVector bv = new ByteVector();
+        if ("Ljava/lang/Synthetic;".equals(desc)) {
+            // workaround for a bug in javac with synthetic parameters
+            // see ClassReader.readParameterAnnotations
+            synthetics = Math.max(synthetics, parameter + 1);
+            return new AnnotationWriter(cw, false, bv, null, 0);
+        }
+        // write type, and reserve space for values count
+        bv.putShort(cw.newUTF8(desc)).putShort(0);
+        AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2);
+        if (visible) {
+            if (panns == null) {
+                panns = new AnnotationWriter[Type.getArgumentTypes(descriptor).length];
+            }
+            aw.next = panns[parameter];
+            panns[parameter] = aw;
+        } else {
+            if (ipanns == null) {
+                ipanns = new AnnotationWriter[Type.getArgumentTypes(descriptor).length];
+            }
+            aw.next = ipanns[parameter];
+            ipanns[parameter] = aw;
+        }
+        return aw;
+    }
+
+    public void visitAttribute(final Attribute attr) {
+        if (attr.isCodeAttribute()) {
+            attr.next = cattrs;
+            cattrs = attr;
+        } else {
+            attr.next = attrs;
+            attrs = attr;
+        }
+    }
+
+    public void visitCode() {
+    }
+
+    public void visitFrame(
+        final int type,
+        final int nLocal,
+        final Object[] local,
+        final int nStack,
+        final Object[] stack)
+    {
+        if (!ClassReader.FRAMES || compute == FRAMES) {
+            return;
+        }
+
+        if (type == Opcodes.F_NEW) {
+            startFrame(code.length, nLocal, nStack);
+            for (int i = 0; i < nLocal; ++i) {
+                if (local[i] instanceof String) {
+                    frame[frameIndex++] = Frame.OBJECT
+                            | cw.addType((String) local[i]);
+                } else if (local[i] instanceof Integer) {
+                    frame[frameIndex++] = ((Integer) local[i]).intValue();
+                } else {
+                    frame[frameIndex++] = Frame.UNINITIALIZED
+                            | cw.addUninitializedType("",
+                                    ((Label) local[i]).position);
+                }
+            }
+            for (int i = 0; i < nStack; ++i) {
+                if (stack[i] instanceof String) {
+                    frame[frameIndex++] = Frame.OBJECT
+                            | cw.addType((String) stack[i]);
+                } else if (stack[i] instanceof Integer) {
+                    frame[frameIndex++] = ((Integer) stack[i]).intValue();
+                } else {
+                    frame[frameIndex++] = Frame.UNINITIALIZED
+                            | cw.addUninitializedType("",
+                                    ((Label) stack[i]).position);
+                }
+            }
+            endFrame();
+        } else {
+            int delta;
+            if (stackMap == null) {
+                stackMap = new ByteVector();
+                delta = code.length;
+            } else {
+                delta = code.length - previousFrameOffset - 1;
+            }
+
+            switch (type) {
+                case Opcodes.F_FULL:
+                    stackMap.putByte(FULL_FRAME)
+                            .putShort(delta)
+                            .putShort(nLocal);
+                    for (int i = 0; i < nLocal; ++i) {
+                        writeFrameType(local[i]);
+                    }
+                    stackMap.putShort(nStack);
+                    for (int i = 0; i < nStack; ++i) {
+                        writeFrameType(stack[i]);
+                    }
+                    break;
+                case Opcodes.F_APPEND:
+                    stackMap.putByte(SAME_FRAME_EXTENDED + nLocal)
+                            .putShort(delta);
+                    for (int i = 0; i < nLocal; ++i) {
+                        writeFrameType(local[i]);
+                    }
+                    break;
+                case Opcodes.F_CHOP:
+                    stackMap.putByte(SAME_FRAME_EXTENDED - nLocal)
+                            .putShort(delta);
+                    break;
+                case Opcodes.F_SAME:
+                    if (delta < 64) {
+                        stackMap.putByte(delta);
+                    } else {
+                        stackMap.putByte(SAME_FRAME_EXTENDED).putShort(delta);
+                    }
+                    break;
+                case Opcodes.F_SAME1:
+                    if (delta < 64) {
+                        stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME + delta);
+                    } else {
+                        stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
+                                .putShort(delta);
+                    }
+                    writeFrameType(stack[0]);
+                    break;
+            }
+
+            previousFrameOffset = code.length;
+            ++frameCount;
+        }
+    }
+
+    public void visitInsn(final int opcode) {
+        // adds the instruction to the bytecode of the method
+        code.putByte(opcode);
+        // update currentBlock
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, 0, null, null);
+            } else {
+                // updates current and max stack sizes
+                int size = stackSize + Frame.SIZE[opcode];
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+            // if opcode == ATHROW or xRETURN, ends current block (no successor)
+            if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN)
+                    || opcode == Opcodes.ATHROW)
+            {
+                noSuccessor();
+            }
+        }
+    }
+
+    public void visitIntInsn(final int opcode, final int operand) {
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, operand, null, null);
+            } else if (opcode != Opcodes.NEWARRAY) {
+                // updates current and max stack sizes only for NEWARRAY
+                // (stack size variation = 0 for BIPUSH or SIPUSH)
+                int size = stackSize + 1;
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if (opcode == Opcodes.SIPUSH) {
+            code.put12(opcode, operand);
+        } else { // BIPUSH or NEWARRAY
+            code.put11(opcode, operand);
+        }
+    }
+
+    public void visitVarInsn(final int opcode, final int var) {
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, var, null, null);
+            } else {
+                // updates current and max stack sizes
+                if (opcode == Opcodes.RET) {
+                    // no stack change, but end of current block (no successor)
+                    currentBlock.status |= Label.RET;
+                    // save 'stackSize' here for future use
+                    // (see {@link #findSubroutineSuccessors})
+                    currentBlock.inputStackTop = stackSize;
+                    noSuccessor();
+                } else { // xLOAD or xSTORE
+                    int size = stackSize + Frame.SIZE[opcode];
+                    if (size > maxStackSize) {
+                        maxStackSize = size;
+                    }
+                    stackSize = size;
+                }
+            }
+        }
+        if (compute != NOTHING) {
+            // updates max locals
+            int n;
+            if (opcode == Opcodes.LLOAD || opcode == Opcodes.DLOAD
+                    || opcode == Opcodes.LSTORE || opcode == Opcodes.DSTORE)
+            {
+                n = var + 2;
+            } else {
+                n = var + 1;
+            }
+            if (n > maxLocals) {
+                maxLocals = n;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if (var < 4 && opcode != Opcodes.RET) {
+            int opt;
+            if (opcode < Opcodes.ISTORE) {
+                /* ILOAD_0 */
+                opt = 26 + ((opcode - Opcodes.ILOAD) << 2) + var;
+            } else {
+                /* ISTORE_0 */
+                opt = 59 + ((opcode - Opcodes.ISTORE) << 2) + var;
+            }
+            code.putByte(opt);
+        } else if (var >= 256) {
+            code.putByte(196 /* WIDE */).put12(opcode, var);
+        } else {
+            code.put11(opcode, var);
+        }
+        if (opcode >= Opcodes.ISTORE && compute == FRAMES && handlerCount > 0) {
+            visitLabel(new Label());
+        }
+    }
+
+    public void visitTypeInsn(final int opcode, final String type) {
+        Item i = cw.newClassItem(type);
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, code.length, cw, i);
+            } else if (opcode == Opcodes.NEW) {
+                // updates current and max stack sizes only if opcode == NEW
+                // (no stack change for ANEWARRAY, CHECKCAST, INSTANCEOF)
+                int size = stackSize + 1;
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        code.put12(opcode, i.index);
+    }
+
+    public void visitFieldInsn(
+        final int opcode,
+        final String owner,
+        final String name,
+        final String desc)
+    {
+        Item i = cw.newFieldItem(owner, name, desc);
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, 0, cw, i);
+            } else {
+                int size;
+                // computes the stack size variation
+                char c = desc.charAt(0);
+                switch (opcode) {
+                    case Opcodes.GETSTATIC:
+                        size = stackSize + (c == 'D' || c == 'J' ? 2 : 1);
+                        break;
+                    case Opcodes.PUTSTATIC:
+                        size = stackSize + (c == 'D' || c == 'J' ? -2 : -1);
+                        break;
+                    case Opcodes.GETFIELD:
+                        size = stackSize + (c == 'D' || c == 'J' ? 1 : 0);
+                        break;
+                    // case Constants.PUTFIELD:
+                    default:
+                        size = stackSize + (c == 'D' || c == 'J' ? -3 : -2);
+                        break;
+                }
+                // updates current and max stack sizes
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        code.put12(opcode, i.index);
+    }
+
+    public void visitMethodInsn(
+        final int opcode,
+        final String owner,
+        final String name,
+        final String desc)
+    {
+        boolean itf = opcode == Opcodes.INVOKEINTERFACE;
+        Item i = cw.newMethodItem(owner, name, desc, itf);
+        int argSize = i.intVal;
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, 0, cw, i);
+            } else {
+                /*
+                 * computes the stack size variation. In order not to recompute
+                 * several times this variation for the same Item, we use the
+                 * intVal field of this item to store this variation, once it
+                 * has been computed. More precisely this intVal field stores
+                 * the sizes of the arguments and of the return value
+                 * corresponding to desc.
+                 */
+                if (argSize == 0) {
+                    // the above sizes have not been computed yet,
+                    // so we compute them...
+                    argSize = getArgumentsAndReturnSizes(desc);
+                    // ... and we save them in order
+                    // not to recompute them in the future
+                    i.intVal = argSize;
+                }
+                int size;
+                if (opcode == Opcodes.INVOKESTATIC) {
+                    size = stackSize - (argSize >> 2) + (argSize & 0x03) + 1;
+                } else {
+                    size = stackSize - (argSize >> 2) + (argSize & 0x03);
+                }
+                // updates current and max stack sizes
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if (itf) {
+            if (argSize == 0) {
+                argSize = getArgumentsAndReturnSizes(desc);
+                i.intVal = argSize;
+            }
+            code.put12(Opcodes.INVOKEINTERFACE, i.index).put11(argSize >> 2, 0);
+        } else {
+            code.put12(opcode, i.index);
+        }
+    }
+
+    public void visitJumpInsn(final int opcode, final Label label) {
+        Label nextInsn = null;
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(opcode, 0, null, null);
+                // 'label' is the target of a jump instruction
+                label.getFirst().status |= Label.TARGET;
+                // adds 'label' as a successor of this basic block
+                addSuccessor(Edge.NORMAL, label);
+                if (opcode != Opcodes.GOTO) {
+                    // creates a Label for the next basic block
+                    nextInsn = new Label();
+                }
+            } else {
+                if (opcode == Opcodes.JSR) {
+                    if ((label.status & Label.SUBROUTINE) == 0) {
+                        label.status |= Label.SUBROUTINE;
+                        ++subroutines;
+                    }
+                    currentBlock.status |= Label.JSR;
+                    addSuccessor(stackSize + 1, label);
+                    // creates a Label for the next basic block
+                    nextInsn = new Label();
+                    /*
+                     * note that, by construction in this method, a JSR block
+                     * has at least two successors in the control flow graph:
+                     * the first one leads the next instruction after the JSR,
+                     * while the second one leads to the JSR target.
+                     */
+                } else {
+                    // updates current stack size (max stack size unchanged
+                    // because stack size variation always negative in this
+                    // case)
+                    stackSize += Frame.SIZE[opcode];
+                    addSuccessor(stackSize, label);
+                }
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if ((label.status & Label.RESOLVED) != 0
+                && label.position - code.length < Short.MIN_VALUE)
+        {
+            /*
+             * case of a backward jump with an offset < -32768. In this case we
+             * automatically replace GOTO with GOTO_W, JSR with JSR_W and IFxxx
+             * <l> with IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx is the
+             * "opposite" opcode of IFxxx (i.e., IFNE for IFEQ) and where <l'>
+             * designates the instruction just after the GOTO_W.
+             */
+            if (opcode == Opcodes.GOTO) {
+                code.putByte(200); // GOTO_W
+            } else if (opcode == Opcodes.JSR) {
+                code.putByte(201); // JSR_W
+            } else {
+                // if the IF instruction is transformed into IFNOT GOTO_W the
+                // next instruction becomes the target of the IFNOT instruction
+                if (nextInsn != null) {
+                    nextInsn.status |= Label.TARGET;
+                }
+                code.putByte(opcode <= 166
+                        ? ((opcode + 1) ^ 1) - 1
+                        : opcode ^ 1);
+                code.putShort(8); // jump offset
+                code.putByte(200); // GOTO_W
+            }
+            label.put(this, code, code.length - 1, true);
+        } else {
+            /*
+             * case of a backward jump with an offset >= -32768, or of a forward
+             * jump with, of course, an unknown offset. In these cases we store
+             * the offset in 2 bytes (which will be increased in
+             * resizeInstructions, if needed).
+             */
+            code.putByte(opcode);
+            label.put(this, code, code.length - 1, false);
+        }
+        if (currentBlock != null) {
+            if (nextInsn != null) {
+                // if the jump instruction is not a GOTO, the next instruction
+                // is also a successor of this instruction. Calling visitLabel
+                // adds the label of this next instruction as a successor of the
+                // current block, and starts a new basic block
+                visitLabel(nextInsn);
+            }
+            if (opcode == Opcodes.GOTO) {
+                noSuccessor();
+            }
+        }
+    }
+
+    public void visitLabel(final Label label) {
+        // resolves previous forward references to label, if any
+        resize |= label.resolve(this, code.length, code.data);
+        // updates currentBlock
+        if ((label.status & Label.DEBUG) != 0) {
+            return;
+        }
+        if (compute == FRAMES) {
+            if (currentBlock != null) {
+                if (label.position == currentBlock.position) {
+                    // successive labels, do not start a new basic block
+                    currentBlock.status |= (label.status & Label.TARGET);
+                    label.frame = currentBlock.frame;
+                    return;
+                }
+                // ends current block (with one new successor)
+                addSuccessor(Edge.NORMAL, label);
+            }
+            // begins a new current block
+            currentBlock = label;
+            if (label.frame == null) {
+                label.frame = new Frame();
+                label.frame.owner = label;
+            }
+            // updates the basic block list
+            if (previousBlock != null) {
+                if (label.position == previousBlock.position) {
+                    previousBlock.status |= (label.status & Label.TARGET);
+                    label.frame = previousBlock.frame;
+                    currentBlock = previousBlock;
+                    return;
+                }
+                previousBlock.successor = label;
+            }
+            previousBlock = label;
+        } else if (compute == MAXS) {
+            if (currentBlock != null) {
+                // ends current block (with one new successor)
+                currentBlock.outputStackMax = maxStackSize;
+                addSuccessor(stackSize, label);
+            }
+            // begins a new current block
+            currentBlock = label;
+            // resets the relative current and max stack sizes
+            stackSize = 0;
+            maxStackSize = 0;
+            // updates the basic block list
+            if (previousBlock != null) {
+                previousBlock.successor = label;
+            }
+            previousBlock = label;
+        }
+    }
+
+    public void visitLdcInsn(final Object cst) {
+        Item i = cw.newConstItem(cst);
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.LDC, 0, cw, i);
+            } else {
+                int size;
+                // computes the stack size variation
+                if (i.type == ClassWriter.LONG || i.type == ClassWriter.DOUBLE)
+                {
+                    size = stackSize + 2;
+                } else {
+                    size = stackSize + 1;
+                }
+                // updates current and max stack sizes
+                if (size > maxStackSize) {
+                    maxStackSize = size;
+                }
+                stackSize = size;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        int index = i.index;
+        if (i.type == ClassWriter.LONG || i.type == ClassWriter.DOUBLE) {
+            code.put12(20 /* LDC2_W */, index);
+        } else if (index >= 256) {
+            code.put12(19 /* LDC_W */, index);
+        } else {
+            code.put11(Opcodes.LDC, index);
+        }
+    }
+
+    public void visitIincInsn(final int var, final int increment) {
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.IINC, var, null, null);
+            }
+        }
+        if (compute != NOTHING) {
+            // updates max locals
+            int n = var + 1;
+            if (n > maxLocals) {
+                maxLocals = n;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        if ((var > 255) || (increment > 127) || (increment < -128)) {
+            code.putByte(196 /* WIDE */)
+                    .put12(Opcodes.IINC, var)
+                    .putShort(increment);
+        } else {
+            code.putByte(Opcodes.IINC).put11(var, increment);
+        }
+    }
+
+    public void visitTableSwitchInsn(
+        final int min,
+        final int max,
+        final Label dflt,
+        final Label[] labels)
+    {
+        // adds the instruction to the bytecode of the method
+        int source = code.length;
+        code.putByte(Opcodes.TABLESWITCH);
+        code.length += (4 - code.length % 4) % 4;
+        dflt.put(this, code, source, true);
+        code.putInt(min).putInt(max);
+        for (int i = 0; i < labels.length; ++i) {
+            labels[i].put(this, code, source, true);
+        }
+        // updates currentBlock
+        visitSwitchInsn(dflt, labels);
+    }
+
+    public void visitLookupSwitchInsn(
+        final Label dflt,
+        final int[] keys,
+        final Label[] labels)
+    {
+        // adds the instruction to the bytecode of the method
+        int source = code.length;
+        code.putByte(Opcodes.LOOKUPSWITCH);
+        code.length += (4 - code.length % 4) % 4;
+        dflt.put(this, code, source, true);
+        code.putInt(labels.length);
+        for (int i = 0; i < labels.length; ++i) {
+            code.putInt(keys[i]);
+            labels[i].put(this, code, source, true);
+        }
+        // updates currentBlock
+        visitSwitchInsn(dflt, labels);
+    }
+
+    private void visitSwitchInsn(final Label dflt, final Label[] labels) {
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.LOOKUPSWITCH, 0, null, null);
+                // adds current block successors
+                addSuccessor(Edge.NORMAL, dflt);
+                dflt.getFirst().status |= Label.TARGET;
+                for (int i = 0; i < labels.length; ++i) {
+                    addSuccessor(Edge.NORMAL, labels[i]);
+                    labels[i].getFirst().status |= Label.TARGET;
+                }
+            } else {
+                // updates current stack size (max stack size unchanged)
+                --stackSize;
+                // adds current block successors
+                addSuccessor(stackSize, dflt);
+                for (int i = 0; i < labels.length; ++i) {
+                    addSuccessor(stackSize, labels[i]);
+                }
+            }
+            // ends current block
+            noSuccessor();
+        }
+    }
+
+    public void visitMultiANewArrayInsn(final String desc, final int dims) {
+        Item i = cw.newClassItem(desc);
+        // Label currentBlock = this.currentBlock;
+        if (currentBlock != null) {
+            if (compute == FRAMES) {
+                currentBlock.frame.execute(Opcodes.MULTIANEWARRAY, dims, cw, i);
+            } else {
+                // updates current stack size (max stack size unchanged because
+                // stack size variation always negative or null)
+                stackSize += 1 - dims;
+            }
+        }
+        // adds the instruction to the bytecode of the method
+        code.put12(Opcodes.MULTIANEWARRAY, i.index).putByte(dims);
+    }
+
+    public void visitTryCatchBlock(
+        final Label start,
+        final Label end,
+        final Label handler,
+        final String type)
+    {
+        ++handlerCount;
+        Handler h = new Handler();
+        h.start = start;
+        h.end = end;
+        h.handler = handler;
+        h.desc = type;
+        h.type = type != null ? cw.newClass(type) : 0;
+        if (lastHandler == null) {
+            firstHandler = h;
+        } else {
+            lastHandler.next = h;
+        }
+        lastHandler = h;
+    }
+
+    public void visitLocalVariable(
+        final String name,
+        final String desc,
+        final String signature,
+        final Label start,
+        final Label end,
+        final int index)
+    {
+        if (signature != null) {
+            if (localVarType == null) {
+                localVarType = new ByteVector();
+            }
+            ++localVarTypeCount;
+            localVarType.putShort(start.position)
+                    .putShort(end.position - start.position)
+                    .putShort(cw.newUTF8(name))
+                    .putShort(cw.newUTF8(signature))
+                    .putShort(index);
+        }
+        if (localVar == null) {
+            localVar = new ByteVector();
+        }
+        ++localVarCount;
+        localVar.putShort(start.position)
+                .putShort(end.position - start.position)
+                .putShort(cw.newUTF8(name))
+                .putShort(cw.newUTF8(desc))
+                .putShort(index);
+        if (compute != NOTHING) {
+            // updates max locals
+            char c = desc.charAt(0);
+            int n = index + (c == 'J' || c == 'D' ? 2 : 1);
+            if (n > maxLocals) {
+                maxLocals = n;
+            }
+        }
+    }
+
+    public void visitLineNumber(final int line, final Label start) {
+        if (lineNumber == null) {
+            lineNumber = new ByteVector();
+        }
+        ++lineNumberCount;
+        lineNumber.putShort(start.position);
+        lineNumber.putShort(line);
+    }
+
+    public void visitMaxs(final int maxStack, final int maxLocals) {
+        if (ClassReader.FRAMES && compute == FRAMES) {
+            // completes the control flow graph with exception handler blocks
+            Handler handler = firstHandler;
+            while (handler != null) {
+                Label l = handler.start.getFirst();
+                Label h = handler.handler.getFirst();
+                Label e = handler.end.getFirst();
+                // computes the kind of the edges to 'h'
+                String t = handler.desc == null
+                        ? "java/lang/Throwable"
+                        : handler.desc;
+                int kind = Frame.OBJECT | cw.addType(t);
+                // h is an exception handler
+                h.status |= Label.TARGET;
+                // adds 'h' as a successor of labels between 'start' and 'end'
+                while (l != e) {
+                    // creates an edge to 'h'
+                    Edge b = new Edge();
+                    b.info = kind;
+                    b.successor = h;
+                    // adds it to the successors of 'l'
+                    b.next = l.successors;
+                    l.successors = b;
+                    // goes to the next label
+                    l = l.successor;
+                }
+                handler = handler.next;
+            }
+
+            // creates and visits the first (implicit) frame
+            Frame f = labels.frame;
+            Type[] args = Type.getArgumentTypes(descriptor);
+            f.initInputFrame(cw, access, args, this.maxLocals);
+            visitFrame(f);
+
+            /*
+             * fix point algorithm: mark the first basic block as 'changed'
+             * (i.e. put it in the 'changed' list) and, while there are changed
+             * basic blocks, choose one, mark it as unchanged, and update its
+             * successors (which can be changed in the process).
+             */
+            int max = 0;
+            Label changed = labels;
+            while (changed != null) {
+                // removes a basic block from the list of changed basic blocks
+                Label l = changed;
+                changed = changed.next;
+                l.next = null;
+                f = l.frame;
+                // a reacheable jump target must be stored in the stack map
+                if ((l.status & Label.TARGET) != 0) {
+                    l.status |= Label.STORE;
+                }
+                // all visited labels are reacheable, by definition
+                l.status |= Label.REACHABLE;
+                // updates the (absolute) maximum stack size
+                int blockMax = f.inputStack.length + l.outputStackMax;
+                if (blockMax > max) {
+                    max = blockMax;
+                }
+                // updates the successors of the current basic block
+                Edge e = l.successors;
+                while (e != null) {
+                    Label n = e.successor.getFirst();
+                    boolean change = f.merge(cw, n.frame, e.info);
+                    if (change && n.next == null) {
+                        // if n has changed and is not already in the 'changed'
+                        // list, adds it to this list
+                        n.next = changed;
+                        changed = n;
+                    }
+                    e = e.next;
+                }
+            }
+            this.maxStack = max;
+
+            // visits all the frames that must be stored in the stack map
+            Label l = labels;
+            while (l != null) {
+                f = l.frame;
+                if ((l.status & Label.STORE) != 0) {
+                    visitFrame(f);
+                }
+                if ((l.status & Label.REACHABLE) == 0) {
+                    // finds start and end of dead basic block
+                    Label k = l.successor;
+                    int start = l.position;
+                    int end = (k == null ? code.length : k.position) - 1;
+                    // if non empty basic block
+                    if (end >= start) {
+                        // replaces instructions with NOP ... NOP ATHROW
+                        for (int i = start; i < end; ++i) {
+                            code.data[i] = Opcodes.NOP;
+                        }
+                        code.data[end] = (byte) Opcodes.ATHROW;
+                        // emits a frame for this unreachable block
+                        startFrame(start, 0, 1);
+                        frame[frameIndex++] = Frame.OBJECT
+                                | cw.addType("java/lang/Throwable");
+                        endFrame();
+                    }
+                }
+                l = l.successor;
+            }
+        } else if (compute == MAXS) {
+            // completes the control flow graph with exception handler blocks
+            Handler handler = firstHandler;
+            while (handler != null) {
+                Label l = handler.start;
+                Label h = handler.handler;
+                Label e = handler.end;
+                // adds 'h' as a successor of labels between 'start' and 'end'
+                while (l != e) {
+                    // creates an edge to 'h'
+                    Edge b = new Edge();
+                    b.info = Edge.EXCEPTION;
+                    b.successor = h;
+                    // adds it to the successors of 'l'
+                    if ((l.status & Label.JSR) == 0) {
+                        b.next = l.successors;
+                        l.successors = b;
+                    } else {
+                        // if l is a JSR block, adds b after the first two edges
+                        // to preserve the hypothesis about JSR block successors
+                        // order (see {@link #visitJumpInsn})
+                        b.next = l.successors.next.next;
+                        l.successors.next.next = b;
+                    }
+                    // goes to the next label
+                    l = l.successor;
+                }
+                handler = handler.next;
+            }
+
+            if (subroutines > 0) {
+                // completes the control flow graph with the RET successors
+                /*
+                 * first step: finds the subroutines. This step determines, for
+                 * each basic block, to which subroutine(s) it belongs.
+                 */
+                // finds the basic blocks that belong to the "main" subroutine
+                int id = 0;
+                labels.visitSubroutine(null, 1, subroutines);
+                // finds the basic blocks that belong to the real subroutines
+                Label l = labels;
+                while (l != null) {
+                    if ((l.status & Label.JSR) != 0) {
+                        // the subroutine is defined by l's TARGET, not by l
+                        Label subroutine = l.successors.next.successor;
+                        // if this subroutine has not been visited yet...
+                        if ((subroutine.status & Label.VISITED) == 0) {
+                            // ...assigns it a new id and finds its basic blocks
+                            id += 1;
+                            subroutine.visitSubroutine(null, (id / 32L) << 32
+                                    | (1L << (id % 32)), subroutines);
+                        }
+                    }
+                    l = l.successor;
+                }
+                // second step: finds the successors of RET blocks
+                l = labels;
+                while (l != null) {
+                    if ((l.status & Label.JSR) != 0) {
+                        Label L = labels;
+                        while (L != null) {
+                            L.status &= ~Label.VISITED;
+                            L = L.successor;
+                        }
+                        // the subroutine is defined by l's TARGET, not by l
+                        Label subroutine = l.successors.next.successor;
+                        subroutine.visitSubroutine(l, 0, subroutines);
+                    }
+                    l = l.successor;
+                }
+            }
+
+            /*
+             * control flow analysis algorithm: while the block stack is not
+             * empty, pop a block from this stack, update the max stack size,
+             * compute the true (non relative) begin stack size of the
+             * successors of this block, and push these successors onto the
+             * stack (unless they have already been pushed onto the stack).
+             * Note: by hypothesis, the {@link Label#inputStackTop} of the
+             * blocks in the block stack are the true (non relative) beginning
+             * stack sizes of these blocks.
+             */
+            int max = 0;
+            Label stack = labels;
+            while (stack != null) {
+                // pops a block from the stack
+                Label l = stack;
+                stack = stack.next;
+                // computes the true (non relative) max stack size of this block
+                int start = l.inputStackTop;
+                int blockMax = start + l.outputStackMax;
+                // updates the global max stack size
+                if (blockMax > max) {
+                    max = blockMax;
+                }
+                // analyzes the successors of the block
+                Edge b = l.successors;
+                if ((l.status & Label.JSR) != 0) {
+                    // ignores the first edge of JSR blocks (virtual successor)
+                    b = b.next;
+                }
+                while (b != null) {
+                    l = b.successor;
+                    // if this successor has not already been pushed...
+                    if ((l.status & Label.PUSHED) == 0) {
+                        // computes its true beginning stack size...
+                        l.inputStackTop = b.info == Edge.EXCEPTION ? 1 : start
+                                + b.info;
+                        // ...and pushes it onto the stack
+                        l.status |= Label.PUSHED;
+                        l.next = stack;
+                        stack = l;
+                    }
+                    b = b.next;
+                }
+            }
+            this.maxStack = max;
+        } else {
+            this.maxStack = maxStack;
+            this.maxLocals = maxLocals;
+        }
+    }
+
+    public void visitEnd() {
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: control flow analysis algorithm
+    // ------------------------------------------------------------------------
+
+    /**
+     * Computes the size of the arguments and of the return value of a method.
+     *
+     * @param desc the descriptor of a method.
+     * @return the size of the arguments of the method (plus one for the
+     *         implicit this argument), argSize, and the size of its return
+     *         value, retSize, packed into a single int i =
+     *         <tt>(argSize << 2) | retSize</tt> (argSize is therefore equal
+     *         to <tt>i >> 2</tt>, and retSize to <tt>i & 0x03</tt>).
+     */
+    static int getArgumentsAndReturnSizes(final String desc) {
+        int n = 1;
+        int c = 1;
+        while (true) {
+            char car = desc.charAt(c++);
+            if (car == ')') {
+                car = desc.charAt(c);
+                return n << 2
+                        | (car == 'V' ? 0 : (car == 'D' || car == 'J' ? 2 : 1));
+            } else if (car == 'L') {
+                while (desc.charAt(c++) != ';') {
+                }
+                n += 1;
+            } else if (car == '[') {
+                while ((car = desc.charAt(c)) == '[') {
+                    ++c;
+                }
+                if (car == 'D' || car == 'J') {
+                    n -= 1;
+                }
+            } else if (car == 'D' || car == 'J') {
+                n += 2;
+            } else {
+                n += 1;
+            }
+        }
+    }
+
+    /**
+     * Adds a successor to the {@link #currentBlock currentBlock} block.
+     *
+     * @param info information about the control flow edge to be added.
+     * @param successor the successor block to be added to the current block.
+     */
+    private void addSuccessor(final int info, final Label successor) {
+        // creates and initializes an Edge object...
+        Edge b = new Edge();
+        b.info = info;
+        b.successor = successor;
+        // ...and adds it to the successor list of the currentBlock block
+        b.next = currentBlock.successors;
+        currentBlock.successors = b;
+    }
+
+    /**
+     * Ends the current basic block. This method must be used in the case where
+     * the current basic block does not have any successor.
+     */
+    private void noSuccessor() {
+        if (compute == FRAMES) {
+            Label l = new Label();
+            l.frame = new Frame();
+            l.frame.owner = l;
+            l.resolve(this, code.length, code.data);
+            previousBlock.successor = l;
+            previousBlock = l;
+        } else {
+            currentBlock.outputStackMax = maxStackSize;
+        }
+        currentBlock = null;
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: stack map frames
+    // ------------------------------------------------------------------------
+
+    /**
+     * Visits a frame that has been computed from scratch.
+     *
+     * @param f the frame that must be visited.
+     */
+    private void visitFrame(final Frame f) {
+        int i, t;
+        int nTop = 0;
+        int nLocal = 0;
+        int nStack = 0;
+        int[] locals = f.inputLocals;
+        int[] stacks = f.inputStack;
+        // computes the number of locals (ignores TOP types that are just after
+        // a LONG or a DOUBLE, and all trailing TOP types)
+        for (i = 0; i < locals.length; ++i) {
+            t = locals[i];
+            if (t == Frame.TOP) {
+                ++nTop;
+            } else {
+                nLocal += nTop + 1;
+                nTop = 0;
+            }
+            if (t == Frame.LONG || t == Frame.DOUBLE) {
+                ++i;
+            }
+        }
+        // computes the stack size (ignores TOP types that are just after
+        // a LONG or a DOUBLE)
+        for (i = 0; i < stacks.length; ++i) {
+            t = stacks[i];
+            ++nStack;
+            if (t == Frame.LONG || t == Frame.DOUBLE) {
+                ++i;
+            }
+        }
+        // visits the frame and its content
+        startFrame(f.owner.position, nLocal, nStack);
+        for (i = 0; nLocal > 0; ++i, --nLocal) {
+            t = locals[i];
+            frame[frameIndex++] = t;
+            if (t == Frame.LONG || t == Frame.DOUBLE) {
+                ++i;
+            }
+        }
+        for (i = 0; i < stacks.length; ++i) {
+            t = stacks[i];
+            frame[frameIndex++] = t;
+            if (t == Frame.LONG || t == Frame.DOUBLE) {
+                ++i;
+            }
+        }
+        endFrame();
+    }
+
+    /**
+     * Starts the visit of a stack map frame.
+     *
+     * @param offset the offset of the instruction to which the frame
+     *        corresponds.
+     * @param nLocal the number of local variables in the frame.
+     * @param nStack the number of stack elements in the frame.
+     */
+    private void startFrame(final int offset, final int nLocal, final int nStack)
+    {
+        int n = 3 + nLocal + nStack;
+        if (frame == null || frame.length < n) {
+            frame = new int[n];
+        }
+        frame[0] = offset;
+        frame[1] = nLocal;
+        frame[2] = nStack;
+        frameIndex = 3;
+    }
+
+    /**
+     * Checks if the visit of the current frame {@link #frame} is finished, and
+     * if yes, write it in the StackMapTable attribute.
+     */
+    private void endFrame() {
+        if (previousFrame != null) { // do not write the first frame
+            if (stackMap == null) {
+                stackMap = new ByteVector();
+            }
+            writeFrame();
+            ++frameCount;
+        }
+        previousFrame = frame;
+        frame = null;
+    }
+
+    /**
+     * Compress and writes the current frame {@link #frame} in the StackMapTable
+     * attribute.
+     */
+    private void writeFrame() {
+        int clocalsSize = frame[1];
+        int cstackSize = frame[2];
+        if ((cw.version & 0xFFFF) < Opcodes.V1_6) {
+            stackMap.putShort(frame[0]).putShort(clocalsSize);
+            writeFrameTypes(3, 3 + clocalsSize);
+            stackMap.putShort(cstackSize);
+            writeFrameTypes(3 + clocalsSize, 3 + clocalsSize + cstackSize);
+            return;
+        }
+        int localsSize = previousFrame[1];
+        int type = FULL_FRAME;
+        int k = 0;
+        int delta;
+        if (frameCount == 0) {
+            delta = frame[0];
+        } else {
+            delta = frame[0] - previousFrame[0] - 1;
+        }
+        if (cstackSize == 0) {
+            k = clocalsSize - localsSize;
+            switch (k) {
+                case -3:
+                case -2:
+                case -1:
+                    type = CHOP_FRAME;
+                    localsSize = clocalsSize;
+                    break;
+                case 0:
+                    type = delta < 64 ? SAME_FRAME : SAME_FRAME_EXTENDED;
+                    break;
+                case 1:
+                case 2:
+                case 3:
+                    type = APPEND_FRAME;
+                    break;
+            }
+        } else if (clocalsSize == localsSize && cstackSize == 1) {
+            type = delta < 63
+                    ? SAME_LOCALS_1_STACK_ITEM_FRAME
+                    : SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED;
+        }
+        if (type != FULL_FRAME) {
+            // verify if locals are the same
+            int l = 3;
+            for (int j = 0; j < localsSize; j++) {
+                if (frame[l] != previousFrame[l]) {
+                    type = FULL_FRAME;
+                    break;
+                }
+                l++;
+            }
+        }
+        switch (type) {
+            case SAME_FRAME:
+                stackMap.putByte(delta);
+                break;
+            case SAME_LOCALS_1_STACK_ITEM_FRAME:
+                stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME + delta);
+                writeFrameTypes(3 + clocalsSize, 4 + clocalsSize);
+                break;
+            case SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED:
+                stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED)
+                        .putShort(delta);
+                writeFrameTypes(3 + clocalsSize, 4 + clocalsSize);
+                break;
+            case SAME_FRAME_EXTENDED:
+                stackMap.putByte(SAME_FRAME_EXTENDED).putShort(delta);
+                break;
+            case CHOP_FRAME:
+                stackMap.putByte(SAME_FRAME_EXTENDED + k).putShort(delta);
+                break;
+            case APPEND_FRAME:
+                stackMap.putByte(SAME_FRAME_EXTENDED + k).putShort(delta);
+                writeFrameTypes(3 + localsSize, 3 + clocalsSize);
+                break;
+            // case FULL_FRAME:
+            default:
+                stackMap.putByte(FULL_FRAME)
+                        .putShort(delta)
+                        .putShort(clocalsSize);
+                writeFrameTypes(3, 3 + clocalsSize);
+                stackMap.putShort(cstackSize);
+                writeFrameTypes(3 + clocalsSize, 3 + clocalsSize + cstackSize);
+        }
+    }
+
+    /**
+     * Writes some types of the current frame {@link #frame} into the
+     * StackMapTableAttribute. This method converts types from the format used
+     * in {@link Label} to the format used in StackMapTable attributes. In
+     * particular, it converts type table indexes to constant pool indexes.
+     *
+     * @param start index of the first type in {@link #frame} to write.
+     * @param end index of last type in {@link #frame} to write (exclusive).
+     */
+    private void writeFrameTypes(final int start, final int end) {
+        for (int i = start; i < end; ++i) {
+            int t = frame[i];
+            int d = t & Frame.DIM;
+            if (d == 0) {
+                int v = t & Frame.BASE_VALUE;
+                switch (t & Frame.BASE_KIND) {
+                    case Frame.OBJECT:
+                        stackMap.putByte(7)
+                                .putShort(cw.newClass(cw.typeTable[v].strVal1));
+                        break;
+                    case Frame.UNINITIALIZED:
+                        stackMap.putByte(8).putShort(cw.typeTable[v].intVal);
+                        break;
+                    default:
+                        stackMap.putByte(v);
+                }
+            } else {
+                StringBuffer buf = new StringBuffer();
+                d >>= 28;
+                while (d-- > 0) {
+                    buf.append('[');
+                }
+                if ((t & Frame.BASE_KIND) == Frame.OBJECT) {
+                    buf.append('L');
+                    buf.append(cw.typeTable[t & Frame.BASE_VALUE].strVal1);
+                    buf.append(';');
+                } else {
+                    switch (t & 0xF) {
+                        case 1:
+                            buf.append('I');
+                            break;
+                        case 2:
+                            buf.append('F');
+                            break;
+                        case 3:
+                            buf.append('D');
+                            break;
+                        case 9:
+                            buf.append('Z');
+                            break;
+                        case 10:
+                            buf.append('B');
+                            break;
+                        case 11:
+                            buf.append('C');
+                            break;
+                        case 12:
+                            buf.append('S');
+                            break;
+                        default:
+                            buf.append('J');
+                    }
+                }
+                stackMap.putByte(7).putShort(cw.newClass(buf.toString()));
+            }
+        }
+    }
+
+    private void writeFrameType(final Object type) {
+        if (type instanceof String) {
+            stackMap.putByte(7).putShort(cw.newClass((String) type));
+        } else if (type instanceof Integer) {
+            stackMap.putByte(((Integer) type).intValue());
+        } else {
+            stackMap.putByte(8).putShort(((Label) type).position);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: dump bytecode array
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the size of the bytecode of this method.
+     *
+     * @return the size of the bytecode of this method.
+     */
+    final int getSize() {
+        if (classReaderOffset != 0) {
+            return 6 + classReaderLength;
+        }
+        if (resize) {
+            // replaces the temporary jump opcodes introduced by Label.resolve.
+            if (ClassReader.RESIZE) {
+                resizeInstructions();
+            } else {
+                throw new RuntimeException("Method code too large!");
+            }
+        }
+        int size = 8;
+        if (code.length > 0) {
+            cw.newUTF8("Code");
+            size += 18 + code.length + 8 * handlerCount;
+            if (localVar != null) {
+                cw.newUTF8("LocalVariableTable");
+                size += 8 + localVar.length;
+            }
+            if (localVarType != null) {
+                cw.newUTF8("LocalVariableTypeTable");
+                size += 8 + localVarType.length;
+            }
+            if (lineNumber != null) {
+                cw.newUTF8("LineNumberTable");
+                size += 8 + lineNumber.length;
+            }
+            if (stackMap != null) {
+                boolean zip = (cw.version & 0xFFFF) >= Opcodes.V1_6;
+                cw.newUTF8(zip ? "StackMapTable" : "StackMap");
+                size += 8 + stackMap.length;
+            }
+            if (cattrs != null) {
+                size += cattrs.getSize(cw,
+                        code.data,
+                        code.length,
+                        maxStack,
+                        maxLocals);
+            }
+        }
+        if (exceptionCount > 0) {
+            cw.newUTF8("Exceptions");
+            size += 8 + 2 * exceptionCount;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0
+                && (cw.version & 0xffff) < Opcodes.V1_5)
+        {
+            cw.newUTF8("Synthetic");
+            size += 6;
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            cw.newUTF8("Deprecated");
+            size += 6;
+        }
+        if (ClassReader.SIGNATURES && signature != null) {
+            cw.newUTF8("Signature");
+            cw.newUTF8(signature);
+            size += 8;
+        }
+        if (ClassReader.ANNOTATIONS && annd != null) {
+            cw.newUTF8("AnnotationDefault");
+            size += 6 + annd.length;
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            cw.newUTF8("RuntimeVisibleAnnotations");
+            size += 8 + anns.getSize();
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            cw.newUTF8("RuntimeInvisibleAnnotations");
+            size += 8 + ianns.getSize();
+        }
+        if (ClassReader.ANNOTATIONS && panns != null) {
+            cw.newUTF8("RuntimeVisibleParameterAnnotations");
+            size += 7 + 2 * (panns.length - synthetics);
+            for (int i = panns.length - 1; i >= synthetics; --i) {
+                size += panns[i] == null ? 0 : panns[i].getSize();
+            }
+        }
+        if (ClassReader.ANNOTATIONS && ipanns != null) {
+            cw.newUTF8("RuntimeInvisibleParameterAnnotations");
+            size += 7 + 2 * (ipanns.length - synthetics);
+            for (int i = ipanns.length - 1; i >= synthetics; --i) {
+                size += ipanns[i] == null ? 0 : ipanns[i].getSize();
+            }
+        }
+        if (attrs != null) {
+            size += attrs.getSize(cw, null, 0, -1, -1);
+        }
+        return size;
+    }
+
+    /**
+     * Puts the bytecode of this method in the given byte vector.
+     *
+     * @param out the byte vector into which the bytecode of this method must be
+     *        copied.
+     */
+    final void put(final ByteVector out) {
+        out.putShort(access).putShort(name).putShort(desc);
+        if (classReaderOffset != 0) {
+            out.putByteArray(cw.cr.b, classReaderOffset, classReaderLength);
+            return;
+        }
+        int attributeCount = 0;
+        if (code.length > 0) {
+            ++attributeCount;
+        }
+        if (exceptionCount > 0) {
+            ++attributeCount;
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0
+                && (cw.version & 0xffff) < Opcodes.V1_5)
+        {
+            ++attributeCount;
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            ++attributeCount;
+        }
+        if (ClassReader.SIGNATURES && signature != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && annd != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && panns != null) {
+            ++attributeCount;
+        }
+        if (ClassReader.ANNOTATIONS && ipanns != null) {
+            ++attributeCount;
+        }
+        if (attrs != null) {
+            attributeCount += attrs.getCount();
+        }
+        out.putShort(attributeCount);
+        if (code.length > 0) {
+            int size = 12 + code.length + 8 * handlerCount;
+            if (localVar != null) {
+                size += 8 + localVar.length;
+            }
+            if (localVarType != null) {
+                size += 8 + localVarType.length;
+            }
+            if (lineNumber != null) {
+                size += 8 + lineNumber.length;
+            }
+            if (stackMap != null) {
+                size += 8 + stackMap.length;
+            }
+            if (cattrs != null) {
+                size += cattrs.getSize(cw,
+                        code.data,
+                        code.length,
+                        maxStack,
+                        maxLocals);
+            }
+            out.putShort(cw.newUTF8("Code")).putInt(size);
+            out.putShort(maxStack).putShort(maxLocals);
+            out.putInt(code.length).putByteArray(code.data, 0, code.length);
+            out.putShort(handlerCount);
+            if (handlerCount > 0) {
+                Handler h = firstHandler;
+                while (h != null) {
+                    out.putShort(h.start.position)
+                            .putShort(h.end.position)
+                            .putShort(h.handler.position)
+                            .putShort(h.type);
+                    h = h.next;
+                }
+            }
+            attributeCount = 0;
+            if (localVar != null) {
+                ++attributeCount;
+            }
+            if (localVarType != null) {
+                ++attributeCount;
+            }
+            if (lineNumber != null) {
+                ++attributeCount;
+            }
+            if (stackMap != null) {
+                ++attributeCount;
+            }
+            if (cattrs != null) {
+                attributeCount += cattrs.getCount();
+            }
+            out.putShort(attributeCount);
+            if (localVar != null) {
+                out.putShort(cw.newUTF8("LocalVariableTable"));
+                out.putInt(localVar.length + 2).putShort(localVarCount);
+                out.putByteArray(localVar.data, 0, localVar.length);
+            }
+            if (localVarType != null) {
+                out.putShort(cw.newUTF8("LocalVariableTypeTable"));
+                out.putInt(localVarType.length + 2).putShort(localVarTypeCount);
+                out.putByteArray(localVarType.data, 0, localVarType.length);
+            }
+            if (lineNumber != null) {
+                out.putShort(cw.newUTF8("LineNumberTable"));
+                out.putInt(lineNumber.length + 2).putShort(lineNumberCount);
+                out.putByteArray(lineNumber.data, 0, lineNumber.length);
+            }
+            if (stackMap != null) {
+                boolean zip = (cw.version & 0xFFFF) >= Opcodes.V1_6;
+                out.putShort(cw.newUTF8(zip ? "StackMapTable" : "StackMap"));
+                out.putInt(stackMap.length + 2).putShort(frameCount);
+                out.putByteArray(stackMap.data, 0, stackMap.length);
+            }
+            if (cattrs != null) {
+                cattrs.put(cw, code.data, code.length, maxLocals, maxStack, out);
+            }
+        }
+        if (exceptionCount > 0) {
+            out.putShort(cw.newUTF8("Exceptions"))
+                    .putInt(2 * exceptionCount + 2);
+            out.putShort(exceptionCount);
+            for (int i = 0; i < exceptionCount; ++i) {
+                out.putShort(exceptions[i]);
+            }
+        }
+        if ((access & Opcodes.ACC_SYNTHETIC) != 0
+                && (cw.version & 0xffff) < Opcodes.V1_5)
+        {
+            out.putShort(cw.newUTF8("Synthetic")).putInt(0);
+        }
+        if ((access & Opcodes.ACC_DEPRECATED) != 0) {
+            out.putShort(cw.newUTF8("Deprecated")).putInt(0);
+        }
+        if (ClassReader.SIGNATURES && signature != null) {
+            out.putShort(cw.newUTF8("Signature"))
+                    .putInt(2)
+                    .putShort(cw.newUTF8(signature));
+        }
+        if (ClassReader.ANNOTATIONS && annd != null) {
+            out.putShort(cw.newUTF8("AnnotationDefault"));
+            out.putInt(annd.length);
+            out.putByteArray(annd.data, 0, annd.length);
+        }
+        if (ClassReader.ANNOTATIONS && anns != null) {
+            out.putShort(cw.newUTF8("RuntimeVisibleAnnotations"));
+            anns.put(out);
+        }
+        if (ClassReader.ANNOTATIONS && ianns != null) {
+            out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations"));
+            ianns.put(out);
+        }
+        if (ClassReader.ANNOTATIONS && panns != null) {
+            out.putShort(cw.newUTF8("RuntimeVisibleParameterAnnotations"));
+            AnnotationWriter.put(panns, synthetics, out);
+        }
+        if (ClassReader.ANNOTATIONS && ipanns != null) {
+            out.putShort(cw.newUTF8("RuntimeInvisibleParameterAnnotations"));
+            AnnotationWriter.put(ipanns, synthetics, out);
+        }
+        if (attrs != null) {
+            attrs.put(cw, null, 0, -1, -1, out);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Utility methods: instruction resizing (used to handle GOTO_W and JSR_W)
+    // ------------------------------------------------------------------------
+
+    /**
+     * Resizes and replaces the temporary instructions inserted by
+     * {@link Label#resolve} for wide forward jumps, while keeping jump offsets
+     * and instruction addresses consistent. This may require to resize other
+     * existing instructions, or even to introduce new instructions: for
+     * example, increasing the size of an instruction by 2 at the middle of a
+     * method can increases the offset of an IFEQ instruction from 32766 to
+     * 32768, in which case IFEQ 32766 must be replaced with IFNEQ 8 GOTO_W
+     * 32765. This, in turn, may require to increase the size of another jump
+     * instruction, and so on... All these operations are handled automatically
+     * by this method. <p> <i>This method must be called after all the method
+     * that is being built has been visited</i>. In particular, the
+     * {@link Label Label} objects used to construct the method are no longer
+     * valid after this method has been called.
+     */
+    private void resizeInstructions() {
+        byte[] b = code.data; // bytecode of the method
+        int u, v, label; // indexes in b
+        int i, j; // loop indexes
+        /*
+         * 1st step: As explained above, resizing an instruction may require to
+         * resize another one, which may require to resize yet another one, and
+         * so on. The first step of the algorithm consists in finding all the
+         * instructions that need to be resized, without modifying the code.
+         * This is done by the following "fix point" algorithm:
+         *
+         * Parse the code to find the jump instructions whose offset will need
+         * more than 2 bytes to be stored (the future offset is computed from
+         * the current offset and from the number of bytes that will be inserted
+         * or removed between the source and target instructions). For each such
+         * instruction, adds an entry in (a copy of) the indexes and sizes
+         * arrays (if this has not already been done in a previous iteration!).
+         *
+         * If at least one entry has been added during the previous step, go
+         * back to the beginning, otherwise stop.
+         *
+         * In fact the real algorithm is complicated by the fact that the size
+         * of TABLESWITCH and LOOKUPSWITCH instructions depends on their
+         * position in the bytecode (because of padding). In order to ensure the
+         * convergence of the algorithm, the number of bytes to be added or
+         * removed from these instructions is over estimated during the previous
+         * loop, and computed exactly only after the loop is finished (this
+         * requires another pass to parse the bytecode of the method).
+         */
+        int[] allIndexes = new int[0]; // copy of indexes
+        int[] allSizes = new int[0]; // copy of sizes
+        boolean[] resize; // instructions to be resized
+        int newOffset; // future offset of a jump instruction
+
+        resize = new boolean[code.length];
+
+        // 3 = loop again, 2 = loop ended, 1 = last pass, 0 = done
+        int state = 3;
+        do {
+            if (state == 3) {
+                state = 2;
+            }
+            u = 0;
+            while (u < b.length) {
+                int opcode = b[u] & 0xFF; // opcode of current instruction
+                int insert = 0; // bytes to be added after this instruction
+
+                switch (ClassWriter.TYPE[opcode]) {
+                    case ClassWriter.NOARG_INSN:
+                    case ClassWriter.IMPLVAR_INSN:
+                        u += 1;
+                        break;
+                    case ClassWriter.LABEL_INSN:
+                        if (opcode > 201) {
+                            // converts temporary opcodes 202 to 217, 218 and
+                            // 219 to IFEQ ... JSR (inclusive), IFNULL and
+                            // IFNONNULL
+                            opcode = opcode < 218 ? opcode - 49 : opcode - 20;
+                            label = u + readUnsignedShort(b, u + 1);
+                        } else {
+                            label = u + readShort(b, u + 1);
+                        }
+                        newOffset = getNewOffset(allIndexes, allSizes, u, label);
+                        if (newOffset < Short.MIN_VALUE
+                                || newOffset > Short.MAX_VALUE)
+                        {
+                            if (!resize[u]) {
+                                if (opcode == Opcodes.GOTO
+                                        || opcode == Opcodes.JSR)
+                                {
+                                    // two additional bytes will be required to
+                                    // replace this GOTO or JSR instruction with
+                                    // a GOTO_W or a JSR_W
+                                    insert = 2;
+                                } else {
+                                    // five additional bytes will be required to
+                                    // replace this IFxxx <l> instruction with
+                                    // IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx
+                                    // is the "opposite" opcode of IFxxx (i.e.,
+                                    // IFNE for IFEQ) and where <l'> designates
+                                    // the instruction just after the GOTO_W.
+                                    insert = 5;
+                                }
+                                resize[u] = true;
+                            }
+                        }
+                        u += 3;
+                        break;
+                    case ClassWriter.LABELW_INSN:
+                        u += 5;
+                        break;
+                    case ClassWriter.TABL_INSN:
+                        if (state == 1) {
+                            // true number of bytes to be added (or removed)
+                            // from this instruction = (future number of padding
+                            // bytes - current number of padding byte) -
+                            // previously over estimated variation =
+                            // = ((3 - newOffset%4) - (3 - u%4)) - u%4
+                            // = (-newOffset%4 + u%4) - u%4
+                            // = -(newOffset & 3)
+                            newOffset = getNewOffset(allIndexes, allSizes, 0, u);
+                            insert = -(newOffset & 3);
+                        } else if (!resize[u]) {
+                            // over estimation of the number of bytes to be
+                            // added to this instruction = 3 - current number
+                            // of padding bytes = 3 - (3 - u%4) = u%4 = u & 3
+                            insert = u & 3;
+                            resize[u] = true;
+                        }
+                        // skips instruction
+                        u = u + 4 - (u & 3);
+                        u += 4 * (readInt(b, u + 8) - readInt(b, u + 4) + 1) + 12;
+                        break;
+                    case ClassWriter.LOOK_INSN:
+                        if (state == 1) {
+                            // like TABL_INSN
+                            newOffset = getNewOffset(allIndexes, allSizes, 0, u);
+                            insert = -(newOffset & 3);
+                        } else if (!resize[u]) {
+                            // like TABL_INSN
+                            insert = u & 3;
+                            resize[u] = true;
+                        }
+                        // skips instruction
+                        u = u + 4 - (u & 3);
+                        u += 8 * readInt(b, u + 4) + 8;
+                        break;
+                    case ClassWriter.WIDE_INSN:
+                        opcode = b[u + 1] & 0xFF;
+                        if (opcode == Opcodes.IINC) {
+                            u += 6;
+                        } else {
+                            u += 4;
+                        }
+                        break;
+                    case ClassWriter.VAR_INSN:
+                    case ClassWriter.SBYTE_INSN:
+                    case ClassWriter.LDC_INSN:
+                        u += 2;
+                        break;
+                    case ClassWriter.SHORT_INSN:
+                    case ClassWriter.LDCW_INSN:
+                    case ClassWriter.FIELDORMETH_INSN:
+                    case ClassWriter.TYPE_INSN:
+                    case ClassWriter.IINC_INSN:
+                        u += 3;
+                        break;
+                    case ClassWriter.ITFMETH_INSN:
+                        u += 5;
+                        break;
+                    // case ClassWriter.MANA_INSN:
+                    default:
+                        u += 4;
+                        break;
+                }
+                if (insert != 0) {
+                    // adds a new (u, insert) entry in the allIndexes and
+                    // allSizes arrays
+                    int[] newIndexes = new int[allIndexes.length + 1];
+                    int[] newSizes = new int[allSizes.length + 1];
+                    System.arraycopy(allIndexes,
+                            0,
+                            newIndexes,
+                            0,
+                            allIndexes.length);
+                    System.arraycopy(allSizes, 0, newSizes, 0, allSizes.length);
+                    newIndexes[allIndexes.length] = u;
+                    newSizes[allSizes.length] = insert;
+                    allIndexes = newIndexes;
+                    allSizes = newSizes;
+                    if (insert > 0) {
+                        state = 3;
+                    }
+                }
+            }
+            if (state < 3) {
+                --state;
+            }
+        } while (state != 0);
+
+        // 2nd step:
+        // copies the bytecode of the method into a new bytevector, updates the
+        // offsets, and inserts (or removes) bytes as requested.
+
+        ByteVector newCode = new ByteVector(code.length);
+
+        u = 0;
+        while (u < code.length) {
+            int opcode = b[u] & 0xFF;
+            switch (ClassWriter.TYPE[opcode]) {
+                case ClassWriter.NOARG_INSN:
+                case ClassWriter.IMPLVAR_INSN:
+                    newCode.putByte(opcode);
+                    u += 1;
+                    break;
+                case ClassWriter.LABEL_INSN:
+                    if (opcode > 201) {
+                        // changes temporary opcodes 202 to 217 (inclusive), 218
+                        // and 219 to IFEQ ... JSR (inclusive), IFNULL and
+                        // IFNONNULL
+                        opcode = opcode < 218 ? opcode - 49 : opcode - 20;
+                        label = u + readUnsignedShort(b, u + 1);
+                    } else {
+                        label = u + readShort(b, u + 1);
+                    }
+                    newOffset = getNewOffset(allIndexes, allSizes, u, label);
+                    if (resize[u]) {
+                        // replaces GOTO with GOTO_W, JSR with JSR_W and IFxxx
+                        // <l> with IFNOTxxx <l'> GOTO_W <l>, where IFNOTxxx is
+                        // the "opposite" opcode of IFxxx (i.e., IFNE for IFEQ)
+                        // and where <l'> designates the instruction just after
+                        // the GOTO_W.
+                        if (opcode == Opcodes.GOTO) {
+                            newCode.putByte(200); // GOTO_W
+                        } else if (opcode == Opcodes.JSR) {
+                            newCode.putByte(201); // JSR_W
+                        } else {
+                            newCode.putByte(opcode <= 166
+                                    ? ((opcode + 1) ^ 1) - 1
+                                    : opcode ^ 1);
+                            newCode.putShort(8); // jump offset
+                            newCode.putByte(200); // GOTO_W
+                            // newOffset now computed from start of GOTO_W
+                            newOffset -= 3;
+                        }
+                        newCode.putInt(newOffset);
+                    } else {
+                        newCode.putByte(opcode);
+                        newCode.putShort(newOffset);
+                    }
+                    u += 3;
+                    break;
+                case ClassWriter.LABELW_INSN:
+                    label = u + readInt(b, u + 1);
+                    newOffset = getNewOffset(allIndexes, allSizes, u, label);
+                    newCode.putByte(opcode);
+                    newCode.putInt(newOffset);
+                    u += 5;
+                    break;
+                case ClassWriter.TABL_INSN:
+                    // skips 0 to 3 padding bytes
+                    v = u;
+                    u = u + 4 - (v & 3);
+                    // reads and copies instruction
+                    newCode.putByte(Opcodes.TABLESWITCH);
+                    newCode.length += (4 - newCode.length % 4) % 4;
+                    label = v + readInt(b, u);
+                    u += 4;
+                    newOffset = getNewOffset(allIndexes, allSizes, v, label);
+                    newCode.putInt(newOffset);
+                    j = readInt(b, u);
+                    u += 4;
+                    newCode.putInt(j);
+                    j = readInt(b, u) - j + 1;
+                    u += 4;
+                    newCode.putInt(readInt(b, u - 4));
+                    for (; j > 0; --j) {
+                        label = v + readInt(b, u);
+                        u += 4;
+                        newOffset = getNewOffset(allIndexes, allSizes, v, label);
+                        newCode.putInt(newOffset);
+                    }
+                    break;
+                case ClassWriter.LOOK_INSN:
+                    // skips 0 to 3 padding bytes
+                    v = u;
+                    u = u + 4 - (v & 3);
+                    // reads and copies instruction
+                    newCode.putByte(Opcodes.LOOKUPSWITCH);
+                    newCode.length += (4 - newCode.length % 4) % 4;
+                    label = v + readInt(b, u);
+                    u += 4;
+                    newOffset = getNewOffset(allIndexes, allSizes, v, label);
+                    newCode.putInt(newOffset);
+                    j = readInt(b, u);
+                    u += 4;
+                    newCode.putInt(j);
+                    for (; j > 0; --j) {
+                        newCode.putInt(readInt(b, u));
+                        u += 4;
+                        label = v + readInt(b, u);
+                        u += 4;
+                        newOffset = getNewOffset(allIndexes, allSizes, v, label);
+                        newCode.putInt(newOffset);
+                    }
+                    break;
+                case ClassWriter.WIDE_INSN:
+                    opcode = b[u + 1] & 0xFF;
+                    if (opcode == Opcodes.IINC) {
+                        newCode.putByteArray(b, u, 6);
+                        u += 6;
+                    } else {
+                        newCode.putByteArray(b, u, 4);
+                        u += 4;
+                    }
+                    break;
+                case ClassWriter.VAR_INSN:
+                case ClassWriter.SBYTE_INSN:
+                case ClassWriter.LDC_INSN:
+                    newCode.putByteArray(b, u, 2);
+                    u += 2;
+                    break;
+                case ClassWriter.SHORT_INSN:
+                case ClassWriter.LDCW_INSN:
+                case ClassWriter.FIELDORMETH_INSN:
+                case ClassWriter.TYPE_INSN:
+                case ClassWriter.IINC_INSN:
+                    newCode.putByteArray(b, u, 3);
+                    u += 3;
+                    break;
+                case ClassWriter.ITFMETH_INSN:
+                    newCode.putByteArray(b, u, 5);
+                    u += 5;
+                    break;
+                // case MANA_INSN:
+                default:
+                    newCode.putByteArray(b, u, 4);
+                    u += 4;
+                    break;
+            }
+        }
+
+        // recomputes the stack map frames
+        if (frameCount > 0) {
+            if (compute == FRAMES) {
+                frameCount = 0;
+                stackMap = null;
+                previousFrame = null;
+                frame = null;
+                Frame f = new Frame();
+                f.owner = labels;
+                Type[] args = Type.getArgumentTypes(descriptor);
+                f.initInputFrame(cw, access, args, maxLocals);
+                visitFrame(f);
+                Label l = labels;
+                while (l != null) {
+                    /*
+                     * here we need the original label position. getNewOffset
+                     * must therefore never have been called for this label.
+                     */
+                    u = l.position - 3;
+                    if ((l.status & Label.STORE) != 0 || (u >= 0 && resize[u]))
+                    {
+                        getNewOffset(allIndexes, allSizes, l);
+                        // TODO update offsets in UNINITIALIZED values
+                        visitFrame(l.frame);
+                    }
+                    l = l.successor;
+                }
+            } else {
+                /*
+                 * Resizing an existing stack map frame table is really hard.
+                 * Not only the table must be parsed to update the offets, but
+                 * new frames may be needed for jump instructions that were
+                 * inserted by this method. And updating the offsets or
+                 * inserting frames can change the format of the following
+                 * frames, in case of packed frames. In practice the whole table
+                 * must be recomputed. For this the frames are marked as
+                 * potentially invalid. This will cause the whole class to be
+                 * reread and rewritten with the COMPUTE_FRAMES option (see the
+                 * ClassWriter.toByteArray method). This is not very efficient
+                 * but is much easier and requires much less code than any other
+                 * method I can think of.
+                 */
+                cw.invalidFrames = true;
+            }
+        }
+        // updates the exception handler block labels
+        Handler h = firstHandler;
+        while (h != null) {
+            getNewOffset(allIndexes, allSizes, h.start);
+            getNewOffset(allIndexes, allSizes, h.end);
+            getNewOffset(allIndexes, allSizes, h.handler);
+            h = h.next;
+        }
+        // updates the instructions addresses in the
+        // local var and line number tables
+        for (i = 0; i < 2; ++i) {
+            ByteVector bv = i == 0 ? localVar : localVarType;
+            if (bv != null) {
+                b = bv.data;
+                u = 0;
+                while (u < bv.length) {
+                    label = readUnsignedShort(b, u);
+                    newOffset = getNewOffset(allIndexes, allSizes, 0, label);
+                    writeShort(b, u, newOffset);
+                    label += readUnsignedShort(b, u + 2);
+                    newOffset = getNewOffset(allIndexes, allSizes, 0, label)
+                            - newOffset;
+                    writeShort(b, u + 2, newOffset);
+                    u += 10;
+                }
+            }
+        }
+        if (lineNumber != null) {
+            b = lineNumber.data;
+            u = 0;
+            while (u < lineNumber.length) {
+                writeShort(b, u, getNewOffset(allIndexes,
+                        allSizes,
+                        0,
+                        readUnsignedShort(b, u)));
+                u += 4;
+            }
+        }
+        // updates the labels of the other attributes
+        Attribute attr = cattrs;
+        while (attr != null) {
+            Label[] labels = attr.getLabels();
+            if (labels != null) {
+                for (i = labels.length - 1; i >= 0; --i) {
+                    getNewOffset(allIndexes, allSizes, labels[i]);
+                }
+            }
+            attr = attr.next;
+        }
+
+        // replaces old bytecodes with new ones
+        code = newCode;
+    }
+
+    /**
+     * Reads an unsigned short value in the given byte array.
+     *
+     * @param b a byte array.
+     * @param index the start index of the value to be read.
+     * @return the read value.
+     */
+    static int readUnsignedShort(final byte[] b, final int index) {
+        return ((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF);
+    }
+
+    /**
+     * Reads a signed short value in the given byte array.
+     *
+     * @param b a byte array.
+     * @param index the start index of the value to be read.
+     * @return the read value.
+     */
+    static short readShort(final byte[] b, final int index) {
+        return (short) (((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF));
+    }
+
+    /**
+     * Reads a signed int value in the given byte array.
+     *
+     * @param b a byte array.
+     * @param index the start index of the value to be read.
+     * @return the read value.
+     */
+    static int readInt(final byte[] b, final int index) {
+        return ((b[index] & 0xFF) << 24) | ((b[index + 1] & 0xFF) << 16)
+                | ((b[index + 2] & 0xFF) << 8) | (b[index + 3] & 0xFF);
+    }
+
+    /**
+     * Writes a short value in the given byte array.
+     *
+     * @param b a byte array.
+     * @param index where the first byte of the short value must be written.
+     * @param s the value to be written in the given byte array.
+     */
+    static void writeShort(final byte[] b, final int index, final int s) {
+        b[index] = (byte) (s >>> 8);
+        b[index + 1] = (byte) s;
+    }
+
+    /**
+     * Computes the future value of a bytecode offset. <p> Note: it is possible
+     * to have several entries for the same instruction in the <tt>indexes</tt>
+     * and <tt>sizes</tt>: two entries (index=a,size=b) and (index=a,size=b')
+     * are equivalent to a single entry (index=a,size=b+b').
+     *
+     * @param indexes current positions of the instructions to be resized. Each
+     *        instruction must be designated by the index of its <i>last</i>
+     *        byte, plus one (or, in other words, by the index of the <i>first</i>
+     *        byte of the <i>next</i> instruction).
+     * @param sizes the number of bytes to be <i>added</i> to the above
+     *        instructions. More precisely, for each i < <tt>len</tt>,
+     *        <tt>sizes</tt>[i] bytes will be added at the end of the
+     *        instruction designated by <tt>indexes</tt>[i] or, if
+     *        <tt>sizes</tt>[i] is negative, the <i>last</i> |<tt>sizes[i]</tt>|
+     *        bytes of the instruction will be removed (the instruction size
+     *        <i>must not</i> become negative or null).
+     * @param begin index of the first byte of the source instruction.
+     * @param end index of the first byte of the target instruction.
+     * @return the future value of the given bytecode offset.
+     */
+    static int getNewOffset(
+        final int[] indexes,
+        final int[] sizes,
+        final int begin,
+        final int end)
+    {
+        int offset = end - begin;
+        for (int i = 0; i < indexes.length; ++i) {
+            if (begin < indexes[i] && indexes[i] <= end) {
+                // forward jump
+                offset += sizes[i];
+            } else if (end < indexes[i] && indexes[i] <= begin) {
+                // backward jump
+                offset -= sizes[i];
+            }
+        }
+        return offset;
+    }
+
+    /**
+     * Updates the offset of the given label.
+     *
+     * @param indexes current positions of the instructions to be resized. Each
+     *        instruction must be designated by the index of its <i>last</i>
+     *        byte, plus one (or, in other words, by the index of the <i>first</i>
+     *        byte of the <i>next</i> instruction).
+     * @param sizes the number of bytes to be <i>added</i> to the above
+     *        instructions. More precisely, for each i < <tt>len</tt>,
+     *        <tt>sizes</tt>[i] bytes will be added at the end of the
+     *        instruction designated by <tt>indexes</tt>[i] or, if
+     *        <tt>sizes</tt>[i] is negative, the <i>last</i> |<tt>sizes[i]</tt>|
+     *        bytes of the instruction will be removed (the instruction size
+     *        <i>must not</i> become negative or null).
+     * @param label the label whose offset must be updated.
+     */
+    static void getNewOffset(
+        final int[] indexes,
+        final int[] sizes,
+        final Label label)
+    {
+        if ((label.status & Label.RESIZED) == 0) {
+            label.position = getNewOffset(indexes, sizes, 0, label.position);
+            label.status |= Label.RESIZED;
+        }
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java
new file mode 100644
index 00000000000..74d450f7aa4
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java
@@ -0,0 +1,371 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+/**
+ * Defines the JVM opcodes, access flags and array type codes. This interface
+ * does not define all the JVM opcodes because some opcodes are automatically
+ * handled. For example, the xLOAD and xSTORE opcodes are automatically replaced
+ * by xLOAD_n and xSTORE_n opcodes when possible. The xLOAD_n and xSTORE_n
+ * opcodes are therefore not defined in this interface. Likewise for LDC,
+ * automatically replaced by LDC_W or LDC2_W when necessary, WIDE, GOTO_W and
+ * JSR_W.
+ *
+ * @author Eric Bruneton
+ * @author Eugene Kuleshov
+ */
+public interface Opcodes {
+
+    // versions
+
+    int V1_1 = 3 << 16 | 45;
+    int V1_2 = 0 << 16 | 46;
+    int V1_3 = 0 << 16 | 47;
+    int V1_4 = 0 << 16 | 48;
+    int V1_5 = 0 << 16 | 49;
+    int V1_6 = 0 << 16 | 50;
+
+    // access flags
+
+    int ACC_PUBLIC = 0x0001; // class, field, method
+    int ACC_PRIVATE = 0x0002; // class, field, method
+    int ACC_PROTECTED = 0x0004; // class, field, method
+    int ACC_STATIC = 0x0008; // field, method
+    int ACC_FINAL = 0x0010; // class, field, method
+    int ACC_SUPER = 0x0020; // class
+    int ACC_SYNCHRONIZED = 0x0020; // method
+    int ACC_VOLATILE = 0x0040; // field
+    int ACC_BRIDGE = 0x0040; // method
+    int ACC_VARARGS = 0x0080; // method
+    int ACC_TRANSIENT = 0x0080; // field
+    int ACC_NATIVE = 0x0100; // method
+    int ACC_INTERFACE = 0x0200; // class
+    int ACC_ABSTRACT = 0x0400; // class, method
+    int ACC_STRICT = 0x0800; // method
+    int ACC_SYNTHETIC = 0x1000; // class, field, method
+    int ACC_ANNOTATION = 0x2000; // class
+    int ACC_ENUM = 0x4000; // class(?) field inner
+
+    // ASM specific pseudo access flags
+
+    int ACC_DEPRECATED = 131072; // class, field, method
+
+    // types for NEWARRAY
+
+    int T_BOOLEAN = 4;
+    int T_CHAR = 5;
+    int T_FLOAT = 6;
+    int T_DOUBLE = 7;
+    int T_BYTE = 8;
+    int T_SHORT = 9;
+    int T_INT = 10;
+    int T_LONG = 11;
+
+    // stack map frame types
+
+    /**
+     * Represents an expanded frame. See {@link ClassReader#EXPAND_FRAMES}.
+     */
+    int F_NEW = -1;
+
+    /**
+     * Represents a compressed frame with complete frame data.
+     */
+    int F_FULL = 0;
+
+    /**
+     * Represents a compressed frame where locals are the same as the locals in
+     * the previous frame, except that additional 1-3 locals are defined, and
+     * with an empty stack.
+     */
+    int F_APPEND = 1;
+
+    /**
+     * Represents a compressed frame where locals are the same as the locals in
+     * the previous frame, except that the last 1-3 locals are absent and with
+     * an empty stack.
+     */
+    int F_CHOP = 2;
+
+    /**
+     * Represents a compressed frame with exactly the same locals as the
+     * previous frame and with an empty stack.
+     */
+    int F_SAME = 3;
+
+    /**
+     * Represents a compressed frame with exactly the same locals as the
+     * previous frame and with a single value on the stack.
+     */
+    int F_SAME1 = 4;
+
+    Integer TOP = new Integer(0);
+    Integer INTEGER = new Integer(1);
+    Integer FLOAT = new Integer(2);
+    Integer DOUBLE = new Integer(3);
+    Integer LONG = new Integer(4);
+    Integer NULL = new Integer(5);
+    Integer UNINITIALIZED_THIS = new Integer(6);
+
+    // opcodes // visit method (- = idem)
+
+    int NOP = 0; // visitInsn
+    int ACONST_NULL = 1; // -
+    int ICONST_M1 = 2; // -
+    int ICONST_0 = 3; // -
+    int ICONST_1 = 4; // -
+    int ICONST_2 = 5; // -
+    int ICONST_3 = 6; // -
+    int ICONST_4 = 7; // -
+    int ICONST_5 = 8; // -
+    int LCONST_0 = 9; // -
+    int LCONST_1 = 10; // -
+    int FCONST_0 = 11; // -
+    int FCONST_1 = 12; // -
+    int FCONST_2 = 13; // -
+    int DCONST_0 = 14; // -
+    int DCONST_1 = 15; // -
+    int BIPUSH = 16; // visitIntInsn
+    int SIPUSH = 17; // -
+    int LDC = 18; // visitLdcInsn
+    // int LDC_W = 19; // -
+    // int LDC2_W = 20; // -
+    int ILOAD = 21; // visitVarInsn
+    int LLOAD = 22; // -
+    int FLOAD = 23; // -
+    int DLOAD = 24; // -
+    int ALOAD = 25; // -
+    // int ILOAD_0 = 26; // -
+    // int ILOAD_1 = 27; // -
+    // int ILOAD_2 = 28; // -
+    // int ILOAD_3 = 29; // -
+    // int LLOAD_0 = 30; // -
+    // int LLOAD_1 = 31; // -
+    // int LLOAD_2 = 32; // -
+    // int LLOAD_3 = 33; // -
+    // int FLOAD_0 = 34; // -
+    // int FLOAD_1 = 35; // -
+    // int FLOAD_2 = 36; // -
+    // int FLOAD_3 = 37; // -
+    // int DLOAD_0 = 38; // -
+    // int DLOAD_1 = 39; // -
+    // int DLOAD_2 = 40; // -
+    // int DLOAD_3 = 41; // -
+    // int ALOAD_0 = 42; // -
+    // int ALOAD_1 = 43; // -
+    // int ALOAD_2 = 44; // -
+    // int ALOAD_3 = 45; // -
+    int IALOAD = 46; // visitInsn
+    int LALOAD = 47; // -
+    int FALOAD = 48; // -
+    int DALOAD = 49; // -
+    int AALOAD = 50; // -
+    int BALOAD = 51; // -
+    int CALOAD = 52; // -
+    int SALOAD = 53; // -
+    int ISTORE = 54; // visitVarInsn
+    int LSTORE = 55; // -
+    int FSTORE = 56; // -
+    int DSTORE = 57; // -
+    int ASTORE = 58; // -
+    // int ISTORE_0 = 59; // -
+    // int ISTORE_1 = 60; // -
+    // int ISTORE_2 = 61; // -
+    // int ISTORE_3 = 62; // -
+    // int LSTORE_0 = 63; // -
+    // int LSTORE_1 = 64; // -
+    // int LSTORE_2 = 65; // -
+    // int LSTORE_3 = 66; // -
+    // int FSTORE_0 = 67; // -
+    // int FSTORE_1 = 68; // -
+    // int FSTORE_2 = 69; // -
+    // int FSTORE_3 = 70; // -
+    // int DSTORE_0 = 71; // -
+    // int DSTORE_1 = 72; // -
+    // int DSTORE_2 = 73; // -
+    // int DSTORE_3 = 74; // -
+    // int ASTORE_0 = 75; // -
+    // int ASTORE_1 = 76; // -
+    // int ASTORE_2 = 77; // -
+    // int ASTORE_3 = 78; // -
+    int IASTORE = 79; // visitInsn
+    int LASTORE = 80; // -
+    int FASTORE = 81; // -
+    int DASTORE = 82; // -
+    int AASTORE = 83; // -
+    int BASTORE = 84; // -
+    int CASTORE = 85; // -
+    int SASTORE = 86; // -
+    int POP = 87; // -
+    int POP2 = 88; // -
+    int DUP = 89; // -
+    int DUP_X1 = 90; // -
+    int DUP_X2 = 91; // -
+    int DUP2 = 92; // -
+    int DUP2_X1 = 93; // -
+    int DUP2_X2 = 94; // -
+    int SWAP = 95; // -
+    int IADD = 96; // -
+    int LADD = 97; // -
+    int FADD = 98; // -
+    int DADD = 99; // -
+    int ISUB = 100; // -
+    int LSUB = 101; // -
+    int FSUB = 102; // -
+    int DSUB = 103; // -
+    int IMUL = 104; // -
+    int LMUL = 105; // -
+    int FMUL = 106; // -
+    int DMUL = 107; // -
+    int IDIV = 108; // -
+    int LDIV = 109; // -
+    int FDIV = 110; // -
+    int DDIV = 111; // -
+    int IREM = 112; // -
+    int LREM = 113; // -
+    int FREM = 114; // -
+    int DREM = 115; // -
+    int INEG = 116; // -
+    int LNEG = 117; // -
+    int FNEG = 118; // -
+    int DNEG = 119; // -
+    int ISHL = 120; // -
+    int LSHL = 121; // -
+    int ISHR = 122; // -
+    int LSHR = 123; // -
+    int IUSHR = 124; // -
+    int LUSHR = 125; // -
+    int IAND = 126; // -
+    int LAND = 127; // -
+    int IOR = 128; // -
+    int LOR = 129; // -
+    int IXOR = 130; // -
+    int LXOR = 131; // -
+    int IINC = 132; // visitIincInsn
+    int I2L = 133; // visitInsn
+    int I2F = 134; // -
+    int I2D = 135; // -
+    int L2I = 136; // -
+    int L2F = 137; // -
+    int L2D = 138; // -
+    int F2I = 139; // -
+    int F2L = 140; // -
+    int F2D = 141; // -
+    int D2I = 142; // -
+    int D2L = 143; // -
+    int D2F = 144; // -
+    int I2B = 145; // -
+    int I2C = 146; // -
+    int I2S = 147; // -
+    int LCMP = 148; // -
+    int FCMPL = 149; // -
+    int FCMPG = 150; // -
+    int DCMPL = 151; // -
+    int DCMPG = 152; // -
+    int IFEQ = 153; // visitJumpInsn
+    int IFNE = 154; // -
+    int IFLT = 155; // -
+    int IFGE = 156; // -
+    int IFGT = 157; // -
+    int IFLE = 158; // -
+    int IF_ICMPEQ = 159; // -
+    int IF_ICMPNE = 160; // -
+    int IF_ICMPLT = 161; // -
+    int IF_ICMPGE = 162; // -
+    int IF_ICMPGT = 163; // -
+    int IF_ICMPLE = 164; // -
+    int IF_ACMPEQ = 165; // -
+    int IF_ACMPNE = 166; // -
+    int GOTO = 167; // -
+    int JSR = 168; // -
+    int RET = 169; // visitVarInsn
+    int TABLESWITCH = 170; // visiTableSwitchInsn
+    int LOOKUPSWITCH = 171; // visitLookupSwitch
+    int IRETURN = 172; // visitInsn
+    int LRETURN = 173; // -
+    int FRETURN = 174; // -
+    int DRETURN = 175; // -
+    int ARETURN = 176; // -
+    int RETURN = 177; // -
+    int GETSTATIC = 178; // visitFieldInsn
+    int PUTSTATIC = 179; // -
+    int GETFIELD = 180; // -
+    int PUTFIELD = 181; // -
+    int INVOKEVIRTUAL = 182; // visitMethodInsn
+    int INVOKESPECIAL = 183; // -
+    int INVOKESTATIC = 184; // -
+    int INVOKEINTERFACE = 185; // -
+    // int UNUSED = 186; // NOT VISITED
+    int NEW = 187; // visitTypeInsn
+    int NEWARRAY = 188; // visitIntInsn
+    int ANEWARRAY = 189; // visitTypeInsn
+    int ARRAYLENGTH = 190; // visitInsn
+    int ATHROW = 191; // -
+    int CHECKCAST = 192; // visitTypeInsn
+    int INSTANCEOF = 193; // -
+    int MONITORENTER = 194; // visitInsn
+    int MONITOREXIT = 195; // -
+    // int WIDE = 196; // NOT VISITED
+    int MULTIANEWARRAY = 197; // visitMultiANewArrayInsn
+    int IFNULL = 198; // visitJumpInsn
+    int IFNONNULL = 199; // -
+    // int GOTO_W = 200; // -
+    // int JSR_W = 201; // -
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java
new file mode 100644
index 00000000000..3539c57f693
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java
@@ -0,0 +1,824 @@
+/*
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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:
+ *
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2007 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ *    contributors may be used to endorse or promote products derived from
+ *    this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.sun.xml.internal.ws.org.objectweb.asm;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+/**
+ * A Java type. This class can be used to make it easier to manipulate type and
+ * method descriptors.
+ *
+ * @author Eric Bruneton
+ * @author Chris Nokleberg
+ */
+public class Type {
+
+    /**
+     * The sort of the <tt>void</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int VOID = 0;
+
+    /**
+     * The sort of the <tt>boolean</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int BOOLEAN = 1;
+
+    /**
+     * The sort of the <tt>char</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int CHAR = 2;
+
+    /**
+     * The sort of the <tt>byte</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int BYTE = 3;
+
+    /**
+     * The sort of the <tt>short</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int SHORT = 4;
+
+    /**
+     * The sort of the <tt>int</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int INT = 5;
+
+    /**
+     * The sort of the <tt>float</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int FLOAT = 6;
+
+    /**
+     * The sort of the <tt>long</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int LONG = 7;
+
+    /**
+     * The sort of the <tt>double</tt> type. See {@link #getSort getSort}.
+     */
+    public static final int DOUBLE = 8;
+
+    /**
+     * The sort of array reference types. See {@link #getSort getSort}.
+     */
+    public static final int ARRAY = 9;
+
+    /**
+     * The sort of object reference type. See {@link #getSort getSort}.
+     */
+    public static final int OBJECT = 10;
+
+    /**
+     * The <tt>void</tt> type.
+     */
+    public static final Type VOID_TYPE = new Type(VOID);
+
+    /**
+     * The <tt>boolean</tt> type.
+     */
+    public static final Type BOOLEAN_TYPE = new Type(BOOLEAN);
+
+    /**
+     * The <tt>char</tt> type.
+     */
+    public static final Type CHAR_TYPE = new Type(CHAR);
+
+    /**
+     * The <tt>byte</tt> type.
+     */
+    public static final Type BYTE_TYPE = new Type(BYTE);
+
+    /**
+     * The <tt>short</tt> type.
+     */
+    public static final Type SHORT_TYPE = new Type(SHORT);
+
+    /**
+     * The <tt>int</tt> type.
+     */
+    public static final Type INT_TYPE = new Type(INT);
+
+    /**
+     * The <tt>float</tt> type.
+     */
+    public static final Type FLOAT_TYPE = new Type(FLOAT);
+
+    /**
+     * The <tt>long</tt> type.
+     */
+    public static final Type LONG_TYPE = new Type(LONG);
+
+    /**
+     * The <tt>double</tt> type.
+     */
+    public static final Type DOUBLE_TYPE = new Type(DOUBLE);
+
+    // ------------------------------------------------------------------------
+    // Fields
+    // ------------------------------------------------------------------------
+
+    /**
+     * The sort of this Java type.
+     */
+    private final int sort;
+
+    /**
+     * A buffer containing the internal name of this Java type. This field is
+     * only used for reference types.
+     */
+    private final char[] buf;
+
+    /**
+     * The offset of the internal name of this Java type in {@link #buf buf}.
+     * This field is only used for reference types.
+     */
+    private final int off;
+
+    /**
+     * The length of the internal name of this Java type. This field is only
+     * used for reference types.
+     */
+    private final int len;
+
+    // ------------------------------------------------------------------------
+    // Constructors
+    // ------------------------------------------------------------------------
+
+    /**
+     * Constructs a primitive type.
+     *
+     * @param sort the sort of the primitive type to be constructed.
+     */
+    private Type(final int sort) {
+        this(sort, null, 0, 1);
+    }
+
+    /**
+     * Constructs a reference type.
+     *
+     * @param sort the sort of the reference type to be constructed.
+     * @param buf a buffer containing the descriptor of the previous type.
+     * @param off the offset of this descriptor in the previous buffer.
+     * @param len the length of this descriptor.
+     */
+    private Type(final int sort, final char[] buf, final int off, final int len)
+    {
+        this.sort = sort;
+        this.buf = buf;
+        this.off = off;
+        this.len = len;
+    }
+
+    /**
+     * Returns the Java type corresponding to the given type descriptor.
+     *
+     * @param typeDescriptor a type descriptor.
+     * @return the Java type corresponding to the given type descriptor.
+     */
+    public static Type getType(final String typeDescriptor) {
+        return getType(typeDescriptor.toCharArray(), 0);
+    }
+
+    /**
+     * Returns the Java type corresponding to the given internal name.
+     *
+     * @param internalName an internal name.
+     * @return the Java type corresponding to the given internal name.
+     */
+    public static Type getObjectType(final String internalName) {
+        char[] buf = internalName.toCharArray();
+        return new Type(buf[0] == '[' ? ARRAY : OBJECT, buf, 0, buf.length);
+    }
+
+    /**
+     * Returns the Java type corresponding to the given class.
+     *
+     * @param c a class.
+     * @return the Java type corresponding to the given class.
+     */
+    public static Type getType(final Class c) {
+        if (c.isPrimitive()) {
+            if (c == Integer.TYPE) {
+                return INT_TYPE;
+            } else if (c == Void.TYPE) {
+                return VOID_TYPE;
+            } else if (c == Boolean.TYPE) {
+                return BOOLEAN_TYPE;
+            } else if (c == Byte.TYPE) {
+                return BYTE_TYPE;
+            } else if (c == Character.TYPE) {
+                return CHAR_TYPE;
+            } else if (c == Short.TYPE) {
+                return SHORT_TYPE;
+            } else if (c == Double.TYPE) {
+                return DOUBLE_TYPE;
+            } else if (c == Float.TYPE) {
+                return FLOAT_TYPE;
+            } else /* if (c == Long.TYPE) */{
+                return LONG_TYPE;
+            }
+        } else {
+            return getType(getDescriptor(c));
+        }
+    }
+
+    /**
+     * Returns the Java types corresponding to the argument types of the given
+     * method descriptor.
+     *
+     * @param methodDescriptor a method descriptor.
+     * @return the Java types corresponding to the argument types of the given
+     *         method descriptor.
+     */
+    public static Type[] getArgumentTypes(final String methodDescriptor) {
+        char[] buf = methodDescriptor.toCharArray();
+        int off = 1;
+        int size = 0;
+        while (true) {
+            char car = buf[off++];
+            if (car == ')') {
+                break;
+            } else if (car == 'L') {
+                while (buf[off++] != ';') {
+                }
+                ++size;
+            } else if (car != '[') {
+                ++size;
+            }
+        }
+        Type[] args = new Type[size];
+        off = 1;
+        size = 0;
+        while (buf[off] != ')') {
+            args[size] = getType(buf, off);
+            off += args[size].len + (args[size].sort == OBJECT ? 2 : 0);
+            size += 1;
+        }
+        return args;
+    }
+
+    /**
+     * Returns the Java types corresponding to the argument types of the given
+     * method.
+     *
+     * @param method a method.
+     * @return the Java types corresponding to the argument types of the given
+     *         method.
+     */
+    public static Type[] getArgumentTypes(final Method method) {
+        Class[] classes = method.getParameterTypes();
+        Type[] types = new Type[classes.length];
+        for (int i = classes.length - 1; i >= 0; --i) {
+            types[i] = getType(classes[i]);
+        }
+        return types;
+    }
+
+    /**
+     * Returns the Java type corresponding to the return type of the given
+     * method descriptor.
+     *
+     * @param methodDescriptor a method descriptor.
+     * @return the Java type corresponding to the return type of the given
+     *         method descriptor.
+     */
+    public static Type getReturnType(final String methodDescriptor) {
+        char[] buf = methodDescriptor.toCharArray();
+        return getType(buf, methodDescriptor.indexOf(')') + 1);
+    }
+
+    /**
+     * Returns the Java type corresponding to the return type of the given
+     * method.
+     *
+     * @param method a method.
+     * @return the Java type corresponding to the return type of the given
+     *         method.
+     */
+    public static Type getReturnType(final Method method) {
+        return getType(method.getReturnType());
+    }
+
+    /**
+     * Returns the Java type corresponding to the given type descriptor.
+     *
+     * @param buf a buffer containing a type descriptor.
+     * @param off the offset of this descriptor in the previous buffer.
+     * @return the Java type corresponding to the given type descriptor.
+     */
+    private static Type getType(final char[] buf, final int off) {
+        int len;
+        switch (buf[off]) {
+            case 'V':
+                return VOID_TYPE;
+            case 'Z':
+                return BOOLEAN_TYPE;
+            case 'C':
+                return CHAR_TYPE;
+            case 'B':
+                return BYTE_TYPE;
+            case 'S':
+                return SHORT_TYPE;
+            case 'I':
+                return INT_TYPE;
+            case 'F':
+                return FLOAT_TYPE;
+            case 'J':
+                return LONG_TYPE;
+            case 'D':
+                return DOUBLE_TYPE;
+            case '[':
+                len = 1;
+                while (buf[off + len] == '[') {
+                    ++len;
+                }
+                if (buf[off + len] == 'L') {
+                    ++len;
+                    while (buf[off + len] != ';') {
+                        ++len;
+                    }
+                }
+                return new Type(ARRAY, buf, off, len + 1);
+                // case 'L':
+            default:
+                len = 1;
+                while (buf[off + len] != ';') {
+                    ++len;
+                }
+                return new Type(OBJECT, buf, off + 1, len - 1);
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Accessors
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the sort of this Java type.
+     *
+     * @return {@link #VOID VOID}, {@link #BOOLEAN BOOLEAN},
+     *         {@link #CHAR CHAR}, {@link #BYTE BYTE}, {@link #SHORT SHORT},
+     *         {@link #INT INT}, {@link #FLOAT FLOAT}, {@link #LONG LONG},
+     *         {@link #DOUBLE DOUBLE}, {@link #ARRAY ARRAY} or
+     *         {@link #OBJECT OBJECT}.
+     */
+    public int getSort() {
+        return sort;
+    }
+
+    /**
+     * Returns the number of dimensions of this array type. This method should
+     * only be used for an array type.
+     *
+     * @return the number of dimensions of this array type.
+     */
+    public int getDimensions() {
+        int i = 1;
+        while (buf[off + i] == '[') {
+            ++i;
+        }
+        return i;
+    }
+
+    /**
+     * Returns the type of the elements of this array type. This method should
+     * only be used for an array type.
+     *
+     * @return Returns the type of the elements of this array type.
+     */
+    public Type getElementType() {
+        return getType(buf, off + getDimensions());
+    }
+
+    /**
+     * Returns the name of the class corresponding to this type.
+     *
+     * @return the fully qualified name of the class corresponding to this type.
+     */
+    public String getClassName() {
+        switch (sort) {
+            case VOID:
+                return "void";
+            case BOOLEAN:
+                return "boolean";
+            case CHAR:
+                return "char";
+            case BYTE:
+                return "byte";
+            case SHORT:
+                return "short";
+            case INT:
+                return "int";
+            case FLOAT:
+                return "float";
+            case LONG:
+                return "long";
+            case DOUBLE:
+                return "double";
+            case ARRAY:
+                StringBuffer b = new StringBuffer(getElementType().getClassName());
+                for (int i = getDimensions(); i > 0; --i) {
+                    b.append("[]");
+                }
+                return b.toString();
+                // case OBJECT:
+            default:
+                return new String(buf, off, len).replace('/', '.');
+        }
+    }
+
+    /**
+     * Returns the internal name of the class corresponding to this object or
+     * array type. The internal name of a class is its fully qualified name (as
+     * returned by Class.getName(), where '.' are replaced by '/'. This method
+     * should only be used for an object or array type.
+     *
+     * @return the internal name of the class corresponding to this object type.
+     */
+    public String getInternalName() {
+        return new String(buf, off, len);
+    }
+
+    // ------------------------------------------------------------------------
+    // Conversion to type descriptors
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the descriptor corresponding to this Java type.
+     *
+     * @return the descriptor corresponding to this Java type.
+     */
+    public String getDescriptor() {
+        StringBuffer buf = new StringBuffer();
+        getDescriptor(buf);
+        return buf.toString();
+    }
+
+    /**
+     * Returns the descriptor corresponding to the given argument and return
+     * types.
+     *
+     * @param returnType the return type of the method.
+     * @param argumentTypes the argument types of the method.
+     * @return the descriptor corresponding to the given argument and return
+     *         types.
+     */
+    public static String getMethodDescriptor(
+        final Type returnType,
+        final Type[] argumentTypes)
+    {
+        StringBuffer buf = new StringBuffer();
+        buf.append('(');
+        for (int i = 0; i < argumentTypes.length; ++i) {
+            argumentTypes[i].getDescriptor(buf);
+        }
+        buf.append(')');
+        returnType.getDescriptor(buf);
+        return buf.toString();
+    }
+
+    /**
+     * Appends the descriptor corresponding to this Java type to the given
+     * string buffer.
+     *
+     * @param buf the string buffer to which the descriptor must be appended.
+     */
+    private void getDescriptor(final StringBuffer buf) {
+        switch (sort) {
+            case VOID:
+                buf.append('V');
+                return;
+            case BOOLEAN:
+                buf.append('Z');
+                return;
+            case CHAR:
+                buf.append('C');
+                return;
+            case BYTE:
+                buf.append('B');
+                return;
+            case SHORT:
+                buf.append('S');
+                return;
+            case INT:
+                buf.append('I');
+                return;
+            case FLOAT:
+                buf.append('F');
+                return;
+            case LONG:
+                buf.append('J');
+                return;
+            case DOUBLE:
+                buf.append('D');
+                return;
+            case ARRAY:
+                buf.append(this.buf, off, len);
+                return;
+                // case OBJECT:
+            default:
+                buf.append('L');
+                buf.append(this.buf, off, len);
+                buf.append(';');
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Direct conversion from classes to type descriptors,
+    // without intermediate Type objects
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the internal name of the given class. The internal name of a
+     * class is its fully qualified name, as returned by Class.getName(), where
+     * '.' are replaced by '/'.
+     *
+     * @param c an object or array class.
+     * @return the internal name of the given class.
+     */
+    public static String getInternalName(final Class c) {
+        return c.getName().replace('.', '/');
+    }
+
+    /**
+     * Returns the descriptor corresponding to the given Java type.
+     *
+     * @param c an object class, a primitive class or an array class.
+     * @return the descriptor corresponding to the given class.
+     */
+    public static String getDescriptor(final Class c) {
+        StringBuffer buf = new StringBuffer();
+        getDescriptor(buf, c);
+        return buf.toString();
+    }
+
+    /**
+     * Returns the descriptor corresponding to the given constructor.
+     *
+     * @param c a {@link Constructor Constructor} object.
+     * @return the descriptor of the given constructor.
+     */
+    public static String getConstructorDescriptor(final Constructor c) {
+        Class[] parameters = c.getParameterTypes();
+        StringBuffer buf = new StringBuffer();
+        buf.append('(');
+        for (int i = 0; i < parameters.length; ++i) {
+            getDescriptor(buf, parameters[i]);
+        }
+        return buf.append(")V").toString();
+    }
+
+    /**
+     * Returns the descriptor corresponding to the given method.
+     *
+     * @param m a {@link Method Method} object.
+     * @return the descriptor of the given method.
+     */
+    public static String getMethodDescriptor(final Method m) {
+        Class[] parameters = m.getParameterTypes();
+        StringBuffer buf = new StringBuffer();
+        buf.append('(');
+        for (int i = 0; i < parameters.length; ++i) {
+            getDescriptor(buf, parameters[i]);
+        }
+        buf.append(')');
+        getDescriptor(buf, m.getReturnType());
+        return buf.toString();
+    }
+
+    /**
+     * Appends the descriptor of the given class to the given string buffer.
+     *
+     * @param buf the string buffer to which the descriptor must be appended.
+     * @param c the class whose descriptor must be computed.
+     */
+    private static void getDescriptor(final StringBuffer buf, final Class c) {
+        Class d = c;
+        while (true) {
+            if (d.isPrimitive()) {
+                char car;
+                if (d == Integer.TYPE) {
+                    car = 'I';
+                } else if (d == Void.TYPE) {
+                    car = 'V';
+                } else if (d == Boolean.TYPE) {
+                    car = 'Z';
+                } else if (d == Byte.TYPE) {
+                    car = 'B';
+                } else if (d == Character.TYPE) {
+                    car = 'C';
+                } else if (d == Short.TYPE) {
+                    car = 'S';
+                } else if (d == Double.TYPE) {
+                    car = 'D';
+                } else if (d == Float.TYPE) {
+                    car = 'F';
+                } else /* if (d == Long.TYPE) */{
+                    car = 'J';
+                }
+                buf.append(car);
+                return;
+            } else if (d.isArray()) {
+                buf.append('[');
+                d = d.getComponentType();
+            } else {
+                buf.append('L');
+                String name = d.getName();
+                int len = name.length();
+                for (int i = 0; i < len; ++i) {
+                    char car = name.charAt(i);
+                    buf.append(car == '.' ? '/' : car);
+                }
+                buf.append(';');
+                return;
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Corresponding size and opcodes
+    // ------------------------------------------------------------------------
+
+    /**
+     * Returns the size of values of this type.
+     *
+     * @return the size of values of this type, i.e., 2 for <tt>long</tt> and
+     *         <tt>double</tt>, and 1 otherwise.
+     */
+    public int getSize() {
+        return sort == LONG || sort == DOUBLE ? 2 : 1;
+    }
+
+    /**
+     * Returns a JVM instruction opcode adapted to this Java type.
+     *
+     * @param opcode a JVM instruction opcode. This opcode must be one of ILOAD,
+     *        ISTORE, IALOAD, IASTORE, IADD, ISUB, IMUL, IDIV, IREM, INEG, ISHL,
+     *        ISHR, IUSHR, IAND, IOR, IXOR and IRETURN.
+     * @return an opcode that is similar to the given opcode, but adapted to
+     *         this Java type. For example, if this type is <tt>float</tt> and
+     *         <tt>opcode</tt> is IRETURN, this method returns FRETURN.
+     */
+    public int getOpcode(final int opcode) {
+        if (opcode == Opcodes.IALOAD || opcode == Opcodes.IASTORE) {
+            switch (sort) {
+                case BOOLEAN:
+                case BYTE:
+                    return opcode + 5;
+                case CHAR:
+                    return opcode + 6;
+                case SHORT:
+                    return opcode + 7;
+                case INT:
+                    return opcode;
+                case FLOAT:
+                    return opcode + 2;
+                case LONG:
+                    return opcode + 1;
+                case DOUBLE:
+                    return opcode + 3;
+                    // case ARRAY:
+                    // case OBJECT:
+                default:
+                    return opcode + 4;
+            }
+        } else {
+            switch (sort) {
+                case VOID:
+                    return opcode + 5;
+                case BOOLEAN:
+                case CHAR:
+                case BYTE:
+                case SHORT:
+                case INT:
+                    return opcode;
+                case FLOAT:
+                    return opcode + 2;
+                case LONG:
+                    return opcode + 1;
+                case DOUBLE:
+                    return opcode + 3;
+                    // case ARRAY:
+                    // case OBJECT:
+                default:
+                    return opcode + 4;
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------------
+    // Equals, hashCode and toString
+    // ------------------------------------------------------------------------
+
+    /**
+     * Tests if the given object is equal to this type.
+     *
+     * @param o the object to be compared to this type.
+     * @return <tt>true</tt> if the given object is equal to this type.
+     */
+    public boolean equals(final Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Type)) {
+            return false;
+        }
+        Type t = (Type) o;
+        if (sort != t.sort) {
+            return false;
+        }
+        if (sort == OBJECT || sort == ARRAY) {
+            if (len != t.len) {
+                return false;
+            }
+            for (int i = off, j = t.off, end = i + len; i < end; i++, j++) {
+                if (buf[i] != t.buf[j]) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Returns a hash code value for this type.
+     *
+     * @return a hash code value for this type.
+     */
+    public int hashCode() {
+        int hc = 13 * sort;
+        if (sort == OBJECT || sort == ARRAY) {
+            for (int i = off, end = i + len; i < end; i++) {
+                hc = 17 * (hc + buf[i]);
+            }
+        }
+        return hc;
+    }
+
+    /**
+     * Returns a string representation of this type.
+     *
+     * @return the descriptor of this type.
+     */
+    public String toString() {
+        return getDescriptor();
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java
index 16fa82e5cf4..b4b16ee30c0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java
@@ -103,7 +103,7 @@ abstract class MUTube extends AbstractFilterTubeImpl {
                 if (!header.isIgnorable(soapVersion, roles)) {
                     QName qName = new QName(header.getNamespaceURI(), header.getLocalPart());
                     if (! knownHeaders.contains(qName)) {
-                        logger.finest("Element not understood=" + qName);
+                        logger.info("Element not understood=" + qName);
                         if (notUnderstoodHeaders == null)
                             notUnderstoodHeaders = new HashSet<QName>();
                         notUnderstoodHeaders.add(qName);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java
new file mode 100644
index 00000000000..ba4c62ae91f
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.protocol.soap;
+
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.message.ExceptionHasMessage;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.fault.SOAPFaultBuilder;
+
+import javax.xml.namespace.QName;
+
+/**
+ * This is used to represent Message creation exception when a {@link com.sun.xml.internal.ws.api.pipe.Codec}
+ * trying to create a {@link Message}.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class MessageCreationException extends ExceptionHasMessage {
+
+    private final SOAPVersion soapVersion;
+
+    public MessageCreationException(SOAPVersion soapVersion, Object... args) {
+        super("soap.msg.create.err", args);
+        this.soapVersion = soapVersion;
+    }
+
+    public String getDefaultResourceBundleName() {
+        return "com.sun.xml.internal.ws.resources.soap";
+    }
+
+    public Message getFaultMessage() {
+        QName faultCode = soapVersion.faultCodeClient;
+        return SOAPFaultBuilder.createSOAPFaultMessage(
+                soapVersion, getLocalizedMessage(), faultCode);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java
index 26f60cc0e7c..65cf18fb223 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java
@@ -182,6 +182,18 @@ public final class AddressingMessages {
         return localizer.localize(localizableNULL_MESSAGE());
     }
 
+    public static Localizable localizableACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
+        return messageFactory.getMessage("action.not.supported.exception", arg0);
+    }
+
+    /**
+     * Action: "{0}" not supported
+     *
+     */
+    public static String ACTION_NOT_SUPPORTED_EXCEPTION(Object arg0) {
+        return localizer.localize(localizableACTION_NOT_SUPPORTED_EXCEPTION(arg0));
+    }
+
     public static Localizable localizableNON_ANONYMOUS_RESPONSE_NULL_HEADERS(Object arg0) {
         return messageFactory.getMessage("nonAnonymous.response.nullHeaders", arg0);
     }
@@ -218,6 +230,18 @@ public final class AddressingMessages {
         return localizer.localize(localizableREPLY_TO_CANNOT_PARSE());
     }
 
+    public static Localizable localizableINVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
+        return messageFactory.getMessage("invalid.addressing.header.exception", arg0, arg1);
+    }
+
+    /**
+     * Invalid WS-Addressing header: "{0}",Reason: "{1}"
+     *
+     */
+    public static String INVALID_ADDRESSING_HEADER_EXCEPTION(Object arg0, Object arg1) {
+        return localizer.localize(localizableINVALID_ADDRESSING_HEADER_EXCEPTION(arg0, arg1));
+    }
+
     public static Localizable localizableWSAW_ANONYMOUS_PROHIBITED() {
         return messageFactory.getMessage("wsaw.anonymousProhibited");
     }
@@ -242,6 +266,18 @@ public final class AddressingMessages {
         return localizer.localize(localizableNULL_WSDL_PORT());
     }
 
+    public static Localizable localizableADDRESSING_SHOULD_BE_ENABLED() {
+        return messageFactory.getMessage("addressing.should.be.enabled.");
+    }
+
+    /**
+     * Addressing is not enabled
+     *
+     */
+    public static String ADDRESSING_SHOULD_BE_ENABLED() {
+        return localizer.localize(localizableADDRESSING_SHOULD_BE_ENABLED());
+    }
+
     public static Localizable localizableNULL_ADDRESSING_VERSION() {
         return messageFactory.getMessage("null.addressing.version");
     }
@@ -254,6 +290,18 @@ public final class AddressingMessages {
         return localizer.localize(localizableNULL_ADDRESSING_VERSION());
     }
 
+    public static Localizable localizableMISSING_HEADER_EXCEPTION(Object arg0) {
+        return messageFactory.getMessage("missing.header.exception", arg0);
+    }
+
+    /**
+     * Missing WS-Addressing header: "{0}"
+     *
+     */
+    public static String MISSING_HEADER_EXCEPTION(Object arg0) {
+        return localizer.localize(localizableMISSING_HEADER_EXCEPTION(arg0));
+    }
+
     public static Localizable localizableNULL_PACKET() {
         return messageFactory.getMessage("null.packet");
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java
index cb6c43a39ed..281fa83335f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java
@@ -198,6 +198,18 @@ public final class ClientMessages {
         return localizer.localize(localizableUNDEFINED_PORT_TYPE(arg0));
     }
 
+    public static Localizable localizableWSDL_CONTAINS_NO_SERVICE(Object arg0) {
+        return messageFactory.getMessage("wsdl.contains.no.service", arg0);
+    }
+
+    /**
+     * WSDL {0} contains no service definition.
+     *
+     */
+    public static String WSDL_CONTAINS_NO_SERVICE(Object arg0) {
+        return localizer.localize(localizableWSDL_CONTAINS_NO_SERVICE(arg0));
+    }
+
     public static Localizable localizableINVALID_SOAP_ACTION() {
         return messageFactory.getMessage("invalid.soap.action");
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java
index a8e91696026..21aacaef315 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java
@@ -175,7 +175,7 @@ public final class ModelerMessages {
     }
 
     /**
-     * Unable to create JAXBContext due to the security restriction
+     * Unable to create JAXBContext
      *
      */
     public static String UNABLE_TO_CREATE_JAXB_CONTEXT() {
@@ -278,4 +278,16 @@ public final class ModelerMessages {
         return localizer.localize(localizableRUNTIME_MODELER_WSFEATURE_ILLEGAL_FTRCONSTRUCTOR(arg0, arg1));
     }
 
+    public static Localizable localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(Object arg0) {
+        return messageFactory.getMessage("runtime.modeler.webmethod.must.be.nonstaticfinal", arg0);
+    }
+
+    /**
+     * @WebMethod is not allowed on a static or final method {0}
+     *
+     */
+    public static String RUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(Object arg0) {
+        return localizer.localize(localizableRUNTIME_MODELER_WEBMETHOD_MUST_BE_NONSTATICFINAL(arg0));
+    }
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
index b44e93acba9..5e314ed3f29 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java
@@ -50,6 +50,18 @@ public final class ProviderApiMessages {
         return localizer.localize(localizableNULL_ADDRESS_SERVICE_ENDPOINT());
     }
 
+    public static Localizable localizableNO_WSDL_NO_PORT(Object arg0) {
+        return messageFactory.getMessage("no.wsdl.no.port", arg0);
+    }
+
+    /**
+     * WSDL Metadata not available to create the proxy, either Service instance or ServiceEndpointInterface {0} should have WSDL information
+     *
+     */
+    public static String NO_WSDL_NO_PORT(Object arg0) {
+        return localizer.localize(localizableNO_WSDL_NO_PORT(arg0));
+    }
+
     public static Localizable localizableNULL_SERVICE() {
         return messageFactory.getMessage("null.service");
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java
index 017e62b5b09..15bbbbbae87 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java
@@ -38,6 +38,27 @@ public final class ServerMessages {
     private final static LocalizableMessageFactory messageFactory = new LocalizableMessageFactory("com.sun.xml.internal.ws.resources.server");
     private final static Localizer localizer = new Localizer();
 
+    public static Localizable localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("runtime.parser.wsdl.incorrectservice", arg0, arg1);
+    }
+
+    /**
+     * could not get binding from WSDL! service: {0} not found in the WSDL {1}.
+     * It could be because service name does not match WSDL''s wsdl:service name:
+     *  1. service name is not there in deployment descriptor OR
+     *  2. Either there is a typo in deployment descriptor''s service name OR
+     *  3. The computed names from @WebService do not match wsdl:service name
+     * OR
+     *  1. There is an error while parsing the wsdl and Service with name {0} is not found in the WSDLModel.
+     * Suggest doing the following:
+     *  1. Add/Correct entries for service name in deployment descriptor OR
+     *  2. Specify targetNamespace, serviceName in @WebService on the endpoint class
+     *
+     */
+    public static String RUNTIME_PARSER_WSDL_INCORRECTSERVICE(Object arg0, Object arg1) {
+        return localizer.localize(localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(arg0, arg1));
+    }
+
     public static Localizable localizableRUNTIME_PARSER_MISSING_ATTRIBUTE_NO_LINE() {
         return messageFactory.getMessage("runtime.parser.missing.attribute.no.line");
     }
@@ -122,16 +143,16 @@ public final class ServerMessages {
         return localizer.localize(localizableGENERATE_NON_STANDARD_WSDL());
     }
 
-    public static Localizable localizableDISPATCH_CANNOT_FIND_METHOD(Object arg0, Object arg1) {
-        return messageFactory.getMessage("dispatch.cannotFindMethod", arg0, arg1);
+    public static Localizable localizableDISPATCH_CANNOT_FIND_METHOD(Object arg0) {
+        return messageFactory.getMessage("dispatch.cannotFindMethod", arg0);
     }
 
     /**
-     * Cannot find dispatch method for {0} using "{1}"
+     * Cannot find dispatch method for {0}
      *
      */
-    public static String DISPATCH_CANNOT_FIND_METHOD(Object arg0, Object arg1) {
-        return localizer.localize(localizableDISPATCH_CANNOT_FIND_METHOD(arg0, arg1));
+    public static String DISPATCH_CANNOT_FIND_METHOD(Object arg0) {
+        return localizer.localize(localizableDISPATCH_CANNOT_FIND_METHOD(arg0));
     }
 
     public static Localizable localizableNO_CONTENT_TYPE() {
@@ -357,6 +378,18 @@ public final class ServerMessages {
         return localizer.localize(localizableNOT_HTTP_CONTEXT_TYPE(arg0));
     }
 
+    public static Localizable localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
+        return messageFactory.getMessage("runtime.parser.wsdl.noservice.in.wsdlmodel", arg0);
+    }
+
+    /**
+     * There is an error in processing the WSDL {0} and no valid services are found.
+     *
+     */
+    public static String RUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(Object arg0) {
+        return localizer.localize(localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(arg0));
+    }
+
     public static Localizable localizablePORT_NAME_REQUIRED() {
         return messageFactory.getMessage("port.name.required");
     }
@@ -393,6 +426,18 @@ public final class ServerMessages {
         return localizer.localize(localizableRUNTIME_PARSER_WSDL_MULTIPLEBINDING(arg0, arg1, arg2));
     }
 
+    public static Localizable localizableNON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
+        return messageFactory.getMessage("non.unique.dispatch.qname", arg0, arg1);
+    }
+
+    /**
+     * Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique operation signature on the wire for successful dispatch. Methods {0} have the same request body block {1}. Method dispatching may fail, runtime will try to dispatch using SOAPAction.
+     *
+     */
+    public static String NON_UNIQUE_DISPATCH_QNAME(Object arg0, Object arg1) {
+        return localizer.localize(localizableNON_UNIQUE_DISPATCH_QNAME(arg0, arg1));
+    }
+
     public static Localizable localizableALREADY_HTTP_SERVER(Object arg0) {
         return messageFactory.getMessage("already.http.server", arg0);
     }
@@ -441,6 +486,18 @@ public final class ServerMessages {
         return localizer.localize(localizableRUNTIME_PARSER_WRONG_ELEMENT(arg0, arg1, arg2));
     }
 
+    public static Localizable localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
+        return messageFactory.getMessage("runtimemodeler.invalidannotationOnImpl", arg0, arg1, arg2);
+    }
+
+    /**
+     * Invalid annotation: {0} on endpoint implementation class "{1}" - will be ignored. "{1}" is annotated with @WebService(endpointInterface="{2}"}, it MUST NOT be annotated with {0}, to fix it - put this annotation on the SEI {2}.
+     *
+     */
+    public static String RUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(Object arg0, Object arg1, Object arg2) {
+        return localizer.localize(localizableRUNTIMEMODELER_INVALIDANNOTATION_ON_IMPL(arg0, arg1, arg2));
+    }
+
     public static Localizable localizableRUNTIME_PARSER_WSDL_NOSERVICE() {
         return messageFactory.getMessage("runtime.parser.wsdl.noservice");
     }
@@ -538,6 +595,18 @@ public final class ServerMessages {
         return localizer.localize(localizableRUNTIME_PARSER_CLASS_NOT_FOUND(arg0));
     }
 
+    public static Localizable localizableUNSUPPORTED_CHARSET(Object arg0) {
+        return messageFactory.getMessage("unsupported.charset", arg0);
+    }
+
+    /**
+     * Unsupported charset "{0}" in the received message''s Content-Type
+     *
+     */
+    public static String UNSUPPORTED_CHARSET(Object arg0) {
+        return localizer.localize(localizableUNSUPPORTED_CHARSET(arg0));
+    }
+
     public static Localizable localizableSTATIC_RESOURCE_INJECTION_ONLY(Object arg0, Object arg1) {
         return messageFactory.getMessage("static.resource.injection.only", arg0, arg1);
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java
index 15d440cea51..0430fb79ca7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java
@@ -542,16 +542,16 @@ public final class WsservletMessages {
         return localizer.localize(localizableSERVLET_HTML_NO_INFO_AVAILABLE());
     }
 
-    public static Localizable localizableSERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1, Object arg2) {
-        return messageFactory.getMessage("servlet.html.information.table", arg0, arg1, arg2);
+    public static Localizable localizableSERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("servlet.html.information.table", arg0, arg1);
     }
 
     /**
-     * <table border="0"><tr><td>Address:</td><td>{0}</td></tr><tr><td>WSDL:</td><td><a href="{0}?wsdl">{0}?wsdl</a></td></tr><tr><td>Port QName:</td><td>{1}</td></tr><tr><td>Implementation class:</td><td>{2}</td></tr></table>
+     * <table border="0"><tr><td>Address:</td><td>{0}</td></tr><tr><td>WSDL:</td><td><a href="{0}?wsdl">{0}?wsdl</a></td></tr><tr><td>Implementation class:</td><td>{1}</td></tr></table>
      *
      */
-    public static String SERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1, Object arg2) {
-        return localizer.localize(localizableSERVLET_HTML_INFORMATION_TABLE(arg0, arg1, arg2));
+    public static String SERVLET_HTML_INFORMATION_TABLE(Object arg0, Object arg1) {
+        return localizer.localize(localizableSERVLET_HTML_INFORMATION_TABLE(arg0, arg1));
     }
 
     public static Localizable localizableSERVLET_TRACE_WRITING_FAULT_RESPONSE() {
@@ -698,6 +698,18 @@ public final class WsservletMessages {
         return localizer.localize(localizableERROR_SERVLET_CAUGHT_THROWABLE_IN_INIT(arg0));
     }
 
+    public static Localizable localizableSERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
+        return messageFactory.getMessage("servlet.html.endpoint.table", arg0, arg1);
+    }
+
+    /**
+     * <table border="0"><tr><td>Service Name:</td><td>{0}</td></tr><tr><td>Port Name:</td><td>{1}</td></tr></table>
+     *
+     */
+    public static String SERVLET_HTML_ENDPOINT_TABLE(Object arg0, Object arg1) {
+        return localizer.localize(localizableSERVLET_HTML_ENDPOINT_TABLE(arg0, arg1));
+    }
+
     public static Localizable localizableERROR_SERVLET_CAUGHT_THROWABLE_WHILE_RECOVERING(Object arg0) {
         return messageFactory.getMessage("error.servlet.caughtThrowableWhileRecovering", arg0);
     }
@@ -1099,7 +1111,7 @@ public final class WsservletMessages {
     }
 
     /**
-     * Port Name
+     * Endpoint
      *
      */
     public static String SERVLET_HTML_COLUMN_HEADER_PORT_NAME() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties
index 7d1be288d3b..3927a6363e7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties
@@ -41,6 +41,7 @@ null.message=Null message found when processing the server inbound request and W
 null.headers=No headers found when processing the server inbound request and WS-Addressing is required
 null.wsa.headers=No WS-Addressing headers found processing the server inbound request
 addressing.notEnabled=Addressing is not enabled, {0} should not be included in the pipeline"
+addressing.should.be.enabled.=Addressing is not enabled
 validation.client.nullAction=Validating inbound Addressing headers on client and found null Action
 validation.server.nullAction=Validating inbound Addressing headers on server and found null Action
 
@@ -50,4 +51,7 @@ nonAnonymous.response.sending=Sending non-anonymous reply to "{0}"
 nonAnonymous.response.nullHeaders=No response headers found in non-anonymous response from "{0}"
 nonAnonymous.response.nullMessage=No message for non-anonymous response from "{0}"
 nonAnonymous.response.oneway=Ignoring non-anonymous response for one-way message
- 
+
+invalid.addressing.header.exception=Invalid WS-Addressing header: "{0}",Reason: "{1}"
+action.not.supported.exception=Action: "{0}" not supported
+missing.header.exception=Missing WS-Addressing header: "{0}"
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/client.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/client.properties
index 8fc77d27939..a11a60a8750 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/client.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/client.properties
@@ -51,4 +51,4 @@ invalid.soap.action=A valid SOAPAction should be set in the RequestContext when
   Use BindingProvider.SOAPACTION_URI_PROPERTY to set it.
 failed.to.parseWithMEX=Failed to access the WSDL at: {0}. It failed with: \n\t{1}.\nRetrying with MEX gave: \n\t{2}
 failed.to.parse=Failed to access the WSDL at: {0}. It failed with: \n\t{1}.
- 
+wsdl.contains.no.service=WSDL {0} contains no service definition.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties
index de9e2c9c6e6..47b8088b3e5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties
@@ -39,4 +39,3 @@ invalid.uri.resolution=Unable to resolve endpoint address using the supplied pat
 duplicate.port=WSDLPort {0} already exists. Can not create a port of the same QName.
 invalid.query.leading.char=Leading '?' of MessageContext.QUERY_STRING: {0} is not valid. Remove '?' and run again.
 duplicate.port=WSDLPort {0} already exists. Can not create a port of the same QName.
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/encoding.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/encoding.properties
index 58c16753676..ceb296b2ec3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/encoding.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/encoding.properties
@@ -39,4 +39,3 @@ xsd.unknownPrefix=unknown prefix \"{0}\"
 xsd.unexpectedElementName=unexpected element name: expected={0}, actual: {1}
 
 failed.to.read.response=Failed to read a response: {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/handler.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/handler.properties
index 44360c8ce40..9bde1616309 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/handler.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/handler.properties
@@ -30,4 +30,3 @@ cannot.extend.handler.directly=Handler {0} must implement LogicalHandler or SOAP
 handler.not.valid.type= {0} does not implement one of the handler interfaces.
 handler.messageContext.invalid.class= \"{0}\" is not an allowed value for the property \"{1}\"
 handler.predestroy.ignore=Exception ignored from invoking handler @PreDestroy method: {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties
index 051ad563968..f7cf90ff9fe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties
@@ -24,4 +24,3 @@
 #
 
 unexpected.http.method=Cannot handle HTTP method: {0}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties
index e96d51417ac..a4dddb793fd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties
@@ -31,19 +31,19 @@ runtime.modeler.class.not.found=class: {0} could not be found
 runtime.modeler.wrapper.not.found=Wrapper class {0} is not found. Have you run APT to generate them?
 runtime.modeler.method.not.found=method: {0} could not be found on class: {1}
 runtime.modeler.webmethod.must.be.public=@WebMethod is not allowed on a non-public method {0}
-runtime.modeler.webmethod.must.be.nonstatic=@WebMethod is not allowed on a static method {0}  
+runtime.modeler.webmethod.must.be.nonstatic=@WebMethod is not allowed on a static method {0}
+runtime.modeler.webmethod.must.be.nonstaticfinal=@WebMethod is not allowed on a static or final method {0}
 runtime.modeler.oneway.operation.no.out.parameters=oneway operation should not have out parameters class: {0} method: {1}
 runtime.modeler.cannot.get.serviceName.from.interface=The serviceName cannot be retrieved from an interface.  class {0}
 runtime.modeler.portname.servicename.namespace.mismatch=The namespace of the serviceName \"{0}\" and the namespace of the portName \"{1}\" must match
 runtime.modeler.no.package=A @WebService.targetNamespace must be specified on classes with no package.  Class: {0}
 runtime.modeler.no.operations=The web service defined by the class {0} does not contain any valid WebMethods.
 runtime.modeler.mtom.conflict = Error in  @BindingType: MTOM Configuration in binding identifier {0} conflicts with feature @MTOM {1}
-runtime.modeler.feature.conflict= Feature {0} in implementation conflicts with {1} in WSDL configuration 
+runtime.modeler.feature.conflict= Feature {0} in implementation conflicts with {1} in WSDL configuration
 
 runtime.modeler.wsfeature.no.ftrconstructor=Annotation {0} is not recognizable, atleast one constructor of {1} should be marked with @FeatureConstructor
 runtime.modeler.wsfeature.morethanone.ftrconstructor=Annotation {0} is illegal, Only one constructor of {1} can be marked as @FeatureConstructor
 runtime.modeler.wsfeature.illegal.ftrconstructor=Annotation {0} is illegal, In {1} @FeatureConstructor value does n't match the constructor parameters
 
-unable.to.create.JAXBContext=Unable to create JAXBContext due to the security restriction
+unable.to.create.JAXBContext=Unable to create JAXBContext
 not.a.valid.bare.method=SEI {0} has method {1} annotated as BARE but it has more than one parameter bound to body. This is invalid. Please annotate the method with annotation: @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.WRAPPED)
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties
index 6585175a18e..2927520f6bb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties
@@ -29,7 +29,8 @@ null.service=serviceName can't be null when portName is specified
 null.portname=EPR does n't have EndpointName in the Metadata
 null.wsdl= EPR does n't have WSDL Metadata which is needed for the current operation
 notfound.service.in.wsdl= Service: {0} not found in WSDL: {1}
+no.wsdl.no.port = WSDL Metadata not available to create the proxy, either Service instance or \
+  ServiceEndpointInterface {0} should have WSDL information
 notfound.port.in.wsdl=Port: {0} not a valid port in Service: {1} in WSDL: {2}
 error.wsdl= Error in parsing WSDL: {0}
 null.epr= EndpointReference is null
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/sender.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/sender.properties
index 8cb82043407..8f8f3c89b0d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/sender.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/sender.properties
@@ -27,4 +27,3 @@ sender.nestedError=sender error: {0}
 sender.request.messageNotReady=message not ready to be sent
 sender.response.cannotDecodeFaultDetail=fault detail cannot be decoded
 sender.request.illegalValueForContentNegotiation=illegal value for content negotiation property \"{0}\"
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/server.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/server.properties
index 35e73a395d0..1b7ebe3719a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/server.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/server.properties
@@ -49,7 +49,7 @@ service.name.required=Service QName is not found
 port.name.required=Port QName is not found
 wrong.tns.for.port=Port namespace {0} doesn't match Service namespace {1}
 
-already.http.server=There is already a HTTP server at : {0} 
+already.http.server=There is already a HTTP server at : {0}
 already.https.server=There is already a HTTPS server at : {0}
 not.HttpContext.type=Required com.sun.net.httpserver.HttpContext. Got : {0}
 
@@ -73,6 +73,18 @@ runtime.saxparser.exception={0}\n{1}
 runtime.parser.wsdl.noservice=can\'t apply binding! service {0} not found in the WSDL {1}
 runtime.parser.wsdl.nobinding=can\'t apply binding! no binding found for binding ID {0] for service {1} in WSDL {2}
 runtime.parser.wsdl.multiplebinding=multiple bindings found for binding ID {0} for service {1} in WSDL {2}
+runtime.parser.wsdl.noservice.in.wsdlmodel=There is an error in processing the WSDL {0} and no valid services are found.
+runtime.parser.wsdl.incorrectservice=could not get binding from WSDL! service: {0} not found in the WSDL {1}.\n\
+  It could be because service name does not match WSDL''s wsdl:service name:\n\
+    1. service name is not there in deployment descriptor OR\n\
+    2. Either there is a typo in deployment descriptor''s service name OR\n\
+    3. The computed names from @WebService do not match wsdl:service name\n\
+  OR\n\
+    1. There is an error while parsing the wsdl and Service with name {0} is not found in the WSDLModel.\n\
+  Suggest doing the following:\n\
+    1. Add/Correct entries for service name in deployment descriptor OR \n\
+    2. Specify targetNamespace, serviceName in @WebService on the endpoint class
+
 runtime.parser.wsdl.incorrectserviceport=could not get binding from WSDL! service: {0} or port {1} not found in the WSDL {2}.\n\
   It could be because service and port names do not match WSDL''s wsdl:service and wsdl:port names:\n\
     1. service and port names are not there in deployment descriptor OR\n\
@@ -95,8 +107,16 @@ static.resource.injection.only=Static resource {0} cannot be injected to non-sta
 
 dd.mtom.conflict = Error in Deployment Descriptor : MTOM Configuration in binding {0} conflicts with enable-mtom attribute value {1}
 
-dispatch.cannotFindMethod=Cannot find dispatch method for {0} using "{1}"
+dispatch.cannotFindMethod=Cannot find dispatch method for {0}
+non.unique.dispatch.qname=Non unique body parts! In a port, as per BP 1.1 R2710 operations must have unique \
+  operation signature on the wire for successful dispatch. Methods {0} have the \
+  same request body block {1}. Method dispatching may fail, runtime will try to \
+  dispatch using SOAPAction.
+
+
 unsupported.contentType=Unsupported Content-Type: {0} Supported ones are: {1}
 no.contentType=Request doesn't have a Content-Type
+unsupported.charset=Unsupported charset "{0}" in the received message''s Content-Type
 duplicate.portKnownHeader=Received SOAP message contains duplicate header: {0} for a bound parameter
- 
+
+runtimemodeler.invalidannotationOnImpl=Invalid annotation: {0} on endpoint implementation class \"{1}\" - will be ignored. \"{1}\" is annotated with @WebService(endpointInterface=\"{2}\"}, it MUST NOT be annotated with {0}, to fix it - put this annotation on the SEI {2}.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/soap.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/soap.properties
index 24298d68130..c50d08d763e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/soap.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/soap.properties
@@ -28,5 +28,4 @@ soap.msg.factory.create.err=Couldn''t create SOAP message factory due to excepti
 soap.protocol.invalidFaultCode=Invalid fault code: {0}
 soap.factory.create.err=Couldn''t create SOAP factory due to exception: {0}
 soap.fault.create.err=Couldn''t create SOAP Fault due to exception: {0}
-soap.version.mismatch.err=Couldn''t create SOAP message. Expecting Envelope in namespace {0}, but got {1} 
- 
+soap.version.mismatch.err=Couldn''t create SOAP message. Expecting Envelope in namespace {0}, but got {1}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties
index f345b07a804..72e6ffb9261 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties
@@ -48,4 +48,3 @@ fastinfoset.decodingNotAccepted=Fast Infoset decoding is not accepted
 fastinfoset.noImplementation=Unable to locate compatible implementation of Fast Infoset in classpath
 
 sourcereader.invalidSource=Unable to create reader from source \"{0}\"
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/util.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/util.properties
index a3489630a1c..a85423a7259 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/util.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/util.properties
@@ -31,4 +31,3 @@ util.parser.wrong.element=found element \"{1}\", expected \"{2}\" in handler cha
 util.failed.to.find.handlerchain.file=Could not find handler chain file {1} for class {0}
 util.failed.to.parse.handlerchain.file=Could not parse handler chain file {1} for class {0}
 util.location=at line {0} of {1}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties
index bd8d2b2850c..5de2eaf88cb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties
@@ -28,4 +28,3 @@ wsdl.import.should.be.wsdl=Import of {0} is violation of BP 1.1 R2001. Proceedin
   R2001 A DESCRIPTION MUST only use the WSDL \"import\" statement to import another WSDL description.
 wsdl.portaddress.epraddress.not.match= For Port: {0}, service location {1} does not match address {2} \
   in the EndpointReference
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties
index eb1b4bdaca9..e1369364b10 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties
@@ -81,7 +81,6 @@ WSSERVLET22.diag.check.1=Set endpoint with stub.setTargetEndpoint property
 servlet.error.noResponseMessage=WSSERVLET23: no response message
 WSSERVLET23.diag.cause.1=The request generated no response from the service
 WSSERVLET23.diag.check.1=If a response was expected, check that a request message was actually sent
-WSSERVLET23.diag.cause.1=The request generated no response from the service
 WSSERVLET23.diag.check.2=The request may be malformed and be accepted by the service, yet did not generate a response
 
 servlet.trace.writingFaultResponse=WSSERVLET24: writing fault response
@@ -178,12 +177,13 @@ servlet.no.address.available=No address is available for {0}
 servlet.html.title= Web Services
 servlet.html.title2=<h1>Web Services</h1>
 servlet.html.noInfoAvailable=<p>No JAX-WS context information available.</p>
-servlet.html.columnHeader.portName=Port Name
+servlet.html.columnHeader.portName=Endpoint
 servlet.html.columnHeader.status=Status
 servlet.html.columnHeader.information=Information
 servlet.html.status.active=ACTIVE
 servlet.html.status.error=ERROR
-servlet.html.information.table=<table border=\"0\"><tr><td>Address\:</td><td>{0}</td></tr><tr><td>WSDL\:</td><td><a href\="{0}?wsdl">{0}?wsdl</a></td></tr><tr><td>Port QName\:</td><td>{1}</td></tr><tr><td>Implementation class\:</td><td>{2}</td></tr></table>
+servlet.html.endpoint.table=<table border=\"0\"><tr><td>Service Name\:</td><td>{0}</td></tr><tr><td>Port Name\:</td><td>{1}</td></tr></table>
+servlet.html.information.table=<table border=\"0\"><tr><td>Address\:</td><td>{0}</td></tr><tr><td>WSDL\:</td><td><a href\="{0}?wsdl">{0}?wsdl</a></td></tr><tr><td>Implementation class\:</td><td>{1}</td></tr></table>
 servlet.html.notFound=<h1>404 Not Found: {0}</h1>
 
 
@@ -234,4 +234,3 @@ html.rootPage.body2b=</p>
 html.rootPage.body3a=<p>A WSDL description of these ports is available <a href='
 html.rootPage.body3b='>here.</a></p>
 html.rootPage.body4=<p>This endpoint is incorrectly configured. Please check the location and contents of the configuration file.</p>
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties
index 70a418eeffb..9f173fa4daa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties
@@ -34,4 +34,3 @@ xml.get.ds.err=Couldn't get DataSource
 xml.content-type.mustbe.multipart=Content-Type needs to be Multipart/Related and with type=text/xml
 xml.invalid.content-type=Invalid Content-Type: {0}
 xml.Content-Type.parse.err=Error while parsing MimeHeaders for Content-Type
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java
index 1b2ca5f0eab..a726619c26d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java
@@ -199,35 +199,43 @@ abstract class AbstractInstanceResolver<T> extends InstanceResolver<T> {
     InjectionPlan<T,R> buildInjectionPlan(Class<? extends T> clazz, Class<R> resourceType, boolean isStatic) {
         List<InjectionPlan<T,R>> plan = new ArrayList<InjectionPlan<T,R>>();
 
-        for(Field field: clazz.getDeclaredFields()) {
-            Resource resource = field.getAnnotation(Resource.class);
-            if (resource != null) {
-                if(isInjectionPoint(resource, field.getType(),
-                    ServerMessages.localizableWRONG_FIELD_TYPE(field.getName()),resourceType)) {
+        Class<?> cl = clazz;
+        while(cl != Object.class) {
+            for(Field field: cl.getDeclaredFields()) {
+                Resource resource = field.getAnnotation(Resource.class);
+                if (resource != null) {
+                    if(isInjectionPoint(resource, field.getType(),
+                        ServerMessages.localizableWRONG_FIELD_TYPE(field.getName()),resourceType)) {
 
-                    if(isStatic && !Modifier.isStatic(field.getModifiers()))
-                        throw new WebServiceException(ServerMessages.STATIC_RESOURCE_INJECTION_ONLY(resourceType,field));
+                        if(isStatic && !Modifier.isStatic(field.getModifiers()))
+                            throw new WebServiceException(ServerMessages.STATIC_RESOURCE_INJECTION_ONLY(resourceType,field));
 
-                    plan.add(new FieldInjectionPlan<T,R>(field));
+                        plan.add(new FieldInjectionPlan<T,R>(field));
+                    }
                 }
             }
+            cl = cl.getSuperclass();
         }
 
-        for(Method method : clazz.getDeclaredMethods()) {
-            Resource resource = method.getAnnotation(Resource.class);
-            if (resource != null) {
-                Class[] paramTypes = method.getParameterTypes();
-                if (paramTypes.length != 1)
-                    throw new ServerRtException(ServerMessages.WRONG_NO_PARAMETERS(method));
-                if(isInjectionPoint(resource,paramTypes[0],
-                    ServerMessages.localizableWRONG_PARAMETER_TYPE(method.getName()),resourceType)) {
+        cl = clazz;
+        while(cl != Object.class) {
+            for(Method method : cl.getDeclaredMethods()) {
+                Resource resource = method.getAnnotation(Resource.class);
+                if (resource != null) {
+                    Class[] paramTypes = method.getParameterTypes();
+                    if (paramTypes.length != 1)
+                        throw new ServerRtException(ServerMessages.WRONG_NO_PARAMETERS(method));
+                    if(isInjectionPoint(resource,paramTypes[0],
+                        ServerMessages.localizableWRONG_PARAMETER_TYPE(method.getName()),resourceType)) {
 
-                    if(isStatic && !Modifier.isStatic(method.getModifiers()))
-                        throw new WebServiceException(ServerMessages.STATIC_RESOURCE_INJECTION_ONLY(resourceType,method));
+                        if(isStatic && !Modifier.isStatic(method.getModifiers()))
+                            throw new WebServiceException(ServerMessages.STATIC_RESOURCE_INJECTION_ONLY(resourceType,method));
 
-                    plan.add(new MethodInjectionPlan<T,R>(method));
+                        plan.add(new MethodInjectionPlan<T,R>(method));
+                    }
                 }
             }
+            cl = cl.getSuperclass();
         }
 
         return new Compositor<T,R>(plan);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java
new file mode 100644
index 00000000000..e5a43cc33e9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.server;
+
+import com.sun.xml.internal.ws.developer.ValidationErrorHandler;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.SAXException;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+public class DraconianValidationErrorHandler extends ValidationErrorHandler {
+    public void warning(SAXParseException e) throws SAXException {
+        throw e;
+    }
+
+    public void error(SAXParseException e) throws SAXException {
+        throw e;
+    }
+
+    public void fatalError(SAXParseException e) throws SAXException {
+        ; // noop
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java
index 8ddc94c208f..d44db5a087a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java
@@ -50,6 +50,7 @@ import com.sun.xml.internal.ws.model.RuntimeModeler;
 import com.sun.xml.internal.ws.model.SOAPSEIModel;
 import com.sun.xml.internal.ws.model.wsdl.WSDLModelImpl;
 import com.sun.xml.internal.ws.model.wsdl.WSDLPortImpl;
+import com.sun.xml.internal.ws.model.wsdl.WSDLServiceImpl;
 import com.sun.xml.internal.ws.resources.ServerMessages;
 import com.sun.xml.internal.ws.server.provider.ProviderInvokerTube;
 import com.sun.xml.internal.ws.server.sei.SEIInvokerTube;
@@ -160,7 +161,7 @@ public class EndpointFactory {
         AbstractSEIModelImpl seiModel = null;
         // create WSDL model
         if (primaryDoc != null) {
-            wsdlPort = getWSDLPort(primaryDoc, docList, serviceName, portName);
+            wsdlPort = getWSDLPort(primaryDoc, docList, serviceName, portName, container);
         }
 
         WebServiceFeatureList features=((BindingImpl)binding).getFeatures();
@@ -184,7 +185,7 @@ public class EndpointFactory {
             if (primaryDoc == null) {
                 primaryDoc = generateWSDL(binding, seiModel, docList, container, implType);
                 // create WSDL model
-                wsdlPort = getWSDLPort(primaryDoc, docList, serviceName, portName);
+                wsdlPort = getWSDLPort(primaryDoc, docList, serviceName, portName, container);
                 seiModel.freeze(wsdlPort);
             }
             // New Features might have been added in WSDL through Policy.
@@ -297,7 +298,7 @@ public class EndpointFactory {
         // wsdlPort will be null, means we will generate WSDL. Hence no need to apply
         // bindings or need to look in the WSDL
         if(wsdlPort == null){
-            rap = new RuntimeModeler(implType,serviceName, binding.getBindingId());
+            rap = new RuntimeModeler(implType,serviceName, binding.getBindingId(), binding.getFeatures().toArray());
         } else {
             /*
             This not needed anymore as wsdlFeatures are merged later anyway
@@ -305,7 +306,7 @@ public class EndpointFactory {
             applyEffectiveMtomSetting(wsdlPort.getBinding(), binding);
             */
             //now we got the Binding so lets build the model
-            rap = new RuntimeModeler(implType, serviceName, (WSDLPortImpl)wsdlPort);
+            rap = new RuntimeModeler(implType, serviceName, (WSDLPortImpl)wsdlPort, binding.getFeatures().toArray());
         }
         rap.setPortName(portName);
         return rap.buildRuntimeModel();
@@ -441,8 +442,11 @@ public class EndpointFactory {
         }
         SDDocument.WSDL wsdlDoc = (SDDocument.WSDL)primaryDoc;
         if (!wsdlDoc.hasService()) {
-            throw new WebServiceException("Not a primary WSDL="+primaryWsdl.getSystemId()+
-                    " since it doesn't have Service "+serviceName);
+            if(wsdlDoc.getAllServices().isEmpty())
+                throw new WebServiceException("Not a primary WSDL="+primaryWsdl.getSystemId()+
+                        " since it doesn't have Service "+serviceName);
+            else
+                throw new WebServiceException("WSDL "+primaryDoc.getSystemId()+" has the following services "+wsdlDoc.getAllServices()+" but not "+serviceName+". Maybe you forgot to specify a service name in @WebService/@WebServiceProvider?");
         }
     }
 
@@ -487,17 +491,25 @@ public class EndpointFactory {
      * @param metadata it may contain imported WSDL and schema documents
      * @param serviceName service name in wsdl
      * @param portName port name in WSDL
+     * @param container container in which this service is running
      * @return non-null wsdl port object
      */
     private static @NotNull WSDLPortImpl getWSDLPort(SDDocumentSource primaryWsdl, List<? extends SDDocumentSource> metadata,
-                                                     @NotNull QName serviceName, @NotNull QName portName) {
+                                                     @NotNull QName serviceName, @NotNull QName portName, Container container) {
         URL wsdlUrl = primaryWsdl.getSystemId();
         try {
             // TODO: delegate to another entity resolver
             WSDLModelImpl wsdlDoc = RuntimeWSDLParser.parse(
                 new Parser(primaryWsdl), new EntityResolverImpl(metadata),
-                    false, ServiceFinder.find(WSDLParserExtension.class).toArray());
-            WSDLPortImpl wsdlPort = wsdlDoc.getService(serviceName).get(portName);
+                    false, container, ServiceFinder.find(WSDLParserExtension.class).toArray());
+            if(wsdlDoc.getServices().size() == 0) {
+                throw new ServerRtException(ServerMessages.localizableRUNTIME_PARSER_WSDL_NOSERVICE_IN_WSDLMODEL(wsdlUrl));
+            }
+            WSDLServiceImpl wsdlService = wsdlDoc.getService(serviceName);
+            if (wsdlService == null) {
+                throw new ServerRtException(ServerMessages.localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICE(serviceName,wsdlUrl));
+            }
+            WSDLPortImpl wsdlPort = wsdlService.get(portName);
             if (wsdlPort == null) {
                 throw new ServerRtException(ServerMessages.localizableRUNTIME_PARSER_WSDL_INCORRECTSERVICEPORT(serviceName, portName, wsdlUrl));
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/JMXAgent.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/JMXAgent.java
new file mode 100644
index 00000000000..11c1517148d
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/JMXAgent.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * JAXWSServerAgent.java
+ *
+ * Created on February 7, 2007, 6:37 PM
+ */
+
+package com.sun.xml.internal.ws.server;
+
+import com.sun.xml.internal.ws.util.RuntimeVersionMBean;
+import com.sun.xml.internal.ws.util.RuntimeVersion;
+import com.sun.xml.internal.ws.transport.http.HttpDump;
+
+import javax.management.ObjectName;
+import javax.management.MBeanServer;
+import java.lang.management.ManagementFactory;
+
+/**
+ *
+ * @author Jitendra Kotamraju
+ */
+public class JMXAgent {
+
+    // Platform MBeanServer used to register your MBeans
+    private final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+
+    // Singleton instance
+    private static JMXAgent singleton;
+
+    /**
+     * Instantiate and register your MBeans.
+     */
+    public void init() throws Exception {
+
+        RuntimeVersionMBean mbean = new RuntimeVersion();
+        ObjectName mbeanName = new ObjectName("com.sun.xml.internal.ws.util:type=RuntimeVersion");
+        if (!getMBeanServer().isRegistered(mbeanName)) {
+            getMBeanServer().registerMBean(mbean, mbeanName);
+        }
+
+        HttpDump dump = new HttpDump();
+        ObjectName dumpName = new ObjectName("com.sun.xml.internal.ws.transport.http:type=HttpDump");
+        if (!getMBeanServer().isRegistered(dumpName)) {
+            getMBeanServer().registerMBean(dump, dumpName);
+        }
+    }
+
+    /**
+     * Returns an agent singleton.
+     */
+    public synchronized static JMXAgent getDefault() throws Exception {
+        if(singleton == null) {
+            singleton = new JMXAgent();
+            singleton.init();
+        }
+        return singleton;
+    }
+
+    private MBeanServer getMBeanServer() {
+        return mbs;
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java
index a87b457957d..eaaddedb9c6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java
@@ -25,24 +25,16 @@
 
 package com.sun.xml.internal.ws.server;
 
-import com.sun.xml.internal.ws.api.server.DocumentAddressResolver;
-import com.sun.xml.internal.ws.api.server.PortAddressResolver;
-import com.sun.xml.internal.ws.api.server.SDDocument;
-import com.sun.xml.internal.ws.api.server.SDDocumentFilter;
-import com.sun.xml.internal.ws.api.server.SDDocumentSource;
-import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.api.server.*;
 import com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory;
 import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
+import com.sun.xml.internal.ws.util.RuntimeVersion;
+import com.sun.xml.internal.ws.util.xml.XMLStreamReaderToXMLStreamWriter;
 import com.sun.xml.internal.ws.wsdl.parser.ParserUtil;
 import com.sun.xml.internal.ws.wsdl.parser.WSDLConstants;
-import com.sun.xml.internal.ws.util.RuntimeVersion;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.*;
 import javax.xml.ws.WebServiceException;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -61,11 +53,12 @@ import java.util.Set;
  * @author Kohsuke Kawaguchi
  * @author Jitendra Kotamraju
  */
-class SDDocumentImpl extends SDDocumentSource implements SDDocument {
+public class SDDocumentImpl extends SDDocumentSource implements SDDocument {
 
     private static final String NS_XSD = "http://www.w3.org/2001/XMLSchema";
     private static final QName SCHEMA_INCLUDE_QNAME = new QName(NS_XSD, "include");
     private static final QName SCHEMA_IMPORT_QNAME = new QName(NS_XSD, "import");
+    private static final QName SCHEMA_REDEFINE_QNAME = new QName(NS_XSD, "redefine");
     private static final String VERSION_COMMENT =
         " Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is "+RuntimeVersion.VERSION+". ";
 
@@ -98,7 +91,8 @@ class SDDocumentImpl extends SDDocumentSource implements SDDocument {
                          if (reader.getEventType() != XMLStreamConstants.START_ELEMENT)
                             continue;
                         QName name = reader.getName();
-                        if (SCHEMA_INCLUDE_QNAME.equals(name) || SCHEMA_IMPORT_QNAME.equals(name)) {
+                        if (SCHEMA_INCLUDE_QNAME.equals(name) || SCHEMA_IMPORT_QNAME.equals(name) ||
+                                SCHEMA_REDEFINE_QNAME.equals(name)) {
                             String importedDoc = reader.getAttributeValue(null, "schemaLocation");
                             if (importedDoc != null) {
                                 importedDocs.add(new URL(src.getSystemId(), importedDoc).toString());
@@ -112,6 +106,7 @@ class SDDocumentImpl extends SDDocumentSource implements SDDocument {
                     boolean hasPortType = false;
                     boolean hasService = false;
                     Set<String> importedDocs = new HashSet<String>();
+                    Set<QName> allServices = new HashSet<QName>();
 
                     // if WSDL, parse more
                     while (XMLStreamReaderUtil.nextContent(reader) != XMLStreamConstants.END_DOCUMENT) {
@@ -129,6 +124,7 @@ class SDDocumentImpl extends SDDocumentSource implements SDDocument {
                         } else if (WSDLConstants.QNAME_SERVICE.equals(name)) {
                             String sn = ParserUtil.getMandatoryNonEmptyAttribute(reader, WSDLConstants.ATTR_NAME);
                             QName sqn = new QName(tns,sn);
+                            allServices.add(sqn);
                             if(serviceName.equals(sqn)) {
                                 hasService = true;
                             }
@@ -137,7 +133,8 @@ class SDDocumentImpl extends SDDocumentSource implements SDDocument {
                             if (importedDoc != null) {
                                 importedDocs.add(new URL(src.getSystemId(), importedDoc).toString());
                             }
-                        } else if (SCHEMA_INCLUDE_QNAME.equals(name) || SCHEMA_IMPORT_QNAME.equals(name)) {
+                        } else if (SCHEMA_INCLUDE_QNAME.equals(name) || SCHEMA_IMPORT_QNAME.equals(name) ||
+                                SCHEMA_REDEFINE_QNAME.equals(name)) {
                             String importedDoc = reader.getAttributeValue(null, "schemaLocation");
                             if (importedDoc != null) {
                                 importedDocs.add(new URL(src.getSystemId(), importedDoc).toString());
@@ -145,7 +142,7 @@ class SDDocumentImpl extends SDDocumentSource implements SDDocument {
                         }
                     }
                     return new WSDLImpl(
-                        rootName,systemId,src,tns,hasPortType,hasService,importedDocs);
+                        rootName,systemId,src,tns,hasPortType,hasService,importedDocs,allServices);
                 } else {
                     return new SDDocumentImpl(rootName,systemId,src);
                 }
@@ -225,6 +222,31 @@ class SDDocumentImpl extends SDDocumentSource implements SDDocument {
         return imports;
     }
 
+    public void writeTo(OutputStream os) throws IOException {
+        XMLStreamWriter w = null;
+        try {
+            //generate the WSDL with utf-8 encoding and XML version 1.0
+            w = XMLStreamWriterFactory.create(os, "UTF-8");
+            w.writeStartDocument("UTF-8", "1.0");
+            new XMLStreamReaderToXMLStreamWriter().bridge(source.read(), w);
+            w.writeEndDocument();
+        } catch (XMLStreamException e) {
+            IOException ioe = new IOException(e.getMessage());
+            ioe.initCause(e);
+            throw ioe;
+        } finally {
+            try {
+                if (w != null)
+                    w.close();
+            } catch (XMLStreamException e) {
+                IOException ioe = new IOException(e.getMessage());
+                ioe.initCause(e);
+                throw ioe;
+            }
+        }
+    }
+
+
     public void writeTo(PortAddressResolver portAddressResolver, DocumentAddressResolver resolver, OutputStream os) throws IOException {
         XMLStreamWriter w = null;
         try {
@@ -292,13 +314,15 @@ class SDDocumentImpl extends SDDocumentSource implements SDDocument {
         private final String targetNamespace;
         private final boolean hasPortType;
         private final boolean hasService;
+        private final Set<QName> allServices;
 
         public WSDLImpl(QName rootName, URL url, SDDocumentSource source, String targetNamespace, boolean hasPortType,
-                        boolean hasService, Set<String> imports) {
+                        boolean hasService, Set<String> imports,Set<QName> allServices) {
             super(rootName, url, source, imports);
             this.targetNamespace = targetNamespace;
             this.hasPortType = hasPortType;
             this.hasService = hasService;
+            this.allServices = allServices;
         }
 
         public String getTargetNamespace() {
@@ -313,6 +337,10 @@ class SDDocumentImpl extends SDDocumentSource implements SDDocument {
             return hasService;
         }
 
+        public Set<QName> getAllServices() {
+            return allServices;
+        }
+
         public boolean isWSDL() {
             return true;
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java
new file mode 100644
index 00000000000..27f6abf0938
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.server;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractTubeImpl;
+import com.sun.xml.internal.ws.api.server.SDDocument;
+import com.sun.xml.internal.ws.api.server.SDDocumentSource;
+import com.sun.xml.internal.ws.api.server.ServiceDefinition;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+import com.sun.xml.internal.ws.util.ByteArrayBuffer;
+import com.sun.xml.internal.ws.util.MetadataUtil;
+import com.sun.xml.internal.ws.util.pipe.AbstractSchemaValidationTube;
+import com.sun.xml.internal.ws.util.xml.MetadataDocument;
+import org.w3c.dom.*;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.NamespaceSupport;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * {@link Tube} that does the schema validation on the server side.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class ServerSchemaValidationTube extends AbstractSchemaValidationTube {
+
+    private static final Logger LOGGER = Logger.getLogger(ServerSchemaValidationTube.class.getName());
+
+    //private final ServiceDefinition docs;
+    private final Schema schema;
+    private final Validator validator;
+
+    private final boolean noValidation;
+
+    public ServerSchemaValidationTube(WSEndpoint endpoint, WSBinding binding, Tube next) {
+        super(binding, next);
+        //docs = endpoint.getServiceDefinition();
+        SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        Source[] sources = getSchemaSources(endpoint.getServiceDefinition());
+        for(Source source : sources) {
+            LOGGER.fine("Constructing validation Schema from = "+source.getSystemId());
+            //printDOM((DOMSource)source);
+        }
+        if (sources.length != 0) {
+            noValidation = false;
+            sf.setResourceResolver(new MetadataResolverImpl(endpoint.getServiceDefinition()));
+            try {
+                schema = sf.newSchema(sources);
+            } catch(SAXException e) {
+                throw new WebServiceException(e);
+            }
+            validator = schema.newValidator();
+        } else {
+            noValidation = true;
+            schema = null;
+            validator = null;
+        }
+    }
+
+    /**
+     * Constructs list of schema documents as follows:
+     *   - all <xsd:schema> fragements from all WSDL documents.
+     *   - all schema documents in the application(from WAR etc)
+     *
+     * @return list of root schema documents
+     */
+    private Source[] getSchemaSources(ServiceDefinition sd) {
+        String primary = sd.getPrimary().getURL().toExternalForm();
+        MetadataUtil.MetadataResolver mdresolver = new MetadataResolverImpl(sd);
+        Map<String, SDDocument> docs = MetadataUtil.getMetadataClosure(primary, mdresolver, true);
+
+        List<Source> list = new ArrayList<Source>();
+        for(Map.Entry<String, SDDocument> entry : docs.entrySet()) {
+            SDDocument doc = entry.getValue();
+            // Add all xsd:schema fragments from all WSDLs. That should form a closure of schemas.
+            if (doc.isWSDL()) {
+                Document dom = createDOM(doc);
+                // Get xsd:schema node from WSDL's DOM
+                addSchemaFragmentSource(dom, doc.getURL().toExternalForm(), list);
+            } else if (doc.isSchema()) {
+                // If there are multiple schemas with the same targetnamespace,
+                // JAXP works only with the first one. Above, all schema fragments may have the same targetnamespace,
+                // and that means it will not include all the schemas. Since we have a list of schemas, just add them.
+                Document dom = createDOM(doc);
+                list.add(new DOMSource(dom, doc.getURL().toExternalForm()));
+            }
+        }
+        //addSchemaSource(list);
+        return list.toArray(new Source[list.size()]) ;
+    }
+
+    private class MetadataResolverImpl implements MetadataUtil.MetadataResolver, LSResourceResolver {
+
+        Map<String, SDDocument> docs = new HashMap<String, SDDocument>();
+
+        MetadataResolverImpl(ServiceDefinition sd) {
+            for(SDDocument doc : sd) {
+                SDDocument sdi = doc;
+                docs.put(sdi.getURL().toExternalForm(), sdi);
+            }
+        }
+
+        public SDDocument resolveEntity(String systemId) {
+            SDDocument sdi = docs.get(systemId);
+            if (sdi == null) {
+                SDDocumentSource sds;
+                try {
+                    sds = SDDocumentSource.create(new URL(systemId));
+                } catch(MalformedURLException e) {
+                    throw new WebServiceException(e);
+                }
+                sdi = MetadataDocument.create(sds, new QName(""), new QName(""));
+                docs.put(systemId, sdi);
+            }
+            return sdi;
+        }
+
+        public LSInput resolveResource(String type, String namespaceURI, String publicId, final String systemId, final String baseURI) {
+            LOGGER.fine("type="+type+ " namespaceURI="+namespaceURI+" publicId="+publicId+" systemId="+systemId+" baseURI="+baseURI);
+            try {
+                URL base = baseURI == null ? null : new URL(baseURI);
+                final URL rel = new URL(base, systemId);
+                final SDDocument doc = docs.get(rel.toExternalForm());
+                if (doc != null) {
+                    return new LSInput() {
+
+                        public Reader getCharacterStream() {
+                            return null;
+                        }
+
+                        public void setCharacterStream(Reader characterStream) {
+                            throw new UnsupportedOperationException();
+                        }
+
+                        public InputStream getByteStream() {
+                            ByteArrayBuffer bab = new ByteArrayBuffer();
+                            try {
+                                doc.writeTo(null, resolver, bab);
+                            } catch (IOException ioe) {
+                                throw new WebServiceException(ioe);
+                            }
+                            return bab.newInputStream();
+                        }
+
+                        public void setByteStream(InputStream byteStream) {
+                            throw new UnsupportedOperationException();
+                        }
+
+                        public String getStringData() {
+                            return null;
+                        }
+
+                        public void setStringData(String stringData) {
+                            throw new UnsupportedOperationException();
+                        }
+
+                        public String getSystemId() {
+                            return rel.toExternalForm();
+                        }
+
+                        public void setSystemId(String systemId) {
+                            throw new UnsupportedOperationException();
+                        }
+
+                        public String getPublicId() {
+                            return null;
+                        }
+
+                        public void setPublicId(String publicId) {
+                            throw new UnsupportedOperationException();
+                        }
+
+                        public String getBaseURI() {
+                            return rel.toExternalForm();
+                        }
+
+                        public void setBaseURI(String baseURI) {
+                            throw new UnsupportedOperationException();
+                        }
+
+                        public String getEncoding() {
+                            return null;
+                        }
+
+                        public void setEncoding(String encoding) {
+                            throw new UnsupportedOperationException();
+                        }
+
+                        public boolean getCertifiedText() {
+                            return false;
+                        }
+
+                        public void setCertifiedText(boolean certifiedText) {
+                            throw new UnsupportedOperationException();
+                        }
+                    };
+                }
+            } catch(Exception e) {
+                LOGGER.log(Level.WARNING, "Exception in LSResourceResolver impl", e);
+            }
+            LOGGER.fine("Don't know about systemId="+systemId+" baseURI="+baseURI);
+            return null;
+        }
+
+    }
+
+
+    protected Validator getValidator() {
+        return validator;
+    }
+
+    protected boolean isNoValidation() {
+        return noValidation;
+    }
+
+    /**
+     * Recursively visit ancestors and build up {@link org.xml.sax.helpers.NamespaceSupport} oject.
+     */
+    private void buildNamespaceSupport(NamespaceSupport nss, Node node) {
+        if(node==null || node.getNodeType()!=Node.ELEMENT_NODE)
+            return;
+
+        buildNamespaceSupport( nss, node.getParentNode() );
+
+        nss.pushContext();
+        NamedNodeMap atts = node.getAttributes();
+        for( int i=0; i<atts.getLength(); i++ ) {
+            Attr a = (Attr)atts.item(i);
+            if( "xmlns".equals(a.getPrefix()) ) {
+                nss.declarePrefix( a.getLocalName(), a.getValue() );
+                continue;
+            }
+            if( "xmlns".equals(a.getName()) ) {
+                nss.declarePrefix( "", a.getValue() );
+                continue;
+            }
+        }
+    }
+
+    /**
+     * Adds inscope namespaces as attributes to  <xsd:schema> fragment nodes.
+     *
+     * @param nss namespace context info
+     * @param elem that is patched with inscope namespaces
+     */
+    private @Nullable void patchDOMFragment(NamespaceSupport nss, Element elem) {
+        NamedNodeMap atts = elem.getAttributes();
+        for( Enumeration en = nss.getPrefixes(); en.hasMoreElements(); ) {
+            String prefix = (String)en.nextElement();
+
+            for( int i=0; i<atts.getLength(); i++ ) {
+                Attr a = (Attr)atts.item(i);
+                if (!"xmlns".equals(a.getPrefix()) || !a.getLocalName().equals("prefix")) {
+                    LOGGER.fine("Patching with xmlns:"+prefix+"="+nss.getURI(prefix));
+                    elem.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:"+prefix, nss.getURI(prefix));
+                }
+            }
+        }
+    }
+
+
+
+
+    protected ServerSchemaValidationTube(ServerSchemaValidationTube that, TubeCloner cloner) {
+        super(that,cloner);
+        //this.docs = that.docs;
+        this.schema = that.schema;
+        this.validator = schema.newValidator();
+        this.noValidation = that.noValidation;
+    }
+
+    public AbstractTubeImpl copy(TubeCloner cloner) {
+        return new ServerSchemaValidationTube(this,cloner);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java
index 6c1fb1f2a7d..ba8a33231b5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java
@@ -352,6 +352,7 @@ public final class StatefulInstanceResolver<T> extends AbstractMultiInstanceReso
         String key = reverseInstances.get(o);
         if(key==null)   return; // already unexported
         instances.remove(key);
+        reverseInstances.remove(o);
     }
 
     public T resolve(EndpointReference epr) {
@@ -405,9 +406,9 @@ public final class StatefulInstanceResolver<T> extends AbstractMultiInstanceReso
     /**
      * Timer that controls the instance time out. Lazily created.
      */
-    private static volatile Timer timer;
+    private volatile Timer timer;
 
-    private static synchronized void startTimer() {
+    private synchronized void startTimer() {
         if(timer==null)
             timer = new Timer("JAX-WS stateful web service timeout timer");
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java
index 515ce6931d4..1f6049b45e3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java
@@ -47,6 +47,10 @@ public final class UnsupportedMediaException extends JAXWSExceptionBase {
         super(ServerMessages.localizableNO_CONTENT_TYPE());
     }
 
+    public UnsupportedMediaException(String charset) {
+        super(ServerMessages.localizableUNSUPPORTED_CHARSET(charset));
+    }
+
     public String getDefaultResourceBundleName() {
         return "com.sun.xml.internal.ws.resources.server";
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java
index bb0645030d1..0cc2582a1cc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java
@@ -26,7 +26,6 @@ package com.sun.xml.internal.ws.server;
 
 import com.sun.xml.internal.ws.api.server.PortAddressResolver;
 import com.sun.xml.internal.ws.api.server.WSEndpoint;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
 import com.sun.xml.internal.ws.api.server.DocumentAddressResolver;
 import com.sun.xml.internal.ws.api.server.SDDocument;
 import com.sun.xml.internal.ws.util.xml.XMLStreamReaderToXMLStreamWriter;
@@ -52,6 +51,7 @@ final class WSDLPatcher extends XMLStreamReaderToXMLStreamWriter {
     private static final String NS_XSD = "http://www.w3.org/2001/XMLSchema";
     private static final QName SCHEMA_INCLUDE_QNAME = new QName(NS_XSD, "include");
     private static final QName SCHEMA_IMPORT_QNAME = new QName(NS_XSD, "import");
+    private static final QName SCHEMA_REDEFINE_QNAME = new QName(NS_XSD, "redefine");
 
     private static final Logger logger = Logger.getLogger(
             com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".wsdl.patcher");
@@ -76,6 +76,7 @@ final class WSDLPatcher extends XMLStreamReaderToXMLStreamWriter {
     private String targetNamespace;
     private QName serviceName;
     private QName portName;
+    private String portAddress;
 
     private enum EPR_ADDRESS_STATE {IN, OUT, DONE}
     private EPR_ADDRESS_STATE eprAddressState = EPR_ADDRESS_STATE.OUT;
@@ -109,6 +110,7 @@ final class WSDLPatcher extends XMLStreamReaderToXMLStreamWriter {
 
         if((name.equals(SCHEMA_INCLUDE_QNAME) && attLocalName.equals("schemaLocation"))
         || (name.equals(SCHEMA_IMPORT_QNAME)  && attLocalName.equals("schemaLocation"))
+        || (name.equals(SCHEMA_REDEFINE_QNAME)  && attLocalName.equals("schemaLocation"))
         || (name.equals(WSDLConstants.QNAME_IMPORT)  && attLocalName.equals("location"))) {
             // patch this attribute value.
 
@@ -128,10 +130,11 @@ final class WSDLPatcher extends XMLStreamReaderToXMLStreamWriter {
             name.equals(WSDLConstants.NS_SOAP12_BINDING_ADDRESS)) {
 
             if(attLocalName.equals("location")) {
+                portAddress = in.getAttributeValue(i);
                 String value = getAddressLocation();
                 if (value != null) {
-                    logger.fine("Fixing service:"+serviceName+ " port:"+portName
-                            + " address with "+value);
+                    logger.fine("Service:"+serviceName+ " port:"+portName
+                            + " current address "+portAddress+" Patching it with "+value);
                     writeAttribute(i, value);
                     return;
                 }
@@ -241,6 +244,6 @@ final class WSDLPatcher extends XMLStreamReaderToXMLStreamWriter {
      */
     private String getAddressLocation() {
         return (portAddressResolver == null || portName == null)
-                ? null : portAddressResolver.getAddressFor(serviceName, portName.getLocalPart());
+                ? null : portAddressResolver.getAddressFor(serviceName, portName.getLocalPart(), portAddress);
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java
index 7ec71dbf499..2654fa85557 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java
@@ -47,6 +47,7 @@ import com.sun.xml.internal.ws.api.pipe.TubelineAssembler;
 import com.sun.xml.internal.ws.api.pipe.TubelineAssemblerFactory;
 import com.sun.xml.internal.ws.api.server.Container;
 import com.sun.xml.internal.ws.api.server.EndpointAwareCodec;
+import com.sun.xml.internal.ws.api.server.EndpointComponent;
 import com.sun.xml.internal.ws.api.server.TransportBackChannel;
 import com.sun.xml.internal.ws.api.server.WSEndpoint;
 import com.sun.xml.internal.ws.api.server.WebServiceContextDelegate;
@@ -63,7 +64,9 @@ import javax.xml.ws.EndpointReference;
 import javax.xml.ws.handler.Handler;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -75,6 +78,16 @@ import java.util.logging.Logger;
  * @author Jitendra Kotamraju
  */
 public final class WSEndpointImpl<T> extends WSEndpoint<T> {
+    // Register JAX-WS JMX MBeans
+    static {
+        try {
+            JMXAgent.getDefault();
+        } catch (Throwable t) {
+            // Ignore for now by logging the stack trace
+            t.printStackTrace();
+        }
+    }
+
     private final @NotNull QName serviceName;
     private final @NotNull QName portName;
     private final WSBinding binding;
@@ -100,6 +113,7 @@ public final class WSEndpointImpl<T> extends WSEndpoint<T> {
 
     private final Class<T> implementationClass;
     private final @Nullable WSDLProperties wsdlProperties;
+    private final Set<EndpointComponent> componentRegistry = new LinkedHashSet<EndpointComponent>();
 
     WSEndpointImpl(@NotNull QName serviceName, @NotNull QName portName, WSBinding binding,
                    Container container, SEIModel seiModel, WSDLPort port,
@@ -156,18 +170,7 @@ public final class WSEndpointImpl<T> extends WSEndpoint<T> {
         return port;
     }
 
-    /**
-     * Gets the {@link SEIModel} that represents the relationship
-     * between WSDL and Java SEI.
-     *
-     * <p>
-     * This method returns a non-null value if and only if this
-     * endpoint is ultimately serving an application through an SEI.
-     *
-     * @return
-     *      maybe null. See above for more discussion.
-     *      Always the same value.
-     */
+    @Override
     public @Nullable SEIModel getSEIModel() {
         return seiModel;
     }
@@ -267,6 +270,10 @@ public final class WSEndpointImpl<T> extends WSEndpoint<T> {
         return serviceDef;
     }
 
+    public Set<EndpointComponent> getComponentRegistry() {
+        return componentRegistry;
+    }
+
     private static final Logger logger = Logger.getLogger(
         com.sun.xml.internal.ws.util.Constants.LoggingDomain + ".server.endpoint");
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java
index fbcd7837ddd..286ee51481c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java
@@ -74,7 +74,7 @@ abstract class ProviderArgumentsBuilder<T> {
 
     public static ProviderArgumentsBuilder<?> create(ProviderEndpointModel model, WSBinding binding) {
         return (binding instanceof SOAPBinding) ? SOAPProviderArgumentBuilder.create(model, binding.getSOAPVersion())
-                : XMLProviderArgumentBuilder.create(model);
+                : XMLProviderArgumentBuilder.createBuilder(model, binding);
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java
index 21b03148627..4fc760e1b20 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java
@@ -56,14 +56,14 @@ abstract class XMLProviderArgumentBuilder<T> extends ProviderArgumentsBuilder<T>
         return response;
     }
 
-    static XMLProviderArgumentBuilder create(ProviderEndpointModel model) {
+    static XMLProviderArgumentBuilder createBuilder(ProviderEndpointModel model, WSBinding binding) {
         if (model.mode == Service.Mode.PAYLOAD) {
             return new PayloadSource();
         } else {
             if(model.datatype==Source.class)
                 return new PayloadSource();
             if(model.datatype== DataSource.class)
-                return new DataSourceParameter();
+                return new DataSourceParameter(binding);
             throw new WebServiceException(ServerMessages.PROVIDER_INVALID_PARAMETER_TYPE(model.implClass,model.datatype));
         }
     }
@@ -83,15 +83,20 @@ abstract class XMLProviderArgumentBuilder<T> extends ProviderArgumentsBuilder<T>
     }
 
     private static final class DataSourceParameter extends XMLProviderArgumentBuilder<DataSource> {
+        private final WSBinding binding;
+
+        DataSourceParameter(WSBinding binding) {
+            this.binding = binding;
+        }
         public DataSource getParameter(Packet packet) {
             Message msg = packet.getMessage();
             return (msg instanceof XMLMessage.MessageDataSource)
                     ? ((XMLMessage.MessageDataSource) msg).getDataSource()
-                    : XMLMessage.getDataSource(msg);
+                    : XMLMessage.getDataSource(msg, binding);
         }
 
         public Message getResponseMessage(DataSource ds) {
-            return XMLMessage.create(ds);
+            return XMLMessage.create(ds, binding);
         }
 
         protected Message getResponseMessage(Exception e) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java
index aeb4ea5755d..92623abd2b1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java
@@ -49,6 +49,7 @@ import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFault;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
 import javax.xml.transform.Source;
 import javax.xml.ws.Holder;
 import javax.xml.ws.WebServiceException;
@@ -219,11 +220,12 @@ abstract class EndpointArgumentsBuilder {
             } else if(isXMLMimeType(param.getBinding().getMimeType())) {
                 return new JAXBBuilder(param, setter);
             } else {
-                throw new UnsupportedOperationException("Attachment is not mapped");
+                throw new UnsupportedOperationException("Unknown Type="+type+" Attachment is not mapped.");
             }
         }
 
         public void readRequest(Message msg, Object[] args) throws JAXBException, XMLStreamException {
+            boolean foundAttachment = false;
             // TODO not to loop
             for (Attachment att : msg.getAttachments()) {
                 String part = getWSDLPartName(att);
@@ -231,10 +233,14 @@ abstract class EndpointArgumentsBuilder {
                     continue;
                 }
                 if(part.equals(pname) || part.equals(pname1)){
+                    foundAttachment = true;
                     mapAttachment(att, args);
                     break;
                 }
             }
+            if (!foundAttachment) {
+                throw new WebServiceException("Missing Attachment for "+pname);
+            }
         }
 
         abstract void mapAttachment(Attachment att, Object[] args) throws JAXBException;
@@ -277,10 +283,20 @@ abstract class EndpointArgumentsBuilder {
 
         void mapAttachment(Attachment att, Object[] args) {
             Image image;
+            InputStream is = null;
             try {
-                image = ImageIO.read(att.asInputStream());
+                is = att.asInputStream();
+                image = ImageIO.read(is);
             } catch(IOException ioe) {
                 throw new WebServiceException(ioe);
+            } finally {
+                if (is != null) {
+                    try {
+                        is.close();
+                    } catch(IOException ioe) {
+                        throw new WebServiceException(ioe);
+                    }
+                }
             }
             setter.put(image, args);
         }
@@ -489,30 +505,27 @@ abstract class EndpointArgumentsBuilder {
         }
 
         public void readRequest(Message msg, Object[] args) throws JAXBException, XMLStreamException {
-            Object retVal = null;
 
-            XMLStreamReader reader = msg.readPayload();
-            Object wrapperBean = wrapper.unmarshal(reader, (msg.getAttachments() != null) ?
-                    new AttachmentUnmarshallerImpl(msg.getAttachments()): null);
+            if (parts.length>0) {
+                XMLStreamReader reader = msg.readPayload();
+                Object wrapperBean = wrapper.unmarshal(reader, (msg.getAttachments() != null) ?
+                        new AttachmentUnmarshallerImpl(msg.getAttachments()): null);
 
-            try {
-                for (PartBuilder part : parts) {
-                    Object o = part.readResponse(args,wrapperBean);
-                    // there's only at most one EndpointArgumentsBuilder that returns a value.
-                    // TODO: reorder parts so that the return value comes at the end.
-                    if(o!=null) {
-                        assert retVal==null;
-                        retVal = o;
+                try {
+                    for (PartBuilder part : parts) {
+                        part.readRequest(args,wrapperBean);
                     }
+                } catch (AccessorException e) {
+                    // this can happen when the set method throw a checked exception or something like that
+                    throw new WebServiceException(e);    // TODO:i18n
                 }
-            } catch (AccessorException e) {
-                // this can happen when the set method throw a checked exception or something like that
-                throw new WebServiceException(e);    // TODO:i18n
-            }
 
-            // we are done with the body
-            reader.close();
-            XMLStreamReaderFactory.recycle(reader);
+                // we are done with the body
+                reader.close();
+                XMLStreamReaderFactory.recycle(reader);
+            } else {
+                msg.consume();
+            }
         }
 
         /**
@@ -535,10 +548,9 @@ abstract class EndpointArgumentsBuilder {
                 assert accessor!=null && setter!=null;
             }
 
-            final Object readResponse( Object[] args, Object wrapperBean ) throws AccessorException {
+            final void readRequest( Object[] args, Object wrapperBean ) throws AccessorException {
                 Object obj = accessor.get(wrapperBean);
                 setter.put(obj,args);
-                return null;
             }
 
 
@@ -576,7 +588,7 @@ abstract class EndpointArgumentsBuilder {
             XMLStreamReader reader = msg.readPayload();
             if (!reader.getName().equals(wrapperName))
                 throw new WebServiceException( // TODO: i18n
-                    "Unexpected response element "+reader.getName()+" expected: "+wrapperName);
+                    "Unexpected request element "+reader.getName()+" expected: "+wrapperName);
             reader.nextTag();
 
             while(reader.getEventType()==XMLStreamReader.START_ELEMENT) {
@@ -589,6 +601,11 @@ abstract class EndpointArgumentsBuilder {
                 } else {
                     part.readRequest(args,reader, msg.getAttachments());
                 }
+                // skip any whitespace
+                if (reader.getEventType() != XMLStreamConstants.START_ELEMENT &&
+                        reader.getEventType() != XMLStreamConstants.END_ELEMENT) {
+                    XMLStreamReaderUtil.nextElementContent(reader);
+                }
             }
 
             // we are done with the body
@@ -623,6 +640,6 @@ abstract class EndpointArgumentsBuilder {
     }
 
     private static boolean isXMLMimeType(String mimeType){
-        return (mimeType.equals("text/xml") || mimeType.equals("application/xml")) ? true : false;
+        return mimeType.equals("text/xml") || mimeType.equals("application/xml");
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java
index da61e0477a7..1c9156bd1c3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: EndpointMethodDispatcher.java,v 1.1.2.5 2006/11/10 00:55:03 kohsuke Exp $
- */
 
 package com.sun.xml.internal.ws.server.sei;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java
index 2320f8ff378..78d71f7126d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java
@@ -59,6 +59,7 @@ final class EndpointMethodDispatcherGetter {
         // even when action based dispatching is in place,
         // we still need this because clients are alowed not to use addressing headers
         dispatcherList.add(new PayloadQNameBasedDispatcher(model, binding, invokerTube));
+        dispatcherList.add(new SOAPActionBasedDispatcher(model, binding, invokerTube));
     }
 
     List<EndpointMethodDispatcher> getDispatcherList() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java
index 715f6b6a6ad..9bf5a9f4a45 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java
@@ -29,8 +29,6 @@ import com.sun.xml.internal.ws.api.SOAPVersion;
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.message.Message;
 import com.sun.xml.internal.ws.api.message.Packet;
-import com.sun.xml.internal.ws.api.model.SEIModel;
-import com.sun.xml.internal.ws.encoding.soap.DeserializationException;
 import com.sun.xml.internal.ws.fault.SOAPFaultBuilder;
 import com.sun.xml.internal.ws.message.jaxb.JAXBMessage;
 import com.sun.xml.internal.ws.model.JavaMethodImpl;
@@ -41,6 +39,8 @@ import javax.jws.WebParam.Mode;
 import javax.xml.bind.JAXBException;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.ws.Holder;
+import javax.xml.ws.ProtocolException;
+import javax.xml.ws.WebServiceException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -226,18 +226,20 @@ final class EndpointMethodHandler {
 
 
     public Packet invoke(Packet req) {
-        // Some transports(like HTTP) may want to send response before envoking endpoint method
-        if (isOneWay && req.transportBackChannel != null) {
-            req.transportBackChannel.close();
-        }
         Message reqMsg = req.getMessage();
         Object[] args = new Object[noOfArgs];
         try {
             argumentsBuilder.readRequest(reqMsg,args);
         } catch (JAXBException e) {
-            throw new DeserializationException("failed.to.read.response",e);
+            throw new WebServiceException(e);
         } catch (XMLStreamException e) {
-            throw new DeserializationException("failed.to.read.response",e);
+            throw new WebServiceException(e);
+        }
+        // Some transports(like HTTP) may want to send response before envoking endpoint method
+        // Doing this here so that after closing the response stream, cannot read
+        // request from some transports(light weight http server)
+        if (isOneWay && req.transportBackChannel != null) {
+            req.transportBackChannel.close();
         }
         Message responseMessage;
         try {
@@ -248,11 +250,17 @@ final class EndpointMethodHandler {
 
             if (!(cause instanceof RuntimeException) && cause instanceof Exception) {
                 // Service specific exception
-                LOGGER.log(Level.INFO, cause.getMessage(), cause);
+                LOGGER.log(Level.FINE, cause.getMessage(), cause);
                 responseMessage = SOAPFaultBuilder.createSOAPFaultMessage(soapVersion,
                         javaMethodModel.getCheckedException(cause.getClass()), cause);
             } else {
-                LOGGER.log(Level.SEVERE, cause.getMessage(), cause);
+                if (cause instanceof ProtocolException) {
+                    // Application code may be throwing it intentionally
+                    LOGGER.log(Level.FINE, cause.getMessage(), cause);
+                } else {
+                    // Probably some bug in application code
+                    LOGGER.log(Level.SEVERE, cause.getMessage(), cause);
+                }
                 responseMessage = SOAPFaultBuilder.createSOAPFaultMessage(soapVersion, null, cause);
             }
         } catch (Exception e) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java
index da73ab02d3c..d3f3277c0a5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java
@@ -25,7 +25,7 @@
 
 package com.sun.xml.internal.ws.server.sei;
 
-import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.message.Message;
 import com.sun.xml.internal.ws.api.message.Packet;
@@ -36,6 +36,9 @@ import com.sun.xml.internal.ws.resources.ServerMessages;
 import com.sun.xml.internal.ws.util.QNameMap;
 
 import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * An {@link com.sun.xml.internal.ws.server.sei.EndpointMethodDispatcher} that uses
@@ -47,28 +50,60 @@ import javax.xml.namespace.QName;
  * handler.
  *
  * @author Arun Gupta
+ * @author Jitendra Kotamraju
  */
 final class PayloadQNameBasedDispatcher implements EndpointMethodDispatcher {
-    private final QNameMap<EndpointMethodHandler> methodHandlers;
+    private static final Logger LOGGER = Logger.getLogger(PayloadQNameBasedDispatcher.class.getName());
+
     private static final String EMPTY_PAYLOAD_LOCAL = "";
     private static final String EMPTY_PAYLOAD_NSURI = "";
-    private WSBinding binding;
+    private static final QName EMPTY_PAYLOAD = new QName(EMPTY_PAYLOAD_NSURI, EMPTY_PAYLOAD_LOCAL);
+
+    private final QNameMap<EndpointMethodHandler> methodHandlers = new QNameMap<EndpointMethodHandler>();
+    private final QNameMap<List<String>> unique = new QNameMap<List<String>>();
+    private final WSBinding binding;
 
     public PayloadQNameBasedDispatcher(AbstractSEIModelImpl model, WSBinding binding, SEIInvokerTube invokerTube) {
         this.binding = binding;
-        methodHandlers = new QNameMap<EndpointMethodHandler>();
-        for( JavaMethodImpl m : model.getJavaMethods() ) {
-            EndpointMethodHandler handler = new EndpointMethodHandler(invokerTube,m,binding);
-            QName payloadName = model.getQNameForJM(m);     // TODO need a new method on JavaMethodImpl
-            methodHandlers.put(payloadName.getNamespaceURI(), payloadName.getLocalPart(), handler);
+        // Find if any payload QNames repeat for operations
+        for(JavaMethodImpl m : model.getJavaMethods()) {
+            QName name = m.getRequestPayloadName();
+            if (name == null)
+                name = EMPTY_PAYLOAD;
+            List<String> methods = unique.get(name);
+            if (methods == null) {
+                methods = new ArrayList<String>();
+                unique.put(name, methods);
+            }
+            methods.add(m.getMethod().getName());
+        }
+
+        // Log warnings about non unique payload QNames
+        for(QNameMap.Entry<List<String>> e : unique.entrySet()) {
+            if (e.getValue().size() > 1) {
+                LOGGER.warning(ServerMessages.NON_UNIQUE_DISPATCH_QNAME(e.getValue(), e.createQName()));
+            }
+        }
+
+        for( JavaMethodImpl m : model.getJavaMethods()) {
+            QName name = m.getRequestPayloadName();
+            if (name == null)
+                name = EMPTY_PAYLOAD;
+            // Set up method handlers only for unique QNames. So that dispatching
+            // happens consistently for a method
+            if (unique.get(name).size() == 1) {
+                methodHandlers.put(name, new EndpointMethodHandler(invokerTube,m,binding));
+            }
         }
     }
 
     /**
-     * {@link PayloadQNameBasedDispatcher} never returns null because this is always
-     * the last {@link EndpointMethodHandler} to kick in.
+     *
+     * @return not null if it finds a unique handler for the request
+     *         null otherwise
+     * @throws DispatchException if the payload itself is incorrect
      */
-    public @NotNull EndpointMethodHandler getEndpointMethodHandler(Packet request) throws DispatchException {
+    public @Nullable EndpointMethodHandler getEndpointMethodHandler(Packet request) throws DispatchException {
         Message message = request.getMessage();
         String localPart = message.getPayloadLocalPart();
         String nsUri;
@@ -77,18 +112,19 @@ final class PayloadQNameBasedDispatcher implements EndpointMethodDispatcher {
             nsUri = EMPTY_PAYLOAD_NSURI;
         } else {
             nsUri = message.getPayloadNamespaceURI();
+            if(nsUri == null)
+                nsUri = EMPTY_PAYLOAD_NSURI;
         }
+        EndpointMethodHandler mh = methodHandlers.get(nsUri, localPart);
 
-        EndpointMethodHandler h = methodHandlers.get(nsUri, localPart);
-
-        if (h==null) {
+        // Check if payload itself is correct. Usually it is, so let us check last
+        if (mh == null && !unique.containsKey(nsUri,localPart)) {
             String dispatchKey = "{" + nsUri + "}" + localPart;
-            String faultString = ServerMessages.DISPATCH_CANNOT_FIND_METHOD(dispatchKey, "Payload QName-based Dispatcher");
+            String faultString = ServerMessages.DISPATCH_CANNOT_FIND_METHOD(dispatchKey);
             throw new DispatchException(SOAPFaultBuilder.createSOAPFaultMessage(
-                binding.getSOAPVersion(), faultString, binding.getSOAPVersion().faultCodeClient));
+                 binding.getSOAPVersion(), faultString, binding.getSOAPVersion().faultCodeClient));
         }
-
-        return h;
+        return mh;
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java
index 1f3c132960b..88ead7075e1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java
@@ -34,8 +34,11 @@ import com.sun.xml.internal.ws.api.server.Invoker;
 import com.sun.xml.internal.ws.client.sei.MethodHandler;
 import com.sun.xml.internal.ws.model.AbstractSEIModelImpl;
 import com.sun.xml.internal.ws.server.InvokerTube;
+import com.sun.xml.internal.ws.resources.ServerMessages;
+import com.sun.xml.internal.ws.fault.SOAPFaultBuilder;
 
 import java.util.List;
+import java.text.MessageFormat;
 
 /**
  * This pipe is used to invoke SEI based endpoints.
@@ -68,24 +71,26 @@ public class SEIInvokerTube extends InvokerTube {
      * that traverses through the Pipeline to transport.
      */
     public @NotNull NextAction processRequest(@NotNull Packet req) {
-        Packet res = null;
-
-        try {
-            for (EndpointMethodDispatcher dispatcher : dispatcherList) {
-                EndpointMethodHandler handler = dispatcher.getEndpointMethodHandler(req);
-                if (handler != null) {
-                    res = handler.invoke(req);
-                    break;
-                }
+        for (EndpointMethodDispatcher dispatcher : dispatcherList) {
+            EndpointMethodHandler handler;
+            try {
+                handler = dispatcher.getEndpointMethodHandler(req);
+            } catch(DispatchException e) {
+                return doReturnWith(req.createServerResponse(e.fault, model.getPort(), null, binding));
+            }
+            if (handler != null) {
+                Packet res = handler.invoke(req);
+                assert res!=null;
+                return doReturnWith(res);
             }
-        } catch (DispatchException e) {
-            return doReturnWith(req.createServerResponse(e.fault, model.getPort(), null, binding));
         }
-
-        // PayloadQNameBasedDispatcher should throw DispatchException
-        assert res!=null;
-
-        return doReturnWith(res);
+        String err = MessageFormat.format("Request=[SOAPAction={0},Payload='{'{1}'}'{2}]",
+                req.soapAction,req.getMessage().getPayloadNamespaceURI(),
+                req.getMessage().getPayloadLocalPart());
+        String faultString = ServerMessages.DISPATCH_CANNOT_FIND_METHOD(err);
+        Message faultMsg = SOAPFaultBuilder.createSOAPFaultMessage(
+            binding.getSOAPVersion(), faultString, binding.getSOAPVersion().faultCodeClient);
+        return doReturnWith(req.createServerResponse(faultMsg, model.getPort(), null, binding));
     }
 
     public @NotNull NextAction processResponse(@NotNull Packet response) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java
new file mode 100644
index 00000000000..bd8398dbfc7
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.server.sei;
+
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.model.AbstractSEIModelImpl;
+import com.sun.xml.internal.ws.model.JavaMethodImpl;
+
+import javax.xml.namespace.QName;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * An {@link EndpointMethodDispatcher} that uses SOAPAction as the key for dispatching.
+ * <p/>
+ * A map of all SOAPAction on the port and the corresponding {@link EndpointMethodHandler}
+ * is initialized in the constructor. The SOAPAction from the
+ * request {@link Packet} is used as the key to return the correct handler.
+ *
+ * @author Jitendra Kotamraju
+ */
+final class SOAPActionBasedDispatcher implements EndpointMethodDispatcher {
+    private final Map<String, EndpointMethodHandler> methodHandlers;
+
+    public SOAPActionBasedDispatcher(AbstractSEIModelImpl model, WSBinding binding, SEIInvokerTube invokerTube) {
+        // Find if any SOAPAction repeat for operations
+        Map<String, Integer> unique = new HashMap<String, Integer>();
+        for(JavaMethodImpl m : model.getJavaMethods()) {
+            String soapAction = m.getOperation().getSOAPAction();
+            Integer count = unique.get(soapAction);
+            if (count == null) {
+                unique.put(soapAction, 1);
+            } else {
+                unique.put(soapAction, ++count);
+            }
+        }
+        methodHandlers = new HashMap<String, EndpointMethodHandler>();
+        for( JavaMethodImpl m : model.getJavaMethods() ) {
+            String soapAction = m.getOperation().getSOAPAction();
+            // Set up method handlers only for unique SOAPAction values so
+            // that dispatching happens consistently for a method
+            if (unique.get(soapAction) == 1) {
+                methodHandlers.put('"'+soapAction+'"', new EndpointMethodHandler(invokerTube,m,binding));
+            }
+        }
+    }
+
+    public @Nullable EndpointMethodHandler getEndpointMethodHandler(Packet request) {
+        return request.soapAction == null ? null : methodHandlers.get(request.soapAction);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java
index 673a0b7da00..f266344916e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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
@@ -27,12 +27,15 @@ package com.sun.xml.internal.ws.spi;
 
 import com.sun.xml.internal.ws.api.BindingID;
 import com.sun.xml.internal.ws.api.WSService;
-import com.sun.xml.internal.ws.api.server.*;
-import com.sun.xml.internal.ws.api.server.Container;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
 import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLService;
+import com.sun.xml.internal.ws.api.server.BoundEndpoint;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.api.server.ContainerResolver;
+import com.sun.xml.internal.ws.api.server.Module;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
 import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
 import com.sun.xml.internal.ws.client.WSServiceDelegate;
 import com.sun.xml.internal.ws.developer.MemberSubmissionEndpointReference;
@@ -51,7 +54,11 @@ import javax.xml.bind.Unmarshaller;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.*;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
 import javax.xml.ws.spi.Provider;
 import javax.xml.ws.spi.ServiceDelegate;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -131,12 +138,12 @@ public class ProviderImpl extends Provider {
     }
 
     public W3CEndpointReference createW3CEndpointReference(String address, QName serviceName, QName portName, List<Element> metadata, String wsdlDocumentLocation, List<Element> referenceParameters) {
+        Container container = ContainerResolver.getInstance().getContainer();
         if (address == null) {
             if (serviceName == null || portName == null) {
                 throw new IllegalStateException(ProviderApiMessages.NULL_ADDRESS_SERVICE_ENDPOINT());
             } else {
                 //check if it is run in a Java EE Container and if so, get address using serviceName and portName
-                Container container = ContainerResolver.getInstance().getContainer();
                 Module module = container.getSPI(Module.class);
                 if (module != null) {
                     List<BoundEndpoint> beList = module.getBoundEndpoints();
@@ -168,7 +175,7 @@ public class ProviderImpl extends Provider {
 
                 URL wsdlLoc = new URL(wsdlDocumentLocation);
                 WSDLModelImpl wsdlDoc = RuntimeWSDLParser.parse(wsdlLoc, new StreamSource(wsdlLoc.toExternalForm()), er,
-                        false, ServiceFinder.find(WSDLParserExtension.class).toArray());
+                        false, container, ServiceFinder.find(WSDLParserExtension.class).toArray());
                 if (serviceName != null) {
                     WSDLService wsdlService = wsdlDoc.getService(serviceName);
                     if (wsdlService == null)
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java
index 7ba9542800a..74df36a60bc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java
@@ -114,12 +114,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
      */
     private int depth = 0;
 
-    /**
-     * Flag indicating if {@link #_namedNodeMap} is already split into
-     * {@link #_currentAttributes} and {@link Scope#currentNamespaces}.
-     */
-    boolean _needAttributesSplit;
-
     /**
      * State of this reader. Any of the valid states defined in StAX'
      * XMLStreamConstants class.
@@ -254,9 +248,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
      * to attributes-proper and namespace decls.
      */
     private void splitAttributes() {
-        if (!_needAttributesSplit) return;
-        _needAttributesSplit = false;
-
         // Clear attribute and namespace lists
         _currentAttributes.clear();
 
@@ -281,7 +272,8 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
         ensureNs(_current);
         for( int i=_currentAttributes.size()-1; i>=0; i-- ) {
             Attr a = _currentAttributes.get(i);
-            ensureNs(a);
+            if(fixNull(a.getNamespaceURI()).length()>0)
+                ensureNs(a);    // no need to declare "" for attributes in the default namespace
         }
     }
 
@@ -312,8 +304,10 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
                 return; // declared correctly
         }
 
-        // needs to be declared
+        if(prefix.equals("xml") || prefix.equals("xmlns"))
+            return; // implicitly declared namespaces
 
+        // needs to be declared
         scope.additionalNamespaces.add(prefix);
         scope.additionalNamespaces.add(uri);
     }
@@ -322,7 +316,7 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
      * Allocate new {@link Scope} for {@link #splitAttributes()}.
      */
     private Scope allocateScope() {
-        if(scopes.length==depth) {
+        if(scopes.length==++depth) {
             Scope[] newBuf = new Scope[scopes.length*2];
             System.arraycopy(scopes,0,newBuf,0,scopes.length);
             scopes = newBuf;
@@ -337,10 +331,8 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
     }
 
     public int getAttributeCount() {
-        if (_state == START_ELEMENT) {
-            splitAttributes();
+        if (_state == START_ELEMENT)
             return _currentAttributes.size();
-        }
         throw new IllegalStateException("DOMStreamReader: getAttributeCount() called in illegal state");
     }
 
@@ -349,8 +341,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
      */
     public String getAttributeLocalName(int index) {
         if (_state == START_ELEMENT) {
-            splitAttributes();
-
             String localName = _currentAttributes.get(index).getLocalName();
             return (localName != null) ? localName :
                 QName.valueOf(_currentAttributes.get(index).getNodeName()).getLocalPart();
@@ -363,8 +353,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
      */
     public QName getAttributeName(int index) {
         if (_state == START_ELEMENT) {
-            splitAttributes();
-
             Node attr = _currentAttributes.get(index);
             String localName = attr.getLocalName();
             if (localName != null) {
@@ -381,7 +369,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
 
     public String getAttributeNamespace(int index) {
         if (_state == START_ELEMENT) {
-            splitAttributes();
             String uri = _currentAttributes.get(index).getNamespaceURI();
             return fixNull(uri);
         }
@@ -390,7 +377,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
 
     public String getAttributePrefix(int index) {
         if (_state == START_ELEMENT) {
-            splitAttributes();
             String prefix = _currentAttributes.get(index).getPrefix();
             return fixNull(prefix);
         }
@@ -406,7 +392,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
 
     public String getAttributeValue(int index) {
         if (_state == START_ELEMENT) {
-            splitAttributes();
             return _currentAttributes.get(index).getNodeValue();
         }
         throw new IllegalStateException("DOMStreamReader: getAttributeValue() called in illegal state");
@@ -414,7 +399,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
 
     public String getAttributeValue(String namespaceURI, String localName) {
         if (_state == START_ELEMENT) {
-            splitAttributes();
             if (_namedNodeMap != null) {
                 Node attr = _namedNodeMap.getNamedItemNS(namespaceURI, localName);
                 return attr != null ? attr.getNodeValue() : null;
@@ -489,7 +473,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
      */
     private Scope getCheckedScope() {
         if (_state == START_ELEMENT || _state == END_ELEMENT) {
-            splitAttributes();
             return scopes[depth];
         }
         throw new IllegalStateException("DOMStreamReader: neither on START_ELEMENT nor END_ELEMENT");
@@ -532,7 +515,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
         }
 
         // check scopes
-        splitAttributes();
         String nsUri = scopes[depth].getNamespaceURI(prefix);
         if(nsUri!=null)    return nsUri;
 
@@ -562,7 +544,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
         }
 
         // check scopes
-        splitAttributes();
         String prefix = scopes[depth].getPrefix(nsUri);
         if(prefix!=null)    return prefix;
 
@@ -754,27 +735,30 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
     public int next() throws XMLStreamException {
         while(true) {
             int r = _next();
-            if(r!=CHARACTERS)   return r;
+            switch (r) {
+            case CHARACTERS:
+                // if we are currently at text node, make sure that this is a meaningful text node.
+                Node prev = _current.getPreviousSibling();
+                if(prev!=null && prev.getNodeType()==Node.TEXT_NODE)
+                    continue;   // nope. this is just a continuation of previous text that should be invisible
 
-            // if we are currently at text node, make sure that this is a meaningful text node.
-            Node prev = _current.getPreviousSibling();
-            if(prev!=null && prev.getNodeType()==Node.TEXT_NODE)
-                continue;   // nope. this is just a continuation of previous text that should be invisible
-
-            Text t = (Text)_current;
-            wholeText = t.getWholeText();
-            if(wholeText.length()==0)
-                continue;   // nope. this is empty text.
-            return CHARACTERS;
+                Text t = (Text)_current;
+                wholeText = t.getWholeText();
+                if(wholeText.length()==0)
+                    continue;   // nope. this is empty text.
+                return CHARACTERS;
+            case START_ELEMENT:
+                splitAttributes();
+                return START_ELEMENT;
+            default:
+                return r;
+            }
         }
     }
 
     private int _next() throws XMLStreamException {
         Node child;
 
-        // Indicate that attributes still need processing
-        _needAttributesSplit = true;
-
         switch (_state) {
             case END_DOCUMENT:
                 throw new IllegalStateException("DOMStreamReader: Calling next() at END_DOCUMENT");
@@ -793,8 +777,6 @@ public final class DOMStreamReader implements XMLStreamReader, NamespaceContext
                     return (_state = mapNodeTypeToState(_current.getNodeType()));
                 }
             case START_ELEMENT:
-                depth++;
-
                 child = _current.getFirstChild();
                 if (child == null) {
                     return (_state = END_ELEMENT);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java
new file mode 100644
index 00000000000..9f62e3b2fbc
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.streaming;
+
+import com.sun.xml.internal.ws.message.jaxb.JAXBMessage;
+import com.sun.xml.internal.ws.encoding.MtomCodec;
+
+import javax.xml.bind.attachment.AttachmentMarshaller;
+import javax.xml.stream.XMLStreamWriter;
+
+/**
+ * A {@link XMLStreamWriter} that used for MTOM encoding may provide its own
+ * {@link AttachmentMarshaller}. The marshaller could do processing based on
+ * MTOM threshold, and make decisions about inlining the attachment data or not.
+ *
+ * @author Jitendra Kotamraju
+ * @see JAXBMessage
+ * @see MtomCodec
+ */
+public interface MtomStreamWriter {
+    AttachmentMarshaller getAttachmentMarshaller();
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java
deleted file mode 100644
index 4cdd3ac9b53..00000000000
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.xml.internal.ws.streaming;
-
-import org.xml.sax.helpers.XMLReaderFactory;
-
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-/**
- * <p> XMLReader provides a high-level streaming parser interface
- * for reading XML documents. </p>
- *
- * <p> The {@link #next} method is used to read events from the XML document. </p>
- *
- * <p> Each time it is called, {@link #next} returns the new state of the reader. </p>
- *
- * <p> Possible states are: BOF, the initial state, START, denoting the start
- * tag of an element, END, denoting the end tag of an element, CHARS, denoting
- * the character content of an element, PI, denoting a processing instruction,
- * EOF, denoting the end of the document. </p>
- *
- * <p> Depending on the state the reader is in, one or more of the following
- * query methods will be meaningful: {@link #getName}, {@link #getURI},
- * {@link #getLocalName}, {@link #getAttributes}, {@link #getValue}. </p>
- *
- * <p> Elements visited by a XMLReader are tagged with unique IDs. The ID of the
- * current element can be found by calling {@link #getElementId}. </p>
- *
- * <p> A XMLReader is always namespace-aware, and keeps track of the namespace
- * declarations which are in scope at any time during streaming. The
- * {@link #getURI(java.lang.String)} method can be used to find the URI
- * associated to a given prefix in the current scope. </p>
- *
- * <p> XMLReaders can be created using a {@link XMLReaderFactory}. </p>
- *
- * <p> Some utility methods, {@link #nextContent} and {@link #nextElementContent}
- * make it possible to ignore whitespace and processing instructions with
- * minimum impact on the client code. </p>
- *
- * <p> Similarly, the {@link #skipElement} and {@link #skipElement(int elementId)}
- * methods allow to skip to the end tag of an element ignoring all its content. </p>
- *
- * <p> Finally, the {@link #recordElement} method can be invoked when the XMLReader
- * is positioned on the start tag of an element to record the element's contents
- * so that they can be played back later. </p>
- *
- * @see XMLReaderFactory
- *
- * @author WS Development Team
- */
-public interface XMLReader {
-    /**
-     * The initial state of a XMLReader.
-     */
-    public static final int BOF = 0;
-
-    /**
-     * The state denoting the start tag of an element.
-     */
-    public static final int START = 1;
-
-    /**
-     * The state denoting the end tag of an element.
-     */
-    public static final int END = 2;
-
-    /**
-     * The state denoting the character content of an element.
-     */
-    public static final int CHARS = 3;
-
-    /**
-     * The state denoting a processing instruction.
-     */
-    public static final int PI = 4;
-
-    /**
-     * The state denoting that the end of the document has been reached.
-     */
-    public static final int EOF = 5;
-
-    /**
-     * Return the next state of the XMLReader.
-     *
-     * The return value is one of: START, END, CHARS, PI, EOF.
-     */
-    public int next();
-
-    /*
-    * Return the next state of the XMLReader.
-    *
-    * <p> Whitespace character content and processing instructions are ignored. </p>
-    *
-    * <p> The return value is one of: START, END, CHARS, EOF. </p>
-    */
-    public int nextContent();
-
-    /**
-     * Return the next state of the XMLReader.
-     *
-     * <p> Whitespace character content, processing instructions are ignored.
-     * Non-whitespace character content triggers an exception. </p>
-     *
-     * <p> The return value is one of: START, END, EOF. </p>
-     */
-    public int nextElementContent();
-
-    /**
-     * Return the current state of the XMLReader.
-     *
-     */
-    public int getState();
-
-    /**
-     * Return the current qualified name.
-     *
-     * <p> Meaningful only when the state is one of: START, END. </p>
-     */
-    public QName getName();
-
-    /**
-     * Return the current URI.
-     *
-     * <p> Meaningful only when the state is one of: START, END. </p>
-     */
-    public String getURI();
-
-    /**
-     * Return the current local name.
-     *
-     * <p> Meaningful only when the state is one of: START, END, PI. </p>
-     */
-    public String getLocalName();
-
-    /**
-     * Return the current attribute list. In the jaxws implementation,
-     * this list also includes namespace declarations.
-     *
-     * <p> Meaningful only when the state is one of: START. </p>
-     *
-     * <p> The returned {@link Attributes} object belong to the XMLReader and is
-     * only guaranteed to be valid until the {@link #next} method is called,
-     * directly or indirectly.</p>
-     */
-    public Attributes getAttributes();
-
-    /**
-     * Return the current value.
-     *
-     * <p> Meaningful only when the state is one of: CHARS, PI. </p>
-     */
-    public String getValue();
-
-    /**
-     * Return the current element ID.
-     */
-    public int getElementId();
-
-    /**
-     * Return the current line number.
-     *
-     * <p> Due to aggressive parsing, this value may be off by a few lines. </p>
-     */
-    public int getLineNumber();
-
-    /**
-     * Return the URI for the given prefix.
-     *
-     * <p> If there is no namespace declaration in scope for the given
-     * prefix, return null. </p>
-     */
-    public String getURI(String prefix);
-
-    /**
-     * Return an iterator on all prefixes in scope, except for the default prefix.
-     *
-     */
-    public Iterator getPrefixes();
-
-    /**
-     * Records the current element and leaves the reader positioned on its end tag.
-     *
-     * <p> The XMLReader must be positioned on the start tag of the element.
-     * The returned reader will play back all events starting with the
-     * start tag of the element and ending with its end tag. </p>
-     */
-    public XMLReader recordElement();
-
-    /**
-     * Skip all nodes up to the end tag of the element with the current element ID.
-     */
-    public void skipElement();
-
-    /**
-     * Skip all nodes up to the end tag of the element with the given element ID.
-     */
-    public void skipElement(int elementId);
-
-    /**
-     * Close the XMLReader.
-     *
-     * <p> All subsequent calls to {@link #next} will return EOF. </p>
-     */
-    public void close();
-}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java
index e077dda7123..02ea254582c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java
@@ -32,7 +32,6 @@ import com.sun.xml.internal.ws.util.localization.Localizable;
  * <p> XMLReaderException represents an exception that occurred while reading an
  * XML document. </p>
  *
- * @see XMLReader
  * @see JAXWSExceptionBase
  *
  * @author WS Development Team
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java
index cf778857cd3..d0b6e5a8b3a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java
@@ -29,6 +29,7 @@ import javax.xml.namespace.QName;
 import static javax.xml.stream.XMLStreamConstants.*;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
 
 /**
  * <p> XMLStreamReaderUtil provides some utility methods intended to be used
@@ -49,6 +50,16 @@ public class XMLStreamReaderUtil {
         }
     }
 
+    public static void readRest(XMLStreamReader reader) {
+        try {
+            while(reader.getEventType() != XMLStreamConstants.END_DOCUMENT) {
+                reader.next();
+            }
+        } catch (XMLStreamException e) {
+            throw wrapException(e);
+        }
+    }
+
     public static int next(XMLStreamReader reader) {
         try {
             int readerEvent = reader.next();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java
index 34524a22806..f992311d246 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java
@@ -53,27 +53,38 @@ public class XMLStreamWriterUtil {
      * @throws XMLStreamException if any of writer operations throw the exception
      */
     public static @Nullable OutputStream getOutputStream(XMLStreamWriter writer) throws XMLStreamException {
-        // SJSXP
+        Object obj = null;
+
+        // Hack for JDK6's SJSXP
         if (writer instanceof Map) {
-            Object obj = ((Map) writer).get("sjsxp-outputstream");
-            if (obj != null) {
-                writer.writeCharacters("");  // Force completion of open elems
-                return (OutputStream)obj;
+            obj = ((Map) writer).get("sjsxp-outputstream");
+        }
+
+        // woodstox
+        if (obj == null) {
+            try {
+                obj = writer.getProperty("com.ctc.wstx.outputUnderlyingStream");
+            } catch(Exception ie) {
+                // Catch all exceptions. SJSXP in JDK throws NPE
+                // nothing to do here
             }
         }
-        // woodstox
-        try {
-            Object obj = writer.getProperty("com.ctc.wstx.outputUnderlyingStream");
-            if (obj != null) {
-                writer.writeCharacters("");  // Force completion of open elems
-                writer.flush();
-                return (OutputStream)obj;
-            }
-        } catch(Exception ie) {
-            //Above property lookup causes NPE on JDK6u1, should be ignored.
-            // We should not fail due to such lookups.
 
-            // nothing to do here
+        // SJSXP
+        if (obj == null) {
+            try {
+                obj = writer.getProperty("http://java.sun.com/xml/stream/properties/outputstream");
+            } catch(Exception ie) {
+                // Catch all exceptions. SJSXP in JDK throws NPE
+                // nothing to do here
+            }
+        }
+
+
+        if (obj != null) {
+            writer.writeCharacters("");  // Force completion of open elems
+            writer.flush();
+            return (OutputStream)obj;
         }
         return null;
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/Headers.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/Headers.java
index d7e9ae9a996..7eda6df7682 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/Headers.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/Headers.java
@@ -208,4 +208,9 @@ public class Headers implements Map<String,List<String>> {
     public int hashCode() {
         return map.hashCode();
     }
+
+    @Override
+    public String toString() {
+        return map.toString();
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java
index 7999e77169a..a998935e3e3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java
@@ -28,8 +28,8 @@ package com.sun.xml.internal.ws.transport.http;
 import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.ws.api.BindingID;
 import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.server.Container;
-import com.sun.xml.internal.ws.api.server.InstanceResolver;
 import com.sun.xml.internal.ws.api.server.SDDocumentSource;
 import com.sun.xml.internal.ws.api.server.WSEndpoint;
 import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
@@ -74,7 +74,7 @@ import java.util.logging.Logger;
  * Parses {@code sun-jaxws.xml} into {@link WSEndpoint}.
  *
  * <p>
- * Since {@code sun-jaxws.xml} captures more information that what {@link WSEndpoint}
+ * Since {@code sun-jaxws.xml} captures more information than what {@link WSEndpoint}
  * represents (in particular URL pattern and name), this class
  * takes a parameterization 'A' so that the user of this parser can choose to
  * create another type that wraps {@link WSEndpoint}.
@@ -171,6 +171,8 @@ public class DeploymentDescriptorParser<A> {
         if (paths != null) {
             for (String path : paths) {
                 if (path.endsWith("/")) {
+                    if(path.endsWith("/CVS/") || path.endsWith("/.svn/"))
+                        continue;
                     collectDocs(path);
                 } else {
                     URL res = loader.getResource(path);
@@ -239,7 +241,7 @@ public class DeploymentDescriptorParser<A> {
             ensureNoContent(reader);
             WSEndpoint<?> endpoint = WSEndpoint.create(
                     implementorClass, !handlersSetInDD,
-                    InstanceResolver.createDefault(implementorClass).createInvoker(),
+                    null,
                     serviceName, portName, container, binding,
                     primaryWSDL, docs.values(), createEntityResolver(),false
             );
@@ -520,6 +522,7 @@ public class DeploymentDescriptorParser<A> {
         }
     }
 
+
     /**
      * Loads the class of the given name.
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java
index 8d0250cd70f..590ddb02956 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java
@@ -36,7 +36,10 @@ import com.sun.xml.internal.ws.api.pipe.Codec;
 import com.sun.xml.internal.ws.api.pipe.ContentType;
 import com.sun.xml.internal.ws.api.server.AbstractServerAsyncTransport;
 import com.sun.xml.internal.ws.api.server.Adapter;
+import com.sun.xml.internal.ws.api.server.BoundEndpoint;
 import com.sun.xml.internal.ws.api.server.DocumentAddressResolver;
+import com.sun.xml.internal.ws.api.server.EndpointComponent;
+import com.sun.xml.internal.ws.api.server.Module;
 import com.sun.xml.internal.ws.api.server.PortAddressResolver;
 import com.sun.xml.internal.ws.api.server.SDDocument;
 import com.sun.xml.internal.ws.api.server.ServiceDefinition;
@@ -48,7 +51,9 @@ import com.sun.xml.internal.ws.server.ServerRtException;
 import com.sun.xml.internal.ws.server.UnsupportedMediaException;
 import com.sun.xml.internal.ws.util.ByteArrayBuffer;
 
+import javax.xml.ws.Binding;
 import javax.xml.ws.WebServiceException;
+import javax.xml.ws.http.HTTPBinding;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -92,6 +97,12 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
 
     public final HttpAdapterList<? extends HttpAdapter> owner;
 
+    /**
+     * Servlet URL pattern with which this {@link HttpAdapter} is associated.
+     */
+    public final String urlPattern;
+
+
     /**
      * Creates a lone {@link HttpAdapter} that does not know of any other
      * {@link HttpAdapter}s.
@@ -106,9 +117,18 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
         return new DummyList().createAdapter("","",endpoint);
     }
 
+    /**
+     * @deprecated
+     *      remove as soon as we can update the test util.
+     */
     protected HttpAdapter(WSEndpoint endpoint, HttpAdapterList<? extends HttpAdapter> owner) {
+        this(endpoint,owner,null);
+    }
+
+    protected HttpAdapter(WSEndpoint endpoint, HttpAdapterList<? extends HttpAdapter> owner, String urlPattern) {
         super(endpoint);
         this.owner = owner;
+        this.urlPattern = urlPattern;
 
         // fill in WSDL map
         ServiceDefinition sdef = this.endpoint.getServiceDefinition();
@@ -150,6 +170,18 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
         }
     }
 
+    /**
+     * Returns the "/abc/def/ghi" portion if
+     * the URL pattern is "/abc/def/ghi/*".
+     */
+    public String getValidPath() {
+        if (urlPattern.endsWith("/*")) {
+            return urlPattern.substring(0, urlPattern.length() - 2);
+        } else {
+            return urlPattern;
+        }
+    }
+
     protected HttpToolkit createToolkit() {
         return new HttpToolkit();
     }
@@ -173,6 +205,29 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
      * @throws IOException when I/O errors happen
      */
     public void handle(@NotNull WSHTTPConnection connection) throws IOException {
+        if(connection.getRequestMethod().equals("GET")) {
+            // metadata query. let the interceptor run
+            for( EndpointComponent c : endpoint.getComponentRegistry() ) {
+                HttpMetadataPublisher spi = c.getSPI(HttpMetadataPublisher.class);
+                if(spi!=null && spi.handleMetadataRequest(this,connection))
+                    return; // handled
+            }
+
+            if (isMetadataQuery(connection.getQueryString())) {
+                // Sends published WSDL and schema documents as the default action.
+                publishWSDL(connection);
+                return;
+            }
+
+            Binding binding = getEndpoint().getBinding();
+            if (!(binding instanceof HTTPBinding)) {
+                // Writes HTML page with all the endpoint descriptions
+                writeWebServicesHtmlPage(connection);
+                return;
+            }
+        }
+
+        // normal request handling
         HttpToolkit tk = pool.take();
         try {
             tk.handle(connection);
@@ -194,7 +249,7 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
         String ct = con.getRequestHeader("Content-Type");
         InputStream in = con.getInput();
         Packet packet = new Packet();
-        packet.soapAction = con.getRequestHeader("SOAPAction");
+        packet.soapAction = fixQuotesAroundSoapAction(con.getRequestHeader("SOAPAction"));
         packet.wasTransportSecure = con.isSecure();
         packet.acceptableMimeTypes = con.getRequestHeader("Accept");
         packet.addSatellite(con);
@@ -204,6 +259,7 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
         if (dump) {
             ByteArrayBuffer buf = new ByteArrayBuffer();
             buf.write(in);
+            in.close();
             dump(buf, "HTTP request", con.getRequestHeaders());
             in = buf.newInputStream();
         }
@@ -211,7 +267,25 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
         return packet;
     }
 
-
+    /**
+     * Some stacks may send non WS-I BP 1.2 conformant SoapAction.
+     * Make sure SOAPAction is quoted as {@link Packet#soapAction} expectsa quoted soapAction value.
+     *
+     * @param soapAction SoapAction HTTP Header
+     * @return
+     */
+    private String fixQuotesAroundSoapAction(String soapAction) {
+        if(soapAction != null && (!soapAction.startsWith("\"") || !soapAction.endsWith("\"")) ) {
+            LOGGER.warning("Received WS-I BP non-conformant Unquoted SoapAction HTTP header: "+ soapAction);
+            String fixedSoapAction = soapAction;
+            if(!soapAction.startsWith("\""))
+                fixedSoapAction = "\"" + fixedSoapAction;
+            if(!soapAction.endsWith("\""))
+                fixedSoapAction = fixedSoapAction + "\"";
+            return fixedSoapAction;
+        }
+        return soapAction;
+    }
 
 
     private void encodePacket(@NotNull Packet packet, @NotNull WSHTTPConnection con, @NotNull Codec codec) throws IOException {
@@ -347,7 +421,12 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
         public void close() {
             if(!con.isClosed()) {
                 // close the response channel now
-                con.setStatus(WSHTTPConnection.ONEWAY);
+                if (con.getStatus() == 0) {
+                    // if the appliation didn't set the status code,
+                    // set the default one.
+                    con.setStatus(WSHTTPConnection.ONEWAY);
+                }
+
                 try {
                     con.getOutput().close(); // no payload
                 } catch (IOException e) {
@@ -360,20 +439,23 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
 
     final class HttpToolkit extends Adapter.Toolkit {
         public void handle(WSHTTPConnection con) throws IOException {
+            boolean invoke = false;
             try {
                 Packet packet = new Packet();
                 try {
                     packet = decodePacket(con, codec);
+                    invoke = true;
                 } catch(ExceptionHasMessage e) {
                     LOGGER.log(Level.SEVERE, e.getMessage(), e);
                     packet.setMessage(e.getFaultMessage());
                 } catch(UnsupportedMediaException e) {
                     LOGGER.log(Level.SEVERE, e.getMessage(), e);
                     con.setStatus(WSHTTPConnection.UNSUPPORTED_MEDIA);
-                } catch(ServerRtException e) {
+                } catch(Exception e) {
                     LOGGER.log(Level.SEVERE, e.getMessage(), e);
+                    con.setStatus(HttpURLConnection.HTTP_INTERNAL_ERROR);
                 }
-                if (packet.getMessage() != null && !packet.getMessage().isFault()) {
+                if (invoke) {
                     try {
                         packet = head.process(packet, con.getWebServiceContextDelegate(),
                                 packet.transportBackChannel);
@@ -403,7 +485,7 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
      * @return true for metadata requests
      *         false for web service requests
      */
-    public final boolean isMetadataQuery(String query) {
+    private boolean isMetadataQuery(String query) {
         // we intentionally return true even if documents don't exist,
         // so that they get 404.
         return query != null && (query.equals("WSDL") || query.startsWith("wsdl") || query.startsWith("xsd="));
@@ -414,35 +496,23 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
      * in response to the GET requests to URLs like "?wsdl" or "?xsd=2".
      *
      * @param con
-     *      The connection to which the data will be sent. Must not be null.
-     * @param baseAddress
-     *      The requested base URL (such as "http://myhost:2045/foo/bar").
-     *      Used to reference other resoures. Must not be null.
-     * @param queryString
-     *      The query string given by the client (which indicates
-     *      what document to serve.) Can be null (but it causes an 404 not found.)
+     *      The connection to which the data will be sent.
      *
      * @throws IOException when I/O errors happen
      */
-    public void publishWSDL(WSHTTPConnection con, final String baseAddress, String queryString) throws IOException {
-        // Workaround for a bug in http server. Read and close InputStream
-        // TODO remove once the bug is fixed in http server
-        InputStream in = con.getInput();
-        while(in.read() != -1);
-        in.close();
-
-        SDDocument doc = wsdls.get(queryString);
+    public void publishWSDL(@NotNull WSHTTPConnection con) throws IOException {
+        SDDocument doc = wsdls.get(con.getQueryString());
         if (doc == null) {
             writeNotFoundErrorPage(con,"Invalid Request");
             return;
         }
 
         con.setStatus(HttpURLConnection.HTTP_OK);
-        con.setContentTypeResponseHeader("text/xml;charset=utf-8");
+        con.setContentTypeResponseHeader("text/xml;charset=\"utf-8\"");
 
         OutputStream os = con.getProtocol().contains("1.1") ? con.getOutput() : new Http10OutputStream(con);
 
-        final PortAddressResolver portAddressResolver = owner.createPortAddressResolver(baseAddress);
+        final PortAddressResolver portAddressResolver = owner.createPortAddressResolver(con.getBaseAddress());
         final String address = portAddressResolver.getAddressFor(endpoint.getServiceName(), endpoint.getPortName().getLocalPart());
         assert address != null;
         DocumentAddressResolver resolver = new DocumentAddressResolver() {
@@ -480,7 +550,7 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
 
     private void writeNotFoundErrorPage(WSHTTPConnection con, String message) throws IOException {
         con.setStatus(HttpURLConnection.HTTP_NOT_FOUND);
-        con.setContentTypeResponseHeader("text/html; charset=UTF-8");
+        con.setContentTypeResponseHeader("text/html; charset=\"utf-8\"");
 
         PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutput(),"UTF-8"));
         out.println("<html>");
@@ -502,7 +572,7 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
     private static final class DummyList extends HttpAdapterList<HttpAdapter> {
         @Override
         protected HttpAdapter createHttpAdapter(String name, String urlPattern, WSEndpoint<?> endpoint) {
-            return new HttpAdapter(endpoint, this);
+            return new HttpAdapter(endpoint,this,urlPattern);
         }
     }
 
@@ -525,21 +595,96 @@ public class HttpAdapter extends Adapter<HttpAdapter.HttpToolkit> {
         System.out.println("--------------------");
     }
 
+    /**
+     * Generates the listing of all services.
+     */
+    private void writeWebServicesHtmlPage(WSHTTPConnection con) throws IOException {
+        if (!publishStatusPage) return;
+
+        // TODO: resurrect the ability to localize according to the current request.
+
+        // standard browsable page
+        con.setStatus(WSHTTPConnection.OK);
+        con.setContentTypeResponseHeader("text/html; charset=\"utf-8\"");
+
+        PrintWriter out = new PrintWriter(new OutputStreamWriter(con.getOutput(),"UTF-8"));
+        out.println("<html>");
+        out.println("<head><title>");
+        // out.println("Web Services");
+        out.println(WsservletMessages.SERVLET_HTML_TITLE());
+        out.println("</title></head>");
+        out.println("<body>");
+        // out.println("<h1>Web Services</h1>");
+        out.println(WsservletMessages.SERVLET_HTML_TITLE_2());
+
+        // what endpoints do we have in this system?
+        Module module = getEndpoint().getContainer().getSPI(Module.class);
+        List<BoundEndpoint> endpoints = Collections.emptyList();
+        if(module!=null) {
+            endpoints = module.getBoundEndpoints();
+        }
+
+        if (endpoints.isEmpty()) {
+            // out.println("<p>No JAX-WS context information available.</p>");
+            out.println(WsservletMessages.SERVLET_HTML_NO_INFO_AVAILABLE());
+        } else {
+            out.println("<table width='100%' border='1'>");
+            out.println("<tr>");
+            out.println("<td>");
+            // out.println("Endpoint");
+            out.println(WsservletMessages.SERVLET_HTML_COLUMN_HEADER_PORT_NAME());
+            out.println("</td>");
+
+            out.println("<td>");
+            // out.println("Information");
+            out.println(WsservletMessages.SERVLET_HTML_COLUMN_HEADER_INFORMATION());
+            out.println("</td>");
+            out.println("</tr>");
+
+            for (BoundEndpoint a : endpoints) {
+                String endpointAddress = a.getAddress(con.getBaseAddress()).toString();
+                out.println("<tr>");
+
+                out.println("<td>");
+                out.println(WsservletMessages.SERVLET_HTML_ENDPOINT_TABLE(
+                    a.getEndpoint().getServiceName(),
+                    a.getEndpoint().getPortName()
+                ));
+                out.println("</td>");
+
+                out.println("<td>");
+                out.println(WsservletMessages.SERVLET_HTML_INFORMATION_TABLE(
+                    endpointAddress,
+                    a.getEndpoint().getImplementationClass().getName()
+                ));
+                out.println("</td>");
+
+                out.println("</tr>");
+            }
+            out.println("</table>");
+        }
+        out.println("</body>");
+        out.println("</html>");
+        out.close();
+    }
+
     /**
      * Dumps what goes across HTTP transport.
      */
-    public static boolean dump;
+    public static boolean dump = false;
+
+    public static boolean publishStatusPage = true;
 
     static {
-        boolean b;
         try {
-            b = Boolean.getBoolean(HttpAdapter.class.getName()+".dump");
+            dump = Boolean.getBoolean(HttpAdapter.class.getName()+".dump");
+        } catch( Throwable t ) {
+        }
+        try {
+            publishStatusPage = System.getProperty(HttpAdapter.class.getName()+".publishStatusPage").equals("true");
         } catch( Throwable t ) {
-            b = false;
         }
-        dump = b;
     }
 
     private static final Logger LOGGER = Logger.getLogger(HttpAdapter.class.getName());
-
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDump.java
similarity index 77%
rename from jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java
rename to jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDump.java
index d1161ee0ed4..d200c368ec2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDump.java
@@ -23,22 +23,18 @@
  * have any questions.
  */
 
-package com.sun.xml.internal.ws.addressing.model;
-
-import javax.xml.ws.WebServiceException;
-import javax.xml.namespace.QName;
+package com.sun.xml.internal.ws.transport.http;
 
 /**
- * @author Arun Gupta
+ * @author Jitendra Kotamraju
+ *
  */
-public class MapRequiredException extends WebServiceException {
-    QName name;
-
-    public MapRequiredException(QName name) {
-        this.name = name;
+public class HttpDump implements HttpDumpMBean {
+    public void setDump(boolean dump) {
+        HttpAdapter.dump = dump;
     }
 
-    public QName getMapQName() {
-        return name;
+    public boolean getDump() {
+        return HttpAdapter.dump;
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java
new file mode 100644
index 00000000000..6b46a5ad969
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.transport.http;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+public interface HttpDumpMBean {
+
+    public void setDump(boolean dump);
+
+    public boolean getDump();
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java
new file mode 100644
index 00000000000..47f9e929307
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.transport.http;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.server.EndpointComponent;
+import com.sun.xml.internal.ws.api.server.WSEndpoint;
+
+import java.io.IOException;
+
+/**
+ * Intercepts GET HTTP requests to process the requests.
+ *
+ * <p>
+ * {@link HttpAdapter} looks for this SPI in {@link WSEndpoint#getComponentRegistry()}
+ * to allow components to expose additional information through HTTP.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see EndpointComponent#getSPI(Class)
+ * @since 2.1.2
+ */
+public abstract class HttpMetadataPublisher {
+    /**
+     * When {@link HttpAdapter} receives a GET request with a query string
+     * (which is a convention for metadata requests, such as '?wsdl' or '?xsd=...'),
+     * then this method is invoked to allow components to intercept the request.
+     *
+     * @param adapter
+     *      Adapter that accepted the connection.
+     * @param connection
+     *      Represents the current connection.
+     * @return
+     *      true if the request is processed. If false is returned the default processing kicks in.
+     */
+    public abstract boolean handleMetadataRequest(@NotNull HttpAdapter adapter, @NotNull WSHTTPConnection connection) throws IOException;
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
index 7989e0b6cc8..8cecfd321a8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java
@@ -213,6 +213,16 @@ public abstract class WSHTTPConnection extends PropertySet {
      */
     public abstract @Nullable String getPathInfo();
 
+    /**
+     * Gets the absolute URL up to the context path.
+     * @return
+     *      String like "http://myhost/myapp"
+     * @since 2.1.2
+     */
+    public @NotNull String getBaseAddress() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * Whether connection is HTTPS or not
      *
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java
index a7141defb91..d721dad67a3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java
@@ -33,6 +33,7 @@ import com.sun.xml.internal.ws.client.ClientTransportException;
 import com.sun.xml.internal.ws.resources.ClientMessages;
 import com.sun.xml.internal.ws.transport.Headers;
 import com.sun.xml.internal.ws.developer.JAXWSProperties;
+import com.sun.xml.internal.ws.util.RuntimeVersion;
 import com.sun.istack.internal.Nullable;
 import com.sun.istack.internal.NotNull;
 
@@ -47,6 +48,8 @@ import javax.xml.ws.BindingProvider;
 import static javax.xml.ws.BindingProvider.SESSION_MAINTAIN_PROPERTY;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.handler.MessageContext;
+import java.io.FilterInputStream;
+import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -72,22 +75,18 @@ final class HttpClientTransport {
             // Nothing much can be done. Intentionally left empty
         }
     }
-    private static String LAST_ENDPOINT = "";
-    private static boolean redirect = true;
-    private static final int START_REDIRECT_COUNT = 3;
-    private static int redirectCount = START_REDIRECT_COUNT;
 
     /*package*/ int statusCode;
+    /*package*/ String statusMessage;
     private final Map<String, List<String>> reqHeaders;
     private Map<String, List<String>> respHeaders = null;
 
     private OutputStream outputStream;
     private boolean https;
     private HttpURLConnection httpConnection = null;
-    private EndpointAddress endpoint = null;
-    private Packet context = null;
+    private final EndpointAddress endpoint;
+    private final Packet context;
     private CookieJar cookieJar = null;
-    private boolean isFailure = false;
     private final Integer chunkSize;
 
 
@@ -98,7 +97,7 @@ final class HttpClientTransport {
         chunkSize = (Integer)context.invocationProperties.get(JAXWSProperties.HTTP_CLIENT_STREAMING_CHUNK_SIZE);
     }
 
-    /**
+    /*
      * Prepare the stream for HTTP request
      */
     public OutputStream getOutput() {
@@ -133,32 +132,24 @@ final class HttpClientTransport {
         }
     }
 
-    /**
+    /*
      * Get the response from HTTP connection and prepare the input stream for response
      */
-    public InputStream getInput() {
+    public @Nullable InputStream getInput() {
         // response processing
 
         InputStream in;
         try {
+            saveCookieAsNeeded();
             in = readResponse();
-            String contentEncoding = httpConnection.getContentEncoding();
-            if (contentEncoding != null && contentEncoding.contains("gzip")) {
-                in = new GZIPInputStream(in);
-            }
-        } catch (IOException e) {
-            if (statusCode == HttpURLConnection.HTTP_NO_CONTENT
-                || (isFailure
-                && statusCode != HttpURLConnection.HTTP_INTERNAL_ERROR)) {
-                try {
-                    throw new ClientTransportException(ClientMessages.localizableHTTP_STATUS_CODE(
-                        statusCode, httpConnection.getResponseMessage()));
-                } catch (IOException ex) {
-                    throw new ClientTransportException(ClientMessages.localizableHTTP_STATUS_CODE(
-                        statusCode, ex));
+            if (in != null) {
+                String contentEncoding = httpConnection.getContentEncoding();
+                if (contentEncoding != null && contentEncoding.contains("gzip")) {
+                    in = new GZIPInputStream(in);
                 }
             }
-            throw new ClientTransportException(ClientMessages.localizableHTTP_CLIENT_FAILED(e),e);
+        } catch (IOException e) {
+            throw new ClientTransportException(ClientMessages.localizableHTTP_STATUS_CODE(statusCode, statusMessage), e);
         }
         return in;
     }
@@ -172,75 +163,43 @@ final class HttpClientTransport {
         return respHeaders;
     }
 
-    protected InputStream readResponse() throws IOException {
-        return (isFailure
-                ? httpConnection.getErrorStream()
-                : httpConnection.getInputStream());
-    }
-
-    /*
-     * Will throw an exception instead of returning 'false' if there is no
-     * return message to be processed (i.e., in the case of an UNAUTHORIZED
-     * response from the servlet or 404 not found)
-     */
-    /*package*/void checkResponseCode() {
+    protected @Nullable InputStream readResponse() {
+        InputStream is;
         try {
-
-            statusCode = httpConnection.getResponseCode();
-
-            if ((httpConnection.getResponseCode()
-                == HttpURLConnection.HTTP_INTERNAL_ERROR)) {
-                isFailure = true;
-                //added HTTP_ACCEPT for 1-way operations
-            } else if (
-                httpConnection.getResponseCode()
-                    == HttpURLConnection.HTTP_UNAUTHORIZED) {
-
-                // no soap message returned, so skip reading message and throw exception
-                throw new ClientTransportException(
-                    ClientMessages.localizableHTTP_CLIENT_UNAUTHORIZED(httpConnection.getResponseMessage()));
-            } else if (
-                httpConnection.getResponseCode()
-                    == HttpURLConnection.HTTP_NOT_FOUND) {
-
-                // no message returned, so skip reading message and throw exception
-                throw new ClientTransportException(
-                    ClientMessages.localizableHTTP_NOT_FOUND(httpConnection.getResponseMessage()));
-            } else if (
-                (statusCode == HttpURLConnection.HTTP_MOVED_TEMP) ||
-                    (statusCode == HttpURLConnection.HTTP_MOVED_PERM)) {
-                isFailure = true;
-
-                if (!redirect || (redirectCount <= 0)) {
-                    throw new ClientTransportException(
-                        ClientMessages.localizableHTTP_STATUS_CODE(statusCode,getStatusMessage()));
-                }
-            } else if (
-                statusCode < 200 || (statusCode >= 303 && statusCode < 500)) {
-                throw new ClientTransportException(
-                    ClientMessages.localizableHTTP_STATUS_CODE(statusCode,getStatusMessage()));
-            } else if (statusCode >= 500) {
-                isFailure = true;
-            }
-        } catch (IOException e) {
-            throw new WebServiceException(e);
+            is = httpConnection.getInputStream();
+        } catch(IOException ioe) {
+            is = httpConnection.getErrorStream();
         }
-        // Hack for now
-        saveCookieAsNeeded();
+        if (is == null) {
+            return is;
+        }
+        // Since StreamMessage doesn't read </s:Body></s:Envelope>, there
+        // are some bytes left in the InputStream. This confuses JDK and may
+        // not reuse underlying sockets. Hopefully JDK fixes it in its code !
+        final InputStream temp = is;
+        return new FilterInputStream(temp) {
+            // Workaround for "SJSXP XMLStreamReader.next() closes stream".
+            // So it doesn't read from the closed stream
+            boolean closed;
+            @Override
+            public void close() throws IOException {
+                if (!closed) {
+                    closed = true;
+                    byte[] buf = new byte[8192];
+                    while(temp.read(buf) != -1);
+                    super.close();
+                }
+            }
+        };
     }
 
-    private String getStatusMessage() throws IOException {
-        int statusCode = httpConnection.getResponseCode();
-        String message = httpConnection.getResponseMessage();
-        if (statusCode == HttpURLConnection.HTTP_CREATED
-            || (statusCode >= HttpURLConnection.HTTP_MULT_CHOICE
-            && statusCode != HttpURLConnection.HTTP_NOT_MODIFIED
-            && statusCode < HttpURLConnection.HTTP_BAD_REQUEST)) {
-            String location = httpConnection.getHeaderField("Location");
-            if (location != null)
-                message += " - Location: " + location;
+    protected void readResponseCodeAndMessage() {
+        try {
+            statusCode = httpConnection.getResponseCode();
+            statusMessage = httpConnection.getResponseMessage();
+        } catch(IOException ioe) {
+            throw new WebServiceException(ioe);
         }
-        return message;
     }
 
     protected void sendCookieAsNeeded() {
@@ -264,24 +223,16 @@ final class HttpClientTransport {
         }
     }
 
-
     private void createHttpConnection() throws IOException {
 
-        // does the client want request redirection to occur
-        String redirectProperty =
-            (String) context.invocationProperties.get(REDIRECT_REQUEST_PROPERTY);
-        if (redirectProperty != null) {
-            if (redirectProperty.equalsIgnoreCase("false"))
-                redirect = false;
-        }
-
-        checkEndpoints();
-
         httpConnection = (HttpURLConnection) endpoint.openConnection();
         if (httpConnection instanceof HttpsURLConnection) {
             https = true;
 
             boolean verification = false;
+            // TODO The above property needs to be removed in future version as the semantics of this property are not preoperly defined.
+            // One should use JAXWSProperties.HOSTNAME_VERIFIER to control the behavior
+
             // does the client want client hostname verification by the service
             String verificationProperty =
                 (String) context.invocationProperties.get(HOSTNAME_VERIFICATION_PROPERTY);
@@ -289,7 +240,8 @@ final class HttpClientTransport {
                 if (verificationProperty.equalsIgnoreCase("true"))
                     verification = true;
             }
-            if (!verification) {
+            // By default, JAX-WS should not disable any host verification.
+            if (verification) {
                 ((HttpsURLConnection) httpConnection).setHostnameVerifier(new HttpClientVerifier());
             }
 
@@ -338,6 +290,11 @@ final class HttpClientTransport {
             httpConnection.setReadTimeout(reqTimeout);
         }
 
+        Integer connectTimeout = (Integer)context.invocationProperties.get(JAXWSProperties.CONNECT_TIMEOUT);
+        if (connectTimeout != null) {
+            httpConnection.setConnectTimeout(connectTimeout);
+        }
+
         Integer chunkSize = (Integer)context.invocationProperties.get(JAXWSProperties.HTTP_CLIENT_STREAMING_CHUNK_SIZE);
         if (chunkSize != null) {
             httpConnection.setChunkedStreamingMode(chunkSize);
@@ -347,33 +304,13 @@ final class HttpClientTransport {
         for (Map.Entry<String, List<String>> entry : reqHeaders.entrySet()) {
             httpConnection.addRequestProperty(entry.getKey(), entry.getValue().get(0));
         }
+        httpConnection.addRequestProperty("User-Agent", RuntimeVersion.VERSION.toString());
     }
 
     public boolean isSecure() {
         return https;
     }
 
-    //    private void redirectRequest(HttpURLConnection httpConnection, SOAPMessageContext context) {
-//        String redirectEndpoint = httpConnection.getHeaderField("Location");
-//        if (redirectEndpoint != null) {
-//            httpConnection.disconnect();
-//            invoke(redirectEndpoint, context);
-//        } else
-//            System.out.println("redirection Failed");
-//    }
-
-    private boolean checkForRedirect(int statusCode) {
-        return (((statusCode == 301) || (statusCode == 302)) && redirect && (redirectCount-- > 0));
-    }
-
-    private void checkEndpoints() {
-        if (!LAST_ENDPOINT.equalsIgnoreCase(endpoint.toString())) {
-            redirectCount = START_REDIRECT_COUNT;
-            LAST_ENDPOINT = endpoint.toString();
-        }
-    }
-
-
     private void writeBasicAuthAsNeeded(Packet context, Map<String, List<String>> reqHeaders) {
         String user = (String) context.invocationProperties.get(BindingProvider.USERNAME_PROPERTY);
         if (user != null) {
@@ -412,48 +349,24 @@ final class HttpClientTransport {
      * is kept in memory. This wraps the ChunkedOuputStream so that it writes only small
      * chunks.
      */
-    private static final class WSChunkedOuputStream extends OutputStream {
-        final OutputStream actual;
+    private static final class WSChunkedOuputStream extends FilterOutputStream {
         final int chunkSize;
 
         WSChunkedOuputStream(OutputStream actual, int chunkSize) {
-            this.actual = actual;
+            super(actual);
             this.chunkSize = chunkSize;
         }
 
         @Override
         public void write(byte b[], int off, int len) throws IOException {
-            int sent = 0;
-            while(sent < len) {
-                int chunk = len-sent;
-                if (chunk > chunkSize) {
-                    chunk = chunkSize;
-                }
-                actual.write(b, off, chunk);
-                off += chunk;
-                sent += chunk;
+            while(len > 0) {
+                int sent = (len > chunkSize) ? chunkSize : len;
+                out.write(b, off, sent);        // don't use super.write() as it writes byte-by-byte
+                len -= sent;
+                off += sent;
             }
         }
 
-        @Override
-        public void write(byte b[]) throws IOException {
-            write(b, 0, b.length);
-        }
-
-        @Override
-        public void write(int b) throws IOException {
-            actual.write(b);
-        }
-
-        @Override
-        public void flush() throws IOException {
-            actual.flush();
-        }
-
-        @Override
-        public void close() throws IOException {
-            actual.close();
-        }
     }
 
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java
index 29d8e2918e9..64e3495fa80 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java
@@ -25,19 +25,19 @@
 package com.sun.xml.internal.ws.transport.http.client;
 
 import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.SOAPVersion;
+import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.message.Packet;
-import com.sun.xml.internal.ws.api.pipe.Codec;
-import com.sun.xml.internal.ws.api.pipe.ContentType;
-import com.sun.xml.internal.ws.api.pipe.NextAction;
-import com.sun.xml.internal.ws.api.pipe.Pipe;
-import com.sun.xml.internal.ws.api.pipe.Tube;
-import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.*;
 import com.sun.xml.internal.ws.api.pipe.helper.AbstractTubeImpl;
 import com.sun.xml.internal.ws.transport.http.WSHTTPConnection;
+import com.sun.xml.internal.ws.transport.Headers;
 import com.sun.xml.internal.ws.util.ByteArrayBuffer;
+import com.sun.xml.internal.ws.client.ClientTransportException;
+import com.sun.xml.internal.ws.resources.ClientMessages;
 
-import javax.xml.ws.BindingProvider;
 import javax.xml.ws.WebServiceException;
+import javax.xml.ws.soap.SOAPBinding;
 import javax.xml.ws.handler.MessageContext;
 import java.io.IOException;
 import java.io.InputStream;
@@ -47,25 +47,31 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.net.HttpURLConnection;
 
 /**
  * {@link Pipe} and {@link Tube} that sends a request to a remote HTTP server.
  *
+ * TODO: need to create separate HTTP transport pipes for binding. SOAP1.1, SOAP1.2,
+ * TODO: XML/HTTP differ in handling status codes.
+ *
  * @author Jitendra Kotamraju
  */
 public class HttpTransportPipe extends AbstractTubeImpl {
 
     private final Codec codec;
+    private final WSBinding binding;
 
-    public HttpTransportPipe(Codec codec) {
+    public HttpTransportPipe(Codec codec, WSBinding binding) {
         this.codec = codec;
+        this.binding = binding;
     }
 
     /**
      * Copy constructor for {@link Tube#copy(TubeCloner)}.
      */
     private HttpTransportPipe(HttpTransportPipe that, TubeCloner cloner) {
-        this( that.codec.copy() );
+        this( that.codec.copy(), that.binding);
         cloner.add(that,this);
     }
 
@@ -85,10 +91,11 @@ public class HttpTransportPipe extends AbstractTubeImpl {
         HttpClientTransport con;
         try {
             // get transport headers from message
-            Map<String, List<String>> reqHeaders = (Map<String, List<String>>) request.invocationProperties.get(MessageContext.HTTP_REQUEST_HEADERS);
-            //assign empty map if its null
-            if(reqHeaders == null){
-                reqHeaders = new HashMap<String, List<String>>();
+            Map<String, List<String>> reqHeaders = new Headers();
+            Map<String, List<String>> userHeaders = (Map<String, List<String>>) request.invocationProperties.get(MessageContext.HTTP_REQUEST_HEADERS);
+            if (userHeaders != null) {
+                // userHeaders may not be modifiable like SingletonMap, just copy them
+                reqHeaders.putAll(userHeaders);
             }
 
             con = new HttpClientTransport(request,reqHeaders);
@@ -105,7 +112,9 @@ public class HttpTransportPipe extends AbstractTubeImpl {
                 if (ct.getAcceptHeader() != null) {
                     reqHeaders.put("Accept", Collections.singletonList(ct.getAcceptHeader()));
                 }
-                writeSOAPAction(reqHeaders, ct.getSOAPActionHeader(),request);
+                if (binding instanceof SOAPBinding) {
+                    writeSOAPAction(reqHeaders, ct.getSOAPActionHeader(),request);
+                }
 
                 if(dump)
                     dump(buf, "HTTP request", reqHeaders);
@@ -117,12 +126,14 @@ public class HttpTransportPipe extends AbstractTubeImpl {
                 if (ct.getAcceptHeader() != null) {
                     reqHeaders.put("Accept", Collections.singletonList(ct.getAcceptHeader()));
                 }
-                writeSOAPAction(reqHeaders, ct.getSOAPActionHeader(), request);
+                if (binding instanceof SOAPBinding) {
+                    writeSOAPAction(reqHeaders, ct.getSOAPActionHeader(), request);
+                }
 
                 if(dump) {
                     ByteArrayBuffer buf = new ByteArrayBuffer();
                     codec.encode(request, buf);
-                    dump(buf, "HTTP request", reqHeaders);
+                    dump(buf, "HTTP request - "+request.endpointAddress, reqHeaders);
                     OutputStream out = con.getOutput();
                     if (out != null) {
                         buf.writeTo(out);
@@ -137,10 +148,25 @@ public class HttpTransportPipe extends AbstractTubeImpl {
 
             con.closeOutput();
 
-            con.checkResponseCode();
-            if (con.statusCode== WSHTTPConnection.ONEWAY) {
+            con.readResponseCodeAndMessage();   // throws IOE
+            InputStream response = con.getInput();
+            if(dump) {
+                ByteArrayBuffer buf = new ByteArrayBuffer();
+                if (response != null) {
+                    buf.write(response);
+                    response.close();
+                }
+                dump(buf,"HTTP response - "+request.endpointAddress+" - "+con.statusCode, con.getHeaders());
+                response = buf.newInputStream();
+            }
+
+            if (con.statusCode== WSHTTPConnection.ONEWAY || (request.expectReply != null && !request.expectReply)) {
+                checkStatusCodeOneway(response, con.statusCode, con.statusMessage);   // throws ClientTransportException
                 return request.createClientResponse(null);    // one way. no response given.
             }
+
+            checkStatusCode(response, con.statusCode, con.statusMessage); // throws ClientTransportException
+
             String contentType = con.getContentType();
             if (contentType == null) {
                 throw new WebServiceException("No Content-type in the header!");
@@ -151,13 +177,6 @@ public class HttpTransportPipe extends AbstractTubeImpl {
             Packet reply = request.createClientResponse(null);
             //reply.addSatellite(new HttpResponseProperties(con));
             reply.wasTransportSecure = con.isSecure();
-            InputStream response = con.getInput();
-            if(dump) {
-                ByteArrayBuffer buf = new ByteArrayBuffer();
-                buf.write(response);
-                dump(buf,"HTTP response "+con.statusCode, con.getHeaders());
-                response = buf.newInputStream();
-            }
             codec.decode(response, contentType, reply);
             return reply;
         } catch(WebServiceException wex) {
@@ -167,11 +186,36 @@ public class HttpTransportPipe extends AbstractTubeImpl {
         }
     }
 
+    private void checkStatusCode(InputStream in, int statusCode, String statusMessage) throws IOException {
+        // SOAP1.1 and SOAP1.2 differ here
+        if (binding instanceof SOAPBinding) {
+            if (statusCode != HttpURLConnection.HTTP_OK && statusCode != HttpURLConnection.HTTP_INTERNAL_ERROR) {
+                if (in != null) {
+                    in.close();
+                }
+                throw new ClientTransportException(ClientMessages.localizableHTTP_STATUS_CODE(statusCode, statusMessage));
+            }
+        }
+        // Every status code is OK for XML/HTTP
+    }
+
+    private void checkStatusCodeOneway(InputStream in, int statusCode, String statusMessage) throws IOException {
+        if (statusCode != WSHTTPConnection.ONEWAY && statusCode != WSHTTPConnection.OK) {
+            if (in != null) {
+                in.close();
+            }
+            throw new ClientTransportException(ClientMessages.localizableHTTP_STATUS_CODE(statusCode,statusMessage));
+        }
+    }
+
     /**
      * write SOAPAction header if the soapAction parameter is non-null or BindingProvider properties set.
      * BindingProvider properties take precedence.
      */
     private void writeSOAPAction(Map<String, List<String>> reqHeaders, String soapAction, Packet packet) {
+        //dont write SOAPAction HTTP header for SOAP 1.2 messages.
+        if(SOAPVersion.SOAP_12.equals(binding.getSOAPVersion()))
+            return;
         if (soapAction != null)
             reqHeaders.put("SOAPAction", Collections.singletonList(soapAction));
         else
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
index b7b1c3e53f4..e7e1151a236 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java
@@ -46,6 +46,7 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.ws.*;
 import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import javax.xml.parsers.ParserConfigurationException;
 
 import java.io.IOException;
 import java.net.URL;
@@ -57,6 +58,7 @@ import java.util.Map;
 import java.util.concurrent.Executor;
 
 import org.xml.sax.EntityResolver;
+import org.xml.sax.SAXException;
 import org.w3c.dom.Element;
 
 
@@ -205,7 +207,7 @@ public class EndpointImpl extends Endpoint {
         try {
             Class.forName("com.sun.net.httpserver.HttpServer");
         } catch (Exception e) {
-            throw new UnsupportedOperationException("NOT SUPPORTED");
+            throw new UnsupportedOperationException("Couldn't load light weight http server", e);
         }
 
         WSEndpoint wse = WSEndpoint.create(
@@ -243,8 +245,7 @@ public class EndpointImpl extends Endpoint {
             Transformer transformer = XmlUtil.newTransformer();
             for (Source source : metadata) {
                 try {
-                    XMLStreamBufferResult xsbr = new XMLStreamBufferResult();
-                    transformer.transform(source, xsbr);
+                    XMLStreamBufferResult xsbr = XmlUtil.identityTransform(source, new XMLStreamBufferResult());
                     String systemId = source.getSystemId();
 
                     r.add(SDDocumentSource.create(new URL(systemId), xsbr.getXMLStreamBuffer()));
@@ -252,6 +253,10 @@ public class EndpointImpl extends Endpoint {
                     throw new ServerRtException("server.rt.err", te);
                 } catch (IOException te) {
                     throw new ServerRtException("server.rt.err", te);
+                } catch (SAXException e) {
+                    throw new ServerRtException("server.rt.err", e);
+                } catch (ParserConfigurationException e) {
+                    throw new ServerRtException("server.rt.err", e);
                 }
             }
         }
@@ -265,6 +270,7 @@ public class EndpointImpl extends Endpoint {
     private @Nullable SDDocumentSource getPrimaryWsdl() {
         Class implType = implementor.getClass();
         // Takes care of @WebService, @WebServiceProvider's wsdlLocation
+        EndpointFactory.verifyImplementorClass(implType);
         String wsdlLocation = EndpointFactory.getWsdlLocation(implType);
         if (wsdlLocation != null) {
             ClassLoader cl = implType.getClassLoader();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java
index 444ac441475..605509698d7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java
@@ -51,7 +51,7 @@ import org.w3c.dom.Element;
  *
  * @author Jitendra Kotamraju
  */
-final class HttpEndpoint {
+public final class HttpEndpoint extends com.sun.xml.internal.ws.api.server.HttpEndpoint {
     private String address;
     private HttpContext httpContext;
     private final HttpAdapter adapter;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java
index 3e5fd050070..289d3473353 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java
@@ -32,11 +32,19 @@ import com.sun.net.httpserver.HttpsExchange;
 import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.server.WSEndpoint;
 import com.sun.xml.internal.ws.api.server.WebServiceContextDelegate;
+import com.sun.xml.internal.ws.api.server.PortAddressResolver;
 import com.sun.xml.internal.ws.transport.http.HttpAdapter;
 import com.sun.xml.internal.ws.transport.http.WSHTTPConnection;
+import com.sun.xml.internal.ws.developer.JAXWSProperties;
+import com.sun.xml.internal.ws.resources.WsservletMessages;
 
 import javax.xml.ws.handler.MessageContext;
-import java.io.*;
+import javax.xml.ws.WebServiceException;
+import java.io.FilterInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URI;
 import java.security.Principal;
 import java.util.ArrayList;
@@ -81,9 +89,8 @@ final class ServerConnectionImpl extends WSHTTPConnection implements WebServiceC
         for(Map.Entry <String, List<String>> entry : headers.entrySet()) {
             String name = entry.getKey();
             List<String> values = entry.getValue();
-            if (name.equalsIgnoreCase("Content-Length") || name.equalsIgnoreCase("Content-Type")) {
-                continue;  // ignore headers that interfere with our correct operations
-            } else {
+            // ignore headers that interfere with our correct operations
+            if (!name.equalsIgnoreCase("Content-Length") && !name.equalsIgnoreCase("Content-Type")) {
                 r.put(name,new ArrayList<String>(values));
             }
         }
@@ -111,17 +118,20 @@ final class ServerConnectionImpl extends WSHTTPConnection implements WebServiceC
     }
 
     public @NotNull InputStream getInput() {
+
         // Light weight http server's InputStream.close() throws exception if
         // all the bytes are not read. Work around until it is fixed.
         return new FilterInputStream(httpExchange.getRequestBody()) {
+            // Workaround for "SJSXP XMLStreamReader.next() closes stream".
+            boolean closed;
+
             @Override
             public void close() throws IOException {
-                try {
+                if (!closed) {
                     while (read() != -1);
-                } catch(IOException e) {
-                    //Ignore
+                    super.close();
+                    closed = true;
                 }
-                super.close();
             }
         };
     }
@@ -146,7 +156,14 @@ final class ServerConnectionImpl extends WSHTTPConnection implements WebServiceC
                     // Ignoring purposefully.
                 }
             }
+
+            // Otherwise, FilterOutpuStream writes byte by byte
+            @Override
+            public void write(byte[] buf, int start, int len) throws IOException {
+                out.write(buf, start, len);
+            }
         };
+
     }
 
     public @NotNull WebServiceContextDelegate getWebServiceContextDelegate() {
@@ -162,7 +179,14 @@ final class ServerConnectionImpl extends WSHTTPConnection implements WebServiceC
     }
 
     public @NotNull String getEPRAddress(Packet request, WSEndpoint endpoint) {
-        return WSHttpHandler.getRequestAddress(httpExchange);
+        //return WSHttpHandler.getRequestAddress(httpExchange);
+
+        PortAddressResolver resolver = adapter.owner.createPortAddressResolver(getBaseAddress());
+        String address = resolver.getAddressFor(endpoint.getServiceName(), endpoint.getPortName().getLocalPart());
+        if(address==null)
+            throw new WebServiceException(WsservletMessages.SERVLET_NO_ADDRESS_AVAILABLE(endpoint.getPortName()));
+        return address;
+
     }
 
     public String getWSDLAddress(@NotNull Packet request, @NotNull WSEndpoint endpoint) {
@@ -206,6 +230,16 @@ final class ServerConnectionImpl extends WSHTTPConnection implements WebServiceC
         return null;
     }
 
+    @Property(JAXWSProperties.HTTP_EXCHANGE)
+    public HttpExchange getExchange() {
+        return httpExchange;
+    }
+
+    @Override @NotNull
+    public String getBaseAddress() {
+        return WSHttpHandler.getRequestAddress(httpExchange);
+    }
+
     @Override
     public String getProtocol() {
         return httpExchange.getProtocol();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
index c3c75a30ca1..37bae12606a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java
@@ -30,7 +30,6 @@ import com.sun.xml.internal.ws.server.ServerRtException;
 
 import java.net.InetSocketAddress;
 import java.net.URL;
-import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -54,8 +53,9 @@ final class ServerMgr {
 
     /**
      * Gets the singleton instance.
+     * @return manager instance
      */
-    public static ServerMgr getInstance() {
+    static ServerMgr getInstance() {
         return serverMgr;
     }
 
@@ -64,7 +64,7 @@ final class ServerMgr {
      * it uses that server to create a context. Otherwise, it creates a new
      * HTTP server. This sever is added to servers Map.
      */
-    public HttpContext createContext(String address) {
+    /*package*/ HttpContext createContext(String address) {
         try {
             HttpServer server;
             ServerState state;
@@ -80,7 +80,7 @@ final class ServerMgr {
                 if (state == null) {
                     logger.fine("Creating new HTTP Server at "+inetAddress);
                     server = HttpServer.create(inetAddress, 5);
-                    server.setExecutor(Executors.newFixedThreadPool(5));
+                    server.setExecutor(Executors.newCachedThreadPool());
                     String path = url.toURI().getPath();
                     logger.fine("Creating HTTP Context at = "+path);
                     HttpContext context = server.createContext(path);
@@ -105,7 +105,7 @@ final class ServerMgr {
      * Removes a context. If the server doesn't have anymore contexts, it
      * would stop the server and server is removed from servers Map.
      */
-    public void removeContext(HttpContext context) {
+    /*package*/ void removeContext(HttpContext context) {
         InetSocketAddress inetAddress = context.getServer().getAddress();
         synchronized(servers) {
             ServerState state = servers.get(inetAddress);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java
index c4eb2f82061..6da9a3b075f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java
@@ -90,16 +90,8 @@ final class WSHttpHandler implements HttpHandler {
         try {
             logger.fine("Received HTTP request:"+msg.getRequestURI());
             String method = msg.getRequestMethod();
-            if (method.equals(GET_METHOD)) {
-                String queryString = msg.getRequestURI().getQuery();
-                logger.fine("Query String for request ="+queryString);
-                if (adapter.isMetadataQuery(queryString)) {
-                    adapter.publishWSDL(con,getRequestAddress(msg), msg.getRequestURI().getQuery());
-                } else {
-                    adapter.handle(con);
-                }
-            } else if (method.equals(POST_METHOD) || method.equals(HEAD_METHOD)
-                        || method.equals(PUT_METHOD) || method.equals(DELETE_METHOD)) {
+            if(method.equals(GET_METHOD) || method.equals(POST_METHOD) || method.equals(HEAD_METHOD)
+            || method.equals(PUT_METHOD) || method.equals(DELETE_METHOD)) {
                 adapter.handle(con);
             } else {
                 logger.warning(HttpserverMessages.UNEXPECTED_HTTP_METHOD(method));
@@ -144,9 +136,9 @@ final class WSHttpHandler implements HttpHandler {
         strBuf.append((msg instanceof HttpsExchange) ? "https" : "http");
         strBuf.append("://");
 
-        List<String> hostHeader = msg.getRequestHeaders().get("Host");
+        String hostHeader = msg.getRequestHeaders().getFirst("Host");
         if (hostHeader != null) {
-            strBuf.append(hostHeader.get(0));   // Uses Host header
+            strBuf.append(hostHeader);   // Uses Host header
         } else {
             strBuf.append(msg.getLocalAddress().getHostName());
             strBuf.append(":");
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java
index 05e9e8055fd..9929d89e28c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java
@@ -82,7 +82,12 @@ public class ByteArrayBuffer extends OutputStream {
     }
 
     public ByteArrayBuffer(byte[] data) {
+        this(data,data.length);
+    }
+
+    public ByteArrayBuffer(byte[] data, int length) {
         this.buf = data;
+        this.count = length;
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java
index d0b2dcd3ccf..8246a976d7b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java
@@ -50,7 +50,7 @@ import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 
 /**
- * $author: JAXWS Development Team
+ * @author: JAXWS Development Team
  */
 public class DOMUtil {
 
@@ -135,11 +135,13 @@ public class DOMUtil {
     public static void writeTagWithAttributes(Element node, XMLStreamWriter writer) throws XMLStreamException {
         String nodePrefix = fixNull(node.getPrefix());
         String nodeNS = fixNull(node.getNamespaceURI());
+        //fix to work with DOM level 1 nodes.
+        String nodeLocalName = node.getLocalName()== null?node.getNodeName():node.getLocalName();
 
         // See if nodePrefix:nodeNS is declared in writer's NamespaceContext before writing start element
         // Writing start element puts nodeNS in NamespaceContext even though namespace declaration not written
         boolean prefixDecl = isPrefixDeclared(writer, nodeNS, nodePrefix);
-        writer.writeStartElement(nodePrefix, node.getLocalName(), nodeNS);
+        writer.writeStartElement(nodePrefix, nodeLocalName, nodeNS);
 
         if (node.hasAttributes()) {
             NamedNodeMap attrs = node.getAttributes();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
index ea7e10970f0..9685696b0b2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java
@@ -30,6 +30,7 @@ import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
 import com.sun.xml.internal.ws.handler.HandlerChainsModel;
 import com.sun.xml.internal.ws.server.EndpointFactory;
 import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
+import com.sun.istack.internal.NotNull;
 
 import javax.jws.HandlerChain;
 import javax.jws.WebService;
@@ -84,7 +85,7 @@ public class HandlerAnnotationProcessor {
      * handlers and roles. Will return null if the class passed
      * in has no handler chain annotation.
      */
-    public static HandlerAnnotationInfo buildHandlerInfo(
+    public static HandlerAnnotationInfo buildHandlerInfo(@NotNull
         Class<?> clazz, QName serviceName, QName portName, WSBinding binding) {
 
 //        clazz = checkClass(clazz);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java
new file mode 100644
index 00000000000..861955e9351
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.util;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.xml.internal.ws.api.server.SDDocument;
+import com.sun.xml.internal.ws.server.SDDocumentImpl;
+import org.xml.sax.EntityResolver;
+
+import java.util.*;
+
+/**
+ * WSDL, schema document metadata utility class.
+ *
+ * @author Jitendra Kotamraju
+ */
+public class MetadataUtil {
+
+    /**
+     * Gets closure of all the referenced documents from the primary document(typically
+     * the service WSDL). It traverses the WSDL and schema imports and builds a closure
+     * set of documents.
+     *
+     * @param systemId primary wsdl or the any root document
+     * @param resolver used to get SDDocumentImpl for a document
+     * @param onlyTopLevelSchemas if true, the imported schemas from a schema would be ignored
+     * @return all the documents
+     */
+    public static Map<String, SDDocument> getMetadataClosure(@NotNull String systemId,
+            @NotNull MetadataResolver resolver, boolean onlyTopLevelSchemas) {
+        Map <String, SDDocument> closureDocs = new HashMap<String, SDDocument>();
+        Set<String> remaining = new HashSet<String>();
+        remaining.add(systemId);
+
+        while(!remaining.isEmpty()) {
+            Iterator<String> it = remaining.iterator();
+            String current = it.next();
+            remaining.remove(current);
+
+            SDDocument currentDoc = resolver.resolveEntity(current);
+            SDDocument old = closureDocs.put(currentDoc.getURL().toExternalForm(), currentDoc);
+            assert old == null;
+
+            Set<String> imports =  currentDoc.getImports();
+            if (!currentDoc.isSchema() || !onlyTopLevelSchemas) {
+                for(String importedDoc : imports) {
+                    if (closureDocs.get(importedDoc) == null) {
+                        remaining.add(importedDoc);
+                    }
+                }
+            }
+        }
+
+        return closureDocs;
+    }
+
+    public interface MetadataResolver {
+        /**
+         * returns {@link SDDocumentImpl} for the give systemId. It
+         * parses the document and categorises as WSDL, schema etc.
+         * The implementation could use a catlog resolver or an entity
+         * resolver {@link EntityResolver} before parsing.
+         *
+         * @param systemId document's systemId
+         * @return document for the systemId
+         */
+        @NotNull SDDocument resolveEntity(String systemId);
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/Pool.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/Pool.java
index b95ec9839bd..b73dfaac11a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/Pool.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/Pool.java
@@ -31,6 +31,7 @@ import com.sun.xml.internal.ws.api.pipe.TubeCloner;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.lang.ref.WeakReference;
 
 /**
  * General-purpose object pool.
@@ -47,7 +48,9 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  * @author Kohsuke Kawaguchi
  */
 public abstract class Pool<T> {
-    private final ConcurrentLinkedQueue<T> queue = new ConcurrentLinkedQueue<T>();
+
+    // volatile since multiple threads may access queue reference
+    private volatile WeakReference<ConcurrentLinkedQueue<T>> queue;
 
     /**
      * Gets a new object from the pool.
@@ -59,17 +62,32 @@ public abstract class Pool<T> {
      *      always non-null.
      */
     public final T take() {
-        T t = queue.poll();
+        T t = getQueue().poll();
         if(t==null)
             return create();
         return t;
     }
 
+    private ConcurrentLinkedQueue<T> getQueue() {
+        WeakReference<ConcurrentLinkedQueue<T>> q = queue;
+        if (q != null) {
+            ConcurrentLinkedQueue<T> d = q.get();
+            if (d != null)
+                return d;
+        }
+
+        // overwrite the queue
+        ConcurrentLinkedQueue<T> d = new ConcurrentLinkedQueue<T>();
+        queue = new WeakReference<ConcurrentLinkedQueue<T>>(d);
+
+        return d;
+    }
+
     /**
      * Returns an object back to the pool.
      */
     public final void recycle(T t) {
-        queue.offer(t);
+        getQueue().offer(t);
     }
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java
index 25ae78a7995..cb502c2562e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java
@@ -25,6 +25,8 @@
 
 package com.sun.xml.internal.ws.util;
 
+import com.sun.istack.internal.NotNull;
+
 import javax.xml.namespace.QName;
 import java.util.AbstractSet;
 import java.util.Collection;
@@ -134,7 +136,7 @@ public final class QNameMap<V> {
      *          <tt>null</tt> if the map contains no mapping for this set of keys.
      * @see #put(String,String, Object)
      */
-    public V get( String nsUri, String localPart ) {
+    public V get( @NotNull String nsUri, String localPart ) {
         Entry<V> e = getEntry(nsUri,localPart);
         if(e==null) return null;
         else        return e.value;
@@ -346,7 +348,7 @@ public final class QNameMap<V> {
         }
     }
 
-    public boolean containsKey(String nsUri,String localName) {
+    public boolean containsKey(@NotNull String nsUri,String localName) {
         return getEntry(nsUri,localName)!=null;
     }
 
@@ -458,7 +460,7 @@ public final class QNameMap<V> {
         }
     }
 
-    private Entry<V> getEntry(String nsUri,String localName) {
+    private Entry<V> getEntry(@NotNull String nsUri,String localName) {
         int hash = hash(localName);
         int i = indexFor(hash, table.length);
         Entry<V> e = table[i];
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java
index 84feee984b0..ed2645f8858 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java
@@ -25,13 +25,43 @@
 
 package com.sun.xml.internal.ws.util;
 
+import com.sun.xml.internal.ws.util.RuntimeVersionMBean;
+
+import java.io.InputStream;
+import java.io.IOException;
+
 /**
  * Obtains the version number of the JAX-WS runtime.
  *
  * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
  */
-public abstract class RuntimeVersion {
-    private RuntimeVersion() {}    // no instanciation please
+public final class RuntimeVersion implements RuntimeVersionMBean {
+
+    public static final Version VERSION;
+
+    static {
+        Version version = null;
+        InputStream in = RuntimeVersion.class.getResourceAsStream("version.properties");
+        try {
+            version = Version.create(in);
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch(IOException ioe) {
+                    // Nothing to do
+                }
+            }
+        }
+        VERSION = version == null ? Version.create(null) : version;
+    }
+
+    /**
+     * Get JAX-WS version
+     */
+    public String getVersion() {
+        return VERSION.toString();
+    }
 
-    public static final Version VERSION = Version.create(RuntimeVersion.class.getResourceAsStream("version.properties"));
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java
new file mode 100644
index 00000000000..2d7e2038ece
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+
+package com.sun.xml.internal.ws.util;
+
+import javax.management.*;
+import com.sun.xml.internal.ws.util.RuntimeVersion;
+
+/**
+ * @author Jitendra Kotamraju
+ */
+public interface RuntimeVersionMBean {
+
+    /**
+     * Get JAX-WS runtime version
+     */
+    public String getVersion();
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
new file mode 100644
index 00000000000..f88d1daab48
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.util.pipe;
+
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
+import com.sun.xml.internal.ws.api.WSBinding;
+import com.sun.xml.internal.ws.api.message.Message;
+import com.sun.xml.internal.ws.api.message.Packet;
+import com.sun.xml.internal.ws.api.pipe.NextAction;
+import com.sun.xml.internal.ws.api.pipe.Tube;
+import com.sun.xml.internal.ws.api.pipe.TubeCloner;
+import com.sun.xml.internal.ws.api.pipe.helper.AbstractFilterTubeImpl;
+import com.sun.xml.internal.ws.api.server.DocumentAddressResolver;
+import com.sun.xml.internal.ws.api.server.SDDocument;
+import com.sun.xml.internal.ws.developer.SchemaValidationFeature;
+import com.sun.xml.internal.ws.developer.ValidationErrorHandler;
+import com.sun.xml.internal.ws.util.ByteArrayBuffer;
+import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import com.sun.xml.internal.ws.wsdl.parser.WSDLConstants;
+import org.w3c.dom.*;
+import org.xml.sax.helpers.NamespaceSupport;
+
+import javax.xml.XMLConstants;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Validator;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.logging.Logger;
+
+/**
+ * {@link Tube} that does the schema validation.
+ *
+ * @author Jitendra Kotamraju
+ */
+public abstract class AbstractSchemaValidationTube extends AbstractFilterTubeImpl {
+
+    private static final Logger LOGGER = Logger.getLogger(AbstractSchemaValidationTube.class.getName());
+
+    protected final WSBinding binding;
+    protected final SchemaValidationFeature feature;
+    protected final DocumentAddressResolver resolver = new ValidationDocumentAddressResolver();
+
+    public AbstractSchemaValidationTube(WSBinding binding, Tube next) {
+        super(next);
+        this.binding = binding;
+        feature = binding.getFeature(SchemaValidationFeature.class);
+    }
+
+    protected AbstractSchemaValidationTube(AbstractSchemaValidationTube that, TubeCloner cloner) {
+        super(that, cloner);
+        this.binding = that.binding;
+        this.feature = that.feature;
+    }
+
+    protected abstract Validator getValidator();
+
+    protected abstract boolean isNoValidation();
+
+    private static class ValidationDocumentAddressResolver implements DocumentAddressResolver {
+
+        @Nullable
+        public String getRelativeAddressFor(@NotNull SDDocument current, @NotNull SDDocument referenced) {
+            LOGGER.fine("Current = "+current.getURL()+" resolved relative="+referenced.getURL());
+            return referenced.getURL().toExternalForm();
+        }
+    }
+
+    protected Document createDOM(SDDocument doc) {
+        // Get infoset
+        ByteArrayBuffer bab = new ByteArrayBuffer();
+        try {
+            doc.writeTo(null, resolver, bab);
+        } catch (IOException ioe) {
+            throw new WebServiceException(ioe);
+        }
+
+        // Convert infoset to DOM
+        Transformer trans = XmlUtil.newTransformer();
+        Source source = new StreamSource(bab.newInputStream(), null); //doc.getURL().toExternalForm());
+        DOMResult result = new DOMResult();
+        try {
+            trans.transform(source, result);
+        } catch(TransformerException te) {
+            throw new WebServiceException(te);
+        }
+        return (Document)result.getNode();
+    }
+
+
+    /**
+     * Locates xsd:schema elements in the WSDL and creates DOMSource and adds them to the list
+     *
+     * @param doc WSDL document
+     * @param systemId systemId for WSDL document
+     * @param list xsd:schema DOMSource list
+     */
+    protected @Nullable void addSchemaFragmentSource(Document doc, String systemId, List<Source> list) {
+
+        Element e = doc.getDocumentElement();
+        assert e.getNamespaceURI().equals(WSDLConstants.NS_WSDL);
+        assert e.getLocalName().equals("definitions");
+
+        NodeList typesList = e.getElementsByTagNameNS(WSDLConstants.NS_WSDL, "types");
+        for(int i=0; i < typesList.getLength(); i++) {
+            NodeList schemaList = ((Element)typesList.item(i)).getElementsByTagNameNS(WSDLConstants.NS_XMLNS, "schema");
+            for(int j=0; j < schemaList.getLength(); j++) {
+                Element elem = (Element)schemaList.item(j);
+                NamespaceSupport nss = new NamespaceSupport();
+                buildNamespaceSupport(nss, elem);
+                patchDOMFragment(nss, elem);
+                list.add(new DOMSource(elem, systemId+"#schema"+j));
+            }
+        }
+    }
+
+
+    /**
+     * Recursively visit ancestors and build up {@link org.xml.sax.helpers.NamespaceSupport} oject.
+     */
+    private void buildNamespaceSupport(NamespaceSupport nss, Node node) {
+        if(node==null || node.getNodeType()!=Node.ELEMENT_NODE)
+            return;
+
+        buildNamespaceSupport( nss, node.getParentNode() );
+
+        nss.pushContext();
+        NamedNodeMap atts = node.getAttributes();
+        for( int i=0; i<atts.getLength(); i++ ) {
+            Attr a = (Attr)atts.item(i);
+            if( "xmlns".equals(a.getPrefix()) ) {
+                nss.declarePrefix( a.getLocalName(), a.getValue() );
+                continue;
+            }
+            if( "xmlns".equals(a.getName()) ) {
+                nss.declarePrefix( "", a.getValue() );
+                continue;
+            }
+        }
+    }
+
+    /**
+     * Adds inscope namespaces as attributes to  <xsd:schema> fragment nodes.
+     *
+     * @param nss namespace context info
+     * @param elem that is patched with inscope namespaces
+     */
+    private @Nullable void patchDOMFragment(NamespaceSupport nss, Element elem) {
+        NamedNodeMap atts = elem.getAttributes();
+        for( Enumeration en = nss.getPrefixes(); en.hasMoreElements(); ) {
+            String prefix = (String)en.nextElement();
+
+            for( int i=0; i<atts.getLength(); i++ ) {
+                Attr a = (Attr)atts.item(i);
+                if (!"xmlns".equals(a.getPrefix()) || !a.getLocalName().equals("prefix")) {
+                    LOGGER.fine("Patching with xmlns:"+prefix+"="+nss.getURI(prefix));
+                    elem.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:"+prefix, nss.getURI(prefix));
+                }
+            }
+        }
+    }
+
+    @Override
+    public NextAction processRequest(Packet request) {
+        if (isNoValidation() || !request.getMessage().hasPayload() || request.getMessage().isFault()) {
+            return super.processRequest(request);
+        }
+        doProcess(request);
+        return super.processRequest(request);
+    }
+
+    @Override
+    public NextAction processResponse(Packet response) {
+        if (isNoValidation() || response.getMessage() == null || !response.getMessage().hasPayload() || response.getMessage().isFault()) {
+            return super.processResponse(response);
+        }
+        doProcess(response);
+        return super.processResponse(response);
+    }
+
+    private void doProcess(Packet packet) {
+        getValidator().reset();
+        Class<? extends ValidationErrorHandler> handlerClass = feature.getErrorHandler();
+        ValidationErrorHandler handler;
+        try {
+            handler = handlerClass.newInstance();
+        } catch(Exception e) {
+            throw new WebServiceException(e);
+        }
+        handler.setPacket(packet);
+        getValidator().setErrorHandler(handler);
+        Message msg = packet.getMessage().copy();
+        Source source = msg.readPayloadAsSource();
+        try {
+            // Validator javadoc allows ONLY SAX, and DOM Sources
+            // But the impl seems to handle all kinds.
+            getValidator().validate(source);
+        } catch(Exception e) {
+            throw new WebServiceException(e);
+        }
+    }
+
+    protected DOMSource toDOMSource(Source source) {
+        if (source instanceof DOMSource) {
+            return (DOMSource)source;
+        }
+        Transformer trans = XmlUtil.newTransformer();
+        DOMResult result = new DOMResult();
+        try {
+            trans.transform(source, result);
+        } catch(TransformerException te) {
+            throw new WebServiceException(te);
+        }
+        return new DOMSource(result.getNode());
+    }
+
+    protected static void printDOM(DOMSource src) {
+        try {
+            ByteArrayBuffer bos = new ByteArrayBuffer();
+            StreamResult sr = new StreamResult(bos );
+            Transformer trans = TransformerFactory.newInstance().newTransformer();
+            trans.transform(src, sr);
+            LOGGER.info("**** src ******"+bos.toString());
+            bos.close();
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java
index 3220cc37dd9..6548cc3d045 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java
@@ -82,11 +82,13 @@ public class DumpTube extends AbstractFilterTubeImpl {
         this.staxOut = that.staxOut;
     }
 
+    @Override
     public NextAction processRequest(Packet request) {
         dump("request",request);
         return super.processRequest(request);
     }
 
+    @Override
     public NextAction processResponse(Packet response) {
         dump("response",response);
         return super.processResponse(response);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java
index 38ef2e83a12..035a474ac65 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java
@@ -51,6 +51,7 @@ public class StandaloneTubeAssembler implements TubelineAssembler {
         }
         head = context.createWsaTube(head);
         head = context.createClientMUTube(head);
+        head = context.createValidationTube(head);
         return context.createHandlerTube(head);
     }
 
@@ -61,6 +62,7 @@ public class StandaloneTubeAssembler implements TubelineAssembler {
      */
     public Tube createServer(ServerTubeAssemblerContext context) {
         Tube head = context.getTerminalTube();
+        head = context.createValidationTube(head);
         head = context.createHandlerTube(head);
         head = context.createMonitoringTube(head);
         head = context.createServerMUTube(head);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties
index 2bdd9f9b863..ef473f9707a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties
@@ -241,4 +241,3 @@ V-038 = Element "{0}" requires additional elements
 V-039 = IDREFS attributes must have at least one value
 
 V-040 = ENTITIES attributes must have at least one value
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/version.properties b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/version.properties
index 27f0f706450..b6719e45543 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/version.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/version.properties
@@ -23,7 +23,7 @@
 # have any questions.
 #
 
-build-id=JAX-WS RI 2.1.1
-build-version=JAX-WS RI 2.1.1
-major-version=2.1.1
- 
+#Fri May 15 16:16:14 CEST 2009
+build-id=JAX-WS RI 2.1.6
+major-version=2.1.6
+build-version=JAX-WS RI 2.1.6
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java
index 1267b394687..8d987bb34d1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java
@@ -175,15 +175,15 @@ public class ContentHandlerToXMLStreamWriter extends DefaultHandler {
     public void startPrefixMapping(String prefix, String uri)
         throws SAXException {
 
-        if (prefix.equals("xml")) {
-            return;
-        }
-
         // defend against parsers that pass null in for "xmlns" prefix
         if (prefix == null) {
             prefix = "";
         }
 
+        if (prefix.equals("xml")) {
+            return;
+        }
+
         prefixBindings.add(prefix);
         prefixBindings.add(uri);
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/MetadataDocument.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/MetadataDocument.java
new file mode 100644
index 00000000000..585966c9c34
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/MetadataDocument.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.xml.internal.ws.util.xml;
+
+import com.sun.xml.internal.ws.api.server.*;
+import com.sun.xml.internal.ws.api.streaming.XMLStreamWriterFactory;
+import com.sun.xml.internal.ws.streaming.XMLStreamReaderUtil;
+import com.sun.xml.internal.ws.util.RuntimeVersion;
+import com.sun.xml.internal.ws.wsdl.parser.ParserUtil;
+import com.sun.xml.internal.ws.wsdl.parser.WSDLConstants;
+import com.sun.xml.internal.ws.server.ServerRtException;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.*;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * {@link com.sun.xml.internal.ws.api.server.SDDocument} implmentation.
+ *
+ * <p>
+ * This extends from {@link com.sun.xml.internal.ws.api.server.SDDocumentSource} so that
+ * JAX-WS server runtime code can use {@link com.sun.xml.internal.ws.api.server.SDDocument}
+ * as {@link com.sun.xml.internal.ws.api.server.SDDocumentSource}.
+ *
+ * @author Kohsuke Kawaguchi
+ * @author Jitendra Kotamraju
+ */
+public class MetadataDocument extends SDDocumentSource implements SDDocument {
+
+    private static final String NS_XSD = "http://www.w3.org/2001/XMLSchema";
+    private static final QName SCHEMA_INCLUDE_QNAME = new QName(NS_XSD, "include");
+    private static final QName SCHEMA_IMPORT_QNAME = new QName(NS_XSD, "import");
+    private static final QName SCHEMA_REDEFINE_QNAME = new QName(NS_XSD, "redefine");
+    private static final String VERSION_COMMENT =
+        " Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is "+RuntimeVersion.VERSION+". ";
+
+    /**
+     * Creates {@link com.sun.xml.internal.ws.api.server.SDDocument} from {@link com.sun.xml.internal.ws.api.server.SDDocumentSource}.
+     * @param src WSDL document infoset
+     * @param serviceName wsdl:service name
+     * @param portTypeName
+     *      The information about the port of {@link com.sun.xml.internal.ws.api.server.WSEndpoint} to which this document is built for.
+     *      These values are used to determine which document is the concrete and abstract WSDLs
+     *      for this endpoint.
+     *
+     * @return null
+     *      Always non-null.
+     */
+    public static SDDocument create(SDDocumentSource src, QName serviceName, QName portTypeName) {
+        URL systemId = src.getSystemId();
+
+        try {
+            // RuntimeWSDLParser parser = new RuntimeWSDLParser(null);
+            XMLStreamReader reader = src.read();
+            try {
+                XMLStreamReaderUtil.nextElementContent(reader);
+
+                QName rootName = reader.getName();
+                if(rootName.equals(WSDLConstants.QNAME_SCHEMA)) {
+                    String tns = ParserUtil.getMandatoryNonEmptyAttribute(reader, WSDLConstants.ATTR_TNS);
+                    Set<String> importedDocs = new HashSet<String>();
+                    while (XMLStreamReaderUtil.nextContent(reader) != XMLStreamConstants.END_DOCUMENT) {
+                         if (reader.getEventType() != XMLStreamConstants.START_ELEMENT)
+                            continue;
+                        QName name = reader.getName();
+                        if (SCHEMA_INCLUDE_QNAME.equals(name) || SCHEMA_IMPORT_QNAME.equals(name) ||
+                                SCHEMA_REDEFINE_QNAME.equals(name)) {
+                            String importedDoc = reader.getAttributeValue(null, "schemaLocation");
+                            if (importedDoc != null) {
+                                importedDocs.add(new URL(src.getSystemId(), importedDoc).toString());
+                            }
+                        }
+                    }
+                    return new SchemaImpl(rootName,systemId,src,tns,importedDocs);
+                } else if (rootName.equals(WSDLConstants.QNAME_DEFINITIONS)) {
+                    String tns = ParserUtil.getMandatoryNonEmptyAttribute(reader, WSDLConstants.ATTR_TNS);
+
+                    boolean hasPortType = false;
+                    boolean hasService = false;
+                    Set<String> importedDocs = new HashSet<String>();
+                    Set<QName> allServices = new HashSet<QName>();
+
+                    // if WSDL, parse more
+                    while (XMLStreamReaderUtil.nextContent(reader) != XMLStreamConstants.END_DOCUMENT) {
+                         if(reader.getEventType() != XMLStreamConstants.START_ELEMENT)
+                            continue;
+
+                        QName name = reader.getName();
+                        if (WSDLConstants.QNAME_PORT_TYPE.equals(name)) {
+                            String pn = ParserUtil.getMandatoryNonEmptyAttribute(reader, WSDLConstants.ATTR_NAME);
+                            if (portTypeName != null) {
+                                if(portTypeName.getLocalPart().equals(pn)&&portTypeName.getNamespaceURI().equals(tns)) {
+                                    hasPortType = true;
+                                }
+                            }
+                        } else if (WSDLConstants.QNAME_SERVICE.equals(name)) {
+                            String sn = ParserUtil.getMandatoryNonEmptyAttribute(reader, WSDLConstants.ATTR_NAME);
+                            QName sqn = new QName(tns,sn);
+                            allServices.add(sqn);
+                            if(serviceName.equals(sqn)) {
+                                hasService = true;
+                            }
+                        } else if (WSDLConstants.QNAME_IMPORT.equals(name)) {
+                            String importedDoc = reader.getAttributeValue(null, "location");
+                            if (importedDoc != null) {
+                                importedDocs.add(new URL(src.getSystemId(), importedDoc).toString());
+                            }
+                        } else if (SCHEMA_INCLUDE_QNAME.equals(name) || SCHEMA_IMPORT_QNAME.equals(name) ||
+                                SCHEMA_REDEFINE_QNAME.equals(name)) {
+                            String importedDoc = reader.getAttributeValue(null, "schemaLocation");
+                            if (importedDoc != null) {
+                                importedDocs.add(new URL(src.getSystemId(), importedDoc).toString());
+                            }
+                        }
+                    }
+                    return new WSDLImpl(
+                        rootName,systemId,src,tns,hasPortType,hasService,importedDocs,allServices);
+                } else {
+                    return new MetadataDocument(rootName,systemId,src);
+                }
+            } finally {
+                reader.close();
+            }
+        } catch (WebServiceException e) {
+            throw new ServerRtException("runtime.parser.wsdl", systemId,e);
+        } catch (IOException e) {
+            throw new ServerRtException("runtime.parser.wsdl", systemId,e);
+        } catch (XMLStreamException e) {
+            throw new ServerRtException("runtime.parser.wsdl", systemId,e);
+        }
+    }
+
+
+    private final QName rootName;
+    private final SDDocumentSource source;
+
+    /**
+     * The original system ID of this document.
+     *
+     * When this document contains relative references to other resources,
+     * this field is used to find which {@link com.sun.xml.internal.ws.server.SDDocumentImpl} it refers to.
+     *
+     * Must not be null.
+     */
+    private final URL url;
+    private final Set<String> imports;
+
+    protected MetadataDocument(QName rootName, URL url, SDDocumentSource source) {
+        this(rootName, url, source, new HashSet<String>());
+    }
+
+    protected MetadataDocument(QName rootName, URL url, SDDocumentSource source, Set<String> imports) {
+        assert url!=null;
+        this.rootName = rootName;
+        this.source = source;
+        this.url = url;
+        this.imports = imports;
+    }
+
+    public QName getRootName() {
+        return rootName;
+    }
+
+    public boolean isWSDL() {
+        return false;
+    }
+
+    public boolean isSchema() {
+        return false;
+    }
+
+    public URL getURL() {
+        return url;
+    }
+
+    public XMLStreamReader read(XMLInputFactory xif) throws IOException, XMLStreamException {
+        return source.read(xif);
+    }
+
+    public XMLStreamReader read() throws IOException, XMLStreamException {
+        return source.read();
+    }
+
+    public URL getSystemId() {
+        return url;
+    }
+
+    public Set<String> getImports() {
+        return imports;
+    }
+
+    public void writeTo(PortAddressResolver portAddressResolver, DocumentAddressResolver resolver, OutputStream os) throws IOException {
+        XMLStreamWriter w = null;
+        try {
+            //generate the WSDL with utf-8 encoding and XML version 1.0
+            w = XMLStreamWriterFactory.create(os, "UTF-8");
+            w.writeStartDocument("UTF-8", "1.0");
+            writeTo(portAddressResolver,resolver,w);
+            w.writeEndDocument();
+        } catch (XMLStreamException e) {
+            IOException ioe = new IOException(e.getMessage());
+            ioe.initCause(e);
+            throw ioe;
+        } finally {
+            try {
+                if (w != null)
+                    w.close();
+            } catch (XMLStreamException e) {
+                IOException ioe = new IOException(e.getMessage());
+                ioe.initCause(e);
+                throw ioe;
+            }
+        }
+    }
+
+    public void writeTo(PortAddressResolver portAddressResolver, DocumentAddressResolver resolver, XMLStreamWriter out) throws XMLStreamException, IOException {
+
+        XMLStreamReader xsr = source.read();
+        try {
+            out.writeComment(VERSION_COMMENT);
+            new XMLStreamReaderToXMLStreamWriter().bridge(xsr, out);
+        } finally {
+            xsr.close();
+        }
+    }
+
+
+    /**
+     * {@link com.sun.xml.internal.ws.api.server.SDDocument.Schema} implementation.
+     *
+     * @author Kohsuke Kawaguchi
+     */
+    private static final class SchemaImpl extends MetadataDocument implements Schema {
+        private final String targetNamespace;
+
+        public SchemaImpl(QName rootName, URL url, SDDocumentSource source, String targetNamespace,
+                          Set<String> imports) {
+            super(rootName, url, source, imports);
+            this.targetNamespace = targetNamespace;
+        }
+
+        public String getTargetNamespace() {
+            return targetNamespace;
+        }
+
+        public boolean isSchema() {
+            return true;
+        }
+    }
+
+
+    private static final class WSDLImpl extends MetadataDocument implements WSDL {
+        private final String targetNamespace;
+        private final boolean hasPortType;
+        private final boolean hasService;
+        private final Set<QName> allServices;
+
+        public WSDLImpl(QName rootName, URL url, SDDocumentSource source, String targetNamespace, boolean hasPortType,
+                        boolean hasService, Set<String> imports, Set<QName> allServices) {
+            super(rootName, url, source, imports);
+            this.targetNamespace = targetNamespace;
+            this.hasPortType = hasPortType;
+            this.hasService = hasService;
+            this.allServices = allServices;
+        }
+
+        public String getTargetNamespace() {
+            return targetNamespace;
+        }
+
+        public boolean hasPortType() {
+            return hasPortType;
+        }
+
+        public boolean hasService() {
+            return hasService;
+        }
+
+        public Set<QName> getAllServices() {
+            return allServices;
+        }
+
+        public boolean isWSDL() {
+            return true;
+        }
+    }
+
+
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java
index 954398b5f97..663c1bc5e0f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java
@@ -25,16 +25,10 @@
 
 package com.sun.xml.internal.ws.util.xml;
 
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.SAXParseException2;
 import com.sun.istack.internal.XMLStreamReaderToContentHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
+import org.xml.sax.*;
 import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.helpers.XMLFilterImpl;
 
@@ -88,6 +82,8 @@ public class StAXSource extends SAXSource {
     // this object will be wrapped by the XMLReader exposed to the client
     private final XMLStreamReaderToContentHandler reader;
 
+    private final XMLStreamReader staxReader;
+
     // SAX allows ContentHandler to be changed during the parsing,
     // but JAXB doesn't. So this repeater will sit between those
     // two components.
@@ -102,7 +98,14 @@ public class StAXSource extends SAXSource {
         }
 
         public void setFeature(String name, boolean value) throws SAXNotRecognizedException {
-            throw new SAXNotRecognizedException(name);
+            // Should support these two features according to XMLReader javadoc.
+            if (name.equals("http://xml.org/sax/features/namespaces") && value) {
+                // Ignore for now
+            } else if (name.equals("http://xml.org/sax/features/namespace-prefixes") && !value) {
+                // Ignore for now
+            } else {
+                throw new SAXNotRecognizedException(name);
+            }
         }
 
         public Object getProperty(String name) throws SAXNotRecognizedException {
@@ -171,12 +174,12 @@ public class StAXSource extends SAXSource {
             } catch( XMLStreamException e ) {
                 // wrap it in a SAXException
                 SAXParseException se =
-                    new SAXParseException(
+                    new SAXParseException2(
                         e.getMessage(),
                         null,
                         null,
-                        e.getLocation().getLineNumber(),
-                        e.getLocation().getColumnNumber(),
+                        e.getLocation() == null ? -1 : e.getLocation().getLineNumber(),
+                        e.getLocation() == null ? -1 : e.getLocation().getColumnNumber(),
                         e);
 
                 // if the consumer sets an error handler, it is our responsibility
@@ -188,10 +191,29 @@ public class StAXSource extends SAXSource {
                 // returns, we will abort anyway.
                 throw se;
 
+            } finally {
+                try {
+                    staxReader.close();
+                } catch(XMLStreamException xe) {
+                    //falls through. Not much can be done.
+                }
             }
         }
     };
 
+    /**
+     * Creates a new {@link javax.xml.transform.Source} for the given
+     * {@link XMLStreamReader}.
+     *
+     * @param reader XMLStreamReader that will be exposed as a Source
+     * @param eagerQuit if true, when the conversion is completed, leave the cursor to the last
+     *                  event that was fired (such as end element)
+     * @see #StAXSource(XMLStreamReader, boolean, String[])
+     */
+    public StAXSource(XMLStreamReader reader, boolean eagerQuit) {
+        this(reader, eagerQuit, new String[0]);
+    }
+
     /**
      * Creates a new {@link javax.xml.transform.Source} for the given
      * {@link XMLStreamReader}.
@@ -201,13 +223,18 @@ public class StAXSource extends SAXSource {
      * {@link javax.xml.stream.XMLStreamConstants#START_ELEMENT} event.
      *
      * @param reader XMLStreamReader that will be exposed as a Source
+     * @param eagerQuit if true, when the conversion is completed, leave the cursor to the last
+     *                  event that was fired (such as end element)
+     * @param inscope inscope Namespaces
+     *                array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }
      * @throws IllegalArgumentException iff the reader is null
      * @throws IllegalStateException iff the reader is not pointing at either a
      * START_DOCUMENT or START_ELEMENT event
      */
-    public StAXSource(XMLStreamReader reader, boolean eagerQuit) {
+    public StAXSource(XMLStreamReader reader, boolean eagerQuit, @NotNull String[] inscope) {
         if( reader == null )
             throw new IllegalArgumentException();
+        this.staxReader = reader;
 
         int eventType = reader.getEventType();
         if (!(eventType == XMLStreamConstants.START_DOCUMENT)
@@ -215,7 +242,7 @@ public class StAXSource extends SAXSource {
             throw new IllegalStateException();
         }
 
-        this.reader = new XMLStreamReaderToContentHandler(reader,repeater,eagerQuit,false);
+        this.reader = new XMLStreamReaderToContentHandler(reader,repeater,eagerQuit,false,inscope);
 
         super.setXMLReader(pseudoParser);
         // pass a dummy InputSource. We don't care
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java
index 2ec1de7d232..96a1977b6d7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java
@@ -43,6 +43,8 @@ import javax.xml.XMLConstants;
  */
 public class XMLStreamReaderToXMLStreamWriter {
 
+    private static final int BUF_SIZE = 4096;
+
     protected XMLStreamReader in;
     protected XMLStreamWriter out;
 
@@ -126,11 +128,13 @@ public class XMLStreamReaderToXMLStreamWriter {
             in.getPIData());
     }
 
+
     protected void handleCharacters() throws XMLStreamException {
-        out.writeCharacters(
-            in.getTextCharacters(),
-            in.getTextStart(),
-            in.getTextLength() );
+        char[] buf = new char[BUF_SIZE];
+        for (int start=0,read=buf.length; read == buf.length; start+=buf.length) {
+            read = in.getTextCharacters(start, buf, 0, buf.length);
+            out.writeCharacters(buf, 0, read);
+        }
     }
 
     protected void handleEndElement() throws XMLStreamException {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java
index cb00e5aa864..df6dff70ca9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java
@@ -40,11 +40,21 @@ import org.xml.sax.EntityResolver;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.InputSource;
 
 import javax.xml.namespace.QName;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.WebServiceException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -61,6 +71,8 @@ import java.util.StringTokenizer;
  * @author WS Development Team
  */
 public class XmlUtil {
+    private final static String LEXICAL_HANDLER_PROPERTY =
+        "http://xml.org/sax/properties/lexical-handler";
 
     public static String getPrefix(String s) {
         int i = s.indexOf(':');
@@ -188,6 +200,12 @@ public class XmlUtil {
 
     static final TransformerFactory transformerFactory = TransformerFactory.newInstance();
 
+    static final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance();
+
+    static {
+        saxParserFactory.setNamespaceAware(true);
+    }
+
     /**
      * Creates a new identity transformer.
      */
@@ -199,6 +217,36 @@ public class XmlUtil {
         }
     }
 
+    /**
+     * Performs identity transformation.
+     */
+    public static <T extends Result>
+    T identityTransform(Source src, T result) throws TransformerException, SAXException, ParserConfigurationException, IOException {
+        if (src instanceof StreamSource) {
+            // work around a bug in JAXP in JDK6u4 and earlier where the namespace processing
+            // is not turned on by default
+            StreamSource ssrc = (StreamSource) src;
+            TransformerHandler th = ((SAXTransformerFactory) transformerFactory).newTransformerHandler();
+            th.setResult(result);
+            XMLReader reader = saxParserFactory.newSAXParser().getXMLReader();
+            reader.setContentHandler(th);
+            reader.setProperty(LEXICAL_HANDLER_PROPERTY, th);
+            reader.parse(toInputSource(ssrc));
+        } else {
+            newTransformer().transform(src, result);
+        }
+        return result;
+    }
+
+    private static InputSource toInputSource(StreamSource src) {
+        InputSource is = new InputSource();
+        is.setByteStream(src.getInputStream());
+        is.setCharacterStream(src.getReader());
+        is.setPublicId(src.getPublicId());
+        is.setSystemId(src.getSystemId());
+        return is;
+    }
+
     /*
     * Gets an EntityResolver using XML catalog
     */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java
index be160006f84..bacade62314 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java
@@ -25,16 +25,7 @@
 
 package com.sun.xml.internal.ws.wsdl.parser;
 
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundPortType;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLFault;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLInput;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLMessage;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLOutput;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLPortType;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLService;
+import com.sun.xml.internal.ws.api.model.wsdl.*;
 import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
 import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtensionContext;
 
@@ -169,12 +160,12 @@ class DelegatingParserExtension extends WSDLParserExtension {
         core.bindingOperationOutputAttributes(operation, reader);
     }
 
-    public boolean bindingOperationFaultElements(WSDLBoundOperation operation, XMLStreamReader reader) {
-        return core.bindingOperationFaultElements(operation, reader);
+    public boolean bindingOperationFaultElements(WSDLBoundFault fault, XMLStreamReader reader) {
+        return core.bindingOperationFaultElements(fault, reader);
     }
 
-    public void bindingOperationFaultAttributes(WSDLBoundOperation operation, XMLStreamReader reader) {
-        core.bindingOperationFaultAttributes(operation, reader);
+    public void bindingOperationFaultAttributes(WSDLBoundFault fault, XMLStreamReader reader) {
+        core.bindingOperationFaultAttributes(fault, reader);
     }
 
     public void finished(WSDLParserExtensionContext context) {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java
index 7202cd2c97a..f2ceae5ba67 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java
@@ -25,16 +25,7 @@
 package com.sun.xml.internal.ws.wsdl.parser;
 
 
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundOperation;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLBoundPortType;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLFault;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLInput;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLMessage;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLOperation;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLOutput;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLPort;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLPortType;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLService;
+import com.sun.xml.internal.ws.api.model.wsdl.*;
 import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
 
 import javax.xml.namespace.QName;
@@ -133,7 +124,7 @@ final class FoolProofParserExtension extends DelegatingParserExtension {
         return post(pre(reader),reader,super.bindingOperationOutputElements(operation, reader));
     }
 
-    public boolean bindingOperationFaultElements(WSDLBoundOperation operation, XMLStreamReader reader) {
-        return post(pre(reader),reader,super.bindingOperationFaultElements(operation, reader));
+    public boolean bindingOperationFaultElements(WSDLBoundFault fault, XMLStreamReader reader) {
+        return post(pre(reader),reader,super.bindingOperationFaultElements(fault, reader));
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java
index 871a13e0f77..7e68060dba5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java
@@ -26,9 +26,10 @@ package com.sun.xml.internal.ws.wsdl.parser;
 
 
 import com.sun.xml.internal.ws.streaming.Attributes;
-import com.sun.xml.internal.ws.streaming.XMLReader;
 import com.sun.xml.internal.ws.streaming.XMLReaderException;
 import com.sun.xml.internal.ws.util.xml.XmlUtil;
+import com.sun.istack.internal.NotNull;
+import com.sun.istack.internal.Nullable;
 
 
 import java.io.File;
@@ -56,17 +57,10 @@ public class ParserUtil {
         return reader.getAttributeValue(name.getNamespaceURI(), name.getLocalPart());
     }
 
-    public static void verifyTag(XMLReader reader, QName name) {
-        if (!name.equals(reader.getName())) {
-            throw new XMLReaderException("xmlreader.unexpectedState.tag",
-                new Object[] { name, reader.getName() });
-        }
-    }
-
     public static QName getQName(XMLStreamReader reader, String tag){
         String localName = XmlUtil.getLocalPart(tag);
         String pfix = XmlUtil.getPrefix(tag);
-        String uri = reader.getNamespaceURI(pfix);
+        String uri = reader.getNamespaceURI(fixNull(pfix));
         return new QName(uri, localName);
     }
 
@@ -84,18 +78,6 @@ public class ParserUtil {
         return value;
     }
 
-    public static void fail(String key, XMLReader reader) {
-        //throw new WebServicesClientException(key,
-        //        Integer.toString(reader.getLineNumber()));
-    }
-
-    public static void failWithFullName(String key, XMLReader reader) {
-        //throw new WebServicesClientException(key,
-        //new Object[]{
-        //  Integer.toString(reader.getLineNumber()),
-        //  reader.getName().toString()});
-    }
-
     public static void failWithFullName(String key, XMLStreamReader reader) {
 //        throw new WebServicesClientException(key,
 //        new Object[]{
@@ -110,15 +92,6 @@ public class ParserUtil {
         //          reader.getLocalName()});
     }
 
-    public static void failWithLocalName(String key, XMLReader reader,
-        String arg) {
-        //throw new WebServicesClientException(key,
-        //      new Object[]{
-        //          Integer.toString(reader.getLineNumber()),
-        //          reader.getLocalName(),
-        //          arg});
-    }
-
     public static void failWithLocalName(String key, XMLStreamReader reader,
         String arg) {
         //throw new WebServicesClientException(key,
@@ -127,4 +100,9 @@ public class ParserUtil {
         //          reader.getLocalName(),
         //          arg});
     }
+
+    private static @NotNull String fixNull(@Nullable String s) {
+        if (s == null) return "";
+        else return s;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
index 1403cecd140..2c59c8597ae 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java
@@ -29,13 +29,17 @@ import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.api.BindingID;
 import com.sun.xml.internal.ws.api.EndpointAddress;
-import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
 import com.sun.xml.internal.ws.api.addressing.WSEndpointReference;
 import com.sun.xml.internal.ws.api.model.ParameterBinding;
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLDescriptorKind;
-import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
-import com.sun.xml.internal.ws.api.wsdl.parser.*;
+import com.sun.xml.internal.ws.api.server.Container;
+import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory;
+import com.sun.xml.internal.ws.api.wsdl.parser.MetaDataResolver;
+import com.sun.xml.internal.ws.api.wsdl.parser.MetadataResolverFactory;
+import com.sun.xml.internal.ws.api.wsdl.parser.ServiceDescriptor;
+import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtension;
+import com.sun.xml.internal.ws.api.wsdl.parser.XMLEntityResolver;
 import com.sun.xml.internal.ws.api.wsdl.parser.XMLEntityResolver.Parser;
 import com.sun.xml.internal.ws.model.wsdl.*;
 import com.sun.xml.internal.ws.resources.ClientMessages;
@@ -60,7 +64,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 /**
@@ -101,10 +109,10 @@ public class RuntimeWSDLParser {
      *      Either this or <tt>wsdl</tt> parameter must be given.
      *      Null location means the system won't be able to resolve relative references in the WSDL,
      */
-    public static WSDLModelImpl parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver, boolean isClientSide, WSDLParserExtension... extensions) throws IOException, XMLStreamException, SAXException {
+    public static WSDLModelImpl parse(@Nullable URL wsdlLoc, @NotNull Source wsdlSource, @NotNull EntityResolver resolver, boolean isClientSide, Container container, WSDLParserExtension... extensions) throws IOException, XMLStreamException, SAXException {
         assert resolver != null;
 
-        RuntimeWSDLParser wsdlParser = new RuntimeWSDLParser(wsdlSource.getSystemId(), new EntityResolverWrapper(resolver), isClientSide, extensions);
+        RuntimeWSDLParser wsdlParser = new RuntimeWSDLParser(wsdlSource.getSystemId(), new EntityResolverWrapper(resolver), isClientSide, container, extensions);
         Parser parser;
         try{
             parser = wsdlParser.resolveWSDL(wsdlLoc, wsdlSource);
@@ -116,25 +124,29 @@ public class RuntimeWSDLParser {
             //Try MEX if there is WSDLLoc available
             if(wsdlLoc == null)
                 throw e;
-            return tryWithMex(wsdlParser, wsdlLoc, resolver, isClientSide, e, extensions);
+            return tryWithMex(wsdlParser, wsdlLoc, resolver, isClientSide, container, e, extensions);
 
         }catch(IOException e){
             //Try MEX if there is WSDLLoc available
             if(wsdlLoc == null)
                 throw e;
-            return tryWithMex(wsdlParser, wsdlLoc, resolver, isClientSide, e, extensions);
+            return tryWithMex(wsdlParser, wsdlLoc, resolver, isClientSide, container, e, extensions);
         }
         wsdlParser.parseWSDL(parser, false);
         wsdlParser.wsdlDoc.freeze();
         wsdlParser.extensionFacade.finished(wsdlParser.context);
         wsdlParser.extensionFacade.postFinished(wsdlParser.context);
+
+        if(wsdlParser.wsdlDoc.getServices().isEmpty())
+            throw new WebServiceException(ClientMessages.WSDL_CONTAINS_NO_SERVICE(wsdlLoc));
+
         return wsdlParser.wsdlDoc;
     }
 
-    private static WSDLModelImpl tryWithMex(@NotNull RuntimeWSDLParser wsdlParser, @NotNull URL wsdlLoc, @NotNull EntityResolver resolver, boolean isClientSide, Throwable e, WSDLParserExtension... extensions) throws SAXException, XMLStreamException {
+    private static WSDLModelImpl tryWithMex(@NotNull RuntimeWSDLParser wsdlParser, @NotNull URL wsdlLoc, @NotNull EntityResolver resolver, boolean isClientSide, Container container, Throwable e, WSDLParserExtension... extensions) throws SAXException, XMLStreamException {
         ArrayList<Throwable> exceptions = new ArrayList<Throwable>();
         try {
-            WSDLModelImpl wsdlModel =  wsdlParser.parseUsingMex(wsdlLoc, resolver, isClientSide, extensions);
+            WSDLModelImpl wsdlModel =  wsdlParser.parseUsingMex(wsdlLoc, resolver, isClientSide, container, extensions);
             if(wsdlModel == null){
                 throw new WebServiceException(ClientMessages.FAILED_TO_PARSE(wsdlLoc.toExternalForm(), e.getMessage()), e);
             }
@@ -149,7 +161,7 @@ public class RuntimeWSDLParser {
         throw new InaccessibleWSDLException(exceptions);
     }
 
-    private WSDLModelImpl parseUsingMex(@NotNull URL wsdlLoc, @NotNull EntityResolver resolver, boolean isClientSide, WSDLParserExtension[] extensions) throws IOException, SAXException, XMLStreamException, URISyntaxException {
+    private WSDLModelImpl parseUsingMex(@NotNull URL wsdlLoc, @NotNull EntityResolver resolver, boolean isClientSide, Container container, WSDLParserExtension[] extensions) throws IOException, SAXException, XMLStreamException, URISyntaxException {
         //try MEX
         MetaDataResolver mdResolver = null;
         ServiceDescriptor serviceDescriptor = null;
@@ -165,22 +177,21 @@ public class RuntimeWSDLParser {
         }
         if (serviceDescriptor != null) {
             List<? extends Source> wsdls = serviceDescriptor.getWSDLs();
-            wsdlParser = new RuntimeWSDLParser(wsdlLoc.toExternalForm(), new MexEntityResolver(wsdls), isClientSide, extensions);
+            wsdlParser = new RuntimeWSDLParser(wsdlLoc.toExternalForm(), new MexEntityResolver(wsdls), isClientSide, container, extensions);
 
-            //now parse the first WSDL in the list
-            if(wsdls.size() > 0){
-                String systemId = wsdls.get(0).getSystemId();
+            for(Source src: wsdls ) {
+                String systemId = src.getSystemId();
                 Parser parser = wsdlParser.resolver.resolveEntity(null, systemId);
                 wsdlParser.parseWSDL(parser, false);
             }
         }
         //Incase that mex is not present or it couldn't get the metadata, try by appending ?wsdl and give
         // it a last shot else fail
-        if (mdResolver == null && (wsdlLoc.getProtocol().equals("http") || wsdlLoc.getProtocol().equals("https")) && (wsdlLoc.getQuery() == null)) {
+        if ((mdResolver == null || serviceDescriptor == null) && (wsdlLoc.getProtocol().equals("http") || wsdlLoc.getProtocol().equals("https")) && (wsdlLoc.getQuery() == null)) {
             String urlString = wsdlLoc.toExternalForm();
             urlString += "?wsdl";
             wsdlLoc = new URL(urlString);
-            wsdlParser = new RuntimeWSDLParser(wsdlLoc.toExternalForm(),new EntityResolverWrapper(resolver), isClientSide, extensions);
+            wsdlParser = new RuntimeWSDLParser(wsdlLoc.toExternalForm(),new EntityResolverWrapper(resolver), isClientSide, container, extensions);
             Parser parser = resolveWSDL(wsdlLoc, new StreamSource(wsdlLoc.toExternalForm()));
             wsdlParser.parseWSDL(parser, false);
         }
@@ -199,9 +210,9 @@ public class RuntimeWSDLParser {
         return reader.getName().equals(WSDLConstants.QNAME_DEFINITIONS);
     }
 
-    public static WSDLModelImpl parse(XMLEntityResolver.Parser wsdl, XMLEntityResolver resolver, boolean isClientSide, WSDLParserExtension... extensions) throws IOException, XMLStreamException, SAXException {
+    public static WSDLModelImpl parse(XMLEntityResolver.Parser wsdl, XMLEntityResolver resolver, boolean isClientSide, Container container, WSDLParserExtension... extensions) throws IOException, XMLStreamException, SAXException {
         assert resolver != null;
-        RuntimeWSDLParser parser = new RuntimeWSDLParser( wsdl.systemId.toExternalForm(), resolver, isClientSide, extensions);
+        RuntimeWSDLParser parser = new RuntimeWSDLParser( wsdl.systemId.toExternalForm(), resolver, isClientSide, container, extensions);
         parser.parseWSDL(wsdl, false);
         parser.wsdlDoc.freeze();
         parser.extensionFacade.finished(parser.context);
@@ -209,16 +220,17 @@ public class RuntimeWSDLParser {
         return parser.wsdlDoc;
     }
 
-    private RuntimeWSDLParser(@NotNull String sourceLocation, XMLEntityResolver resolver, boolean isClientSide, WSDLParserExtension... extensions) {
+    private RuntimeWSDLParser(@NotNull String sourceLocation, XMLEntityResolver resolver, boolean isClientSide, Container container, WSDLParserExtension... extensions) {
         this.wsdlDoc = sourceLocation!=null ? new WSDLModelImpl(sourceLocation) : new WSDLModelImpl();
         this.resolver = resolver;
 
         this.extensions = new ArrayList<WSDLParserExtension>();
-        this.context = new WSDLParserExtensionContextImpl(wsdlDoc, isClientSide);
+        this.context = new WSDLParserExtensionContextImpl(wsdlDoc, isClientSide, container);
 
         // register handlers for default extensions
         register(new MemberSubmissionAddressingWSDLParserExtension());
         register(new W3CAddressingWSDLParserExtension());
+        register(new W3CAddressingMetadataWSDLParserExtension());
 
         for (WSDLParserExtension e : extensions)
             register(e);
@@ -406,7 +418,7 @@ public class RuntimeWSDLParser {
                 } else {
                     binding.setStyle(Style.DOCUMENT);
                 }
-                XMLStreamReaderUtil.next(reader);
+                goToEnd(reader);
             } else if (WSDLConstants.NS_SOAP12_BINDING.equals(name)) {
                 binding.setBindingId(BindingID.SOAP12_HTTP);
                 String style = reader.getAttributeValue(null, "style");
@@ -415,7 +427,7 @@ public class RuntimeWSDLParser {
                 } else {
                     binding.setStyle(Style.DOCUMENT);
                 }
-                XMLStreamReaderUtil.next(reader);
+                goToEnd(reader);
             } else if (WSDLConstants.QNAME_OPERATION.equals(name)) {
                 parseBindingOperation(reader, binding);
             } else {
@@ -441,6 +453,7 @@ public class RuntimeWSDLParser {
 
         while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT) {
             QName name = reader.getName();
+            String style = null;
             if (WSDLConstants.QNAME_INPUT.equals(name)) {
                 parseInputBinding(reader, bindingOp);
             } else if (WSDLConstants.QNAME_OUTPUT.equals(name)) {
@@ -449,28 +462,28 @@ public class RuntimeWSDLParser {
                 parseFaultBinding(reader, bindingOp);
             } else if (SOAPConstants.QNAME_OPERATION.equals(name) ||
                     SOAPConstants.QNAME_SOAP12OPERATION.equals(name)) {
-                String style = reader.getAttributeValue(null, "style");
-                /**
-                 *  If style attribute is present set it otherwise set the style as defined
-                 *  on the <soap:binding> element
-                 */
-                if (style != null) {
-                    if (style.equals("rpc"))
-                        bindingOp.setStyle(Style.RPC);
-                    else
-                        bindingOp.setStyle(Style.DOCUMENT);
-                } else {
-                    bindingOp.setStyle(binding.getStyle());
-                }
+                style = reader.getAttributeValue(null, "style");
                 String soapAction = reader.getAttributeValue(null, "soapAction");
 
                 if (soapAction != null)
                     bindingOp.setSoapAction(soapAction);
 
-                XMLStreamReaderUtil.next(reader);
+                goToEnd(reader);
             } else {
                 extensionFacade.bindingOperationElements(bindingOp, reader);
             }
+            /**
+             *  If style attribute is present set it otherwise set the style as defined
+             *  on the <soap:binding> element
+             */
+            if (style != null) {
+                if (style.equals("rpc"))
+                    bindingOp.setStyle(Style.RPC);
+                else
+                    bindingOp.setStyle(Style.DOCUMENT);
+            } else {
+                bindingOp.setStyle(binding.getStyle());
+            }
         }
     }
 
@@ -513,21 +526,14 @@ public class RuntimeWSDLParser {
     }
 
     private void parseFaultBinding(XMLStreamReader reader, WSDLBoundOperationImpl bindingOp) {
-        boolean bodyFound = false;
-        extensionFacade.bindingOperationFaultAttributes(bindingOp, reader);
+        String faultName = ParserUtil.getMandatoryNonEmptyAttribute(reader, "name");
+        WSDLBoundFaultImpl wsdlBoundFault = new WSDLBoundFaultImpl(reader, faultName, bindingOp);
+        bindingOp.addFault(wsdlBoundFault);
+
+        extensionFacade.bindingOperationFaultAttributes(wsdlBoundFault, reader);
+
         while (XMLStreamReaderUtil.nextElementContent(reader) != XMLStreamConstants.END_ELEMENT) {
-            QName name = reader.getName();
-            if ((SOAPConstants.QNAME_BODY.equals(name) || SOAPConstants.QNAME_SOAP12BODY.equals(name)) && !bodyFound) {
-                bodyFound = true;
-                bindingOp.setFaultExplicitBodyParts(parseSOAPBodyBinding(reader, bindingOp.getFaultParts()));
-                goToEnd(reader);
-            } else if ((SOAPConstants.QNAME_HEADER.equals(name) || SOAPConstants.QNAME_SOAP12HEADER.equals(name))) {
-                parseSOAPHeaderBinding(reader, bindingOp.getFaultParts());
-            } else if (MIMEConstants.QNAME_MULTIPART_RELATED.equals(name)) {
-                parseMimeMultipartBinding(reader, bindingOp, BindingMode.FAULT);
-            } else {
-                extensionFacade.bindingOperationFaultElements(bindingOp, reader);
-            }
+            extensionFacade.bindingOperationFaultElements(wsdlBoundFault, reader);
         }
     }
 
@@ -698,7 +704,7 @@ public class RuntimeWSDLParser {
         String msg = ParserUtil.getMandatoryNonEmptyAttribute(reader, "message");
         QName msgName = ParserUtil.getQName(reader, msg);
         String name = ParserUtil.getMandatoryNonEmptyAttribute(reader, "name");
-        WSDLFaultImpl fault = new WSDLFaultImpl(reader,name, msgName);
+        WSDLFaultImpl fault = new WSDLFaultImpl(reader,name, msgName, operation);
         operation.addFault(fault);
         extensionFacade.portTypeOperationFaultAttributes(fault, reader);
         extensionFacade.portTypeOperationFault(operation, reader);
@@ -757,11 +763,10 @@ public class RuntimeWSDLParser {
                         break;
                     }
                 }
-                if (desc == null)
-                    continue;
-
-                WSDLPartImpl wsdlPart = new WSDLPartImpl(reader, part, partIndex, new WSDLPartDescriptorImpl(reader,ParserUtil.getQName(reader, desc), kind));
-                msg.add(wsdlPart);
+                if (desc != null) {
+                    WSDLPartImpl wsdlPart = new WSDLPartImpl(reader, part, partIndex, new WSDLPartDescriptorImpl(reader,ParserUtil.getQName(reader, desc), kind));
+                    msg.add(wsdlPart);
+                }
                 if (reader.getEventType() != XMLStreamConstants.END_ELEMENT)
                     goToEnd(reader);
             } else {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java
new file mode 100644
index 00000000000..e83acba90f9
--- /dev/null
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.xml.internal.ws.wsdl.parser;
+
+import com.sun.xml.internal.ws.api.model.wsdl.*;
+import com.sun.xml.internal.ws.model.wsdl.WSDLOperationImpl;
+import com.sun.xml.internal.ws.model.wsdl.WSDLBoundPortTypeImpl;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.namespace.QName;
+
+/**
+ * W3C WS-Addressing Runtime WSDL parser extension that parses
+ * WS-Addressing Metadata wsdl extensibility elements
+ * This mainly reads wsam:Action element on input/output/fault messages in wsdl.
+ *
+ * @author Rama Pulavarthi
+ */
+public class W3CAddressingMetadataWSDLParserExtension extends W3CAddressingWSDLParserExtension {
+
+    String METADATA_WSDL_EXTN_NS = "http://www.w3.org/2007/05/addressing/metadata";
+    QName METADATA_WSDL_ACTION_TAG = new QName(METADATA_WSDL_EXTN_NS, "Action", "wsam");
+
+    @Override
+    public boolean bindingElements(WSDLBoundPortType binding, XMLStreamReader reader) {
+        return false;
+    }
+
+    @Override
+    public boolean portElements(WSDLPort port, XMLStreamReader reader) {
+        return false;
+    }
+
+    @Override
+    public boolean bindingOperationElements(WSDLBoundOperation operation, XMLStreamReader reader) {
+        return false;
+    }
+
+    @Override
+    public boolean portTypeOperationInput(WSDLOperation o, XMLStreamReader reader) {
+        WSDLOperationImpl impl = (WSDLOperationImpl) o;
+
+        String action = ParserUtil.getAttribute(reader, METADATA_WSDL_ACTION_TAG);
+        if (action != null) {
+            impl.getInput().setAction(action);
+            impl.getInput().setDefaultAction(false);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean portTypeOperationOutput(WSDLOperation o, XMLStreamReader reader) {
+        WSDLOperationImpl impl = (WSDLOperationImpl) o;
+
+        String action = ParserUtil.getAttribute(reader, METADATA_WSDL_ACTION_TAG);
+        if (action != null) {
+            impl.getOutput().setAction(action);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean portTypeOperationFault(WSDLOperation o, XMLStreamReader reader) {
+        WSDLOperationImpl impl = (WSDLOperationImpl) o;
+
+        String action = ParserUtil.getAttribute(reader, METADATA_WSDL_ACTION_TAG);
+        if (action != null) {
+            String name = ParserUtil.getMandatoryNonEmptyAttribute(reader, "name");
+            impl.getFaultActionMap().put(name, action);
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void patchAnonymousDefault(WSDLBoundPortTypeImpl binding) {
+    }
+
+    @Override
+    protected String getNamespaceURI() {
+        return METADATA_WSDL_EXTN_NS;
+    }
+}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java
index b383999cf8d..3024d2dc648 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java
@@ -25,24 +25,28 @@
 package com.sun.xml.internal.ws.wsdl.parser;
 
 import com.sun.xml.internal.ws.api.model.wsdl.WSDLModel;
+import com.sun.xml.internal.ws.api.server.Container;
 import com.sun.xml.internal.ws.api.wsdl.parser.WSDLParserExtensionContext;
 
 /**
  * Provides implementation of {@link WSDLParserExtensionContext}
  *
  * @author Vivek Pandey
+ * @author Fabian Ritzmann
  */
 final class WSDLParserExtensionContextImpl implements WSDLParserExtensionContext {
     private final boolean isClientSide;
     private final WSDLModel wsdlModel;
+    private final Container container;
 
     /**
      * Construct {@link WSDLParserExtensionContextImpl} with information that whether its on client side
      * or server side.
      */
-    protected WSDLParserExtensionContextImpl(WSDLModel model, boolean isClientSide) {
+    protected WSDLParserExtensionContextImpl(WSDLModel model, boolean isClientSide, Container container) {
         this.wsdlModel = model;
         this.isClientSide = isClientSide;
+        this.container = container;
     }
 
     public boolean isClientSide() {
@@ -52,4 +56,8 @@ final class WSDLParserExtensionContextImpl implements WSDLParserExtensionContext
     public WSDLModel getWSDLModel() {
         return wsdlModel;
     }
+
+    public Container getContainer() {
+        return this.container;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java
index 17d58b2a7ea..c9aebba3fc5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java
@@ -296,9 +296,9 @@ final class WSDLParserExtensionFacade extends WSDLParserExtension {
         }
     }
 
-    public boolean bindingOperationFaultElements(WSDLBoundOperation operation, XMLStreamReader reader) {
+    public boolean bindingOperationFaultElements(WSDLBoundFault fault, XMLStreamReader reader) {
         for (WSDLParserExtension e : extensions) {
-            if (e.bindingOperationFaultElements(operation, reader)) {
+            if (e.bindingOperationFaultElements(fault, reader)) {
                 return true;
             }
         }
@@ -306,9 +306,9 @@ final class WSDLParserExtensionFacade extends WSDLParserExtension {
         return true;
     }
 
-    public void bindingOperationFaultAttributes(WSDLBoundOperation operation, XMLStreamReader reader) {
+    public void bindingOperationFaultAttributes(WSDLBoundFault fault, XMLStreamReader reader) {
         for (WSDLParserExtension e : extensions) {
-            e.bindingOperationFaultAttributes(operation, reader);
+            e.bindingOperationFaultAttributes(fault, reader);
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java
index 4beba110929..5eca0be0c8f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java
@@ -22,9 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: UsingAddressing.java,v 1.1.2.3 2006/09/26 22:17:15 ramapulavarthi Exp $
- */
 
 package com.sun.xml.internal.ws.wsdl.writer;
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java
index 3e567f318cf..eb69da52216 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java
@@ -22,29 +22,27 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-/*
- * $Id: W3CAddressingWSDLGeneratorExtension.java,v 1.1.2.14 2007/03/15 07:22:13 ramapulavarthi Exp $
- */
 
 package com.sun.xml.internal.ws.wsdl.writer;
 
-import javax.xml.ws.Action;
-import javax.xml.ws.FaultAction;
-import javax.xml.ws.soap.AddressingFeature;
-
-import com.sun.istack.internal.NotNull;
 import com.sun.xml.internal.txw2.TypedXmlWriter;
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.addressing.AddressingVersion;
 import com.sun.xml.internal.ws.api.model.CheckedException;
 import com.sun.xml.internal.ws.api.model.JavaMethod;
-import com.sun.xml.internal.ws.api.model.SEIModel;
-import com.sun.xml.internal.ws.api.server.Container;
-import com.sun.xml.internal.ws.api.wsdl.writer.WSDLGeneratorExtension;
 import com.sun.xml.internal.ws.api.wsdl.writer.WSDLGenExtnContext;
+import com.sun.xml.internal.ws.api.wsdl.writer.WSDLGeneratorExtension;
+
+import javax.xml.ws.Action;
+import javax.xml.ws.FaultAction;
+import javax.xml.ws.soap.AddressingFeature;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.logging.Logger;
 
 /**
  * @author Arun Gupta
+ * @author Rama Pulavarthi
  */
 public class W3CAddressingWSDLGeneratorExtension extends WSDLGeneratorExtension {
     private boolean enabled;
@@ -70,9 +68,38 @@ public class W3CAddressingWSDLGeneratorExtension extends WSDLGeneratorExtension
         Action a = method.getSEIMethod().getAnnotation(Action.class);
         if (a != null && !a.input().equals("")) {
             addAttribute(input, a.input());
+        } else {
+            if (method.getBinding().getSOAPAction().equals("")) {
+                //hack: generate default action for interop with .Net3.0 when soapAction is non-empty
+                String defaultAction = getDefaultAction(method);
+                addAttribute(input, defaultAction);
+            }
         }
     }
 
+    protected static final String getDefaultAction(JavaMethod method) {
+        String tns = method.getOwner().getTargetNamespace();
+        String delim = "/";
+        // TODO: is this the correct way to find the separator ?
+        try {
+            URI uri = new URI(tns);
+            if(uri.getScheme().equalsIgnoreCase("urn"))
+                delim = ":";
+        } catch (URISyntaxException e) {
+            LOGGER.warning("TargetNamespace of WebService is not a valid URI");
+        }
+        if (tns.endsWith(delim))
+            tns = tns.substring(0, tns.length() - 1);
+        //this assumes that fromjava case there won't be input name.
+        // if there is input name in future, then here name=inputName
+        //else use operation name as follows.
+        String name = (method.getMEP().isOneWay())?method.getOperationName():method.getOperationName()+"Request";
+
+        return new StringBuilder(tns).append(delim).append(
+                method.getOwner().getPortTypeName().getLocalPart()).append(
+                delim).append(name).toString();
+    }
+
     @Override
     public void addOperationOutputExtension(TypedXmlWriter output, JavaMethod method) {
         if (!enabled)
@@ -124,4 +151,5 @@ public class W3CAddressingWSDLGeneratorExtension extends WSDLGeneratorExtension
         }
         */
     }
+     private static final Logger LOGGER = Logger.getLogger(W3CAddressingWSDLGeneratorExtension.class.getName());
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java
index 7e085a03d41..887c64c6b7f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java
@@ -500,9 +500,9 @@ public class WSDLGenerator {
         PortType portType = portDefinitions.portType().name(model.getPortTypeName().getLocalPart());
         extension.addPortTypeExtension(portType);
         for (JavaMethodImpl method : model.getJavaMethods()) {
-//            Operation operation = portType.operation().name(method.getOperation().getLocalName());
             Operation operation = portType.operation().name(method.getOperationName());
             generateParameterOrder(operation, method);
+            extension.addOperationExtension(operation, method);
             switch (method.getMEP()) {
                 case REQUEST_RESPONSE:
                     // input message
@@ -581,7 +581,9 @@ public class WSDLGenerator {
                 }
             }
         }
-        operation.parameterOrder(paramOrder.toString());
+        if (i>1) {
+            operation.parameterOrder(paramOrder.toString());
+        }
     }
 
 
@@ -709,14 +711,14 @@ public class WSDLGenerator {
                 SOAPVersion soapVersion = sBinding.getSOAPVersion();
                 if (soapVersion == SOAPVersion.SOAP_12){
                     com.sun.xml.internal.ws.wsdl.writer.document.soap12.SOAPBinding soapBinding = binding.soap12Binding();
-                    soapBinding.transport(SOAP12_HTTP_TRANSPORT);
+                    soapBinding.transport(this.binding.getBindingId().getTransport());
                     if (sBinding.getStyle().equals(Style.DOCUMENT))
                         soapBinding.style(DOCUMENT);
                     else
                         soapBinding.style(RPC);
                 } else {
                 com.sun.xml.internal.ws.wsdl.writer.document.soap.SOAPBinding soapBinding = binding.soapBinding();
-                    soapBinding.transport(SOAP_HTTP_TRANSPORT);
+                    soapBinding.transport(this.binding.getBindingId().getTransport());
                     if (sBinding.getStyle().equals(Style.DOCUMENT))
                         soapBinding.style(DOCUMENT);
                     else
@@ -825,6 +827,7 @@ public class WSDLGenerator {
         }
         for (CheckedExceptionImpl exception : method.getCheckedExceptions()) {
             Fault fault = operation.fault().name(exception.getMessageName());
+            extension.addBindingOperationFaultExtension(fault, method, exception);
             SOAPFault soapFault = fault._element(SOAPFault.class).name(exception.getMessageName());
             soapFault.use(LITERAL);
         }
@@ -832,9 +835,9 @@ public class WSDLGenerator {
 
     protected void generateSOAP12BindingOperation(JavaMethodImpl method, Binding binding) {
         BindingOperationType operation = binding.operation().name(method.getOperationName());
+        extension.addBindingOperationExtension(operation, method);
         String targetNamespace = model.getTargetNamespace();
         QName requestMessage = new QName(targetNamespace, method.getOperationName());
-
         ArrayList<ParameterImpl> bodyParams = new ArrayList<ParameterImpl>();
         ArrayList<ParameterImpl> headerParams = new ArrayList<ParameterImpl>();
         splitParameters(bodyParams, headerParams, method.getRequestParameters());
@@ -843,7 +846,7 @@ public class WSDLGenerator {
 
         // input
         TypedXmlWriter input = operation.input();
-
+        extension.addBindingOperationInputExtension(input, method);
         com.sun.xml.internal.ws.wsdl.writer.document.soap12.BodyType body = input._element(com.sun.xml.internal.ws.wsdl.writer.document.soap12.Body.class);
         boolean isRpc = soapBinding.getStyle().equals(Style.RPC);
         if (soapBinding.getUse().equals(Use.LITERAL)) {
@@ -886,6 +889,7 @@ public class WSDLGenerator {
             splitParameters(bodyParams, headerParams, method.getResponseParameters());
             unwrappable = unwrappable ? headerParams.size() == 0 : unwrappable;
             TypedXmlWriter output = operation.output();
+            extension.addBindingOperationOutputExtension(output, method);
             body = output._element(com.sun.xml.internal.ws.wsdl.writer.document.soap12.Body.class);
             body.use(LITERAL);
             if (headerParams.size() > 0) {
@@ -921,6 +925,7 @@ public class WSDLGenerator {
         }
         for (CheckedExceptionImpl exception : method.getCheckedExceptions()) {
             Fault fault = operation.fault().name(exception.getMessageName());
+            extension.addBindingOperationFaultExtension(fault, method, exception);
             com.sun.xml.internal.ws.wsdl.writer.document.soap12.SOAPFault soapFault = fault._element(com.sun.xml.internal.ws.wsdl.writer.document.soap12.SOAPFault.class).name(exception.getMessageName());
             soapFault.use(LITERAL);
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java
index 1452a8fe8d2..a1fde6e03b5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom;
 
 import org.xml.sax.Attributes;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/SCD.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/SCD.java
index 35571444b7c..4cb06875539 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/SCD.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/SCD.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom;
 
 import com.sun.xml.internal.xsom.impl.scd.Iterators;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java
index 99237b3a248..8e9c67d2a6e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import org.xml.sax.Locator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java
index 271d59db743..bb4bac6e974 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java
index a8ed336b919..436913fe4d1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java
index d1c5ecf8c71..876642bc322 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java
index 1cf893223d5..006889914ec 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import org.relaxng.datatype.ValidationContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSComplexType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSComplexType.java
index e33bc4543ed..6624b46df24 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSComplexType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSComplexType.java
@@ -22,8 +22,12 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
+import java.util.List;
+
 
 /**
  * Complex type.
@@ -98,4 +102,19 @@ public interface XSComplexType extends XSType, XSAttContainer
      *      if this component has not been redefined.
      */
     public XSComplexType getRedefinedBy();
+
+    /**
+     * Returns a list of direct subtypes of this complex type. If the type is not subtyped, returns empty list.
+     * Doesn't return null.
+     * Note that the complex type may be extended outside of the scope of the schemaset known to XSOM.
+     * @return
+     */
+    public List<XSComplexType> getSubtypes();
+
+    /**
+     * Returns a list of element declarations of this type.
+     * @return
+     */
+    public List<XSElementDecl> getElementDecls();
+
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSComponent.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSComponent.java
index cd97fe18212..96d5c2740dc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSComponent.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSComponent.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import com.sun.xml.internal.xsom.parser.SchemaDocument;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSContentType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSContentType.java
index 197f892ad9f..99105f62257 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSContentType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSContentType.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import com.sun.xml.internal.xsom.visitor.XSContentTypeFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java
index fc7f5a00d2e..e7c7c46f66d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java
index fb2ebd2fb11..c0180bd89b2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import java.util.List;
@@ -140,4 +142,15 @@ public interface XSElementDecl extends XSDeclaration, XSTerm
 
     XmlString getDefaultValue();
     XmlString getFixedValue();
+
+    /**
+     * Used for javadoc schema generation
+     *
+     * @return
+     *    null if form attribute not present,
+     *    true if form attribute present and set to qualified,
+     *    false if form attribute present and set to unqualified.
+     */
+
+    Boolean getForm();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSFacet.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSFacet.java
index 5fe2d0b76da..369b50a372c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSFacet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSFacet.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java
index 12ab2e7eadd..859f4cf5c63 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom;
 
 import java.util.List;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java
index b80da6c4cb6..a3a8ea67ff4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java
index 62e0774b4ff..e960f624e0d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java
index 7310ca30745..c6ce3f2cd2e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSNotation.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSNotation.java
index a4568d6e0b2..65728027f12 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSNotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSNotation.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSParticle.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSParticle.java
index 255107d42cf..6332521207e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSParticle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSParticle.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java
index 844610ea648..2cb98352075 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import java.util.Iterator;
@@ -40,6 +42,12 @@ public interface XSRestrictionSimpleType extends XSSimpleType {
     /** Iterates facets that are specified in this step of derivation. */
     public Iterator<XSFacet> iterateDeclaredFacets();
 
+    /**
+     * Gets all the facets that are declared on this restriction.
+     *
+     * @return
+     *      Can be empty but always non-null.
+     */
     public Collection<? extends XSFacet> getDeclaredFacets();
 
     /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSchema.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSchema.java
index 980064d1e5c..9febbd4a9e1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSchema.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSchema.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import com.sun.xml.internal.xsom.parser.SchemaDocument;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java
index b80128d8bfd..555f92f4c8d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import javax.xml.namespace.NamespaceContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java
index 81b1496ab45..c8bffa7fc52 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java
@@ -22,11 +22,15 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import com.sun.xml.internal.xsom.visitor.XSSimpleTypeFunction;
 import com.sun.xml.internal.xsom.visitor.XSSimpleTypeVisitor;
 
+import java.util.List;
+
 /**
  * Simple type.
  *
@@ -131,6 +135,16 @@ public interface XSSimpleType extends XSType, XSContentType
      */
     XSFacet getFacet( String name );
 
+    /**
+     * For multi-valued facets (enumeration and pattern), obtain all values.
+     *
+     * @see #getFacet(String)
+     *
+     * @return
+     *      can be empty but never null.
+     */
+    List<XSFacet> getFacets( String name );
+
 
 
     void visit( XSSimpleTypeVisitor visitor );
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSTerm.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSTerm.java
index 432918eae90..a3ff1ea4e46 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSTerm.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSTerm.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import com.sun.xml.internal.xsom.visitor.XSTermFunction;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSType.java
index 8052f1727b9..933bbdbc3ab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSType.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java
index 392063fb2b2..70eed3765c7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSVariety.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSVariety.java
index c3590f5df7c..8349a0eb2b2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSVariety.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSVariety.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java
index 219dd608ca5..e08d6f67072 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSXPath.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSXPath.java
index 774d5c19406..56ecd4b3285 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSXPath.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XSXPath.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XmlString.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XmlString.java
index cde4c6e72b8..4e49a4c35b6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/XmlString.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/XmlString.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom;
 
 import org.relaxng.datatype.ValidationContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java
index 40a49bc3827..8aa47576bdd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
@@ -51,6 +53,28 @@ public class AnnotationImpl implements XSAnnotation
         locator = NULL_LOCATION;
     }
 
+    private static class LocatorImplUnmodifiable extends LocatorImpl {
 
-    private static final LocatorImpl NULL_LOCATION = new LocatorImpl();
+        @Override
+        public void setColumnNumber(int columnNumber) {
+            return;
+        }
+
+        @Override
+        public void setPublicId(String publicId) {
+            return;
+        }
+
+        @Override
+        public void setSystemId(String systemId) {
+            return;
+        }
+
+        @Override
+        public void setLineNumber(int lineNumber) {
+            return;
+        }
+    };
+
+    private static final LocatorImplUnmodifiable NULL_LOCATION = new LocatorImplUnmodifiable();
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java
index 30a799f12ed..4dfeba637ab 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java
index 00ec2bb33ab..f356b6286af 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSAttributeDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java
index f09f97121e5..294f56145c5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSAttributeDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java
index 9d2107e9907..1522cbd82da 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
@@ -67,7 +69,12 @@ public abstract class AttributesHolder extends DeclarationImpl {
     public void addProhibitedAttribute( UName name ) {
         prohibitedAtts.add(name);
     }
-    public List<XSAttributeUse> getAttributeUses() {
+
+    /**
+     * Returns the attribute uses by looking at attribute groups and etc.
+     * Searching for the base type is done in {@link ComplexTypeImpl}.
+     */
+    public Collection<XSAttributeUse> getAttributeUses() {
         // TODO: this is fairly inefficient
         List<XSAttributeUse> v = new ArrayList<XSAttributeUse>();
         v.addAll(attributes.values());
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java
index 31c37147a53..50b96a22daa 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
@@ -30,6 +32,8 @@ import com.sun.xml.internal.xsom.XSAttributeUse;
 import com.sun.xml.internal.xsom.XSComplexType;
 import com.sun.xml.internal.xsom.XSContentType;
 import com.sun.xml.internal.xsom.XSElementDecl;
+import com.sun.xml.internal.xsom.XSSchema;
+import com.sun.xml.internal.xsom.XSSchemaSet;
 import com.sun.xml.internal.xsom.XSSimpleType;
 import com.sun.xml.internal.xsom.XSType;
 import com.sun.xml.internal.xsom.XSWildcard;
@@ -38,9 +42,14 @@ import com.sun.xml.internal.xsom.impl.parser.SchemaDocumentImpl;
 import com.sun.xml.internal.xsom.impl.scd.Iterators;
 import com.sun.xml.internal.xsom.visitor.XSFunction;
 import com.sun.xml.internal.xsom.visitor.XSVisitor;
+import java.util.ArrayList;
+import java.util.List;
 import org.xml.sax.Locator;
 
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 public class ComplexTypeImpl extends AttributesHolder implements XSComplexType, Ref.ComplexType
 {
@@ -230,13 +239,29 @@ public class ComplexTypeImpl extends AttributesHolder implements XSComplexType,
             super.iterateAttributeUses() );
     }
 
+    public Collection<XSAttributeUse> getAttributeUses() {
+        XSComplexType baseType = getBaseType().asComplexType();
+
+        if( baseType==null )    return super.getAttributeUses();
+
+        // TODO: this is fairly inefficient
+        Map<UName,XSAttributeUse> uses = new HashMap<UName, XSAttributeUse>();
+        for( XSAttributeUse a : baseType.getAttributeUses())
+            uses.put(new UName(a.getDecl()),a);
+
+        uses.keySet().removeAll(prohibitedAtts);
+
+        for( XSAttributeUse a : super.getAttributeUses())
+            uses.put(new UName(a.getDecl()),a);
+
+        return uses.values();
+    }
+
 
     public XSType[] listSubstitutables() {
         return Util.listSubstitutables(this);
     }
 
-
-
     public void visit( XSVisitor visitor ) {
         visitor.complexType(this);
     }
@@ -246,4 +271,30 @@ public class ComplexTypeImpl extends AttributesHolder implements XSComplexType,
 
     // Ref.ComplexType implementation
     public XSComplexType getType() { return this; }
+
+    public List<XSComplexType> getSubtypes() {
+        ArrayList subtypeList = new ArrayList();
+        Iterator<XSComplexType> cTypes = getRoot().iterateComplexTypes();
+        while (cTypes.hasNext()) {
+            XSComplexType cType= cTypes.next();
+            XSType base = cType.getBaseType();
+            if ((base != null) && (base.equals(this))) {
+                subtypeList.add(cType);
+            }
+        }
+        return subtypeList;
+    }
+
+    public List<XSElementDecl> getElementDecls() {
+        ArrayList declList = new ArrayList();
+        XSSchemaSet schemaSet = getRoot();
+        for (XSSchema sch : schemaSet.getSchemas()) {
+            for (XSElementDecl decl : sch.getElementDecls().values()) {
+                if (decl.getType().equals(this)) {
+                    declList.add(decl);
+                }
+            }
+        }
+        return declList;
+    }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java
index 180fdc368f8..76a3e18154f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.SCD;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Const.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Const.java
index 1a49c9321c4..28fd2c441f1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Const.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Const.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 public class Const
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java
index 398bc4d6100..b05536d7a96 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSContentType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java
index afefbae28aa..1b598b7fcd9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSDeclaration;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java
index 0af81c9297a..3488f197aee 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSElementDecl;
@@ -53,10 +55,10 @@ public class ElementDecl extends DeclarationImpl implements XSElementDecl, Ref.T
         String _tns, String _name, boolean _anonymous,
 
         XmlString _defv, XmlString _fixedv,
-        boolean _nillable, boolean _abstract,
+        boolean _nillable, boolean _abstract, Boolean _form,
         Ref.Type _type, Ref.Element _substHead,
         int _substDisallowed, int _substExcluded,
-        List<IdentityConstraintImpl> idConstraints ) {
+        List<IdentityConstraintImpl> idConstraints) {
 
         super(owner,_annon,_loc,fa,_tns,_name,_anonymous);
 
@@ -64,6 +66,7 @@ public class ElementDecl extends DeclarationImpl implements XSElementDecl, Ref.T
         this.fixedValue = _fixedv;
         this.nillable = _nillable;
         this._abstract = _abstract;
+        this.form = _form;
         this.type = _type;
         this.substHead = _substHead;
         this.substDisallowed = _substDisallowed;
@@ -113,6 +116,11 @@ public class ElementDecl extends DeclarationImpl implements XSElementDecl, Ref.T
         return idConstraints;
     }
 
+    private Boolean form;
+    public Boolean getForm() {
+        return form;
+    }
+
 
     /**
      * @deprecated
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java
index 1e98f3b2143..6583713e527 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSContentType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java
index b416b0d9c3c..04238fa6ae6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSFacet;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java
index 4ff2fcdd5b0..daf2272942b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.ForeignAttributes;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java
index 7901f45b849..c1935525a40 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSElementDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java
index 01bb6534ef4..5b2690d44e0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSFacet;
@@ -33,6 +35,8 @@ import com.sun.xml.internal.xsom.visitor.XSSimpleTypeFunction;
 import com.sun.xml.internal.xsom.visitor.XSSimpleTypeVisitor;
 import org.xml.sax.Locator;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
 public class ListSimpleTypeImpl extends SimpleTypeImpl implements XSListSimpleType
@@ -60,6 +64,7 @@ public class ListSimpleTypeImpl extends SimpleTypeImpl implements XSListSimpleTy
 
     // list type by itself doesn't have any facet. */
     public XSFacet getFacet( String name ) { return null; }
+    public List<XSFacet> getFacets( String name ) { return Collections.EMPTY_LIST; }
 
     public XSVariety getVariety() { return XSVariety.LIST; }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java
index aaa9d8af029..519175fa011 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSElementDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java
index 40274abb47e..23a2101f4a2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSElementDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java
index 07944afbe63..bfaeaa2f050 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSNotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java
index 922e2bf6eb1..d8df6961c4d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSContentType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java
index 3f347b4d394..e5037819204 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java
index da28db35c4d..0e526ba5ba5 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSFacet;
@@ -88,6 +90,14 @@ public class RestrictionSimpleTypeImpl extends SimpleTypeImpl implements XSRestr
         return getSimpleBaseType().getFacet(name);
     }
 
+    public List<XSFacet> getFacets( String name ) {
+        List<XSFacet> f = getDeclaredFacets(name);
+        if(!f.isEmpty())     return f;
+
+        // none was found on this datatype. check the base type.
+        return getSimpleBaseType().getFacets(name);
+    }
+
     public XSVariety getVariety() { return getSimpleBaseType().getVariety(); }
 
     public XSSimpleType getPrimitiveType() {
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java
index bcb78c691e2..f71683a0399 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.ForeignAttributes;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java
index 518439c0ed8..aa55bc754c2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.SCD;
@@ -58,6 +60,7 @@ import org.xml.sax.Locator;
 
 import javax.xml.namespace.NamespaceContext;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -285,6 +288,7 @@ public class SchemaSetImpl implements XSSchemaSet
         public XSListSimpleType getBaseListType() {return null;}
         public XSUnionSimpleType getBaseUnionType() {return null;}
         public XSFacet getFacet(String name) { return null; }
+        public List<XSFacet> getFacets( String name ) { return Collections.EMPTY_LIST; }
         public XSFacet getDeclaredFacet(String name) { return null; }
         public List<XSFacet> getDeclaredFacets(String name) { return Collections.EMPTY_LIST; }
 
@@ -362,5 +366,30 @@ public class SchemaSetImpl implements XSSchemaSet
                         XSParticle.UNBOUNDED, 0 )
                 })
                 ,null,1,1);
+        public List<XSComplexType> getSubtypes() {
+            ArrayList subtypeList = new ArrayList();
+            Iterator<XSComplexType> cTypes = getRoot().iterateComplexTypes();
+            while (cTypes.hasNext()) {
+                XSComplexType cType= cTypes.next();
+                XSType base = cType.getBaseType();
+                if ((base != null) && (base.equals(this))) {
+                    subtypeList.add(cType);
+                }
+            }
+            return subtypeList;
+        }
+
+        public List<XSElementDecl> getElementDecls() {
+            ArrayList declList = new ArrayList();
+            XSSchemaSet schemaSet = getRoot();
+            for (XSSchema sch : schemaSet.getSchemas()) {
+                for (XSElementDecl decl : sch.getElementDecls().values()) {
+                    if (decl.getType().equals(this)) {
+                        declList.add(decl);
+                    }
+                }
+            }
+            return declList;
+        }
     }
 }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java
index aa01ede207e..dde74940400 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSComplexType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/UName.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/UName.java
index 326d2a6a813..5eb48e9b55c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/UName.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/UName.java
@@ -22,8 +22,11 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl;
 
+import com.sun.xml.internal.xsom.XSDeclaration;
+
 import java.util.Comparator;
 
 /**
@@ -49,6 +52,10 @@ public final class UName {
         this(nsUri,localName,localName);
     }
 
+    public UName(XSDeclaration decl) {
+        this(decl.getTargetNamespace(),decl.getName());
+    }
+
     private final String nsUri;
     private final String localName;
     private final String qname;
@@ -57,6 +64,32 @@ public final class UName {
     public String getNamespaceURI() { return nsUri; }
     public String getQualifiedName() { return qname; }
 
+
+    // Issue 540; XSComplexType.getAttributeUse(String,String) always return null
+    // UName was used in HashMap without overriden equals and hashCode methods.
+
+    @Override
+    public boolean equals(Object obj) {
+        if(obj instanceof UName) {
+            UName u = (UName)obj;
+
+            return ((this.getName().compareTo(u.getName()) == 0) &&
+                    (this.getNamespaceURI().compareTo(u.getNamespaceURI()) == 0) &&
+                    (this.getQualifiedName().compareTo(u.getQualifiedName()) == 0));
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 13 * hash + (this.nsUri != null ? this.nsUri.hashCode() : 0);
+        hash = 13 * hash + (this.localName != null ? this.localName.hashCode() : 0);
+        hash = 13 * hash + (this.qname != null ? this.qname.hashCode() : 0);
+        return hash;
+    }
+
     /**
      * Compares {@link UName}s by their names.
      */
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java
index d64a246579f..f4bd0960cf3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSFacet;
@@ -35,6 +37,8 @@ import org.xml.sax.Locator;
 
 import java.util.Iterator;
 import java.util.Set;
+import java.util.List;
+import java.util.Collections;
 
 public class UnionSimpleTypeImpl extends SimpleTypeImpl implements XSUnionSimpleType
 {
@@ -83,8 +87,9 @@ public class UnionSimpleTypeImpl extends SimpleTypeImpl implements XSUnionSimple
 
     // union type by itself doesn't have any facet. */
     public XSFacet getFacet( String name ) { return null; }
+    public List<XSFacet> getFacets( String name ) { return Collections.EMPTY_LIST; }
 
-    public XSVariety getVariety() { return XSVariety.LIST; }
+    public XSVariety getVariety() { return XSVariety.UNION; }
 
     public XSSimpleType getPrimitiveType() { return null; }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Util.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Util.java
index dee3e8cfa11..fc106a2e397 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Util.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/Util.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSComplexType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java
index 8e30b780076..664522eda25 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSElementDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java
index 98149ace24e..7c86550dcea 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl;
 
 import com.sun.xml.internal.xsom.XSIdentityConstraint;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/package.html b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/package.html
index c734a13f1b8..e0101df7864 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/package.html
@@ -23,5 +23,5 @@
  have any questions.
 -->
 <html><body>
-Implementation of the <code>com.sun.xml.xsom</code> package.
+Implementation of the <code>com.sun.xml.internal.xsom</code> package.
 </body></html>
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java
index 9dc4afc05ed..e06e51d7317 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import com.sun.xml.internal.xsom.impl.Ref;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java
index a1a9927be2c..330eba02e39 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import com.sun.xml.internal.xsom.parser.AnnotationContext;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java
index 5faea26fa95..66ddba46dc1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import com.sun.xml.internal.xsom.XSAttGroupDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java
index e0cb9975d84..7cd41786554 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import java.text.MessageFormat;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties
index 6673c2fc876..d0e0909b206 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties
@@ -24,50 +24,49 @@
 #
 
 UndefinedSimpleType = \
-	undefined simple type ''{0}''
+        undefined simple type ''{0}''
 
 UndefinedCompplexType = \
-	undefined complex type ''{0}''
+        undefined complex type ''{0}''
 
 UndefinedType = \
-	undefined simple or complex type ''{0}''
+        undefined simple or complex type ''{0}''
 
 UndefinedElement = \
-	undefined element declaration ''{0}''
+        undefined element declaration ''{0}''
 
 UndefinedModelGroup = \
-	undefined model group ''{0}''
+        undefined model group ''{0}''
 
 UndefinedAttribute = \
-	undefined attribute ''{0}''
+        undefined attribute ''{0}''
 
 UndefinedAttributeGroup = \
-	undefined attribute group ''{0}''
+        undefined attribute group ''{0}''
 
 UndefinedIdentityConstraint = \
     undefined identity constraint ''{0}''
 
 UndefinedPrefix = \
-	unbounded prefix ''{0}''
+        unbounded prefix ''{0}''
 
 UnexpectedTargetnamespace.Include = \
-	the target namespace of the included schema "{0}" doesn''t agree with the expected value "{1}"
+        the target namespace of the included schema "{0}" doesn''t agree with the expected value "{1}"
 
 UnexpectedTargetnamespace.Import = \
-	the target namespace of the imported schema "{0}" doesn''t agree with the expected value "{1}"
+        the target namespace of the imported schema "{0}" doesn''t agree with the expected value "{1}"
 
 DoubleDefinition = \
-	''{0}'' is already defined
+        ''{0}'' is already defined
 
 DoubleDefinition.Original = \
-	(related to above error) the first definition appears here
-	
+        (related to above error) the first definition appears here
+
 MissingSchemaLocation = \
-	a "schemaLocation" attribute is required
+        a "schemaLocation" attribute is required
 
 EntityResolutionFailure = \
-	failed to retrieve ''{0}'': {1}
+        failed to retrieve ''{0}'': {1}
 
 SimpleContentExpected = \
   A complex type with a simple content or a simple type is expected but found ''{0}'':{1}
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties
index aad85b989be..e3f70250317 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties
@@ -24,47 +24,46 @@
 #
 
 UndefinedSimpleType = \
-	\u672A\u5B9A\u7FA9\u306E\u30B7\u30F3\u30D7\u30EB\u30BF\u30A4\u30D7''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        \u672A\u5B9A\u7FA9\u306E\u30B7\u30F3\u30D7\u30EB\u30BF\u30A4\u30D7''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UndefinedCompplexType = \
-	\u672A\u5B9A\u7FA9\u306E\u30B3\u30F3\u30D7\u30EC\u30C3\u30AF\u30B9\u30BF\u30A4\u30D7''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        \u672A\u5B9A\u7FA9\u306E\u30B3\u30F3\u30D7\u30EC\u30C3\u30AF\u30B9\u30BF\u30A4\u30D7''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UndefinedType = \
-	\u672A\u5B9A\u7FA9\u306E\u578B''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        \u672A\u5B9A\u7FA9\u306E\u578B''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UndefinedElement = \
-	\u672A\u5B9A\u7FA9\u306E\u8981\u7D20''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        \u672A\u5B9A\u7FA9\u306E\u8981\u7D20''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UndefinedModelGroup = \
-	\u672A\u5B9A\u7FA9\u306E\u30E2\u30C7\u30EB\u30B0\u30EB\u30FC\u30D7''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        \u672A\u5B9A\u7FA9\u306E\u30E2\u30C7\u30EB\u30B0\u30EB\u30FC\u30D7''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UndefinedAttribute = \
-	\u672A\u5B9A\u7FA9\u306E\u5C5E\u6027''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        \u672A\u5B9A\u7FA9\u306E\u5C5E\u6027''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UndefinedAttributeGroup = \
-	\u672A\u5B9A\u7FA9\u306E\u5C5E\u6027\u30B0\u30EB\u30FC\u30D7''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        \u672A\u5B9A\u7FA9\u306E\u5C5E\u6027\u30B0\u30EB\u30FC\u30D7''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UndefinedIdentityConstraint = \
-	\u672A\u5B9A\u7FA9\u306E\u4E00\u610F\u6027\u5236\u7D04''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        \u672A\u5B9A\u7FA9\u306E\u4E00\u610F\u6027\u5236\u7D04''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UndefinedPrefix = \
-	xmlns\u5BA3\u8A00\u306E\u3055\u308C\u3066\u3044\u306A\u3044\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
+        xmlns\u5BA3\u8A00\u306E\u3055\u308C\u3066\u3044\u306A\u3044\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9''{0}''\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059
 
 UnexpectedTargetnamespace.Include = \
-	include\u3057\u305F\u5074\u3068\u3055\u308C\u305F\u5074\u306EtargetNamespace\u5C5E\u6027\u306E\u5024\u304C\u98DF\u3044\u9055\u3063\u3066\u3044\u307E\u3059({0}\u3068{1})
+        include\u3057\u305F\u5074\u3068\u3055\u308C\u305F\u5074\u306EtargetNamespace\u5C5E\u6027\u306E\u5024\u304C\u98DF\u3044\u9055\u3063\u3066\u3044\u307E\u3059({0}\u3068{1})
 
 UnexpectedTargetnamespace.Import = \
-	import\u3057\u305F\u5074\u3068\u3055\u308C\u305F\u5074\u306EtargetNamespace\u5C5E\u6027\u306E\u5024\u304C\u98DF\u3044\u9055\u3063\u3066\u3044\u307E\u3059({0}\u3068{1})
+        import\u3057\u305F\u5074\u3068\u3055\u308C\u305F\u5074\u306EtargetNamespace\u5C5E\u6027\u306E\u5024\u304C\u98DF\u3044\u9055\u3063\u3066\u3044\u307E\u3059({0}\u3068{1})
 
 DoubleDefinition = \
-	''{0}''\u306F\u65E2\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
+        ''{0}''\u306F\u65E2\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059
 
 DoubleDefinition.Original = \
-	\uFF08\u4E0A\u306E\u30A8\u30E9\u30FC\u306B\u95A2\u9023\uFF09\u5143\u3005\u306E\u5B9A\u7FA9\u306F\u3053\u3053\u3067\u884C\u308F\u308C\u3066\u3044\u307E\u3059
+        \uFF08\u4E0A\u306E\u30A8\u30E9\u30FC\u306B\u95A2\u9023\uFF09\u5143\u3005\u306E\u5B9A\u7FA9\u306F\u3053\u3053\u3067\u884C\u308F\u308C\u3066\u3044\u307E\u3059
 
 MissingSchemaLocation = \
-	schemaLocation\u5C5E\u6027\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+        schemaLocation\u5C5E\u6027\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 
 EntityResolutionFailure = \
-	''{0}''\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093: {1}
- 
+        ''{0}''\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093: {1}
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java
index c0eaf3e7ee2..be4179472e4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import com.sun.xml.internal.xsom.XSDeclaration;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java
index bd6c01a9f48..e2c9a5f78e3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import com.sun.xml.internal.xsom.XSSchemaSet;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java
index 5907139841b..935de5ca8d8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import org.xml.sax.SAXException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java
index 55ca9d8ab8e..caf0017d8b6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import org.xml.sax.Locator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java
index 06b2b983974..768bb48bd59 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import com.sun.xml.internal.xsom.parser.XMLParser;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java
index ab71e2fd738..280129df8ef 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import com.sun.xml.internal.xsom.impl.SchemaImpl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java
index a7ea8a45f46..b5fd0ce25f7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.parser;
 
 import com.sun.xml.internal.xsom.XSType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java
index 75acbf45af3..cbe3167c3c2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java
@@ -194,18 +194,6 @@ public class Schema extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 41:
-            {
-                if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 37;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         case 16:
             {
                 if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
@@ -218,6 +206,39 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 11:
+            {
+                if((($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","form"))>=0)) {
+                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 24, locator,false,defaultValue,fixedValue);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 36:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))))))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 130, null);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 27:
+            {
+                if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0))))))) {
+                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         case 45:
             {
                 if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
@@ -230,19 +251,38 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 41:
             {
-                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 12:
-            {
-                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 11;
+                    $_ngcc_current_state = 37;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 37:
+            {
+                if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 36;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 49:
+            {
+                if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 45;
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
@@ -259,25 +299,37 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 12:
+            {
+                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 11;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 2:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 376, anno,AnnotationContext.SCHEMA);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 118, anno,AnnotationContext.SCHEMA);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) {
-                        NGCCHandler h = new includeDecl(this, super._source, $runtime, 377);
+                        NGCCHandler h = new includeDecl(this, super._source, $runtime, 119);
                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                     }
                     else {
                         if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) {
-                            NGCCHandler h = new importDecl(this, super._source, $runtime, 378);
+                            NGCCHandler h = new importDecl(this, super._source, $runtime, 120);
                             spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                         }
                         else {
                             if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
-                                NGCCHandler h = new redefine(this, super._source, $runtime, 379);
+                                NGCCHandler h = new redefine(this, super._source, $runtime, 121);
                                 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                             }
                             else {
@@ -288,12 +340,12 @@ public class Schema extends NGCCHandler {
                                 }
                                 else {
                                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                                        NGCCHandler h = new simpleType(this, super._source, $runtime, 381);
+                                        NGCCHandler h = new simpleType(this, super._source, $runtime, 123);
                                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                     }
                                     else {
                                         if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
-                                            NGCCHandler h = new complexType(this, super._source, $runtime, 382);
+                                            NGCCHandler h = new complexType(this, super._source, $runtime, 124);
                                             spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                         }
                                         else {
@@ -304,17 +356,17 @@ public class Schema extends NGCCHandler {
                                             }
                                             else {
                                                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
-                                                    NGCCHandler h = new group(this, super._source, $runtime, 384);
+                                                    NGCCHandler h = new group(this, super._source, $runtime, 126);
                                                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                                 }
                                                 else {
                                                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
-                                                        NGCCHandler h = new notation(this, super._source, $runtime, 385);
+                                                        NGCCHandler h = new notation(this, super._source, $runtime, 127);
                                                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                                     }
                                                     else {
                                                         if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
-                                                            NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 386);
+                                                            NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 128);
                                                             spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                                         }
                                                         else {
@@ -333,26 +385,9 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 27:
+        case 0:
             {
-                if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 || ($ai = $runtime.getAttributeIndex("","final"))>=0))))))) {
-                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 11:
-            {
-                if((($ai = $runtime.getAttributeIndex("","form"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0)) {
-                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 282, locator,false,defaultValue,fixedValue);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
+                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
         case 57:
@@ -370,22 +405,22 @@ public class Schema extends NGCCHandler {
         case 1:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 365, anno,AnnotationContext.SCHEMA);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 107, anno,AnnotationContext.SCHEMA);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) {
-                        NGCCHandler h = new includeDecl(this, super._source, $runtime, 366);
+                        NGCCHandler h = new includeDecl(this, super._source, $runtime, 108);
                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                     }
                     else {
                         if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) {
-                            NGCCHandler h = new importDecl(this, super._source, $runtime, 367);
+                            NGCCHandler h = new importDecl(this, super._source, $runtime, 109);
                             spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                         }
                         else {
                             if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
-                                NGCCHandler h = new redefine(this, super._source, $runtime, 368);
+                                NGCCHandler h = new redefine(this, super._source, $runtime, 110);
                                 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                             }
                             else {
@@ -396,12 +431,12 @@ public class Schema extends NGCCHandler {
                                 }
                                 else {
                                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                                        NGCCHandler h = new simpleType(this, super._source, $runtime, 370);
+                                        NGCCHandler h = new simpleType(this, super._source, $runtime, 112);
                                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                     }
                                     else {
                                         if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
-                                            NGCCHandler h = new complexType(this, super._source, $runtime, 371);
+                                            NGCCHandler h = new complexType(this, super._source, $runtime, 113);
                                             spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                         }
                                         else {
@@ -412,17 +447,17 @@ public class Schema extends NGCCHandler {
                                             }
                                             else {
                                                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
-                                                    NGCCHandler h = new group(this, super._source, $runtime, 373);
+                                                    NGCCHandler h = new group(this, super._source, $runtime, 115);
                                                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                                 }
                                                 else {
                                                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
-                                                        NGCCHandler h = new notation(this, super._source, $runtime, 374);
+                                                        NGCCHandler h = new notation(this, super._source, $runtime, 116);
                                                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                                     }
                                                     else {
                                                         if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
-                                                            NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 375);
+                                                            NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 117);
                                                             spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                                         }
                                                         else {
@@ -440,41 +475,6 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 49:
-            {
-                if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 45;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 36:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))))))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 388, null);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 37:
-            {
-                if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 36;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -489,18 +489,6 @@ public class Schema extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 41:
-            {
-                if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 37;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         case 16:
             {
                 if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
@@ -513,57 +501,10 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 45:
+        case 11:
             {
-                if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 41;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 12:
-            {
-                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 11;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 53:
-            {
-                if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 49;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 27:
-            {
-                if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) {
-                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
+                if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 24, locator,false,defaultValue,fixedValue);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -571,10 +512,10 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 11:
+        case 36:
             {
-                if(((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
-                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 282, locator,false,defaultValue,fixedValue);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 130, null);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -593,33 +534,10 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 1:
+        case 27:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 49:
-            {
-                if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 45;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 36:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 388, null);
+                if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) {
+                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -627,6 +545,30 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 45:
+            {
+                if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 41;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 41:
+            {
+                if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 37;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 37:
             {
                 if(($ai = $runtime.getAttributeIndex("","finalDefault"))>=0) {
@@ -639,6 +581,30 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 49:
+            {
+                if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 45;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 53:
+            {
+                if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 49;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 26:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) {
@@ -650,6 +616,40 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 12:
+            {
+                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 11;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 1:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("schema"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedLeaveElement($__qname);
@@ -664,24 +664,13 @@ public class Schema extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 41:
+        case 37:
             {
-                if(($__uri.equals("") && $__local.equals("blockDefault"))) {
-                    $_ngcc_current_state = 43;
+                if(($__uri.equals("") && $__local.equals("finalDefault"))) {
+                    $_ngcc_current_state = 39;
                 }
                 else {
-                    $_ngcc_current_state = 37;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 45:
-            {
-                if(($__uri.equals("") && $__local.equals("elementFormDefault"))) {
-                    $_ngcc_current_state = 47;
-                }
-                else {
-                    $_ngcc_current_state = 41;
+                    $_ngcc_current_state = 36;
                     $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
                 }
             }
@@ -697,22 +686,17 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 12:
+        case 11:
             {
-                if(($__uri.equals("") && $__local.equals("fixed"))) {
-                    $_ngcc_current_state = 14;
+                if((($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("form")))) {
+                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 24, locator,false,defaultValue,fixedValue);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
-                    $_ngcc_current_state = 11;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                    unexpectedEnterAttribute($__qname);
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 53:
             {
                 if(($__uri.equals("") && $__local.equals("targetNamespace"))) {
@@ -724,23 +708,6 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 27:
-            {
-                if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("final"))))))))) {
-                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
         case 49:
             {
                 if(($__uri.equals("") && $__local.equals("attributeFormDefault"))) {
@@ -752,21 +719,32 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 37:
+        case 12:
             {
-                if(($__uri.equals("") && $__local.equals("finalDefault"))) {
-                    $_ngcc_current_state = 39;
+                if(($__uri.equals("") && $__local.equals("fixed"))) {
+                    $_ngcc_current_state = 14;
                 }
                 else {
-                    $_ngcc_current_state = 36;
+                    $_ngcc_current_state = 11;
                     $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
                 }
             }
             break;
-        case 11:
+        case 2:
             {
-                if((($__uri.equals("") && $__local.equals("form")) || ($__uri.equals("") && $__local.equals("name")))) {
-                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 282, locator,false,defaultValue,fixedValue);
+                $_ngcc_current_state = 1;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 27:
+            {
+                if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("name"))))))))) {
+                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -774,6 +752,28 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 45:
+            {
+                if(($__uri.equals("") && $__local.equals("elementFormDefault"))) {
+                    $_ngcc_current_state = 47;
+                }
+                else {
+                    $_ngcc_current_state = 41;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 41:
+            {
+                if(($__uri.equals("") && $__local.equals("blockDefault"))) {
+                    $_ngcc_current_state = 43;
+                }
+                else {
+                    $_ngcc_current_state = 37;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -788,32 +788,73 @@ public class Schema extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 41:
-            {
-                $_ngcc_current_state = 37;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 16:
             {
                 $_ngcc_current_state = 12;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 17:
+            {
+                if(($__uri.equals("") && $__local.equals("default"))) {
+                    $_ngcc_current_state = 12;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
         case 45:
             {
                 $_ngcc_current_state = 41;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
+        case 13:
             {
-                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("fixed"))) {
+                    $_ngcc_current_state = 11;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
             }
             break;
-        case 12:
+        case 41:
             {
-                $_ngcc_current_state = 11;
+                $_ngcc_current_state = 37;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 46:
+            {
+                if(($__uri.equals("") && $__local.equals("elementFormDefault"))) {
+                    $_ngcc_current_state = 41;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 37:
+            {
+                $_ngcc_current_state = 36;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 54:
+            {
+                if(($__uri.equals("") && $__local.equals("targetNamespace"))) {
+                    $_ngcc_current_state = 49;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 49:
+            {
+                $_ngcc_current_state = 45;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -823,6 +864,32 @@ public class Schema extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 42:
+            {
+                if(($__uri.equals("") && $__local.equals("blockDefault"))) {
+                    $_ngcc_current_state = 37;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 38:
+            {
+                if(($__uri.equals("") && $__local.equals("finalDefault"))) {
+                    $_ngcc_current_state = 36;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 12:
+            {
+                $_ngcc_current_state = 11;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
@@ -839,76 +906,9 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 54:
+        case 0:
             {
-                if(($__uri.equals("") && $__local.equals("targetNamespace"))) {
-                    $_ngcc_current_state = 49;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 38:
-            {
-                if(($__uri.equals("") && $__local.equals("finalDefault"))) {
-                    $_ngcc_current_state = 36;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 42:
-            {
-                if(($__uri.equals("") && $__local.equals("blockDefault"))) {
-                    $_ngcc_current_state = 37;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 17:
-            {
-                if(($__uri.equals("") && $__local.equals("default"))) {
-                    $_ngcc_current_state = 12;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 49:
-            {
-                $_ngcc_current_state = 45;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 37:
-            {
-                $_ngcc_current_state = 36;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 13:
-            {
-                if(($__uri.equals("") && $__local.equals("fixed"))) {
-                    $_ngcc_current_state = 11;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 46:
-            {
-                if(($__uri.equals("") && $__local.equals("elementFormDefault"))) {
-                    $_ngcc_current_state = 41;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
+                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -922,24 +922,6 @@ public class Schema extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 41:
-            {
-                if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 37;
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 39:
-            {
-                NGCCHandler h = new erSet(this, super._source, $runtime, 390);
-                spawnChildFromText(h, $value);
-            }
-            break;
         case 16:
             {
                 if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
@@ -952,6 +934,84 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 47:
+            {
+                if($value.equals("unqualified")) {
+                    NGCCHandler h = new qualification(this, super._source, $runtime, 142);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if($value.equals("qualified")) {
+                        NGCCHandler h = new qualification(this, super._source, $runtime, 142);
+                        spawnChildFromText(h, $value);
+                    }
+                }
+            }
+            break;
+        case 11:
+            {
+                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 24, locator,false,defaultValue,fixedValue);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                        NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 24, locator,false,defaultValue,fixedValue);
+                        spawnChildFromText(h, $value);
+                    }
+                }
+            }
+            break;
+        case 14:
+            {
+                fixedValue = $value;
+                $_ngcc_current_state = 13;
+            }
+            break;
+        case 27:
+            {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
+                        spawnChildFromText(h, $value);
+                    }
+                    else {
+                        if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                            NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
+                            spawnChildFromText(h, $value);
+                        }
+                        else {
+                            if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                                NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
+                                spawnChildFromText(h, $value);
+                            }
+                            else {
+                                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
+                                    spawnChildFromText(h, $value);
+                                }
+                                else {
+                                    if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+                                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
+                                        spawnChildFromText(h, $value);
+                                    }
+                                    else {
+                                        if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+                                            NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 42, locator,true);
+                                            spawnChildFromText(h, $value);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            break;
         case 45:
             {
                 if(($ai = $runtime.getAttributeIndex("","elementFormDefault"))>=0) {
@@ -964,158 +1024,14 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
-        case 51:
+        case 41:
             {
-                if($value.equals("unqualified")) {
-                    NGCCHandler h = new qualification(this, super._source, $runtime, 405);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if($value.equals("qualified")) {
-                        NGCCHandler h = new qualification(this, super._source, $runtime, 405);
-                        spawnChildFromText(h, $value);
-                    }
-                }
-            }
-            break;
-        case 18:
-            {
-                defaultValue = $value;
-                $_ngcc_current_state = 17;
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromText(this, super._cookie, $value);
-            }
-            break;
-        case 12:
-            {
-                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","blockDefault"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendText(super._cookie, $value);
                 }
                 else {
-                    $_ngcc_current_state = 11;
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 53:
-            {
-                if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 49;
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 27:
-            {
-                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
-                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
-                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                        spawnChildFromText(h, $value);
-                    }
-                    else {
-                        if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
-                            NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                            spawnChildFromText(h, $value);
-                        }
-                        else {
-                            if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                                NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                                spawnChildFromText(h, $value);
-                            }
-                            else {
-                                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
-                                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                                    spawnChildFromText(h, $value);
-                                }
-                                else {
-                                    if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
-                                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                                        spawnChildFromText(h, $value);
-                                    }
-                                    else {
-                                        if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
-                                            NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 300, locator,true);
-                                            spawnChildFromText(h, $value);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            break;
-        case 11:
-            {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 282, locator,false,defaultValue,fixedValue);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
-                        NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 282, locator,false,defaultValue,fixedValue);
-                        spawnChildFromText(h, $value);
-                    }
-                }
-            }
-            break;
-        case 47:
-            {
-                if($value.equals("unqualified")) {
-                    NGCCHandler h = new qualification(this, super._source, $runtime, 400);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if($value.equals("qualified")) {
-                        NGCCHandler h = new qualification(this, super._source, $runtime, 400);
-                        spawnChildFromText(h, $value);
-                    }
-                }
-            }
-            break;
-        case 43:
-            {
-                NGCCHandler h = new ersSet(this, super._source, $runtime, 395);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 55:
-            {
-                $_ngcc_current_state = 54;
-            }
-            break;
-        case 14:
-            {
-                fixedValue = $value;
-                $_ngcc_current_state = 13;
-            }
-            break;
-        case 49:
-            {
-                if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 45;
+                    $_ngcc_current_state = 37;
                     $runtime.sendText(super._cookie, $value);
                 }
             }
@@ -1132,168 +1048,252 @@ public class Schema extends NGCCHandler {
                 }
             }
             break;
+        case 43:
+            {
+                NGCCHandler h = new ersSet(this, super._source, $runtime, 137);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 49:
+            {
+                if(($ai = $runtime.getAttributeIndex("","attributeFormDefault"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 45;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 53:
+            {
+                if(($ai = $runtime.getAttributeIndex("","targetNamespace"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 49;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 12:
+            {
+                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 11;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 51:
+            {
+                if($value.equals("unqualified")) {
+                    NGCCHandler h = new qualification(this, super._source, $runtime, 147);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if($value.equals("qualified")) {
+                        NGCCHandler h = new qualification(this, super._source, $runtime, 147);
+                        spawnChildFromText(h, $value);
+                    }
+                }
+            }
+            break;
+        case 18:
+            {
+                defaultValue = $value;
+                $_ngcc_current_state = 17;
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromText(this, super._cookie, $value);
+            }
+            break;
+        case 39:
+            {
+                NGCCHandler h = new erSet(this, super._source, $runtime, 132);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 55:
+            {
+                $_ngcc_current_state = 54;
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 395:
-            {
-                blockDefault = ((Integer)$__result__);
-                action12();
-                $_ngcc_current_state = 42;
-            }
-            break;
-        case 388:
-            {
-                fa = ((ForeignAttributesImpl)$__result__);
-                action10();
-                $_ngcc_current_state = 2;
-            }
-            break;
-        case 390:
-            {
-                finalDefault = ((Integer)$__result__);
-                action11();
-                $_ngcc_current_state = 38;
-            }
-            break;
-        case 405:
-            {
-                afd = ((Boolean)$__result__).booleanValue();
-                action14();
-                $_ngcc_current_state = 50;
-            }
-            break;
-        case 300:
-            {
-                e = ((ElementDecl)$__result__);
-                action7();
-                $_ngcc_current_state = 26;
-            }
-            break;
-        case 376:
-            {
-                anno = ((AnnotationImpl)$__result__);
-                action9();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 377:
-            {
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 378:
-            {
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 379:
-            {
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 381:
-            {
-                st = ((SimpleTypeImpl)$__result__);
-                action6();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 382:
-            {
-                ct = ((ComplexTypeImpl)$__result__);
-                action5();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 384:
-            {
-                group = ((ModelGroupDeclImpl)$__result__);
-                action2();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 385:
-            {
-                notation = ((XSNotation)$__result__);
-                action1();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 386:
-            {
-                ag = ((AttGroupDeclImpl)$__result__);
-                action0();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 282:
+        case 24:
             {
                 ad = ((AttributeDeclImpl)$__result__);
                 action3();
                 $_ngcc_current_state = 10;
             }
             break;
-        case 400:
+        case 130:
             {
-                efd = ((Boolean)$__result__).booleanValue();
-                action13();
-                $_ngcc_current_state = 46;
+                fa = ((ForeignAttributesImpl)$__result__);
+                action10();
+                $_ngcc_current_state = 2;
             }
             break;
-        case 365:
+        case 137:
+            {
+                blockDefault = ((Integer)$__result__);
+                action12();
+                $_ngcc_current_state = 42;
+            }
+            break;
+        case 132:
+            {
+                finalDefault = ((Integer)$__result__);
+                action11();
+                $_ngcc_current_state = 38;
+            }
+            break;
+        case 107:
             {
                 anno = ((AnnotationImpl)$__result__);
                 action9();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 366:
+        case 108:
             {
                 $_ngcc_current_state = 1;
             }
             break;
-        case 367:
+        case 109:
             {
                 $_ngcc_current_state = 1;
             }
             break;
-        case 368:
+        case 110:
             {
                 $_ngcc_current_state = 1;
             }
             break;
-        case 370:
+        case 112:
             {
                 st = ((SimpleTypeImpl)$__result__);
                 action6();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 371:
+        case 113:
             {
                 ct = ((ComplexTypeImpl)$__result__);
                 action5();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 373:
+        case 115:
             {
                 group = ((ModelGroupDeclImpl)$__result__);
                 action2();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 374:
+        case 116:
             {
                 notation = ((XSNotation)$__result__);
                 action1();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 375:
+        case 117:
+            {
+                ag = ((AttGroupDeclImpl)$__result__);
+                action0();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 142:
+            {
+                efd = ((Boolean)$__result__).booleanValue();
+                action13();
+                $_ngcc_current_state = 46;
+            }
+            break;
+        case 147:
+            {
+                afd = ((Boolean)$__result__).booleanValue();
+                action14();
+                $_ngcc_current_state = 50;
+            }
+            break;
+        case 42:
+            {
+                e = ((ElementDecl)$__result__);
+                action7();
+                $_ngcc_current_state = 26;
+            }
+            break;
+        case 118:
+            {
+                anno = ((AnnotationImpl)$__result__);
+                action9();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 119:
+            {
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 120:
+            {
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 121:
+            {
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 123:
+            {
+                st = ((SimpleTypeImpl)$__result__);
+                action6();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 124:
+            {
+                ct = ((ComplexTypeImpl)$__result__);
+                action5();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 126:
+            {
+                group = ((ModelGroupDeclImpl)$__result__);
+                action2();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 127:
+            {
+                notation = ((XSNotation)$__result__);
+                action1();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 128:
             {
                 ag = ((AttGroupDeclImpl)$__result__);
                 action0();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java
index 5163854fe93..06e48245954 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java
@@ -97,17 +97,6 @@ class SimpleType_List extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 9:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 11, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         case 2:
             {
                 if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
@@ -116,7 +105,7 @@ class SimpleType_List extends NGCCHandler {
                 }
                 else {
                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                        NGCCHandler h = new simpleType(this, super._source, $runtime, 3);
+                        NGCCHandler h = new simpleType(this, super._source, $runtime, 166);
                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                     }
                     else {
@@ -140,7 +129,7 @@ class SimpleType_List extends NGCCHandler {
         case 7:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 9, annotation,AnnotationContext.SIMPLETYPE_DECL);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 172, annotation,AnnotationContext.SIMPLETYPE_DECL);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -154,6 +143,17 @@ class SimpleType_List extends NGCCHandler {
                 revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
+        case 9:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -168,17 +168,6 @@ class SimpleType_List extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 9:
-            {
-                if((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 11, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
         case 2:
             {
                 if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
@@ -213,6 +202,17 @@ class SimpleType_List extends NGCCHandler {
                 revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 9:
+            {
+                if((($ai = $runtime.getAttributeIndex("","itemType"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedLeaveElement($__qname);
@@ -227,17 +227,6 @@ class SimpleType_List extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 9:
-            {
-                if(($__uri.equals("") && $__local.equals("itemType"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 11, fa);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
         case 2:
             {
                 if(($__uri.equals("") && $__local.equals("itemType"))) {
@@ -259,6 +248,17 @@ class SimpleType_List extends NGCCHandler {
                 revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 9:
+            {
+                if(($__uri.equals("") && $__local.equals("itemType"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -273,6 +273,16 @@ class SimpleType_List extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 4:
+            {
+                if(($__uri.equals("") && $__local.equals("itemType"))) {
+                    $_ngcc_current_state = 1;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
         case 7:
             {
                 $_ngcc_current_state = 2;
@@ -284,16 +294,6 @@ class SimpleType_List extends NGCCHandler {
                 revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 4:
-            {
-                if(($__uri.equals("") && $__local.equals("itemType"))) {
-                    $_ngcc_current_state = 1;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -305,20 +305,6 @@ class SimpleType_List extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 5:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 5);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 9:
-            {
-                if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 11, fa);
-                    spawnChildFromText(h, $value);
-                }
-            }
-            break;
         case 2:
             {
                 if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
@@ -327,6 +313,12 @@ class SimpleType_List extends NGCCHandler {
                 }
             }
             break;
+        case 5:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 168);
+                spawnChildFromText(h, $value);
+            }
+            break;
         case 7:
             {
                 $_ngcc_current_state = 2;
@@ -338,36 +330,44 @@ class SimpleType_List extends NGCCHandler {
                 revertToParentFromText(result, super._cookie, $value);
             }
             break;
+        case 9:
+            {
+                if(($ai = $runtime.getAttributeIndex("","itemType"))>=0) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 174, fa);
+                    spawnChildFromText(h, $value);
+                }
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 11:
-            {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 7;
-            }
-            break;
-        case 5:
+        case 168:
             {
                 itemTypeName = ((UName)$__result__);
                 action1();
                 $_ngcc_current_state = 4;
             }
             break;
-        case 3:
+        case 166:
             {
                 itemType = ((SimpleTypeImpl)$__result__);
                 $_ngcc_current_state = 1;
             }
             break;
-        case 9:
+        case 172:
             {
                 annotation = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 2;
             }
             break;
+        case 174:
+            {
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 7;
+            }
+            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java
index e9edd6d9925..967fc8da561 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java
@@ -106,7 +106,7 @@ class SimpleType_Restriction extends NGCCHandler {
         case 1:
             {
                 if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
-                    NGCCHandler h = new facet(this, super._source, $runtime, 40);
+                    NGCCHandler h = new facet(this, super._source, $runtime, 529);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -114,11 +114,6 @@ class SimpleType_Restriction extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
         case 13:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
@@ -134,7 +129,7 @@ class SimpleType_Restriction extends NGCCHandler {
         case 10:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 51, annotation,AnnotationContext.SIMPLETYPE_DECL);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 540, annotation,AnnotationContext.SIMPLETYPE_DECL);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -151,7 +146,7 @@ class SimpleType_Restriction extends NGCCHandler {
                 }
                 else {
                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                        NGCCHandler h = new simpleType(this, super._source, $runtime, 45);
+                        NGCCHandler h = new simpleType(this, super._source, $runtime, 534);
                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                     }
                     else {
@@ -162,8 +157,8 @@ class SimpleType_Restriction extends NGCCHandler {
             break;
         case 12:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","base"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 53, fa);
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","base"))>=0 && (((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 542, fa);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -181,7 +176,7 @@ class SimpleType_Restriction extends NGCCHandler {
         case 2:
             {
                 if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
-                    NGCCHandler h = new facet(this, super._source, $runtime, 41);
+                    NGCCHandler h = new facet(this, super._source, $runtime, 530);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -190,6 +185,11 @@ class SimpleType_Restriction extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -215,11 +215,6 @@ class SimpleType_Restriction extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 10:
             {
                 $_ngcc_current_state = 5;
@@ -240,7 +235,7 @@ class SimpleType_Restriction extends NGCCHandler {
         case 12:
             {
                 if((($ai = $runtime.getAttributeIndex("","base"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 53, fa);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 542, fa);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -261,6 +256,11 @@ class SimpleType_Restriction extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveElement($__qname);
@@ -275,11 +275,6 @@ class SimpleType_Restriction extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 10:
             {
                 $_ngcc_current_state = 5;
@@ -299,7 +294,7 @@ class SimpleType_Restriction extends NGCCHandler {
         case 12:
             {
                 if(($__uri.equals("") && $__local.equals("base"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 53, fa);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 542, fa);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -320,6 +315,11 @@ class SimpleType_Restriction extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -334,17 +334,6 @@ class SimpleType_Restriction extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 10:
-            {
-                $_ngcc_current_state = 5;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 7:
             {
                 if(($__uri.equals("") && $__local.equals("base"))) {
@@ -355,6 +344,12 @@ class SimpleType_Restriction extends NGCCHandler {
                 }
             }
             break;
+        case 10:
+            {
+                $_ngcc_current_state = 5;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 4:
             {
                 action1();
@@ -368,6 +363,11 @@ class SimpleType_Restriction extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -379,9 +379,10 @@ class SimpleType_Restriction extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 0:
+        case 8:
             {
-                revertToParentFromText(result, super._cookie, $value);
+                NGCCHandler h = new qname(this, super._source, $runtime, 536);
+                spawnChildFromText(h, $value);
             }
             break;
         case 10:
@@ -401,17 +402,11 @@ class SimpleType_Restriction extends NGCCHandler {
         case 12:
             {
                 if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 53, fa);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 542, fa);
                     spawnChildFromText(h, $value);
                 }
             }
             break;
-        case 8:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 47);
-                spawnChildFromText(h, $value);
-            }
-            break;
         case 4:
             {
                 action1();
@@ -425,48 +420,53 @@ class SimpleType_Restriction extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
+        case 0:
+            {
+                revertToParentFromText(result, super._cookie, $value);
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 40:
+        case 529:
             {
                 facet = ((XSFacet)$__result__);
                 action0();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 51:
+        case 530:
             {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 5;
+                facet = ((XSFacet)$__result__);
+                action0();
+                $_ngcc_current_state = 1;
             }
             break;
-        case 47:
+        case 536:
             {
                 baseTypeName = ((UName)$__result__);
                 action2();
                 $_ngcc_current_state = 7;
             }
             break;
-        case 53:
+        case 540:
             {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 10;
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 5;
             }
             break;
-        case 45:
+        case 534:
             {
                 baseType = ((SimpleTypeImpl)$__result__);
                 $_ngcc_current_state = 4;
             }
             break;
-        case 41:
+        case 542:
             {
-                facet = ((XSFacet)$__result__);
-                action0();
-                $_ngcc_current_state = 1;
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 10;
             }
             break;
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java
index ead31314c51..74354ac3c4a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java
@@ -109,6 +109,41 @@ class SimpleType_Union extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 4:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 191, annotation,AnnotationContext.SIMPLETYPE_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 2;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+                    NGCCHandler h = new simpleType(this, super._source, $runtime, 188);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 6:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 193, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         case 7:
             {
                 if(($ai = $runtime.getAttributeIndex("","memberTypes"))>=0) {
@@ -121,6 +156,17 @@ class SimpleType_Union extends NGCCHandler {
                 }
             }
             break;
+        case 1:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+                    NGCCHandler h = new simpleType(this, super._source, $runtime, 187);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         case 12:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
@@ -138,52 +184,6 @@ class SimpleType_Union extends NGCCHandler {
                 revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
-        case 1:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                    NGCCHandler h = new simpleType(this, super._source, $runtime, 682);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 2:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                    NGCCHandler h = new simpleType(this, super._source, $runtime, 683);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 4:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 686, annotation,AnnotationContext.SIMPLETYPE_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 2;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 6:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 688, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -198,6 +198,29 @@ class SimpleType_Union extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 4:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 6:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 193, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         case 7:
             {
                 if(($ai = $runtime.getAttributeIndex("","memberTypes"))>=0) {
@@ -210,11 +233,6 @@ class SimpleType_Union extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 1:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
@@ -227,27 +245,9 @@ class SimpleType_Union extends NGCCHandler {
                 }
             }
             break;
-        case 2:
+        case 0:
             {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 4:
-            {
-                $_ngcc_current_state = 2;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 6:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 688, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
+                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -264,6 +264,18 @@ class SimpleType_Union extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 4:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 7:
             {
                 if(($__uri.equals("") && $__local.equals("memberTypes"))) {
@@ -280,18 +292,6 @@ class SimpleType_Union extends NGCCHandler {
                 revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 4:
-            {
-                $_ngcc_current_state = 2;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -306,26 +306,21 @@ class SimpleType_Union extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 7:
+        case 4:
             {
-                $_ngcc_current_state = 6;
+                $_ngcc_current_state = 2;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 4:
+        case 7:
             {
-                $_ngcc_current_state = 2;
+                $_ngcc_current_state = 6;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -339,6 +334,11 @@ class SimpleType_Union extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -350,6 +350,31 @@ class SimpleType_Union extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
+        case 4:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 9:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 195);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 10:
+            {
+                __text = $value;
+                $_ngcc_current_state = 9;
+                action3();
+            }
+            break;
         case 7:
             {
                 if(($ai = $runtime.getAttributeIndex("","memberTypes"))>=0) {
@@ -362,87 +387,62 @@ class SimpleType_Union extends NGCCHandler {
                 }
             }
             break;
+        case 8:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 196);
+                spawnChildFromText(h, $value);
+            }
+            break;
         case 0:
             {
                 revertToParentFromText(result, super._cookie, $value);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 4:
-            {
-                $_ngcc_current_state = 2;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 10:
-            {
-                __text = $value;
-                $_ngcc_current_state = 9;
-                action3();
-            }
-            break;
-        case 9:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 690);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 8:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 691);
-                spawnChildFromText(h, $value);
-            }
-            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 682:
+        case 188:
             {
                 anonymousMemberType = ((SimpleTypeImpl)$__result__);
                 action1();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 683:
-            {
-                anonymousMemberType = ((SimpleTypeImpl)$__result__);
-                action1();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 691:
+        case 196:
             {
                 memberTypeName = ((UName)$__result__);
                 action2();
                 $_ngcc_current_state = 8;
             }
             break;
-        case 690:
-            {
-                memberTypeName = ((UName)$__result__);
-                action2();
-                $_ngcc_current_state = 8;
-            }
-            break;
-        case 686:
+        case 191:
             {
                 annotation = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 2;
             }
             break;
-        case 688:
+        case 195:
+            {
+                memberTypeName = ((UName)$__result__);
+                action2();
+                $_ngcc_current_state = 8;
+            }
+            break;
+        case 193:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 4;
             }
             break;
+        case 187:
+            {
+                anonymousMemberType = ((SimpleTypeImpl)$__result__);
+                action1();
+                $_ngcc_current_state = 1;
+            }
+            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java
index 4d269dbcc3a..656b1fd08a1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java
@@ -85,6 +85,11 @@ class annotation extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
         case 2:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
@@ -97,11 +102,6 @@ class annotation extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
         default:
             {
                 unexpectedEnterElement($__qname);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java
index 71d1dd0db32..41ca784dfc0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java
@@ -90,53 +90,6 @@ class attributeDeclBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 9:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","type"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 7:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 216, null,AnnotationContext.ATTRIBUTE_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 1:
-            {
-                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                        NGCCHandler h = new simpleType(this, super._source, $runtime, 207);
-                        spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                    }
-                    else {
-                        $_ngcc_current_state = 0;
-                        $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                    }
-                }
-            }
-            break;
         case 13:
             {
                 if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
@@ -149,6 +102,11 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
         case 12:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -160,6 +118,48 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 9:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","type"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 7:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 338, null,AnnotationContext.ATTRIBUTE_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 1:
+            {
+                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+                        NGCCHandler h = new simpleType(this, super._source, $runtime, 329);
+                        spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                    }
+                    else {
+                        $_ngcc_current_state = 0;
+                        $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    }
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -174,41 +174,6 @@ class attributeDeclBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 9:
-            {
-                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 7:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 1:
-            {
-                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 0;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         case 13:
             {
                 if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
@@ -221,6 +186,11 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 12:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -232,6 +202,36 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 9:
+            {
+                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 7:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 1:
+            {
+                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 0;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedLeaveElement($__qname);
@@ -246,40 +246,6 @@ class attributeDeclBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 9:
-            {
-                if(($__uri.equals("") && $__local.equals("type"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 7:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 1:
-            {
-                if(($__uri.equals("") && $__local.equals("type"))) {
-                    $_ngcc_current_state = 5;
-                }
-                else {
-                    $_ngcc_current_state = 0;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         case 13:
             {
                 if(($__uri.equals("") && $__local.equals("form"))) {
@@ -291,6 +257,11 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 12:
             {
                 if(($__uri.equals("") && $__local.equals("name"))) {
@@ -301,6 +272,35 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 9:
+            {
+                if(($__uri.equals("") && $__local.equals("type"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 7:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 1:
+            {
+                if(($__uri.equals("") && $__local.equals("type"))) {
+                    $_ngcc_current_state = 5;
+                }
+                else {
+                    $_ngcc_current_state = 0;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -315,6 +315,17 @@ class attributeDeclBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 13:
+            {
+                $_ngcc_current_state = 12;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 10:
             {
                 if(($__uri.equals("") && $__local.equals("name"))) {
@@ -327,7 +338,7 @@ class attributeDeclBody extends NGCCHandler {
             break;
         case 9:
             {
-                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
+                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
                 spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
             }
             break;
@@ -337,27 +348,6 @@ class attributeDeclBody extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 14:
-            {
-                if(($__uri.equals("") && $__local.equals("form"))) {
-                    $_ngcc_current_state = 12;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 4:
             {
                 if(($__uri.equals("") && $__local.equals("type"))) {
@@ -368,9 +358,19 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 13:
+        case 14:
             {
-                $_ngcc_current_state = 12;
+                if(($__uri.equals("") && $__local.equals("form"))) {
+                    $_ngcc_current_state = 12;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 1:
+            {
+                $_ngcc_current_state = 0;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -385,67 +385,12 @@ class attributeDeclBody extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 15:
-            {
-                if($value.equals("unqualified")) {
-                    NGCCHandler h = new qualification(this, super._source, $runtime, 223);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if($value.equals("qualified")) {
-                        NGCCHandler h = new qualification(this, super._source, $runtime, 223);
-                        spawnChildFromText(h, $value);
-                    }
-                }
-            }
-            break;
-        case 5:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 209);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 9:
-            {
-                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 218, fa);
-                    spawnChildFromText(h, $value);
-                }
-            }
-            break;
-        case 7:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
         case 11:
             {
                 name = $value;
                 $_ngcc_current_state = 10;
             }
             break;
-        case 0:
-            {
-                revertToParentFromText(makeResult(), super._cookie, $value);
-            }
-            break;
-        case 1:
-            {
-                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 0;
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
         case 13:
             {
                 if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
@@ -458,6 +403,25 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromText(makeResult(), super._cookie, $value);
+            }
+            break;
+        case 15:
+            {
+                if($value.equals("unqualified")) {
+                    NGCCHandler h = new qualification(this, super._source, $runtime, 345);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if($value.equals("qualified")) {
+                        NGCCHandler h = new qualification(this, super._source, $runtime, 345);
+                        spawnChildFromText(h, $value);
+                    }
+                }
+            }
+            break;
         case 12:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -466,37 +430,73 @@ class attributeDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 9:
+            {
+                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 340, fa);
+                    spawnChildFromText(h, $value);
+                }
+            }
+            break;
+        case 7:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 1:
+            {
+                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 0;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 5:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 331);
+                spawnChildFromText(h, $value);
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 223:
+        case 345:
             {
                 form = ((Boolean)$__result__).booleanValue();
                 action1();
                 $_ngcc_current_state = 14;
             }
             break;
-        case 216:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 218:
+        case 340:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 7;
             }
             break;
-        case 207:
+        case 338:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 329:
             {
                 type = ((SimpleTypeImpl)$__result__);
                 $_ngcc_current_state = 0;
             }
             break;
-        case 209:
+        case 331:
             {
                 typeName = ((UName)$__result__);
                 action0();
@@ -507,7 +507,7 @@ class attributeDeclBody extends NGCCHandler {
     }
 
     public boolean accepted() {
-        return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 7))));
+        return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 7))));
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java
index 7d781aa429b..2f0b7d9e9ce 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java
@@ -81,34 +81,28 @@ class attributeGroupDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 7:
+        case 13:
             {
-                if(($ai = $runtime.getAttributeIndex("","id"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 6;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    unexpectedEnterElement($__qname);
                 }
             }
             break;
-        case 4:
+        case 3:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 17, null,AnnotationContext.ATTRIBUTE_GROUP);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 3;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
+                action0();
+                $_ngcc_current_state = 2;
+                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
         case 6:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 19, fa);
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 674, fa);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -128,37 +122,43 @@ class attributeGroupDecl extends NGCCHandler {
                 }
             }
             break;
+        case 2:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 669, result);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         case 0:
             {
                 revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
-        case 13:
+        case 4:
             {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 672, null,AnnotationContext.ATTRIBUTE_GROUP);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 3;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 7:
+            {
+                if(($ai = $runtime.getAttributeIndex("","id"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 3:
-            {
-                action0();
-                $_ngcc_current_state = 2;
-                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 2:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) {
-                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 14, result);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
+                    $_ngcc_current_state = 6;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
             break;
@@ -176,40 +176,6 @@ class attributeGroupDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 7:
-            {
-                if(($ai = $runtime.getAttributeIndex("","id"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 6;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 4:
-            {
-                $_ngcc_current_state = 3;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 6:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 19, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 13:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -228,6 +194,28 @@ class attributeGroupDecl extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 6:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 674, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 669, result);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         case 1:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
@@ -239,14 +227,26 @@ class attributeGroupDecl extends NGCCHandler {
                 }
             }
             break;
-        case 2:
+        case 0:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
-                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 14, result);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 4:
+            {
+                $_ngcc_current_state = 3;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 7:
+            {
+                if(($ai = $runtime.getAttributeIndex("","id"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
-                    unexpectedLeaveElement($__qname);
+                    $_ngcc_current_state = 6;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
             }
             break;
@@ -264,28 +264,6 @@ class attributeGroupDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 7:
-            {
-                if(($__uri.equals("") && $__local.equals("id"))) {
-                    $_ngcc_current_state = 9;
-                }
-                else {
-                    $_ngcc_current_state = 6;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 4:
-            {
-                $_ngcc_current_state = 3;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 13:
             {
                 if(($__uri.equals("") && $__local.equals("name"))) {
@@ -303,6 +281,28 @@ class attributeGroupDecl extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 4:
+            {
+                $_ngcc_current_state = 3;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 7:
+            {
+                if(($__uri.equals("") && $__local.equals("id"))) {
+                    $_ngcc_current_state = 9;
+                }
+                else {
+                    $_ngcc_current_state = 6;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -317,6 +317,13 @@ class attributeGroupDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 3:
+            {
+                action0();
+                $_ngcc_current_state = 2;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 8:
             {
                 if(($__uri.equals("") && $__local.equals("id"))) {
@@ -327,30 +334,6 @@ class attributeGroupDecl extends NGCCHandler {
                 }
             }
             break;
-        case 7:
-            {
-                $_ngcc_current_state = 6;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 4:
-            {
-                $_ngcc_current_state = 3;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 3:
-            {
-                action0();
-                $_ngcc_current_state = 2;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 11:
             {
                 if(($__uri.equals("") && $__local.equals("name"))) {
@@ -361,6 +344,23 @@ class attributeGroupDecl extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 4:
+            {
+                $_ngcc_current_state = 3;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 7:
+            {
+                $_ngcc_current_state = 6;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -372,6 +372,43 @@ class attributeGroupDecl extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
+        case 13:
+            {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 12:
+            {
+                name = $value;
+                $_ngcc_current_state = 11;
+            }
+            break;
+        case 9:
+            {
+                $_ngcc_current_state = 8;
+            }
+            break;
+        case 3:
+            {
+                action0();
+                $_ngcc_current_state = 2;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromText(result, super._cookie, $value);
+            }
+            break;
+        case 4:
+            {
+                $_ngcc_current_state = 3;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
         case 7:
             {
                 if(($ai = $runtime.getAttributeIndex("","id"))>=0) {
@@ -384,63 +421,26 @@ class attributeGroupDecl extends NGCCHandler {
                 }
             }
             break;
-        case 4:
-            {
-                $_ngcc_current_state = 3;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 9:
-            {
-                $_ngcc_current_state = 8;
-            }
-            break;
-        case 12:
-            {
-                name = $value;
-                $_ngcc_current_state = 11;
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromText(result, super._cookie, $value);
-            }
-            break;
-        case 13:
-            {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 3:
-            {
-                action0();
-                $_ngcc_current_state = 2;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 19:
+        case 669:
             {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 4;
+                $_ngcc_current_state = 1;
             }
             break;
-        case 17:
+        case 672:
             {
                 annotation = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 3;
             }
             break;
-        case 14:
+        case 674:
             {
-                $_ngcc_current_state = 1;
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 4;
             }
             break;
         }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java
index 3e432421248..21bd093be0c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java
@@ -141,144 +141,6 @@ class attributeUses extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 33:
-            {
-                if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 29;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 19:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 621, null,AnnotationContext.ATTRIBUTE_USE);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 18;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 25:
-            {
-                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 17;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 5:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    action7();
-                    $_ngcc_current_state = 33;
-                }
-                else {
-                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
-                        $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                        action3();
-                        $_ngcc_current_state = 13;
-                    }
-                    else {
-                        $_ngcc_current_state = 1;
-                        $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                    }
-                }
-            }
-            break;
-        case 8:
-            {
-                action2();
-                $_ngcc_current_state = 7;
-                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 3:
-            {
-                if((($ai = $runtime.getAttributeIndex("","namespace"))>=0 || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($ai = $runtime.getAttributeIndex("","processContents"))>=0))) {
-                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 603, wloc);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 16:
-            {
-                action4();
-                $_ngcc_current_state = 15;
-                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 9:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 610, null,AnnotationContext.ATTRIBUTE_USE);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 8;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 29:
-            {
-                if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 25;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 17:
-            {
-                if((($ai = $runtime.getAttributeIndex("","form"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0)) {
-                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 628, locator,true,defaultValue,fixedValue);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                        $runtime.consumeAttribute($ai);
-                        $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                    }
-                    else {
-                        unexpectedEnterElement($__qname);
-                    }
-                }
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 13:
-            {
-                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         case 1:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
@@ -306,6 +168,144 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
+        case 13:
+            {
+                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 25:
+            {
+                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 17;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 8:
+            {
+                action2();
+                $_ngcc_current_state = 7;
+                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 33:
+            {
+                if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 29;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 9:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 409, null,AnnotationContext.ATTRIBUTE_USE);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 8;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 3:
+            {
+                if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($ai = $runtime.getAttributeIndex("","namespace"))>=0))) {
+                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 402, wloc);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 29:
+            {
+                if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 25;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 5:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    action7();
+                    $_ngcc_current_state = 33;
+                }
+                else {
+                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+                        $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                        action3();
+                        $_ngcc_current_state = 13;
+                    }
+                    else {
+                        $_ngcc_current_state = 1;
+                        $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    }
+                }
+            }
+            break;
+        case 19:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 420, null,AnnotationContext.ATTRIBUTE_USE);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 18;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 17:
+            {
+                if((($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","form"))>=0)) {
+                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 427, locator,true,defaultValue,fixedValue);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+                        $runtime.consumeAttribute($ai);
+                        $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    }
+                    else {
+                        unexpectedEnterElement($__qname);
+                    }
+                }
+            }
+            break;
+        case 16:
+            {
+                action4();
+                $_ngcc_current_state = 15;
+                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -320,24 +320,34 @@ class attributeUses extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 33:
+        case 2:
             {
-                if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 1:
+            {
+                $_ngcc_current_state = 0;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 13:
+            {
+                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
-                    $_ngcc_current_state = 29;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                    unexpectedLeaveElement($__qname);
                 }
             }
             break;
-        case 19:
-            {
-                $_ngcc_current_state = 18;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 25:
             {
                 if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
@@ -350,17 +360,81 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
+        case 8:
+            {
+                action2();
+                $_ngcc_current_state = 7;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 33:
+            {
+                if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 29;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 9:
+            {
+                $_ngcc_current_state = 8;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 29:
+            {
+                if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 25;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 3:
+            {
+                if(((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) {
+                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 402, wloc);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 7:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 1;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 5:
             {
                 $_ngcc_current_state = 1;
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 2:
+        case 18:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 418, null);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -378,64 +452,10 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
-        case 8:
-            {
-                action2();
-                $_ngcc_current_state = 7;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 3:
-            {
-                if(((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) {
-                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 603, wloc);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 16:
-            {
-                action4();
-                $_ngcc_current_state = 15;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 9:
-            {
-                $_ngcc_current_state = 8;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 29:
-            {
-                if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 25;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 7:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 1;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
         case 17:
             {
-                if(((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
-                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 628, locator,true,defaultValue,fixedValue);
+                if(((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) || (($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 427, locator,true,defaultValue,fixedValue);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -449,36 +469,16 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 19:
             {
-                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+                $_ngcc_current_state = 18;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 18:
+        case 16:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 619, null);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 13:
-            {
-                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
+                action4();
+                $_ngcc_current_state = 15;
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -496,21 +496,20 @@ class attributeUses extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 33:
+        case 1:
             {
-                if(($__uri.equals("") && $__local.equals("use"))) {
-                    $_ngcc_current_state = 35;
-                }
-                else {
-                    $_ngcc_current_state = 29;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
+                $_ngcc_current_state = 0;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 19:
+        case 13:
             {
-                $_ngcc_current_state = 18;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("ref"))) {
+                    $_ngcc_current_state = 12;
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
             }
             break;
         case 25:
@@ -524,12 +523,6 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
-        case 5:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 8:
             {
                 action2();
@@ -537,30 +530,34 @@ class attributeUses extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 3:
+        case 33:
             {
-                if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) {
-                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 603, wloc);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("use"))) {
+                    $_ngcc_current_state = 35;
                 }
                 else {
-                    unexpectedEnterAttribute($__qname);
+                    $_ngcc_current_state = 29;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
                 }
             }
             break;
-        case 16:
-            {
-                action4();
-                $_ngcc_current_state = 15;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 9:
             {
                 $_ngcc_current_state = 8;
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 3:
+            {
+                if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) {
+                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 402, wloc);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
+            }
+            break;
         case 29:
             {
                 if(($__uri.equals("") && $__local.equals("default"))) {
@@ -572,10 +569,27 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 5:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 19:
+            {
+                $_ngcc_current_state = 18;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 17:
             {
-                if((($__uri.equals("") && $__local.equals("form")) || ($__uri.equals("") && $__local.equals("name")))) {
-                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 628, locator,true,defaultValue,fixedValue);
+                if((($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("form")))) {
+                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 427, locator,true,defaultValue,fixedValue);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -588,24 +602,10 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 16:
             {
-                revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 13:
-            {
-                if(($__uri.equals("") && $__local.equals("ref"))) {
-                    $_ngcc_current_state = 12;
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
+                action4();
+                $_ngcc_current_state = 15;
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -623,15 +623,9 @@ class attributeUses extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 33:
+        case 1:
             {
-                $_ngcc_current_state = 29;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 19:
-            {
-                $_ngcc_current_state = 18;
+                $_ngcc_current_state = 0;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -641,12 +635,46 @@ class attributeUses extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 5:
+        case 8:
             {
-                $_ngcc_current_state = 1;
+                action2();
+                $_ngcc_current_state = 7;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 33:
+            {
+                $_ngcc_current_state = 29;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 9:
+            {
+                $_ngcc_current_state = 8;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 29:
+            {
+                $_ngcc_current_state = 25;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 34:
+            {
+                if(($__uri.equals("") && $__local.equals("use"))) {
+                    $_ngcc_current_state = 29;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 30:
             {
                 if(($__uri.equals("") && $__local.equals("default"))) {
@@ -657,33 +685,9 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
-        case 8:
+        case 5:
             {
-                action2();
-                $_ngcc_current_state = 7;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 16:
-            {
-                action4();
-                $_ngcc_current_state = 15;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 26:
-            {
-                if(($__uri.equals("") && $__local.equals("fixed"))) {
-                    $_ngcc_current_state = 17;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 9:
-            {
-                $_ngcc_current_state = 8;
+                $_ngcc_current_state = 1;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -697,33 +701,6 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
-        case 29:
-            {
-                $_ngcc_current_state = 25;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 34:
-            {
-                if(($__uri.equals("") && $__local.equals("use"))) {
-                    $_ngcc_current_state = 29;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
         case 21:
             {
                 if(($__uri.equals("") && $__local.equals("ref"))) {
@@ -734,6 +711,29 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
+        case 19:
+            {
+                $_ngcc_current_state = 18;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 26:
+            {
+                if(($__uri.equals("") && $__local.equals("fixed"))) {
+                    $_ngcc_current_state = 17;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 16:
+            {
+                action4();
+                $_ngcc_current_state = 15;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -745,28 +745,30 @@ class attributeUses extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 33:
+        case 12:
             {
-                if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 29;
-                    $runtime.sendText(super._cookie, $value);
-                }
+                NGCCHandler h = new qname(this, super._source, $runtime, 412);
+                spawnChildFromText(h, $value);
             }
             break;
-        case 19:
+        case 1:
             {
-                $_ngcc_current_state = 18;
+                $_ngcc_current_state = 0;
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 12:
+        case 13:
             {
-                NGCCHandler h = new qname(this, super._source, $runtime, 613);
-                spawnChildFromText(h, $value);
+                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 27:
+            {
+                fixedValue = $value;
+                $_ngcc_current_state = 26;
             }
             break;
         case 25:
@@ -781,18 +783,6 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
-        case 5:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 35:
-            {
-                use = $value;
-                $_ngcc_current_state = 34;
-            }
-            break;
         case 8:
             {
                 action2();
@@ -800,45 +790,38 @@ class attributeUses extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 3:
+        case 33:
             {
-                if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
-                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 603, wloc);
-                    spawnChildFromText(h, $value);
+                if(($ai = $runtime.getAttributeIndex("","use"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
                 }
                 else {
-                    if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                        NGCCHandler h = new wildcardBody(this, super._source, $runtime, 603, wloc);
-                        spawnChildFromText(h, $value);
-                    }
+                    $_ngcc_current_state = 29;
+                    $runtime.sendText(super._cookie, $value);
                 }
             }
             break;
-        case 16:
-            {
-                action4();
-                $_ngcc_current_state = 15;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 27:
-            {
-                fixedValue = $value;
-                $_ngcc_current_state = 26;
-            }
-            break;
-        case 31:
-            {
-                defaultValue = $value;
-                $_ngcc_current_state = 30;
-            }
-            break;
         case 9:
             {
                 $_ngcc_current_state = 8;
                 $runtime.sendText(super._cookie, $value);
             }
             break;
+        case 3:
+            {
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 402, wloc);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+                        NGCCHandler h = new wildcardBody(this, super._source, $runtime, 402, wloc);
+                        spawnChildFromText(h, $value);
+                    }
+                }
+            }
+            break;
         case 29:
             {
                 if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
@@ -851,15 +834,32 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromText(this, super._cookie, $value);
+            }
+            break;
+        case 5:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 22:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 423);
+                spawnChildFromText(h, $value);
+            }
+            break;
         case 17:
             {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 628, locator,true,defaultValue,fixedValue);
+                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                    NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 427, locator,true,defaultValue,fixedValue);
                     spawnChildFromText(h, $value);
                 }
                 else {
-                    if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
-                        NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 628, locator,true,defaultValue,fixedValue);
+                    if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                        NGCCHandler h = new attributeDeclBody(this, super._source, $runtime, 427, locator,true,defaultValue,fixedValue);
                         spawnChildFromText(h, $value);
                     }
                     else {
@@ -871,85 +871,85 @@ class attributeUses extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 19:
             {
-                revertToParentFromText(this, super._cookie, $value);
-            }
-            break;
-        case 22:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 624);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 13:
-            {
-                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
+                $_ngcc_current_state = 18;
                 $runtime.sendText(super._cookie, $value);
             }
             break;
+        case 31:
+            {
+                defaultValue = $value;
+                $_ngcc_current_state = 30;
+            }
+            break;
+        case 16:
+            {
+                action4();
+                $_ngcc_current_state = 15;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 35:
+            {
+                use = $value;
+                $_ngcc_current_state = 34;
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 621:
+        case 412:
             {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 18;
+                groupName = ((UName)$__result__);
+                $_ngcc_current_state = 11;
             }
             break;
-        case 603:
+        case 402:
             {
                 wildcard = ((WildcardImpl)$__result__);
                 action0();
                 $_ngcc_current_state = 2;
             }
             break;
-        case 610:
-            {
-                $_ngcc_current_state = 8;
-            }
-            break;
-        case 628:
-            {
-                anonymousDecl = ((AttributeDeclImpl)$__result__);
-                action6();
-                $_ngcc_current_state = 16;
-            }
-            break;
-        case 619:
+        case 418:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 16;
             }
             break;
-        case 613:
+        case 420:
             {
-                groupName = ((UName)$__result__);
-                $_ngcc_current_state = 11;
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 18;
             }
             break;
-        case 624:
+        case 409:
+            {
+                $_ngcc_current_state = 8;
+            }
+            break;
+        case 423:
             {
                 attDeclName = ((UName)$__result__);
                 action5();
                 $_ngcc_current_state = 21;
             }
             break;
+        case 427:
+            {
+                anonymousDecl = ((AttributeDeclImpl)$__result__);
+                action6();
+                $_ngcc_current_state = 16;
+            }
+            break;
         }
     }
 
     public boolean accepted() {
-        return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 5))));
+        return((($_ngcc_current_state == 5) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 1))));
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java
index 9428e3db1ab..ad5658ac78b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java
@@ -187,14 +187,42 @@ class complexType extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 28:
+        case 7:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 113, fa);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    action7();
+                    $_ngcc_current_state = 24;
+                }
+                else {
+                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+                        $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                        action4();
+                        $_ngcc_current_state = 15;
+                    }
+                    else {
+                        unexpectedEnterElement($__qname);
+                    }
+                }
+            }
+            break;
+        case 38:
+            {
+                action8();
+                $_ngcc_current_state = 37;
+                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 48:
+            {
+                if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
+                    NGCCHandler h = new facet(this, super._source, $runtime, 257);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    unexpectedEnterElement($__qname);
+                    action11();
+                    $_ngcc_current_state = 47;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
             break;
@@ -210,21 +238,33 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 47:
+        case 44:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) {
-                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 135, result);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
                     unexpectedEnterElement($__qname);
                 }
             }
             break;
+        case 49:
+            {
+                if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
+                    NGCCHandler h = new facet(this, super._source, $runtime, 258);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 48;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 18:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) {
-                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 100, result);
+                if((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))))))))) {
+                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 219, result);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -232,29 +272,33 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 52:
+        case 67:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                    NGCCHandler h = new simpleType(this, super._source, $runtime, 143);
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent")))))))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 284, fa);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 51;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    unexpectedEnterElement($__qname);
                 }
             }
             break;
-        case 38:
+        case 88:
             {
-                action8();
-                $_ngcc_current_state = 37;
-                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    action16();
+                    $_ngcc_current_state = 84;
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
             }
             break;
         case 61:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 155, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 274, annotation,AnnotationContext.COMPLEXTYPE_DECL);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -263,6 +307,40 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 28:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 232, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 80:
+            {
+                if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 76;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 12:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         case 35:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
@@ -282,102 +360,36 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 88:
+        case 76:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    action16();
-                    $_ngcc_current_state = 84;
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 48:
-            {
-                if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
-                    NGCCHandler h = new facet(this, super._source, $runtime, 138);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    action11();
-                    $_ngcc_current_state = 47;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 49:
-            {
-                if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
-                    NGCCHandler h = new facet(this, super._source, $runtime, 139);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 48;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 59:
-            {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
+                else {
+                    $_ngcc_current_state = 72;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 51:
+            {
+                action13();
+                $_ngcc_current_state = 49;
+                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 47:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 254, result);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
                 else {
                     unexpectedEnterElement($__qname);
                 }
             }
             break;
-        case 39:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 126, annotation,AnnotationContext.COMPLEXTYPE_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 38;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 2:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    $_ngcc_current_state = 63;
-                }
-                else {
-                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) {
-                        $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                        $_ngcc_current_state = 29;
-                    }
-                    else {
-                        if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) {
-                            action1();
-                            NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 86, result);
-                            spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                        }
-                        else {
-                            unexpectedEnterElement($__qname);
-                        }
-                    }
-                }
-            }
-            break;
-        case 65:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 163, null,AnnotationContext.COMPLEXTYPE_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 2;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         case 68:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -401,22 +413,37 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 7:
+        case 37:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    action7();
-                    $_ngcc_current_state = 24;
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 242, result);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
-                        $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                        action4();
-                        $_ngcc_current_state = 15;
-                    }
-                    else {
-                        unexpectedEnterElement($__qname);
-                    }
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 26:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 230, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 7;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 56:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || (((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 267, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
                 }
             }
             break;
@@ -431,97 +458,10 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 21:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 104, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 54:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 146, annotation,AnnotationContext.COMPLEXTYPE_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 52;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 80:
-            {
-                if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 76;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 9:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))))))))) {
-                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 89, result);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 51:
-            {
-                action13();
-                $_ngcc_current_state = 49;
-                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 12:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 93, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 26:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 111, annotation,AnnotationContext.COMPLEXTYPE_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 7;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 67:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")))))))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 165, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         case 10:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 91, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 210, annotation,AnnotationContext.COMPLEXTYPE_DECL);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -530,15 +470,14 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 29:
+        case 41:
             {
-                if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 247, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 28;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    unexpectedEnterElement($__qname);
                 }
             }
             break;
@@ -554,28 +493,111 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    $_ngcc_current_state = 63;
+                }
+                else {
+                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) {
+                        $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                        $_ngcc_current_state = 29;
+                    }
+                    else {
+                        if((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))))))))) {
+                            action1();
+                            NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 205, result);
+                            spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                        }
+                        else {
+                            unexpectedEnterElement($__qname);
+                        }
+                    }
+                }
+            }
+            break;
+        case 65:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 282, null,AnnotationContext.COMPLEXTYPE_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 2;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 21:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 223, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 54:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 265, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 52;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 52:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+                    NGCCHandler h = new simpleType(this, super._source, $runtime, 262);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 51;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 39:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 245, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 38;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 0:
             {
                 revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
-        case 76:
+        case 29:
             {
-                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 72;
+                    $_ngcc_current_state = 28;
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
             break;
-        case 44:
+        case 9:
             {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))))))))) {
+                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 208, result);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
                     unexpectedEnterElement($__qname);
@@ -585,7 +607,7 @@ class complexType extends NGCCHandler {
         case 19:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 102, annotation,AnnotationContext.COMPLEXTYPE_DECL);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 221, annotation,AnnotationContext.COMPLEXTYPE_DECL);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -594,43 +616,10 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 37:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) {
-                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 123, result);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 41:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 128, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 56:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 148, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         case 63:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 157, fa);
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 276, fa);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -638,6 +627,17 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 59:
+            {
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -652,22 +652,47 @@ class complexType extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 1:
+        case 38:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+                action8();
+                $_ngcc_current_state = 37;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 48:
+            {
+                action11();
+                $_ngcc_current_state = 47;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 6:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) {
                     $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
+                    $_ngcc_current_state = 1;
                 }
                 else {
                     unexpectedLeaveElement($__qname);
                 }
             }
             break;
-        case 8:
+        case 36:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
                     $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 6;
+                    $_ngcc_current_state = 34;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 44:
+            {
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -686,21 +711,16 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 47:
+        case 49:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
-                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 135, result);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
+                $_ngcc_current_state = 48;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
         case 18:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
-                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 100, result);
+                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 219, result);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -708,71 +728,50 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 46:
+        case 67:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 34;
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 284, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
                 }
             }
             break;
-        case 52:
-            {
-                $_ngcc_current_state = 51;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 38:
-            {
-                action8();
-                $_ngcc_current_state = 37;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 61:
             {
                 $_ngcc_current_state = 35;
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 48:
+        case 34:
             {
-                action11();
-                $_ngcc_current_state = 47;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 49:
-            {
-                $_ngcc_current_state = 48;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 59:
-            {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 1;
                 }
                 else {
                     unexpectedLeaveElement($__qname);
                 }
             }
             break;
-        case 39:
+        case 80:
             {
-                $_ngcc_current_state = 38;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 76;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
             }
             break;
-        case 2:
+        case 12:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
-                    action1();
-                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 86, result);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 212, fa);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -780,12 +779,36 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 65:
+        case 76:
             {
-                $_ngcc_current_state = 2;
+                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 72;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 51:
+            {
+                action13();
+                $_ngcc_current_state = 49;
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 47:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 254, result);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         case 68:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -809,69 +832,22 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 24:
+        case 37:
             {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 242, result);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
                 }
             }
             break;
-        case 21:
+        case 46:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 104, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 54:
-            {
-                $_ngcc_current_state = 52;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 80:
-            {
-                if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 76;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 9:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
-                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 89, result);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 51:
-            {
-                action13();
-                $_ngcc_current_state = 49;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 12:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 93, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 34;
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -884,22 +860,22 @@ class complexType extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 17:
+        case 56:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 6;
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 267, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
                 }
             }
             break;
-        case 67:
+        case 24:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 165, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -912,34 +888,11 @@ class complexType extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 34:
+        case 41:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleContent"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 1;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 29:
-            {
-                if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 28;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 6:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexContent"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 1;
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 247, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -958,28 +911,108 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+                    action1();
+                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 205, result);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 65:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 17:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 6;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 21:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 223, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 54:
+            {
+                $_ngcc_current_state = 52;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 52:
+            {
+                $_ngcc_current_state = 51;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 39:
+            {
+                $_ngcc_current_state = 38;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 8:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 6;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 1:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         case 0:
             {
                 revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 76:
+        case 29:
             {
-                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
-                    $_ngcc_current_state = 72;
+                    $_ngcc_current_state = 28;
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
             }
             break;
-        case 44:
+        case 9:
             {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
+                    NGCCHandler h = new complexType_complexContent_body(this, super._source, $runtime, 208, result);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -992,44 +1025,11 @@ class complexType extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 37:
+        case 59:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
-                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 123, result);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 41:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 128, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 56:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 148, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 36:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("extension"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 34;
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -1050,34 +1050,6 @@ class complexType extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 59:
-            {
-                if(($__uri.equals("") && $__local.equals("base"))) {
-                    $_ngcc_current_state = 58;
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
-        case 49:
-            {
-                $_ngcc_current_state = 48;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 39:
-            {
-                $_ngcc_current_state = 38;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 65:
-            {
-                $_ngcc_current_state = 2;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 68:
             {
                 if(($__uri.equals("") && $__local.equals("name"))) {
@@ -1089,6 +1061,20 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 38:
+            {
+                action8();
+                $_ngcc_current_state = 37;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 48:
+            {
+                action11();
+                $_ngcc_current_state = 47;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 15:
             {
                 if(($__uri.equals("") && $__local.equals("base"))) {
@@ -1099,6 +1085,12 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 26:
+            {
+                $_ngcc_current_state = 7;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 24:
             {
                 if(($__uri.equals("") && $__local.equals("base"))) {
@@ -1109,42 +1101,33 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 54:
-            {
-                $_ngcc_current_state = 52;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 80:
-            {
-                if(($__uri.equals("") && $__local.equals("block"))) {
-                    $_ngcc_current_state = 82;
-                }
-                else {
-                    $_ngcc_current_state = 76;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 51:
-            {
-                action13();
-                $_ngcc_current_state = 49;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 26:
-            {
-                $_ngcc_current_state = 7;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 10:
             {
                 $_ngcc_current_state = 9;
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 84:
+            {
+                if(($__uri.equals("") && $__local.equals("abstract"))) {
+                    $_ngcc_current_state = 86;
+                }
+                else {
+                    $_ngcc_current_state = 80;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 44:
+            {
+                if(($__uri.equals("") && $__local.equals("base"))) {
+                    $_ngcc_current_state = 43;
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
+            }
+            break;
         case 72:
             {
                 if(($__uri.equals("") && $__local.equals("mixed"))) {
@@ -1156,6 +1139,58 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 49:
+            {
+                $_ngcc_current_state = 48;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 65:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 54:
+            {
+                $_ngcc_current_state = 52;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 52:
+            {
+                $_ngcc_current_state = 51;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 39:
+            {
+                $_ngcc_current_state = 38;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 61:
+            {
+                $_ngcc_current_state = 35;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 80:
+            {
+                if(($__uri.equals("") && $__local.equals("block"))) {
+                    $_ngcc_current_state = 82;
+                }
+                else {
+                    $_ngcc_current_state = 76;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 29:
             {
                 if(($__uri.equals("") && $__local.equals("mixed"))) {
@@ -1167,22 +1202,6 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 84:
-            {
-                if(($__uri.equals("") && $__local.equals("abstract"))) {
-                    $_ngcc_current_state = 86;
-                }
-                else {
-                    $_ngcc_current_state = 80;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 76:
             {
                 if(($__uri.equals("") && $__local.equals("final"))) {
@@ -1194,32 +1213,10 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 52:
+        case 51:
             {
-                $_ngcc_current_state = 51;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 44:
-            {
-                if(($__uri.equals("") && $__local.equals("base"))) {
-                    $_ngcc_current_state = 43;
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
-        case 38:
-            {
-                action8();
-                $_ngcc_current_state = 37;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 61:
-            {
-                $_ngcc_current_state = 35;
+                action13();
+                $_ngcc_current_state = 49;
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -1229,11 +1226,14 @@ class complexType extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 48:
+        case 59:
             {
-                action11();
-                $_ngcc_current_state = 47;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("base"))) {
+                    $_ngcc_current_state = 58;
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
             }
             break;
         default:
@@ -1250,32 +1250,20 @@ class complexType extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 42:
+        case 81:
             {
-                if(($__uri.equals("") && $__local.equals("base"))) {
-                    $_ngcc_current_state = 41;
+                if(($__uri.equals("") && $__local.equals("block"))) {
+                    $_ngcc_current_state = 76;
                 }
                 else {
                     unexpectedLeaveAttribute($__qname);
                 }
             }
             break;
-        case 72:
+        case 22:
             {
-                $_ngcc_current_state = 68;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 52:
-            {
-                $_ngcc_current_state = 51;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 69:
-            {
-                if(($__uri.equals("") && $__local.equals("name"))) {
-                    $_ngcc_current_state = 67;
+                if(($__uri.equals("") && $__local.equals("base"))) {
+                    $_ngcc_current_state = 21;
                 }
                 else {
                     unexpectedLeaveAttribute($__qname);
@@ -1289,22 +1277,13 @@ class complexType extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 61:
+        case 48:
             {
-                $_ngcc_current_state = 35;
+                action11();
+                $_ngcc_current_state = 47;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 81:
-            {
-                if(($__uri.equals("") && $__local.equals("block"))) {
-                    $_ngcc_current_state = 76;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
         case 73:
             {
                 if(($__uri.equals("") && $__local.equals("mixed"))) {
@@ -1315,10 +1294,19 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 48:
+        case 30:
             {
-                action11();
-                $_ngcc_current_state = 47;
+                if(($__uri.equals("") && $__local.equals("mixed"))) {
+                    $_ngcc_current_state = 28;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 72:
+            {
+                $_ngcc_current_state = 68;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -1328,43 +1316,31 @@ class complexType extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 39:
+        case 61:
             {
-                $_ngcc_current_state = 38;
+                $_ngcc_current_state = 35;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 65:
-            {
-                $_ngcc_current_state = 2;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 68:
-            {
-                $_ngcc_current_state = 67;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 57:
-            {
-                if(($__uri.equals("") && $__local.equals("base"))) {
-                    $_ngcc_current_state = 56;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
         case 80:
             {
                 $_ngcc_current_state = 76;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 54:
+        case 69:
             {
-                $_ngcc_current_state = 52;
+                if(($__uri.equals("") && $__local.equals("name"))) {
+                    $_ngcc_current_state = 67;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 76:
+            {
+                $_ngcc_current_state = 72;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -1375,40 +1351,6 @@ class complexType extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 26:
-            {
-                $_ngcc_current_state = 7;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 10:
-            {
-                $_ngcc_current_state = 9;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 29:
-            {
-                $_ngcc_current_state = 28;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 22:
-            {
-                if(($__uri.equals("") && $__local.equals("base"))) {
-                    $_ngcc_current_state = 21;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 84:
-            {
-                $_ngcc_current_state = 80;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 77:
             {
                 if(($__uri.equals("") && $__local.equals("final"))) {
@@ -1419,30 +1361,9 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 68:
             {
-                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 76:
-            {
-                $_ngcc_current_state = 72;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 30:
-            {
-                if(($__uri.equals("") && $__local.equals("mixed"))) {
-                    $_ngcc_current_state = 28;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 19:
-            {
-                $_ngcc_current_state = 18;
+                $_ngcc_current_state = 67;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -1466,6 +1387,85 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 42:
+            {
+                if(($__uri.equals("") && $__local.equals("base"))) {
+                    $_ngcc_current_state = 41;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 10:
+            {
+                $_ngcc_current_state = 9;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 26:
+            {
+                $_ngcc_current_state = 7;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 84:
+            {
+                $_ngcc_current_state = 80;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 65:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 54:
+            {
+                $_ngcc_current_state = 52;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 52:
+            {
+                $_ngcc_current_state = 51;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 39:
+            {
+                $_ngcc_current_state = 38;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 57:
+            {
+                if(($__uri.equals("") && $__local.equals("base"))) {
+                    $_ngcc_current_state = 56;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 29:
+            {
+                $_ngcc_current_state = 28;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 19:
+            {
+                $_ngcc_current_state = 18;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -1477,21 +1477,35 @@ class complexType extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
+        case 38:
+            {
+                action8();
+                $_ngcc_current_state = 37;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 48:
+            {
+                action11();
+                $_ngcc_current_state = 47;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 70:
+            {
+                name = $value;
+                $_ngcc_current_state = 69;
+            }
+            break;
         case 82:
             {
-                NGCCHandler h = new erSet(this, super._source, $runtime, 182);
+                NGCCHandler h = new erSet(this, super._source, $runtime, 301);
                 spawnChildFromText(h, $value);
             }
             break;
-        case 23:
+        case 78:
             {
-                NGCCHandler h = new qname(this, super._source, $runtime, 106);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 43:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 130);
+                NGCCHandler h = new erSet(this, super._source, $runtime, 296);
                 spawnChildFromText(h, $value);
             }
             break;
@@ -1507,48 +1521,12 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 58:
+        case 44:
             {
-                NGCCHandler h = new qname(this, super._source, $runtime, 150);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 31:
-            {
-                mixedValue = $value;
-                $_ngcc_current_state = 30;
-            }
-            break;
-        case 52:
-            {
-                $_ngcc_current_state = 51;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 38:
-            {
-                action8();
-                $_ngcc_current_state = 37;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 61:
-            {
-                $_ngcc_current_state = 35;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 70:
-            {
-                name = $value;
-                $_ngcc_current_state = 69;
-            }
-            break;
-        case 48:
-            {
-                action11();
-                $_ngcc_current_state = 47;
-                $runtime.sendText(super._cookie, $value);
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
             }
             break;
         case 49:
@@ -1557,69 +1535,15 @@ class complexType extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 59:
-            {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 39:
-            {
-                $_ngcc_current_state = 38;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 65:
-            {
-                $_ngcc_current_state = 2;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 68:
-            {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 67;
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 74:
+        case 31:
             {
                 mixedValue = $value;
-                $_ngcc_current_state = 73;
+                $_ngcc_current_state = 30;
             }
             break;
-        case 15:
+        case 61:
             {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 24:
-            {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 86:
-            {
-                abstractValue = $value;
-                $_ngcc_current_state = 85;
-            }
-            break;
-        case 54:
-            {
-                $_ngcc_current_state = 52;
+                $_ngcc_current_state = 35;
                 $runtime.sendText(super._cookie, $value);
             }
             break;
@@ -1635,6 +1559,30 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
+        case 14:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 214);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 74:
+            {
+                mixedValue = $value;
+                $_ngcc_current_state = 73;
+            }
+            break;
+        case 76:
+            {
+                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 72;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
         case 51:
             {
                 action13();
@@ -1642,9 +1590,29 @@ class complexType extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 78:
+        case 68:
             {
-                NGCCHandler h = new erSet(this, super._source, $runtime, 177);
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 67;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 15:
+            {
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 58:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 269);
                 spawnChildFromText(h, $value);
             }
             break;
@@ -1660,16 +1628,12 @@ class complexType extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 29:
+        case 24:
             {
-                if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendText(super._cookie, $value);
                 }
-                else {
-                    $_ngcc_current_state = 28;
-                    $runtime.sendText(super._cookie, $value);
-                }
             }
             break;
         case 84:
@@ -1684,10 +1648,28 @@ class complexType extends NGCCHandler {
                 }
             }
             break;
-        case 14:
+        case 65:
             {
-                NGCCHandler h = new qname(this, super._source, $runtime, 95);
-                spawnChildFromText(h, $value);
+                $_ngcc_current_state = 2;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 54:
+            {
+                $_ngcc_current_state = 52;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 52:
+            {
+                $_ngcc_current_state = 51;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 39:
+            {
+                $_ngcc_current_state = 38;
+                $runtime.sendText(super._cookie, $value);
             }
             break;
         case 0:
@@ -1695,24 +1677,34 @@ class complexType extends NGCCHandler {
                 revertToParentFromText(result, super._cookie, $value);
             }
             break;
-        case 76:
+        case 86:
             {
-                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                abstractValue = $value;
+                $_ngcc_current_state = 85;
+            }
+            break;
+        case 23:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 225);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 29:
+            {
+                if(($ai = $runtime.getAttributeIndex("","mixed"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendText(super._cookie, $value);
                 }
                 else {
-                    $_ngcc_current_state = 72;
+                    $_ngcc_current_state = 28;
                     $runtime.sendText(super._cookie, $value);
                 }
             }
             break;
-        case 44:
+        case 43:
             {
-                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
+                NGCCHandler h = new qname(this, super._source, $runtime, 249);
+                spawnChildFromText(h, $value);
             }
             break;
         case 19:
@@ -1721,186 +1713,194 @@ class complexType extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
+        case 59:
+            {
+                if(($ai = $runtime.getAttributeIndex("","base"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 106:
-            {
-                baseTypeName = ((UName)$__result__);
-                action6();
-                $_ngcc_current_state = 22;
-            }
-            break;
-        case 143:
-            {
-                baseContentType = ((SimpleTypeImpl)$__result__);
-                $_ngcc_current_state = 51;
-            }
-            break;
-        case 155:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 35;
-            }
-            break;
-        case 138:
+        case 257:
             {
                 facet = ((XSFacet)$__result__);
                 action12();
                 $_ngcc_current_state = 48;
             }
             break;
-        case 139:
-            {
-                facet = ((XSFacet)$__result__);
-                action12();
-                $_ngcc_current_state = 48;
-            }
-            break;
-        case 86:
-            {
-                explicitContent = ((ContentTypeImpl)$__result__);
-                action0();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 89:
-            {
-                explicitContent = ((ContentTypeImpl)$__result__);
-                action2();
-                $_ngcc_current_state = 8;
-            }
-            break;
-        case 177:
-            {
-                finalValue = ((Integer)$__result__);
-                $_ngcc_current_state = 77;
-            }
-            break;
-        case 111:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 7;
-            }
-            break;
-        case 91:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 9;
-            }
-            break;
-        case 95:
-            {
-                baseTypeName = ((UName)$__result__);
-                action3();
-                $_ngcc_current_state = 13;
-            }
-            break;
-        case 102:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 18;
-            }
-            break;
-        case 123:
-            {
-                $_ngcc_current_state = 36;
-            }
-            break;
-        case 113:
-            {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 26;
-            }
-            break;
-        case 182:
+        case 301:
             {
                 blockValue = ((Integer)$__result__);
                 $_ngcc_current_state = 81;
             }
             break;
-        case 130:
+        case 258:
             {
-                baseTypeName = ((UName)$__result__);
-                action9();
-                $_ngcc_current_state = 42;
+                facet = ((XSFacet)$__result__);
+                action12();
+                $_ngcc_current_state = 48;
             }
             break;
-        case 150:
-            {
-                baseTypeName = ((UName)$__result__);
-                action14();
-                $_ngcc_current_state = 57;
-            }
-            break;
-        case 135:
-            {
-                $_ngcc_current_state = 46;
-            }
-            break;
-        case 100:
+        case 219:
             {
                 explicitContent = ((ContentTypeImpl)$__result__);
                 action5();
                 $_ngcc_current_state = 17;
             }
             break;
-        case 126:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 38;
-            }
-            break;
-        case 163:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 2;
-            }
-            break;
-        case 146:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 52;
-            }
-            break;
-        case 104:
+        case 232:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 19;
+                $_ngcc_current_state = 26;
             }
             break;
-        case 93:
+        case 212:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 10;
             }
             break;
-        case 165:
+        case 242:
             {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 65;
+                $_ngcc_current_state = 36;
             }
             break;
-        case 128:
-            {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 39;
-            }
-            break;
-        case 148:
+        case 267:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 54;
             }
             break;
-        case 157:
+        case 210:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 9;
+            }
+            break;
+        case 247:
+            {
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 39;
+            }
+            break;
+        case 205:
+            {
+                explicitContent = ((ContentTypeImpl)$__result__);
+                action0();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 262:
+            {
+                baseContentType = ((SimpleTypeImpl)$__result__);
+                $_ngcc_current_state = 51;
+            }
+            break;
+        case 225:
+            {
+                baseTypeName = ((UName)$__result__);
+                action6();
+                $_ngcc_current_state = 22;
+            }
+            break;
+        case 208:
+            {
+                explicitContent = ((ContentTypeImpl)$__result__);
+                action2();
+                $_ngcc_current_state = 8;
+            }
+            break;
+        case 249:
+            {
+                baseTypeName = ((UName)$__result__);
+                action9();
+                $_ngcc_current_state = 42;
+            }
+            break;
+        case 296:
+            {
+                finalValue = ((Integer)$__result__);
+                $_ngcc_current_state = 77;
+            }
+            break;
+        case 284:
+            {
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 65;
+            }
+            break;
+        case 274:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 35;
+            }
+            break;
+        case 214:
+            {
+                baseTypeName = ((UName)$__result__);
+                action3();
+                $_ngcc_current_state = 13;
+            }
+            break;
+        case 254:
+            {
+                $_ngcc_current_state = 46;
+            }
+            break;
+        case 269:
+            {
+                baseTypeName = ((UName)$__result__);
+                action14();
+                $_ngcc_current_state = 57;
+            }
+            break;
+        case 230:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 7;
+            }
+            break;
+        case 282:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 2;
+            }
+            break;
+        case 265:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 52;
+            }
+            break;
+        case 223:
+            {
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 19;
+            }
+            break;
+        case 245:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 38;
+            }
+            break;
+        case 276:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 61;
             }
             break;
+        case 221:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 18;
+            }
+            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java
index a3e9bd2f73e..809e6888641 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java
@@ -81,20 +81,20 @@ class complexType_complexContent_body extends NGCCHandler {
             break;
         case 1:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute"))))) {
-                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 676, owner);
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("anyAttribute")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attribute"))))) {
+                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 515, owner);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 676, owner);
+                    NGCCHandler h = new attributeUses(this, super._source, $runtime, 515, owner);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
             }
             break;
         case 2:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
-                    NGCCHandler h = new particle(this, super._source, $runtime, 678);
+                if((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
+                    NGCCHandler h = new particle(this, super._source, $runtime, 517);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -124,7 +124,7 @@ class complexType_complexContent_body extends NGCCHandler {
             break;
         case 1:
             {
-                NGCCHandler h = new attributeUses(this, super._source, $runtime, 676, owner);
+                NGCCHandler h = new attributeUses(this, super._source, $runtime, 515, owner);
                 spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
             }
             break;
@@ -155,7 +155,7 @@ class complexType_complexContent_body extends NGCCHandler {
             break;
         case 1:
             {
-                NGCCHandler h = new attributeUses(this, super._source, $runtime, 676, owner);
+                NGCCHandler h = new attributeUses(this, super._source, $runtime, 515, owner);
                 spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
             }
             break;
@@ -186,7 +186,7 @@ class complexType_complexContent_body extends NGCCHandler {
             break;
         case 1:
             {
-                NGCCHandler h = new attributeUses(this, super._source, $runtime, 676, owner);
+                NGCCHandler h = new attributeUses(this, super._source, $runtime, 515, owner);
                 spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
             }
             break;
@@ -214,7 +214,7 @@ class complexType_complexContent_body extends NGCCHandler {
             break;
         case 1:
             {
-                NGCCHandler h = new attributeUses(this, super._source, $runtime, 676, owner);
+                NGCCHandler h = new attributeUses(this, super._source, $runtime, 515, owner);
                 spawnChildFromText(h, $value);
             }
             break;
@@ -229,13 +229,13 @@ class complexType_complexContent_body extends NGCCHandler {
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 676:
+        case 515:
             {
                 action0();
                 $_ngcc_current_state = 0;
             }
             break;
-        case 678:
+        case 517:
             {
                 particle = ((ParticleImpl)$__result__);
                 $_ngcc_current_state = 1;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java
index 0d6d8886335..e1149185267 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java
@@ -105,10 +105,22 @@ class elementDeclBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 24:
+            {
+                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 23;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 0:
             {
                 if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
-                    NGCCHandler h = new identityConstraint(this, super._source, $runtime, 492);
+                    NGCCHandler h = new identityConstraint(this, super._source, $runtime, 451);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -116,6 +128,18 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 11:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 469, null,AnnotationContext.ELEMENT_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 3;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 17:
             {
                 if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
@@ -140,27 +164,26 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 32:
+        case 1:
             {
-                if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
+                    NGCCHandler h = new identityConstraint(this, super._source, $runtime, 452);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 28;
+                    $_ngcc_current_state = 0;
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
             break;
-        case 44:
+        case 48:
             {
-                if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType")))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))))))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 40;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    unexpectedEnterElement($__qname);
                 }
             }
             break;
@@ -176,73 +199,15 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 11:
+        case 32:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 510, null,AnnotationContext.ELEMENT_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 3;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 1:
-            {
-                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
-                    NGCCHandler h = new identityConstraint(this, super._source, $runtime, 493);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 0;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 23:
-            {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 3:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                    NGCCHandler h = new simpleType(this, super._source, $runtime, 505);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
-                        NGCCHandler h = new complexType(this, super._source, $runtime, 506);
-                        spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                    }
-                    else {
-                        if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
-                            $runtime.consumeAttribute($ai);
-                            $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                        }
-                        else {
-                            $_ngcc_current_state = 1;
-                            $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                        }
-                    }
-                }
-            }
-            break;
-        case 48:
-            {
-                if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","final"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
+                    $_ngcc_current_state = 28;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
             break;
@@ -258,6 +223,30 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 3:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+                    NGCCHandler h = new simpleType(this, super._source, $runtime, 464);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+                        NGCCHandler h = new complexType(this, super._source, $runtime, 465);
+                        spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                    }
+                    else {
+                        if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+                            $runtime.consumeAttribute($ai);
+                            $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                        }
+                        else {
+                            $_ngcc_current_state = 1;
+                            $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                        }
+                    }
+                }
+            }
+            break;
         case 40:
             {
                 if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
@@ -270,14 +259,25 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 24:
+        case 23:
             {
-                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 23;
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 44:
+            {
+                if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 40;
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
@@ -296,11 +296,29 @@ class elementDeclBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 24:
+            {
+                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 23;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 0:
             {
                 revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 11:
+            {
+                $_ngcc_current_state = 3;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 17:
             {
                 if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
@@ -325,27 +343,20 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 32:
+        case 1:
             {
-                if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 28;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
+                $_ngcc_current_state = 0;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 44:
+        case 48:
             {
-                if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                if((($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
-                    $_ngcc_current_state = 40;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                    unexpectedLeaveElement($__qname);
                 }
             }
             break;
@@ -361,50 +372,16 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 11:
+        case 32:
             {
-                $_ngcc_current_state = 3;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 23:
-            {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 3:
-            {
-                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
-                    $runtime.consumeAttribute($ai);
+                    $_ngcc_current_state = 28;
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
-        case 48:
-            {
-                if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || ($ai = $runtime.getAttributeIndex("","final"))>=0))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
             }
             break;
         case 13:
@@ -419,6 +396,18 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 3:
+            {
+                if(($ai = $runtime.getAttributeIndex("","type"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 40:
             {
                 if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
@@ -431,14 +420,25 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 24:
+        case 23:
             {
-                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
-                    $_ngcc_current_state = 23;
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 44:
+            {
+                if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 40;
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
             }
@@ -457,11 +457,28 @@ class elementDeclBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 24:
+            {
+                if(($__uri.equals("") && $__local.equals("form"))) {
+                    $_ngcc_current_state = 26;
+                }
+                else {
+                    $_ngcc_current_state = 23;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 0:
             {
                 revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 11:
+            {
+                $_ngcc_current_state = 3;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 17:
             {
                 if(($__uri.equals("") && $__local.equals("nillable"))) {
@@ -484,25 +501,20 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 32:
+        case 1:
             {
-                if(($__uri.equals("") && $__local.equals("default"))) {
-                    $_ngcc_current_state = 34;
-                }
-                else {
-                    $_ngcc_current_state = 28;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
+                $_ngcc_current_state = 0;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 44:
+        case 48:
             {
-                if(($__uri.equals("") && $__local.equals("abstract"))) {
-                    $_ngcc_current_state = 46;
+                if((($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("abstract")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("form")) || ($__uri.equals("") && $__local.equals("name"))))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
-                    $_ngcc_current_state = 40;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                    unexpectedEnterAttribute($__qname);
                 }
             }
             break;
@@ -517,50 +529,17 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 11:
+        case 32:
             {
-                $_ngcc_current_state = 3;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 23:
-            {
-                if(($__uri.equals("") && $__local.equals("name"))) {
-                    $_ngcc_current_state = 22;
+                if(($__uri.equals("") && $__local.equals("default"))) {
+                    $_ngcc_current_state = 34;
                 }
                 else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
-        case 3:
-            {
-                if(($__uri.equals("") && $__local.equals("type"))) {
-                    $_ngcc_current_state = 6;
-                }
-                else {
-                    $_ngcc_current_state = 1;
+                    $_ngcc_current_state = 28;
                     $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
                 }
             }
             break;
-        case 48:
-            {
-                if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("abstract")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("name")) || ($__uri.equals("") && $__local.equals("final"))))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
         case 13:
             {
                 if(($__uri.equals("") && $__local.equals("substitutionGroup"))) {
@@ -572,6 +551,17 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 3:
+            {
+                if(($__uri.equals("") && $__local.equals("type"))) {
+                    $_ngcc_current_state = 6;
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 40:
             {
                 if(($__uri.equals("") && $__local.equals("block"))) {
@@ -583,13 +573,23 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 24:
+        case 23:
             {
-                if(($__uri.equals("") && $__local.equals("form"))) {
-                    $_ngcc_current_state = 26;
+                if(($__uri.equals("") && $__local.equals("name"))) {
+                    $_ngcc_current_state = 22;
                 }
                 else {
-                    $_ngcc_current_state = 23;
+                    unexpectedEnterAttribute($__qname);
+                }
+            }
+            break;
+        case 44:
+            {
+                if(($__uri.equals("") && $__local.equals("abstract"))) {
+                    $_ngcc_current_state = 46;
+                }
+                else {
+                    $_ngcc_current_state = 40;
                     $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
                 }
             }
@@ -608,87 +608,26 @@ class elementDeclBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 17:
+        case 24:
             {
-                $_ngcc_current_state = 13;
+                $_ngcc_current_state = 23;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
+        case 45:
             {
-                revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 36:
-            {
-                $_ngcc_current_state = 32;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 25:
-            {
-                if(($__uri.equals("") && $__local.equals("form"))) {
-                    $_ngcc_current_state = 23;
+                if(($__uri.equals("") && $__local.equals("abstract"))) {
+                    $_ngcc_current_state = 40;
                 }
                 else {
                     unexpectedLeaveAttribute($__qname);
                 }
             }
             break;
-        case 44:
+        case 29:
             {
-                $_ngcc_current_state = 40;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 32:
-            {
-                $_ngcc_current_state = 28;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 28:
-            {
-                $_ngcc_current_state = 24;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 11:
-            {
-                $_ngcc_current_state = 3;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 18:
-            {
-                if(($__uri.equals("") && $__local.equals("nillable"))) {
-                    $_ngcc_current_state = 13;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 37:
-            {
-                if(($__uri.equals("") && $__local.equals("final"))) {
-                    $_ngcc_current_state = 32;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 21:
-            {
-                if(($__uri.equals("") && $__local.equals("name"))) {
-                    $_ngcc_current_state = 17;
+                if(($__uri.equals("") && $__local.equals("fixed"))) {
+                    $_ngcc_current_state = 24;
                 }
                 else {
                     unexpectedLeaveAttribute($__qname);
@@ -706,32 +645,75 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 29:
+        case 21:
             {
-                if(($__uri.equals("") && $__local.equals("fixed"))) {
-                    $_ngcc_current_state = 24;
+                if(($__uri.equals("") && $__local.equals("name"))) {
+                    $_ngcc_current_state = 17;
                 }
                 else {
                     unexpectedLeaveAttribute($__qname);
                 }
             }
             break;
-        case 3:
+        case 18:
             {
-                $_ngcc_current_state = 1;
+                if(($__uri.equals("") && $__local.equals("nillable"))) {
+                    $_ngcc_current_state = 13;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 25:
+            {
+                if(($__uri.equals("") && $__local.equals("form"))) {
+                    $_ngcc_current_state = 23;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 11:
+            {
+                $_ngcc_current_state = 3;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 33:
+        case 0:
             {
-                if(($__uri.equals("") && $__local.equals("default"))) {
-                    $_ngcc_current_state = 28;
+                revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 17:
+            {
+                $_ngcc_current_state = 13;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 1:
+            {
+                $_ngcc_current_state = 0;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 37:
+            {
+                if(($__uri.equals("") && $__local.equals("final"))) {
+                    $_ngcc_current_state = 32;
                 }
                 else {
                     unexpectedLeaveAttribute($__qname);
                 }
             }
             break;
+        case 36:
+            {
+                $_ngcc_current_state = 32;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 14:
             {
                 if(($__uri.equals("") && $__local.equals("substitutionGroup"))) {
@@ -742,31 +724,9 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 13:
+        case 28:
             {
-                $_ngcc_current_state = 11;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 45:
-            {
-                if(($__uri.equals("") && $__local.equals("abstract"))) {
-                    $_ngcc_current_state = 40;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 24:
-            {
-                $_ngcc_current_state = 23;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 40:
-            {
-                $_ngcc_current_state = 36;
+                $_ngcc_current_state = 24;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -780,6 +740,46 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 33:
+            {
+                if(($__uri.equals("") && $__local.equals("default"))) {
+                    $_ngcc_current_state = 28;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 32:
+            {
+                $_ngcc_current_state = 28;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 13:
+            {
+                $_ngcc_current_state = 11;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 3:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 44:
+            {
+                $_ngcc_current_state = 40;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 40:
+            {
+                $_ngcc_current_state = 36;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -791,6 +791,67 @@ class elementDeclBody extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
+        case 24:
+            {
+                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 23;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 19:
+            {
+                nillable = $value;
+                $_ngcc_current_state = 18;
+            }
+            break;
+        case 46:
+            {
+                abstractValue = $value;
+                $_ngcc_current_state = 45;
+            }
+            break;
+        case 6:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 455);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 34:
+            {
+                defaultValue = $value;
+                $_ngcc_current_state = 33;
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromText(makeResult(), super._cookie, $value);
+            }
+            break;
+        case 11:
+            {
+                $_ngcc_current_state = 3;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 26:
+            {
+                if($value.equals("unqualified")) {
+                    NGCCHandler h = new qualification(this, super._source, $runtime, 485);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if($value.equals("qualified")) {
+                        NGCCHandler h = new qualification(this, super._source, $runtime, 485);
+                        spawnChildFromText(h, $value);
+                    }
+                }
+            }
+            break;
         case 17:
             {
                 if(($ai = $runtime.getAttributeIndex("","nillable"))>=0) {
@@ -803,9 +864,22 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 22:
             {
-                revertToParentFromText(makeResult(), super._cookie, $value);
+                name = $value;
+                $_ngcc_current_state = 21;
+            }
+            break;
+        case 38:
+            {
+                NGCCHandler h = new erSet(this, super._source, $runtime, 500);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 1:
+            {
+                $_ngcc_current_state = 0;
+                $runtime.sendText(super._cookie, $value);
             }
             break;
         case 36:
@@ -820,14 +894,58 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 44:
+        case 48:
             {
-                if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                        NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                        spawnChildFromText(h, $value);
+                    }
+                    else {
+                        if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                            NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                            spawnChildFromText(h, $value);
+                        }
+                        else {
+                            if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+                                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                                spawnChildFromText(h, $value);
+                            }
+                            else {
+                                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                                    spawnChildFromText(h, $value);
+                                }
+                                else {
+                                    if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+                                        NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                                        spawnChildFromText(h, $value);
+                                    }
+                                    else {
+                                        if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+                                            NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 514, fa);
+                                            spawnChildFromText(h, $value);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            break;
+        case 28:
+            {
+                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendText(super._cookie, $value);
                 }
                 else {
-                    $_ngcc_current_state = 40;
+                    $_ngcc_current_state = 24;
                     $runtime.sendText(super._cookie, $value);
                 }
             }
@@ -844,91 +962,21 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 46:
+        case 13:
             {
-                abstractValue = $value;
-                $_ngcc_current_state = 45;
-            }
-            break;
-        case 30:
-            {
-                fixedValue = $value;
-                $_ngcc_current_state = 29;
-            }
-            break;
-        case 6:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 496);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 28:
-            {
-                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendText(super._cookie, $value);
                 }
                 else {
-                    $_ngcc_current_state = 24;
+                    $_ngcc_current_state = 11;
                     $runtime.sendText(super._cookie, $value);
                 }
             }
             break;
-        case 22:
-            {
-                name = $value;
-                $_ngcc_current_state = 21;
-            }
-            break;
-        case 11:
-            {
-                $_ngcc_current_state = 3;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 26:
-            {
-                if($value.equals("unqualified")) {
-                    NGCCHandler h = new qualification(this, super._source, $runtime, 526);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if($value.equals("qualified")) {
-                        NGCCHandler h = new qualification(this, super._source, $runtime, 526);
-                        spawnChildFromText(h, $value);
-                    }
-                }
-            }
-            break;
-        case 19:
-            {
-                nillable = $value;
-                $_ngcc_current_state = 18;
-            }
-            break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 23:
-            {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 38:
-            {
-                NGCCHandler h = new erSet(this, super._source, $runtime, 541);
-                spawnChildFromText(h, $value);
-            }
-            break;
         case 15:
             {
-                NGCCHandler h = new qname(this, super._source, $runtime, 513);
+                NGCCHandler h = new qname(this, super._source, $runtime, 472);
                 spawnChildFromText(h, $value);
             }
             break;
@@ -944,84 +992,24 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
-        case 42:
+        case 44:
             {
-                NGCCHandler h = new ersSet(this, super._source, $runtime, 546);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 48:
-            {
-                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                        NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                        spawnChildFromText(h, $value);
-                    }
-                    else {
-                        if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
-                            NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                            spawnChildFromText(h, $value);
-                        }
-                        else {
-                            if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
-                                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                                spawnChildFromText(h, $value);
-                            }
-                            else {
-                                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
-                                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                                    spawnChildFromText(h, $value);
-                                }
-                                else {
-                                    if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
-                                        NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                                        spawnChildFromText(h, $value);
-                                    }
-                                    else {
-                                        if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
-                                            NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 555, fa);
-                                            spawnChildFromText(h, $value);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            break;
-        case 34:
-            {
-                defaultValue = $value;
-                $_ngcc_current_state = 33;
-            }
-            break;
-        case 13:
-            {
-                if(($ai = $runtime.getAttributeIndex("","substitutionGroup"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendText(super._cookie, $value);
                 }
                 else {
-                    $_ngcc_current_state = 11;
+                    $_ngcc_current_state = 40;
                     $runtime.sendText(super._cookie, $value);
                 }
             }
             break;
-        case 24:
+        case 23:
             {
-                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendText(super._cookie, $value);
                 }
-                else {
-                    $_ngcc_current_state = 23;
-                    $runtime.sendText(super._cookie, $value);
-                }
             }
             break;
         case 40:
@@ -1036,86 +1024,98 @@ class elementDeclBody extends NGCCHandler {
                 }
             }
             break;
+        case 42:
+            {
+                NGCCHandler h = new ersSet(this, super._source, $runtime, 505);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 30:
+            {
+                fixedValue = $value;
+                $_ngcc_current_state = 29;
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 510:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 3;
-            }
-            break;
-        case 546:
-            {
-                blockValue = ((Integer)$__result__);
-                $_ngcc_current_state = 41;
-            }
-            break;
-        case 496:
+        case 455:
             {
                 typeName = ((UName)$__result__);
                 $_ngcc_current_state = 5;
             }
             break;
-        case 492:
+        case 464:
+            {
+                type = ((SimpleTypeImpl)$__result__);
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 465:
+            {
+                type = ((ComplexTypeImpl)$__result__);
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 451:
             {
                 idc = ((IdentityConstraintImpl)$__result__);
                 action0();
                 $_ngcc_current_state = 0;
             }
             break;
-        case 526:
+        case 469:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 3;
+            }
+            break;
+        case 500:
+            {
+                finalValue = ((Integer)$__result__);
+                $_ngcc_current_state = 37;
+            }
+            break;
+        case 505:
+            {
+                blockValue = ((Integer)$__result__);
+                $_ngcc_current_state = 41;
+            }
+            break;
+        case 485:
             {
                 form = ((Boolean)$__result__).booleanValue();
                 action3();
                 $_ngcc_current_state = 25;
             }
             break;
-        case 493:
+        case 452:
             {
                 idc = ((IdentityConstraintImpl)$__result__);
                 action0();
                 $_ngcc_current_state = 0;
             }
             break;
-        case 541:
+        case 514:
             {
-                finalValue = ((Integer)$__result__);
-                $_ngcc_current_state = 37;
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 44;
             }
             break;
-        case 513:
+        case 472:
             {
                 substRef = ((UName)$__result__);
                 action2();
                 $_ngcc_current_state = 14;
             }
             break;
-        case 505:
-            {
-                type = ((SimpleTypeImpl)$__result__);
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 506:
-            {
-                type = ((ComplexTypeImpl)$__result__);
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 555:
-            {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 44;
-            }
-            break;
         }
     }
 
     public boolean accepted() {
-        return((($_ngcc_current_state == 13) || (($_ngcc_current_state == 17) || (($_ngcc_current_state == 3) || (($_ngcc_current_state == 1) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 11)))))));
+        return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 17) || (($_ngcc_current_state == 11) || (($_ngcc_current_state == 0) || (($_ngcc_current_state == 3) || ($_ngcc_current_state == 13)))))));
     }
 
 
@@ -1161,6 +1161,7 @@ class elementDeclBody extends NGCCHandler {
             $runtime.createXmlString(fixedValue),
             $runtime.parseBoolean(nillable),
             $runtime.parseBoolean(abstractValue),
+            (java.lang.Boolean)(formSpecified ? form : null),
             type,
             substHeadRef,
             blockValue.intValue(),
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java
index 5f931adf7bf..ba162c30ae9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java
@@ -141,17 +141,17 @@ class erSet extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromText(makeResult(), super._cookie, $value);
+            }
+            break;
         case 1:
             {
                 v = $value;
                 $_ngcc_current_state = 0;
             }
             break;
-        case 0:
-            {
-                revertToParentFromText(makeResult(), super._cookie, $value);
-            }
-            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java
index 34ef0cb00c9..d2134d053dd 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java
@@ -95,17 +95,6 @@ class facet extends NGCCHandler {
                 }
             }
             break;
-        case 4:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 577, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         case 11:
             {
                 if(($ai = $runtime.getAttributeIndex("","value"))>=0) {
@@ -117,15 +106,14 @@ class facet extends NGCCHandler {
                 }
             }
             break;
-        case 2:
+        case 4:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 575, null,AnnotationContext.SIMPLETYPE_DECL);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 562, fa);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    unexpectedEnterElement($__qname);
                 }
             }
             break;
@@ -146,6 +134,18 @@ class facet extends NGCCHandler {
                 revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 560, null,AnnotationContext.SIMPLETYPE_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -160,6 +160,18 @@ class facet extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 1:
+            {
+                if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
+                    action0();
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         case 5:
             {
                 if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
@@ -172,17 +184,6 @@ class facet extends NGCCHandler {
                 }
             }
             break;
-        case 4:
-            {
-                if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 577, fa);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
         case 11:
             {
                 if(($ai = $runtime.getAttributeIndex("","value"))>=0) {
@@ -194,10 +195,15 @@ class facet extends NGCCHandler {
                 }
             }
             break;
-        case 2:
+        case 4:
             {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 562, fa);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
             }
             break;
         case 0:
@@ -205,16 +211,10 @@ class facet extends NGCCHandler {
                 revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 1:
+        case 2:
             {
-                if((((((((((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minExclusive")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxExclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxInclusive"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("totalDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("fractionDigits"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("length"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("maxLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("minLength"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("enumeration"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("whiteSpace"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("pattern")))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
-                    action0();
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -252,17 +252,17 @@ class facet extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
-            {
-                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -277,23 +277,6 @@ class facet extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 5:
-            {
-                $_ngcc_current_state = 4;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 9:
             {
                 if(($__uri.equals("") && $__local.equals("value"))) {
@@ -304,6 +287,12 @@ class facet extends NGCCHandler {
                 }
             }
             break;
+        case 5:
+            {
+                $_ngcc_current_state = 4;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 6:
             {
                 if(($__uri.equals("") && $__local.equals("fixed"))) {
@@ -314,6 +303,17 @@ class facet extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -357,34 +357,34 @@ class facet extends NGCCHandler {
                 $_ngcc_current_state = 6;
             }
             break;
+        case 0:
+            {
+                revertToParentFromText(result, super._cookie, $value);
+            }
+            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 0:
-            {
-                revertToParentFromText(result, super._cookie, $value);
-            }
-            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 577:
-            {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 2;
-            }
-            break;
-        case 575:
+        case 560:
             {
                 annotation = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 1;
             }
             break;
+        case 562:
+            {
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 2;
+            }
+            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java
index bfe47f81812..facff7fef27 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java
@@ -93,9 +93,27 @@ class group extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 11:
             {
-                revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(($ai = $runtime.getAttributeIndex("","ID"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 10;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 5:
+            {
+                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 315, null);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
             }
             break;
         case 10:
@@ -109,52 +127,6 @@ class group extends NGCCHandler {
                 }
             }
             break;
-        case 6:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 233, null,AnnotationContext.MODELGROUP_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 5;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 3:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) {
-                    NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 229, mloc,compositorName);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 15:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    action2();
-                    $_ngcc_current_state = 11;
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 5:
-            {
-                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 231, null);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         case 4:
             {
                 if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
@@ -166,14 +138,42 @@ class group extends NGCCHandler {
                 }
             }
             break;
-        case 11:
+        case 3:
             {
-                if(($ai = $runtime.getAttributeIndex("","ID"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))))))) {
+                    NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 313, mloc,compositorName);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 10;
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 15:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    action2();
+                    $_ngcc_current_state = 11;
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 6:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 317, null,AnnotationContext.MODELGROUP_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 5;
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
@@ -192,9 +192,27 @@ class group extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 2:
             {
-                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 1;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 11:
+            {
+                if(($ai = $runtime.getAttributeIndex("","ID"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 10;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
             }
             break;
         case 10:
@@ -208,27 +226,10 @@ class group extends NGCCHandler {
                 }
             }
             break;
-        case 6:
-            {
-                $_ngcc_current_state = 5;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 2:
-            {
-                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 1;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
         case 3:
             {
                 if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
-                    NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 229, mloc,compositorName);
+                    NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 313, mloc,compositorName);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -248,16 +249,15 @@ class group extends NGCCHandler {
                 }
             }
             break;
-        case 11:
+        case 0:
             {
-                if(($ai = $runtime.getAttributeIndex("","ID"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 10;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
+                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 6:
+            {
+                $_ngcc_current_state = 5;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -274,9 +274,15 @@ class group extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 11:
             {
-                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("ID"))) {
+                    $_ngcc_current_state = 13;
+                }
+                else {
+                    $_ngcc_current_state = 10;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
             }
             break;
         case 10:
@@ -289,23 +295,17 @@ class group extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 6:
             {
                 $_ngcc_current_state = 5;
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 11:
-            {
-                if(($__uri.equals("") && $__local.equals("ID"))) {
-                    $_ngcc_current_state = 13;
-                }
-                else {
-                    $_ngcc_current_state = 10;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -320,11 +320,6 @@ class group extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 12:
             {
                 if(($__uri.equals("") && $__local.equals("ID"))) {
@@ -335,6 +330,12 @@ class group extends NGCCHandler {
                 }
             }
             break;
+        case 11:
+            {
+                $_ngcc_current_state = 10;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 8:
             {
                 if(($__uri.equals("") && $__local.equals("name"))) {
@@ -345,18 +346,17 @@ class group extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 6:
             {
                 $_ngcc_current_state = 5;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 11:
-            {
-                $_ngcc_current_state = 10;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -368,30 +368,6 @@ class group extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromText(result, super._cookie, $value);
-            }
-            break;
-        case 13:
-            {
-                $_ngcc_current_state = 12;
-            }
-            break;
-        case 10:
-            {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 6:
-            {
-                $_ngcc_current_state = 5;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
         case 11:
             {
                 if(($ai = $runtime.getAttributeIndex("","ID"))>=0) {
@@ -404,36 +380,60 @@ class group extends NGCCHandler {
                 }
             }
             break;
+        case 10:
+            {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 13:
+            {
+                $_ngcc_current_state = 12;
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromText(result, super._cookie, $value);
+            }
+            break;
         case 9:
             {
                 name = $value;
                 $_ngcc_current_state = 8;
             }
             break;
+        case 6:
+            {
+                $_ngcc_current_state = 5;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 233:
+        case 313:
+            {
+                term = ((ModelGroupImpl)$__result__);
+                $_ngcc_current_state = 2;
+            }
+            break;
+        case 317:
             {
                 annotation = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 5;
             }
             break;
-        case 231:
+        case 315:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 action1();
                 $_ngcc_current_state = 4;
             }
             break;
-        case 229:
-            {
-                term = ((ModelGroupImpl)$__result__);
-                $_ngcc_current_state = 2;
-            }
-            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java
index 63cf994f410..9194d0db3d9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java
@@ -94,28 +94,6 @@ class identityConstraint extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 7:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    $_ngcc_current_state = 6;
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 6:
-            {
-                if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    NGCCHandler h = new xpath(this, super._source, $runtime, 251);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         case 10:
             {
                 if(($ai = $runtime.getAttributeIndex("","refer"))>=0) {
@@ -128,15 +106,10 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 3:
+        case 6:
             {
                 if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    NGCCHandler h = new xpath(this, super._source, $runtime, 247);
+                    NGCCHandler h = new xpath(this, super._source, $runtime, 653);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -155,29 +128,22 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 8:
+        case 17:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 254, null,AnnotationContext.IDENTITY_CONSTRAINT);
+                if((($ai = $runtime.getAttributeIndex("","name"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 666, null);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
-                else {
-                    $_ngcc_current_state = 7;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 4:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    $_ngcc_current_state = 3;
-                }
                 else {
                     unexpectedEnterElement($__qname);
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
         case 18:
             {
                 if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) {
@@ -190,10 +156,44 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 17:
+        case 1:
             {
-                if((($ai = $runtime.getAttributeIndex("","name"))>=0 && (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 264, null);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    $_ngcc_current_state = 3;
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 4:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    $_ngcc_current_state = 3;
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 8:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 656, null,AnnotationContext.IDENTITY_CONSTRAINT);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 7;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 3:
+            {
+                if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+                    NGCCHandler h = new xpath(this, super._source, $runtime, 649);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -201,11 +201,11 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 1:
+        case 7:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) {
                     $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    $_ngcc_current_state = 3;
+                    $_ngcc_current_state = 6;
                 }
                 else {
                     unexpectedEnterElement($__qname);
@@ -226,22 +226,22 @@ class identityConstraint extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 6:
+        case 2:
             {
-                if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")))) {
-                    NGCCHandler h = new xpath(this, super._source, $runtime, 251);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 1;
                 }
                 else {
                     unexpectedLeaveElement($__qname);
                 }
             }
             break;
-        case 2:
+        case 5:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field"))) {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) {
                     $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 1;
+                    $_ngcc_current_state = 4;
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -260,15 +260,10 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 6:
             {
-                revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 3:
-            {
-                if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field")))) {
-                    NGCCHandler h = new xpath(this, super._source, $runtime, 247);
+                if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector")))) {
+                    NGCCHandler h = new xpath(this, super._source, $runtime, 653);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -287,16 +282,10 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 8:
-            {
-                $_ngcc_current_state = 7;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 17:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 264, null);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 666, null);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -304,15 +293,9 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 5:
+        case 0:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("selector"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 4;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
+                revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
             }
             break;
         case 1:
@@ -326,6 +309,23 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
+        case 8:
+            {
+                $_ngcc_current_state = 7;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 3:
+            {
+                if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("field")))) {
+                    NGCCHandler h = new xpath(this, super._source, $runtime, 649);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedLeaveElement($__qname);
@@ -340,17 +340,6 @@ class identityConstraint extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 6:
-            {
-                if(($__uri.equals("") && $__local.equals("xpath"))) {
-                    NGCCHandler h = new xpath(this, super._source, $runtime, 251);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
         case 10:
             {
                 if(($__uri.equals("") && $__local.equals("refer"))) {
@@ -362,15 +351,10 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 3:
+        case 6:
             {
                 if(($__uri.equals("") && $__local.equals("xpath"))) {
-                    NGCCHandler h = new xpath(this, super._source, $runtime, 247);
+                    NGCCHandler h = new xpath(this, super._source, $runtime, 653);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -388,16 +372,32 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
+        case 17:
+            {
+                if(($__uri.equals("") && $__local.equals("name"))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 666, null);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 8:
             {
                 $_ngcc_current_state = 7;
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 17:
+        case 3:
             {
-                if(($__uri.equals("") && $__local.equals("name"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 264, null);
+                if(($__uri.equals("") && $__local.equals("xpath"))) {
+                    NGCCHandler h = new xpath(this, super._source, $runtime, 649);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -430,10 +430,14 @@ class identityConstraint extends NGCCHandler {
                 revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 8:
+        case 14:
             {
-                $_ngcc_current_state = 7;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("name"))) {
+                    $_ngcc_current_state = 10;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
             }
             break;
         case 11:
@@ -446,14 +450,10 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 14:
+        case 8:
             {
-                if(($__uri.equals("") && $__local.equals("name"))) {
-                    $_ngcc_current_state = 10;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
+                $_ngcc_current_state = 7;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -467,12 +467,10 @@ class identityConstraint extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 6:
+        case 12:
             {
-                if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    NGCCHandler h = new xpath(this, super._source, $runtime, 251);
-                    spawnChildFromText(h, $value);
-                }
+                NGCCHandler h = new qname(this, super._source, $runtime, 659);
+                spawnChildFromText(h, $value);
             }
             break;
         case 10:
@@ -487,31 +485,20 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromText(makeResult(), super._cookie, $value);
-            }
-            break;
         case 15:
             {
                 name = $value;
                 $_ngcc_current_state = 14;
             }
             break;
-        case 3:
+        case 6:
             {
                 if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    NGCCHandler h = new xpath(this, super._source, $runtime, 247);
+                    NGCCHandler h = new xpath(this, super._source, $runtime, 653);
                     spawnChildFromText(h, $value);
                 }
             }
             break;
-        case 12:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 257);
-                spawnChildFromText(h, $value);
-            }
-            break;
         case 16:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -520,16 +507,29 @@ class identityConstraint extends NGCCHandler {
                 }
             }
             break;
+        case 17:
+            {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 666, null);
+                    spawnChildFromText(h, $value);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromText(makeResult(), super._cookie, $value);
+            }
+            break;
         case 8:
             {
                 $_ngcc_current_state = 7;
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 17:
+        case 3:
             {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 264, null);
+                if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+                    NGCCHandler h = new xpath(this, super._source, $runtime, 649);
                     spawnChildFromText(h, $value);
                 }
             }
@@ -539,38 +539,38 @@ class identityConstraint extends NGCCHandler {
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 251:
+        case 666:
             {
-                selector = ((XPathImpl)$__result__);
-                $_ngcc_current_state = 5;
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 16;
             }
             break;
-        case 257:
+        case 656:
+            {
+                ann = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 7;
+            }
+            break;
+        case 659:
             {
                 ref = ((UName)$__result__);
                 action1();
                 $_ngcc_current_state = 11;
             }
             break;
-        case 264:
+        case 653:
             {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 16;
+                selector = ((XPathImpl)$__result__);
+                $_ngcc_current_state = 5;
             }
             break;
-        case 247:
+        case 649:
             {
                 field = ((XPathImpl)$__result__);
                 action0();
                 $_ngcc_current_state = 2;
             }
             break;
-        case 254:
-            {
-                ann = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 7;
-            }
-            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java
index 1ea3133e866..5231e4781a3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java
@@ -76,27 +76,14 @@ class importDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 8:
+        case 12:
             {
-                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    $_ngcc_current_state = 8;
                 }
                 else {
-                    $_ngcc_current_state = 4;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 2:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 589, null,AnnotationContext.SCHEMA);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                    unexpectedEnterElement($__qname);
                 }
             }
             break;
@@ -112,22 +99,35 @@ class importDecl extends NGCCHandler {
                 }
             }
             break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 3, null,AnnotationContext.SCHEMA);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 8:
+            {
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 4;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 0:
             {
                 revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
-        case 12:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("import"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    $_ngcc_current_state = 8;
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -142,6 +142,24 @@ class importDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 4:
+            {
+                if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 2;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 8:
             {
                 if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
@@ -166,24 +184,6 @@ class importDecl extends NGCCHandler {
                 }
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 4:
-            {
-                if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 2;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         case 0:
             {
                 revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
@@ -203,13 +203,13 @@ class importDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 8:
+        case 4:
             {
-                if(($__uri.equals("") && $__local.equals("namespace"))) {
-                    $_ngcc_current_state = 10;
+                if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
+                    $_ngcc_current_state = 6;
                 }
                 else {
-                    $_ngcc_current_state = 4;
+                    $_ngcc_current_state = 2;
                     $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
                 }
             }
@@ -220,13 +220,13 @@ class importDecl extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 4:
+        case 8:
             {
-                if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
-                    $_ngcc_current_state = 6;
+                if(($__uri.equals("") && $__local.equals("namespace"))) {
+                    $_ngcc_current_state = 10;
                 }
                 else {
-                    $_ngcc_current_state = 2;
+                    $_ngcc_current_state = 4;
                     $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
                 }
             }
@@ -250,29 +250,6 @@ class importDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 8:
-            {
-                $_ngcc_current_state = 4;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 4:
-            {
-                $_ngcc_current_state = 2;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 9:
             {
                 if(($__uri.equals("") && $__local.equals("namespace"))) {
@@ -283,6 +260,24 @@ class importDecl extends NGCCHandler {
                 }
             }
             break;
+        case 4:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 8:
+            {
+                $_ngcc_current_state = 4;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 5:
             {
                 if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
@@ -293,6 +288,11 @@ class importDecl extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -304,22 +304,10 @@ class importDecl extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 8:
+        case 10:
             {
-                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 4;
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendText(super._cookie, $value);
+                ns = $value;
+                $_ngcc_current_state = 9;
             }
             break;
         case 4:
@@ -334,21 +322,33 @@ class importDecl extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromText(this, super._cookie, $value);
-            }
-            break;
         case 6:
             {
                 schemaLocation = $value;
                 $_ngcc_current_state = 5;
             }
             break;
-        case 10:
+        case 2:
             {
-                ns = $value;
-                $_ngcc_current_state = 9;
+                $_ngcc_current_state = 1;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 8:
+            {
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 4;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromText(this, super._cookie, $value);
             }
             break;
         }
@@ -356,7 +356,7 @@ class importDecl extends NGCCHandler {
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 589:
+        case 3:
             {
                 $_ngcc_current_state = 1;
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java
index 01870407c96..95b382d9f90 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java
@@ -77,18 +77,6 @@ class includeDecl extends NGCCHandler {
                 revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
-        case 2:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 268, null,AnnotationContext.SCHEMA);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         case 6:
             {
                 if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
@@ -111,6 +99,18 @@ class includeDecl extends NGCCHandler {
                 }
             }
             break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 521, null,AnnotationContext.SCHEMA);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -130,12 +130,6 @@ class includeDecl extends NGCCHandler {
                 revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 1:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("include"))) {
@@ -159,6 +153,12 @@ class includeDecl extends NGCCHandler {
                 }
             }
             break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveElement($__qname);
@@ -178,12 +178,6 @@ class includeDecl extends NGCCHandler {
                 revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 6:
             {
                 if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
@@ -194,6 +188,12 @@ class includeDecl extends NGCCHandler {
                 }
             }
             break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -208,6 +208,11 @@ class includeDecl extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 4:
             {
                 if(($__uri.equals("") && $__local.equals("schemaLocation"))) {
@@ -218,11 +223,6 @@ class includeDecl extends NGCCHandler {
                 }
             }
             break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
@@ -245,18 +245,6 @@ class includeDecl extends NGCCHandler {
                 revertToParentFromText(this, super._cookie, $value);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 5:
-            {
-                schemaLocation = $value;
-                $_ngcc_current_state = 4;
-            }
-            break;
         case 6:
             {
                 if(($ai = $runtime.getAttributeIndex("","schemaLocation"))>=0) {
@@ -265,12 +253,24 @@ class includeDecl extends NGCCHandler {
                 }
             }
             break;
+        case 5:
+            {
+                schemaLocation = $value;
+                $_ngcc_current_state = 4;
+            }
+            break;
+        case 2:
+            {
+                $_ngcc_current_state = 1;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 268:
+        case 521:
             {
                 $_ngcc_current_state = 1;
             }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java
index 2243dd591ab..62578d4d3ac 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java
@@ -95,15 +95,34 @@ class modelGroupBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 2:
             {
-                revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+                if((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
+                    NGCCHandler h = new particle(this, super._source, $runtime, 179);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 6:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 184, null);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 184, null);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
             }
             break;
         case 1:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
-                    NGCCHandler h = new particle(this, super._source, $runtime, 31);
+                if((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
+                    NGCCHandler h = new particle(this, super._source, $runtime, 178);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -113,22 +132,10 @@ class modelGroupBody extends NGCCHandler {
                 }
             }
             break;
-        case 2:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))) {
-                    NGCCHandler h = new particle(this, super._source, $runtime, 32);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         case 4:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 35, null,AnnotationContext.MODELGROUP);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 182, null,AnnotationContext.MODELGROUP);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -137,16 +144,9 @@ class modelGroupBody extends NGCCHandler {
                 }
             }
             break;
-        case 6:
+        case 0:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 37, null);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 37, null);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
+                revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
         default:
@@ -163,9 +163,16 @@ class modelGroupBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 2:
             {
-                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 6:
+            {
+                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 184, null);
+                spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
             }
             break;
         case 1:
@@ -175,22 +182,15 @@ class modelGroupBody extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 4:
             {
                 $_ngcc_current_state = 2;
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 6:
+        case 0:
             {
-                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 37, null);
-                spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -207,9 +207,16 @@ class modelGroupBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 2:
             {
-                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+                $_ngcc_current_state = 1;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 6:
+            {
+                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 184, null);
+                spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
             }
             break;
         case 1:
@@ -219,22 +226,15 @@ class modelGroupBody extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 4:
             {
                 $_ngcc_current_state = 2;
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 6:
+        case 0:
             {
-                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 37, null);
-                spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -251,9 +251,16 @@ class modelGroupBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 2:
             {
-                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 6:
+            {
+                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 184, null);
+                spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
             }
             break;
         case 1:
@@ -263,22 +270,15 @@ class modelGroupBody extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 4:
             {
                 $_ngcc_current_state = 2;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 6:
+        case 0:
             {
-                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 37, null);
-                spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
+                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -292,9 +292,16 @@ class modelGroupBody extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 0:
+        case 2:
             {
-                revertToParentFromText(result, super._cookie, $value);
+                $_ngcc_current_state = 1;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 6:
+            {
+                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 184, null);
+                spawnChildFromText(h, $value);
             }
             break;
         case 1:
@@ -304,22 +311,15 @@ class modelGroupBody extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
         case 4:
             {
                 $_ngcc_current_state = 2;
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 6:
+        case 0:
             {
-                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 37, null);
-                spawnChildFromText(h, $value);
+                revertToParentFromText(result, super._cookie, $value);
             }
             break;
         }
@@ -327,27 +327,27 @@ class modelGroupBody extends NGCCHandler {
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 31:
+        case 179:
             {
                 childParticle = ((ParticleImpl)$__result__);
                 action1();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 32:
-            {
-                childParticle = ((ParticleImpl)$__result__);
-                action1();
-                $_ngcc_current_state = 1;
-            }
-            break;
-        case 37:
+        case 184:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 4;
             }
             break;
-        case 35:
+        case 178:
+            {
+                childParticle = ((ParticleImpl)$__result__);
+                action1();
+                $_ngcc_current_state = 1;
+            }
+            break;
+        case 182:
             {
                 annotation = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 2;
@@ -357,7 +357,7 @@ class modelGroupBody extends NGCCHandler {
     }
 
     public boolean accepted() {
-        return((($_ngcc_current_state == 4) || (($_ngcc_current_state == 2) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 0)))));
+        return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 4) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 2)))));
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java
index ff8fe99119c..bed98f26d99 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java
@@ -76,16 +76,11 @@ class notation extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 10:
             {
-                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 14:
-            {
-                if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 571, null);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
                     unexpectedEnterElement($__qname);
@@ -95,7 +90,7 @@ class notation extends NGCCHandler {
         case 2:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 558, null,AnnotationContext.NOTATION);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 386, null,AnnotationContext.NOTATION);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -104,21 +99,9 @@ class notation extends NGCCHandler {
                 }
             }
             break;
-        case 4:
+        case 13:
             {
-                if(($ai = $runtime.getAttributeIndex("","system"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 2;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
-        case 10:
-            {
-                if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
@@ -139,12 +122,29 @@ class notation extends NGCCHandler {
                 }
             }
             break;
-        case 13:
+        case 0:
             {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 4:
+            {
+                if(($ai = $runtime.getAttributeIndex("","system"))>=0) {
                     $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
+                else {
+                    $_ngcc_current_state = 2;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
+        case 14:
+            {
+                if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 399, null);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
                 else {
                     unexpectedEnterElement($__qname);
                 }
@@ -164,27 +164,11 @@ class notation extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 10:
             {
-                revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 14:
-            {
-                if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 571, null);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 1:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
+                if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -197,6 +181,22 @@ class notation extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 13:
+            {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 4:
             {
                 if(($ai = $runtime.getAttributeIndex("","system"))>=0) {
@@ -209,22 +209,22 @@ class notation extends NGCCHandler {
                 }
             }
             break;
-        case 10:
+        case 14:
             {
-                if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                if((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation")))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 399, null);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
                 }
             }
             break;
-        case 13:
+        case 1:
             {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("notation"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -245,16 +245,10 @@ class notation extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 10:
             {
-                revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 14:
-            {
-                if(($__uri.equals("") && $__local.equals("name"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 571, null);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("public"))) {
+                    $_ngcc_current_state = 9;
                 }
                 else {
                     unexpectedEnterAttribute($__qname);
@@ -267,6 +261,21 @@ class notation extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 13:
+            {
+                if(($__uri.equals("") && $__local.equals("name"))) {
+                    $_ngcc_current_state = 12;
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 4:
             {
                 if(($__uri.equals("") && $__local.equals("system"))) {
@@ -278,20 +287,11 @@ class notation extends NGCCHandler {
                 }
             }
             break;
-        case 10:
-            {
-                if(($__uri.equals("") && $__local.equals("public"))) {
-                    $_ngcc_current_state = 9;
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
-        case 13:
+        case 14:
             {
                 if(($__uri.equals("") && $__local.equals("name"))) {
-                    $_ngcc_current_state = 12;
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 399, null);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedEnterAttribute($__qname);
@@ -312,31 +312,20 @@ class notation extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 5:
-            {
-                if(($__uri.equals("") && $__local.equals("system"))) {
-                    $_ngcc_current_state = 2;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 4:
+        case 8:
             {
-                $_ngcc_current_state = 2;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("public"))) {
+                    $_ngcc_current_state = 4;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
             }
             break;
         case 11:
@@ -349,16 +338,27 @@ class notation extends NGCCHandler {
                 }
             }
             break;
-        case 8:
+        case 5:
             {
-                if(($__uri.equals("") && $__local.equals("public"))) {
-                    $_ngcc_current_state = 4;
+                if(($__uri.equals("") && $__local.equals("system"))) {
+                    $_ngcc_current_state = 2;
                 }
                 else {
                     unexpectedLeaveAttribute($__qname);
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 4:
+            {
+                $_ngcc_current_state = 2;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -370,17 +370,10 @@ class notation extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 0:
+        case 9:
             {
-                revertToParentFromText(makeResult(), super._cookie, $value);
-            }
-            break;
-        case 14:
-            {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 571, null);
-                    spawnChildFromText(h, $value);
-                }
+                pub = $value;
+                $_ngcc_current_state = 8;
             }
             break;
         case 6:
@@ -389,12 +382,39 @@ class notation extends NGCCHandler {
                 $_ngcc_current_state = 5;
             }
             break;
+        case 10:
+            {
+                if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 12:
+            {
+                name = $value;
+                $_ngcc_current_state = 11;
+            }
+            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
                 $runtime.sendText(super._cookie, $value);
             }
             break;
+        case 13:
+            {
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromText(makeResult(), super._cookie, $value);
+            }
+            break;
         case 4:
             {
                 if(($ai = $runtime.getAttributeIndex("","system"))>=0) {
@@ -407,31 +427,11 @@ class notation extends NGCCHandler {
                 }
             }
             break;
-        case 12:
-            {
-                name = $value;
-                $_ngcc_current_state = 11;
-            }
-            break;
-        case 10:
-            {
-                if(($ai = $runtime.getAttributeIndex("","public"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
-        case 9:
-            {
-                pub = $value;
-                $_ngcc_current_state = 8;
-            }
-            break;
-        case 13:
+        case 14:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 399, null);
+                    spawnChildFromText(h, $value);
                 }
             }
             break;
@@ -440,18 +440,18 @@ class notation extends NGCCHandler {
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 571:
-            {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 13;
-            }
-            break;
-        case 558:
+        case 386:
             {
                 ann = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 1;
             }
             break;
+        case 399:
+            {
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 13;
+            }
+            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java
index a2e4ad35a10..b7f0d3eb22b 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java
@@ -80,6 +80,18 @@ class occurs extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 5:
+            {
+                if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 1:
             {
                 if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
@@ -97,18 +109,6 @@ class occurs extends NGCCHandler {
                 revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
-        case 5:
-            {
-                if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -123,6 +123,18 @@ class occurs extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 5:
+            {
+                if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 1:
             {
                 if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
@@ -140,18 +152,6 @@ class occurs extends NGCCHandler {
                 revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 5:
-            {
-                if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedLeaveElement($__qname);
@@ -166,6 +166,17 @@ class occurs extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 5:
+            {
+                if(($__uri.equals("") && $__local.equals("maxOccurs"))) {
+                    $_ngcc_current_state = 7;
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 1:
             {
                 if(($__uri.equals("") && $__local.equals("minOccurs"))) {
@@ -182,17 +193,6 @@ class occurs extends NGCCHandler {
                 revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 5:
-            {
-                if(($__uri.equals("") && $__local.equals("maxOccurs"))) {
-                    $_ngcc_current_state = 7;
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -207,14 +207,10 @@ class occurs extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 2:
+        case 5:
             {
-                if(($__uri.equals("") && $__local.equals("minOccurs"))) {
-                    $_ngcc_current_state = 0;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
         case 6:
@@ -227,6 +223,16 @@ class occurs extends NGCCHandler {
                 }
             }
             break;
+        case 2:
+            {
+                if(($__uri.equals("") && $__local.equals("minOccurs"))) {
+                    $_ngcc_current_state = 0;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
         case 1:
             {
                 $_ngcc_current_state = 0;
@@ -238,12 +244,6 @@ class occurs extends NGCCHandler {
                 revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 5:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -255,16 +255,15 @@ class occurs extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 7:
+        case 5:
             {
-                if($value.equals("unbounded")) {
-                    $_ngcc_current_state = 6;
-                    action1();
+                if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
                 }
                 else {
-                    v = $value;
-                    $_ngcc_current_state = 6;
-                    action2();
+                    $_ngcc_current_state = 1;
+                    $runtime.sendText(super._cookie, $value);
                 }
             }
             break;
@@ -280,9 +279,17 @@ class occurs extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 7:
             {
-                revertToParentFromText(this, super._cookie, $value);
+                if($value.equals("unbounded")) {
+                    $_ngcc_current_state = 6;
+                    action1();
+                }
+                else {
+                    v = $value;
+                    $_ngcc_current_state = 6;
+                    action2();
+                }
             }
             break;
         case 3:
@@ -292,16 +299,9 @@ class occurs extends NGCCHandler {
                 action0();
             }
             break;
-        case 5:
+        case 0:
             {
-                if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendText(super._cookie, $value);
-                }
+                revertToParentFromText(this, super._cookie, $value);
             }
             break;
         }
@@ -313,7 +313,7 @@ class occurs extends NGCCHandler {
     }
 
     public boolean accepted() {
-        return((($_ngcc_current_state == 5) || (($_ngcc_current_state == 0) || ($_ngcc_current_state == 1))));
+        return((($_ngcc_current_state == 0) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 5))));
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java
index 5b54441897d..d87870f9ab6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java
@@ -129,10 +129,10 @@ class particle extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 3:
+        case 26:
             {
-                if((($ai = $runtime.getAttributeIndex("","namespace"))>=0 || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($ai = $runtime.getAttributeIndex("","processContents"))>=0))) {
-                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 416, wloc);
+                if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 599);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -140,16 +140,26 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 10:
+        case 4:
             {
-                action3();
-                $_ngcc_current_state = 7;
-                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 574);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
             }
             break;
-        case 0:
+        case 25:
             {
-                revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
             }
             break;
         case 20:
@@ -159,6 +169,17 @@ class particle extends NGCCHandler {
                 $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
+        case 16:
+            {
+                if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))))))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 588);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         case 1:
             {
                 if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
@@ -192,33 +213,10 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 4:
-            {
-                if(((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 417);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 11:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 425, null,AnnotationContext.PARTICLE);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 10;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         case 21:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 437, null,AnnotationContext.PARTICLE);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 594, null,AnnotationContext.PARTICLE);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -227,10 +225,28 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 16:
+        case 29:
             {
-                if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($ai = $runtime.getAttributeIndex("","final"))>=0 && (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("key")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("keyref"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("unique")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))))))))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))))))) {
+                    NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 603, loc,compositorName);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
+        case 10:
+            {
+                action3();
+                $_ngcc_current_state = 7;
+                $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 30:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))))))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 604);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -245,8 +261,8 @@ class particle extends NGCCHandler {
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","name"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 || ($ai = $runtime.getAttributeIndex("","final"))>=0))))))) {
-                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                    if((($ai = $runtime.getAttributeIndex("","default"))>=0 || (($ai = $runtime.getAttributeIndex("","block"))>=0 || (($ai = $runtime.getAttributeIndex("","fixed"))>=0 || (($ai = $runtime.getAttributeIndex("","form"))>=0 || (($ai = $runtime.getAttributeIndex("","final"))>=0 || (($ai = $runtime.getAttributeIndex("","abstract"))>=0 || ($ai = $runtime.getAttributeIndex("","name"))>=0))))))) {
+                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                     }
                     else {
@@ -255,10 +271,15 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 29:
+        case 0:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))) {
-                    NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 446, loc,compositorName);
+                revertToParentFromEnterElement(result, super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 3:
+            {
+                if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ($ai = $runtime.getAttributeIndex("","namespace"))>=0))) {
+                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 573, wloc);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -266,37 +287,16 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 26:
+        case 11:
             {
-                if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 442);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 582, null,AnnotationContext.PARTICLE);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 30:
-            {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")) || ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || (((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 447);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 25:
-            {
-                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                    $runtime.consumeAttribute($ai);
+                    $_ngcc_current_state = 10;
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
             }
             break;
         default:
@@ -313,6 +313,85 @@ class particle extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 26:
+            {
+                if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 599);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 28:
+            {
+                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 4:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")))))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 574);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 25:
+            {
+                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 20:
+            {
+                action5();
+                $_ngcc_current_state = 19;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 16:
+            {
+                if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 588);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
+        case 21:
+            {
+                $_ngcc_current_state = 20;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 19:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
@@ -324,10 +403,10 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 3:
+        case 29:
             {
-                if(((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))) {
-                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 416, wloc);
+                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
+                    NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 603, loc,compositorName);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -342,56 +421,10 @@ class particle extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
+        case 30:
             {
-                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 20:
-            {
-                action5();
-                $_ngcc_current_state = 19;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 4:
-            {
-                if(((($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 417);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 11:
-            {
-                $_ngcc_current_state = 10;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 21:
-            {
-                $_ngcc_current_state = 20;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 2:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 16:
-            {
-                if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))))))))))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                if((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || (($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 604);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -417,8 +450,8 @@ class particle extends NGCCHandler {
                     $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
-                    if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) {
-                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                    if(((($ai = $runtime.getAttributeIndex("","default"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","block"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","fixed"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","form"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","final"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || ((($ai = $runtime.getAttributeIndex("","abstract"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element"))) || (($ai = $runtime.getAttributeIndex("","name"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("element")))))))))) {
+                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                         spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                     }
                     else {
@@ -427,10 +460,15 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 29:
+        case 0:
             {
-                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
-                    NGCCHandler h = new modelGroupBody(this, super._source, $runtime, 446, loc,compositorName);
+                revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 3:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")) || ((($ai = $runtime.getAttributeIndex("","processContents"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any"))) || (($ai = $runtime.getAttributeIndex("","namespace"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("any")))))) {
+                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 573, wloc);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -438,48 +476,10 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 26:
+        case 11:
             {
-                if(((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || ((($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) || (($ai = $runtime.getAttributeIndex("","ref"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group")))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 442);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 28:
-            {
-                if(((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 30:
-            {
-                if((((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))) || ((($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence")))) || (($ai = $runtime.getAttributeIndex("","minOccurs"))>=0 && ((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("all")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("choice"))) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("sequence"))))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 447);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
-        case 25:
-            {
-                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
+                $_ngcc_current_state = 10;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -498,8 +498,8 @@ class particle extends NGCCHandler {
         switch($_ngcc_current_state) {
         case 4:
             {
-                if((($__uri.equals("") && $__local.equals("namespace")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("minOccurs")) || ($__uri.equals("") && $__local.equals("processContents")))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 417);
+                if((($__uri.equals("") && $__local.equals("processContents")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("minOccurs")) || ($__uri.equals("") && $__local.equals("namespace")))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 574);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -507,49 +507,10 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 11:
+        case 26:
             {
-                $_ngcc_current_state = 10;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 21:
-            {
-                $_ngcc_current_state = 20;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 16:
-            {
-                if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("ref")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("final")))))))))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 431);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
-        case 8:
-            {
-                if(($__uri.equals("") && $__local.equals("ref"))) {
-                    $_ngcc_current_state = 14;
-                }
-                else {
-                    if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("name")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("final"))))))))) {
-                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
-                        spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                    }
-                    else {
-                        unexpectedEnterAttribute($__qname);
-                    }
-                }
-            }
-            break;
-        case 3:
-            {
-                if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) {
-                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 416, wloc);
+                if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("minOccurs")) || ($__uri.equals("") && $__local.equals("ref"))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 599);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
@@ -564,9 +525,15 @@ class particle extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
+        case 30:
             {
-                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+                if((($__uri.equals("") && $__local.equals("maxOccurs")) || ($__uri.equals("") && $__local.equals("minOccurs")))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 604);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
             }
             break;
         case 20:
@@ -576,28 +543,6 @@ class particle extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 26:
-            {
-                if((($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("minOccurs")) || ($__uri.equals("") && $__local.equals("ref"))))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 442);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
-        case 30:
-            {
-                if((($__uri.equals("") && $__local.equals("maxOccurs")) || ($__uri.equals("") && $__local.equals("minOccurs")))) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 447);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
-                }
-                else {
-                    unexpectedEnterAttribute($__qname);
-                }
-            }
-            break;
         case 25:
             {
                 if(($__uri.equals("") && $__local.equals("ref"))) {
@@ -608,6 +553,61 @@ class particle extends NGCCHandler {
                 }
             }
             break;
+        case 8:
+            {
+                if(($__uri.equals("") && $__local.equals("ref"))) {
+                    $_ngcc_current_state = 14;
+                }
+                else {
+                    if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("abstract")) || ($__uri.equals("") && $__local.equals("name"))))))))) {
+                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
+                        spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                    }
+                    else {
+                        unexpectedEnterAttribute($__qname);
+                    }
+                }
+            }
+            break;
+        case 0:
+            {
+                revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 16:
+            {
+                if((($__uri.equals("") && $__local.equals("default")) || (($__uri.equals("") && $__local.equals("block")) || (($__uri.equals("") && $__local.equals("fixed")) || (($__uri.equals("") && $__local.equals("maxOccurs")) || (($__uri.equals("") && $__local.equals("minOccurs")) || (($__uri.equals("") && $__local.equals("form")) || (($__uri.equals("") && $__local.equals("final")) || (($__uri.equals("") && $__local.equals("abstract")) || (($__uri.equals("") && $__local.equals("ref")) || ($__uri.equals("") && $__local.equals("name")))))))))))) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 588);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
+            }
+            break;
+        case 3:
+            {
+                if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) {
+                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 573, wloc);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                }
+                else {
+                    unexpectedEnterAttribute($__qname);
+                }
+            }
+            break;
+        case 21:
+            {
+                $_ngcc_current_state = 20;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 11:
+            {
+                $_ngcc_current_state = 10;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -622,28 +622,6 @@ class particle extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 13:
-            {
-                if(($__uri.equals("") && $__local.equals("ref"))) {
-                    $_ngcc_current_state = 11;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 11:
-            {
-                $_ngcc_current_state = 10;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 21:
-            {
-                $_ngcc_current_state = 20;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 23:
             {
                 if(($__uri.equals("") && $__local.equals("ref"))) {
@@ -661,11 +639,6 @@ class particle extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 20:
             {
                 action5();
@@ -673,6 +646,33 @@ class particle extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(result, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 21:
+            {
+                $_ngcc_current_state = 20;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 11:
+            {
+                $_ngcc_current_state = 10;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 13:
+            {
+                if(($__uri.equals("") && $__local.equals("ref"))) {
+                    $_ngcc_current_state = 11;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -684,36 +684,58 @@ class particle extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 24:
+        case 26:
             {
-                NGCCHandler h = new qname(this, super._source, $runtime, 440);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 3:
-            {
-                if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
-                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 416, wloc);
+                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 599);
                     spawnChildFromText(h, $value);
                 }
                 else {
-                    if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                        NGCCHandler h = new wildcardBody(this, super._source, $runtime, 416, wloc);
+                    if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
+                        NGCCHandler h = new occurs(this, super._source, $runtime, 599);
                         spawnChildFromText(h, $value);
                     }
+                    else {
+                        if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+                            NGCCHandler h = new occurs(this, super._source, $runtime, 599);
+                            spawnChildFromText(h, $value);
+                        }
+                    }
                 }
             }
             break;
-        case 10:
+        case 4:
             {
-                action3();
-                $_ngcc_current_state = 7;
-                $runtime.sendText(super._cookie, $value);
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 574);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
+                        NGCCHandler h = new occurs(this, super._source, $runtime, 574);
+                        spawnChildFromText(h, $value);
+                    }
+                    else {
+                        if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+                            NGCCHandler h = new occurs(this, super._source, $runtime, 574);
+                            spawnChildFromText(h, $value);
+                        }
+                        else {
+                            if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+                                NGCCHandler h = new occurs(this, super._source, $runtime, 574);
+                                spawnChildFromText(h, $value);
+                            }
+                        }
+                    }
+                }
             }
             break;
-        case 0:
+        case 25:
             {
-                revertToParentFromText(result, super._cookie, $value);
+                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
             }
             break;
         case 20:
@@ -723,99 +745,55 @@ class particle extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
-        case 14:
-            {
-                NGCCHandler h = new qname(this, super._source, $runtime, 428);
-                spawnChildFromText(h, $value);
-            }
-            break;
-        case 4:
-            {
-                if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 417);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
-                        NGCCHandler h = new occurs(this, super._source, $runtime, 417);
-                        spawnChildFromText(h, $value);
-                    }
-                    else {
-                        if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
-                            NGCCHandler h = new occurs(this, super._source, $runtime, 417);
-                            spawnChildFromText(h, $value);
-                        }
-                        else {
-                            if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                                NGCCHandler h = new occurs(this, super._source, $runtime, 417);
-                                spawnChildFromText(h, $value);
-                            }
-                        }
-                    }
-                }
-            }
-            break;
-        case 11:
-            {
-                $_ngcc_current_state = 10;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 21:
-            {
-                $_ngcc_current_state = 20;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
         case 16:
             {
-                if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                     spawnChildFromText(h, $value);
                 }
                 else {
-                    if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
-                        NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                    if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
+                        NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                         spawnChildFromText(h, $value);
                     }
                     else {
-                        if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
-                            NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                        if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
+                            NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                             spawnChildFromText(h, $value);
                         }
                         else {
-                            if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                                NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                            if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                                NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                                 spawnChildFromText(h, $value);
                             }
                             else {
-                                if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
-                                    NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                                    NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                                     spawnChildFromText(h, $value);
                                 }
                                 else {
-                                    if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                                        NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                                    if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
+                                        NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                                         spawnChildFromText(h, $value);
                                     }
                                     else {
-                                        if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
-                                            NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                                        if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+                                            NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                                             spawnChildFromText(h, $value);
                                         }
                                         else {
-                                            if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
-                                                NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                                            if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
+                                                NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                                                 spawnChildFromText(h, $value);
                                             }
                                             else {
-                                                if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
-                                                    NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                                                if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
+                                                    NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                                                     spawnChildFromText(h, $value);
                                                 }
                                                 else {
-                                                    if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
-                                                        NGCCHandler h = new occurs(this, super._source, $runtime, 431);
+                                                    if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
+                                                        NGCCHandler h = new occurs(this, super._source, $runtime, 588);
                                                         spawnChildFromText(h, $value);
                                                     }
                                                 }
@@ -829,6 +807,39 @@ class particle extends NGCCHandler {
                 }
             }
             break;
+        case 21:
+            {
+                $_ngcc_current_state = 20;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 10:
+            {
+                action3();
+                $_ngcc_current_state = 7;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
+        case 14:
+            {
+                NGCCHandler h = new qname(this, super._source, $runtime, 585);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 30:
+            {
+                if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
+                    NGCCHandler h = new occurs(this, super._source, $runtime, 604);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
+                        NGCCHandler h = new occurs(this, super._source, $runtime, 604);
+                        spawnChildFromText(h, $value);
+                    }
+                }
+            }
+            break;
         case 8:
             {
                 if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
@@ -836,38 +847,38 @@ class particle extends NGCCHandler {
                     $runtime.sendText(super._cookie, $value);
                 }
                 else {
-                    if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
-                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                    if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                         spawnChildFromText(h, $value);
                     }
                     else {
                         if(($ai = $runtime.getAttributeIndex("","abstract"))>=0) {
-                            NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                            NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                             spawnChildFromText(h, $value);
                         }
                         else {
-                            if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
-                                NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                            if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
+                                NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                                 spawnChildFromText(h, $value);
                             }
                             else {
-                                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                                if(($ai = $runtime.getAttributeIndex("","form"))>=0) {
+                                    NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                                     spawnChildFromText(h, $value);
                                 }
                                 else {
                                     if(($ai = $runtime.getAttributeIndex("","fixed"))>=0) {
-                                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                                        NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                                         spawnChildFromText(h, $value);
                                     }
                                     else {
                                         if(($ai = $runtime.getAttributeIndex("","block"))>=0) {
-                                            NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                                            NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                                             spawnChildFromText(h, $value);
                                         }
                                         else {
                                             if(($ai = $runtime.getAttributeIndex("","default"))>=0) {
-                                                NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 422, loc,false);
+                                                NGCCHandler h = new elementDeclBody(this, super._source, $runtime, 579, loc,false);
                                                 spawnChildFromText(h, $value);
                                             }
                                         }
@@ -879,46 +890,35 @@ class particle extends NGCCHandler {
                 }
             }
             break;
-        case 26:
+        case 0:
             {
-                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 442);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
-                        NGCCHandler h = new occurs(this, super._source, $runtime, 442);
-                        spawnChildFromText(h, $value);
-                    }
-                    else {
-                        if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
-                            NGCCHandler h = new occurs(this, super._source, $runtime, 442);
-                            spawnChildFromText(h, $value);
-                        }
-                    }
-                }
+                revertToParentFromText(result, super._cookie, $value);
             }
             break;
-        case 30:
+        case 3:
             {
-                if(($ai = $runtime.getAttributeIndex("","minOccurs"))>=0) {
-                    NGCCHandler h = new occurs(this, super._source, $runtime, 447);
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    NGCCHandler h = new wildcardBody(this, super._source, $runtime, 573, wloc);
                     spawnChildFromText(h, $value);
                 }
                 else {
-                    if(($ai = $runtime.getAttributeIndex("","maxOccurs"))>=0) {
-                        NGCCHandler h = new occurs(this, super._source, $runtime, 447);
+                    if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+                        NGCCHandler h = new wildcardBody(this, super._source, $runtime, 573, wloc);
                         spawnChildFromText(h, $value);
                     }
                 }
             }
             break;
-        case 25:
+        case 24:
             {
-                if(($ai = $runtime.getAttributeIndex("","ref"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
+                NGCCHandler h = new qname(this, super._source, $runtime, 597);
+                spawnChildFromText(h, $value);
+            }
+            break;
+        case 11:
+            {
+                $_ngcc_current_state = 10;
+                $runtime.sendText(super._cookie, $value);
             }
             break;
         }
@@ -926,75 +926,75 @@ class particle extends NGCCHandler {
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 440:
+        case 599:
             {
-                groupName = ((UName)$__result__);
-                $_ngcc_current_state = 23;
+                occurs = ((occurs)$__result__);
+                $_ngcc_current_state = 25;
             }
             break;
-        case 416:
-            {
-                wcBody = ((WildcardImpl)$__result__);
-                action0();
-                $_ngcc_current_state = 2;
-            }
-            break;
-        case 428:
-            {
-                elementTypeName = ((UName)$__result__);
-                $_ngcc_current_state = 13;
-            }
-            break;
-        case 425:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 10;
-            }
-            break;
-        case 422:
+        case 579:
             {
                 anonymousElementDecl = ((ElementDecl)$__result__);
                 action2();
                 $_ngcc_current_state = 7;
             }
             break;
-        case 446:
+        case 573:
+            {
+                wcBody = ((WildcardImpl)$__result__);
+                action0();
+                $_ngcc_current_state = 2;
+            }
+            break;
+        case 597:
+            {
+                groupName = ((UName)$__result__);
+                $_ngcc_current_state = 23;
+            }
+            break;
+        case 582:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 10;
+            }
+            break;
+        case 574:
+            {
+                occurs = ((occurs)$__result__);
+                $_ngcc_current_state = 3;
+            }
+            break;
+        case 588:
+            {
+                occurs = ((occurs)$__result__);
+                $_ngcc_current_state = 8;
+            }
+            break;
+        case 594:
+            {
+                annotation = ((AnnotationImpl)$__result__);
+                $_ngcc_current_state = 20;
+            }
+            break;
+        case 603:
             {
                 term = ((ModelGroupImpl)$__result__);
                 action7();
                 $_ngcc_current_state = 28;
             }
             break;
-        case 442:
+        case 585:
             {
-                occurs = ((occurs)$__result__);
-                $_ngcc_current_state = 25;
+                elementTypeName = ((UName)$__result__);
+                $_ngcc_current_state = 13;
             }
             break;
-        case 447:
+        case 604:
             {
                 occurs = ((occurs)$__result__);
                 $_ngcc_current_state = 29;
             }
             break;
-        case 417:
-            {
-                occurs = ((occurs)$__result__);
-                $_ngcc_current_state = 3;
-            }
-            break;
-        case 437:
-            {
-                annotation = ((AnnotationImpl)$__result__);
-                $_ngcc_current_state = 20;
-            }
-            break;
-        case 431:
-            {
-                occurs = ((occurs)$__result__);
-                $_ngcc_current_state = 8;
-            }
-            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java
index f3998268f66..38e2effacb8 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java
@@ -141,17 +141,17 @@ class qname extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromText($runtime.parseUName(qvalue), super._cookie, $value);
-            }
-            break;
         case 1:
             {
                 qvalue = $value;
                 $_ngcc_current_state = 0;
             }
             break;
+        case 0:
+            {
+                revertToParentFromText($runtime.parseUName(qvalue), super._cookie, $value);
+            }
+            break;
         }
     }
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java
index caea009a2fe..370c46f0d27 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java
@@ -116,41 +116,30 @@ class redefine extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 15:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
-                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
-                    $_ngcc_current_state = 14;
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
         case 1:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 476, null,AnnotationContext.SCHEMA);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 369, null,AnnotationContext.SCHEMA);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
                     if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                        NGCCHandler h = new simpleType(this, super._source, $runtime, 477);
+                        NGCCHandler h = new simpleType(this, super._source, $runtime, 370);
                         spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                     }
                     else {
                         if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
-                            NGCCHandler h = new complexType(this, super._source, $runtime, 478);
+                            NGCCHandler h = new complexType(this, super._source, $runtime, 371);
                             spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                         }
                         else {
                             if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
-                                NGCCHandler h = new group(this, super._source, $runtime, 479);
+                                NGCCHandler h = new group(this, super._source, $runtime, 372);
                                 spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                             }
                             else {
                                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
-                                    NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 480);
+                                    NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 373);
                                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                                 }
                                 else {
@@ -162,9 +151,51 @@ class redefine extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 2:
             {
-                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 374, null,AnnotationContext.SCHEMA);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+                        NGCCHandler h = new simpleType(this, super._source, $runtime, 375);
+                        spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                    }
+                    else {
+                        if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
+                            NGCCHandler h = new complexType(this, super._source, $runtime, 376);
+                            spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                        }
+                        else {
+                            if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
+                                NGCCHandler h = new group(this, super._source, $runtime, 377);
+                                spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                            }
+                            else {
+                                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
+                                    NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 378);
+                                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                                }
+                                else {
+                                    $_ngcc_current_state = 1;
+                                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            break;
+        case 15:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("redefine"))) {
+                    $runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
+                    $_ngcc_current_state = 14;
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
             }
             break;
         case 14:
@@ -178,40 +209,9 @@ class redefine extends NGCCHandler {
                 }
             }
             break;
-        case 2:
+        case 0:
             {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 481, null,AnnotationContext.SCHEMA);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                        NGCCHandler h = new simpleType(this, super._source, $runtime, 482);
-                        spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                    }
-                    else {
-                        if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("complexType"))) {
-                            NGCCHandler h = new complexType(this, super._source, $runtime, 483);
-                            spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                        }
-                        else {
-                            if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("group"))) {
-                                NGCCHandler h = new group(this, super._source, $runtime, 484);
-                                spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                            }
-                            else {
-                                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("attributeGroup"))) {
-                                    NGCCHandler h = new attributeGroupDecl(this, super._source, $runtime, 485);
-                                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                                }
-                                else {
-                                    $_ngcc_current_state = 1;
-                                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                                }
-                            }
-                        }
-                    }
-                }
+                revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
         default:
@@ -239,9 +239,10 @@ class redefine extends NGCCHandler {
                 }
             }
             break;
-        case 0:
+        case 2:
             {
-                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+                $_ngcc_current_state = 1;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
         case 14:
@@ -255,10 +256,9 @@ class redefine extends NGCCHandler {
                 }
             }
             break;
-        case 2:
+        case 0:
             {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -275,9 +275,10 @@ class redefine extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 2:
             {
-                revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+                $_ngcc_current_state = 1;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
         case 14:
@@ -290,10 +291,9 @@ class redefine extends NGCCHandler {
                 }
             }
             break;
-        case 2:
+        case 0:
             {
-                $_ngcc_current_state = 1;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
             }
             break;
         default:
@@ -310,11 +310,6 @@ class redefine extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 2:
             {
                 $_ngcc_current_state = 1;
@@ -331,6 +326,11 @@ class redefine extends NGCCHandler {
                 }
             }
             break;
+        case 0:
+            {
+                revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -342,9 +342,10 @@ class redefine extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 0:
+        case 2:
             {
-                revertToParentFromText(this, super._cookie, $value);
+                $_ngcc_current_state = 1;
+                $runtime.sendText(super._cookie, $value);
             }
             break;
         case 14:
@@ -355,12 +356,6 @@ class redefine extends NGCCHandler {
                 }
             }
             break;
-        case 2:
-            {
-                $_ngcc_current_state = 1;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
         case 13:
             {
                 schemaLocation = $value;
@@ -368,71 +363,76 @@ class redefine extends NGCCHandler {
                 action4();
             }
             break;
+        case 0:
+            {
+                revertToParentFromText(this, super._cookie, $value);
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 476:
+        case 374:
             {
                 $_ngcc_current_state = 1;
             }
             break;
-        case 477:
+        case 375:
             {
                 newSt = ((SimpleTypeImpl)$__result__);
                 action3();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 478:
+        case 376:
             {
                 newCt = ((ComplexTypeImpl)$__result__);
                 action2();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 479:
+        case 377:
             {
                 newGrp = ((ModelGroupDeclImpl)$__result__);
                 action1();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 480:
+        case 378:
             {
                 newAg = ((AttGroupDeclImpl)$__result__);
                 action0();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 481:
+        case 369:
             {
                 $_ngcc_current_state = 1;
             }
             break;
-        case 482:
+        case 370:
             {
                 newSt = ((SimpleTypeImpl)$__result__);
                 action3();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 483:
+        case 371:
             {
                 newCt = ((ComplexTypeImpl)$__result__);
                 action2();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 484:
+        case 372:
             {
                 newGrp = ((ModelGroupDeclImpl)$__result__);
                 action1();
                 $_ngcc_current_state = 1;
             }
             break;
-        case 485:
+        case 373:
             {
                 newAg = ((AttGroupDeclImpl)$__result__);
                 action0();
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java
index 5c4d8faff1b..0f5f7891a0d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java
@@ -79,14 +79,14 @@ class simpleType extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 11:
+        case 8:
             {
-                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 632, null,AnnotationContext.SIMPLETYPE_DECL);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    $_ngcc_current_state = 10;
+                    $_ngcc_current_state = 7;
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
@@ -103,49 +103,15 @@ class simpleType extends NGCCHandler {
                 }
             }
             break;
-        case 10:
+        case 11:
             {
-                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union")))))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 71, fa);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    unexpectedEnterElement($__qname);
-                }
-            }
-            break;
-        case 8:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 69, null,AnnotationContext.SIMPLETYPE_DECL);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 7;
+                if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
+                    $runtime.consumeAttribute($ai);
                     $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
-            }
-            break;
-        case 2:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
-                    NGCCHandler h = new SimpleType_Restriction(this, super._source, $runtime, 65, annotation,locator,fa,name,finalSet);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                }
                 else {
-                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) {
-                        NGCCHandler h = new SimpleType_List(this, super._source, $runtime, 66, annotation,locator,fa,name,finalSet);
-                        spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                    }
-                    else {
-                        if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
-                            NGCCHandler h = new SimpleType_Union(this, super._source, $runtime, 60, annotation,locator,fa,name,finalSet);
-                            spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
-                        }
-                        else {
-                            unexpectedEnterElement($__qname);
-                        }
-                    }
+                    $_ngcc_current_state = 10;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
             }
             break;
@@ -173,6 +139,40 @@ class simpleType extends NGCCHandler {
                 $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
+        case 2:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction"))) {
+                    NGCCHandler h = new SimpleType_Restriction(this, super._source, $runtime, 628, annotation,locator,fa,name,finalSet);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list"))) {
+                        NGCCHandler h = new SimpleType_List(this, super._source, $runtime, 629, annotation,locator,fa,name,finalSet);
+                        spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                    }
+                    else {
+                        if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union"))) {
+                            NGCCHandler h = new SimpleType_Union(this, super._source, $runtime, 623, annotation,locator,fa,name,finalSet);
+                            spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                        }
+                        else {
+                            unexpectedEnterElement($__qname);
+                        }
+                    }
+                }
+            }
+            break;
+        case 10:
+            {
+                if((($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("restriction")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")) || (($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("union")) || ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("list")))))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 634, fa);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    unexpectedEnterElement($__qname);
+                }
+            }
+            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -187,6 +187,12 @@ class simpleType extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 8:
+            {
+                $_ngcc_current_state = 7;
+                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 11:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -199,28 +205,11 @@ class simpleType extends NGCCHandler {
                 }
             }
             break;
-        case 8:
-            {
-                $_ngcc_current_state = 7;
-                $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 0:
             {
                 revertToParentFromLeaveElement(result, super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 1:
-            {
-                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
-                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
-                    $_ngcc_current_state = 0;
-                }
-                else {
-                    unexpectedLeaveElement($__qname);
-                }
-            }
-            break;
         case 15:
             {
                 if(($ai = $runtime.getAttributeIndex("","final"))>=0) {
@@ -233,6 +222,17 @@ class simpleType extends NGCCHandler {
                 }
             }
             break;
+        case 1:
+            {
+                if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("simpleType"))) {
+                    $runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
+                    $_ngcc_current_state = 0;
+                }
+                else {
+                    unexpectedLeaveElement($__qname);
+                }
+            }
+            break;
         case 7:
             {
                 action0();
@@ -254,6 +254,12 @@ class simpleType extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 8:
+            {
+                $_ngcc_current_state = 7;
+                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 11:
             {
                 if(($__uri.equals("") && $__local.equals("name"))) {
@@ -265,12 +271,6 @@ class simpleType extends NGCCHandler {
                 }
             }
             break;
-        case 8:
-            {
-                $_ngcc_current_state = 7;
-                $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         case 0:
             {
                 revertToParentFromEnterAttribute(result, super._cookie, $__uri, $__local, $__qname);
@@ -308,19 +308,9 @@ class simpleType extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 16:
+        case 8:
             {
-                if(($__uri.equals("") && $__local.equals("final"))) {
-                    $_ngcc_current_state = 11;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
-        case 11:
-            {
-                $_ngcc_current_state = 10;
+                $_ngcc_current_state = 7;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -334,9 +324,9 @@ class simpleType extends NGCCHandler {
                 }
             }
             break;
-        case 8:
+        case 11:
             {
-                $_ngcc_current_state = 7;
+                $_ngcc_current_state = 10;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -351,6 +341,16 @@ class simpleType extends NGCCHandler {
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 16:
+            {
+                if(($__uri.equals("") && $__local.equals("final"))) {
+                    $_ngcc_current_state = 11;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
         case 7:
             {
                 action0();
@@ -369,6 +369,12 @@ class simpleType extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
+        case 8:
+            {
+                $_ngcc_current_state = 7;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
         case 11:
             {
                 if(($ai = $runtime.getAttributeIndex("","name"))>=0) {
@@ -381,18 +387,6 @@ class simpleType extends NGCCHandler {
                 }
             }
             break;
-        case 17:
-            {
-                finalValue = $value;
-                $_ngcc_current_state = 16;
-            }
-            break;
-        case 8:
-            {
-                $_ngcc_current_state = 7;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
         case 0:
             {
                 revertToParentFromText(result, super._cookie, $value);
@@ -423,36 +417,42 @@ class simpleType extends NGCCHandler {
                 $runtime.sendText(super._cookie, $value);
             }
             break;
+        case 17:
+            {
+                finalValue = $value;
+                $_ngcc_current_state = 16;
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 71:
+        case 634:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 8;
             }
             break;
-        case 69:
+        case 632:
             {
                 annotation = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 7;
             }
             break;
-        case 65:
+        case 628:
             {
                 result = ((RestrictionSimpleTypeImpl)$__result__);
                 $_ngcc_current_state = 1;
             }
             break;
-        case 66:
+        case 629:
             {
                 result = ((ListSimpleTypeImpl)$__result__);
                 $_ngcc_current_state = 1;
             }
             break;
-        case 60:
+        case 623:
             {
                 result = ((UnionSimpleTypeImpl)$__result__);
                 $_ngcc_current_state = 1;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java
index 4bbd39eda16..86188c63bb9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java
@@ -78,7 +78,7 @@ class wildcardBody extends NGCCHandler {
         case 10:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 204, null,AnnotationContext.WILDCARD);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 556, null,AnnotationContext.WILDCARD);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -92,14 +92,26 @@ class wildcardBody extends NGCCHandler {
                 revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
             }
             break;
+        case 1:
+            {
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+                else {
+                    $_ngcc_current_state = 0;
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                }
+            }
+            break;
         case 9:
             {
-                if((($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0)) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
+                if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || ($ai = $runtime.getAttributeIndex("","namespace"))>=0)) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
             }
@@ -116,18 +128,6 @@ class wildcardBody extends NGCCHandler {
                 }
             }
             break;
-        case 1:
-            {
-                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-                else {
-                    $_ngcc_current_state = 0;
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterElement($__qname);
@@ -153,14 +153,26 @@ class wildcardBody extends NGCCHandler {
                 revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 1:
+            {
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+                else {
+                    $_ngcc_current_state = 0;
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 9:
             {
-                if((($ai = $runtime.getAttributeIndex("","namespace"))>=0 || ($ai = $runtime.getAttributeIndex("","processContents"))>=0)) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
+                if((($ai = $runtime.getAttributeIndex("","processContents"))>=0 || ($ai = $runtime.getAttributeIndex("","namespace"))>=0)) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
                     spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
             }
@@ -177,18 +189,6 @@ class wildcardBody extends NGCCHandler {
                 }
             }
             break;
-        case 1:
-            {
-                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-                else {
-                    $_ngcc_current_state = 0;
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedLeaveElement($__qname);
@@ -214,14 +214,25 @@ class wildcardBody extends NGCCHandler {
                 revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
             }
             break;
+        case 1:
+            {
+                if(($__uri.equals("") && $__local.equals("namespace"))) {
+                    $_ngcc_current_state = 3;
+                }
+                else {
+                    $_ngcc_current_state = 0;
+                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
+                }
+            }
+            break;
         case 9:
             {
-                if((($__uri.equals("") && $__local.equals("namespace")) || ($__uri.equals("") && $__local.equals("processContents")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
+                if((($__uri.equals("") && $__local.equals("processContents")) || ($__uri.equals("") && $__local.equals("namespace")))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
                     spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
             }
@@ -237,17 +248,6 @@ class wildcardBody extends NGCCHandler {
                 }
             }
             break;
-        case 1:
-            {
-                if(($__uri.equals("") && $__local.equals("namespace"))) {
-                    $_ngcc_current_state = 3;
-                }
-                else {
-                    $_ngcc_current_state = 0;
-                    $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
-                }
-            }
-            break;
         default:
             {
                 unexpectedEnterAttribute($__qname);
@@ -262,16 +262,6 @@ class wildcardBody extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 6:
-            {
-                if(($__uri.equals("") && $__local.equals("processContents"))) {
-                    $_ngcc_current_state = 1;
-                }
-                else {
-                    unexpectedLeaveAttribute($__qname);
-                }
-            }
-            break;
         case 10:
             {
                 $_ngcc_current_state = 9;
@@ -283,16 +273,26 @@ class wildcardBody extends NGCCHandler {
                 revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 9:
+        case 1:
             {
-                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
-                spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
+                $_ngcc_current_state = 0;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 5:
+        case 6:
             {
-                $_ngcc_current_state = 1;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+                if(($__uri.equals("") && $__local.equals("processContents"))) {
+                    $_ngcc_current_state = 1;
+                }
+                else {
+                    unexpectedLeaveAttribute($__qname);
+                }
+            }
+            break;
+        case 9:
+            {
+                NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
+                spawnChildFromLeaveAttribute(h, $__uri, $__local, $__qname);
             }
             break;
         case 2:
@@ -305,9 +305,9 @@ class wildcardBody extends NGCCHandler {
                 }
             }
             break;
-        case 1:
+        case 5:
             {
-                $_ngcc_current_state = 0;
+                $_ngcc_current_state = 1;
                 $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
@@ -322,12 +322,6 @@ class wildcardBody extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
-        case 7:
-            {
-                modeValue = $value;
-                $_ngcc_current_state = 6;
-            }
-            break;
         case 10:
             {
                 $_ngcc_current_state = 9;
@@ -339,36 +333,6 @@ class wildcardBody extends NGCCHandler {
                 revertToParentFromText(makeResult(), super._cookie, $value);
             }
             break;
-        case 9:
-            {
-                if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
-                    spawnChildFromText(h, $value);
-                }
-                else {
-                    if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
-                        NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
-                        spawnChildFromText(h, $value);
-                    }
-                    else {
-                        NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 202, null);
-                        spawnChildFromText(h, $value);
-                    }
-                }
-            }
-            break;
-        case 5:
-            {
-                if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-                else {
-                    $_ngcc_current_state = 1;
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
         case 1:
             {
                 if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
@@ -387,18 +351,54 @@ class wildcardBody extends NGCCHandler {
                 $_ngcc_current_state = 2;
             }
             break;
+        case 9:
+            {
+                if(($ai = $runtime.getAttributeIndex("","namespace"))>=0) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
+                    spawnChildFromText(h, $value);
+                }
+                else {
+                    if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+                        NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
+                        spawnChildFromText(h, $value);
+                    }
+                    else {
+                        NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 554, null);
+                        spawnChildFromText(h, $value);
+                    }
+                }
+            }
+            break;
+        case 7:
+            {
+                modeValue = $value;
+                $_ngcc_current_state = 6;
+            }
+            break;
+        case 5:
+            {
+                if(($ai = $runtime.getAttributeIndex("","processContents"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+                else {
+                    $_ngcc_current_state = 1;
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 204:
+        case 556:
             {
                 annotation = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 9;
             }
             break;
-        case 202:
+        case 554:
             {
                 fa = ((ForeignAttributesImpl)$__result__);
                 $_ngcc_current_state = 5;
@@ -408,7 +408,7 @@ class wildcardBody extends NGCCHandler {
     }
 
     public boolean accepted() {
-        return((($_ngcc_current_state == 1) || (($_ngcc_current_state == 5) || ($_ngcc_current_state == 0))));
+        return((($_ngcc_current_state == 5) || (($_ngcc_current_state == 1) || ($_ngcc_current_state == 0))));
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java
index c8e78d08f16..44f381a92e4 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java
@@ -70,16 +70,11 @@ class xpath extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
+        case 5:
             {
-                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
-            }
-            break;
-        case 6:
-            {
-                if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 657, null);
-                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+                if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
                     unexpectedEnterElement($__qname);
@@ -89,7 +84,7 @@ class xpath extends NGCCHandler {
         case 1:
             {
                 if(($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation"))) {
-                    NGCCHandler h = new annotation(this, super._source, $runtime, 652, null,AnnotationContext.XPATH);
+                    NGCCHandler h = new annotation(this, super._source, $runtime, 158, null,AnnotationContext.XPATH);
                     spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
@@ -98,11 +93,16 @@ class xpath extends NGCCHandler {
                 }
             }
             break;
-        case 5:
+        case 0:
             {
-                if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+                revertToParentFromEnterElement(makeResult(), super._cookie, $__uri, $__local, $__qname, $attrs);
+            }
+            break;
+        case 6:
+            {
+                if((($ai = $runtime.getAttributeIndex("","xpath"))>=0 && ($__uri.equals("http://www.w3.org/2001/XMLSchema") && $__local.equals("annotation")))) {
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 163, null);
+                    spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
                 }
                 else {
                     unexpectedEnterElement($__qname);
@@ -123,16 +123,11 @@ class xpath extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 6:
+        case 5:
             {
                 if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 657, null);
-                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -145,11 +140,16 @@ class xpath extends NGCCHandler {
                 $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 5:
+        case 0:
+            {
+                revertToParentFromLeaveElement(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 6:
             {
                 if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 163, null);
+                    spawnChildFromLeaveElement(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedLeaveElement($__qname);
@@ -170,16 +170,10 @@ class xpath extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
-        case 0:
-            {
-                revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
-        case 6:
+        case 5:
             {
                 if(($__uri.equals("") && $__local.equals("xpath"))) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 657, null);
-                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
+                    $_ngcc_current_state = 4;
                 }
                 else {
                     unexpectedEnterAttribute($__qname);
@@ -192,10 +186,16 @@ class xpath extends NGCCHandler {
                 $runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
             }
             break;
-        case 5:
+        case 0:
+            {
+                revertToParentFromEnterAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
+        case 6:
             {
                 if(($__uri.equals("") && $__local.equals("xpath"))) {
-                    $_ngcc_current_state = 4;
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 163, null);
+                    spawnChildFromEnterAttribute(h, $__uri, $__local, $__qname);
                 }
                 else {
                     unexpectedEnterAttribute($__qname);
@@ -216,6 +216,12 @@ class xpath extends NGCCHandler {
         $localName = $__local;
         $qname = $__qname;
         switch($_ngcc_current_state) {
+        case 1:
+            {
+                $_ngcc_current_state = 0;
+                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
+            }
+            break;
         case 0:
             {
                 revertToParentFromLeaveAttribute(makeResult(), super._cookie, $__uri, $__local, $__qname);
@@ -231,12 +237,6 @@ class xpath extends NGCCHandler {
                 }
             }
             break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
-                $runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
-            }
-            break;
         default:
             {
                 unexpectedLeaveAttribute($__qname);
@@ -248,6 +248,20 @@ class xpath extends NGCCHandler {
     public void text(String $value) throws SAXException {
         int $ai;
         switch($_ngcc_current_state) {
+        case 5:
+            {
+                if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
+                    $runtime.consumeAttribute($ai);
+                    $runtime.sendText(super._cookie, $value);
+                }
+            }
+            break;
+        case 1:
+            {
+                $_ngcc_current_state = 0;
+                $runtime.sendText(super._cookie, $value);
+            }
+            break;
         case 4:
             {
                 xpath = $value;
@@ -262,47 +276,33 @@ class xpath extends NGCCHandler {
         case 6:
             {
                 if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 657, null);
+                    NGCCHandler h = new foreignAttributes(this, super._source, $runtime, 163, null);
                     spawnChildFromText(h, $value);
                 }
             }
             break;
-        case 1:
-            {
-                $_ngcc_current_state = 0;
-                $runtime.sendText(super._cookie, $value);
-            }
-            break;
-        case 5:
-            {
-                if(($ai = $runtime.getAttributeIndex("","xpath"))>=0) {
-                    $runtime.consumeAttribute($ai);
-                    $runtime.sendText(super._cookie, $value);
-                }
-            }
-            break;
         }
     }
 
     public void onChildCompleted(Object $__result__, int $__cookie__, boolean $__needAttCheck__)throws SAXException {
         switch($__cookie__) {
-        case 657:
-            {
-                fa = ((ForeignAttributesImpl)$__result__);
-                $_ngcc_current_state = 5;
-            }
-            break;
-        case 652:
+        case 158:
             {
                 ann = ((AnnotationImpl)$__result__);
                 $_ngcc_current_state = 0;
             }
             break;
+        case 163:
+            {
+                fa = ((ForeignAttributesImpl)$__result__);
+                $_ngcc_current_state = 5;
+            }
+            break;
         }
     }
 
     public boolean accepted() {
-        return((($_ngcc_current_state == 1) || ($_ngcc_current_state == 0)));
+        return((($_ngcc_current_state == 0) || ($_ngcc_current_state == 1)));
     }
 
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java
index 394a64837f4..3b3948c6748 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.scd;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java
index dcc6a4b9bff..5c2a1464da2 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.scd;
 
 import com.sun.xml.internal.xsom.XSAttContainer;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java
index c39f85fe02c..0e2b2a47313 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.scd;
 
 import java.util.Iterator;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java
index a6356244132..b5f20d31fa7 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java
@@ -25,6 +25,8 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
 package com.sun.xml.internal.xsom.impl.scd;
 
+import java.util.List;
+
 /**
  * This exception is thrown when parse errors are encountered.
  * You can explicitly create objects of this exception type by
@@ -50,7 +52,7 @@ public class ParseException extends Exception {
    */
   public ParseException(Token currentTokenVal,
                         int[][] expectedTokenSequencesVal,
-                        String[] tokenImageVal
+                        List<String> tokenImageVal
                        )
   {
     super("");
@@ -106,7 +108,7 @@ public class ParseException extends Exception {
    * parser within which the parse error occurred.  This array is
    * defined in the generated ...Constants interface.
    */
-  public String[] tokenImage;
+  public List<String> tokenImage;
 
   /**
    * This method has the standard behavior when this object has been
@@ -129,7 +131,7 @@ public class ParseException extends Exception {
         maxSize = expectedTokenSequences[i].length;
       }
       for (int j = 0; j < expectedTokenSequences[i].length; j++) {
-        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(" ");
+        expected.append(tokenImage.get(expectedTokenSequences[i][j])).append(" ");
       }
       if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
         expected.append("...");
@@ -141,7 +143,7 @@ public class ParseException extends Exception {
     for (int i = 0; i < maxSize; i++) {
       if (i != 0) retval += " ";
       if (tok.kind == 0) {
-        retval += tokenImage[0];
+        retval += tokenImage.get(0);
         break;
       }
       retval += add_escapes(tok.image);
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java
index 723ab3637a1..917ccf7727f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.scd;
 
 import com.sun.xml.internal.xsom.SCD;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java
index 2540352b186..dc3b5e8b2fe 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java
@@ -25,6 +25,10 @@
 /* Generated By:JavaCC: Do not edit this line. SCDParserConstants.java */
 package com.sun.xml.internal.xsom.impl.scd;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 public interface SCDParserConstants {
 
   int EOF = 0;
@@ -40,54 +44,55 @@ public interface SCDParserConstants {
 
   int DEFAULT = 0;
 
-  String[] tokenImage = {
-    "<EOF>",
-    "\" \"",
-    "\"\\t\"",
-    "\"\\n\"",
-    "\"\\r\"",
-    "\"\\f\"",
-    "<Letter>",
-    "<BaseChar>",
-    "<Ideographic>",
-    "<CombiningChar>",
-    "<UnicodeDigit>",
-    "<Extender>",
-    "<NCNAME>",
-    "<NUMBER>",
-    "<FACETNAME>",
-    "\":\"",
-    "\"/\"",
-    "\"//\"",
-    "\"attribute::\"",
-    "\"@\"",
-    "\"element::\"",
-    "\"substitutionGroup::\"",
-    "\"type::\"",
-    "\"~\"",
-    "\"baseType::\"",
-    "\"primitiveType::\"",
-    "\"itemType::\"",
-    "\"memberType::\"",
-    "\"scope::\"",
-    "\"attributeGroup::\"",
-    "\"group::\"",
-    "\"identityContraint::\"",
-    "\"key::\"",
-    "\"notation::\"",
-    "\"model::sequence\"",
-    "\"model::choice\"",
-    "\"model::all\"",
-    "\"model::*\"",
-    "\"any::*\"",
-    "\"anyAttribute::*\"",
-    "\"facet::*\"",
-    "\"facet::\"",
-    "\"component::*\"",
-    "\"x-schema::\"",
-    "\"x-schema::*\"",
-    "\"*\"",
-    "\"0\"",
-  };
+  static final List<String> tokenImage = Collections.unmodifiableList(Arrays.asList(
 
-}
+       new String[] {
+         "<EOF>",
+         "\" \"",
+         "\"\\t\"",
+         "\"\\n\"",
+         "\"\\r\"",
+         "\"\\f\"",
+         "<Letter>",
+         "<BaseChar>",
+         "<Ideographic>",
+         "<CombiningChar>",
+         "<UnicodeDigit>",
+         "<Extender>",
+         "<NCNAME>",
+         "<NUMBER>",
+         "<FACETNAME>",
+         "\":\"",
+         "\"/\"",
+         "\"//\"",
+         "\"attribute::\"",
+         "\"@\"",
+         "\"element::\"",
+         "\"substitutionGroup::\"",
+         "\"type::\"",
+         "\"~\"",
+         "\"baseType::\"",
+         "\"primitiveType::\"",
+         "\"itemType::\"",
+         "\"memberType::\"",
+         "\"scope::\"",
+         "\"attributeGroup::\"",
+         "\"group::\"",
+         "\"identityContraint::\"",
+         "\"key::\"",
+         "\"notation::\"",
+         "\"model::sequence\"",
+         "\"model::choice\"",
+         "\"model::all\"",
+         "\"model::*\"",
+         "\"any::*\"",
+         "\"anyAttribute::*\"",
+         "\"facet::*\"",
+         "\"facet::\"",
+         "\"component::*\"",
+         "\"x-schema::\"",
+         "\"x-schema::*\"",
+         "\"*\"",
+         "\"0\"",
+       }));
+  }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java
index 4e9cb602a0e..696740c3b8a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.scd;
 
 import com.sun.xml.internal.xsom.XSComponent;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java
index 4faad353b11..431bf8a25a0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.util;
 
 import org.xml.sax.ErrorHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java
index 1422ae7059d..e122a3e8098 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.util;
 
 import org.xml.sax.EntityResolver;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java
index 3fad540f70c..1f70329e411 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.impl.util;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java
index b80b16c190e..cc5e491a9ff 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.impl.util;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
@@ -46,10 +48,14 @@ import com.sun.xml.internal.xsom.XSType;
 import com.sun.xml.internal.xsom.XSUnionSimpleType;
 import com.sun.xml.internal.xsom.XSWildcard;
 import com.sun.xml.internal.xsom.XSXPath;
+import com.sun.xml.internal.xsom.XSWildcard.Any;
+import com.sun.xml.internal.xsom.XSWildcard.Other;
+import com.sun.xml.internal.xsom.XSWildcard.Union;
 import com.sun.xml.internal.xsom.impl.Const;
 import com.sun.xml.internal.xsom.visitor.XSSimpleTypeVisitor;
 import com.sun.xml.internal.xsom.visitor.XSTermVisitor;
 import com.sun.xml.internal.xsom.visitor.XSVisitor;
+import com.sun.xml.internal.xsom.visitor.XSWildcardFunction;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -124,10 +130,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         if(s.getTargetNamespace().equals(Const.schemaNamespace))
             return;
 
-        println(MessageFormat.format("<schema targetNamespace=\"{0}\">",
-            new Object[]{
-                s.getTargetNamespace(),
-            }));
+        println(MessageFormat.format("<schema targetNamespace=\"{0}\">", s.getTargetNamespace()));
         indent++;
 
         Iterator itr;
@@ -163,8 +166,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
     public void attGroupDecl( XSAttGroupDecl decl ) {
         Iterator itr;
 
-        println(MessageFormat.format("<attGroup name=\"{0}\">",
-            new Object[]{ decl.getName() }));
+        println(MessageFormat.format("<attGroup name=\"{0}\">", decl.getName()));
         indent++;
 
         // TODO: wildcard
@@ -182,8 +184,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
     }
 
     public void dumpRef( XSAttGroupDecl decl ) {
-        println(MessageFormat.format("<attGroup ref=\"'{'{0}'}'{1}\"/>",
-            new Object[]{ decl.getTargetNamespace(), decl.getName() }));
+        println(MessageFormat.format("<attGroup ref=\"'{'{0}'}'{1}\"/>", decl.getTargetNamespace(), decl.getName()));
     }
 
     public void attributeUse( XSAttributeUse use ) {
@@ -204,8 +205,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         } else {
             // reference to a global one
             println(MessageFormat.format("<attribute ref=\"'{'{0}'}'{1}{2}\"/>",
-                new Object[]{ decl.getTargetNamespace(), decl.getName(),
-                    additionalAtts }));
+                decl.getTargetNamespace(), decl.getName(), additionalAtts));
         }
     }
 
@@ -217,21 +217,15 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         XSSimpleType type=decl.getType();
 
         println(MessageFormat.format("<attribute name=\"{0}\"{1}{2}{3}{4}{5}>",
-            new Object[]{
-                decl.getName(),
-                additionalAtts,
-                type.isLocal()?"":
-                MessageFormat.format(" type=\"'{'{0}'}'{1}\"",
-                new Object[]{
-                    type.getTargetNamespace(),
-                    type.getName()
-                }),
-                decl.getFixedValue()==null ?
-                    "":" fixed=\""+decl.getFixedValue()+'\"',
-                decl.getDefaultValue()==null ?
-                    "":" default=\""+decl.getDefaultValue()+'\"',
-                type.isLocal()?"":" /"
-            }));
+            decl.getName(),
+            additionalAtts,
+            type.isLocal()?"":
+                MessageFormat.format(" type=\"'{'{0}'}'{1}\"", type.getTargetNamespace(), type.getName()),
+            decl.getFixedValue()==null ?
+                "":" fixed=\""+decl.getFixedValue()+'\"',
+            decl.getDefaultValue()==null ?
+                "":" default=\""+decl.getDefaultValue()+'\"',
+            type.isLocal()?"":" /"));
 
         if(type.isLocal()) {
             indent++;
@@ -242,10 +236,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
     }
 
     public void simpleType( XSSimpleType type ) {
-        println(MessageFormat.format("<simpleType{0}>",
-            new Object[]{
-                type.isLocal()?"":" name=\""+type.getName()+'\"'
-            }));
+        println(MessageFormat.format("<simpleType{0}>", type.isLocal()?"":" name=\""+type.getName()+'\"'));
         indent++;
 
         type.visit((XSSimpleTypeVisitor)this);
@@ -266,10 +257,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         } else {
             // global type
             println(MessageFormat.format("<list itemType=\"'{'{0}'}'{1}\" />",
-                new Object[]{
-                    itemType.getTargetNamespace(),
-                    itemType.getName()
-                }));
+                itemType.getTargetNamespace(), itemType.getName()));
         }
     }
 
@@ -280,8 +268,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         for( int i=0; i<len; i++ ) {
             XSSimpleType member = type.getMember(i);
             if(member.isGlobal())
-                ref.append(MessageFormat.format(" '{'{0}'}'{1}",
-                    new Object[]{member.getTargetNamespace(),member.getName()}));
+                ref.append(MessageFormat.format(" '{'{0}'}'{1}", member.getTargetNamespace(),member.getName()));
         }
 
         if(ref.length()==0)
@@ -313,11 +300,9 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         XSSimpleType baseType = type.getSimpleBaseType();
 
         println(MessageFormat.format("<restriction{0}>",
-            new Object[]{
-                baseType.isLocal()?"":" base=\"{"+
-                baseType.getTargetNamespace()+'}'+
-                baseType.getName()+'\"'
-            }));
+            baseType.isLocal()?"":" base=\"{"+
+            baseType.getTargetNamespace()+'}'+
+            baseType.getName()+'\"'));
         indent++;
 
         if(baseType.isLocal())
@@ -333,26 +318,19 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
 
     public void facet( XSFacet facet ) {
         println(MessageFormat.format("<{0} value=\"{1}\"/>",
-            new Object[]{
-                facet.getName(), facet.getValue(),
-            }));
+            facet.getName(), facet.getValue()));
     }
 
     public void notation( XSNotation notation ) {
         println(MessageFormat.format("<notation name='\"0}\" public =\"{1}\" system=\"{2}\" />",
-            new Object[] {
-                notation.getName(),
-                notation.getPublicId(),
-                notation.getSystemId() } ));
+            notation.getName(), notation.getPublicId(), notation.getSystemId()));
     }
 
 
 
     public void complexType( XSComplexType type ) {
         println(MessageFormat.format("<complexType{0}>",
-            new Object[]{
-                type.isLocal()?"":" name=\""+type.getName()+'\"'
-            }));
+            type.isLocal()?"":" name=\""+type.getName()+'\"'));
         indent++;
 
         // TODO: wildcard
@@ -367,9 +345,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
             if(type.getDerivationMethod()==XSType.RESTRICTION) {
                 // restriction
                 println(MessageFormat.format("<restriction base=\"<{0}>{1}\">",
-                    new Object[]{
-                        baseType.getTargetNamespace(),
-                        baseType.getName() }));
+                    baseType.getTargetNamespace(), baseType.getName()));
                 indent++;
 
                 dumpComplexTypeAttribute(type);
@@ -379,9 +355,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
             } else {
                 // extension
                 println(MessageFormat.format("<extension base=\"<{0}>{1}\">",
-                    new Object[]{
-                        baseType.getTargetNamespace(),
-                        baseType.getName() }));
+                    baseType.getTargetNamespace(), baseType.getName()));
 
                 // check if have redefine tag - Kirill
                 if( type.isGlobal()
@@ -416,9 +390,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
             if(type.getDerivationMethod()==XSType.RESTRICTION) {
                 // restriction
                 println(MessageFormat.format("<restriction base=\"'{'{0}'}'{1}\">",
-                    new Object[]{
-                        baseType.getTargetNamespace(),
-                        baseType.getName() }));
+                    baseType.getTargetNamespace(), baseType.getName()));
                 indent++;
 
                 type.getContentType().visit(this);
@@ -429,9 +401,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
             } else {
                 // extension
                 println(MessageFormat.format("<extension base=\"'{'{0}'}'{1}\">",
-                    new Object[]{
-                        baseType.getTargetNamespace(),
-                        baseType.getName() }));
+                    baseType.getTargetNamespace(), baseType.getName()));
 
                 // check if have redefine - Kirill
                 if( type.isGlobal()
@@ -473,6 +443,10 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         itr = type.iterateDeclaredAttributeUses();
         while(itr.hasNext())
             attributeUse( (XSAttributeUse)itr.next() );
+
+        XSWildcard awc = type.getAttributeWildcard();
+        if(awc!=null)
+            wildcard("anyAttribute",awc,"");
     }
 
     public void elementDecl( XSElementDecl decl ) {
@@ -483,15 +457,18 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
 
         // TODO: various other attributes
 
+        // qualified attr; Issue
+        if(decl.getForm() != null) {
+            extraAtts += " form=\"" + (decl.getForm() ? "qualified" : "unqualified" ) + "\"";
+        }
+
         println(MessageFormat.format("<element name=\"{0}\"{1}{2}{3}>",
-            new Object[]{
-                decl.getName(),
-                type.isLocal()?"":" type=\"{"+
-                    type.getTargetNamespace()+'}'+
-                    type.getName()+'\"',
-                extraAtts,
-                type.isLocal()?"":"/"
-            }));
+            decl.getName(),
+            type.isLocal()?"":" type=\"{"+
+            type.getTargetNamespace()+'}'+
+            type.getName()+'\"',
+            extraAtts,
+            type.isLocal()?"":"/"));
 
         if(type.isLocal()) {
             indent++;
@@ -504,10 +481,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
     }
 
     public void modelGroupDecl( XSModelGroupDecl decl ) {
-        println(MessageFormat.format("<group name=\"{0}\">",
-            new Object[]{
-                decl.getName()
-            }));
+        println(MessageFormat.format("<group name=\"{0}\">", decl.getName()));
         indent++;
 
         modelGroup(decl.getModelGroup());
@@ -520,8 +494,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         modelGroup(group,"");
     }
     private void modelGroup( XSModelGroup group, String extraAtts ) {
-        println(MessageFormat.format("<{0}{1}>",
-            new Object[]{ group.getCompositor(), extraAtts }));
+        println(MessageFormat.format("<{0}{1}>", group.getCompositor(), extraAtts));
         indent++;
 
         final int len = group.getSize();
@@ -529,8 +502,7 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
             particle(group.getChild(i));
 
         indent--;
-        println(MessageFormat.format("</{0}>",
-            new Object[]{ group.getCompositor() }));
+        println(MessageFormat.format("</{0}>", group.getCompositor()));
     }
 
     public void particle( XSParticle part ) {
@@ -542,11 +514,11 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
         if(i==XSParticle.UNBOUNDED)
             buf.append(" maxOccurs=\"unbounded\"");
         else if(i!=1)
-            buf.append(" maxOccurs=\""+i+'\"');
+            buf.append(" maxOccurs=\"").append(i).append('\"');
 
         i = part.getMinOccurs();
         if(i!=1)
-            buf.append(" minOccurs=\""+i+'\"');
+            buf.append(" minOccurs=\"").append(i).append('\"');
 
         final String extraAtts = buf.toString();
 
@@ -557,40 +529,68 @@ public class SchemaWriter implements XSVisitor, XSSimpleTypeVisitor {
                 else {
                     // reference
                     println(MessageFormat.format("<element ref=\"'{'{0}'}'{1}\"{2}/>",
-                        new Object[]{
-                            decl.getTargetNamespace(),
-                            decl.getName(),
-                            extraAtts
-                        }));
+                        decl.getTargetNamespace(),
+                        decl.getName(),
+                        extraAtts));
                 }
             }
             public void modelGroupDecl( XSModelGroupDecl decl ) {
                 // reference
                 println(MessageFormat.format("<group ref=\"'{'{0}'}'{1}\"{2}/>",
-                    new Object[]{
-                        decl.getTargetNamespace(),
-                        decl.getName(),
-                        extraAtts
-                    }));
+                    decl.getTargetNamespace(),
+                    decl.getName(),
+                    extraAtts));
             }
             public void modelGroup( XSModelGroup group ) {
                 SchemaWriter.this.modelGroup(group,extraAtts);
             }
             public void wildcard( XSWildcard wc ) {
-                SchemaWriter.this.wildcard(wc,extraAtts);
+                SchemaWriter.this.wildcard("any",wc,extraAtts);
             }
         });
     }
 
     public void wildcard( XSWildcard wc ) {
-        wildcard(wc,"");
+        wildcard("any",wc,"");
     }
 
-    private void wildcard( XSWildcard wc, String extraAtts ) {
-        // TODO
-        println(MessageFormat.format("<any/>", new Object[]{extraAtts}));
+    private void wildcard( String tagName, XSWildcard wc, String extraAtts ) {
+        final String proessContents;
+        switch(wc.getMode()) {
+        case XSWildcard.LAX:
+            proessContents = " processContents='lax'";break;
+        case XSWildcard.STRTICT:
+            proessContents = "";break;
+        case XSWildcard.SKIP:
+            proessContents = " processContents='skip'";break;
+        default:
+            throw new AssertionError();
+        }
+
+        println(MessageFormat.format("<{0}{1}{2}{3}/>",tagName, proessContents, wc.apply(WILDCARD_NS), extraAtts));
     }
 
+    private static final XSWildcardFunction<String> WILDCARD_NS = new XSWildcardFunction<String>() {
+        public String any(Any wc) {
+            return ""; // default
+        }
+
+        public String other(Other wc) {
+            return " namespace='##other'";
+        }
+
+        public String union(Union wc) {
+            StringBuffer buf = new StringBuffer(" namespace='");
+            boolean first = true;
+            for (String s : wc.getNamespaces()) {
+                if(first)   first=false;
+                else        buf.append(' ');
+                buf.append(s);
+            }
+            return buf.append('\'').toString();
+        }
+    };
+
     public void annotation( XSAnnotation ann ) {
         // TODO: it would be nice even if we just put <xs:documentation>
     }
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java
index 073896efb63..6c38acac6e9 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java
@@ -1,27 +1,3 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
 /*
 Copyright (c) 2001, 2002 Thai Open Source Software Center Ltd
 All rights reserved.
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java
index ac5616e022b..84f8f9bdca1 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.parser;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java
index 404dcefb128..f18a472a188 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.parser;
 
 import org.xml.sax.ContentHandler;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java
index acd9015b751..8d00414c1f0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.parser;
 
 /**
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java
index 43cae2166a8..0a74a913e51 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.parser;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java
index 1b99b65e293..180a182b83e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.parser;
 
 import com.sun.xml.internal.xsom.XSSchema;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java
index 5dbaedca173..39d0fff12dc 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.parser;
 
 import java.io.IOException;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java
index a313ea69a79..90e57d699de 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.parser;
 
 import java.io.File;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/package.html b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/package.html
index 4298934b1af..69c6c105f7a 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/parser/package.html
@@ -23,5 +23,5 @@
  have any questions.
 -->
 <html><body>
-Classes to parse XML Schema documents into objects of <code>com.sun.xml.xsom</code> package.
+Classes to parse XML Schema documents into objects of <code>com.sun.xml.internal.xsom</code> package.
 </body></html>
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java
index b8553620881..c9130cc8fd0 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.util;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
@@ -47,7 +48,6 @@ import com.sun.xml.internal.xsom.visitor.XSFunction;
  * Extract the name of the components.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.4 $
  */
 public class ComponentNameFunction implements XSFunction<String> {
 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java
index 638a88b75db..8a3e3e6e606 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.util;
 
 import java.util.ArrayList;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java
index 2cac03e0a69..a995de1f021 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.util;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java
index bea12ae21ea..844c70e355d 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.util;
 
 import java.util.Locale;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties
index 1d44b2320d2..4e346d723ba 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties
@@ -23,21 +23,20 @@
 # have any questions.
 #
 
-annotation		= annotation
-attGroupDecl	= attribute group declaration
-attributeDecl	= attribute declaration
-attributeUse	= attribute use
-complexType		= complex type
-schema			= schema
-facet			= facet
-simpleType		= simple type
-particle		= particle
-empty			= empty content model
-wildcard		= wildcard
-modelGroupDecl	= model group declaration
-modelGroup		= model group
-elementDecl		= element declaration
-notation		= notation declaration
+annotation              = annotation
+attGroupDecl    = attribute group declaration
+attributeDecl   = attribute declaration
+attributeUse    = attribute use
+complexType             = complex type
+schema                  = schema
+facet                   = facet
+simpleType              = simple type
+particle                = particle
+empty                   = empty content model
+wildcard                = wildcard
+modelGroupDecl  = model group declaration
+modelGroup              = model group
+elementDecl             = element declaration
+notation                = notation declaration
 idConstraint    = identity constraint
 xpath           = xpath
- 
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java
index 2464d05210e..134e7b50e19 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.util;
 
 import java.util.Set;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java
index 7b5f2a0207e..c49352af350 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.util;
 
 import com.sun.xml.internal.xsom.XSType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java
index c9041b2e3f3..befb7266d2e 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.util;
 
 import com.sun.xml.internal.xsom.XSType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java
index 46a52d5141e..e312d4c566c 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.util;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java
index 2ba69d63a48..04e6004c235 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.util;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java
index eccff233762..f3223ef93f3 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSContentType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java
index 59a70b22a87..9795f1663a6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSContentType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java
index f39f25ce76d..88af1411e14 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java
index 87a4e740c38..30abf3e9d14 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSListSimpleType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java
index 084b6d02296..763af9ea0d6 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSListSimpleType;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java
index 06f8809d2b5..d89228a6adf 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSElementDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java
index f082f066360..71b0e22b63f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java
@@ -22,6 +22,7 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSWildcard;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java
index 8d399759ee2..61d55a91b1f 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSElementDecl;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java
index 33d7ba4f773..5f5e564c6eb 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSAnnotation;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java
index f03e70369df..028e5c4c125 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSWildcard;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java
index 699513ee7cf..50cc553bf75 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java
@@ -22,6 +22,8 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
+
+
 package com.sun.xml.internal.xsom.visitor;
 
 import com.sun.xml.internal.xsom.XSWildcard;
diff --git a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/package.html b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/package.html
index a076ed45483..6b00fdee668 100644
--- a/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/package.html
+++ b/jaxws/src/share/classes/com/sun/xml/internal/xsom/visitor/package.html
@@ -23,5 +23,5 @@
  have any questions.
 -->
 <html><body>
-Visitor pattern support for the <code>com.sun.xml.xsom</code> interfaces.
+Visitor pattern support for the <code>com.sun.xml.internal.xsom</code> interfaces.
 </body></html>
diff --git a/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java b/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java
index 4d0eee51635..0b068efd150 100644
--- a/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java
+++ b/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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
@@ -53,7 +53,7 @@ import static javax.xml.bind.JAXBContext.JAXB_CONTEXT_FACTORY;
  * This code is designed to implement the JAXB 1.0 spec pluggability feature
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision$
+ * @version $Revision: 1.27.2.1 $
  * @see JAXBContext
  */
 class ContextFinder {
@@ -484,26 +484,29 @@ class ContextFinder {
      * Loads the class, provided that the calling thread has an access to the class being loaded.
      */
     private static Class safeLoadClass(String className, ClassLoader classLoader) throws ClassNotFoundException {
-        logger.fine("Trying to load "+className);
-        try {
-            // make sure that the current thread has an access to the package of the given name.
-            SecurityManager s = System.getSecurityManager();
-            if (s != null) {
-                int i = className.lastIndexOf('.');
-                if (i != -1) {
-                    s.checkPackageAccess(className.substring(0,i));
-                }
-            }
+       logger.fine("Trying to load "+className);
+       try {
+          // make sure that the current thread has an access to the package of the given name.
+          SecurityManager s = System.getSecurityManager();
+          if (s != null) {
+              int i = className.lastIndexOf('.');
+              if (i != -1) {
+                  s.checkPackageAccess(className.substring(0,i));
+              }
+          }
 
-            if (classLoader == null)
-                return Class.forName(className);
-            else
-                return classLoader.loadClass(className);
-        } catch (SecurityException se) {
-            // anyone can access the platform default factory class without permission
-            if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className))
-                return Class.forName(className);
-            throw se;
-        }
+          if (classLoader == null) {
+              return Class.forName(className);
+          } else {
+              return classLoader.loadClass(className);
+          }
+       } catch (SecurityException se) {
+           // anyone can access the platform default factory class without permission
+           if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className)) {
+              return Class.forName(className);
+           }
+           throw se;
+       }
     }
+
 }
diff --git a/jaxws/src/share/classes/javax/xml/bind/DatatypeConverter.java b/jaxws/src/share/classes/javax/xml/bind/DatatypeConverter.java
index 97b00419c32..d93b7087773 100644
--- a/jaxws/src/share/classes/javax/xml/bind/DatatypeConverter.java
+++ b/jaxws/src/share/classes/javax/xml/bind/DatatypeConverter.java
@@ -85,7 +85,7 @@ import javax.xml.namespace.NamespaceContext;
  * </p>
  *
  * @author <ul><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Ryan Shoemaker,Sun Microsystems Inc.</li></ul>
- * @version $Revision$
+ * @version $Revision: 1.4 $
  * @see DatatypeConverterInterface
  * @see ParseConversionEvent
  * @see PrintConversionEvent
diff --git a/jaxws/src/share/classes/javax/xml/bind/DatatypeConverterImpl.java b/jaxws/src/share/classes/javax/xml/bind/DatatypeConverterImpl.java
index 134b5145420..4689210a9f5 100644
--- a/jaxws/src/share/classes/javax/xml/bind/DatatypeConverterImpl.java
+++ b/jaxws/src/share/classes/javax/xml/bind/DatatypeConverterImpl.java
@@ -47,7 +47,7 @@ import java.util.TimeZone;
  * This class is responsible for whitespace normalization.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision$
+ * @version $Revision: 1.1 $
  * @since JAXB2.1
  */
 final class DatatypeConverterImpl implements DatatypeConverterInterface {
diff --git a/jaxws/src/share/classes/javax/xml/bind/DatatypeConverterInterface.java b/jaxws/src/share/classes/javax/xml/bind/DatatypeConverterInterface.java
index e67d265e585..016226f777d 100644
--- a/jaxws/src/share/classes/javax/xml/bind/DatatypeConverterInterface.java
+++ b/jaxws/src/share/classes/javax/xml/bind/DatatypeConverterInterface.java
@@ -75,7 +75,7 @@ package javax.xml.bind;
  *
  * <p>
  * @author <ul><li>Sekhar Vajjhala, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Ryan Shoemaker,Sun Microsystems Inc.</li></ul>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  * @see DatatypeConverter
  * @see ParseConversionEvent
  * @see PrintConversionEvent
diff --git a/jaxws/src/share/classes/javax/xml/bind/Element.java b/jaxws/src/share/classes/javax/xml/bind/Element.java
index b0e69976a3c..5fc3f92c2f9 100644
--- a/jaxws/src/share/classes/javax/xml/bind/Element.java
+++ b/jaxws/src/share/classes/javax/xml/bind/Element.java
@@ -35,7 +35,7 @@ package javax.xml.bind;
  * and 5.7.1 "Bind to Java Element Interface" of the specification.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @since JAXB1.0
  */
 
diff --git a/jaxws/src/share/classes/javax/xml/bind/JAXBContext.java b/jaxws/src/share/classes/javax/xml/bind/JAXBContext.java
index b556c3b8757..a29d0919da5 100644
--- a/jaxws/src/share/classes/javax/xml/bind/JAXBContext.java
+++ b/jaxws/src/share/classes/javax/xml/bind/JAXBContext.java
@@ -217,7 +217,7 @@ import java.io.IOException;
  * </blockquote>
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.23 $ $Date: 2005/08/31 20:57:57 $
+ * @version $Revision: 1.24 $ $Date: 2006/03/08 17:05:01 $
  * @see Marshaller
  * @see Unmarshaller
  * @see <a href="http://java.sun.com/docs/books/jls">S 7.4.1.1 "Package Annotations" in Java Language Specification, 3rd Edition</a>
diff --git a/jaxws/src/share/classes/javax/xml/bind/JAXBException.java b/jaxws/src/share/classes/javax/xml/bind/JAXBException.java
index af275e63dc4..689c3d4dcd5 100644
--- a/jaxws/src/share/classes/javax/xml/bind/JAXBException.java
+++ b/jaxws/src/share/classes/javax/xml/bind/JAXBException.java
@@ -31,7 +31,7 @@ import java.io.PrintWriter;
  * This is the root exception class for all JAXB exceptions.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.3 $ $Date: 2004/10/22 15:46:02 $
+ * @version $Revision: 1.1 $ $Date: 2004/12/14 21:50:39 $
  * @see JAXBContext
  * @see Marshaller
  * @see Unmarshaller
diff --git a/jaxws/src/share/classes/javax/xml/bind/MarshalException.java b/jaxws/src/share/classes/javax/xml/bind/MarshalException.java
index f0c6acf95be..4223164a51b 100644
--- a/jaxws/src/share/classes/javax/xml/bind/MarshalException.java
+++ b/jaxws/src/share/classes/javax/xml/bind/MarshalException.java
@@ -36,7 +36,7 @@ package javax.xml.bind;
  * ValidationEventHandler.handleEvent(ValidationEvent)}.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see JAXBException
  * @see Marshaller
  * @since JAXB1.0
diff --git a/jaxws/src/share/classes/javax/xml/bind/Marshaller.java b/jaxws/src/share/classes/javax/xml/bind/Marshaller.java
index 02dfe8dac2c..df7a76fd10b 100644
--- a/jaxws/src/share/classes/javax/xml/bind/Marshaller.java
+++ b/jaxws/src/share/classes/javax/xml/bind/Marshaller.java
@@ -310,7 +310,7 @@ import java.io.File;
  * </blockquote>
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision$ $Date$
+ * @version $Revision: 1.21 $ $Date: 2006/08/28 17:56:41 $
  * @see JAXBContext
  * @see Validator
  * @see Unmarshaller
diff --git a/jaxws/src/share/classes/javax/xml/bind/Messages.properties b/jaxws/src/share/classes/javax/xml/bind/Messages.properties
index 6fb29bf74bf..788417c719c 100644
--- a/jaxws/src/share/classes/javax/xml/bind/Messages.properties
+++ b/jaxws/src/share/classes/javax/xml/bind/Messages.properties
@@ -24,28 +24,28 @@
 #
 
 ContextFinder.ProviderNotFound = \
-	Provider {0} not found
-	
+        Provider {0} not found
+
 ContextFinder.CouldNotInstantiate = \
-	Provider {0} could not be instantiated: {1}	
+        Provider {0} could not be instantiated: {1}
 
 ContextFinder.CantFindPropertiesFile = \
-	Unable to locate jaxb.properties for package {0}
-	
+        Unable to locate jaxb.properties for package {0}
+
 ContextFinder.CantMixProviders = \
-	You may not mix JAXB Providers on the context path
-	
+        You may not mix JAXB Providers on the context path
+
 ContextFinder.MissingProperty = \
-	jaxb.properties in package {0} does not contain the {1} property.
+        jaxb.properties in package {0} does not contain the {1} property.
 
 ContextFinder.NoPackageInContextPath = \
     No package name is given
 
 PropertyException.NameValue = \
-	name: {0} value: {1}
-	
+        name: {0} value: {1}
+
 DatatypeConverter.ConverterMustNotBeNull = \
-	The DatatypeConverterInterface parameter must not be null
-	
+        The DatatypeConverterInterface parameter must not be null
+
 JAXBContext.IllegalCast = \
- 
+    ClassCastException: attempting to cast {0} to {1}.  Please make sure that you are specifying the proper ClassLoader.
diff --git a/jaxws/src/share/classes/javax/xml/bind/NotIdentifiableEvent.java b/jaxws/src/share/classes/javax/xml/bind/NotIdentifiableEvent.java
index 66ed2bb339d..36e83362fa2 100644
--- a/jaxws/src/share/classes/javax/xml/bind/NotIdentifiableEvent.java
+++ b/jaxws/src/share/classes/javax/xml/bind/NotIdentifiableEvent.java
@@ -30,7 +30,7 @@ package javax.xml.bind;
  *
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see Validator
  * @see ValidationEventHandler
  * @since JAXB1.0
diff --git a/jaxws/src/share/classes/javax/xml/bind/ParseConversionEvent.java b/jaxws/src/share/classes/javax/xml/bind/ParseConversionEvent.java
index bbdda9415bb..860fd886ca5 100644
--- a/jaxws/src/share/classes/javax/xml/bind/ParseConversionEvent.java
+++ b/jaxws/src/share/classes/javax/xml/bind/ParseConversionEvent.java
@@ -30,7 +30,7 @@ package javax.xml.bind;
  * string from the XML data into a value of the target Java data type.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see ValidationEvent
  * @see ValidationEventHandler
  * @see Unmarshaller
diff --git a/jaxws/src/share/classes/javax/xml/bind/PrintConversionEvent.java b/jaxws/src/share/classes/javax/xml/bind/PrintConversionEvent.java
index 1c6f9eb0fc1..e246d18dee7 100644
--- a/jaxws/src/share/classes/javax/xml/bind/PrintConversionEvent.java
+++ b/jaxws/src/share/classes/javax/xml/bind/PrintConversionEvent.java
@@ -30,7 +30,7 @@ package javax.xml.bind;
  * from the Java content tree into its lexical representation.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see ValidationEvent
  * @see ValidationEventHandler
  * @see Marshaller
diff --git a/jaxws/src/share/classes/javax/xml/bind/PropertyException.java b/jaxws/src/share/classes/javax/xml/bind/PropertyException.java
index 3f5f734f1a3..21455baafb8 100644
--- a/jaxws/src/share/classes/javax/xml/bind/PropertyException.java
+++ b/jaxws/src/share/classes/javax/xml/bind/PropertyException.java
@@ -32,7 +32,7 @@ package javax.xml.bind;
  * setting a property.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $ $Date: 2004/06/14 21:23:04 $
+ * @version $Revision: 1.1 $ $Date: 2004/12/14 21:50:40 $
  * @see JAXBContext
  * @see Validator
  * @see Unmarshaller
diff --git a/jaxws/src/share/classes/javax/xml/bind/TypeConstraintException.java b/jaxws/src/share/classes/javax/xml/bind/TypeConstraintException.java
index 67657780b6e..0cd58a039ed 100644
--- a/jaxws/src/share/classes/javax/xml/bind/TypeConstraintException.java
+++ b/jaxws/src/share/classes/javax/xml/bind/TypeConstraintException.java
@@ -41,7 +41,7 @@ package javax.xml.bind;
  * called.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see ValidationEvent
  * @since JAXB1.0
  */
diff --git a/jaxws/src/share/classes/javax/xml/bind/UnmarshalException.java b/jaxws/src/share/classes/javax/xml/bind/UnmarshalException.java
index bdd9444a672..5471fe62719 100644
--- a/jaxws/src/share/classes/javax/xml/bind/UnmarshalException.java
+++ b/jaxws/src/share/classes/javax/xml/bind/UnmarshalException.java
@@ -37,7 +37,7 @@ package javax.xml.bind;
  * ValidationEventHandler.handleEvent(ValidationEvent)}.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see JAXBException
  * @see Unmarshaller
  * @see ValidationEventHandler
diff --git a/jaxws/src/share/classes/javax/xml/bind/Unmarshaller.java b/jaxws/src/share/classes/javax/xml/bind/Unmarshaller.java
index e13390d902c..af011fe9052 100644
--- a/jaxws/src/share/classes/javax/xml/bind/Unmarshaller.java
+++ b/jaxws/src/share/classes/javax/xml/bind/Unmarshaller.java
@@ -402,7 +402,7 @@ import java.io.Reader;
  * </blockquote>
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.31 $ $Date: 2005/08/15 20:54:42 $
+ * @version $Revision: 1.32 $ $Date: 2005/08/18 15:18:26 $
  * @see JAXBContext
  * @see Marshaller
  * @see Validator
diff --git a/jaxws/src/share/classes/javax/xml/bind/UnmarshallerHandler.java b/jaxws/src/share/classes/javax/xml/bind/UnmarshallerHandler.java
index b8b9322b689..30ad5cdb45a 100644
--- a/jaxws/src/share/classes/javax/xml/bind/UnmarshallerHandler.java
+++ b/jaxws/src/share/classes/javax/xml/bind/UnmarshallerHandler.java
@@ -55,7 +55,7 @@ import org.xml.sax.ContentHandler;
  * an object, s/he can still start a new round of unmarshalling.
  *
  * @author <ul><li>Kohsuke KAWAGUCHI, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.1 $ $Date: 2004/12/14 21:50:41 $
+ * @version $Revision: 1.2 $ $Date: 2006/03/08 16:55:17 $
  * @see Unmarshaller#getUnmarshallerHandler()
  * @since JAXB1.0
  */
diff --git a/jaxws/src/share/classes/javax/xml/bind/ValidationEvent.java b/jaxws/src/share/classes/javax/xml/bind/ValidationEvent.java
index 3dd45c8d726..4ff70c6e518 100644
--- a/jaxws/src/share/classes/javax/xml/bind/ValidationEvent.java
+++ b/jaxws/src/share/classes/javax/xml/bind/ValidationEvent.java
@@ -32,7 +32,7 @@ package javax.xml.bind;
  * Java content tree back to XML data.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see Validator
  * @see ValidationEventHandler
  * @since JAXB1.0
diff --git a/jaxws/src/share/classes/javax/xml/bind/ValidationEventHandler.java b/jaxws/src/share/classes/javax/xml/bind/ValidationEventHandler.java
index 7c78352c6ae..18d158cb28f 100644
--- a/jaxws/src/share/classes/javax/xml/bind/ValidationEventHandler.java
+++ b/jaxws/src/share/classes/javax/xml/bind/ValidationEventHandler.java
@@ -60,7 +60,7 @@ package javax.xml.bind;
  * </blockquote>
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see Unmarshaller
  * @see Validator
  * @see Marshaller
diff --git a/jaxws/src/share/classes/javax/xml/bind/ValidationEventLocator.java b/jaxws/src/share/classes/javax/xml/bind/ValidationEventLocator.java
index b91630ae634..3e1cea0c05e 100644
--- a/jaxws/src/share/classes/javax/xml/bind/ValidationEventLocator.java
+++ b/jaxws/src/share/classes/javax/xml/bind/ValidationEventLocator.java
@@ -38,7 +38,7 @@ package javax.xml.bind;
  * source of the XML data (file, url, Node, etc).
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see Validator
  * @see ValidationEvent
  * @since JAXB1.0
diff --git a/jaxws/src/share/classes/javax/xml/bind/ValidationException.java b/jaxws/src/share/classes/javax/xml/bind/ValidationException.java
index 1dcd4a6c0e9..644ff97c962 100644
--- a/jaxws/src/share/classes/javax/xml/bind/ValidationException.java
+++ b/jaxws/src/share/classes/javax/xml/bind/ValidationException.java
@@ -36,7 +36,7 @@ package javax.xml.bind;
  * ValidationEventHandler.handleEvent(ValidationEvent)}.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see JAXBException
  * @see Validator
  * @since JAXB1.0
diff --git a/jaxws/src/share/classes/javax/xml/bind/Validator.java b/jaxws/src/share/classes/javax/xml/bind/Validator.java
index 67dd7ecbb87..3ae8ea9141c 100644
--- a/jaxws/src/share/classes/javax/xml/bind/Validator.java
+++ b/jaxws/src/share/classes/javax/xml/bind/Validator.java
@@ -149,7 +149,7 @@ package javax.xml.bind;
  *
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.3 $ $Date: 2005/06/06 15:04:03 $
+ * @version $Revision: 1.4 $ $Date: 2005/07/29 20:56:02 $
  * @see JAXBContext
  * @see Unmarshaller
  * @see ValidationEventHandler
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java
index ca57b0d318c..4641fad3637 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java
@@ -31,7 +31,7 @@ package javax.xml.bind.annotation;
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.1 $
  * @see XmlAccessorOrder
  */
 
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessType.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessType.java
index 5a4cecd4425..a50dfc4ce0c 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessType.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessType.java
@@ -33,7 +33,7 @@ package javax.xml.bind.annotation;
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.1 $
  * @see XmlAccessorType
  */
 
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java
index 67f0c11cdaf..40609e874e1 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java
@@ -71,7 +71,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
- * @version  $Revision: 1.11 $
+ * @version  $Revision: 1.12 $
  * @see XmlAccessOrder
  */
 
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java
index bc2bbdcf980..d4dd050d040 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java
@@ -86,7 +86,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
  * @see XmlAccessType
- * @version  $Revision: 1.8 $
+ * @version  $Revision: 1.9 $
  */
 
 @Inherited @Retention(RUNTIME) @Target({PACKAGE, TYPE})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAttribute.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAttribute.java
index daf8e5a89c1..4221d68be39 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAttribute.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlAttribute.java
@@ -121,7 +121,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * </pre>
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
  * @see XmlType
  * @since JAXB2.0
  */
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlElement.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlElement.java
index 39ffbd6ef62..454df15c794 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlElement.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlElement.java
@@ -134,7 +134,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * <p>
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlID.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlID.java
index fda36916370..700327c0120 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlID.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlID.java
@@ -88,7 +88,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @see XmlIDREF
  * @since JAXB2.0
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlIDREF.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlIDREF.java
index df0a31aca3b..f11a89a2e37 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlIDREF.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlIDREF.java
@@ -244,7 +244,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @see XmlID
  * @since JAXB2.0
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlNs.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlNs.java
index 7fff607a311..8a0cabc0dfd 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlNs.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlNs.java
@@ -43,7 +43,7 @@ import java.lang.annotation.Target;
  * <p><b>Example:</b>See <tt>XmlSchema</tt> annotation type for an example.
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
 
 @Retention(RUNTIME) @Target({})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlNsForm.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlNsForm.java
index 3f0b3610216..981277a0a08 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlNsForm.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlNsForm.java
@@ -62,6 +62,6 @@ package javax.xml.bind.annotation;
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public enum XmlNsForm {UNQUALIFIED, QUALIFIED, UNSET}
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlSchema.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlSchema.java
index 92b53865099..6613687e3ae 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlSchema.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlSchema.java
@@ -115,7 +115,7 @@ import static java.lang.annotation.RetentionPolicy.*;
 
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  */
 
 @Retention(RUNTIME) @Target(PACKAGE)
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java
index c5fe51ebe50..5e7951ad66c 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java
@@ -70,7 +70,7 @@ import java.lang.annotation.Target;
  *
  * @author Kohsuke Kawaguchi
  * @since JAXB2.1
- * @version $Revision: $
+ * @version $Revision: 1.1 $
  */
 @Target({ElementType.TYPE})
 @Retention(RUNTIME)
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlTransient.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlTransient.java
index 5cc238e34cd..520d09a7318 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlTransient.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlTransient.java
@@ -89,7 +89,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  *
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @since JAXB2.0
- * @version $Revision$
+ * @version $Revision: 1.10 $
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD, TYPE})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlType.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlType.java
index 1e35ae5a4f2..5f9cee0f5f2 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlType.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlType.java
@@ -380,7 +380,7 @@ import java.lang.annotation.Target;
  * @see XmlValue
  * @see XmlSchema
  * @since JAXB2.0
- * @version $Revision: 1.19 $
+ * @version $Revision: 1.20 $
  */
 
 @Retention(RUNTIME) @Target({TYPE})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlValue.java b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlValue.java
index 44160df9c10..00c4724a04c 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/XmlValue.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/XmlValue.java
@@ -125,7 +125,7 @@ import static java.lang.annotation.RetentionPolicy.*;
  * @author Sekhar Vajjhala, Sun Microsystems, Inc.
  * @see XmlType
  * @since JAXB2.0
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
  */
 
 @Retention(RUNTIME) @Target({FIELD, METHOD})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/jaxws/src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
index a3f12befc64..3961f165e6a 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
@@ -88,7 +88,7 @@ import static java.lang.annotation.ElementType.PACKAGE;
  * @author <ul><li>Sekhar Vajjhala, Sun Microsystems Inc.</li> <li> Kohsuke Kawaguchi, Sun Microsystems Inc.</li></ul>
  * @since JAXB2.0
  * @see XmlAdapter
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  */
 
 @Retention(RUNTIME) @Target({PACKAGE,FIELD,METHOD,TYPE,PARAMETER})
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/adapters/package.html b/jaxws/src/share/classes/javax/xml/bind/annotation/adapters/package.html
index 1515de9faa9..dc428ba671c 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/adapters/package.html
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/adapters/package.html
@@ -25,7 +25,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
     <head>
-        
+
     </head>
 
     <body>
@@ -53,5 +53,3 @@
 
     </body>
 </html>
-
-
diff --git a/jaxws/src/share/classes/javax/xml/bind/annotation/package.html b/jaxws/src/share/classes/javax/xml/bind/annotation/package.html
index 3c9511626da..fd8ba653d6b 100644
--- a/jaxws/src/share/classes/javax/xml/bind/annotation/package.html
+++ b/jaxws/src/share/classes/javax/xml/bind/annotation/package.html
@@ -25,7 +25,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
     <head>
-        
+
     </head>
 
     <body bgcolor="white">
@@ -37,7 +37,7 @@
         <p>The following table shows the JAXB mapping annotations
            that can be associated with each program element. </p>
 
-        <table border="1" cellpadding="4" cellspacing="3"> 
+        <table border="1" cellpadding="4" cellspacing="3">
           <tbody>
             <tr>
               <td><b>Program Element</td>
@@ -75,7 +75,7 @@
             <tr valign="top">
               <td><b>Class</td>
               <td>
-                <table> 
+                <table>
                   <tr valign="top">
                     <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlAccessorOrder.html">XmlAccessorOrder</b></td>
                   </tr>
@@ -101,7 +101,7 @@
             <tr valign="top">
               <td><b>Enum type</td>
               <td>
-                <table> 
+                <table>
                   <tr valign="top">
                     <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlEnum.html">XmlEnum</b></td>
                   </tr>
@@ -124,7 +124,7 @@
             <tr valign="top">
               <td><b>JavaBean Property/field</td>
               <td>
-                <table> 
+                <table>
                   <tr valign="top">
                     <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlElement.html">XmlElement</b></td>
                   </tr>
@@ -189,7 +189,7 @@
             <tr valign="top">
               <td><b>Parameter</td>
               <td>
-                <table> 
+                <table>
                   <tr valign="top">
                     <td><b><a HREF="../../../../javax/xml/bind/annotation/XmlList.html">XmlList</b></td>
                   </tr>
@@ -208,7 +208,7 @@
 
           </tbody>
         </table>
-        <h3>Terminology</h3> 
+        <h3>Terminology</h3>
           <p>
           <b>JavaBean property and field:</b> For the purposes of
           mapping, there is no semantic difference between a field and
@@ -237,19 +237,19 @@
           <ul>
             <li> For a property, a given annotation can be applied to
                  either read or write property but not both. </li>
-    
+
             <li> A property name must be different from any other
                  property name in any of the super classes of the
                  class being mapped. </li>
- 
+
             <li> A mapped field name or the decapitalized name of a
                  mapped property must be unique within a class. </li>
           </ul>
          <h3>Notations</h3>
-         <b>Namespace prefixes</b> 
+         <b>Namespace prefixes</b>
          <p>The following namespace prefixes are used in the XML Schema
            fragments in this package.<p>
-    
+
         <table border="1" cellpadding="4" cellspacing="3">
           <tbody>
             <tr>
@@ -257,7 +257,7 @@
               <td><b>Namespace</b></td>
               <td><b>Notes</b></td>
            </tr>
- 
+
            <tr valign="top">
              <td>xs</td>
              <td>http://www.w3.org/2001/XMLSchema</td>
@@ -280,5 +280,3 @@
         @since JAXB 2.0
     </body>
 </html>
-
-
diff --git a/jaxws/src/share/classes/javax/xml/bind/attachment/package.html b/jaxws/src/share/classes/javax/xml/bind/attachment/package.html
index e300db7ef90..f27e67a132a 100644
--- a/jaxws/src/share/classes/javax/xml/bind/attachment/package.html
+++ b/jaxws/src/share/classes/javax/xml/bind/attachment/package.html
@@ -25,34 +25,34 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
     <head>
-        
+
     </head>
 
     <body bgcolor="white">
 
         <p>
-	This package is implemented by a MIME-based package processor that 
-        enables the interpretation and creation of optimized binary data 
+        This package is implemented by a MIME-based package processor that
+        enables the interpretation and creation of optimized binary data
         within an MIME-based package format.
 
         <p>
-        Soap MTOM[1], XOP([2][3]) and WS-I AP[4] standardize approaches to 
+        Soap MTOM[1], XOP([2][3]) and WS-I AP[4] standardize approaches to
         optimized transmission of binary datatypes as an attachment.
-        To optimally support these standards within a message passing 
-        environment, this package enables an integrated solution between 
+        To optimally support these standards within a message passing
+        environment, this package enables an integrated solution between
         a MIME-based package processor and JAXB unmarshall/marshal processes.
 
         <h2>Package Specification</h2>
 
         <ul>
-            <li><a href="http://java.sun.com/xml/downloads/jaxb.html">JAXB 
+            <li><a href="http://java.sun.com/xml/downloads/jaxb.html">JAXB
                 Specification</a>
         </ul>
 
         <h2>Related Standards</h2>
 
         <ul>
-	  <li><a href="http://www.w3.org/TR/2004/WD-soap12-mtom-20040608/">[1]SOAP Message Transmission Optimization Mechanism</a> </li>
+          <li><a href="http://www.w3.org/TR/2004/WD-soap12-mtom-20040608/">[1]SOAP Message Transmission Optimization Mechanism</a> </li>
           <li><a href="http://www.w3.org/TR/2005/REC-xop10-20050125/">[2]XML-binary Optimized Packaging</a></li>
           <li><a href="http://www.ws-i.org/Profiles/AttachmentsProfile-1.0-2004-08-24.html">[3]WS-I Attachments Profile Version 1.0.</a></li>
            <li><a href="http://www.w3.org/TR/xml-media-types/">[4]Describing Media Content of Binary Data in XML</a></li>
@@ -62,5 +62,3 @@
         @since JAXB 2.0
     </body>
 </html>
-
-
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/jaxws/src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
index 20ac6ca5f74..83610c9ee0d 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java
@@ -60,7 +60,7 @@ import java.io.IOException;
  * {@link Marshaller#marshal(Object, javax.xml.transform.Result) marshal(Object, javax.xml.stream.XMLEventWriter)}.
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
- * @version $Revision$ $Date$
+ * @version $Revision: 1.8 $ $Date: 2006/08/28 17:56:38 $
  * @see javax.xml.bind.Marshaller
  * @since JAXB1.0
  */
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/jaxws/src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
index 4f2f6a11c3c..775b6a3f838 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
@@ -66,7 +66,7 @@ import java.net.URL;
  * @author <ul>
  *         <li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li>
  *         </ul>
- * @version $Revision: 1.13 $ $Date: 2005/07/28 22:18:12 $
+ * @version $Revision: 1.14 $ $Date: 2006/03/08 17:01:00 $
  * @see javax.xml.bind.Unmarshaller
  * @since JAXB1.0
  */
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java b/jaxws/src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java
index 4b484ee8dc6..126226fac84 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java
@@ -48,7 +48,7 @@ import java.net.URL;
  * {@link javax.xml.bind.Marshaller}.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
  * @see javax.xml.bind.Unmarshaller
  * @see javax.xml.bind.Validator
  * @see javax.xml.bind.ValidationEventHandler
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/Messages.properties b/jaxws/src/share/classes/javax/xml/bind/helpers/Messages.properties
index 8407c341190..a9103281c74 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/Messages.properties
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/Messages.properties
@@ -24,38 +24,36 @@
 #
 
 AbstractUnmarshallerImpl.ISNotNull = \
-	InputStream can not be null
+        InputStream can not be null
 
 AbstractMarshallerImpl.MustBeBoolean = \
-	{0} must be boolean
-	 
+        {0} must be boolean
+
 AbstractMarshallerImpl.MustBeString = \
-	{0} must be a String
-	
+        {0} must be a String
+
 
 DefaultValidationEventHandler.SeverityMessage = \
-	DefaultValidationEventHandler: {0} {1} \n\
+        DefaultValidationEventHandler: {0} {1} \n\
 \ \ \ \ \ Location: {2}
 
 DefaultValidationEventHandler.LocationUnavailable = \
-	unavailable
-	
+        unavailable
+
 DefaultValidationEventHandler.UnrecognizedSeverity = \
-	Unrecognized event severity field "{0}"
+        Unrecognized event severity field "{0}"
 
 DefaultValidationEventHandler.Warning = \
-	[WARNING]:
+        [WARNING]:
 
 DefaultValidationEventHandler.Error = \
-	[ERROR]:
+        [ERROR]:
 
 DefaultValidationEventHandler.FatalError = \
-	[FATAL_ERROR]:
-	
+        [FATAL_ERROR]:
+
 ValidationEventImpl.IllegalSeverity = \
-	Illegal severity
-	
+        Illegal severity
+
 Shared.MustNotBeNull = \
-	{0} parameter must not be null
-	
- 
+        {0} parameter must not be null
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java b/jaxws/src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
index 94bee7344c6..6112f95c56d 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
@@ -36,7 +36,7 @@ import javax.xml.bind.ValidationEventLocator;
  * convenience.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see javax.xml.bind.NotIdentifiableEvent
  * @see javax.xml.bind.Validator
  * @see javax.xml.bind.ValidationEventHandler
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java b/jaxws/src/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java
index 6ee20e44e0b..d48a370a2cb 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java
@@ -37,7 +37,7 @@ import javax.xml.bind.ValidationEventLocator;
  * convenience.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see javax.xml.bind.ParseConversionEvent
  * @see javax.xml.bind.Validator
  * @see javax.xml.bind.ValidationEventHandler
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java b/jaxws/src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java
index 83169349932..f97d0327211 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java
@@ -37,7 +37,7 @@ import javax.xml.bind.ValidationEventLocator;
  * convenience.
  *
  * @author <ul><li>Ryan Shoemaker, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see javax.xml.bind.PrintConversionEvent
  * @see javax.xml.bind.Validator
  * @see javax.xml.bind.ValidationEventHandler
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java b/jaxws/src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java
index 7ad6cdca613..d04ed965874 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java
@@ -38,7 +38,7 @@ import javax.xml.bind.ValidationEventLocator;
  * convenience.
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.1 $
  * @see javax.xml.bind.Validator
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java b/jaxws/src/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
index 09d919e2173..293cb426168 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
@@ -42,7 +42,7 @@ import org.xml.sax.SAXParseException;
  * convenience.
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li></ul>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  * @see javax.xml.bind.Validator
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
diff --git a/jaxws/src/share/classes/javax/xml/bind/helpers/package.html b/jaxws/src/share/classes/javax/xml/bind/helpers/package.html
index f46749ce825..c4a41be2656 100644
--- a/jaxws/src/share/classes/javax/xml/bind/helpers/package.html
+++ b/jaxws/src/share/classes/javax/xml/bind/helpers/package.html
@@ -25,32 +25,32 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
     <head>
-        
+
     </head>
 
     <body bgcolor="white">
 
         <p>
-        <B>JAXB Provider Use Only:</b> Provides partial default implementations for 
+        <B>JAXB Provider Use Only:</b> Provides partial default implementations for
         some of the <tt>javax.xml.bind</tt> interfaces.
 
         <p>
-        JAXB Providers can extend these classes and implement the abstract 
+        JAXB Providers can extend these classes and implement the abstract
         methods.
- 
+
         <h2>Package Specification</h2>
 
         <ul>
-            <li><a href="http://java.sun.com/xml/downloads/jaxb.html">JAXB 
+            <li><a href="http://java.sun.com/xml/downloads/jaxb.html">JAXB
                 Specification</a>
         </ul>
 
         <h2>Related Documentation</h2>
 
-        For overviews, tutorials, examples, guides, and tool documentation, 
+        For overviews, tutorials, examples, guides, and tool documentation,
         please see:
         <ul>
-            <li>The <a href="http://java.sun.com/xml/jaxb/index.html">JAXB 
+            <li>The <a href="http://java.sun.com/xml/jaxb/index.html">JAXB
             Website</a>
         </ul>
 
@@ -58,5 +58,3 @@
 
     </body>
 </html>
-
-
diff --git a/jaxws/src/share/classes/javax/xml/bind/package.html b/jaxws/src/share/classes/javax/xml/bind/package.html
index 2d1f566820a..b454d312f85 100644
--- a/jaxws/src/share/classes/javax/xml/bind/package.html
+++ b/jaxws/src/share/classes/javax/xml/bind/package.html
@@ -25,7 +25,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
     <head>
-        
+
     </head>
 
     <body bgcolor="white">
@@ -42,16 +42,16 @@
         <h2>Package Specification</h2>
 
         <ul>
-            <li><a href="http://java.sun.com/xml/downloads/jaxb.html">JAXB 
+            <li><a href="http://java.sun.com/xml/downloads/jaxb.html">JAXB
                 Specification</a>
         </ul>
 
         <h2>Related Documentation</h2>
 
-        For overviews, tutorials, examples, guides, and tool documentation, 
+        For overviews, tutorials, examples, guides, and tool documentation,
         please see:
         <ul>
-            <li>The <a href="http://java.sun.com/xml/jaxb/index.html">JAXB 
+            <li>The <a href="http://java.sun.com/xml/jaxb/index.html">JAXB
             Website</a>
         </ul>
 
@@ -59,5 +59,3 @@
 
     </body>
 </html>
-
-
diff --git a/jaxws/src/share/classes/javax/xml/bind/util/Messages.properties b/jaxws/src/share/classes/javax/xml/bind/util/Messages.properties
index b7b409c8bfa..4a396143d95 100644
--- a/jaxws/src/share/classes/javax/xml/bind/util/Messages.properties
+++ b/jaxws/src/share/classes/javax/xml/bind/util/Messages.properties
@@ -24,20 +24,19 @@
 #
 
 ValidationEventCollector.UnrecognizedSeverity = \
-	Unrecognized event severity field "{0}"
-	
+        Unrecognized event severity field "{0}"
+
 JAXBResult.NullContext = \
-	JAXBContext can not be null
-	
+        JAXBContext can not be null
+
 JAXBResult.NullUnmarshaller = \
-	Unmarshaller can not be null
-	
+        Unmarshaller can not be null
+
 JAXBSource.NullContext = \
-	JAXBContext can not be null
-	
+        JAXBContext can not be null
+
 JAXBSource.NullContent = \
-	Content object can not be null
-	
+        Content object can not be null
+
 JAXBSource.NullMarshaller = \
-	Marshaller can not be null
- 
+        Marshaller can not be null
diff --git a/jaxws/src/share/classes/javax/xml/bind/util/ValidationEventCollector.java b/jaxws/src/share/classes/javax/xml/bind/util/ValidationEventCollector.java
index 27e22b4ca08..eb6e681a662 100644
--- a/jaxws/src/share/classes/javax/xml/bind/util/ValidationEventCollector.java
+++ b/jaxws/src/share/classes/javax/xml/bind/util/ValidationEventCollector.java
@@ -40,7 +40,7 @@ import java.util.List;
  * the reported errors and warnings.
  *
  * @author <ul><li>Kohsuke Kawaguchi, Sun Microsystems, Inc.</li><li>Ryan Shoemaker, Sun Microsystems, Inc.</li><li>Joe Fialli, Sun Microsystems, Inc.</li></ul>
- * @version $Revision$
+ * @version $Revision: 1.3 $
  * @see javax.xml.bind.Validator
  * @see javax.xml.bind.ValidationEventHandler
  * @see javax.xml.bind.ValidationEvent
diff --git a/jaxws/src/share/classes/javax/xml/bind/util/package.html b/jaxws/src/share/classes/javax/xml/bind/util/package.html
index fcffa20b6ba..49e414a45f5 100644
--- a/jaxws/src/share/classes/javax/xml/bind/util/package.html
+++ b/jaxws/src/share/classes/javax/xml/bind/util/package.html
@@ -25,7 +25,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
     <head>
-        
+
     </head>
 
     <body bgcolor="white">
@@ -36,16 +36,16 @@
         <h2>Package Specification</h2>
 
         <ul>
-            <li><a href="http://java.sun.com/xml/downloads/jaxb.html">JAXB 
+            <li><a href="http://java.sun.com/xml/downloads/jaxb.html">JAXB
                 Specification</a>
         </ul>
 
         <h2>Related Documentation</h2>
 
-        For overviews, tutorials, examples, guides, and tool documentation, 
+        For overviews, tutorials, examples, guides, and tool documentation,
         please see:
         <ul>
-            <li>The <a href="http://java.sun.com/xml/jaxb/index.html">JAXB 
+            <li>The <a href="http://java.sun.com/xml/jaxb/index.html">JAXB
             Website</a>
         </ul>
 
@@ -53,5 +53,3 @@
 
     </body>
 </html>
-
-
diff --git a/jaxws/src/share/classes/javax/xml/soap/AttachmentPart.java b/jaxws/src/share/classes/javax/xml/soap/AttachmentPart.java
index ab1a899d9ce..35eb1e7e9c4 100644
--- a/jaxws/src/share/classes/javax/xml/soap/AttachmentPart.java
+++ b/jaxws/src/share/classes/javax/xml/soap/AttachmentPart.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: AttachmentPart.java,v 1.12 2005/09/08 14:19:50 vj135062 Exp $
- * $Revision: 1.12 $
- * $Date: 2005/09/08 14:19:50 $
+ * $Id: AttachmentPart.java,v 1.13 2006/03/30 00:59:38 ofung Exp $
+ * $Revision: 1.13 $
+ * $Date: 2006/03/30 00:59:38 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/Detail.java b/jaxws/src/share/classes/javax/xml/soap/Detail.java
index 63eecec2716..9af288aad51 100644
--- a/jaxws/src/share/classes/javax/xml/soap/Detail.java
+++ b/jaxws/src/share/classes/javax/xml/soap/Detail.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: Detail.java,v 1.8 2005/04/05 20:34:16 mk125090 Exp $
- * $Revision: 1.8 $
- * $Date: 2005/04/05 20:34:16 $
+ * $Id: Detail.java,v 1.9 2006/03/30 00:59:38 ofung Exp $
+ * $Revision: 1.9 $
+ * $Date: 2006/03/30 00:59:38 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/DetailEntry.java b/jaxws/src/share/classes/javax/xml/soap/DetailEntry.java
index 4f4aa1ceac9..9ccb50a0261 100644
--- a/jaxws/src/share/classes/javax/xml/soap/DetailEntry.java
+++ b/jaxws/src/share/classes/javax/xml/soap/DetailEntry.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: DetailEntry.java,v 1.3 2005/04/05 20:34:16 mk125090 Exp $
- * $Revision: 1.3 $
- * $Date: 2005/04/05 20:34:16 $
+ * $Id: DetailEntry.java,v 1.4 2006/03/30 00:59:38 ofung Exp $
+ * $Revision: 1.4 $
+ * $Date: 2006/03/30 00:59:38 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/FactoryFinder.java b/jaxws/src/share/classes/javax/xml/soap/FactoryFinder.java
index df3c3d1abf4..14768fc7516 100644
--- a/jaxws/src/share/classes/javax/xml/soap/FactoryFinder.java
+++ b/jaxws/src/share/classes/javax/xml/soap/FactoryFinder.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: FactoryFinder.java,v 1.6 2005/04/05 22:28:12 mk125090 Exp $
- * $Revision: 1.6 $
- * $Date: 2005/04/05 22:28:12 $
+ * $Id: FactoryFinder.java,v 1.7 2006/03/30 00:59:38 ofung Exp $
+ * $Revision: 1.7 $
+ * $Date: 2006/03/30 00:59:38 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/MessageFactory.java b/jaxws/src/share/classes/javax/xml/soap/MessageFactory.java
index e6ee4ff97ee..c2e5cd78247 100644
--- a/jaxws/src/share/classes/javax/xml/soap/MessageFactory.java
+++ b/jaxws/src/share/classes/javax/xml/soap/MessageFactory.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: MessageFactory.java,v 1.10 2005/04/05 22:28:13 mk125090 Exp $
- * $Revision: 1.10 $
- * $Date: 2005/04/05 22:28:13 $
+ * $Id: MessageFactory.java,v 1.11 2006/03/30 00:59:38 ofung Exp $
+ * $Revision: 1.11 $
+ * $Date: 2006/03/30 00:59:38 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/MimeHeader.java b/jaxws/src/share/classes/javax/xml/soap/MimeHeader.java
index 427b3496031..b39423ae135 100644
--- a/jaxws/src/share/classes/javax/xml/soap/MimeHeader.java
+++ b/jaxws/src/share/classes/javax/xml/soap/MimeHeader.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: MimeHeader.java,v 1.3 2005/04/05 20:49:48 mk125090 Exp $
- * $Revision: 1.3 $
- * $Date: 2005/04/05 20:49:48 $
+ * $Id: MimeHeader.java,v 1.4 2006/03/30 00:59:38 ofung Exp $
+ * $Revision: 1.4 $
+ * $Date: 2006/03/30 00:59:38 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/MimeHeaders.java b/jaxws/src/share/classes/javax/xml/soap/MimeHeaders.java
index b1a9382b521..3aee560a595 100644
--- a/jaxws/src/share/classes/javax/xml/soap/MimeHeaders.java
+++ b/jaxws/src/share/classes/javax/xml/soap/MimeHeaders.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: MimeHeaders.java,v 1.5 2005/04/05 20:49:49 mk125090 Exp $
- * $Revision: 1.5 $
- * $Date: 2005/04/05 20:49:49 $
+ * $Id: MimeHeaders.java,v 1.6 2006/03/30 00:59:38 ofung Exp $
+ * $Revision: 1.6 $
+ * $Date: 2006/03/30 00:59:38 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/Name.java b/jaxws/src/share/classes/javax/xml/soap/Name.java
index a247bb33a88..8c4d8821c39 100644
--- a/jaxws/src/share/classes/javax/xml/soap/Name.java
+++ b/jaxws/src/share/classes/javax/xml/soap/Name.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: Name.java,v 1.4 2005/04/05 20:49:49 mk125090 Exp $
- * $Revision: 1.4 $
- * $Date: 2005/04/05 20:49:49 $
+ * $Id: Name.java,v 1.5 2006/03/30 00:59:39 ofung Exp $
+ * $Revision: 1.5 $
+ * $Date: 2006/03/30 00:59:39 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/Node.java b/jaxws/src/share/classes/javax/xml/soap/Node.java
index 8507b3e44a5..4be47533ff8 100644
--- a/jaxws/src/share/classes/javax/xml/soap/Node.java
+++ b/jaxws/src/share/classes/javax/xml/soap/Node.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: Node.java,v 1.13 2005/04/05 20:49:49 mk125090 Exp $
- * $Revision: 1.13 $
- * $Date: 2005/04/05 20:49:49 $
+ * $Id: Node.java,v 1.14 2006/03/30 00:59:39 ofung Exp $
+ * $Revision: 1.14 $
+ * $Date: 2006/03/30 00:59:39 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SAAJMetaFactory.java b/jaxws/src/share/classes/javax/xml/soap/SAAJMetaFactory.java
index 3aad820cfd2..987a47459bd 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SAAJMetaFactory.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SAAJMetaFactory.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SAAJMetaFactory.java,v 1.4 2006/03/30 00:59:39 ofung Exp $
- * $Revision: 1.4 $
- * $Date: 2006/03/30 00:59:39 $
+ * $Id: SAAJMetaFactory.java,v 1.5 2007/07/05 06:49:47 vj135062 Exp $
+ * $Revision: 1.5 $
+ * $Date: 2007/07/05 06:49:47 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SAAJResult.java b/jaxws/src/share/classes/javax/xml/soap/SAAJResult.java
index ebacb218a04..b15f46fad46 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SAAJResult.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SAAJResult.java
@@ -23,7 +23,7 @@
  * have any questions.
  */
 /*
- * $Id: SAAJResult.java,v 1.4 2006/03/24 13:05:43 vj135062 Exp $
+ * $Id: SAAJResult.java,v 1.5 2006/03/30 00:59:39 ofung Exp $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPBody.java b/jaxws/src/share/classes/javax/xml/soap/SOAPBody.java
index f17f073fd74..cc931b0641a 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPBody.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPBody.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPBody.java,v 1.17 2005/06/22 10:24:11 vj135062 Exp $
- * $Revision: 1.17 $
- * $Date: 2005/06/22 10:24:11 $
+ * $Id: SOAPBody.java,v 1.18 2006/03/30 00:59:39 ofung Exp $
+ * $Revision: 1.18 $
+ * $Date: 2006/03/30 00:59:39 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPBodyElement.java b/jaxws/src/share/classes/javax/xml/soap/SOAPBodyElement.java
index a3d824d464e..85fc2060e88 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPBodyElement.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPBodyElement.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPBodyElement.java,v 1.3 2005/04/05 22:28:13 mk125090 Exp $
- * $Revision: 1.3 $
- * $Date: 2005/04/05 22:28:13 $
+ * $Id: SOAPBodyElement.java,v 1.4 2006/03/30 00:59:40 ofung Exp $
+ * $Revision: 1.4 $
+ * $Date: 2006/03/30 00:59:40 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPConnection.java b/jaxws/src/share/classes/javax/xml/soap/SOAPConnection.java
index 0c9b5ad531b..4f183d66f1d 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPConnection.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPConnection.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPConnection.java,v 1.12 2005/04/05 21:03:23 mk125090 Exp $
- * $Revision: 1.12 $
- * $Date: 2005/04/05 21:03:23 $
+ * $Id: SOAPConnection.java,v 1.13 2006/03/30 00:59:40 ofung Exp $
+ * $Revision: 1.13 $
+ * $Date: 2006/03/30 00:59:40 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPConnectionFactory.java b/jaxws/src/share/classes/javax/xml/soap/SOAPConnectionFactory.java
index ed3b90954ba..a9a06e93df4 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPConnectionFactory.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPConnectionFactory.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPConnectionFactory.java,v 1.5 2005/04/05 21:03:23 mk125090 Exp $
- * $Revision: 1.5 $
- * $Date: 2005/04/05 21:03:23 $
+ * $Id: SOAPConnectionFactory.java,v 1.6 2006/03/30 00:59:40 ofung Exp $
+ * $Revision: 1.6 $
+ * $Date: 2006/03/30 00:59:40 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPConstants.java b/jaxws/src/share/classes/javax/xml/soap/SOAPConstants.java
index b46d14349d2..96b1fd19b34 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPConstants.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPConstants.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPConstants.java,v 1.12 2005/04/05 22:28:13 mk125090 Exp $
- * $Revision: 1.12 $
- * $Date: 2005/04/05 22:28:13 $
+ * $Id: SOAPConstants.java,v 1.13 2006/03/30 00:59:40 ofung Exp $
+ * $Revision: 1.13 $
+ * $Date: 2006/03/30 00:59:40 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPElement.java b/jaxws/src/share/classes/javax/xml/soap/SOAPElement.java
index c4fd713ecb3..77aae2e84a9 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPElement.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPElement.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPElement.java,v 1.19 2005/12/13 09:20:25 vj135062 Exp $
- * $Revision: 1.19 $
- * $Date: 2005/12/13 09:20:25 $
+ * $Id: SOAPElement.java,v 1.20 2006/03/30 00:59:40 ofung Exp $
+ * $Revision: 1.20 $
+ * $Date: 2006/03/30 00:59:40 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPElementFactory.java b/jaxws/src/share/classes/javax/xml/soap/SOAPElementFactory.java
index 0fb6c597036..06fc4a7f0b1 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPElementFactory.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPElementFactory.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPElementFactory.java,v 1.11 2005/04/05 22:42:05 mk125090 Exp $
- * $Revision: 1.11 $
- * $Date: 2005/04/05 22:42:05 $
+ * $Id: SOAPElementFactory.java,v 1.12 2006/03/30 00:59:41 ofung Exp $
+ * $Revision: 1.12 $
+ * $Date: 2006/03/30 00:59:41 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPEnvelope.java b/jaxws/src/share/classes/javax/xml/soap/SOAPEnvelope.java
index 5419de5e9f4..1fc5fba5273 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPEnvelope.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPEnvelope.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPEnvelope.java,v 1.6 2005/04/05 22:42:05 mk125090 Exp $
- * $Revision: 1.6 $
- * $Date: 2005/04/05 22:42:05 $
+ * $Id: SOAPEnvelope.java,v 1.7 2006/03/30 00:59:41 ofung Exp $
+ * $Revision: 1.7 $
+ * $Date: 2006/03/30 00:59:41 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPException.java b/jaxws/src/share/classes/javax/xml/soap/SOAPException.java
index f4ae4e86181..f28e575897a 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPException.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPException.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPException.java,v 1.6 2005/04/05 21:03:23 mk125090 Exp $
- * $Revision: 1.6 $
- * $Date: 2005/04/05 21:03:23 $
+ * $Id: SOAPException.java,v 1.7 2006/03/30 00:59:41 ofung Exp $
+ * $Revision: 1.7 $
+ * $Date: 2006/03/30 00:59:41 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPFactory.java b/jaxws/src/share/classes/javax/xml/soap/SOAPFactory.java
index dff07d8a91c..e9bf8ca1517 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPFactory.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPFactory.java
@@ -23,8 +23,8 @@
  * have any questions.
  */
 /*
- * $Id: SOAPFactory.java,v 1.13 2005/06/22 10:24:11 vj135062 Exp $
- * $Revision: 1.13 $
+ * $Id: SOAPFactory.java,v 1.14 2006/03/30 00:59:41 ofung Exp $
+ * $Revision: 1.14 $
  * $Datae$
  */
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPFault.java b/jaxws/src/share/classes/javax/xml/soap/SOAPFault.java
index 1d2087b254f..7b47facffc5 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPFault.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPFault.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPFault.java,v 1.20 2006/02/14 04:40:57 vj135062 Exp $
- * $Revision: 1.20 $
- * $Date: 2006/02/14 04:40:57 $
+ * $Id: SOAPFault.java,v 1.21 2006/03/30 00:59:41 ofung Exp $
+ * $Revision: 1.21 $
+ * $Date: 2006/03/30 00:59:41 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPFaultElement.java b/jaxws/src/share/classes/javax/xml/soap/SOAPFaultElement.java
index 5ed03cf8ecc..c21fcb2cf53 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPFaultElement.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPFaultElement.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPFaultElement.java,v 1.4 2005/04/05 20:53:20 mk125090 Exp $
- * $Revision: 1.4 $
- * $Date: 2005/04/05 20:53:20 $
+ * $Id: SOAPFaultElement.java,v 1.5 2006/03/30 00:59:41 ofung Exp $
+ * $Revision: 1.5 $
+ * $Date: 2006/03/30 00:59:41 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPHeader.java b/jaxws/src/share/classes/javax/xml/soap/SOAPHeader.java
index 35c986a3a24..591ebf59841 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPHeader.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPHeader.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPHeader.java,v 1.14 2005/04/05 22:46:27 mk125090 Exp $
- * $Revision: 1.14 $
- * $Date: 2005/04/05 22:46:27 $
+ * $Id: SOAPHeader.java,v 1.15 2006/03/30 00:59:41 ofung Exp $
+ * $Revision: 1.15 $
+ * $Date: 2006/03/30 00:59:41 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPHeaderElement.java b/jaxws/src/share/classes/javax/xml/soap/SOAPHeaderElement.java
index f8dcce403a1..3b33be86ee9 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPHeaderElement.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPHeaderElement.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPHeaderElement.java,v 1.9 2005/04/05 22:46:27 mk125090 Exp $
- * $Revision: 1.9 $
- * $Date: 2005/04/05 22:46:27 $
+ * $Id: SOAPHeaderElement.java,v 1.10 2006/03/30 00:59:42 ofung Exp $
+ * $Revision: 1.10 $
+ * $Date: 2006/03/30 00:59:42 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPMessage.java b/jaxws/src/share/classes/javax/xml/soap/SOAPMessage.java
index 8fe849130d7..5e46ac1312f 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPMessage.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPMessage.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPMessage.java,v 1.22 2005/08/17 08:13:01 vj135062 Exp $
- * $Revision: 1.22 $
- * $Date: 2005/08/17 08:13:01 $
+ * $Id: SOAPMessage.java,v 1.23 2006/03/30 00:59:42 ofung Exp $
+ * $Revision: 1.23 $
+ * $Date: 2006/03/30 00:59:42 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/SOAPPart.java b/jaxws/src/share/classes/javax/xml/soap/SOAPPart.java
index 3367ceb51b5..348ab1140ea 100644
--- a/jaxws/src/share/classes/javax/xml/soap/SOAPPart.java
+++ b/jaxws/src/share/classes/javax/xml/soap/SOAPPart.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: SOAPPart.java,v 1.9 2005/06/21 17:32:45 mk125090 Exp $
- * $Revision: 1.9 $
- * $Date: 2005/06/21 17:32:45 $
+ * $Id: SOAPPart.java,v 1.10 2006/03/30 00:59:42 ofung Exp $
+ * $Revision: 1.10 $
+ * $Date: 2006/03/30 00:59:42 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/Text.java b/jaxws/src/share/classes/javax/xml/soap/Text.java
index 3461ddae48a..db90bd89670 100644
--- a/jaxws/src/share/classes/javax/xml/soap/Text.java
+++ b/jaxws/src/share/classes/javax/xml/soap/Text.java
@@ -23,9 +23,9 @@
  * have any questions.
  */
 /*
- * $Id: Text.java,v 1.3 2005/04/05 20:34:16 mk125090 Exp $
- * $Revision: 1.3 $
- * $Date: 2005/04/05 20:34:16 $
+ * $Id: Text.java,v 1.4 2006/03/30 00:59:42 ofung Exp $
+ * $Revision: 1.4 $
+ * $Date: 2006/03/30 00:59:42 $
  */
 
 
diff --git a/jaxws/src/share/classes/javax/xml/soap/package.html b/jaxws/src/share/classes/javax/xml/soap/package.html
index 9fbb05fda56..660e12a986a 100644
--- a/jaxws/src/share/classes/javax/xml/soap/package.html
+++ b/jaxws/src/share/classes/javax/xml/soap/package.html
@@ -25,7 +25,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html>
 <head>
-   
+
   <title></title>
 
 </head>
@@ -53,11 +53,11 @@
 <p>   <!-- <h2>Package Specification</h2> -->  <!-- The SAAJ 1.1 specification gives an overview of the  -->
  <!-- <code>javax.xml.soap</code> package and --> <!-- explains how its classes and interfaces work. -->
  <!-- <ul> --> <!--   <li><a href="http://java.sun.com/xml/downloads/jaxm.html"> -->
- <!-- 	SAAJ 1.1 Specification</a> --> <!-- </ul> -->  <!-- <h2>Related Documentation</h2> -->
- <!-- 	For overviews, tutorials, examples, guides, and tool documentation, please see: -->
- <!-- 	<ul> --> <!-- 	  <li><a href="../../../../tutorial/doc/JAXM.html">JAXM Tutorial</a> -->
- <!-- 	  <li><a href="../../../../jaxm/index.html">JAXM Reference Implementation (RI) -->
- <!-- 			  Documentation</a> --> <!-- 	</ul> -->  </p>
+ <!--   SAAJ 1.1 Specification</a> --> <!-- </ul> -->  <!-- <h2>Related Documentation</h2> -->
+ <!--   For overviews, tutorials, examples, guides, and tool documentation, please see: -->
+ <!--   <ul> --> <!--     <li><a href="../../../../tutorial/doc/JAXM.html">JAXM Tutorial</a> -->
+ <!--     <li><a href="../../../../jaxm/index.html">JAXM Reference Implementation (RI) -->
+ <!--                     Documentation</a> --> <!--    </ul> -->  </p>
 In addition the APIs in the <code>javax.xml.soap</code> package extend
 their  counterparts in the <code>org.w3c.dom</code> package. This means that
 the  <code>SOAPPart</code> of a <code>SOAPMessage</code> is also a DOM Level
diff --git a/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java b/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java
index 77c4bdb0d2f..68fec331919 100644
--- a/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java
+++ b/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2006 Sun Microsystems, Inc.  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
@@ -148,7 +148,6 @@ class FactoryFinder {
         return newInstance(fallbackClassName, classLoader);
     }
 
-
     private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.ws.spi.ProviderImpl";
 
     /**
@@ -161,7 +160,7 @@ class FactoryFinder {
             if (s != null) {
                 int i = className.lastIndexOf('.');
                 if (i != -1) {
-                    s.checkPackageAccess(className.substring(0,i));
+                    s.checkPackageAccess(className.substring(0, i));
                 }
             }
 
@@ -176,4 +175,5 @@ class FactoryFinder {
             throw se;
         }
     }
+
 }
diff --git a/jaxws/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java b/jaxws/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
index ab6520cc633..a541d2dd590 100644
--- a/jaxws/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
+++ b/jaxws/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java
@@ -93,6 +93,8 @@ public final class W3CEndpointReference extends EndpointReference {
             this.address = epr.address;
             this.metadata = epr.metadata;
             this.referenceParameters = epr.referenceParameters;
+            this.attributes = epr.attributes;
+            this.elements = epr.elements;
         } catch (JAXBException e) {
             throw new WebServiceException("Error unmarshalling W3CEndpointReference " ,e);
         } catch (ClassCastException e) {
@@ -106,7 +108,6 @@ public final class W3CEndpointReference extends EndpointReference {
     public void writeTo(Result result){
         try {
             Marshaller marshaller = w3cjc.createMarshaller();
-            marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
             marshaller.marshal(this, result);
         } catch (JAXBException e) {
             throw new WebServiceException("Error marshalling W3CEndpointReference. ", e);
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/Datatype.java b/jaxws/src/share/classes/org/relaxng/datatype/Datatype.java
index 706b52e1356..2065732ffda 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/Datatype.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/Datatype.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype;
 
 /**
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java
index 55d1bb8b06f..d811d285c24 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype;
 
 /**
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeException.java b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeException.java
index 5e01118ff70..a11ce1f6b70 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeException.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeException.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype;
 
 /**
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java
index 8cb81cbc773..5aa07ba5307 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype;
 
 /**
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java
index e636e006759..5ea5f4b7f36 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype;
 
 /**
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java
index 0f379d51377..4a61fb843ef 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype;
 
 /**
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/ValidationContext.java b/jaxws/src/share/classes/org/relaxng/datatype/ValidationContext.java
index 45f2ed893b5..507e57b4bbf 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/ValidationContext.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/ValidationContext.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype;
 
 /**
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java b/jaxws/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
index a3091b08780..3aa7c0481b4 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java
@@ -148,8 +148,7 @@ public class DatatypeLibraryLoader implements DatatypeLibraryFactory {
 
             Enumeration getResources(String resName) {
               try {
-                    return cl.getResources(resName);
-
+                return cl.getResources(resName);
               }
               catch (IOException e) {
                 return new Singleton(null);
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java b/jaxws/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
index 2c9427168e4..77d35fb500f 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype.helpers;
 
 import org.relaxng.datatype.*;
diff --git a/jaxws/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java b/jaxws/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
index a614f2a7d18..7e042499342 100644
--- a/jaxws/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
+++ b/jaxws/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java
@@ -22,7 +22,6 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-
 package org.relaxng.datatype.helpers;
 
 import org.relaxng.datatype.*;
diff --git a/jdk/.hgignore b/jdk/.hgignore
index ca1b0b21ee2..be55e3a7c83 100644
--- a/jdk/.hgignore
+++ b/jdk/.hgignore
@@ -1,3 +1,6 @@
 ^build/
 ^dist/
 ^nbproject/private/
+^make/netbeans/.*/nbproject/private/
+^make/netbeans/.*/build/
+^make/netbeans/.*/dist/
diff --git a/jdk/.hgtags b/jdk/.hgtags
index b19d2294d2e..e7963e7c7ab 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -41,3 +41,8 @@ f72c0dc047b9b2e797beee68ae0b50decb1f020d jdk7-b61
 a50217eb3ee10b9f9547e0708e5c9625405083ef jdk7-b64
 382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65
 bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66
+a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67
+b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68
+226b20019b1f020c09ea97d137d98e011ce65d76 jdk7-b69
+893bcca951b747ddcf6986362b877f0e1dbb835b jdk7-b70
+b3f3240135f0c10b9f2481c174b81b7fcf0daa60 jdk7-b71
diff --git a/jdk/README b/jdk/README
index e3cc63ec993..d774ab80b70 100644
--- a/jdk/README
+++ b/jdk/README
@@ -9,35 +9,25 @@ Simple Build Instructions:
      http://java.sun.com/javase/downloads/index.jsp
      Set the environment variable ALT_BOOTDIR to the location of this JDK 6.
 
-  2. Download and install the JIBX libraries, version 1.1.5 from
-     http://sourceforge.net/project/showfiles.php?group_id=69358&package_id=68290
-     You'll need the following four JAR files:
-         bcel.jar
-         jibx-bind.jar
-         jibx-run.jar
-         xpp3.jar
-     Set the environment variable ALT_JIBX_LIBS_PATH to the location of
-     these JAR files.
-     
-  3. Download and install the Binary Plugs for the most recent JDK7 from
+  2. Download and install the Binary Plugs for the most recent JDK7 from
      http://download.java.net/openjdk/jdk7/
      Set the environment variable ALT_BINARY_PLUGS_PATH to the location of
      these binary plugs.
      
-  4. Either download and install the latest JDK7 from
+  3. Either download and install the latest JDK7 from
      http://download.java.net/openjdk/jdk7/, or build your own complete
      OpenJDK7 by using the top level Makefile in the OpenJDK Mercurial forest.
      Set the environment variable ALT_JDK_IMPORT_PATH to the location of
      this latest JDK7 or OpenJDK7 build.
      
-  5. Check the sanity of doing a build with the current machine:
+  4. Check the sanity of doing a build with the current machine:
        cd make && gnumake sanity
      See README-builds.html if you run into problems.
   
-  6. Do a partial build of the jdk:
+  5. Do a partial build of the jdk:
        cd make && gnumake all
   
-  7. Construct the images:
+  6. Construct the images:
        cd make && gnumake images
      The resulting JDK image should be found in build/*/j2sdk-image
 
diff --git a/jdk/THIRD_PARTY_README b/jdk/THIRD_PARTY_README
index 690890548f2..43058486295 100644
--- a/jdk/THIRD_PARTY_README
+++ b/jdk/THIRD_PARTY_README
@@ -32,7 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/jdk/make/com/sun/crypto/provider/Makefile b/jdk/make/com/sun/crypto/provider/Makefile
index f8134de149b..8cf809dc469 100644
--- a/jdk/make/com/sun/crypto/provider/Makefile
+++ b/jdk/make/com/sun/crypto/provider/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc.  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
@@ -45,54 +45,49 @@
 # For OpenJDK, the jar files built here are installed directly into the
 # OpenJDK.
 #
-# For JDK, the binaries use pre-built/pre-signed/pre-obfuscated binary
-# files stored in the closed workspace that are not shipped in the
-# OpenJDK workspaces.  We still build the JDK files here to verify the
-# files compile, and in preparation for possible signing and
-# obfuscation.  Developers working on JCE in JDK must sign the JCE files
-# before testing: obfuscation is optional during development.  The JCE
-# signing key is kept separate from the JDK workspace to prevent its
-# disclosure.  The obfuscation tool has not been licensed for general
-# usage.
-#
+# For JDK, the binaries use pre-built/pre-signed binary files stored in
+# the closed workspace that are not shipped in the OpenJDK workspaces.
+# We still build the JDK files here to verify the files compile, and in
+# preparation for possible signing.  Developers working on JCE in JDK
+# must sign the JCE files before testing.  The JCE signing key is kept
+# separate from the JDK workspace to prevent its disclosure.
+# 
 # SPECIAL NOTE TO JCE/JDK developers:  The source files must eventually
-# be built, obfuscated, signed, and then the resulting jar files MUST BE
-# CHECKED INTO THE CLOSED PART OF THE WORKSPACE*.  This separate step
-# *MUST NOT BE FORGOTTEN*, otherwise a bug fixed in the source code will
-# not be reflected in the shipped binaries.  The "release" target should be
+# be built and signed, and the resulting jar files MUST BE CHECKED INTO
+# THE CLOSED PART OF THE WORKSPACE*.  This separate step *MUST NOT BE
+# FORGOTTEN*, otherwise a bug fixed in the source code will not be
+# reflected in the shipped binaries.  The "release" target should be
 # used to generate the required files.
 #
 # There are a number of targets to help both JDK/OpenJDK developers.
 #
 # Main Targets (JDK/OPENJDK):
 #
-#     all/clobber/clean		The usual.
-#				    If OpenJDK, installs sunjce_provider.jar.
-#				    If JDK, installs prebuilt
-#				    sunjce_provider.jar.
+#     all/clobber/clean        The usual.
+#                                  If OpenJDK, installs sunjce_provider.jar.
+#                                  If JDK, installs prebuilt
+#                                      sunjce_provider.jar.
 #
-#     jar			Builds/installs sunjce_provider.jar
-#				    If OpenJDK, does not sign.
-#				    If JDK, tries to sign.
+#     jar                      Builds/installs sunjce_provider.jar
+#                                  If OpenJDK, does not sign.
+#                                  If JDK, tries to sign.
 #
 # Other lesser-used Targets (JDK/OPENJDK):
 #
-#     build-jar			Builds sunjce_provider.jar
-#				    (does not sign/install)
+#     build-jar                Builds sunjce_provider.jar
+#                                  (does not sign/install)
 #
-#     install-jar		Alias for "jar" above.
+#     install-jar              Alias for "jar" above.
 #
 # Other targets (JDK only):
 #
-#     sign			Alias for sign-jar
-#	  sign-jar		Builds/signs sunjce_provider.jar (no install)
+#     sign                     Alias for sign-jar
+#         sign-jar             Builds/signs sunjce_provider.jar (no install)
 #
-#     obfus			Builds/obfuscates/signs sunjce_provider.jar
+#     release                  Builds all targets in preparation
+#                              for workspace integration.
 #
-#     release			Builds all targets in preparation
-#				for workspace integration.
-#
-#     install-prebuilt		Installs the pre-built jar files
+#     install-prebuilt         Installs the pre-built jar files
 #
 # This makefile was written to support parallel target execution.
 #
@@ -103,7 +98,7 @@ PRODUCT = sun
 
 #
 # The following is for when we need to do postprocessing
-# (signing/obfuscation) against a read-only build.  If the OUTPUTDIR
+# (signing) against a read-only build.  If the OUTPUTDIR
 # isn't writable, the build currently crashes out.
 #
 ifndef OPENJDK
@@ -158,8 +153,8 @@ endif # OPENJDK
 #
 # We use a variety of subdirectories in the $(TEMPDIR) depending on what
 # part of the build we're doing.  Both OPENJDK/JDK builds are initially
-# done in the unsigned area.  When files are signed or obfuscated in JDK,
-# they will be placed in the appropriate areas.
+# done in the unsigned area.  When files are signed in JDK, they will be
+# placed in the appropriate areas.
 #
 UNSIGNED_DIR = $(TEMPDIR)/unsigned
 
@@ -223,61 +218,15 @@ $(SIGNED_DIR)/sunjce_provider.jar:
 endif
 	$(call sign-file, $(UNSIGNED_DIR)/sunjce_provider.jar)
 
-# =====================================================
-# Obfuscate/sign/install the JDK build.  Not needed for OpenJDK.
-#
-
-OBFUS_DIR = $(JCE_BUILD_DIR)/obfus/sunjce
-
-CLOSED_DIR = $(BUILDDIR)/closed/com/sun/crypto/provider
-
-obfus: $(OBFUS_DIR)/sunjce_provider.jar
-	$(release-warning)
-
-ifndef ALT_JCE_BUILD_DIR
-$(OBFUS_DIR)/sunjce_provider.jar: build-jar $(JCE_MANIFEST_FILE) \
-	    $(OBFUS_DIR)/sunjce.dox
-else
-$(OBFUS_DIR)/sunjce_provider.jar: $(JCE_MANIFEST_FILE) $(OBFUS_DIR)/sunjce.dox
-	@if [ ! -d $(CLASSDESTDIR) ] ; then \
-	    $(ECHO) "Couldn't find $(CLASSDESTDIR)"; \
-	    exit 1; \
-	fi
-endif
-	@$(ECHO) ">>>Obfuscating SunJCE Provider..."
-	$(presign)
-	$(preobfus)
-	$(prep-target)
-	$(CD) $(OBFUS_DIR); \
-	$(OBFUSCATOR) -fv sunjce.dox
-	@$(CD) $(OBFUS_DIR); $(java-vm-cleanup)
-	$(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ \
-	    -C $(OBFUS_DIR)/build com \
-	    $(BOOT_JAR_JFLAGS)
-	$(sign-target)
-	@$(java-vm-cleanup)
-
-$(OBFUS_DIR)/sunjce.dox: $(CLOSED_DIR)/obfus/sunjce.dox
-	@$(ECHO) ">>>Creating sunjce.dox"
-	$(prep-target)
-	$(SED) "s:@@TEMPDIR@@:$(ABS_TEMPDIR):" $< > $@
-
-#
-# The current obfuscator has a limitation in that it currently only
-# supports up to v49 class file format.  Force v49 classfiles in our
-# builds for now.
-#
-TARGET_CLASS_VERSION = 5
-
 
 # =====================================================
-# Create the Release Engineering files.  Obfuscated builds, etc.
+# Create the Release Engineering files.  Signed builds, etc.
 #
 
-release: $(OBFUS_DIR)/sunjce_provider.jar
+release: $(SIGNED_DIR)/sunjce_provider.jar
 	$(RM) $(JCE_BUILD_DIR)/release/sunjce_provider.jar
 	$(MKDIR) -p $(JCE_BUILD_DIR)/release
-	$(CP) $(OBFUS_DIR)/sunjce_provider.jar $(JCE_BUILD_DIR)/release
+	$(CP) $(SIGNED_DIR)/sunjce_provider.jar $(JCE_BUILD_DIR)/release
 	$(release-warning)
 
 endif # OPENJDK
@@ -319,5 +268,5 @@ clobber clean::
 
 .PHONY: build-jar jar install-jar
 ifndef OPENJDK
-.PHONY: sign sign-jar obfus release install-prebuilt
+.PHONY: sign sign-jar release install-prebuilt
 endif
diff --git a/jdk/make/com/sun/java/pack/Makefile b/jdk/make/com/sun/java/pack/Makefile
index a479483677e..1d013c0894b 100644
--- a/jdk/make/com/sun/java/pack/Makefile
+++ b/jdk/make/com/sun/java/pack/Makefile
@@ -67,15 +67,14 @@ ifeq ($(STANDALONE),true)
 	     $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
 	     $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
 	     $(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
+	     $(ZIPOBJDIR)/compress.$(OBJECT_SUFFIX) \
 	     $(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
 	     $(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
-	     $(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
-	     $(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
+	     $(ZIPOBJDIR)/infback.$(OBJECT_SUFFIX) \
 	     $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
-	     $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
 	     $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
 
-  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+  ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
   OTHER_CXXFLAGS += $(ZINCLUDE)
   LDDFLAGS += $(ZIPOBJS)
 else
diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk
index d959123fdae..6e9695b8ad7 100644
--- a/jdk/make/common/Defs.gmk
+++ b/jdk/make/common/Defs.gmk
@@ -242,6 +242,12 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
   endif
 endif
 
+#
+# zlib version
+#
+ZLIB_VERSION = 1.2.3
+
+
 #
 # Localizations for the different parts of the product beyond English
 #
diff --git a/jdk/make/common/Sanity.gmk b/jdk/make/common/Sanity.gmk
index aa15361ff71..a136e6d8d34 100644
--- a/jdk/make/common/Sanity.gmk
+++ b/jdk/make/common/Sanity.gmk
@@ -93,8 +93,7 @@ sanity-all:: sanity-base \
     sane-alt_bootdir \
     sane-bootdir \
     sane-local-bootdir \
-    sane-alsa-headers \
-    sane-jibx
+    sane-alsa-headers
 
 ifdef OPENJDK
 sanity-all:: sane-freetype 
diff --git a/jdk/make/common/shared/Defs-control.gmk b/jdk/make/common/shared/Defs-control.gmk
index 9c62bf6f7e0..565cbbaa156 100644
--- a/jdk/make/common/shared/Defs-control.gmk
+++ b/jdk/make/common/shared/Defs-control.gmk
@@ -92,9 +92,9 @@ ABS_TEMP_DIR = $(ABS_OUTPUTDIR)/tmp
 dummy := $(shell $(MKDIR) -p $(TEMP_DIR))
 
 # The language version we want for this jdk build
-SOURCE_LANGUAGE_VERSION=5
+SOURCE_LANGUAGE_VERSION=7
 # The class version we want for this jdk build
-TARGET_CLASS_VERSION=5
+TARGET_CLASS_VERSION=7
 
 # The MESSAGE, WARNING and ERROR files are used to store sanity check and 
 # source check messages, warnings and errors. 
diff --git a/jdk/make/common/shared/Defs-java.gmk b/jdk/make/common/shared/Defs-java.gmk
index 16db68b1113..f9ed6353131 100644
--- a/jdk/make/common/shared/Defs-java.gmk
+++ b/jdk/make/common/shared/Defs-java.gmk
@@ -122,13 +122,13 @@ ifeq ($(JAVAC_WARNINGS_FATAL), true)
   JAVACFLAGS  += -Werror
 endif
 
-# Add the source level (currently all source is 1.5, should this be 1.6?)
-SOURCE_LANGUAGE_VERSION = 5
+# Add the source level
+SOURCE_LANGUAGE_VERSION = 7
 LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION)
 JAVACFLAGS  += $(LANGUAGE_VERSION)
 
-# Add the class version we want (currently this is 5, should it be 6 or even 7?)
-TARGET_CLASS_VERSION = 5
+# Add the class version we want
+TARGET_CLASS_VERSION = 7
 CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
 JAVACFLAGS  += $(CLASS_VERSION)
 JAVACFLAGS  += -encoding ascii
@@ -201,7 +201,10 @@ endif
 ifeq ($(JAVAC_WARNINGS_FATAL), true)
   BOOT_JAVACFLAGS  += -Werror
 endif
-BOOT_JAVACFLAGS  += -encoding ascii
+
+BOOT_SOURCE_LANGUAGE_VERSION = 6
+BOOT_TARGET_CLASS_VERSION = 6
+BOOT_JAVACFLAGS  += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
 BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
 
 BOOT_JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
diff --git a/jdk/make/common/shared/Defs.gmk b/jdk/make/common/shared/Defs.gmk
index 199d0766821..2ad6fd4a19f 100644
--- a/jdk/make/common/shared/Defs.gmk
+++ b/jdk/make/common/shared/Defs.gmk
@@ -536,15 +536,6 @@ endif
 #   NOTE: ISA_DIR is usually empty, on Solaris it might be /sparcv9 or /amd64
 BINDIR      = $(OUTPUTDIR)/bin$(ISA_DIR)
   
-# JIBX_LIBS_PATH: path to JIBX libraries, needed for NimbusLookAndFeel
-ifdef ALT_JIBX_LIBS_PATH
-  JIBX_LIBS_PATH:=$(call FullPath,$(ALT_JIBX_LIBS_PATH))
-  JIBX_LIBS_PATH:=$(call AltCheckSpaces,JIBX_LIBS_PATH)
-  JIBX_LIBS_PATH:=$(call AltCheckValue,JIBX_LIBS_PATH)
-else
-  JIBX_LIBS_PATH=$(JDK_DEVTOOLS_DIR)/share/jibx/lib
-endif
-
 # MOZILLA_HEADERS_PATH: path to mozilla header files for plugin
 ifdef ALT_MOZILLA_HEADERS_PATH
   MOZILLA_HEADERS_PATH :=$(call FullPath,$(ALT_MOZILLA_HEADERS_PATH))
diff --git a/jdk/make/common/shared/Sanity-Settings.gmk b/jdk/make/common/shared/Sanity-Settings.gmk
index 283598e394d..b64e3b52a13 100644
--- a/jdk/make/common/shared/Sanity-Settings.gmk
+++ b/jdk/make/common/shared/Sanity-Settings.gmk
@@ -233,7 +233,6 @@ ifeq ($(PLATFORM),windows)
   endif
 endif
 ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
-ALL_SETTINGS+=$(call addAltSetting,JIBX_LIBS_PATH)
 ifndef OPENJDK
   ALL_SETTINGS+=$(call addAltSetting,MOZILLA_HEADERS_PATH)
 endif
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
index 87d9120b1a4..e8b19c942eb 100644
--- a/jdk/make/common/shared/Sanity.gmk
+++ b/jdk/make/common/shared/Sanity.gmk
@@ -214,7 +214,6 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk
 	sane-link \
 	sane-cacerts \
 	sane-alsa-headers \
-	sane-jibx \
 	sane-ant_version \
 	sane-zip_version \
 	sane-unzip_version \
@@ -1516,22 +1515,6 @@ ifeq ($(PLATFORM), solaris)
 endif
 
 
-######################################################
-# JIBX_LIBS_PATH must be valid
-######################################################
-sane-jibx:
-ifdef DISABLE_NIMBUS	
-	$(call SanityWarning,Disabling Nimbus will remove public API in javax.swing.plaf.nimbus.)
-else
-	@if [ ! -r $(subst \,/,$(JIBX_LIBS_PATH))/jibx-run.jar ]; then \
-	  $(ECHO) "ERROR: You do not have access to valid JIBX library files. \n" \
-	    "      Please check your access to \n" \
-	    "          $(subst \,/,$(JIBX_LIBS_PATH))/jibx-run.jar \n" \
-	    "      and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_JIBX_LIBS_PATH \n" \
-	    "" >> $(ERROR_FILE) ; \
-	fi
-endif
-
 ######################################################
 # MOZILLA_HEADERS_PATH must be valid
 ######################################################
diff --git a/jdk/make/java/dyn/Makefile b/jdk/make/java/dyn/Makefile
index 00cc225f4d0..5ae0b5056e4 100644
--- a/jdk/make/java/dyn/Makefile
+++ b/jdk/make/java/dyn/Makefile
@@ -33,8 +33,8 @@ AUTO_FILES_JAVA_DIRS = java/dyn sun/dyn
 
 # The sources built here use new language syntax to generate
 # method handle calls.  Let's be sure we are using that format.
-#LANGUAGE_VERSION = -source 7
-#CLASS_VERSION = -target 7
+LANGUAGE_VERSION = -source 7
+CLASS_VERSION = -target 7
 
 # Actually, it will be less disruptive to compile with the same
 # -target option as the rest of the system, and just turn on
diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk
index 58c7b13608c..e8a2223f67a 100644
--- a/jdk/make/java/java/FILES_java.gmk
+++ b/jdk/make/java/java/FILES_java.gmk
@@ -77,6 +77,7 @@ JAVA_JAVA_java = \
     java/lang/Compiler.java \
     java/lang/Throwable.java \
         java/lang/Exception.java \
+	    java/lang/ReflectiveOperationException.java \
 	    java/lang/IllegalAccessException.java \
 	    java/lang/InstantiationException.java \
 	    java/lang/ClassNotFoundException.java \
@@ -250,6 +251,8 @@ JAVA_JAVA_java = \
 	java/util/IdentityHashMap.java \
 	java/util/EnumMap.java \
     java/util/Arrays.java \
+    java/util/TimSort.java \
+    java/util/ComparableTimSort.java \
     java/util/ConcurrentModificationException.java \
     java/util/ServiceLoader.java \
     java/util/ServiceConfigurationError.java \
diff --git a/jdk/make/java/jli/Makefile b/jdk/make/java/jli/Makefile
index 7a0c53f1ce2..7f972f16031 100644
--- a/jdk/make/java/jli/Makefile
+++ b/jdk/make/java/jli/Makefile
@@ -44,7 +44,6 @@ MS_RUNTIME_STATIC = true
 
 include $(BUILDDIR)/common/Defs.gmk
 
-ZLIB_VERSION = 1.1.3
 ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
 LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
@@ -68,12 +67,10 @@ FILES_c = \
 	wildcard.c \
 	jli_util.c \
 	inflate.c \
-	infblock.c \
 	inftrees.c \
-	infcodes.c \
 	inffast.c \
-	infutil.c \
 	zadler32.c \
+	zcrc32.c \
 	zutil.c
 
 ifneq ($(PLATFORM), windows)
diff --git a/jdk/make/java/nio/FILES_java.gmk b/jdk/make/java/nio/FILES_java.gmk
index 4fb524a7dd4..f3ba8254868 100644
--- a/jdk/make/java/nio/FILES_java.gmk
+++ b/jdk/make/java/nio/FILES_java.gmk
@@ -160,7 +160,6 @@ FILES_src = \
 	\
 	sun/nio/ByteBuffered.java \
 	\
-	sun/nio/ch/AbstractFuture.java \
         sun/nio/ch/AbstractPollArrayWrapper.java \
 	sun/nio/ch/AllocatedNativeObject.java \
 	sun/nio/ch/AsynchronousChannelGroupImpl.java \
diff --git a/jdk/make/java/zip/FILES_c.gmk b/jdk/make/java/zip/FILES_c.gmk
index f88386c8ee9..75621d860aa 100644
--- a/jdk/make/java/zip/FILES_c.gmk
+++ b/jdk/make/java/zip/FILES_c.gmk
@@ -29,15 +29,16 @@ FILES_c = \
 	Deflater.c \
 	Inflater.c \
 	ZipFile.c \
+	zip_util.c \
+	compress.c \
+	deflate.c \
+	gzio.c \
+	infback.c \
+	inffast.c \
+	inflate.c \
+	inftrees.c \
+	trees.c \
+	uncompr.c \
 	zadler32.c \
 	zcrc32.c \
-	deflate.c \
-	trees.c \
-	zutil.c \
-	inflate.c \
-	infblock.c \
-	inftrees.c \
-	infcodes.c \
-	infutil.c \
-	inffast.c \
-	zip_util.c
+	zutil.c 
diff --git a/jdk/make/java/zip/Makefile b/jdk/make/java/zip/Makefile
index 48e8c3904e9..cec9d0d6cf1 100644
--- a/jdk/make/java/zip/Makefile
+++ b/jdk/make/java/zip/Makefile
@@ -30,7 +30,9 @@ LIBRARY = zip
 PRODUCT = sun
 include $(BUILDDIR)/common/Defs.gmk
 
-ZLIB_VERSION = 1.1.3
+#
+# ZLIB_VERSION is defined in make/common/Defs.gmk
+#
 
 #
 # Files to compile.
diff --git a/jdk/make/java/zip/reorder-i586 b/jdk/make/java/zip/reorder-i586
index d9e90ead435..ee717ff2f26 100644
--- a/jdk/make/java/zip/reorder-i586
+++ b/jdk/make/java/zip/reorder-i586
@@ -32,38 +32,17 @@ text: .text%Java_java_util_zip_Inflater_initIDs;
 text: .text%Java_java_util_zip_Inflater_init;
 text: .text%inflateInit2_;
 text: .text%zcalloc;
-text: .text%inflate_blocks_new;
-text: .text%inflate_blocks_reset;
 text: .text%inflateReset;
 text: .text%Java_java_util_zip_Inflater_inflateBytes;
 text: .text%inflate;
-text: .text%inflate_blocks;
-text: .text%inflate_flush;
 text: .text%Java_java_util_zip_ZipFile_read;
 text: .text%ZIP_Read;
-text: .text%inflate_trees_bits;
 text: .text%huft_build: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/inftrees.o;
 text: .text%zcfree;
-text: .text%inflate_trees_dynamic;
-text: .text%inflate_codes_new;
-text: .text%inflate_codes;
-text: .text%inflate_fast;
-text: .text%inflate_codes_free;
-text: .text%inflate_trees_fixed;
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
 text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames;
 text: .text%ZIP_ReadEntry;
 text: .text%InflateFully;
 text: .text%inflateEnd;
-text: .text%inflate_blocks_free;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
 text: .text%Java_java_util_zip_Inflater_reset;
 text: .text%Java_java_util_zip_ZipFile_close;
 text: .text%ZIP_Close;
diff --git a/jdk/make/java/zip/reorder-sparc b/jdk/make/java/zip/reorder-sparc
index 82cc81b6322..176c7709e49 100644
--- a/jdk/make/java/zip/reorder-sparc
+++ b/jdk/make/java/zip/reorder-sparc
@@ -31,37 +31,13 @@ text: .text%Java_java_util_zip_Inflater_initIDs;
 text: .text%Java_java_util_zip_Inflater_init;
 text: .text%inflateInit2_;
 text: .text%zcalloc;
-text: .text%inflate_blocks_new;
-text: .text%inflate_blocks_reset;
-text: .text%inflateReset;
 text: .text%Java_java_util_zip_Inflater_inflateBytes;
-text: .text%inflate;
-text: .text%inflate_blocks;
-text: .text%inflate_flush;
 text: .text%Java_java_util_zip_ZipFile_read;
 text: .text%ZIP_Read;
-text: .text%inflate_trees_bits;
-text: .text%huft_build: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/inftrees.o;
 text: .text%zcfree;
-text: .text%inflate_trees_dynamic;
-text: .text%inflate_codes_new;
-text: .text%inflate_codes;
-text: .text%inflate_fast;
-text: .text%inflate_codes_free;
-text: .text%inflate_trees_fixed;
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
 text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
 text: .text%Java_java_util_zip_Inflater_reset;
 text: .text%Java_java_util_zip_Inflater_end;
 text: .text%inflateEnd;
-text: .text%inflate_blocks_free;
 text: .text%Java_java_util_zip_ZipFile_close;
 text: .text%ZIP_Close;
diff --git a/jdk/make/java/zip/reorder-sparcv9 b/jdk/make/java/zip/reorder-sparcv9
index a2b0f467df0..bf2d983ed19 100644
--- a/jdk/make/java/zip/reorder-sparcv9
+++ b/jdk/make/java/zip/reorder-sparcv9
@@ -1,6 +1,5 @@
 data = R0x2000;
 text = LOAD ?RXO;
-# Test Null
 text: .text%ZIP_Open;
 text: .text%ZIP_Open_Generic;
 text: .text%InitializeZip;
@@ -32,38 +31,17 @@ text: .text%Java_java_util_zip_Inflater_initIDs;
 text: .text%Java_java_util_zip_Inflater_init;
 text: .text%inflateInit2_;
 text: .text%zcalloc;
-text: .text%inflate_blocks_new;
-text: .text%inflate_blocks_reset;
 text: .text%inflateReset;
 text: .text%Java_java_util_zip_Inflater_inflateBytes;
 text: .text%inflate;
-text: .text%inflate_blocks;
-text: .text%inflate_flush;
 text: .text%Java_java_util_zip_ZipFile_read;
 text: .text%ZIP_Read;
-text: .text%inflate_trees_bits;
 text: .text%huft_build: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/inftrees.o;
 text: .text%zcfree;
-text: .text%inflate_trees_dynamic;
-text: .text%inflate_codes_new;
-text: .text%inflate_codes;
-text: .text%inflate_fast;
-text: .text%inflate_codes_free;
-text: .text%inflate_trees_fixed;
-# Test Exit
-# Test Hello
-# Test Sleep
-# Test IntToString
-# Test LoadToolkit
 text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames;
 text: .text%ZIP_ReadEntry;
 text: .text%InflateFully;
 text: .text%inflateEnd;
-text: .text%inflate_blocks_free;
-# Test LoadFrame
-# Test LoadJFrame
-# Test JHello
-# SwingSet
 text: .text%Java_java_util_zip_Inflater_reset;
 text: .text%Java_java_util_zip_ZipFile_close;
 text: .text%ZIP_Close;
diff --git a/jdk/make/javax/crypto/Defs-jce.gmk b/jdk/make/javax/crypto/Defs-jce.gmk
index 46fe1118dca..0b75bceb984 100644
--- a/jdk/make/javax/crypto/Defs-jce.gmk
+++ b/jdk/make/javax/crypto/Defs-jce.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc.  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
@@ -61,7 +61,7 @@ SIGNING_PASSPHRASE = $(SIGNING_KEY_DIR)/passphrase.txt
 SIGNING_ALIAS      = jce_rsa
 
 #
-# Defines for signing/obfuscating the various jar files.
+# Defines for signing the various jar files.
 #
 
 define presign
@@ -100,19 +100,4 @@ define sign-file
 	$(sign-target)
 endef
 
-#
-# Location for the Obfuscation product.  JDK currently has
-# the requirement that we obfuscate our JCE jars.
-#
-OBFUSCATOR = /security/tools/bin/obfus
-OBFUS_DIR = $(TEMPDIR)/obfus
-
-define preobfus
-    @if [ ! -f $(OBFUSCATOR) ]; then \
-	$(ECHO) "\n$(OBFUSCATOR): Obfuscator *NOT* available..." \
-	    $(README-MAKEFILE_WARNING); \
-	exit 2; \
-    fi
-endef
-
 endif  # !OPENJDK
diff --git a/jdk/make/javax/crypto/Makefile b/jdk/make/javax/crypto/Makefile
index 216ff6e222d..fe07ed5edf7 100644
--- a/jdk/make/javax/crypto/Makefile
+++ b/jdk/make/javax/crypto/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007-2009 Sun Microsystems, Inc.  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
@@ -44,64 +44,65 @@
 # For OpenJDK, the jar files built here are installed directly into the
 # OpenJDK.
 #
-# For JDK, the binaries use pre-built/pre-signed/pre-obfuscated binary
-# files stored in the closed workspace that are not shipped in the
-# OpenJDK workspaces.  We still build the JDK files here to verify the
-# files compile, and in preparation for possible signing and
-# obfuscation.  Developers working on JCE in JDK must sign the JCE files
-# before testing: obfuscation is optional during development.  The JCE
-# signing key is kept separate from the JDK workspace to prevent its
-# disclosure.  The obfuscation tool has not been licensed for general
-# usage.
+# For JDK, the binaries use pre-built/pre-signed binary files stored in
+# the closed workspace that are not shipped in the OpenJDK workspaces.
+# We still build the JDK files here to verify the files compile, and in
+# preparation for possible signing.  Developers working on JCE in JDK
+# must sign the JCE files before testing.  The JCE signing key is kept
+# separate from the JDK workspace to prevent its disclosure.
 #
 # SPECIAL NOTE TO JCE/JDK developers:  The source files must eventually
-# be built, obfuscated, signed, and the resulting jar files *MUST BE
-# CHECKED INTO THE CLOSED PART OF THE WORKSPACE*.  This separate step
-# *MUST NOT BE FORGOTTEN*, otherwise a bug fixed in the source code will
-# not be reflected in the shipped binaries.  The "release" target should
-# be used to generate the required files.
+# be built and signed, and the resulting jar files *MUST BE CHECKED INTO
+# THE CLOSED PART OF THE WORKSPACE*.  This separate step *MUST NOT BE
+# FORGOTTEN*, otherwise a bug fixed in the source code will not be
+# reflected in the shipped binaries.  The "release" target should be
+# used to generate the required files.
 #
 # There are a number of targets to help both JDK/OpenJDK developers.
 #
 # Main Targets (JDK/OPENJDK):
 #
-#     all/clobber/clean		The usual.
-#				    If OpenJDK, installs
-#					jce.jar/limited policy files.
-#				    If JDK, installs prebuilt
-#					jce.jar/limited policy files.
+#     all/clobber/clean        The usual.
+#                                  If OpenJDK: builds/installs the
+#                                      jce.jar/limited policy files.
+#                                  If JDK: builds but does not install.
+#                                     During full tops-down builds,
+#                                     prebuilt/presigned jce.jar &
+#                                     limited policy files are copied
+#                                     in by make/java/redist/Makefile.
+#                                     If you are working in this directory
+#                                     and want to install the prebuilts,
+#                                     use the "install-prebuilt" target.
 #
-#     jar			Builds/installs jce.jar
-#				    If OpenJDK, does not sign
-#				    If JDK, tries to sign
+#     jar                      Builds/installs jce.jar
+#                                  If OpenJDK, does not sign
+#                                  If JDK, tries to sign
 #
 # Other lesser-used Targets (JDK/OPENJDK):
 #
-#     build-jar			Builds jce.jar (does not sign/install)
+#     build-jar                Builds jce.jar (does not sign/install)
 #
-#     build-policy		Builds policy files (does not sign/install)
+#     build-policy             Builds policy files (does not sign/install)
 #
-#     install-jar		Alias for "jar" above
+#     install-jar              Alias for "jar" above
 #
-#     install-limited		Builds/installs limited policy files
-#				    If OpenJDK, does not sign
-#				    If JDK, tries to sign
-#     install-unlimited		Builds/nstalls unlimited policy files
-#				    If OpenJDK, does not sign
-#				    If JDK, tries to sign
+#     install-limited          Builds/installs limited policy files
+#                                  If OpenJDK, does not sign
+#                                  If JDK, tries to sign
+#     install-unlimited        Builds/nstalls unlimited policy files
+#                                  If OpenJDK, does not sign
+#                                  If JDK, tries to sign
 #
 # Other targets (JDK only):
 #
-#     sign			Alias for sign-jar and sign-policy
-#	  sign-jar		Builds/signs jce.jar file (no install)
-#	  sign-policy		Builds/signs policy files (no install)
+#     sign                     Alias for sign-jar and sign-policy
+#          sign-jar            Builds/signs jce.jar file (no install)
+#          sign-policy         Builds/signs policy files (no install)
 #
-#     obfus			Builds/obfuscates/signs jce.jar
+#     release                  Builds all targets in preparation
+#                              for workspace integration.
 #
-#     release			Builds all targets in preparation
-#				for workspace integration.
-#
-#     install-prebuilt		Installs the pre-built jar files
+#     install-prebuilt         Installs the pre-built jar files
 #
 # This makefile was written to support parallel target execution.
 #
@@ -112,7 +113,7 @@ PRODUCT = sun
 
 #
 # The following is for when we need to do postprocessing
-# (signing/obfuscation) against a read-only build.  If the OUTPUTDIR
+# (signing) against a read-only build.  If the OUTPUTDIR
 # isn't writable, the build currently crashes out.
 #
 ifndef OPENJDK
@@ -169,8 +170,8 @@ endif # OPENJDK
 #
 # We use a variety of subdirectories in the $(TEMPDIR) depending on what
 # part of the build we're doing.  Both OPENJDK/JDK builds are initially
-# done in the unsigned area.  When files are signed or obfuscated in JDK,
-# they will be placed in the appropriate areas.
+# done in the unsigned area.  When files are signed in JDK, they will be
+# placed in the appropriate areas.
 #
 UNSIGNED_DIR = $(TEMPDIR)/unsigned
 
@@ -178,7 +179,7 @@ include Defs-jce.gmk
 
 
 # =====================================================
-# Build the unsigned jce.jar file.  Signing/obfuscation comes later.
+# Build the unsigned jce.jar file.  Signing comes later.
 #
 
 JAR_DESTFILE = $(LIBDIR)/jce.jar
@@ -363,68 +364,13 @@ $(SIGNED_POLICY_BUILDDIR)/limited/local_policy.jar:		\
 
 
 # =====================================================
-# Obfuscate/sign/install the JDK build.  Not needed for OpenJDK.
-#
-
-OBFUS_DIR = $(JCE_BUILD_DIR)/obfus/jce
-
-CLOSED_DIR = $(BUILDDIR)/closed/javax/crypto
-
-obfus: $(OBFUS_DIR)/jce.jar
-	$(release-warning)
-
-ifndef ALT_JCE_BUILD_DIR
-$(OBFUS_DIR)/jce.jar: build-jar $(JCE_MANIFEST_FILE) $(OBFUS_DIR)/framework.dox
-else
-#
-# We have to remove the build dependency, otherwise, we'll try to rebuild it
-# which we can't do on a read-only filesystem.
-#
-$(OBFUS_DIR)/jce.jar: $(JCE_MANIFEST_FILE) $(OBFUS_DIR)/framework.dox
-	@if [ ! -d $(CLASSDESTDIR) ] ; then \
-	    $(ECHO) "Couldn't find $(CLASSDESTDIR)"; \
-	    exit 1; \
-	fi
-endif
-	@$(ECHO) ">>>Obfuscating JCE framework..."
-	$(presign)
-	$(preobfus)
-	$(prep-target)
-	$(CD) $(OBFUS_DIR); \
-	$(OBFUSCATOR) -fv framework.dox
-	@$(CD) $(OBFUS_DIR); $(java-vm-cleanup)
-	@#
-	@# The sun.security.internal classes are currently not obfuscated
-	@# due to an obfus problem. Manually copy them to the build directory
-	@# so that they are included in the jce.jar file.
-	@#
-	$(CP) -r $(CLASSDESTDIR)/sun $(OBFUS_DIR)/build
-	$(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@	\
-	    -C $(OBFUS_DIR)/build javax			\
-	    -C $(OBFUS_DIR)/build sun			\
-	    $(BOOT_JAR_JFLAGS)
-	$(sign-target)
-	@$(java-vm-cleanup)
-
-$(OBFUS_DIR)/framework.dox: $(CLOSED_DIR)/obfus/framework.dox
-	@$(ECHO) ">>>Creating framework.dox"
-	$(prep-target)
-	$(SED) "s:@@TEMPDIR@@:$(ABS_TEMPDIR):" $< > $@
-
-#
-# The current obfuscator has a limitation in that it currently only
-# supports up to v49 class file format.  Force v49 classfiles in our
-# builds for now.
-#
-TARGET_CLASS_VERSION = 5
-
-
-# =====================================================
-# Create the Release Engineering files.  Obfuscated builds,
+# Create the Release Engineering files.  Signed builds,
 # unlimited policy file distribution, etc.
 #
 
-release: $(OBFUS_DIR)/jce.jar sign-policy $(CLOSED_DIR)/doc/COPYRIGHT.html \
+CLOSED_DIR = $(BUILDDIR)/closed/javax/crypto
+
+release: $(SIGNED_DIR)/jce.jar sign-policy $(CLOSED_DIR)/doc/COPYRIGHT.html \
          $(CLOSED_DIR)/doc/README.txt
 	$(RM) -r \
 	    $(JCE_BUILD_DIR)/release/UnlimitedJCEPolicy              \
@@ -433,7 +379,7 @@ release: $(OBFUS_DIR)/jce.jar sign-policy $(CLOSED_DIR)/doc/COPYRIGHT.html \
 	    $(JCE_BUILD_DIR)/release/local_policy.jar                \
 	    $(JCE_BUILD_DIR)/release/UnlimitedJCEPolicy.zip
 	$(MKDIR) -p $(JCE_BUILD_DIR)/release/UnlimitedJCEPolicy
-	$(CP) $(OBFUS_DIR)/jce.jar $(JCE_BUILD_DIR)/release
+	$(CP) $(SIGNED_DIR)/jce.jar $(JCE_BUILD_DIR)/release
 	$(CP) \
 	    $(SIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar   \
 	    $(SIGNED_POLICY_BUILDDIR)/limited/local_policy.jar       \
@@ -529,5 +475,5 @@ clobber clean::
 .PHONY: build-jar jar build-policy unlimited limited install-jar \
 	install-limited install-unlimited
 ifndef OPENJDK
-.PHONY: sign sign-jar sign-policy obfus release install-prebuilt
+.PHONY: sign sign-jar sign-policy release install-prebuilt
 endif
diff --git a/jdk/make/javax/swing/plaf/Makefile b/jdk/make/javax/swing/plaf/Makefile
index cf3bf0aa274..c0c5ebecc70 100644
--- a/jdk/make/javax/swing/plaf/Makefile
+++ b/jdk/make/javax/swing/plaf/Makefile
@@ -34,16 +34,14 @@ include $(BUILDDIR)/common/Defs.gmk
 #
 include FILES.gmk
 AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
-ifndef DISABLE_NIMBUS
-  SUBDIRS = nimbus
-endif
-
-# Nimbus is handled in its own directory
-AUTO_JAVA_PRUNE = nimbus
 
 ifeq ($(PLATFORM), windows)
     # Don't build GTK L&F on Windows
-    AUTO_JAVA_PRUNE += gtk
+    AUTO_JAVA_PRUNE = gtk
+endif
+
+ifdef DISABLE_NIMBUS
+    AUTO_JAVA_PRUNE += nimbus
 endif
 
 MISC_FILES = $(MISC_SWING_FILES)
@@ -52,6 +50,10 @@ ifneq ($(PLATFORM), windows)
     MISC_FILES += $(MISC_SWING_FILES_UNIX)
 endif
 
+NIMBUS_GENSRC_DIR = $(GENSRCDIR)/javax/swing/plaf/nimbus
+NIMBUS_SKIN_FILE = $(SWING_SRC)/plaf/nimbus/skin.laf
+NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR)/generatenimbus.jar
+
 FILES_java = $(FILES_SWING_java)
 
 #
@@ -75,14 +77,25 @@ endif
 # Process LOGO_ICONS and Motif Icons first.
 #
 build: $(LOGO_ICONS) $(MISC_SWING_FILES_MOTIF_GIF) $(MISC_SWING_FILES_MOTIF_PNG) other_files
-	$(SUBDIRS-loop)
 
-clean clobber::
-	$(SUBDIRS-loop)
+$(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR)
+	@$(ECHO) "Generating Nimbus source files:"
+	$(RM) -r $(NIMBUS_GENSRC_DIR)
+	$(BOOT_JAVA_CMD) -jar $(NIMBUS_GENERATOR_JAR) \
+	    -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(GENSRCDIR) \
+	    -packagePrefix $(PACKAGE).nimbus -lafName Nimbus
+	@$(ECHO) "Finished generating Nimbus source files"
+
+clean:: classes.clean
+	$(RM) -r $(NIMBUS_GENSRC_DIR)
 
 #
 # Include
 #
+ifndef DISABLE_NIMBUS
+    CLASSES_INIT = $(NIMBUS_GENSRC_DIR)
+endif
+
 include $(BUILDDIR)/common/Classes.gmk
 
 ifndef OPENJDK
diff --git a/jdk/make/netbeans/jdwpgen/build.xml b/jdk/make/netbeans/jdwpgen/build.xml
new file mode 100644
index 00000000000..da67672e2af
--- /dev/null
+++ b/jdk/make/netbeans/jdwpgen/build.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="jdwpgen" default="default" basedir=".">
+    <description>Builds, tests, and runs the project jdwpgen.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="jdwpgen-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/jdk/make/netbeans/jdwpgen/nbproject/build-impl.xml b/jdk/make/netbeans/jdwpgen/nbproject/build-impl.xml
new file mode 100644
index 00000000000..9997d00d9e7
--- /dev/null
+++ b/jdk/make/netbeans/jdwpgen/nbproject/build-impl.xml
@@ -0,0 +1,642 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+
+For the purpose of easier reading the script
+is divided into following sections:
+
+  - initialization
+  - compilation
+  - jar
+  - execution
+  - debugging
+  - javadoc
+  - junit compilation
+  - junit execution
+  - junit debugging
+  - applet
+  - cleanup
+
+        -->
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="jdwpgen-impl">
+    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+    <!-- 
+                ======================
+                INITIALIZATION SECTION 
+                ======================
+            -->
+    <target name="-pre-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init" name="-init-private">
+        <property file="nbproject/private/config.properties"/>
+        <property file="nbproject/private/configs/${config}.properties"/>
+        <property file="nbproject/private/private.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private" name="-init-user">
+        <property file="${user.properties.file}"/>
+        <!-- The two properties below are usually overridden -->
+        <!-- by the active platform. Just a fallback. -->
+        <property name="default.javac.source" value="1.4"/>
+        <property name="default.javac.target" value="1.4"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+        <property file="nbproject/configs/${config}.properties"/>
+        <property file="nbproject/project.properties"/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <available file="${manifest.file}" property="manifest.available"/>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class"/>
+                <not>
+                    <equals arg1="${main.class}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition property="manifest.available+main.class+mkdist.available">
+            <and>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+            </and>
+        </condition>
+        <condition property="have.tests">
+            <or>
+                <available file="${test.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="have.sources">
+            <or>
+                <available file="${src.src.dir}"/>
+            </or>
+        </condition>
+        <condition property="netbeans.home+have.tests">
+            <and>
+                <isset property="netbeans.home"/>
+                <isset property="have.tests"/>
+            </and>
+        </condition>
+        <condition property="no.javadoc.preview">
+            <and>
+                <isset property="javadoc.preview"/>
+                <isfalse value="${javadoc.preview}"/>
+            </and>
+        </condition>
+        <property name="run.jvmargs" value=""/>
+        <property name="javac.compilerargs" value=""/>
+        <property name="work.dir" value="${basedir}"/>
+        <condition property="no.deps">
+            <and>
+                <istrue value="${no.dependencies}"/>
+            </and>
+        </condition>
+        <property name="javac.debug" value="true"/>
+        <property name="javadoc.preview" value="true"/>
+        <property name="application.args" value=""/>
+        <property name="source.encoding" value="${file.encoding}"/>
+        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+            <and>
+                <isset property="javadoc.encoding"/>
+                <not>
+                    <equals arg1="${javadoc.encoding}" arg2=""/>
+                </not>
+            </and>
+        </condition>
+        <property name="javadoc.encoding.used" value="${source.encoding}"/>
+        <property name="includes" value="**"/>
+        <property name="excludes" value=""/>
+        <property name="do.depend" value="false"/>
+        <condition property="do.depend.true">
+            <istrue value="${do.depend}"/>
+        </condition>
+        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
+            <and>
+                <isset property="jaxws.endorsed.dir"/>
+                <available file="nbproject/jaxws-build.xml"/>
+            </and>
+        </condition>
+    </target>
+    <target name="-post-init">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.src.dir">Must set src.src.dir</fail>
+        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="build.dir">Must set build.dir</fail>
+        <fail unless="dist.dir">Must set dist.dir</fail>
+        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
+        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
+        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+        <fail unless="dist.jar">Must set dist.jar</fail>
+    </target>
+    <target name="-init-macrodef-property">
+        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-javac">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="/does/not/exist" name="sourcepath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <sequential>
+                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </depend>
+            </sequential>
+        </macrodef>
+        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <sequential>
+                <fail unless="javac.includes">Must set javac.includes</fail>
+                <pathconvert pathsep="," property="javac.includes.binary">
+                    <path>
+                        <filelist dir="@{destdir}" files="${javac.includes}"/>
+                    </path>
+                    <globmapper from="*.java" to="*.class"/>
+                </pathconvert>
+                <delete>
+                    <files includes="${javac.includes.binary}"/>
+                </delete>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-junit">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <sequential>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
+                    <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                    </batchtest>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <attribute default="" name="stopclassname"/>
+            <sequential>
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                </nbjpdastart>
+            </sequential>
+        </macrodef>
+        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${build.classes.dir}" name="dir"/>
+            <sequential>
+                <nbjpdareload>
+                    <fileset dir="@{dir}" includes="${fix.classes}">
+                        <include name="${fix.includes}*.class"/>
+                    </fileset>
+                </nbjpdareload>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-debug-args">
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>
+        <condition property="have-jdk-older-than-1.4">
+            <or>
+                <contains string="${version-output}" substring="java version &quot;1.0"/>
+                <contains string="${version-output}" substring="java version &quot;1.1"/>
+                <contains string="${version-output}" substring="java version &quot;1.2"/>
+                <contains string="${version-output}" substring="java version &quot;1.3"/>
+            </or>
+        </condition>
+        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+            <istrue value="${have-jdk-older-than-1.4}"/>
+        </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
+    </target>
+    <target depends="-init-debug-args" name="-init-macrodef-debug">
+        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${debug-args-line}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-macrodef-java">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${main.class}" name="classname"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${run.jvmargs}"/>
+                    <classpath>
+                        <path path="${run.classpath}"/>
+                    </classpath>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target name="-init-presetdef-jar">
+        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <jar compress="${jar.compress}" jarfile="${dist.jar}">
+                <j2seproject1:fileset dir="${build.classes.dir}"/>
+            </jar>
+        </presetdef>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
+    <!--
+                ===================
+                COMPILATION SECTION
+                ===================
+            -->
+    <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
+    <target depends="init,deps-jar" name="-pre-pre-compile">
+        <mkdir dir="${build.classes.dir}"/>
+    </target>
+    <target name="-pre-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-depend">
+        <j2seproject3:depend/>
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
+        <j2seproject3:javac/>
+        <copy todir="${build.classes.dir}">
+            <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target name="-pre-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.src.dir}"/>
+    </target>
+    <target name="-post-compile-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <!--
+                ====================
+                JAR BUILDING SECTION
+                ====================
+            -->
+    <target depends="init" name="-pre-pre-jar">
+        <dirname file="${dist.jar}" property="dist.jar.dir"/>
+        <mkdir dir="${dist.jar.dir}"/>
+    </target>
+    <target name="-pre-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
+        <j2seproject1:jar/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+        <j2seproject1:jar manifest="${manifest.file}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
+        <j2seproject1:jar manifest="${manifest.file}">
+            <j2seproject1:manifest>
+                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
+            </j2seproject1:manifest>
+        </j2seproject1:jar>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <pathconvert property="run.classpath.without.build.classes.dir">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to=""/>
+        </pathconvert>
+        <pathconvert pathsep=" " property="jar.classpath">
+            <path path="${run.classpath.without.build.classes.dir}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="lib/*"/>
+            </chainedmapper>
+        </pathconvert>
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+            <fileset dir="${build.classes.dir}"/>
+            <manifest>
+                <attribute name="Main-Class" value="${main.class}"/>
+                <attribute name="Class-Path" value="${jar.classpath}"/>
+            </manifest>
+        </copylibs>
+        <echo>To run this application from the command line without Ant, try:</echo>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <echo>java -jar "${dist.jar.resolved}"</echo>
+    </target>
+    <target name="-post-jar">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                EXECUTION SECTION
+                =================
+            -->
+    <target depends="init,compile" description="Run a main class." name="run">
+        <j2seproject1:java>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <target name="-do-not-recompile">
+        <property name="javac.includes.binary" value=""/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-single" name="run-single">
+        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+        <j2seproject1:java classname="${run.class}"/>
+    </target>
+    <!--
+                =================
+                DEBUGGING SECTION
+                =================
+            -->
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
+        <j2seproject1:nbjpdastart name="${debug.class}"/>
+    </target>
+    <target depends="init,compile" name="-debug-start-debuggee">
+        <j2seproject3:debug>
+            <customize>
+                <arg line="${application.args}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
+        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
+    </target>
+    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
+        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+        <j2seproject3:debug classname="${debug.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init" name="-pre-debug-fix">
+        <fail unless="fix.includes">Must set fix.includes</fail>
+        <property name="javac.includes" value="${fix.includes}.java"/>
+    </target>
+    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+        <j2seproject1:nbjpdareload/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+    <!--
+                ===============
+                JAVADOC SECTION
+                ===============
+            -->
+    <target depends="init" name="-javadoc-build">
+        <mkdir dir="${dist.javadoc.dir}"/>
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <classpath>
+                <path path="${javac.classpath}"/>
+            </classpath>
+            <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+        </javadoc>
+    </target>
+    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+    </target>
+    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+    <!--
+                =========================
+                JUNIT COMPILATION SECTION
+                =========================
+            -->
+    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+        <mkdir dir="${build.test.classes.dir}"/>
+    </target>
+    <target name="-pre-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target if="do.depend.true" name="-compile-test-depend">
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+    <target name="-pre-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
+    </target>
+    <target name="-post-compile-test-single">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+    <!--
+                =======================
+                JUNIT EXECUTION SECTION
+                =======================
+            -->
+    <target depends="init" if="have.tests" name="-pre-test-run">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+        <j2seproject3:junit testincludes="**/*Test.java"/>
+    </target>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+        <fail if="tests.failed">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init" if="have.tests" name="test-report"/>
+    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+    <target depends="init" if="have.tests" name="-pre-test-run-single">
+        <mkdir dir="${build.test.results.dir}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+        <j2seproject3:junit excludes="" includes="${test.includes}"/>
+    </target>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+        <fail if="tests.failed">Some tests failed; see details above.</fail>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <!--
+                =======================
+                JUNIT DEBUGGING SECTION
+                =======================
+            -->
+    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
+        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
+        <delete file="${test.report.file}"/>
+        <mkdir dir="${build.test.results.dir}"/>
+        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
+            <customize>
+                <syspropertyset>
+                    <propertyref prefix="test-sys-prop."/>
+                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                </syspropertyset>
+                <arg value="${test.class}"/>
+                <arg value="showoutput=true"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
+                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
+    </target>
+    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
+    </target>
+    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+    <!--
+                =========================
+                APPLET EXECUTION SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" name="run-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject1:java classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject1:java>
+    </target>
+    <!--
+                =========================
+                APPLET DEBUGGING  SECTION
+                =========================
+            -->
+    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
+        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+        <j2seproject3:debug classname="sun.applet.AppletViewer">
+            <customize>
+                <arg value="${applet.url}"/>
+            </customize>
+        </j2seproject3:debug>
+    </target>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
+    <!--
+                ===============
+                CLEANUP SECTION
+                ===============
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="-do-clean">
+        <delete dir="${build.dir}"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+</project>
diff --git a/jdk/make/netbeans/jdwpgen/nbproject/findbugs.settings b/jdk/make/netbeans/jdwpgen/nbproject/findbugs.settings
new file mode 100644
index 00000000000..cb205d1aa21
--- /dev/null
+++ b/jdk/make/netbeans/jdwpgen/nbproject/findbugs.settings
@@ -0,0 +1,72 @@
+#FindBugs User Preferences
+#Mon Jun 15 13:37:16 PDT 2009
+detectorAbnormalFinallyBlockReturn=AbnormalFinallyBlockReturn|false
+detectorAbstractClassEmptyMethods=AbstractClassEmptyMethods|false
+detectorAbstractOverriddenMethod=AbstractOverriddenMethod|false
+detectorArrayBasedCollections=ArrayBasedCollections|false
+detectorArrayWrappedCallByReference=ArrayWrappedCallByReference|false
+detectorBloatedAssignmentScope=BloatedAssignmentScope|false
+detectorBloatedSynchronizedBlock=BloatedSynchronizedBlock|false
+detectorClassEnvy=ClassEnvy|false
+detectorCollectStatistics=CollectStatistics|false
+detectorConfusingAutoboxedOverloading=ConfusingAutoboxedOverloading|false
+detectorConstantListIndex=ConstantListIndex|false
+detectorCopiedOverriddenMethod=CopiedOverriddenMethod|false
+detectorCustomBuiltXML=CustomBuiltXML|false
+detectorCyclomaticComplexity=CyclomaticComplexity|false
+detectorDateComparison=DateComparison|false
+detectorDeclaredRuntimeException=DeclaredRuntimeException|false
+detectorDeletingWhileIterating=DeletingWhileIterating|false
+detectorDubiousListCollection=DubiousListCollection|false
+detectorFieldCouldBeLocal=FieldCouldBeLocal|false
+detectorFinalParameters=FinalParameters|false
+detectorFloatingPointLoops=FloatingPointLoops|false
+detectorInefficientStringBuffering=InefficientStringBuffering|false
+detectorInheritanceTypeChecking=InheritanceTypeChecking|false
+detectorJDBCVendorReliance=JDBCVendorReliance|false
+detectorListIndexedIterating=ListIndexedIterating|false
+detectorLiteralStringComparison=LiteralStringComparison|false
+detectorLocalSynchronizedCollection=LocalSynchronizedCollection|false
+detectorLostExceptionStackTrace=LostExceptionStackTrace|false
+detectorManualArrayCopy=ManualArrayCopy|false
+detectorMethodReturnsConstant=MethodReturnsConstant|false
+detectorNeedlessAutoboxing=NeedlessAutoboxing|false
+detectorNeedlessCustomSerialization=NeedlessCustomSerialization|false
+detectorNeedlessInstanceRetrieval=NeedlessInstanceRetrieval|false
+detectorNeedlessMemberCollectionSynchronization=NeedlessMemberCollectionSynchronization|false
+detectorNonCollectionMethodUse=NonCollectionMethodUse|false
+detectorNonOwnedSynchronization=NonOwnedSynchronization|false
+detectorNonRecycleableTaglibs=NonRecycleableTaglibs|false
+detectorOrphanedDOMNode=OrphanedDOMNode|false
+detectorOverlyConcreteParameter=OverlyConcreteParameter|false
+detectorParallelLists=ParallelLists|false
+detectorPartiallyConstructedObjectAccess=PartiallyConstructedObjectAccess|false
+detectorPossibleIncompleteSerialization=PossibleIncompleteSerialization|false
+detectorPossibleMemoryBloat=PossibleMemoryBloat|false
+detectorPossiblyRedundantMethodCalls=PossiblyRedundantMethodCalls|false
+detectorSQLInLoop=SQLInLoop|false
+detectorSection508Compliance=Section508Compliance|false
+detectorSillynessPotPourri=SillynessPotPourri|false
+detectorSloppyClassReflection=SloppyClassReflection|false
+detectorSluggishGui=SluggishGui|false
+detectorSpoiledChildInterfaceImplementor=SpoiledChildInterfaceImplementor|false
+detectorSpuriousThreadStates=SpuriousThreadStates|false
+detectorStaticArrayCreatedInMethod=StaticArrayCreatedInMethod|false
+detectorStaticMethodInstanceInvocation=StaticMethodInstanceInvocation|false
+detectorSuspiciousComparatorReturnValues=SuspiciousComparatorReturnValues|false
+detectorSuspiciousJDKVersionUse=SuspiciousJDKVersionUse|false
+detectorSuspiciousWaitOnConcurrentObject=SuspiciousWaitOnConcurrentObject|false
+detectorSyncCollectionIterators=SyncCollectionIterators|false
+detectorTailRecursion=TailRecursion|false
+detectorUnnecessaryStoreBeforeReturn=UnnecessaryStoreBeforeReturn|false
+detectorUnrelatedCollectionContents=UnrelatedCollectionContents|false
+detectorUnrelatedReturnValues=UnrelatedReturnValues|false
+detectorUseAddAll=UseAddAll|false
+detectorUseCharacterParameterizedMethod=UseCharacterParameterizedMethod|false
+detectorUseEnumCollections=UseEnumCollections|false
+detectorUseSplit=UseSplit|false
+detectorUseToArray=UseToArray|false
+detector_threshold=2
+effort=default
+filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false
+filter_settings_neg=|
diff --git a/jdk/make/netbeans/jdwpgen/nbproject/genfiles.properties b/jdk/make/netbeans/jdwpgen/nbproject/genfiles.properties
new file mode 100644
index 00000000000..a82838d7b0f
--- /dev/null
+++ b/jdk/make/netbeans/jdwpgen/nbproject/genfiles.properties
@@ -0,0 +1,8 @@
+build.xml.data.CRC32=b40e775f
+build.xml.script.CRC32=af8dc3cb
+build.xml.stylesheet.CRC32=958a1d3e
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=b40e775f
+nbproject/build-impl.xml.script.CRC32=624d12c5
+nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
diff --git a/jdk/make/netbeans/jdwpgen/nbproject/project.properties b/jdk/make/netbeans/jdwpgen/nbproject/project.properties
new file mode 100644
index 00000000000..19b2cffc991
--- /dev/null
+++ b/jdk/make/netbeans/jdwpgen/nbproject/project.properties
@@ -0,0 +1,65 @@
+application.title=jdwpgen
+application.vendor=sun
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/jdwpgen.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+excludes=
+file.reference.tools-jdwpgen=../../tools/src/build/tools/jdwpgen
+file.reference.tools-src=../../tools/src
+includes=build/tools/jdwpgen/**
+jar.compress=false
+javac.classpath=
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:all
+javac.deprecation=false
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=true
+javadoc.nonavbar=true
+javadoc.notree=true
+javadoc.private=true
+javadoc.splitindex=false
+javadoc.use=false
+javadoc.version=false
+javadoc.windowtitle=
+main.class=jdwpgen.Main
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+platform.active=default_platform
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.src.dir=${file.reference.tools-src}
+test.src.dir=test
diff --git a/jdk/make/netbeans/jdwpgen/nbproject/project.xml b/jdk/make/netbeans/jdwpgen/nbproject/project.xml
new file mode 100644
index 00000000000..c7bf8edefc0
--- /dev/null
+++ b/jdk/make/netbeans/jdwpgen/nbproject/project.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>jdwpgen</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <source-roots>
+                <root id="src.src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>
diff --git a/jdk/make/netbeans/jdwpgen/nbproject/sqe.properties b/jdk/make/netbeans/jdwpgen/nbproject/sqe.properties
new file mode 100644
index 00000000000..978ef5bc013
--- /dev/null
+++ b/jdk/make/netbeans/jdwpgen/nbproject/sqe.properties
@@ -0,0 +1,2 @@
+#Path to FindbugsSettingsFile (relative)
+findbugs.settings.file=findbugs.settings
diff --git a/jdk/make/sun/javazic/tzdata/VERSION b/jdk/make/sun/javazic/tzdata/VERSION
index 373805077ff..17a8a1b2984 100644
--- a/jdk/make/sun/javazic/tzdata/VERSION
+++ b/jdk/make/sun/javazic/tzdata/VERSION
@@ -21,4 +21,4 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
-tzdata2009g
+tzdata2009l
diff --git a/jdk/make/sun/javazic/tzdata/africa b/jdk/make/sun/javazic/tzdata/africa
index 072bc251c1d..2032f3862d7 100644
--- a/jdk/make/sun/javazic/tzdata/africa
+++ b/jdk/make/sun/javazic/tzdata/africa
@@ -22,6 +22,8 @@
 # have any questions.
 #
 # <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -263,18 +265,18 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
 # The following appeared in Red Hat bugzilla[1] (edited):
 #
 # > $ zdump -v /usr/share/zoneinfo/Africa/Cairo | grep 2009
-# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 21:59:59 2009 UTC =3D Thu =
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 21:59:59 2009 UTC = Thu =
 # Apr 23
-# > 23:59:59 2009 EET isdst=3D0 gmtoff=3D7200
-# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 22:00:00 2009 UTC =3D Fri =
+# > 23:59:59 2009 EET isdst=0 gmtoff=7200
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 22:00:00 2009 UTC = Fri =
 # Apr 24
-# > 01:00:00 2009 EEST isdst=3D1 gmtoff=3D10800
-# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 20:59:59 2009 UTC =3D Thu =
+# > 01:00:00 2009 EEST isdst=1 gmtoff=10800
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 20:59:59 2009 UTC = Thu =
 # Aug 27
-# > 23:59:59 2009 EEST isdst=3D1 gmtoff=3D10800
-# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 21:00:00 2009 UTC =3D Thu =
+# > 23:59:59 2009 EEST isdst=1 gmtoff=10800
+# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 21:00:00 2009 UTC = Thu =
 # Aug 27
-# > 23:00:00 2009 EET isdst=3D0 gmtoff=3D7200
+# > 23:00:00 2009 EET isdst=0 gmtoff=7200
 #
 # > end date should be Thu Sep 24 2009 (Last Thursday in September at 23:59=
 # :59)
@@ -282,11 +284,11 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
 #
 # timeanddate[2] and another site I've found[3] also support that.
 #
-# [1] <a href="https://bugzilla.redhat.com/show_bug.cgi?id=3D492263">
-# https://bugzilla.redhat.com/show_bug.cgi?id=3D492263
+# [1] <a href="https://bugzilla.redhat.com/show_bug.cgi?id=492263">
+# https://bugzilla.redhat.com/show_bug.cgi?id=492263
 # </a>
-# [2] <a href="http://www.timeanddate.com/worldclock/clockchange.html?n=3D53">
-# http://www.timeanddate.com/worldclock/clockchange.html?n=3D53
+# [2] <a href="http://www.timeanddate.com/worldclock/clockchange.html?n=53">
+# http://www.timeanddate.com/worldclock/clockchange.html?n=53
 # </a>
 # [3] <a href="http://wwp.greenwichmeantime.com/time-zone/africa/egypt/">
 # http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
@@ -296,8 +298,27 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
 # In 2009 (and for the next several years), Ramadan ends before the fourth
 # Thursday in September; Egypt is expected to revert to the last Thursday
 # in September.
+
+# From Steffen Thorsen (2009-08-11):
+# We have been able to confirm the August change with the Egyptian Cabinet 
+# Information and Decision Support Center:
+# <a href="http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html">
+# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
+# </a>
+# 
+# The Middle East News Agency
+# <a href="http://www.mena.org.eg/index.aspx">
+# http://www.mena.org.eg/index.aspx
+# </a>
+# also reports "Egypt starts winter time on August 21"
+# today in article numbered "71, 11/08/2009 12:25 GMT." 
+# Only the title above is available without a subscription to their service,
+# and can be found by searching for "winter" in their search engine
+# (at least today).
+
 Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-Rule	Egypt	2009	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2009	only	-	Aug	20	23:00s	0	-
+Rule	Egypt	2010	max	-	Sep	lastThu	23:00s	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Cairo	2:05:00 -	LMT	1900 Oct
@@ -499,8 +520,8 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
 
 # From Riad M. Hossen Ally (2008-08-03):
 # The Government of Mauritius weblink
-# <a href="http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=3D4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD">
-# http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=3D4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
+# <a href="http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD">
+# http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
 # </a>
 # Cabinet Decision of July 18th, 2008 states as follows:
 #
@@ -522,11 +543,33 @@ Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
 # http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
 # </a>
 
+# From Steffen Thorsen (2009-06-05):
+# According to several sources, Mauritius will not continue to observe
+# DST the coming summer...
+#
+# Some sources, in French:
+# <a href="http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB">
+# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
+# </a>
+# <a href="http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-">
+# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
+# </a>
+#
+# Our wrap-up:
+# <a href="http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html">
+# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
+# </a>
+
+# From Arthur David Olson (2009-07-11):
+# The "mauritius-dst-will-not-repeat" wrapup includes this: 
+# "The trial ended on March 29, 2009, when the clocks moved back by one hour
+# at 2am (or 02:00) local time..."
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
 Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
-Rule Mauritius	2008	max	-	Oct	lastSun	2:00s	1:00	S
-Rule Mauritius	2009	max	-	Mar	lastSun	2:00s	0	-
+Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	S
+Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
 			4:00 Mauritius	MU%sT	# Mauritius Time
diff --git a/jdk/make/sun/javazic/tzdata/antarctica b/jdk/make/sun/javazic/tzdata/antarctica
index bed6d441938..31a624b0e10 100644
--- a/jdk/make/sun/javazic/tzdata/antarctica
+++ b/jdk/make/sun/javazic/tzdata/antarctica
@@ -22,6 +22,8 @@
 # have any questions.
 #
 # <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # From Paul Eggert (1999-11-15):
 # To keep things manageable, we list only locations occupied year-round; see
diff --git a/jdk/make/sun/javazic/tzdata/asia b/jdk/make/sun/javazic/tzdata/asia
index 64e6b0504a0..81534b919a4 100644
--- a/jdk/make/sun/javazic/tzdata/asia
+++ b/jdk/make/sun/javazic/tzdata/asia
@@ -22,6 +22,8 @@
 # have any questions.
 #
 # <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -147,6 +149,57 @@ Zone	Asia/Bahrain	3:22:20 -	LMT	1920		# Al Manamah
 			3:00	-	AST
 
 # Bangladesh
+# From Alexander Krivenyshev (2009-05-13):
+# According to newspaper Asian Tribune (May 6, 2009) Bangladesh may introduce
+# Daylight Saving Time from June 16 to Sept 30
+#
+# Bangladesh to introduce daylight saving time likely from June 16
+# <a href="http://www.asiantribune.com/?q=node/17288">
+# http://www.asiantribune.com/?q=node/17288
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_bangladesh02.html">
+# http://www.worldtimezone.com/dst_news/dst_news_bangladesh02.html
+# </a>
+#
+# "... Bangladesh government has decided to switch daylight saving time from
+# June
+# 16 till September 30 in a bid to ensure maximum use of daylight to cope with
+# crippling power crisis. "
+#
+# The switch will remain in effect from June 16 to Sept 30 (2009) but if
+# implemented the next year, it will come in force from April 1, 2010
+
+# From Steffen Thorsen (2009-06-02):
+# They have finally decided now, but changed the start date to midnight between
+# the 19th and 20th, and they have not set the end date yet.
+#
+# Some sources:
+# <a href="http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601">
+# http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601
+# </a>
+# <a href="http://bdnews24.com/details.php?id=85889&cid=2">
+# http://bdnews24.com/details.php?id=85889&cid=2
+# </a>
+#
+# Our wrap-up:
+# <a href="http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html">
+# http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html
+# </a>
+
+# From A. N. M. Kamrus Saadat (2009-06-15):
+# Finally we've got the official mail regarding DST start time where DST start 
+# time is mentioned as Jun 19 2009, 23:00 from BTRC (Bangladesh 
+# Telecommunication Regulatory Commission). 
+#
+# No DST end date has been announced yet.
+
+# From Arthur David Olson (2009-07-11):
+# Arbitrarily end DST at the end of 2009 so that a POSIX-sytle time zone string
+# can appear in the Dhaka binary file and for the benefit of old glibc
+# reimplementations of the time zone software that mishandle permanent DST.
+# A change will be required once the end date is known.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Dhaka	6:01:40 -	LMT	1890
 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
@@ -154,7 +207,9 @@ Zone	Asia/Dhaka	6:01:40 -	LMT	1890
 			5:30	-	IST	1942 Sep
 			6:30	-	BURT	1951 Sep 30
 			6:00	-	DACT	1971 Mar 26 # Dacca Time
-			6:00	-	BDT	# Bangladesh Time
+			6:00	-	BDT	2009 Jun 19 23:00 # Bangladesh Time
+			6:00	1:00	BDST	2010
+			6:00	-	BDT
 
 # Bhutan
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1129,7 +1184,7 @@ Rule	Jordan	1995	1998	-	Sep	Fri>=15	0:00s	0	-
 Rule	Jordan	1999	only	-	Jul	 1	0:00s	1:00	S
 Rule	Jordan	1999	2002	-	Sep	lastFri	0:00s	0	-
 Rule	Jordan	2000	2001	-	Mar	lastThu	0:00s	1:00	S
-Rule	Jordan	2002	max	-	Mar	lastFri	0:00s	1:00	S
+Rule	Jordan	2002	max	-	Mar	lastThu	24:00	1:00	S
 Rule	Jordan	2003	only	-	Oct	24	0:00s	0	-
 Rule	Jordan	2004	only	-	Oct	15	0:00s	0	-
 Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
diff --git a/jdk/make/sun/javazic/tzdata/australasia b/jdk/make/sun/javazic/tzdata/australasia
index 823550415e0..8e336dcea30 100644
--- a/jdk/make/sun/javazic/tzdata/australasia
+++ b/jdk/make/sun/javazic/tzdata/australasia
@@ -22,6 +22,8 @@
 # have any questions.
 #
 # <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # This file also includes Pacific islands.
 
@@ -447,6 +449,22 @@ Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
 			-11:00	-	SST			# S=Samoa
 
 # Samoa
+
+# From Alexander Krivenyshev (2008-12-06):
+# The Samoa government (Western Samoa) may implement DST on the first Sunday of 
+# October 2009 (October 4, 2009) until the last Sunday of March 2010 (March 28, 
+# 2010). 
+# 
+# "Selected Committee reports to Cabinet on Daylight Saving Time",
+# Government of Samoa:
+# <a href="http://www.govt.ws/pr_article.cfm?pr_id=560">
+# http://www.govt.ws/pr_article.cfm?pr_id=560
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_samoa01.html">
+# http://www.worldtimezone.com/dst_news/dst_news_samoa01.html
+# </a>
+
 Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 			-11:26:56 -	LMT	1911
 			-11:30	-	SAMT	1950		# Samoa Time
@@ -1141,6 +1159,27 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # From Paul Eggert (2007-07-23):
 # See "southeast Australia" above for 2008 and later.
 
+# From Steffen Thorsen (2009-04-28):
+# According to the official press release, South Australia's extended daylight 
+# saving period will continue with the same rules as used during the 2008-2009 
+# summer (southern hemisphere).
+# 
+# From
+# <a href="http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf">
+# http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf
+# </a>
+# The extended daylight saving period that South Australia has been trialling 
+# for over the last year is now set to be ongoing.
+# Daylight saving will continue to start on the first Sunday in October each 
+# year and finish on the first Sunday in April the following year.
+# Industrial Relations Minister, Paul Caica, says this provides South Australia 
+# with a consistent half hour time difference with NSW, Victoria, Tasmania and 
+# the ACT for all 52 weeks of the year...
+# 
+# We have a wrap-up here:
+# <a href="http://www.timeanddate.com/news/time/south-australia-extends-dst.html">
+# http://www.timeanddate.com/news/time/south-australia-extends-dst.html
+# </a>
 ###############################################################################
 
 # New Zealand
diff --git a/jdk/make/sun/javazic/tzdata/backward b/jdk/make/sun/javazic/tzdata/backward
index 57bb988bc99..8a53120f78b 100644
--- a/jdk/make/sun/javazic/tzdata/backward
+++ b/jdk/make/sun/javazic/tzdata/backward
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # This file provides links between current names for time zones
 # and their old names.  Many names changed in late 1993.
diff --git a/jdk/make/sun/javazic/tzdata/etcetera b/jdk/make/sun/javazic/tzdata/etcetera
index 28ae4445ef0..9583d16428d 100644
--- a/jdk/make/sun/javazic/tzdata/etcetera
+++ b/jdk/make/sun/javazic/tzdata/etcetera
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # These entries are mostly present for historical reasons, so that
 # people in areas not otherwise covered by the tz files could "zic -l"
diff --git a/jdk/make/sun/javazic/tzdata/europe b/jdk/make/sun/javazic/tzdata/europe
index a80f1bc9cff..16dbe0ee500 100644
--- a/jdk/make/sun/javazic/tzdata/europe
+++ b/jdk/make/sun/javazic/tzdata/europe
@@ -22,6 +22,8 @@
 # have any questions.
 #
 # <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -479,7 +481,7 @@ Rule	EU	1979	1995	-	Sep	lastSun	 1:00u	0	-
 Rule	EU	1981	max	-	Mar	lastSun	 1:00u	1:00	S
 Rule	EU	1996	max	-	Oct	lastSun	 1:00u	0	-
 # The most recent directive covers the years starting in 2002.  See:
-# <a href="http://europa.eu.int/eur-lex/en/lif/dat/2000/en_300L0084.html">
+# <a="http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT">
 # Directive 2000/84/EC of the European Parliament and of the Council
 # of 19 January 2001 on summer-time arrangements.
 # </a>
diff --git a/jdk/make/sun/javazic/tzdata/factory b/jdk/make/sun/javazic/tzdata/factory
index 3842b9b08d7..244234f23ea 100644
--- a/jdk/make/sun/javazic/tzdata/factory
+++ b/jdk/make/sun/javazic/tzdata/factory
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # For companies who don't want to put time zone specification in
 # their installation procedures.  When users run date, they'll get the message.
diff --git a/jdk/make/sun/javazic/tzdata/iso3166.tab b/jdk/make/sun/javazic/tzdata/iso3166.tab
index 6931ee04a71..01de3059ed3 100644
--- a/jdk/make/sun/javazic/tzdata/iso3166.tab
+++ b/jdk/make/sun/javazic/tzdata/iso3166.tab
@@ -21,9 +21,11 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 # ISO 3166 alpha-2 country codes
 #
-#
 # From Paul Eggert (2006-09-27):
 #
 # This file contains a table with the following columns:
diff --git a/jdk/make/sun/javazic/tzdata/leapseconds b/jdk/make/sun/javazic/tzdata/leapseconds
index ab4f97377fd..6a84f2db12f 100644
--- a/jdk/make/sun/javazic/tzdata/leapseconds
+++ b/jdk/make/sun/javazic/tzdata/leapseconds
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # Allowance for leapseconds added to each timezone file.
 
@@ -75,13 +78,13 @@ Leap	2008	Dec	31	23:59:60	+	S
 # SERVICE DE LA ROTATION TERRESTRE
 # OBSERVATOIRE DE PARIS
 # 61, Av. de l'Observatoire 75014 PARIS (France)
-# Tel.      : 33 (0) 1 40 51 22 29
+# Tel.      : 33 (0) 1 40 51 22 26
 # FAX       : 33 (0) 1 40 51 22 91
 # Internet  : services.iers@obspm.fr
 #
-# Paris, 15 January 2009
+# Paris, 4 July 2009
 #
-# Bulletin C 37
+# Bulletin C 38
 #
 # To authorities responsible
 # for the measurement and
@@ -89,7 +92,7 @@ Leap	2008	Dec	31	23:59:60	+	S
 #
 # INFORMATION ON UTC - TAI
 #
-# NO positive leap second will be introduced at the end of June 2009.
+# NO positive leap second will be introduced at the end of December 2009.
 # The difference between Coordinated Universal Time UTC and the
 # International Atomic Time TAI is :		
 #
@@ -101,6 +104,6 @@ Leap	2008	Dec	31	23:59:60	+	S
 # will be no time step at the next possible date.
 #
 # Daniel GAMBIS
-# Head			
-# Earth Orientation Center of the IERS
+# Director			
+# Earth Orientation Center of IERS
 # Observatoire de Paris, France
diff --git a/jdk/make/sun/javazic/tzdata/northamerica b/jdk/make/sun/javazic/tzdata/northamerica
index a4dd95217b5..1b8cb7a27ed 100644
--- a/jdk/make/sun/javazic/tzdata/northamerica
+++ b/jdk/make/sun/javazic/tzdata/northamerica
@@ -22,6 +22,8 @@
 # have any questions.
 #
 # <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # also includes Central America and the Caribbean
 
diff --git a/jdk/make/sun/javazic/tzdata/pacificnew b/jdk/make/sun/javazic/tzdata/pacificnew
index 5cc43873d3c..7ad10d9b8bb 100644
--- a/jdk/make/sun/javazic/tzdata/pacificnew
+++ b/jdk/make/sun/javazic/tzdata/pacificnew
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # From Arthur David Olson (1989-04-05):
 # On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
diff --git a/jdk/make/sun/javazic/tzdata/solar87 b/jdk/make/sun/javazic/tzdata/solar87
index 6e3bfe5027d..ca1be9c4f40 100644
--- a/jdk/make/sun/javazic/tzdata/solar87
+++ b/jdk/make/sun/javazic/tzdata/solar87
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # So much for footnotes about Saudi Arabia.
 # Apparent noon times below are for Riyadh; your mileage will vary.
diff --git a/jdk/make/sun/javazic/tzdata/solar88 b/jdk/make/sun/javazic/tzdata/solar88
index e5d3265c580..f1d018c4545 100644
--- a/jdk/make/sun/javazic/tzdata/solar88
+++ b/jdk/make/sun/javazic/tzdata/solar88
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # Apparent noon times below are for Riyadh; they're a bit off for other places.
 # Times were computed using formulas in the U.S. Naval Observatory's
diff --git a/jdk/make/sun/javazic/tzdata/solar89 b/jdk/make/sun/javazic/tzdata/solar89
index 4805c9e9888..c76873fec10 100644
--- a/jdk/make/sun/javazic/tzdata/solar89
+++ b/jdk/make/sun/javazic/tzdata/solar89
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # Apparent noon times below are for Riyadh; they're a bit off for other places.
 # Times were computed using a formula provided by the U. S. Naval Observatory:
diff --git a/jdk/make/sun/javazic/tzdata/southamerica b/jdk/make/sun/javazic/tzdata/southamerica
index 7da29e0925d..c886a28b126 100644
--- a/jdk/make/sun/javazic/tzdata/southamerica
+++ b/jdk/make/sun/javazic/tzdata/southamerica
@@ -22,6 +22,8 @@
 # have any questions.
 #
 # <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -696,8 +698,8 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 
 # From Rodrigo Severo (2008-06-24):
 # Just correcting the URL:
-# <a href="https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=3Ddo&secao=3D1&pagina=3D1&data=3D25/04/2008">
-# https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=3Ddo&secao=3D1&pagina=3D1&data=3D25/04/2008
+# <a href="https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008">
+# https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008
 # </a>
 #
 # As a result of the above Decree I believe the America/Rio_Branco
diff --git a/jdk/make/sun/javazic/tzdata/systemv b/jdk/make/sun/javazic/tzdata/systemv
index e0604dc3f9d..152734e3029 100644
--- a/jdk/make/sun/javazic/tzdata/systemv
+++ b/jdk/make/sun/javazic/tzdata/systemv
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 
 # Old rules, should the need arise.
 # No attempt is made to handle Newfoundland, since it cannot be expressed
diff --git a/jdk/make/sun/javazic/tzdata/zone.tab b/jdk/make/sun/javazic/tzdata/zone.tab
index 467367e2d72..2a323ebb90e 100644
--- a/jdk/make/sun/javazic/tzdata/zone.tab
+++ b/jdk/make/sun/javazic/tzdata/zone.tab
@@ -21,6 +21,9 @@
 # CA 95054 USA or visit www.sun.com if you need additional information or
 # have any questions.
 #
+# <pre>
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
 #
 # TZ zone descriptions
 #
@@ -123,7 +126,7 @@ BR	-0640-06952	America/Eirunepe	W Amazonas
 BR	-0958-06748	America/Rio_Branco	Acre
 BS	+2505-07721	America/Nassau
 BT	+2728+08939	Asia/Thimphu
-BW	-2545+02555	Africa/Gaborone
+BW	-2439+02555	Africa/Gaborone
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
 CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
@@ -307,7 +310,7 @@ MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
 MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
 MZ	-2558+03235	Africa/Maputo
 NA	-2234+01706	Africa/Windhoek
-NC	-2216+16530	Pacific/Noumea
+NC	-2216+16627	Pacific/Noumea
 NE	+1331+00207	Africa/Niamey
 NF	-2903+16758	Pacific/Norfolk
 NG	+0627+00324	Africa/Lagos
@@ -387,7 +390,7 @@ TK	-0922-17114	Pacific/Fakaofo
 TL	-0833+12535	Asia/Dili
 TM	+3757+05823	Asia/Ashgabat
 TN	+3648+01011	Africa/Tunis
-TO	-2110+17510	Pacific/Tongatapu
+TO	-2110-17510	Pacific/Tongatapu
 TR	+4101+02858	Europe/Istanbul
 TT	+1039-06131	America/Port_of_Spain
 TV	-0831+17913	Pacific/Funafuti
@@ -431,7 +434,7 @@ US	+211825-1575130	Pacific/Honolulu	Hawaii
 UY	-3453-05611	America/Montevideo
 UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
 UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
-VA	+4154+01227	Europe/Vatican
+VA	+415408+0122711	Europe/Vatican
 VC	+1309-06114	America/St_Vincent
 VE	+1030-06656	America/Caracas
 VG	+1827-06437	America/Tortola
diff --git a/jdk/make/sun/net/FILES_java.gmk b/jdk/make/sun/net/FILES_java.gmk
index 3d729947667..5082c3d370f 100644
--- a/jdk/make/sun/net/FILES_java.gmk
+++ b/jdk/make/sun/net/FILES_java.gmk
@@ -41,6 +41,7 @@ FILES_java = \
 	sun/net/NetProperties.java \
 	sun/net/NetHooks.java \
 	sun/net/util/IPAddressUtil.java \
+	sun/net/util/URLUtil.java \
 	sun/net/dns/ResolverConfiguration.java \
 	sun/net/dns/ResolverConfigurationImpl.java \
 	sun/net/ftp/FtpClient.java \
diff --git a/jdk/make/sun/security/Makefile b/jdk/make/sun/security/Makefile
index 13394fc2100..2b7cc6b2ab3 100644
--- a/jdk/make/sun/security/Makefile
+++ b/jdk/make/sun/security/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 1996-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 1996-2009 Sun Microsystems, Inc.  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
@@ -60,7 +60,7 @@ ifeq ($(PLATFORM), windows)
   endif
 endif
 
-SUBDIRS = other action util tools jgss krb5 smartcardio $(PKCS11) \
+SUBDIRS = ec other action util tools jgss krb5 smartcardio $(PKCS11) \
           $(JGSS_WRAPPER) $(MSCAPI)
 
 all build clean clobber::
diff --git a/jdk/make/sun/security/ec/FILES_c.gmk b/jdk/make/sun/security/ec/FILES_c.gmk
new file mode 100644
index 00000000000..8a1bd099b38
--- /dev/null
+++ b/jdk/make/sun/security/ec/FILES_c.gmk
@@ -0,0 +1,54 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+FILES_c = \
+	ec.c \
+	ec2_163.c \
+	ec2_193.c \
+	ec2_233.c \
+	ec2_aff.c \
+	ec2_mont.c \
+	ecdecode.c \
+	ecl.c \
+	ecl_curve.c \
+	ecl_gf.c \
+	ecl_mult.c \
+	ec_naf.c \
+	ecp_192.c \
+	ecp_224.c \
+	ecp_256.c \
+	ecp_384.c \
+	ecp_521.c \
+	ecp_aff.c \
+	ecp_jac.c \
+	ecp_jm.c \
+	ecp_mont.c \
+	mp_gf2m.c \
+	mpi.c \
+	mplogic.c \
+	mpmontg.c \
+	oid.c \
+	secitem.c
+
diff --git a/jdk/make/sun/security/ec/Makefile b/jdk/make/sun/security/ec/Makefile
new file mode 100644
index 00000000000..297a2deab08
--- /dev/null
+++ b/jdk/make/sun/security/ec/Makefile
@@ -0,0 +1,319 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+#
+# Makefile for building sunec.jar and sunecc native library.
+#
+# This file was derived from make/com/sun/crypto/provider/Makefile.
+#
+
+#
+# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Sun JDK builds
+# respectively.)
+#
+# JCE builds are very different between OpenJDK and JDK.  The OpenJDK JCE
+# jar files do not require signing, but those for JDK do.  If an unsigned
+# jar file is installed into JDK, things will break when the crypto
+# routines are called.
+#
+# This Makefile does the "real" build of the JCE files.  For OpenJDK,
+# the jar files built here are installed directly into the OpenJDK.
+#
+# For JDK, the binaries use pre-built/pre-signed binary files stored in
+# the closed workspace that are not shipped in the OpenJDK workspaces.
+# We still build the JDK files here to verify the files compile, and in
+# preparation for possible signing.  Developers working on JCE in JDK
+# must sign the JCE files before testing.  The JCE signing key is kept
+# separate from the JDK workspace to prevent its disclosure.
+#
+# SPECIAL NOTE TO JCE/JDK developers:  The source files must eventually
+# be built, signed, and then the resulting jar files MUST BE CHECKED
+# INTO THE CLOSED PART OF THE WORKSPACE*.  This separate step *MUST NOT
+# BE FORGOTTEN*, otherwise a bug fixed in the source code will not be
+# reflected in the shipped binaries.  The "release" target should be
+# used to generate the required files.
+#
+# There are a number of targets to help both JDK/OpenJDK developers.
+#
+# Main Targets (JDK/OPENJDK):
+#
+#     all/clobber/clean		The usual, plus the native libraries.
+#				    If OpenJDK, installs sunec.jar.
+#				    If JDK, installs prebuilt
+#				    sunec.jar.
+#
+#     jar			Builds/installs sunec.jar
+#				    If OpenJDK, does not sign.
+#				    If JDK, tries to sign.
+#
+# Other lesser-used Targets (JDK/OPENJDK):
+#
+#     build-jar			Builds sunec.jar
+#				    (does not sign/install)
+#
+#     install-jar		Alias for "jar" above.
+#
+# Other targets (JDK only):
+#
+#     sign			Alias for sign-jar
+#	  sign-jar		Builds/signs sunec.jar (no install)
+#
+#     release			Builds all targets in preparation
+#				for workspace integration.
+#
+#     install-prebuilt		Installs the pre-built jar files
+#
+# This makefile was written to support parallel target execution.
+#
+
+BUILDDIR = ../../..
+PACKAGE = sun.security.ec
+PRODUCT = sun
+
+#
+# The following is for when we need to do postprocessing
+# (signing) against a read-only build.  If the OUTPUTDIR
+# isn't writable, the build currently crashes out.
+#
+ifndef OPENJDK
+  ifdef ALT_JCE_BUILD_DIR
+    # =====================================================
+    # Where to place the output, in case we're building from a read-only
+    # build area.  (e.g. a release engineering build.)
+    JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR}
+    IGNORE_WRITABLE_OUTPUTDIR_TEST=true
+  else
+    JCE_BUILD_DIR=${TEMPDIR}
+  endif
+endif
+
+include $(BUILDDIR)/common/Defs.gmk
+
+#
+# Location for the newly built classfiles.
+#
+CLASSDESTDIR = $(TEMPDIR)/classes
+
+#
+# Java files
+#
+AUTO_FILES_JAVA_DIRS = $(PKGDIR)
+
+include $(BUILDDIR)/common/Classes.gmk
+
+#
+# Some licensees do not get the native ECC sources, but we still need to
+# be able to build "all" for them.  Check here to see if the sources are
+# available.  If not, then skip them.
+#
+
+NATIVE_ECC_AVAILABLE := $(shell \
+    if [ -d $(SHARE_SRC)/native/$(PKGDIR) ] ; then \
+	$(ECHO) true; \
+    else \
+	$(ECHO) false; \
+    fi)
+
+ifeq ($(NATIVE_ECC_AVAILABLE), true)
+
+  LIBRARY = sunecc
+
+  #
+  # Java files that define native methods
+  #
+  FILES_export = \
+      $(PKGDIR)/ECDHKeyAgreement.java \
+      $(PKGDIR)/ECDSASignature.java \
+      $(PKGDIR)/ECKeyPairGenerator.java
+
+  JAVAHFLAGS += -classpath $(CLASSDESTDIR)
+
+  #
+  # C and C++ files
+  #
+  include FILES_c.gmk
+
+  FILES_cpp = ECC_JNI.cpp
+
+  CPLUSPLUSLIBRARY=true
+
+  FILES_m = mapfile-vers
+
+  #
+  # Find native code
+  #
+  vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
+
+  vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
+
+  #
+  # Find include files
+  #
+  OTHER_INCLUDES += -I$(SHARE_SRC)/native/$(PKGDIR)
+
+  #
+  # Compiler flags
+  #
+  OTHER_CFLAGS += -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B
+
+  #
+  # Libraries to link
+  #
+  ifeq ($(PLATFORM), windows)
+    OTHER_LDLIBS += $(JVMLIB)
+  else
+    OTHER_LDLIBS = -ldl $(JVMLIB) $(LIBCXX)
+  endif
+
+  include $(BUILDDIR)/common/Mapfile-vers.gmk
+
+  include $(BUILDDIR)/common/Library.gmk
+
+endif # NATIVE_ECC_AVAILABLE
+
+#
+# We use a variety of subdirectories in the $(TEMPDIR) depending on what
+# part of the build we're doing.  Both OPENJDK/JDK builds are initially
+# done in the unsigned area.  When files are signed in JDK,
+# they will be placed in the appropriate area.
+#
+UNSIGNED_DIR = $(TEMPDIR)/unsigned
+
+include $(BUILDDIR)/javax/crypto/Defs-jce.gmk
+
+#
+# Rules
+#
+
+ifdef OPENJDK
+all: build-jar install-jar
+else
+all: build-jar install-prebuilt
+	$(build-warning)
+endif
+
+
+# =====================================================
+# Build the unsigned sunec.jar file.
+#
+
+JAR_DESTFILE = $(EXTDIR)/sunec.jar
+
+#
+# Since the -C option to jar is used below, each directory entry must be
+# preceded with the appropriate directory to "cd" into.
+#
+JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS))
+
+build-jar: $(UNSIGNED_DIR)/sunec.jar
+
+#
+# Build sunec.jar.
+#
+$(UNSIGNED_DIR)/sunec.jar: build
+	$(prep-target)
+	$(BOOT_JAR_CMD) cf $@ $(JAR_DIRS) \
+	    $(BOOT_JAR_JFLAGS)
+	@$(java-vm-cleanup)
+
+
+ifndef OPENJDK
+# =====================================================
+# Sign the provider jar file.  Not needed for OpenJDK.
+#
+
+SIGNED_DIR = $(JCE_BUILD_DIR)/signed
+
+sign: sign-jar
+
+sign-jar: $(SIGNED_DIR)/sunec.jar
+
+ifndef ALT_JCE_BUILD_DIR
+$(SIGNED_DIR)/sunec.jar: $(UNSIGNED_DIR)/sunec.jar
+else
+#
+# We have to remove the build dependency, otherwise, we'll try to rebuild it
+# which we can't do on a read-only filesystem.
+#
+$(SIGNED_DIR)/sunec.jar:
+	@if [ ! -r $(UNSIGNED_DIR)/sunec.jar ] ; then \
+	    $(ECHO) "Couldn't find $(UNSIGNED_DIR)/sunec.jar"; \
+	    exit 1; \
+	fi
+endif
+	$(call sign-file, $(UNSIGNED_DIR)/sunec.jar)
+
+
+# =====================================================
+# Create the Release Engineering files.  Signed builds, etc.
+#
+
+release: $(SIGNED_DIR)/sunec.jar
+	$(RM) $(JCE_BUILD_DIR)/release/sunec.jar
+	$(MKDIR) -p $(JCE_BUILD_DIR)/release
+	$(CP) $(SIGNED_DIR)/sunec.jar $(JCE_BUILD_DIR)/release
+	$(release-warning)
+
+endif # OPENJDK
+
+
+# =====================================================
+# Install routines.
+#
+
+#
+# Install sunec.jar, depending on which type is requested.
+#
+install-jar jar: $(JAR_DESTFILE)
+ifndef OPENJDK
+	$(release-warning)
+endif
+
+ifdef OPENJDK
+$(JAR_DESTFILE): $(UNSIGNED_DIR)/sunec.jar
+else
+$(JAR_DESTFILE): $(SIGNED_DIR)/sunec.jar
+endif
+	$(install-file)
+
+ifndef OPENJDK
+install-prebuilt:
+	@$(ECHO) "\n>>>Installing prebuilt SunEC provider..."
+	$(RM) $(JAR_DESTFILE)
+	$(CP) $(PREBUILT_DIR)/ec/sunec.jar $(JAR_DESTFILE)
+endif
+
+
+# =====================================================
+# Support routines.
+#
+
+clobber clean::
+	$(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR)
+
+.PHONY: build-jar jar install-jar
+ifndef OPENJDK
+.PHONY: sign sign-jar release install-prebuilt
+endif
diff --git a/jdk/make/sun/security/ec/mapfile-vers b/jdk/make/sun/security/ec/mapfile-vers
new file mode 100644
index 00000000000..2bda0206608
--- /dev/null
+++ b/jdk/make/sun/security/ec/mapfile-vers
@@ -0,0 +1,37 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# Define public interface.
+
+SUNWprivate_1.1 {
+        global:
+                Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair;
+                Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes;
+		Java_sun_security_ec_ECDSASignature_signDigest;
+		Java_sun_security_ec_ECDSASignature_verifySignedDigest;
+		Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
+        local:
+                *;
+};
diff --git a/jdk/make/sun/security/mscapi/Makefile b/jdk/make/sun/security/mscapi/Makefile
index 08d6609e166..c16d130504f 100644
--- a/jdk/make/sun/security/mscapi/Makefile
+++ b/jdk/make/sun/security/mscapi/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -59,31 +59,31 @@
 #
 # Main Targets (JDK/OPENJDK):
 #
-#     all/clobber/clean		The usual, plus the native libraries.
-#				    If OpenJDK, installs sunmscapi.jar.
-#				    If JDK, installs prebuilt
-#				    sunmscapi.jar.
+#     all/clobber/clean        The usual, plus the native libraries.
+#                                  If OpenJDK, installs sunmscapi.jar.
+#                                  If JDK, installs prebuilt
+#                                      sunmscapi.jar.
 #
-#     jar			Builds/installs sunmscapi.jar
-#				    If OpenJDK, does not sign.
-#				    If JDK, tries to sign.
+#     jar                      Builds/installs sunmscapi.jar
+#                                  If OpenJDK, does not sign.
+#                                  If JDK, tries to sign.
 #
 # Other lesser-used Targets (JDK/OPENJDK):
 #
-#     build-jar			Builds sunmscapi.jar
-#				    (does not sign/install)
+#     build-jar                Builds sunmscapi.jar
+#                                  (does not sign/install)
 #
-#     install-jar		Alias for "jar" above.
+#     install-jar              Alias for "jar" above.
 #
 # Other targets (JDK only):
 #
-#     sign			Alias for sign-jar
-#	  sign-jar		Builds/signs sunmscapi.jar (no install)
+#     sign                     Alias for sign-jar
+#          sign-jar            Builds/signs sunmscapi.jar (no install)
 #
-#     release			Builds all targets in preparation
-#				for workspace integration.
+#     release                  Builds all targets in preparation
+#                              for workspace integration.
 #
-#     install-prebuilt		Installs the pre-built jar files
+#     install-prebuilt         Installs the pre-built jar files
 #
 # This makefile was written to support parallel target execution.
 #
diff --git a/jdk/make/sun/security/other/Makefile b/jdk/make/sun/security/other/Makefile
index 8fea7ce903f..3f120fa473f 100644
--- a/jdk/make/sun/security/other/Makefile
+++ b/jdk/make/sun/security/other/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 1996-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 1996-2009 Sun Microsystems, Inc.  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
@@ -33,7 +33,6 @@ include $(BUILDDIR)/common/Defs.gmk
 #
 AUTO_FILES_JAVA_DIRS = \
     sun/security/acl \
-    sun/security/ec \
     sun/security/jca \
     sun/security/pkcs \
     sun/security/pkcs12 \
diff --git a/jdk/make/sun/security/pkcs11/Makefile b/jdk/make/sun/security/pkcs11/Makefile
index f20910b7ed2..9a4a4089be4 100644
--- a/jdk/make/sun/security/pkcs11/Makefile
+++ b/jdk/make/sun/security/pkcs11/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -59,31 +59,31 @@
 #
 # Main Targets (JDK/OPENJDK):
 #
-#     all/clobber/clean		The usual, plus the native libraries.
-#				    If OpenJDK, installs sunpkcs11.jar.
-#				    If JDK, installs prebuilt
-#				    sunpkcs11.jar.
+#     all/clobber/clean        The usual, plus the native libraries.
+#                                  If OpenJDK, installs sunpkcs11.jar.
+#                                  If JDK, installs prebuilt
+#                                      sunpkcs11.jar.
 #
-#     jar			Builds/installs sunpkcs11.jar
-#				    If OpenJDK, does not sign.
-#				    If JDK, tries to sign.
+#     jar                      Builds/installs sunpkcs11.jar
+#                                  If OpenJDK, does not sign.
+#                                  If JDK, tries to sign.
 #
 # Other lesser-used Targets (JDK/OPENJDK):
 #
-#     build-jar			Builds sunpkcs11.jar
-#				    (does not sign/install)
+#     build-jar                Builds sunpkcs11.jar
+#                                  (does not sign/install)
 #
-#     install-jar		Alias for "jar" above.
+#     install-jar              Alias for "jar" above.
 #
 # Other targets (JDK only):
 #
-#     sign			Alias for sign-jar
-#	  sign-jar		Builds/signs sunpkcs11.jar (no install)
+#     sign                     Alias for sign-jar
+#          sign-jar            Builds/signs sunpkcs11.jar (no install)
 #
-#     release			Builds all targets in preparation
-#				for workspace integration.
+#     release                  Builds all targets in preparation
+#                              for workspace integration.
 #
-#     install-prebuilt		Installs the pre-built jar files
+#     install-prebuilt         Installs the pre-built jar files
 #
 # This makefile was written to support parallel target execution.
 #
diff --git a/jdk/make/sun/splashscreen/FILES_c.gmk b/jdk/make/sun/splashscreen/FILES_c.gmk
index a22e189507e..132e02548ff 100644
--- a/jdk/make/sun/splashscreen/FILES_c.gmk
+++ b/jdk/make/sun/splashscreen/FILES_c.gmk
@@ -52,12 +52,10 @@ FILES_c = \
 	compress.c \
 	deflate.c \
 	gzio.c \
-	infblock.c \
-	infcodes.c \
+	infback.c \
 	inffast.c \
 	inflate.c \
 	inftrees.c \
-	infutil.c \
 	trees.c \
 	uncompr.c \
 	zadler32.c \
diff --git a/jdk/make/sun/splashscreen/Makefile b/jdk/make/sun/splashscreen/Makefile
index 0df06e4482e..305df2fc2e0 100644
--- a/jdk/make/sun/splashscreen/Makefile
+++ b/jdk/make/sun/splashscreen/Makefile
@@ -77,13 +77,13 @@ endif # PLATFORM
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
-vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/libpng
 vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
 vpath %.c   $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
 
 CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 
 # Shun the less than portable MMX assembly code in pnggccrd.c,
 # and use alternative implementations in C.
diff --git a/jdk/make/tools/CharsetMapping/IBM420.c2b b/jdk/make/tools/CharsetMapping/IBM420.c2b
index 6cb38028124..7e0c201b41b 100644
--- a/jdk/make/tools/CharsetMapping/IBM420.c2b
+++ b/jdk/make/tools/CharsetMapping/IBM420.c2b
@@ -1 +1,187 @@
-0x15	U+0085
+#
+#  The diff of 01A434B0.TXMAP110 and 34B001A4.RXMAP110
+#
+#  Added: 0x15    U+0085
+#
+0x15    U+0085
+0x42    U+FE7C
+0x46    U+FE80
+0x47    U+FE81
+0x49    U+FE83
+0x4B    U+066C
+0x4B    U+FF0E
+0x4C    U+FF1C
+0x4D    U+FF08
+0x4E    U+FF0B
+0x4F    U+FF5C
+0x50    U+FF06
+0x52    U+FE85
+0x52    U+FE86
+0x55    U+FE89
+0x55    U+FE8A
+0x55    U+FE8B
+0x55    U+FE8C
+0x56    U+0625
+0x56    U+FE87
+0x56    U+FE8D
+0x57    U+FE88
+0x58    U+FE8F
+0x58    U+FE90
+0x59    U+FE92
+0x5A    U+FF01
+0x5B    U+FF04
+0x5C    U+066D
+0x5C    U+FF0A
+0x5D    U+FF09
+0x5E    U+FF1B
+0x60    U+FF0D
+0x61    U+FF0F
+0x62    U+FE93
+0x62    U+FE94
+0x63    U+FE95
+0x63    U+FE96
+0x64    U+FE98
+0x65    U+FE99
+0x65    U+FE9A
+0x66    U+FE9C
+0x67    U+FE9D
+0x67    U+FE9E
+0x68    U+FEA0
+0x69    U+FEA1
+0x69    U+FEA2
+0x6B    U+066B
+0x6B    U+FF0C
+0x6C    U+066A
+0x6C    U+FF05
+0x6D    U+FF3F
+0x6E    U+FF1E
+0x6F    U+FF1F
+0x70    U+FEA4
+0x71    U+FEA5
+0x71    U+FEA6
+0x72    U+FEA8
+0x73    U+FEA9
+0x73    U+FEAA
+0x74    U+FEAB
+0x74    U+FEAC
+0x75    U+FEAD
+0x75    U+FEAE
+0x76    U+FEAF
+0x76    U+FEB0
+0x77    U+FEB1
+0x77    U+FEB2
+0x78    U+FEB4
+0x7A    U+FF1A
+0x7B    U+FF03
+0x7C    U+FF20
+0x7D    U+FF07
+0x7E    U+FF1D
+0x7F    U+FF02
+0x80    U+FEB5
+0x80    U+FEB6
+0x81    U+FF41
+0x82    U+FF42
+0x83    U+FF43
+0x84    U+FF44
+0x85    U+FF45
+0x86    U+FF46
+0x87    U+FF47
+0x88    U+FF48
+0x89    U+FF49
+0x8A    U+FEB8
+0x8B    U+FEB9
+0x8B    U+FEBA
+0x8C    U+FEBC
+0x8D    U+FEBD
+0x8D    U+FEBE
+0x8E    U+FEC0
+0x8F    U+FEC1
+0x8F    U+FEC2
+0x8F    U+FEC3
+0x8F    U+FEC4
+0x90    U+FEC5
+0x90    U+FEC6
+0x90    U+FEC7
+0x90    U+FEC8
+0x91    U+FF4A
+0x92    U+FF4B
+0x93    U+FF4C
+0x94    U+FF4D
+0x95    U+FF4E
+0x96    U+FF4F
+0x97    U+FF50
+0x98    U+FF51
+0x99    U+FF52
+0x9A    U+FEC9
+0x9E    U+FECD
+0xA2    U+FF53
+0xA3    U+FF54
+0xA4    U+FF55
+0xA5    U+FF56
+0xA6    U+FF57
+0xA7    U+FF58
+0xA8    U+FF59
+0xA9    U+FF5A
+0xAB    U+FED1
+0xAB    U+FED2
+0xAC    U+FED4
+0xAD    U+FED5
+0xAD    U+FED6
+0xAE    U+FED8
+0xAF    U+FED9
+0xAF    U+FEDA
+0xB0    U+FEDC
+0xB1    U+FEDD
+0xB1    U+FEDE
+0xB8    U+FEF9
+0xB9    U+FEFA
+0xBA    U+FEE0
+0xBB    U+FEE1
+0xBB    U+FEE2
+0xBC    U+FEE4
+0xBD    U+FEE5
+0xBD    U+FEE6
+0xBE    U+FEE8
+0xBF    U+FEE9
+0xBF    U+FEEA
+0xC1    U+FF21
+0xC2    U+FF22
+0xC3    U+FF23
+0xC4    U+FF24
+0xC5    U+FF25
+0xC6    U+FF26
+0xC7    U+FF27
+0xC8    U+FF28
+0xC9    U+FF29
+0xCF    U+FEED
+0xCF    U+FEEE
+0xD1    U+FF2A
+0xD2    U+FF2B
+0xD3    U+FF2C
+0xD4    U+FF2D
+0xD5    U+FF2E
+0xD6    U+FF2F
+0xD7    U+FF30
+0xD8    U+FF31
+0xD9    U+FF32
+0xDA    U+FEEF
+0xDC    U+FEF1
+0xDE    U+FEF4
+0xE2    U+FF33
+0xE3    U+FF34
+0xE4    U+FF35
+0xE5    U+FF36
+0xE6    U+FF37
+0xE7    U+FF38
+0xE8    U+FF39
+0xE9    U+FF3A
+0xF0    U+FF10
+0xF1    U+FF11
+0xF2    U+FF12
+0xF3    U+FF13
+0xF4    U+FF14
+0xF5    U+FF15
+0xF6    U+FF16
+0xF7    U+FF17
+0xF8    U+FF18
+0xF9    U+FF19
diff --git a/jdk/make/tools/CharsetMapping/IBM420.map b/jdk/make/tools/CharsetMapping/IBM420.map
index d4ce19249b3..f4f78533d27 100644
--- a/jdk/make/tools/CharsetMapping/IBM420.map
+++ b/jdk/make/tools/CharsetMapping/IBM420.map
@@ -1,257 +1,253 @@
-#Generated from IBM420.java
-0x00	U+0000
-0x01	U+0001
-0x02	U+0002
-0x03	U+0003
-0x04	U+009c
-0x05	U+0009
-0x06	U+0086
-0x07	U+007f
-0x08	U+0097
-0x09	U+008d
-0x0a	U+008e
-0x0b	U+000b
-0x0c	U+000c
-0x0d	U+000d
-0x0e	U+000e
-0x0f	U+000f
-0x10	U+0010
-0x11	U+0011
-0x12	U+0012
-0x13	U+0013
-0x14	U+009d
-0x15	U+000a
-0x16	U+0008
-0x17	U+0087
-0x18	U+0018
-0x19	U+0019
-0x1a	U+0092
-0x1b	U+008f
-0x1c	U+001c
-0x1d	U+001d
-0x1e	U+001e
-0x1f	U+001f
-0x20	U+0080
-0x21	U+0081
-0x22	U+0082
-0x23	U+0083
-0x24	U+0084
-0x25	U+000a
-0x26	U+0017
-0x27	U+001b
-0x28	U+0088
-0x29	U+0089
-0x2a	U+008a
-0x2b	U+008b
-0x2c	U+008c
-0x2d	U+0005
-0x2e	U+0006
-0x2f	U+0007
-0x30	U+0090
-0x31	U+0091
-0x32	U+0016
-0x33	U+0093
-0x34	U+0094
-0x35	U+0095
-0x36	U+0096
-0x37	U+0004
-0x38	U+0098
-0x39	U+0099
-0x3a	U+009a
-0x3b	U+009b
-0x3c	U+0014
-0x3d	U+0015
-0x3e	U+009e
-0x3f	U+001a
-0x40	U+0020
-0x41	U+00a0
-0x42	U+fe7c
-0x43	U+fe7d
-0x44	U+0640
-0x45	U+f8fc
-0x46	U+fe80
-0x47	U+fe81
-0x48	U+fe82
-0x49	U+fe83
-0x4a	U+00a2
-0x4b	U+002e
-0x4c	U+003c
-0x4d	U+0028
-0x4e	U+002b
-0x4f	U+007c
-0x50	U+0026
-0x51	U+fe84
-0x52	U+fe85
-0x53	U+fffd
-0x54	U+fffd
-0x55	U+fe8b
-0x56	U+fe8d
-0x57	U+fe8e
-0x58	U+fe8f
-0x59	U+fe91
-0x5a	U+0021
-0x5b	U+0024
-0x5c	U+002a
-0x5d	U+0029
-0x5e	U+003b
-0x5f	U+00ac
-0x60	U+002d
-0x61	U+002f
-0x62	U+fe93
-0x63	U+fe95
-0x64	U+fe97
-0x65	U+fe99
-0x66	U+fe9b
-0x67	U+fe9d
-0x68	U+fe9f
-0x69	U+fea1
-0x6a	U+00a6
-0x6b	U+002c
-0x6c	U+0025
-0x6d	U+005f
-0x6e	U+003e
-0x6f	U+003f
-0x70	U+fea3
-0x71	U+fea5
-0x72	U+fea7
-0x73	U+fea9
-0x74	U+feab
-0x75	U+fead
-0x76	U+feaf
-0x77	U+f8f6
-0x78	U+feb3
-0x79	U+060c
-0x7a	U+003a
-0x7b	U+0023
-0x7c	U+0040
-0x7d	U+0027
-0x7e	U+003d
-0x7f	U+0022
-0x80	U+f8f5
-0x81	U+0061
-0x82	U+0062
-0x83	U+0063
-0x84	U+0064
-0x85	U+0065
-0x86	U+0066
-0x87	U+0067
-0x88	U+0068
-0x89	U+0069
-0x8a	U+feb7
-0x8b	U+f8f4
-0x8c	U+febb
-0x8d	U+f8f7
-0x8e	U+febf
-0x8f	U+fec3
-0x90	U+fec7
-0x91	U+006a
-0x92	U+006b
-0x93	U+006c
-0x94	U+006d
-0x95	U+006e
-0x96	U+006f
-0x97	U+0070
-0x98	U+0071
-0x99	U+0072
-0x9a	U+fec9
-0x9b	U+feca
-0x9c	U+fecb
-0x9d	U+fecc
-0x9e	U+fecd
-0x9f	U+fece
-0xa0	U+fecf
-0xa1	U+00f7
-0xa2	U+0073
-0xa3	U+0074
-0xa4	U+0075
-0xa5	U+0076
-0xa6	U+0077
-0xa7	U+0078
-0xa8	U+0079
-0xa9	U+007a
-0xaa	U+fed0
-0xab	U+fed1
-0xac	U+fed3
-0xad	U+fed5
-0xae	U+fed7
-0xaf	U+fed9
-0xb0	U+fedb
-0xb1	U+fedd
-0xb2	U+fef5
-0xb3	U+fef6
-0xb4	U+fef7
-0xb5	U+fef8
-0xb6	U+fffd
-0xb7	U+fffd
-0xb8	U+fefb
-0xb9	U+fefc
-0xba	U+fedf
-0xbb	U+fee1
-0xbc	U+fee3
-0xbd	U+fee5
-0xbe	U+fee7
-0xbf	U+fee9
-0xc0	U+061b
-0xc1	U+0041
-0xc2	U+0042
-0xc3	U+0043
-0xc4	U+0044
-0xc5	U+0045
-0xc6	U+0046
-0xc7	U+0047
-0xc8	U+0048
-0xc9	U+0049
-0xca	U+00ad
-0xcb	U+feeb
-0xcc	U+fffd
-0xcd	U+feec
-0xce	U+fffd
-0xcf	U+feed
-0xd0	U+061f
-0xd1	U+004a
-0xd2	U+004b
-0xd3	U+004c
-0xd4	U+004d
-0xd5	U+004e
-0xd6	U+004f
-0xd7	U+0050
-0xd8	U+0051
-0xd9	U+0052
-0xda	U+feef
-0xdb	U+fef0
-0xdc	U+fef1
-0xdd	U+fef2
-0xde	U+fef3
-0xdf	U+0660
-0xe0	U+00d7
-0xe1	U+2007
-0xe2	U+0053
-0xe3	U+0054
-0xe4	U+0055
-0xe5	U+0056
-0xe6	U+0057
-0xe7	U+0058
-0xe8	U+0059
-0xe9	U+005a
-0xea	U+0661
-0xeb	U+0662
-0xec	U+fffd
-0xed	U+0663
-0xee	U+0664
-0xef	U+0665
-0xf0	U+0030
-0xf1	U+0031
-0xf2	U+0032
-0xf3	U+0033
-0xf4	U+0034
-0xf5	U+0035
-0xf6	U+0036
-0xf7	U+0037
-0xf8	U+0038
-0xf9	U+0039
-0xfa	U+fffd
-0xfb	U+0666
-0xfc	U+0667
-0xfd	U+0668
-0xfe	U+0669
-0xff	U+009f
+#
+#  Frm IBMCDC datatable 01A434B0.TXMAP110
+#
+#  Changed
+#  0x15    U+0085  ->  0x15    U+000a
+#
+0x00    U+0000
+0x01    U+0001
+0x02    U+0002
+0x03    U+0003
+0x04    U+009C
+0x05    U+0009
+0x06    U+0086
+0x07    U+007F
+0x08    U+0097
+0x09    U+008D
+0x0A    U+008E
+0x0B    U+000B
+0x0C    U+000C
+0x0D    U+000D
+0x0E    U+000E
+0x0F    U+000F
+0x10    U+0010
+0x11    U+0011
+0x12    U+0012
+0x13    U+0013
+0x14    U+009D
+0x15    U+000A
+0x16    U+0008
+0x17    U+0087
+0x18    U+0018
+0x19    U+0019
+0x1A    U+0092
+0x1B    U+008F
+0x1C    U+001C
+0x1D    U+001D
+0x1E    U+001E
+0x1F    U+001F
+0x20    U+0080
+0x21    U+0081
+0x22    U+0082
+0x23    U+0083
+0x24    U+0084
+0x25    U+000A
+0x26    U+0017
+0x27    U+001B
+0x28    U+0088
+0x29    U+0089
+0x2A    U+008A
+0x2B    U+008B
+0x2C    U+008C
+0x2D    U+0005
+0x2E    U+0006
+0x2F    U+0007
+0x30    U+0090
+0x31    U+0091
+0x32    U+0016
+0x33    U+0093
+0x34    U+0094
+0x35    U+0095
+0x36    U+0096
+0x37    U+0004
+0x38    U+0098
+0x39    U+0099
+0x3A    U+009A
+0x3B    U+009B
+0x3C    U+0014
+0x3D    U+0015
+0x3E    U+009E
+0x3F    U+001A
+0x40    U+0020
+0x41    U+00A0
+0x42    U+0651
+0x43    U+FE7D
+0x44    U+0640
+0x45    U+200B
+0x46    U+0621
+0x47    U+0622
+0x48    U+FE82
+0x49    U+0623
+0x4A    U+00A2
+0x4B    U+002E
+0x4C    U+003C
+0x4D    U+0028
+0x4E    U+002B
+0x4F    U+007C
+0x50    U+0026
+0x51    U+FE84
+0x52    U+0624
+0x55    U+0626
+0x56    U+0627
+0x57    U+FE8E
+0x58    U+0628
+0x59    U+FE91
+0x5A    U+0021
+0x5B    U+0024
+0x5C    U+002A
+0x5D    U+0029
+0x5E    U+003B
+0x5F    U+00AC
+0x60    U+002D
+0x61    U+002F
+0x62    U+0629
+0x63    U+062A
+0x64    U+FE97
+0x65    U+062B
+0x66    U+FE9B
+0x67    U+062C
+0x68    U+FE9F
+0x69    U+062D
+0x6A    U+00A6
+0x6B    U+002C
+0x6C    U+0025
+0x6D    U+005F
+0x6E    U+003E
+0x6F    U+003F
+0x70    U+FEA3
+0x71    U+062E
+0x72    U+FEA7
+0x73    U+062F
+0x74    U+0630
+0x75    U+0631
+0x76    U+0632
+0x77    U+0633
+0x78    U+FEB3
+0x79    U+060C
+0x7A    U+003A
+0x7B    U+0023
+0x7C    U+0040
+0x7D    U+0027
+0x7E    U+003D
+0x7F    U+0022
+0x80    U+0634
+0x81    U+0061
+0x82    U+0062
+0x83    U+0063
+0x84    U+0064
+0x85    U+0065
+0x86    U+0066
+0x87    U+0067
+0x88    U+0068
+0x89    U+0069
+0x8A    U+FEB7
+0x8B    U+0635
+0x8C    U+FEBB
+0x8D    U+0636
+0x8E    U+FEBF
+0x8F    U+0637
+0x90    U+0638
+0x91    U+006A
+0x92    U+006B
+0x93    U+006C
+0x94    U+006D
+0x95    U+006E
+0x96    U+006F
+0x97    U+0070
+0x98    U+0071
+0x99    U+0072
+0x9A    U+0639
+0x9B    U+FECA
+0x9C    U+FECB
+0x9D    U+FECC
+0x9E    U+063A
+0x9F    U+FECE
+0xA0    U+FECF
+0xA1    U+00F7
+0xA2    U+0073
+0xA3    U+0074
+0xA4    U+0075
+0xA5    U+0076
+0xA6    U+0077
+0xA7    U+0078
+0xA8    U+0079
+0xA9    U+007A
+0xAA    U+FED0
+0xAB    U+0641
+0xAC    U+FED3
+0xAD    U+0642
+0xAE    U+FED7
+0xAF    U+0643
+0xB0    U+FEDB
+0xB1    U+0644
+0xB2    U+FEF5
+0xB3    U+FEF6
+0xB4    U+FEF7
+0xB5    U+FEF8
+0xB8    U+FEFB
+0xB9    U+FEFC
+0xBA    U+FEDF
+0xBB    U+0645
+0xBC    U+FEE3
+0xBD    U+0646
+0xBE    U+FEE7
+0xBF    U+0647
+0xC0    U+061B
+0xC1    U+0041
+0xC2    U+0042
+0xC3    U+0043
+0xC4    U+0044
+0xC5    U+0045
+0xC6    U+0046
+0xC7    U+0047
+0xC8    U+0048
+0xC9    U+0049
+0xCA    U+00AD
+0xCB    U+FEEB
+0xCD    U+FEEC
+0xCF    U+0648
+0xD0    U+061F
+0xD1    U+004A
+0xD2    U+004B
+0xD3    U+004C
+0xD4    U+004D
+0xD5    U+004E
+0xD6    U+004F
+0xD7    U+0050
+0xD8    U+0051
+0xD9    U+0052
+0xDA    U+0649
+0xDB    U+FEF0
+0xDC    U+064A
+0xDD    U+FEF2
+0xDE    U+FEF3
+0xDF    U+0660
+0xE0    U+00D7
+0xE2    U+0053
+0xE3    U+0054
+0xE4    U+0055
+0xE5    U+0056
+0xE6    U+0057
+0xE7    U+0058
+0xE8    U+0059
+0xE9    U+005A
+0xEA    U+0661
+0xEB    U+0662
+0xED    U+0663
+0xEE    U+0664
+0xEF    U+0665
+0xF0    U+0030
+0xF1    U+0031
+0xF2    U+0032
+0xF3    U+0033
+0xF4    U+0034
+0xF5    U+0035
+0xF6    U+0036
+0xF7    U+0037
+0xF8    U+0038
+0xF9    U+0039
+0xFB    U+0666
+0xFC    U+0667
+0xFD    U+0668
+0xFE    U+0669
+0xFF    U+009F
diff --git a/jdk/make/tools/CharsetMapping/IBM420.nr b/jdk/make/tools/CharsetMapping/IBM420.nr
index 675451906d4..c3d93ee4774 100644
--- a/jdk/make/tools/CharsetMapping/IBM420.nr
+++ b/jdk/make/tools/CharsetMapping/IBM420.nr
@@ -1 +1 @@
-0x25	U+000a
+0x25    U+000a
diff --git a/jdk/make/tools/Makefile b/jdk/make/tools/Makefile
index badfa687a31..1fffa1bcaeb 100644
--- a/jdk/make/tools/Makefile
+++ b/jdk/make/tools/Makefile
@@ -54,7 +54,7 @@ SUBDIRS =                   \
   CharsetMapping
 
 ifndef DISABLE_NIMBUS
-  SUBDIRS += swing-nimbus
+  SUBDIRS += generate_nimbus
 endif
 
 all build clean clobber::
diff --git a/jdk/make/tools/freetypecheck/Makefile b/jdk/make/tools/freetypecheck/Makefile
index 94c983565ac..23161969558 100644
--- a/jdk/make/tools/freetypecheck/Makefile
+++ b/jdk/make/tools/freetypecheck/Makefile
@@ -28,16 +28,21 @@ BUILDDIR = ../..
 include $(BUILDDIR)/common/Defs.gmk
 
 # Default name
-FT_TEST = $(BUILDTOOLBINDIR)/freetype_versioncheck$(EXE_SUFFIX)
+PROGRAM = freetype_versioncheck
+FT_OBJ = $(BUILDTOOLBINDIR)/$(PROGRAM).$(OBJECT_SUFFIX)
+FT_TEST = $(BUILDTOOLBINDIR)/$(PROGRAM)$(EXE_SUFFIX)
 
 # Used on openjdk only
 ifeq ($(OPENJDK),true)
 
 # Start with CFLAGS (which gets us the required -xarch setting on solaris)
 ifeq ($(PLATFORM), windows)
-  FT_OPTIONS  = /nologo $(CC_OBJECT_OUTPUT_FLAG)$(TEMPDIR)
+  FT_OPTIONS  = /nologo /c
   FREETYPE_DLL = $(FREETYPE_LIB_PATH)/freetype.dll
   FT_LD_OPTIONS  = $(FREETYPE_LIB_PATH)/freetype.lib
+ifdef MT
+  FT_LD_OPTIONS += /manifest
+endif
 else
   FT_OPTIONS  = $(CFLAGS)
   FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH)
@@ -55,15 +60,22 @@ FT_LD_OPTIONS += $(LFLAGS_$(COMPILER_VERSION))
 
 # Create test program
 all: $(FT_TEST)
-	@$(FT_TEST)
+	$(FT_TEST)
 
 # On windows we need to copy dll to test dir to ensure it will be found
 #   at runtime
 $(FT_TEST): freetypecheck.c
-	@$(prep-target)
-	@$(CC) $(FT_OPTIONS) $(CC_PROGRAM_OUTPUT_FLAG)$@ $< $(FT_LD_OPTIONS)
+	$(prep-target)
 ifeq ($(PLATFORM), windows)
-	@$(CP) $(FREETYPE_DLL) `dirname $@`
+	$(CC) $(FT_OPTIONS) $(CC_OBJECT_OUTPUT_FLAG)$(FT_OBJ) $<
+	$(LINK) $(FT_LD_OPTIONS) /OUT:$(FT_TEST) $(FT_OBJ)
+	$(CP) $(FREETYPE_DLL) $(@D)/
+ifdef MT
+	$(CP) $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) $(@D)/
+	$(MT) /manifest $(FT_TEST).manifest /outputresource:$(FT_TEST);#1
+endif
+else
+	@$(CC) $(FT_OPTIONS) $(CC_PROGRAM_OUTPUT_FLAG)$@ $< $(FT_LD_OPTIONS)
 endif
 
 else
diff --git a/jdk/make/tools/freetypecheck/freetypecheck.c b/jdk/make/tools/freetypecheck/freetypecheck.c
index 3f900a840a9..71d32022bee 100644
--- a/jdk/make/tools/freetypecheck/freetypecheck.c
+++ b/jdk/make/tools/freetypecheck/freetypecheck.c
@@ -32,6 +32,45 @@
 #include "ft2build.h"
 #include FT_FREETYPE_H
 
+#ifdef _MSC_VER
+#if _MSC_VER > 1400
+
+/*
+ * When building for Microsoft Windows, your program has a dependency
+ * on msvcr??.dll.
+ *
+ * When using Visual Studio 2005 or later, that must be recorded in
+ * the <program>.exe.manifest file.
+ *
+ * Reference:
+ *     C:/Program Files/Microsoft SDKs/Windows/v6.1/include/crtdefs.h
+ */
+#include <crtassem.h>
+#ifdef _M_IX86
+
+#pragma comment(linker,"/manifestdependency:\"type='win32' "            \
+        "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' "              \
+        "version='" _CRT_ASSEMBLY_VERSION "' "                          \
+        "processorArchitecture='x86' "                                  \
+        "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+
+#endif /* _M_IX86 */
+
+//This may not be necessary yet for the Windows 64-bit build, but it
+//will be when that build environment is updated.  Need to test to see
+//if it is harmless:
+#ifdef _M_AMD64
+
+#pragma comment(linker,"/manifestdependency:\"type='win32' "            \
+        "name='" __LIBRARIES_ASSEMBLY_NAME_PREFIX ".CRT' "              \
+        "version='" _CRT_ASSEMBLY_VERSION "' "                          \
+        "processorArchitecture='amd64' "                                \
+        "publicKeyToken='" _VC_ASSEMBLY_PUBLICKEYTOKEN "'\"")
+
+#endif  /* _M_AMD64 */
+#endif  /* _MSC_VER > 1400 */
+#endif  /* _MSC_VER */
+
 #define QUOTEMACRO(x) QUOTEME(x)
 #define QUOTEME(x) #x
 
diff --git a/jdk/make/javax/swing/plaf/nimbus/Makefile b/jdk/make/tools/generate_nimbus/Makefile
similarity index 53%
rename from jdk/make/javax/swing/plaf/nimbus/Makefile
rename to jdk/make/tools/generate_nimbus/Makefile
index ed59f137e53..ed531e5c841 100644
--- a/jdk/make/javax/swing/plaf/nimbus/Makefile
+++ b/jdk/make/tools/generate_nimbus/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 1998-2005 Sun Microsystems, Inc.  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
@@ -23,38 +23,50 @@
 # have any questions.
 #
 
-BUILDDIR  = ../../../..
-PACKAGE   = javax.swing.plaf.nimbus
-PRODUCT   = com
-SWING_SRC = $(SHARE_SRC)/classes/javax/swing
+#
+# Makefile for building the Nimbus generator
+#
+
+BUILDDIR = ../..
+PACKAGE = build.tools.generatenimbus
+PRODUCT = tools
+PROGRAM = generatenimbus
 include $(BUILDDIR)/common/Defs.gmk
 
+BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
+BUILDTOOL_MAIN        = $(PKGDIR)/Generator.java
+
+
 #
 # Files
 #
-NIMBUS_PKG = javax/swing/plaf/nimbus
-NIMBUS_COMPAT_PKG = com/sun/java/swing/plaf/nimbus
-NIMBUS_GENSRC_DIR = $(GENSRCDIR)/$(NIMBUS_PKG)
-NIMBUS_SKIN_FILE = $(SHARE_SRC)/classes/$(NIMBUS_PKG)/skin.laf
-NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR)/nimbus_generator.jar
 
-AUTO_FILES_JAVA_DIRS = $(NIMBUS_PKG) $(NIMBUS_COMPAT_PKG)
+SOURCE_FILES    = Generator.java \
+                  ObjectFactory.java \
+                  Paint.java \
+                  SynthModel.java \
+                  UIDefault.java \
+                  UIStyle.java
+TEMPLATE_FILES  = Defaults.template \
+                  PainterImpl.template \
+                  StateImpl.template
+TEMPLATE_DEST   = $(BUILDTOOLCLASSDIR)/$(PKGDIR)/resources
 
 
 #
 # Rules
 #
-CLASSES_INIT = $(NIMBUS_GENSRC_DIR)
 
-include $(BUILDDIR)/common/Classes.gmk
+all: $(TEMPLATE_DEST) $(BUILDTOOL_JAR_FILE)
 
-$(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(NIMBUS_GENERATOR_JAR)
-	@$(ECHO) "Generating Nimbus source files:"
-	$(BOOT_JAVA_CMD) -jar $(NIMBUS_GENERATOR_JAR) \
-	    -skinFile $(NIMBUS_SKIN_FILE) \
-	    -buildDir $(GENSRCDIR) -srcDir $(GENSRCDIR) \
-	    -packagePrefix $(PACKAGE) -lafName Nimbus
-	@$(ECHO) "Finished generating Nimbus source files"
+include $(BUILDDIR)/common/BuildToolJar.gmk
+
+$(TEMPLATE_DEST): $(TEMPLATE_FILES:%=$(SHARE_SRC)/classes/javax/swing/plaf/nimbus/%)
+	$(MKDIR) -p $@
+	$(RM) $(TEMPLATE_FILES:%=$@/%)
+	$(CP) $^ $@
+
+BUILDTOOL_MAIN_SOURCE_FILE = $(SOURCE_FILES:%=$(BUILDTOOL_SOURCE_ROOT)/$(PKGDIR)/%)
 
 clean clobber::
-	$(RM) -r $(NIMBUS_GENSRC_DIR)
+	$(RM) -r $(TEMPLATE_DEST)
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java b/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
index 5d791d51591..8a57a6521bc 100644
--- a/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
+++ b/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
@@ -26,6 +26,7 @@
 package build.tools.charsetmapping;
 
 import java.io.*;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Scanner;
 import java.util.Formatter;
@@ -54,33 +55,19 @@ public class GenerateSBCS {
             String pkgName  = fields[4];
             System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
 
-            StringBuilder b2c = new StringBuilder();
-            int c2bLen = genB2C(
-                new FileInputStream(new File(args[0], clzName+".map")), b2c);
-
-            String b2cNR = null;
-            File nrF = new File(args[0], clzName+".nr");
-            if (nrF.exists()) {
-                b2cNR = genNR(new FileInputStream(nrF));
-            }
-
-            String c2bNR = null;
-            File c2bF = new File(args[0], clzName+".c2b");
-            if (c2bF.exists()) {
-                c2bNR = genC2BNR(new FileInputStream(c2bF));
-            }
-
-            genSBCSClass(args[0], args[1], "SingleByte-X.java",
-                         clzName, csName, hisName, pkgName, isASCII,
-                         b2c.toString(), b2cNR, c2bNR, c2bLen);
+            genClass(args[0], args[1], "SingleByte-X.java",
+                     clzName, csName, hisName, pkgName, isASCII);
         }
     }
 
     private static void toString(char[] sb, int off, int end,
-                                 Formatter out, String closure) {
+                                 Formatter out, String closure,
+                                 boolean comment) {
         while (off < end) {
             out.format("        \"");
             for (int j = 0; j < 8; j++) {
+                if (off == end)
+                    break;
                 char c = sb[off++];
                 switch (c) {
                 case '\b':
@@ -103,101 +90,124 @@ public class GenerateSBCS {
                     out.format("\\u%04X", c & 0xffff);
                 }
             }
-            if (off == end)
-               out.format("\" %s      // 0x%02x - 0x%02x%n", closure, off-8, off-1);
-            else
-               out.format("\" +      // 0x%02x - 0x%02x%n", off-8, off-1);
+            if (comment) {
+                if (off == end)
+                    out.format("\" %s      // 0x%02x - 0x%02x%n",
+                               closure, off-8, off-1);
+                else
+                    out.format("\" +      // 0x%02x - 0x%02x%n",
+                               off-8, off-1);
+            } else {
+                if (off == end)
+                    out.format("\"%s%n", closure);
+                else
+                    out.format("\" +%n");
+            }
         }
     }
 
     static Pattern sbmap = Pattern.compile("0x(\\p{XDigit}++)\\s++U\\+(\\p{XDigit}++)(\\s++#.*)?");
-    private static int genB2C(InputStream in, StringBuilder out)
+
+    private static void genClass(String srcDir, String dstDir,
+                                 String template,
+                                 String clzName,
+                                 String csName,
+                                 String hisName,
+                                 String pkgName,
+                                 boolean isASCII)
         throws Exception
     {
+        StringBuilder b2cSB = new StringBuilder();
+        StringBuilder b2cNRSB = new StringBuilder();
+        StringBuilder c2bNRSB = new StringBuilder();
+
         char[] sb = new char[0x100];
-        int[] indexC2B = new int[0x100];
+        char[] c2bIndex = new char[0x100];
+        int    c2bOff = 0;
+        Arrays.fill(sb, UNMAPPABLE_DECODING);
+        Arrays.fill(c2bIndex, UNMAPPABLE_DECODING);
 
-        for (int i = 0; i < sb.length; i++)
-            sb[i] = UNMAPPABLE_DECODING;
-
-        // parse the b2c mapping table
+        // (1)read in .map to parse all b->c entries
+        FileInputStream in = new FileInputStream(
+                                 new File(srcDir, clzName + ".map"));
         Parser p = new Parser(in, sbmap);
         Entry  e = null;
-        int    off = 0;
+
         while ((e = p.next()) != null) {
             sb[e.bs] = (char)e.cp;
-            if (indexC2B[e.cp>>8] == 0) {
-                off += 0x100;
-                indexC2B[e.cp>>8] = 1;
+            if (c2bIndex[e.cp>>8] == UNMAPPABLE_DECODING) {
+                c2bOff += 0x100;
+                c2bIndex[e.cp>>8] = 1;
             }
         }
 
-        Formatter fm = new Formatter(out);
+        Formatter fm = new Formatter(b2cSB);
         fm.format("%n");
 
         // vm -server shows cc[byte + 128] access is much faster than
         // cc[byte&0xff] so we output the upper segment first
-        toString(sb, 0x80, 0x100, fm, "+");
-        toString(sb, 0x00, 0x80,  fm, ";");
-
+        toString(sb, 0x80, 0x100, fm, "+", true);
+        toString(sb, 0x00, 0x80,  fm, ";", true);
         fm.close();
-        return off;
-    }
 
-    // generate non-roundtrip entries from xxx.nr file
-    private static String genNR(InputStream in) throws Exception
-    {
-        StringBuilder sb = new StringBuilder();
-        Formatter fm = new Formatter(sb);
-        Parser p = new Parser(in, sbmap);
-        Entry  e = null;
-        fm.format("// remove non-roundtrip entries%n");
-        fm.format("        b2cMap = b2cTable.toCharArray();%n");
-        while ((e = p.next()) != null) {
-            fm.format("        b2cMap[%d] = UNMAPPABLE_DECODING;%n",
-                      (e.bs>=0x80)?(e.bs-0x80):(e.bs+0x80));
-        }
-        fm.close();
-        return sb.toString();
-    }
+        // (2)now the .nr file which includes "b->c" non-roundtrip entries
+        File f = new File(srcDir, clzName + ".nr");
+        if (f.exists()) {
+            in = new FileInputStream(f);
+            fm = new Formatter(b2cNRSB);
+            p = new Parser(in, sbmap);
+            e = null;
 
-    // generate c2b only entries from xxx.c2b file
-    private static String genC2BNR(InputStream in) throws Exception
-    {
-        StringBuilder sb = new StringBuilder();
-        Formatter fm = new Formatter(sb);
-        Parser p = new Parser(in, sbmap);
-        ArrayList<Entry> es = new ArrayList<Entry>();
-        Entry  e = null;
-        while ((e = p.next()) != null) {
-            es.add(e);
+            fm.format("// remove non-roundtrip entries%n");
+            fm.format("        b2cMap = b2cTable.toCharArray();%n");
+            while ((e = p.next()) != null) {
+                fm.format("        b2cMap[%d] = UNMAPPABLE_DECODING;%n",
+                          (e.bs>=0x80)?(e.bs-0x80):(e.bs+0x80));
+            }
+            fm.close();
         }
 
-        fm.format("// non-roundtrip c2b only entries%n");
-        fm.format("        c2bNR = new char[%d];%n", es.size() * 2);
-        int i = 0;
-        for (Entry entry: es) {
-            fm.format("        c2bNR[%d] = 0x%x; c2bNR[%d] = 0x%x;%n",
-                      i++, entry.bs, i++, entry.cp);
+        // (3)finally the .c2b file which includes c->b non-roundtrip entries
+        f = new File(srcDir, clzName + ".c2b");
+        if (f.exists()) {
+            in = new FileInputStream(f);
+            fm = new Formatter(c2bNRSB);
+            p = new Parser(in, sbmap);
+            e = null;
+            ArrayList<Entry> es = new ArrayList<Entry>();
+            while ((e = p.next()) != null) {
+                if (c2bIndex[e.cp>>8] == UNMAPPABLE_DECODING) {
+                    c2bOff += 0x100;
+                    c2bIndex[e.cp>>8] = 1;
+                }
+                es.add(e);
+            }
+            fm.format("// non-roundtrip c2b only entries%n");
+            if (es.size() < 100) {
+                fm.format("        c2bNR = new char[%d];%n", es.size() * 2);
+                int i = 0;
+                for (Entry entry: es) {
+                    fm.format("        c2bNR[%d] = 0x%x; c2bNR[%d] = 0x%x;%n",
+                              i++, entry.bs, i++, entry.cp);
+                }
+            } else {
+                char[] cc = new char[es.size() * 2];
+                int i = 0;
+                for (Entry entry: es) {
+                    cc[i++] = (char)entry.bs;
+                    cc[i++] = (char)entry.cp;
+                }
+                fm.format("        c2bNR = (%n");
+                toString(cc, 0, i,  fm, ").toCharArray();", false);
+            }
+            fm.close();
         }
-        fm.close();
-        return sb.toString();
-    }
 
-    private static void genSBCSClass(String srcDir,
-                                     String dstDir,
-                                     String template,
-                                     String clzName,
-                                     String csName,
-                                     String hisName,
-                                     String pkgName,
-                                     boolean isASCII,
-                                     String b2c,
-                                     String b2cNR,
-                                     String c2bNR,
-                                     int    c2blen)
-        throws Exception
-    {
+        // (4)it's time to generate the source file
+        String b2c = b2cSB.toString();
+        String b2cNR = b2cNRSB.toString();
+        String c2bNR = c2bNRSB.toString();
+
         Scanner s = new Scanner(new File(srcDir, template));
         PrintStream out = new PrintStream(new FileOutputStream(
                               new File(dstDir, clzName + ".java")));
@@ -239,16 +249,16 @@ public class GenerateSBCS {
                 line = line.replace("$B2CTABLE$", b2c);
             }
             if (line.indexOf("$C2BLENGTH$") != -1) {
-                line = line.replace("$C2BLENGTH$", "0x" + Integer.toString(c2blen, 16));
+                line = line.replace("$C2BLENGTH$", "0x" + Integer.toString(c2bOff, 16));
             }
             if (line.indexOf("$NONROUNDTRIP_B2C$") != -1) {
-                if (b2cNR == null)
+                if (b2cNR.length() == 0)
                     continue;
                 line = line.replace("$NONROUNDTRIP_B2C$", b2cNR);
             }
 
             if (line.indexOf("$NONROUNDTRIP_C2B$") != -1) {
-                if (c2bNR == null)
+                if (c2bNR.length() == 0)
                     continue;
                 line = line.replace("$NONROUNDTRIP_C2B$", c2bNR);
             }
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/Generator.java b/jdk/make/tools/src/build/tools/generatenimbus/Generator.java
similarity index 53%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/Generator.java
rename to jdk/make/tools/src/build/tools/generatenimbus/Generator.java
index 6ab4b87d18a..a345305a88d 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/Generator.java
+++ b/jdk/make/tools/src/build/tools/generatenimbus/Generator.java
@@ -22,20 +22,13 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.generator;
+package build.tools.generatenimbus;
 
-import static org.jdesktop.synthdesigner.generator.TemplateWriter.read;
-import static org.jdesktop.synthdesigner.generator.TemplateWriter.writeSrcFile;
-import org.jdesktop.synthdesigner.synthmodel.SynthModel;
-import org.jibx.runtime.BindingDirectory;
-import org.jibx.runtime.IBindingFactory;
-import org.jibx.runtime.IUnmarshallingContext;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
 
 /**
  * Generates the various Java artifacts based on a SynthModel.
@@ -51,12 +44,12 @@ import java.util.Map;
  * @author  Jasper Potts
  */
 public class Generator {
+    private static Generator instance;
+
     /** A map of variables that are used for variable substitution in the template files. */
     private Map<String, String> variables;
-
     private boolean full = false;
     private File buildPackageRoot;
-    private File srcPackageRoot;
     private String packageNamePrefix;
     private String lafName;
     private SynthModel model;
@@ -68,7 +61,7 @@ public class Generator {
      *
      * @param args The commandline arguments
      */
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         if (args.length == 0 || (args.length % 2) != 0) {
             System.out.println("Usage: generator [-options]\n" +
                     "    -full <true|false>     True if we should build the whole LAF or false for building just states and painters.\n" +
@@ -76,9 +69,6 @@ public class Generator {
                     "    -buildDir <value>      The directory beneath which the build-controlled artifacts (such as the Painters) should\n" +
                     "                           be placed. This is the root directory beneath which the necessary packages and source\n" +
                     "                           files will be created.\n" +
-                    "    -srcDir <value>        The directory beneath which the normal user-controlled artifacts (such as the core\n" +
-                    "                           LookAndFeel file) should be placed. These are one-time generated files. This is the root\n" +
-                    "                           directory beneath which the necessary packages and source files will be created.\n" +
                     "    -resourcesDir <value>  The resources directory containing templates and images.\n" +
                     "    -packagePrefix <value> The package name associated with this synth look and feel. For example,\n" +
                     "                           \"org.mypackage.mylaf\"\n" +
@@ -87,7 +77,6 @@ public class Generator {
             boolean full = false;
             File skinFile = new File(System.getProperty("user.dir"));
             File buildDir = new File(System.getProperty("user.dir"));
-            File srcDir = new File(System.getProperty("user.dir"));
             File resourcesDir = new File(System.getProperty("user.dir"));
             String packagePrefix = "org.mypackage.mylaf";
             String lafName = "MyLAF";
@@ -100,8 +89,6 @@ public class Generator {
                     skinFile = new File(value);
                 } else if ("-builddir".equals(key)) {
                     buildDir = new File(value);
-                } else if ("-srcdir".equals(key)) {
-                    srcDir = new File(value);
                 } else if ("-resourcesdir".equals(key)) {
                     resourcesDir = new File(value);
                 } else if ("-packageprefix".equals(key)) {
@@ -114,25 +101,15 @@ public class Generator {
             System.out.println("   full          :" + full);
             System.out.println("   skinFile      :" + skinFile.getAbsolutePath());
             System.out.println("   buildDir      :" + buildDir.getAbsolutePath());
-            System.out.println("   srcDir        :" + srcDir.getAbsolutePath());
             System.out.println("   resourcesDir  :" + resourcesDir.getAbsolutePath());
             System.out.println("   packagePrefix :" +packagePrefix);
             System.out.println("   lafName       :" +lafName);
-            try {
-                // LOAD SKIN MODEL
-                IBindingFactory bindingFactory = BindingDirectory.getFactory(SynthModel.class);
-                IUnmarshallingContext mctx = bindingFactory.createUnmarshallingContext();
-                mctx.setDocument(new FileInputStream(skinFile), "UTF-8");
-                // pass resources directory in as user context so it can be used in SynthModel preSet
-                mctx.setUserContext(resourcesDir);
-                SynthModel model = (SynthModel) mctx.unmarshalElement();
-                // create and run generator
-                Generator generator = new Generator(full, buildDir, srcDir, packagePrefix, lafName, model);
-                generator.generate();
-            } catch (Exception e) {
-                System.err.println("Error loading skin and generating java src:");
-                e.printStackTrace();
-            }
+
+            JAXBContext ctx = JAXBContext.newInstance("build.tools.generatenimbus");
+            Unmarshaller u = ctx.createUnmarshaller();
+            SynthModel model = (SynthModel) u.unmarshal(skinFile);
+            Generator.init(full, buildDir, packagePrefix, lafName, model);
+            Generator.getInstance().generate();
         }
     }
 
@@ -152,8 +129,8 @@ public class Generator {
      * @param lafName           The name of the laf, such as MyLAF.
      * @param model             The actual SynthModel to base these generated files on.
      */
-    public Generator(boolean full, File buildDir, File srcDir, String packageNamePrefix, String lafName,
-                     SynthModel model) {
+    private Generator(boolean full, File buildDir,
+            String packageNamePrefix, String lafName, SynthModel model) {
         this.full = full;
         //validate the input variables
         if (packageNamePrefix == null) {
@@ -162,9 +139,6 @@ public class Generator {
         if (buildDir == null) {
             throw new IllegalArgumentException("You must specify the build directory");
         }
-        if (srcDir == null) {
-            throw new IllegalArgumentException("You must specify the source directory");
-        }
         if (model == null) {
             throw new IllegalArgumentException("You must specify the SynthModel");
         }
@@ -183,8 +157,6 @@ public class Generator {
         //org.mypackage.mylaf subdirectories)
         buildPackageRoot = new File(buildDir, packageNamePrefix.replaceAll("\\.", "\\/"));
         buildPackageRoot.mkdirs();
-        srcPackageRoot = new File(srcDir, packageNamePrefix.replaceAll("\\.", "\\/"));
-        srcPackageRoot.mkdirs();
 
         //save the variables
         this.packageNamePrefix = packageNamePrefix;
@@ -192,98 +164,104 @@ public class Generator {
         this.model = model;
     }
 
-    public void generate() {
-        //Generate the one-time files. If these files already exist, skip the
-        //ones that exist and create the missing ones. Register warnings for the
-        //already existing files.
-
-        //TODO Skip existing files, send warnings, etc.
-        if (full) {
-            try {
-                //create the LookAndFeel file
-                String template = read("resources/LookAndFeel.template");
-                writeSrcFile(template, variables, new File(srcPackageRoot, lafName + "LookAndFeel.java"));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        //create the painters and such.
-        regenerate();
+    public static void init(boolean full, File buildDir,
+            String packageNamePrefix, String lafName, SynthModel model) {
+        instance = new Generator(full, buildDir, packageNamePrefix, lafName, model);
+        model.initStyles();
     }
 
-    public void regenerate() {
+    public static Generator getInstance() {
+        return instance;
+    }
+
+    public static Map<String, String> getVariables() {
+        return new HashMap<String, String>(instance.variables);
+    }
+
+    public void generate() {
+        if (full) {
+            //create the LookAndFeel file
+            writeSrcFileImpl("LookAndFeel", variables, lafName + "LookAndFeel");
+
+            writeSrcFileImpl("AbstractRegionPainter", variables);
+            writeSrcFileImpl("BlendingMode", variables);
+            writeSrcFileImpl("SynthPainterImpl", variables);
+            writeSrcFileImpl("IconImpl", variables, lafName + "Icon.java");
+            writeSrcFileImpl("StyleImpl", variables, lafName + "Style.java");
+            writeSrcFileImpl("Effect", variables);
+            writeSrcFileImpl("EffectUtils", variables);
+            writeSrcFileImpl("ShadowEffect", variables);
+            writeSrcFileImpl("DropShadowEffect", variables);
+            writeSrcFileImpl("InnerShadowEffect", variables);
+            writeSrcFileImpl("InnerGlowEffect", variables);
+            writeSrcFileImpl("OuterGlowEffect", variables);
+            writeSrcFileImpl("State", variables);
+            writeSrcFileImpl("ImageCache", variables);
+            writeSrcFileImpl("ImageScalingHelper", variables);
+        }
+        //next, populate the first set of ui defaults based on what is in the
+        //various palettes of the synth model
+        StringBuilder defBuffer = new StringBuilder();
+        StringBuilder styleBuffer = new StringBuilder();
+        model.write(defBuffer, styleBuffer, packageNamePrefix);
+
+        Map<String, String> vars = getVariables();
+        vars.put("UI_DEFAULT_INIT", defBuffer.toString());
+        vars.put("STYLE_INIT", styleBuffer.toString());
+        writeSrcFile("Defaults", vars, lafName + "Defaults");
+    }
+
+    private void writeSrcFileImpl(String name, Map<String, String> variables) {
+        writeSrcFileImpl(name, variables, name);
+    }
+
+    private void writeSrcFileImpl(String templateName,
+            Map<String, String> variables, String outputName) {
+        PrintWriter out = null;
         try {
-            if (full) {
-                //first, create the AbstractRegionPainter.java file.
-                String template = read("resources/AbstractRegionPainter.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "AbstractRegionPainter.java"));
+            InputStream stream = getClass().getResourceAsStream(
+                    "resources/" + templateName + ".template");
+            TemplateReader in = new TemplateReader(variables, stream);
 
-                //write out BlendingMode.java
-                template = read("resources/BlendingMode.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "BlendingMode.java"));
-
-                //create the SynthPainterImpl class
-                template = read("resources/SynthPainterImpl.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "SynthPainterImpl.java"));
-
-                //create the IconImpl class
-                template = read("resources/IconImpl.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, lafName + "Icon.java"));
-
-                //create the StyleImpl class
-                template = read("resources/StyleImpl.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, lafName + "Style.java"));
-
-                //write out Effect.java
-                template = read("resources/Effect.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "Effect.java"));
-
-                //write out EffectUtils.java
-                template = read("resources/EffectUtils.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "EffectUtils.java"));
-
-                //write out ShadowEffect.java
-                template = read("resources/ShadowEffect.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "ShadowEffect.java"));
-
-                //write out DropShadowEffect.java
-                template = read("resources/DropShadowEffect.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "DropShadowEffect.java"));
-
-                //write out InnerShadowEffect.java
-                template = read("resources/InnerShadowEffect.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "InnerShadowEffect.java"));
-
-                //write out InnerGlowEffect.java
-                template = read("resources/InnerGlowEffect.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "InnerGlowEffect.java"));
-
-                //write out OuterGlowEffect.java
-                template = read("resources/OuterGlowEffect.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "OuterGlowEffect.java"));
-
-                //write out State.java
-                template = read("resources/State.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "State.java"));
-
-                template = read("resources/ImageCache.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "ImageCache.java"));
-
-                template = read("resources/ImageScalingHelper.template");
-                writeSrcFile(template, variables, new File(buildPackageRoot, "ImageScalingHelper.java"));
+            out = new PrintWriter(new File(buildPackageRoot, outputName + ".java"));
+            String line = in.readLine();
+            while (line != null) {
+                out.println(line);
+                line = in.readLine();
             }
-            //next, populate the first set of ui defaults based on what is in the
-            //various palettes of the synth model
-            StringBuilder uiDefaultInit = new StringBuilder();
-            StringBuilder styleInit = new StringBuilder();
-            DefaultsGenerator.generateDefaults(uiDefaultInit, styleInit, model, variables, packageNamePrefix,
-                    buildPackageRoot);
-            variables.put("UI_DEFAULT_INIT", uiDefaultInit.toString());
-            variables.put("STYLE_INIT", styleInit.toString());
-            writeSrcFile(read("resources/Defaults.template"), variables,
-                    new File(buildPackageRoot, lafName + "Defaults.java"));
         } catch (IOException e) {
-            e.printStackTrace();
+            throw new RuntimeException("IOException in writer", e);
+        } finally {
+            if (out != null) out.close();
+        }
+    }
+
+    public static void writeSrcFile(String templateName,
+            Map<String, String> variables, String outputName) {
+        instance.writeSrcFileImpl(templateName, variables, outputName);
+    }
+
+    /** A BufferedReader implementation that automatically performs
+     * string replacements as needed.
+     */
+    private static final class TemplateReader extends BufferedReader {
+        private Map<String, String> variables;
+
+        TemplateReader(Map<String, String> variables, InputStream template) {
+            super(new InputStreamReader(template));
+            this.variables = variables;
+        }
+
+        @Override public String readLine() throws IOException {
+            return substituteVariables(super.readLine());
+        }
+
+        private String substituteVariables(String input) {
+            if (input == null) return null;
+            for (Map.Entry<String, String> variable : variables.entrySet()) {
+                input = input.replace("${" + variable.getKey() + "}", variable.getValue());
+            }
+            return input;
         }
     }
 }
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java b/jdk/make/tools/src/build/tools/generatenimbus/ObjectFactory.java
similarity index 57%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java
rename to jdk/make/tools/src/build/tools/generatenimbus/ObjectFactory.java
index ea0b2d15359..1fdd7cd972c 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java
+++ b/jdk/make/tools/src/build/tools/generatenimbus/ObjectFactory.java
@@ -22,34 +22,41 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.swingx.designer.effects;
 
-import org.jdesktop.swingx.designer.paint.Matte;
+package build.tools.generatenimbus;
+
+import javax.xml.bind.annotation.XmlRegistry;
 
-import javax.swing.UIDefaults;
-import java.awt.Color;
 
 /**
- * InnerGlowEffect
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the test package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups.  Factory methods for each of these are
+ * provided in this class.
  *
- * @author Created by Jasper Potts (Jun 21, 2007)
  */
-public class InnerGlowEffect extends InnerShadowEffect {
+@XmlRegistry
+public class ObjectFactory {
 
-    protected InnerGlowEffect() {
-        distance = 0;
-    }
-
-    public InnerGlowEffect(UIDefaults uiDefaults) {
-        color = new Matte(new Color(255, 255, 211), uiDefaults);
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: test
+     *
+     */
+    public ObjectFactory() {
     }
 
     /**
-     * Get the display name for this effect
+     * Create an instance of {@link SynthModel }
      *
-     * @return The user displayable name
      */
-    public String getDisplayName() {
-        return "Inner Glow";
+    public SynthModel createSynthModel() {
+        return new SynthModel();
     }
 }
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Paint.java b/jdk/make/tools/src/build/tools/generatenimbus/Paint.java
new file mode 100644
index 00000000000..85678410aff
--- /dev/null
+++ b/jdk/make/tools/src/build/tools/generatenimbus/Paint.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package build.tools.generatenimbus;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+
+public abstract class Paint {
+}
+
+class Matte extends Paint {
+    @XmlAttribute private int red;
+    @XmlAttribute private int green;
+    @XmlAttribute private int blue;
+    @XmlAttribute private int alpha;
+
+    @XmlAttribute private String uiDefaultParentName = null;
+    @XmlAttribute private float hueOffset = 0;
+    @XmlAttribute private float saturationOffset = 0;
+    @XmlAttribute private float brightnessOffset = 0;
+    @XmlAttribute private int alphaOffset = 0;
+
+    @XmlAttribute private String componentPropertyName = null;
+    public String getComponentPropertyName() { return componentPropertyName; }
+
+    @XmlAttribute private boolean uiResource = true;
+
+    public boolean isAbsolute() {
+        return uiDefaultParentName == null;
+    }
+
+    public String getDeclaration() {
+        if (isAbsolute()) {
+            return String.format("new Color(%d, %d, %d, %d)",
+                                 red, green, blue, alpha);
+        } else {
+            return String.format("decodeColor(\"%s\", %sf, %sf, %sf, %d)",
+                    uiDefaultParentName, String.valueOf(hueOffset),
+                    String.valueOf(saturationOffset),
+                    String.valueOf(brightnessOffset), alphaOffset);
+        }
+    }
+
+    public String write() {
+        if (isAbsolute()) {
+            return String.format("%s, %s, %s, %s", red, green, blue, alpha);
+        } else {
+            String s = String.format("\"%s\", %sf, %sf, %sf, %d",
+                    uiDefaultParentName, String.valueOf(hueOffset),
+                    String.valueOf(saturationOffset),
+                    String.valueOf(brightnessOffset), alphaOffset);
+            if (! uiResource) {
+                s += ", false";
+            }
+            return s;
+        }
+    }
+
+    public ComponentColor createComponentColor(String variableName) {
+        return new ComponentColor(componentPropertyName, variableName,
+                saturationOffset, brightnessOffset, alphaOffset);
+    }
+}
+
+class ComponentColor {
+    private String propertyName;
+    private String defaultColorVariableName;
+    private float saturationOffset = 0,  brightnessOffset = 0;
+    private int alphaOffset = 0;
+
+    ComponentColor(String propertyName,
+            String defaultColorVariableName,
+            float saturationOffset,
+            float brightnessOffset,
+            int alphaOffset) {
+        this.propertyName = propertyName;
+        this.defaultColorVariableName = defaultColorVariableName;
+        this.saturationOffset = saturationOffset;
+        this.brightnessOffset = brightnessOffset;
+        this.alphaOffset = alphaOffset;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        ComponentColor c = (ComponentColor) o;
+        if (alphaOffset != c.alphaOffset) {
+            return false;
+        }
+        if (Float.compare(saturationOffset, c.saturationOffset) != 0) {
+            return false;
+        }
+        if (Float.compare(brightnessOffset, c.brightnessOffset) != 0) {
+            return false;
+        }
+        if (defaultColorVariableName != null ? !defaultColorVariableName.equals(c.defaultColorVariableName) : c.defaultColorVariableName != null) {
+            return false;
+        }
+        if (propertyName != null ? !propertyName.equals(c.propertyName) : c.propertyName != null) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 61 * hash + (this.propertyName != null ? this.propertyName.hashCode() : 0);
+        hash = 61 * hash + (this.defaultColorVariableName != null ? this.defaultColorVariableName.hashCode() : 0);
+        hash = 61 * hash + Float.floatToIntBits(this.saturationOffset);
+        hash = 61 * hash + Float.floatToIntBits(this.brightnessOffset);
+        hash = 61 * hash + this.alphaOffset;
+        return hash;
+    }
+
+    public void write(StringBuilder sb) {
+        sb.append("                     getComponentColor(c, \"").
+           append(propertyName).append("\", ").
+           append(defaultColorVariableName).append(", ").
+           append(saturationOffset).append("f, ").
+           append(brightnessOffset).append("f, ").
+           append(alphaOffset);
+    }
+}
+
+class GradientStop {
+    @XmlAttribute private float position;
+    public float getPosition() { return position; }
+
+    @XmlAttribute private float midpoint;
+    public float getMidpoint() { return midpoint; }
+
+    @XmlElement private Matte matte;
+    public Matte getColor() { return matte; }
+}
+
+class AbstractGradient extends Paint {
+    public static enum CycleMethod {
+        NO_CYCLE, REFLECT, REPEAT
+    }
+
+    @XmlElement(name="stop") private ArrayList<GradientStop> stops;
+    public List<GradientStop> getStops() { return stops; }
+}
+
+class Gradient extends AbstractGradient {
+}
+
+class RadialGradient extends AbstractGradient {
+}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java b/jdk/make/tools/src/build/tools/generatenimbus/PainterGenerator.java
similarity index 52%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java
rename to jdk/make/tools/src/build/tools/generatenimbus/PainterGenerator.java
index 781fb21ba93..69821862e96 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java
+++ b/jdk/make/tools/src/build/tools/generatenimbus/PainterGenerator.java
@@ -22,49 +22,15 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.generator;
+package build.tools.generatenimbus;
 
-import org.jdesktop.swingx.designer.BezierControlPoint;
-import org.jdesktop.swingx.designer.Canvas;
-import org.jdesktop.swingx.designer.EllipseShape;
-import org.jdesktop.swingx.designer.Layer;
-import org.jdesktop.swingx.designer.PaintedShape;
-import org.jdesktop.swingx.designer.PathShape;
-import org.jdesktop.swingx.designer.RectangleShape;
-import org.jdesktop.swingx.designer.SimpleShape;
-import org.jdesktop.swingx.designer.TemplateLayer;
-import org.jdesktop.swingx.designer.paint.Gradient;
-import org.jdesktop.swingx.designer.paint.Matte;
-import org.jdesktop.swingx.designer.paint.PaintModel;
-import org.jdesktop.swingx.designer.paint.RadialGradient;
-import org.jdesktop.swingx.designer.paint.GradientStop;
-import org.jdesktop.swingx.designer.paint.AbstractGradient;
-import static org.jdesktop.synthdesigner.generator.GeneratorUtils.makePretty;
-import static org.jdesktop.synthdesigner.generator.GeneratorUtils.toClassName;
-import static org.jdesktop.synthdesigner.generator.GeneratorUtils.toConstantName;
-import static org.jdesktop.synthdesigner.generator.TemplateWriter.read;
-import static org.jdesktop.synthdesigner.generator.TemplateWriter.writeSrcFile;
-import org.jdesktop.synthdesigner.synthmodel.UIIconRegion;
-import org.jdesktop.synthdesigner.synthmodel.UIRegion;
-import org.jdesktop.synthdesigner.synthmodel.UIState;
-
-import java.awt.*;
 import java.awt.geom.Point2D;
-import java.beans.Beans;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
-import javax.swing.JList;
-import javax.swing.JTable;
-import javax.swing.text.JTextComponent;
+
 
 /**
  * PainterGenerator - Class for generating Painter class java source from a Canvas
@@ -91,22 +57,6 @@ import javax.swing.text.JTextComponent;
  * @author  Jasper Potts
  */
 public class PainterGenerator {
-    private static String painterImplTemplate;
-    private static String getPainterImplTemplate() {
-        if (painterImplTemplate == null) {
-            //load the painter template file into an in-memory string to improve performance
-            //when generating a lot of classes
-            try {
-                painterImplTemplate = read("resources/PainterImpl.template");
-            } catch (IOException e) {
-                System.err.println("Failed to read template files.");
-                throw new RuntimeException(e);
-            }
-        }
-        return painterImplTemplate;
-    }
-
-
     //a handful of counters, incremented whenever the associated object type is encounted.
     //These counters form the basis of the field and method suffixes.
     //These are all 1 based, because I felt like it :-)
@@ -170,10 +120,8 @@ public class PainterGenerator {
 
     private void generate(UIRegion r) {
         for (UIState state : r.getBackgroundStates()) {
-            System.out.println("------>" + state.getName());
-
             Canvas canvas = state.getCanvas();
-            String type = r instanceof UIIconRegion ? ((UIIconRegion)r).getKey() : "Background";
+            String type = (r instanceof UIIconRegion ? r.getKey() : "Background");
             generate(state, canvas, type);
         }
         for (UIState state : r.getForegroundStates()) {
@@ -203,13 +151,7 @@ public class PainterGenerator {
                     .append("                extendedCacheKeys = new Object[] {\n");
                 for (int i=0; i<entry.getValue().size(); i++) {
                     ComponentColor cc = entry.getValue().get(i);
-                    getExtendedCacheKeysCode
-                    .append("                     getComponentColor(c, \"")
-                    .append(cc.propertyName).append("\", ")
-                    .append(cc.defaultColorVariableName).append(", ")
-                    .append(cc.saturationOffset).append("f, ")
-                    .append(cc.brightnessOffset).append("f, ")
-                    .append(cc.alphaOffset);
+                    cc.write(getExtendedCacheKeysCode);
                     if (i + 1 < entry.getValue().size()) {
                         getExtendedCacheKeysCode.append("),\n");
                     } else {
@@ -228,9 +170,9 @@ public class PainterGenerator {
 
     //type is background, foreground, border, upArrowIcon, etc.
     private void generate(UIState state, Canvas canvas, String type) {
-        String states = UIState.keysToString(state.getStateKeys());
-        String stateType = toConstantName(type + "_" + states);
-        String paintMethodName = "paint" + type + toClassName(states);
+        String states = state.getStateKeys();
+        String stateType = Utils.statesToConstantName(type + "_" + states);
+        String paintMethodName = "paint" + type + Utils.statesToClassName(states);
         //create new array for component colors for this state
         componentColors = new ArrayList<ComponentColor>();
 
@@ -257,171 +199,166 @@ public class PainterGenerator {
         Layer[] layers = canvas.getLayers().toArray(new Layer[0]);
         for (int index=layers.length-1; index >= 0; index--) {
             Layer layer = layers[index];
-            if (layer instanceof TemplateLayer) {
-                continue;
-            }
+
             //shapes must be painted in reverse order
-            List<SimpleShape> shapes = layer.getShapes();
+            List<Shape> shapes = layer.getShapes();
             for (int i=shapes.size()-1; i>=0; i--) {
-                SimpleShape s = shapes.get(i);
-                if (s instanceof PaintedShape) {
-                    PaintedShape shape = (PaintedShape)s;
-                    PaintModel paint = shape.getPaintModel();
+                Shape shape = shapes.get(i);
+                Paint paint = shape.getPaint();
 
-                    /*
-                        We attempt to write the minimal number of bytecodes as possible when
-                        generating code. Due to the inherit complexities in determining what
-                        is extraneous, we use the following system:
+                /*
+                    We attempt to write the minimal number of bytecodes as possible when
+                    generating code. Due to the inherit complexities in determining what
+                    is extraneous, we use the following system:
 
-                        We first generate the code for the shape. Then, we check to see if
-                        this shape has already been generated. If so, then we defer to an
-                        existing method. If not, then we will create a new methods, stick
-                        the code in it, and refer to that method.
-                    */
+                    We first generate the code for the shape. Then, we check to see if
+                    this shape has already been generated. If so, then we defer to an
+                    existing method. If not, then we will create a new methods, stick
+                    the code in it, and refer to that method.
+                */
 
-                    String shapeMethodName = null; // will contain the name of the method which creates the shape
-                    String shapeVariable = null; // will be one of rect, roundRect, ellipse, or path.
-                    String shapeMethodBody = null;
+                String shapeMethodName = null; // will contain the name of the method which creates the shape
+                String shapeVariable = null; // will be one of rect, roundRect, ellipse, or path.
+                String shapeMethodBody = null;
 
-                    if (shape instanceof RectangleShape) {
-                        RectangleShape rshape = (RectangleShape) shape;
-                        float x1 = encode((float)rshape.getX1(), a, b, width);
-                        float y1 = encode((float)rshape.getY1(), c, d, height);
-                        float x2 = encode((float)rshape.getX2(), a, b, width);
-                        float y2 = encode((float)rshape.getY2(), c, d, height);
-                        if (rshape.isRounded()) {
-                            //it is a rounded rectangle
-                            float rounding = (float)rshape.getRounding();
+                if (shape instanceof Rectangle) {
+                    Rectangle rshape = (Rectangle) shape;
+                    float x1 = encode((float)rshape.getX1(), a, b, width);
+                    float y1 = encode((float)rshape.getY1(), c, d, height);
+                    float x2 = encode((float)rshape.getX2(), a, b, width);
+                    float y2 = encode((float)rshape.getY2(), c, d, height);
+                    if (rshape.isRounded()) {
+                        //it is a rounded rectangle
+                        float rounding = (float)rshape.getRounding();
 
-                            shapeMethodBody =
-                                    "        roundRect.setRoundRect(" +
-                                    writeDecodeX(x1) + ", //x\n" +
-                                    "                               " + writeDecodeY(y1) + ", //y\n" +
-                                    "                               " + writeDecodeX(x2) + " - " + writeDecodeX(x1) + ", //width\n" +
-                                    "                               " + writeDecodeY(y2) + " - " + writeDecodeY(y1) + ", //height\n" +
-                                    "                               " + rounding + "f, " + rounding + "f); //rounding";
-                            shapeVariable = "roundRect";
-                        } else {
-                            shapeMethodBody =
-                                    "            rect.setRect(" +
-                                    writeDecodeX(x1) + ", //x\n" +
-                                    "                         " + writeDecodeY(y1) + ", //y\n" +
-                                    "                         " + writeDecodeX(x2) + " - " + writeDecodeX(x1) + ", //width\n" +
-                                    "                         " + writeDecodeY(y2) + " - " + writeDecodeY(y1) + "); //height";
-                            shapeVariable = "rect";
-                        }
-                    } else if (shape instanceof EllipseShape) {
-                        EllipseShape eshape = (EllipseShape) shape;
-                        float x1 = encode((float)eshape.getX1(), a, b, width);
-                        float y1 = encode((float)eshape.getY1(), c, d, height);
-                        float x2 = encode((float)eshape.getX2(), a, b, width);
-                        float y2 = encode((float)eshape.getY2(), c, d, height);
                         shapeMethodBody =
-                                "        ellipse.setFrame(" +
+                                "        roundRect.setRoundRect(" +
+                                writeDecodeX(x1) + ", //x\n" +
+                                "                               " + writeDecodeY(y1) + ", //y\n" +
+                                "                               " + writeDecodeX(x2) + " - " + writeDecodeX(x1) + ", //width\n" +
+                                "                               " + writeDecodeY(y2) + " - " + writeDecodeY(y1) + ", //height\n" +
+                                "                               " + rounding + "f, " + rounding + "f); //rounding";
+                        shapeVariable = "roundRect";
+                    } else {
+                        shapeMethodBody =
+                                "            rect.setRect(" +
                                 writeDecodeX(x1) + ", //x\n" +
                                 "                         " + writeDecodeY(y1) + ", //y\n" +
                                 "                         " + writeDecodeX(x2) + " - " + writeDecodeX(x1) + ", //width\n" +
                                 "                         " + writeDecodeY(y2) + " - " + writeDecodeY(y1) + "); //height";
-                        shapeVariable = "ellipse";
-                    } else if (shape instanceof PathShape) {
-                        PathShape pshape = (PathShape) shape;
-                        List<BezierControlPoint> controlPoints = pshape.getBezierControlPoints();
-                        BezierControlPoint first, last;
-                        first = last = controlPoints.get(0);
-                        StringBuilder buffer = new StringBuilder();
-                        buffer.append("        path.reset();\n");
-                        buffer.append("        path.moveTo(" + writeDecodeX(encode((float)first.getX(), a, b, width)) + ", " + writeDecodeY(encode((float)first.getY(), c, d, height)) + ");\n");
-                        for (int j=1; j<controlPoints.size(); j++) {
-                            BezierControlPoint cp = controlPoints.get(j);
-                            if (last.getCp2().isSharp() && cp.getCp1().isSharp()) {
-                                float x = encode((float)cp.getX(), a, b, width);
-                                float y = encode((float)cp.getY(), c, d, height);
-                                buffer.append("        path.lineTo(" + writeDecodeX(x) + ", " + writeDecodeY(y) + ");\n");
-                            } else {
-                                float x1 = encode((float)last.getX(), a, b, width);
-                                float y1 = encode((float)last.getY(), c, d, height);
-                                float x2 = encode((float)cp.getX(), a, b, width);
-                                float y2 = encode((float)cp.getY(), c, d, height);
-                                buffer.append(
-                                        "        path.curveTo(" + writeDecodeBezierX(x1, last.getX(), last.getCp2X()) + ", "
-                                                                + writeDecodeBezierY(y1, last.getY(), last.getCp2Y()) + ", "
-                                                                + writeDecodeBezierX(x2, cp.getX(), cp.getCp1X()) + ", "
-                                                                + writeDecodeBezierY(y2, cp.getY(), cp.getCp1Y()) + ", "
-                                                                + writeDecodeX(x2) + ", " + writeDecodeY(y2) + ");\n");
-                            }
-                            last = cp;
-                        }
-                        if (last.getCp2().isSharp() && first.getCp1().isSharp()) {
-                            float x = encode((float)first.getX(), a, b, width);
-                            float y = encode((float)first.getY(), c, d, height);
+                        shapeVariable = "rect";
+                    }
+                } else if (shape instanceof Ellipse) {
+                    Ellipse eshape = (Ellipse) shape;
+                    float x1 = encode((float)eshape.getX1(), a, b, width);
+                    float y1 = encode((float)eshape.getY1(), c, d, height);
+                    float x2 = encode((float)eshape.getX2(), a, b, width);
+                    float y2 = encode((float)eshape.getY2(), c, d, height);
+                    shapeMethodBody =
+                            "        ellipse.setFrame(" +
+                            writeDecodeX(x1) + ", //x\n" +
+                            "                         " + writeDecodeY(y1) + ", //y\n" +
+                            "                         " + writeDecodeX(x2) + " - " + writeDecodeX(x1) + ", //width\n" +
+                            "                         " + writeDecodeY(y2) + " - " + writeDecodeY(y1) + "); //height";
+                    shapeVariable = "ellipse";
+                } else if (shape instanceof Path) {
+                    Path pshape = (Path) shape;
+                    List<Point> controlPoints = pshape.getControlPoints();
+                    Point first, last;
+                    first = last = controlPoints.get(0);
+                    StringBuilder buffer = new StringBuilder();
+                    buffer.append("        path.reset();\n");
+                    buffer.append("        path.moveTo(" + writeDecodeX(encode((float)first.getX(), a, b, width)) + ", " + writeDecodeY(encode((float)first.getY(), c, d, height)) + ");\n");
+                    for (int j=1; j<controlPoints.size(); j++) {
+                        Point cp = controlPoints.get(j);
+                        if (last.isP2Sharp() && cp.isP1Sharp()) {
+                            float x = encode((float)cp.getX(), a, b, width);
+                            float y = encode((float)cp.getY(), c, d, height);
                             buffer.append("        path.lineTo(" + writeDecodeX(x) + ", " + writeDecodeY(y) + ");\n");
                         } else {
                             float x1 = encode((float)last.getX(), a, b, width);
                             float y1 = encode((float)last.getY(), c, d, height);
-                            float x2 = encode((float)first.getX(), a, b, width);
-                            float y2 = encode((float)first.getY(), c, d, height);
+                            float x2 = encode((float)cp.getX(), a, b, width);
+                            float y2 = encode((float)cp.getY(), c, d, height);
                             buffer.append(
                                     "        path.curveTo(" + writeDecodeBezierX(x1, last.getX(), last.getCp2X()) + ", "
                                                             + writeDecodeBezierY(y1, last.getY(), last.getCp2Y()) + ", "
-                                                            + writeDecodeBezierX(x2, first.getX(), first.getCp1X()) + ", "
-                                                            + writeDecodeBezierY(y2, first.getY(), first.getCp1Y()) + ", "
+                                                            + writeDecodeBezierX(x2, cp.getX(), cp.getCp1X()) + ", "
+                                                            + writeDecodeBezierY(y2, cp.getY(), cp.getCp1Y()) + ", "
                                                             + writeDecodeX(x2) + ", " + writeDecodeY(y2) + ");\n");
                         }
-                        buffer.append("        path.closePath();");
-                        shapeMethodBody = buffer.toString();
-                        shapeVariable = "path";
+                        last = cp;
+                    }
+                    if (last.isP2Sharp() && first.isP1Sharp()) {
+                        float x = encode((float)first.getX(), a, b, width);
+                        float y = encode((float)first.getY(), c, d, height);
+                        buffer.append("        path.lineTo(" + writeDecodeX(x) + ", " + writeDecodeY(y) + ");\n");
                     } else {
-                        throw new RuntimeException("Cannot happen unless a new Shape has been defined");
+                        float x1 = encode((float)last.getX(), a, b, width);
+                        float y1 = encode((float)last.getY(), c, d, height);
+                        float x2 = encode((float)first.getX(), a, b, width);
+                        float y2 = encode((float)first.getY(), c, d, height);
+                        buffer.append(
+                                "        path.curveTo(" + writeDecodeBezierX(x1, last.getX(), last.getCp2X()) + ", "
+                                                        + writeDecodeBezierY(y1, last.getY(), last.getCp2Y()) + ", "
+                                                        + writeDecodeBezierX(x2, first.getX(), first.getCp1X()) + ", "
+                                                        + writeDecodeBezierY(y2, first.getY(), first.getCp1Y()) + ", "
+                                                        + writeDecodeX(x2) + ", " + writeDecodeY(y2) + ");\n");
                     }
+                    buffer.append("        path.closePath();");
+                    shapeMethodBody = buffer.toString();
+                    shapeVariable = "path";
+                } else {
+                    throw new RuntimeException("Cannot happen unless a new Shape has been defined");
+                }
 
-                    //now that we have the shape defined in shapeMethodBody, and a shapeVariable name,
-                    //look to see if such a body has been previously defined.
-                    shapeMethodName = methods.get(shapeMethodBody);
-                    String returnType = null;
-                    if (shapeMethodName == null) {
-                        if ("rect".equals(shapeVariable)) {
-                            shapeMethodName = "decodeRect" + rectCounter++;
-                            returnType = "Rectangle2D";
-                        } else if ("roundRect".equals(shapeVariable)) {
-                            shapeMethodName = "decodeRoundRect" + roundRectCounter++;
-                            returnType = "RoundRectangle2D";
-                        } else if ("ellipse".equals(shapeVariable)) {
-                            shapeMethodName = "decodeEllipse" + ellipseCounter++;
-                            returnType = "Ellipse2D";
-                        } else {
-                            shapeMethodName = "decodePath" + pathCounter++;
-                            returnType = "Path2D";
-                        }
-                        methods.put(shapeMethodBody, shapeMethodName);
-
-                        //since the method wasn't previously defined, time to define it
-                        shapesCode.append("    private ").append(returnType).append(" ").append(shapeMethodName).append("() {\n");
-                        shapesCode.append(shapeMethodBody);
-                        shapesCode.append("\n");
-                        shapesCode.append("        return " + shapeVariable + ";\n");
-                        shapesCode.append("    }\n\n");
+                //now that we have the shape defined in shapeMethodBody, and a shapeVariable name,
+                //look to see if such a body has been previously defined.
+                shapeMethodName = methods.get(shapeMethodBody);
+                String returnType = null;
+                if (shapeMethodName == null) {
+                    if ("rect".equals(shapeVariable)) {
+                        shapeMethodName = "decodeRect" + rectCounter++;
+                        returnType = "Rectangle2D";
+                    } else if ("roundRect".equals(shapeVariable)) {
+                        shapeMethodName = "decodeRoundRect" + roundRectCounter++;
+                        returnType = "RoundRectangle2D";
+                    } else if ("ellipse".equals(shapeVariable)) {
+                        shapeMethodName = "decodeEllipse" + ellipseCounter++;
+                        returnType = "Ellipse2D";
+                    } else {
+                        shapeMethodName = "decodePath" + pathCounter++;
+                        returnType = "Path2D";
                     }
+                    methods.put(shapeMethodBody, shapeMethodName);
 
-                    //now that the method has been defined, I can go on and decode the
-                    //paint. After the paint is decoded, I can write the g.fill() method call,
-                    //using the result of the shapeMethodName. Yay!
+                    //since the method wasn't previously defined, time to define it
+                    shapesCode.append("    private ").append(returnType).append(" ").append(shapeMethodName).append("() {\n");
+                    shapesCode.append(shapeMethodBody);
+                    shapesCode.append("\n");
+                    shapesCode.append("        return " + shapeVariable + ";\n");
+                    shapesCode.append("    }\n\n");
+                }
+
+                //now that the method has been defined, I can go on and decode the
+                //paint. After the paint is decoded, I can write the g.fill() method call,
+                //using the result of the shapeMethodName. Yay!
 
 //            if (shapeVariable != null) {
-                //first, calculate the bounds of the shape being painted and store in variables
-                    paintingCode.append("        ").append(shapeVariable).append(" = ").append(shapeMethodName).append("();\n");
+            //first, calculate the bounds of the shape being painted and store in variables
+                paintingCode.append("        ").append(shapeVariable).append(" = ").append(shapeMethodName).append("();\n");
 
-                    if (paint instanceof Matte) {
-                        String colorVariable = encodeMatte((Matte)paint);
-                        paintingCode.append("        g.setPaint(").append(colorVariable).append(");\n");
-                    } else if (paint instanceof Gradient) {
-                        String gradientMethodName = encodeGradient(shape, (Gradient)paint);
-                        paintingCode.append("        g.setPaint(").append(gradientMethodName).append("(").append(shapeVariable).append("));\n");
-                    } else if (paint instanceof RadialGradient) {
-                        String radialMethodName = encodeRadial(shape, (RadialGradient)paint);
-                        paintingCode.append("        g.setPaint(").append(radialMethodName).append("(").append(shapeVariable).append("));\n");
-                    }
-                    paintingCode.append("        g.fill(").append(shapeVariable).append(");\n");
+                if (paint instanceof Matte) {
+                    String colorVariable = encodeMatte((Matte)paint);
+                    paintingCode.append("        g.setPaint(").append(colorVariable).append(");\n");
+                } else if (paint instanceof Gradient) {
+                    String gradientMethodName = encodeGradient(shape, (Gradient)paint);
+                    paintingCode.append("        g.setPaint(").append(gradientMethodName).append("(").append(shapeVariable).append("));\n");
+                } else if (paint instanceof RadialGradient) {
+                    String radialMethodName = encodeRadial(shape, (RadialGradient)paint);
+                    paintingCode.append("        g.setPaint(").append(radialMethodName).append("(").append(shapeVariable).append("));\n");
                 }
+                paintingCode.append("        g.fill(").append(shapeVariable).append(");\n");
             }
         }
 
@@ -434,8 +371,33 @@ public class PainterGenerator {
         }
     }
 
-    private float encode(float x, float a, float b, float width) {
-        return ObjectCodeConvertors.encode(x, a, b, width);
+    private float encode(float x, float a, float b, float w) {
+        float r = 0;
+        if (x < a) {
+            r = (x / a);
+        } else if (x > b) {
+            r = 2 + ((x - b) / (w - b));
+        } else if (x == a && x == b) {
+            return 1.5f;
+        } else {
+            r = 1 + ((x - a) / (b - a));
+        }
+
+        if (Float.isNaN(r)) {
+            System.err.println("[Error] Encountered NaN: encode(" + x + ", " + a + ", " + b + ", " + w + ")");
+            return 0;
+        } else if (Float.isInfinite(r)) {
+            System.err.println("[Error] Encountered Infinity: encode(" + x + ", " + a + ", " + b + ", " + w + ")");
+            return 0;
+        } else if (r < 0) {
+            System.err.println("[Error] encoded value was less than 0: encode(" + x + ", " + a + ", " + b + ", " + w + ")");
+            return 0;
+        } else if (r > 3) {
+            System.err.println("[Error] encoded value was greater than 3: encode(" + x + ", " + a + ", " + b + ", " + w + ")");
+            return 3;
+        } else {
+            return r;
+        }
     }
 
     private String writeDecodeX(float encodedX) {
@@ -469,30 +431,17 @@ public class PainterGenerator {
     }
 
     private String encodeMatte(Matte m) {
-        String declaration = null;
-        if (m.isAbsolute()) {
-            Color c = m.getColor();
-            declaration = ObjectCodeConvertors.convert(c);
-        } else {
-            declaration = "decodeColor(\"" + m.getUiDefaultParentName() +
-                          "\", " + m.getHueOffset() + "f, " +
-                          m.getSaturationOffset() + "f, " +
-                          m.getBrightnessOffset() + "f, " +
-                          m.getAlphaOffset() + ")";
-        }
-
+        String declaration = m.getDeclaration();
         String variableName = colors.get(declaration);
         if (variableName == null) {
             variableName = "color" + colorCounter++;
             colors.put(declaration, variableName);
-            colorCode.append("    private Color ").append(variableName).append(" = ");
-            colorCode.append(declaration).append(";\n");
+            colorCode.append(String.format("    private Color %s = %s;\n",
+                                           variableName, declaration));
         }
         // handle component colors
         if (m.getComponentPropertyName() != null) {
-            ComponentColor cc = new ComponentColor(m.getComponentPropertyName(),
-                    variableName, m.getSaturationOffset(),
-                    m.getBrightnessOffset(), m.getAlphaOffset());
+            ComponentColor cc = m.createComponentColor(variableName);
             int index = componentColors.indexOf(cc);
             if (index == -1) {
                 index = componentColors.size();
@@ -504,20 +453,7 @@ public class PainterGenerator {
         }
     }
 
-    private String encodeColor(Color c) {
-        String declaration = ObjectCodeConvertors.convert(c);
-        String variableName = colors.get(declaration);
-        if (variableName == null) {
-            variableName = "color" + colorCounter++;
-            colors.put(declaration, variableName);
-            colorCode.append("    private Color ").append(variableName).append(" = ");
-            colorCode.append(declaration).append(";\n");
-        }
-
-        return variableName;
-    }
-
-    private String encodeGradient(PaintedShape ps, Gradient g) {
+    private String encodeGradient(Shape ps, Gradient g) {
         StringBuilder b = new StringBuilder();
         float x1 = (float)ps.getPaintX1();
         float y1 = (float)ps.getPaintY1();
@@ -633,7 +569,7 @@ public class PainterGenerator {
         b.append("}");
     }
 
-    private String encodeRadial(PaintedShape ps, RadialGradient g) {
+    private String encodeRadial(Shape ps, RadialGradient g) {
         float centerX1 = (float)ps.getPaintX1();
         float centerY1 = (float)ps.getPaintY1();
         float x2 = (float)ps.getPaintX2();
@@ -669,15 +605,14 @@ public class PainterGenerator {
     }
 
     //note that this method is not thread-safe. In fact, none of this class is.
-    static void writePainter(UIRegion r, Map<String, String> variables, File painterPackageRoot, String prefix) throws IOException {
+    public static void writePainter(UIRegion r, String painterName) {
         //Need only write out the stuff for this region, don't need to worry about subregions
         //since this method will be called for each of those (and they go in their own file, anyway).
         //The only subregion that we compound into this is the one for icons.
-
-        String painterName = makePretty(prefix) + "Painter";
         PainterGenerator gen = new PainterGenerator(r);
         System.out.println("Generating source file: " + painterName + ".java");
-        System.out.println(gen.stateTypeCode.toString());
+
+        Map<String, String> variables = Generator.getVariables();
         variables.put("PAINTER_NAME", painterName);
         variables.put("STATIC_DECL", gen.stateTypeCode.toString());
         variables.put("COLORS_DECL", gen.colorCode.toString());
@@ -687,72 +622,6 @@ public class PainterGenerator {
         variables.put("SHAPES_DECL", gen.shapesCode.toString());
         variables.put("GRADIENTS_DECL", gen.gradientsCode.toString());
 
-        writeSrcFile(getPainterImplTemplate(), variables, new File(painterPackageRoot, painterName + ".java"));
-
-        variables.remove("PAINTER_NAME");
-        variables.remove("STATIC_DECL");
-        variables.remove("COLORS_DECL");
-        variables.remove("DO_PAINT_SWITCH_BODY");
-        variables.remove("PAINTING_DECL");
-        variables.remove("SHAPES_DECL");
-        variables.remove("GRADIENTS_DECL");
-    }
-
-    /**
-     * Represents the usage of a color from a component within a painter. That
-     * is, a painter can use colors from the component when it paints. This
-     * class represents the usage of such a color, containing a reference to
-     * the name of the property that contains the color, and the various
-     * derivation offsets to apply to that color.
-     */
-    private static class ComponentColor {
-        public String propertyName;
-        public String defaultColorVariableName;
-        private float saturationOffset = 0, brightnessOffset = 0;
-        private int alphaOffset = 0;
-
-        private ComponentColor(String propertyName,
-                               String defaultColorVariableName,
-                               float saturationOffset,
-                               float brightnessOffset,
-                               int alphaOffset) {
-            this.propertyName = propertyName;
-            this.defaultColorVariableName = defaultColorVariableName;
-            this.saturationOffset = saturationOffset;
-            this.brightnessOffset = brightnessOffset;
-            this.alphaOffset = alphaOffset;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-
-            ComponentColor c = (ComponentColor)o;
-            if (alphaOffset != c.alphaOffset) return false;
-            if (Float.compare(saturationOffset, c.saturationOffset) != 0)
-                return false;
-            if (Float.compare(brightnessOffset, c.brightnessOffset) != 0)
-                return false;
-            if (defaultColorVariableName != null ?
-                    !defaultColorVariableName.equals(c.defaultColorVariableName) :
-                    c.defaultColorVariableName != null) return false;
-            if (propertyName != null ? !propertyName.equals(c.propertyName) :
-                    c.propertyName != null) return false;
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int hash = 5;
-            hash = 61 * hash + (this.propertyName != null ?
-                this.propertyName.hashCode() : 0);
-            hash = 61 * hash + (this.defaultColorVariableName != null ?
-                this.defaultColorVariableName.hashCode() : 0);
-            hash = 61 * hash + Float.floatToIntBits(this.saturationOffset);
-            hash = 61 * hash + Float.floatToIntBits(this.brightnessOffset);
-            hash = 61 * hash + this.alphaOffset;
-            return hash;
-        }
+        Generator.writeSrcFile("PainterImpl", variables, painterName);
     }
 }
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/Shape.java b/jdk/make/tools/src/build/tools/generatenimbus/Shape.java
new file mode 100644
index 00000000000..46e1a08bd68
--- /dev/null
+++ b/jdk/make/tools/src/build/tools/generatenimbus/Shape.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package build.tools.generatenimbus;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+
+
+public abstract class Shape {
+    @XmlElement
+    private PaintPoints paintPoints;
+    public double getPaintX1() { return paintPoints.x1; }
+    public double getPaintX2() { return paintPoints.x2; }
+    public double getPaintY1() { return paintPoints.y1; }
+    public double getPaintY2() { return paintPoints.y2; }
+
+    @XmlElements({
+        @XmlElement(name = "matte", type = Matte.class),
+        @XmlElement(name = "gradient", type = Gradient.class),
+        @XmlElement(name = "radialGradient", type = RadialGradient.class)
+    })
+    private Paint paint;
+    public Paint getPaint() { return paint; }
+
+    static class PaintPoints {
+        @XmlAttribute double x1;
+        @XmlAttribute double y1;
+        @XmlAttribute double x2;
+        @XmlAttribute double y2;
+    }
+}
+
+class Point {
+    @XmlAttribute private double x;
+    public double getX() { return x; }
+
+    @XmlAttribute private double y;
+    public double getY() { return y; }
+
+    @XmlAttribute(name="cp1x") private double cp1x;
+    public double getCp1X() { return cp1x; }
+
+    @XmlAttribute(name="cp1y") private double cp1y;
+    public double getCp1Y() { return cp1y; }
+
+    @XmlAttribute(name="cp2x") private double cp2x;
+    public double getCp2X() { return cp2x; }
+
+    @XmlAttribute(name="cp2y") private double cp2y;
+    public double getCp2Y() { return cp2y; }
+
+    public boolean isP1Sharp() {
+        return cp1x == x && cp1y == y;
+    }
+
+    public boolean isP2Sharp() {
+        return cp2x == x && cp2y == y;
+    }
+}
+
+class Path extends Shape {
+    @XmlElement(name="point")
+    @XmlElementWrapper(name="points")
+    private List<Point> controlPoints = new ArrayList<Point>();
+    public List<Point> getControlPoints() { return controlPoints; }
+}
+
+class Rectangle extends Shape {
+    @XmlAttribute private double x1;
+    public double getX1() { return x1; }
+
+    @XmlAttribute private double x2;
+    public double getX2() { return x2; }
+
+    @XmlAttribute private double y1;
+    public double getY1() { return y1; }
+
+    @XmlAttribute private double y2;
+    public double getY2() { return y2; }
+
+    @XmlAttribute
+    public double getRounding() {
+        double rounding = Math.abs(roundingX - x1) * 2;
+        return rounding > 2 ? rounding : 0;
+    }
+
+    public void setRounding(double rounding) {
+        if (rounding > 0 && rounding < 2) {
+            rounding = 0;
+        }
+        roundingX = rounding / 2d + x1;
+    }
+    private double roundingX;
+
+    public boolean isRounded() {
+        return getRounding() > 0;
+    }
+
+}
+
+class Ellipse extends Shape {
+    @XmlAttribute private double x1;
+    public double getX1() { return x1; }
+
+    @XmlAttribute private double x2;
+    public double getX2() { return x2; }
+
+    @XmlAttribute private double y1;
+    public double getY1() { return y1; }
+
+    @XmlAttribute private double y2;
+    public double getY2() { return y2; }
+}
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/SynthModel.java b/jdk/make/tools/src/build/tools/generatenimbus/SynthModel.java
new file mode 100644
index 00000000000..6fbaa01f14c
--- /dev/null
+++ b/jdk/make/tools/src/build/tools/generatenimbus/SynthModel.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package build.tools.generatenimbus;
+
+import java.awt.Font;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.*;
+
+
+@XmlRootElement(name="synthModel")
+public class SynthModel {
+    @XmlElement private UIStyle style;
+
+    @XmlElement(name="uiColor")
+    @XmlElementWrapper(name="colors")
+    private ArrayList<UIColor> colors;
+
+    @XmlElement(name="uiFont")
+    @XmlElementWrapper(name="fonts")
+    private ArrayList<UIFont> fonts;
+
+    @XmlElement(name="uiComponent")
+    @XmlElementWrapper(name="components")
+    private ArrayList<UIComponent> components;
+
+    public void initStyles() {
+        for (UIComponent c: components) {
+            c.initStyles(this.style);
+        }
+    }
+
+    public void write(StringBuilder defBuffer, StringBuilder styleBuffer, String packageName) {
+        defBuffer.append("        //Color palette\n");
+        for (UIColor c: colors) defBuffer.append(c.write());
+        defBuffer.append('\n');
+
+        defBuffer.append("        //Font palette\n");
+        defBuffer.append("        d.put(\"defaultFont\", new FontUIResource(defaultFont));\n");
+        for (UIFont f: fonts) defBuffer.append(f.write());
+        defBuffer.append('\n');
+
+        defBuffer.append("        //Border palette\n");
+        defBuffer.append('\n');
+
+        defBuffer.append("        //The global style definition\n");
+        defBuffer.append(style.write(""));
+        defBuffer.append('\n');
+
+        for (UIComponent c: components) {
+            String prefix = Utils.escape(c.getKey());
+            defBuffer.append("        //Initialize ").append(prefix).append("\n");
+            c.write(defBuffer, styleBuffer, c, prefix, packageName);
+            defBuffer.append('\n');
+        }
+    }
+}
+
+class Typeface {
+    public enum DeriveStyle {
+        Default, Off, On;
+
+        @Override public String toString() {
+            switch (this) {
+                default:  return "null";
+                case On:  return "true";
+                case Off: return "false";
+            }
+        }
+    }
+
+    @XmlAttribute private String uiDefaultParentName;
+    @XmlAttribute(name="family") private String name;
+    @XmlAttribute private int size;
+    @XmlAttribute private DeriveStyle bold = DeriveStyle.Default;
+    @XmlAttribute private DeriveStyle italic = DeriveStyle.Default;
+    @XmlAttribute private float sizeOffset = 1f;
+
+    public boolean isAbsolute() {
+        return uiDefaultParentName == null;
+    }
+
+    public String write() {
+        if (isAbsolute()) {
+            int style = Font.PLAIN;
+            if (bold == DeriveStyle.On) {
+                style = style | Font.BOLD;
+            }
+            if (italic == DeriveStyle.On) {
+                style = style | Font.ITALIC;
+            }
+
+            return String.format(
+                    "new javax.swing.plaf.FontUIResource(\"%s\", %d, %d)",
+                    name, style, size);
+        } else {
+            return String.format(
+                    "new DerivedFont(\"%s\", %sf, %s, %s)",
+                    uiDefaultParentName, String.valueOf(sizeOffset), bold, italic);
+        }
+    }
+}
+
+class Border {
+    enum BorderType {
+        @XmlEnumValue("empty") EMPTY,
+        @XmlEnumValue("painter") PAINTER
+    }
+    @XmlAttribute private BorderType type;
+    @XmlAttribute private String painter;
+    @XmlAttribute private int top;
+    @XmlAttribute private int left;
+    @XmlAttribute private int bottom;
+    @XmlAttribute private int right;
+
+    public String write() {
+        switch (type) {
+            case PAINTER:
+                return String.format("new PainterBorder(\"%s\", new Insets(%d, %d, %d, %d))",
+                                     painter, top, left, bottom, right);
+            case EMPTY:
+                return String.format("BorderFactory.createEmptyBorder(%d, %d, %d, %d)",
+                                     top, left, bottom, right);
+            default:
+                return "### Look, here's an unknown border! $$$";
+        }
+    }
+}
+
+class Insets {
+    @XmlAttribute int top;
+    @XmlAttribute int left;
+    @XmlAttribute int bottom;
+    @XmlAttribute int right;
+
+    public Insets() {
+        this(0, 0, 0, 0);
+    }
+
+    public Insets(int top, int left, int bottom, int right) {
+        this.top = top;
+        this.left = left;
+        this.bottom = bottom;
+        this.right = right;
+    }
+
+    public String write(boolean uiResource) {
+        String uiSuffix = (uiResource ? "UIResource" : "");
+        return String.format("new Insets%s(%d, %d, %d, %d)",
+                             uiSuffix, top, left, bottom, right);
+    }
+}
+
+class Dimension {
+    @XmlAttribute int width;
+    @XmlAttribute int height;
+
+    public String write(boolean uiResource) {
+        String uiSuffix = (uiResource ? "UIResource" : "");
+        return String.format("new Dimension%s(%d, %d)", uiSuffix, width, height);
+    }
+}
+
+class Canvas {
+    @XmlElement private Dimension size;
+    public Dimension getSize() { return size; }
+
+    @XmlElement(name="layer") private List<Layer> layers;
+    public List<Layer> getLayers() { return layers; }
+
+    @XmlElement private Insets stretchingInsets = null;
+    public Insets getStretchingInsets() { return stretchingInsets; }
+
+    public boolean isBlank() {
+        return layers.size() == 0 || (layers.size() == 1 && layers.get(0).isEmpty());
+    }
+}
+
+class Layer {
+    /** List of shapes in this layer, first shape is painted on top */
+    @XmlElements({
+        @XmlElement(name = "ellipse", type = Ellipse.class),
+        @XmlElement(name = "path", type = Path.class),
+        @XmlElement(name = "rectangle", type = Rectangle.class)
+    })
+    @XmlElementWrapper(name="shapes")
+    private List<Shape> shapes = new ArrayList<Shape>();
+    public List<Shape> getShapes() { return shapes; }
+
+    public boolean isEmpty() {
+        return shapes.isEmpty();
+    }
+}
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIDefault.java b/jdk/make/tools/src/build/tools/generatenimbus/UIDefault.java
new file mode 100644
index 00000000000..10560a011dc
--- /dev/null
+++ b/jdk/make/tools/src/build/tools/generatenimbus/UIDefault.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package build.tools.generatenimbus;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+
+public class UIDefault<T> {
+    @XmlAttribute private String name;
+    private T value;
+
+    public String getName() {
+        return name;
+    }
+
+    public T getValue() {
+        return value;
+    }
+
+    public void setValue(T value) {
+        this.value = value;
+    }
+}
+
+class UIColor extends UIDefault<Matte> {
+
+    @XmlElement
+    public void setMatte(Matte m) {
+        setValue(m);
+    }
+
+    public String write() {
+        return String.format("        addColor(d, \"%s\", %s);\n",
+                             getName(), getValue().write());
+    }
+}
+
+class UIFont extends UIDefault<Typeface> {
+    @XmlElement
+    public void setTypeface(Typeface t) {
+        setValue(t);
+    }
+
+    public String write() {
+        return String.format("        d.put(\"%s\", %s);\n",
+                             getName(), getValue().write());
+    }
+}
+
+class UIProperty extends UIDefault<String> {
+    public static enum PropertyType {
+        BOOLEAN, INT, FLOAT, DOUBLE, STRING, FONT, COLOR, INSETS, DIMENSION, BORDER
+    }
+    @XmlAttribute private PropertyType type;
+
+    @XmlElement private Border border;
+    @XmlElement private Dimension dimension;
+    @XmlElement private Insets insets;
+    @XmlElement private Matte matte;
+    @XmlElement private Typeface typeface;
+
+    @XmlAttribute
+    @Override public void setValue(String value) {
+        super.setValue(value);
+    }
+
+    public String write(String prefix) {
+        switch (type) {
+            case BOOLEAN:
+                return String.format("        d.put(\"%s%s\", Boolean.%s);\n",
+                                     prefix, getName(), getValue().toUpperCase());  ///autobox
+            case STRING:
+                return String.format("        d.put(\"%s%s\", \"%s\");\n",
+                                     prefix, getName(), getValue());
+            case INT:
+                return String.format("        d.put(\"%s%s\", new Integer(%s));\n",
+                                     prefix, getName(), getValue());
+            case FLOAT:
+                return String.format("        d.put(\"%s%s\", new Float(%sf));\n",
+                                     prefix, getName(), getValue());
+            case DOUBLE:
+                return String.format("        d.put(\"%s%s\", new Double(%s));\n",
+                                     prefix, getName(), getValue());
+            case COLOR:
+                return String.format("        addColor(d, \"%s%s\", %s);\n",
+                                     prefix, getName(), matte.write());
+            case FONT:
+                return String.format("        d.put(\"%s%s\", %s);\n",
+                                     prefix, getName(), typeface.write());
+            case INSETS:
+                return String.format("        d.put(\"%s%s\", %s);\n",
+                                     prefix, getName(), insets.write(true));
+            case DIMENSION:
+                return String.format("        d.put(\"%s%s\", new DimensionUIResource(%d, %d));\n",
+                                     prefix, getName(), dimension.width, dimension.height);
+            case BORDER:
+                return String.format("        d.put(\"%s%s\", new BorderUIResource(%s));\n",
+                                     prefix, getName(), border.write());
+            default:
+                return "###  Look, something's wrong with UIProperty.write()  $$$";
+        }
+    }
+}
diff --git a/jdk/make/tools/src/build/tools/generatenimbus/UIStyle.java b/jdk/make/tools/src/build/tools/generatenimbus/UIStyle.java
new file mode 100644
index 00000000000..1e5c5043f6c
--- /dev/null
+++ b/jdk/make/tools/src/build/tools/generatenimbus/UIStyle.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package build.tools.generatenimbus;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlElements;
+
+
+class UIStyle {
+    public static enum CacheMode {
+        NO_CACHING, FIXED_SIZES, NINE_SQUARE_SCALE
+    }
+
+    @XmlElement private UIColor textForeground = null;
+    @XmlElement(name="inherit-textForeground")
+    private boolean textForegroundInherited = true;
+
+    @XmlElement private UIColor textBackground = null;
+    @XmlElement(name="inherit-textBackground")
+    private boolean textBackgroundInherited = true;
+
+    @XmlElement private UIColor background = null;
+    @XmlElement(name="inherit-background")
+    private boolean backgroundInherited = true;
+
+    @XmlElement private boolean cacheSettingsInherited = true;
+    @XmlElement CacheMode cacheMode = CacheMode.FIXED_SIZES;
+    @XmlElement String maxHozCachedImgScaling = "1.0";
+    @XmlElement String maxVertCachedImgScaling = "1.0";
+
+    @XmlElement(name="uiProperty")
+    @XmlElementWrapper(name="uiproperties")
+    private List<UIProperty> uiProperties = new ArrayList<UIProperty>();
+
+    private UIStyle parentStyle = null;
+    public void setParentStyle(UIStyle parentStyle) {
+        this.parentStyle = parentStyle;
+    }
+
+    public CacheMode getCacheMode() {
+        if (cacheSettingsInherited) {
+            return (parentStyle == null ?
+                CacheMode.FIXED_SIZES : parentStyle.getCacheMode());
+        } else {
+            return cacheMode;
+        }
+    }
+
+    public String getMaxHozCachedImgScaling() {
+        if (cacheSettingsInherited) {
+            return (parentStyle == null ?
+                "1.0" : parentStyle.getMaxHozCachedImgScaling());
+        } else {
+            return maxHozCachedImgScaling;
+        }
+    }
+
+    public String getMaxVertCachedImgScaling() {
+        if (cacheSettingsInherited) {
+            return (parentStyle == null ?
+                "1.0" : parentStyle.getMaxVertCachedImgScaling());
+        } else {
+            return maxVertCachedImgScaling;
+        }
+    }
+
+    public String write(String prefix) {
+        StringBuilder sb = new StringBuilder();
+        if (! textForegroundInherited) {
+            sb.append(String.format("        addColor(d, \"%s%s\", %s);\n",
+                    prefix, "textForeground", textForeground.getValue().write()));
+        }
+        if (! textBackgroundInherited) {
+            sb.append(String.format("        addColor(d, \"%s%s\", %s);\n",
+                    prefix, "textBackground", textBackground.getValue().write()));
+        }
+        if (! backgroundInherited) {
+            sb.append(String.format("        addColor(d, \"%s%s\", %s);\n",
+                    prefix, "background", background.getValue().write()));
+        }
+        for (UIProperty property : uiProperties) {
+            sb.append(property.write(prefix));
+        }
+        return sb.toString();
+    }
+}
+
+class UIRegion {
+    @XmlAttribute protected String name;
+    @XmlAttribute protected String key;
+    @XmlAttribute private boolean opaque = false;
+
+    @XmlElement private Insets contentMargins = new Insets(0, 0, 0, 0);
+
+    @XmlElement(name="state")
+    @XmlElementWrapper(name="backgroundStates")
+    protected List<UIState> backgroundStates = new ArrayList<UIState>();
+    public List<UIState> getBackgroundStates() { return backgroundStates; }
+
+    @XmlElement(name="state")
+    @XmlElementWrapper(name="foregroundStates")
+    protected List<UIState> foregroundStates = new ArrayList<UIState>();
+    public List<UIState> getForegroundStates() { return foregroundStates; }
+
+    @XmlElement(name="state")
+    @XmlElementWrapper(name="borderStates")
+    protected List<UIState> borderStates = new ArrayList<UIState>();
+    public List<UIState> getBorderStates() { return borderStates; }
+
+    @XmlElement private UIStyle style = new UIStyle();
+
+    @XmlElements({
+        @XmlElement(name = "region", type = UIRegion.class),
+        @XmlElement(name = "uiComponent", type = UIComponent.class),
+        @XmlElement(name = "uiIconRegion", type = UIIconRegion.class)
+    })
+    @XmlElementWrapper(name="regions")
+    private List<UIRegion> subRegions = new ArrayList<UIRegion>();
+    public List<UIRegion> getSubRegions() { return subRegions; }
+
+    protected void initStyles(UIStyle parentStyle) {
+        style.setParentStyle(parentStyle);
+        for (UIState state: backgroundStates) {
+            state.getStyle().setParentStyle(this.style);
+        }
+        for (UIState state: foregroundStates) {
+            state.getStyle().setParentStyle(this.style);
+        }
+        for (UIState state: borderStates) {
+            state.getStyle().setParentStyle(this.style);
+        }
+        for (UIRegion region: subRegions) {
+            region.initStyles(this.style);
+        }
+    }
+
+    public String getKey() {
+        return key == null || "".equals(key) ? name : key;
+    }
+
+    private boolean hasCanvas() {
+        for (UIState s : backgroundStates) {
+            if (s.hasCanvas()) return true;
+        }
+        for (UIState s : borderStates) {
+            if (s.hasCanvas()) return true;
+        }
+        for (UIState s : foregroundStates) {
+            if (s.hasCanvas()) return true;
+        }
+        for (UIRegion r: subRegions) {
+            if (r.hasCanvas()) return true;
+        }
+        return false;
+    }
+
+    public void write(StringBuilder sb, StringBuilder styleBuffer,
+                      UIComponent comp, String prefix, String pkg) {
+        // write content margins
+        sb.append(String.format("        d.put(\"%s.contentMargins\", %s);\n",
+                                prefix, contentMargins.write(true)));
+        // write opaque if true
+        if (opaque) {
+            sb.append(String.format("        d.put(\"%s.opaque\", Boolean.TRUE);\n", prefix));
+        }
+
+        // register component with LAF
+        String regionCode = "Region." + Utils.regionNameToCaps(name);
+        styleBuffer.append(String.format("        register(%s, \"%s\");\n",
+                                         regionCode, prefix));
+
+        //write the State, if necessary
+        StringBuffer regString = new StringBuffer();
+        List<UIStateType> types = comp.getStateTypes();
+        if (types != null && types.size() > 0) {
+            for (UIStateType type : types) {
+                regString.append(type.getKey());
+                regString.append(",");
+            }
+            //remove the last ","
+            regString.deleteCharAt(regString.length() - 1);
+        }
+
+        if (! regString.equals("Enabled,MouseOver,Pressed,Disabled,Focused,Selected,Default") && types.size() > 0) {
+            //there were either custom states, or the normal states were in a custom order
+            //so go ahead and write out prefix.State
+            sb.append(String.format("        d.put(\"%s.States\", \"%s\");\n",
+                                    prefix, regString));
+        }
+
+        // write out any custom states, if necessary
+        for (UIStateType type : types) {
+            String synthState = type.getKey();
+            if (! "Enabled".equals(synthState) &&
+                ! "MouseOver".equals(synthState) &&
+                ! "Pressed".equals(synthState) &&
+                ! "Disabled".equals(synthState) &&
+                ! "Focused".equals(synthState) &&
+                ! "Selected".equals(synthState) &&
+                ! "Default".equals(synthState)) {
+
+                //what we have here, gentlemen, is a bona-fide custom state.
+                //if the type is not one of the standard types, then construct a name for
+                //the new type, and write out a new subclass of State.
+                String className = Utils.normalize(prefix) + synthState + "State";
+                sb.append(String.format("        d.put(\"%s.%s\", new %s());\n",
+                                        prefix, synthState, className));
+
+                String body = type.getCodeSnippet();
+                Map<String, String> variables = Generator.getVariables();
+                variables.put("STATE_NAME", className);
+                variables.put("STATE_KEY", synthState);
+                variables.put("BODY", body);
+
+                Generator.writeSrcFile("StateImpl", variables, className);
+            }
+        }
+
+        // write style
+        sb.append(style.write(prefix + '.'));
+
+        String fileName = Utils.normalize(prefix) + "Painter";
+        boolean hasCanvas = hasCanvas();
+        if (hasCanvas) {
+            PainterGenerator.writePainter(this, fileName);
+        }
+        // write states ui defaults
+        for (UIState state : backgroundStates) {
+            state.write(sb, prefix, pkg, fileName, "background");
+        }
+        for (UIState state : foregroundStates) {
+            state.write(sb, prefix, pkg, fileName, "foreground");
+        }
+        for (UIState state : borderStates) {
+            state.write(sb, prefix, pkg, fileName, "border");
+        }
+
+        // handle sub regions
+        for (UIRegion subreg : subRegions) {
+            String p = prefix;
+            if (! (subreg instanceof UIIconRegion)) {
+                p = prefix + ":" + Utils.escape(subreg.getKey());
+            }
+            UIComponent c = comp;
+            if (subreg instanceof UIComponent) {
+                c = (UIComponent) subreg;
+            }
+            subreg.write(sb, styleBuffer, c, p, pkg);
+        }
+    }
+}
+
+class UIIconRegion extends UIRegion {
+    @XmlAttribute private String basicKey;
+
+    @Override public void write(StringBuilder sb, StringBuilder styleBuffer, UIComponent comp, String prefix, String pkg) {
+        Dimension size = null;
+        String fileNamePrefix = Utils.normalize(prefix) + "Painter";
+        // write states ui defaults
+        for (UIState state : backgroundStates) {
+            Canvas canvas = state.getCanvas();
+            if (!canvas.isBlank()) {
+                state.write(sb, prefix, pkg, fileNamePrefix, getKey());
+                size = canvas.getSize();
+            }
+        }
+
+        if (size != null) {
+            // Put SynthIconImpl wrapper in UiDefaults
+            String k = (basicKey == null ? prefix + "." + getKey() : basicKey);
+            sb.append(String.format(
+                    "        d.put(\"%s\", new NimbusIcon(\"%s\", \"%sPainter\", %d, %d));\n",
+                    k, prefix, getKey(), size.width, size.height));
+        }
+    }
+}
+
+class UIComponent extends UIRegion {
+    @XmlAttribute private String componentName;
+
+    @XmlElement(name="stateType")
+    @XmlElementWrapper(name="stateTypes")
+    private List<UIStateType> stateTypes = new ArrayList<UIStateType>();
+    public List<UIStateType> getStateTypes() { return stateTypes; }
+
+    @Override public String getKey() {
+        if (key == null || "".equals(key)) {
+            if (componentName == null || "".equals(componentName)) {
+                return name;
+            } else {
+                return "\"" + componentName + "\"";
+            }
+        } else {
+            return key;
+        }
+    }
+}
+
+class UIState {
+    @XmlAttribute private String stateKeys;
+    public String getStateKeys() { return stateKeys; }
+
+    /** Indicates whether to invert the meaning of the 9-square stretching insets */
+    @XmlAttribute private boolean inverted;
+
+    /** A cached string representing the list of stateKeys deliminated with "+" */
+    private String cachedName = null;
+
+    @XmlElement private Canvas canvas;
+    public Canvas getCanvas() { return canvas; }
+
+    @XmlElement private UIStyle style;
+    public UIStyle getStyle() { return style; }
+
+    public boolean hasCanvas() {
+        return ! canvas.isBlank();
+    }
+
+    public static List<String> stringToKeys(String keysString) {
+        return Arrays.asList(keysString.split("\\+"));
+    }
+
+    public String getName() {
+        if (cachedName == null) {
+            StringBuilder buf = new StringBuilder();
+            List<String> keys = stringToKeys(stateKeys);
+            Collections.sort(keys);
+            for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
+                buf.append(iter.next());
+                if (iter.hasNext()) {
+                    buf.append('+');
+                }
+            }
+            cachedName = buf.toString();
+        }
+        return cachedName;
+    }
+
+    public void write(StringBuilder sb, String prefix, String pkg, String fileNamePrefix, String painterPrefix) {
+        String statePrefix = prefix + "[" + getName() + "]";
+        // write state style
+        sb.append(style.write(statePrefix + '.'));
+        // write painter
+        if (hasCanvas()) {
+            writeLazyPainter(sb, statePrefix, pkg, fileNamePrefix, painterPrefix);
+        }
+    }
+
+    private void writeLazyPainter(StringBuilder sb, String statePrefix, String packageNamePrefix, String fileNamePrefix, String painterPrefix) {
+        String cacheModeString = "AbstractRegionPainter.PaintContext.CacheMode." + style.getCacheMode();
+        String stateConstant = Utils.statesToConstantName(painterPrefix + "_" + stateKeys);
+        sb.append(String.format(
+                "        d.put(\"%s.%sPainter\", new LazyPainter(\"%s.%s\", %s.%s, %s, %s, %b, %s, %s, %s));\n",
+                statePrefix, painterPrefix, packageNamePrefix, fileNamePrefix,
+                fileNamePrefix, stateConstant, canvas.getStretchingInsets().write(false),
+                canvas.getSize().write(false), inverted, cacheModeString,
+                Utils.formatDouble(style.getMaxHozCachedImgScaling()),
+                Utils.formatDouble(style.getMaxVertCachedImgScaling())));
+    }
+}
+
+class UIStateType {
+    @XmlAttribute private String key;
+    public String getKey() { return key; }
+
+    @XmlElement private String codeSnippet;
+    public String getCodeSnippet() { return codeSnippet; }
+}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/GeneratorUtils.java b/jdk/make/tools/src/build/tools/generatenimbus/Utils.java
similarity index 59%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/GeneratorUtils.java
rename to jdk/make/tools/src/build/tools/generatenimbus/Utils.java
index 0d0fb75f52a..09599303cae 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/GeneratorUtils.java
+++ b/jdk/make/tools/src/build/tools/generatenimbus/Utils.java
@@ -22,158 +22,61 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.generator;
 
+package build.tools.generatenimbus;
+
+import java.util.ArrayList;
+import java.util.List;
 import javax.swing.plaf.synth.Region;
-import javax.swing.plaf.synth.SynthConstants;
 
-/**
- * GeneratorUtils
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-class GeneratorUtils {
-    private GeneratorUtils() {}
+public class Utils {
 
-    /**
-     * Given a synth state, create the appropriate name as it would be used for a ui default key.
-     * <p/>
-     * For example:
-     * <p/>
-     * enabled enabled+over enabled+over+selected
-     */
-    static String toUIDefaultKey(int state) {
-        StringBuffer buffer = new StringBuffer();
-        if ((state & SynthConstants.DEFAULT) == SynthConstants.DEFAULT) {
-            buffer.append("default");
-        }
-        if ((state & SynthConstants.DISABLED) == SynthConstants.DISABLED) {
-            if (buffer.length() > 0) buffer.append("+");
-            buffer.append("disabled");
-        }
-        if ((state & SynthConstants.ENABLED) == SynthConstants.ENABLED) {
-            if (buffer.length() > 0) buffer.append("+");
-            buffer.append("enabled");
-        }
-        if ((state & SynthConstants.FOCUSED) == SynthConstants.FOCUSED) {
-            if (buffer.length() > 0) buffer.append("+");
-            buffer.append("focused");
-        }
-        if ((state & SynthConstants.MOUSE_OVER) == SynthConstants.MOUSE_OVER) {
-            if (buffer.length() > 0) buffer.append("+");
-            buffer.append("over");
-        }
-        if ((state & SynthConstants.PRESSED) == SynthConstants.PRESSED) {
-            if (buffer.length() > 0) buffer.append("+");
-            buffer.append("down");
-        }
-        if ((state & SynthConstants.SELECTED) == SynthConstants.SELECTED) {
-            if (buffer.length() > 0) buffer.append("+");
-            buffer.append("selected");
-        }
-        return buffer.toString();
+    public static String escape(String s) {
+        return s.replace("\"", "\\\"");
     }
 
-    //takes a states string of the form Enabled+Foo+Bar.
-    //removes any whitespace. Replaces the + signs with And.
-    static String toClassName(String states) {
-        String s = states.replace(" ", "");
-        s = states.replace("+", "And");
-        return s;
-    }
-
-    //takes a states string of the form Enabled+Foo+Bar.
-    //removes any whitespace. Replaces the + signs with _.
-    //capitalizes the whole lot
-    static String toConstantName(String states) {
-        String s = states.replace(" ", "");
-        s = states.replace("+", "_");
-        return s.toUpperCase();
-    }
-
-    /**
-     * Given a string "s" of the form:
-     *
-     * A.\"A.a\".B
-     *
-     * Make it such that:
-     *
-     * AAAB
-     *
-     * For example, ComboBox.\"ComboBox.arrowButton\" would become
-     * ComboBoxComboBoxArrowButton
-     *
-     * @param s
-     * @return
-     */
-    static String makePretty(String s) {
+    public static String normalize(String s) {
         char[] src = s.toCharArray();
-        char[] dst = new char[src.length];
-        int dstIndex = 0;
-        for (int i=0; i<src.length; i++) {
-            //if the src char is a period and there is a following character,
-            //make sure the character is capitalized.
-            if ((src[i] == '.' || src[i] == ':') && i < src.length -1) {
-                src[i+1] = Character.toUpperCase(src[i+1]);
-                continue;
+        StringBuilder buf = new StringBuilder();
+        List<String> parts = new ArrayList<String>();
+        boolean capitalize = false;
+
+        for (int i = 0; i < src.length; i++) {
+            switch (src[i]) {
+                case '\\':
+                case '"':
+                    break;
+                case '.':
+                    capitalize = true;
+                    break;
+                case ':':
+                    parts.add(buf.toString());
+                    buf.delete(0, buf.length());
+                    capitalize = true;
+                    break;
+                default:
+                    buf.append(capitalize ? Character.toUpperCase(src[i]) : src[i]);
+                    capitalize = false;
+                    break;
             }
-            //if the src char is one that is to be removed, skip it.
-            if (src[i] == '.' || src[i] == ':' || src[i] == '\\' || src[i] == '"') {
-                continue;
-            }
-            //copy over the current char.
-            dst[dstIndex++] = src[i];
         }
-        //at this point, dstIndex is 1 greater than the last valid index position in dst
-        //or in other words it represents the count.
-        return new String(dst, 0, dstIndex);
+        parts.add(buf.toString());
+
+        // Try to optimize long class names by omitting repeating prefixes, e.g.
+        // SliderTrackPainter.java instead of SliderSliderTrackPainter.java
+        String result = parts.get(0);
+        for (int i = 1; i < parts.size(); i++) {
+            String part = parts.get(i);
+            if (part.startsWith(result)) {
+                result = part;
+            } else {
+                result += part;
+            }
+        }
+        return result;
     }
 
-    /**
-     * Encodes the given synth state as if it were specified in java code, such as
-     * <p/>
-     * SynthConstants.ENABLED | SynthConstants.MOUSE_OVER
-     */
-    static String toJavaList(int state) {
-        StringBuffer buffer = new StringBuffer();
-        if ((state & SynthConstants.DEFAULT) == SynthConstants.DEFAULT) {
-            buffer.append("SynthConstants.DEFAULT");
-        }
-        if ((state & SynthConstants.DISABLED) == SynthConstants.DISABLED) {
-            if (buffer.length() > 0) buffer.append(" | ");
-            buffer.append("SynthConstants.DISABLED");
-        }
-        if ((state & SynthConstants.ENABLED) == SynthConstants.ENABLED) {
-            if (buffer.length() > 0) buffer.append(" | ");
-            buffer.append("SynthConstants.ENABLED");
-        }
-        if ((state & SynthConstants.FOCUSED) == SynthConstants.FOCUSED) {
-            if (buffer.length() > 0) buffer.append(" | ");
-            buffer.append("SynthConstants.FOCUSED");
-        }
-        if ((state & SynthConstants.MOUSE_OVER) == SynthConstants.MOUSE_OVER) {
-            if (buffer.length() > 0) buffer.append(" | ");
-            buffer.append("SynthConstants.MOUSE_OVER");
-        }
-        if ((state & SynthConstants.PRESSED) == SynthConstants.PRESSED) {
-            if (buffer.length() > 0) buffer.append(" | ");
-            buffer.append("SynthConstants.PRESSED");
-        }
-        if ((state & SynthConstants.SELECTED) == SynthConstants.SELECTED) {
-            if (buffer.length() > 0) buffer.append(" | ");
-            buffer.append("SynthConstants.SELECTED");
-        }
-        return buffer.toString();
-    }
-
-    /**
-     * Checks the given region name to discover if it is one of the standard synth regions. If so, return the name in
-     * caps and such. Otherwise, return a big fat null.
-     * <p/>
-     * I have to do this because, unfortunately, synth's Region doesn't implement equals.
-     */
-    static String getRegionNameCaps(String regionName) {
+    public static String regionNameToCaps(String regionName) {
         if (Region.ARROW_BUTTON.getName().equals(regionName)) {
             return "ARROW_BUTTON";
         } else if (Region.BUTTON.getName().equals(regionName)) {
@@ -289,7 +192,24 @@ class GeneratorUtils {
         } else if (Region.VIEWPORT.getName().equals(regionName)) {
             return "VIEWPORT";
         }
-        System.err.println("[Info] Couldn't find a Region for " + regionName);
-        return null;
+        throw new RuntimeException("Bad Region name " + regionName);
+    }
+
+    public static String statesToConstantName(String states) {
+        String s = states.replace(" ", "");
+        s = states.replace("+", "_");
+        return s.toUpperCase();
+    }
+
+    //takes a states string of the form Enabled+Foo+Bar.
+    //removes any whitespace. Replaces the + signs with And.
+    public static String statesToClassName(String states) {
+        String s = states.replace(" ", "");
+        s = states.replace("+", "And");
+        return s;
+    }
+
+    public static String formatDouble(String doubleValue) {
+        return doubleValue.replace("INF", "Double.POSITIVE_INFINITY");
     }
 }
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java b/jdk/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java
index 442019676dc..ea362356fc3 100644
--- a/jdk/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java
+++ b/jdk/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java
@@ -30,7 +30,7 @@ import java.io.*;
 
 abstract class AbstractNamedNode extends Node {
 
-    NameNode nameNode;
+    NameNode nameNode = null;
     String name;
 
     public String name() {
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/AltNode.java b/jdk/make/tools/src/build/tools/jdwpgen/AltNode.java
index b4aeae90b58..76b5ed423ff 100644
--- a/jdk/make/tools/src/build/tools/jdwpgen/AltNode.java
+++ b/jdk/make/tools/src/build/tools/jdwpgen/AltNode.java
@@ -30,7 +30,7 @@ import java.io.*;
 
 class AltNode extends AbstractGroupNode implements TypeNode {
 
-    SelectNode select;
+    SelectNode select = null;
 
     void constrain(Context ctx) {
         super.constrain(ctx);
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java b/jdk/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java
index 56ca041c4ff..86196612d37 100644
--- a/jdk/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java
+++ b/jdk/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java
@@ -33,13 +33,7 @@ class ConstantSetNode extends AbstractNamedNode {
     /**
      * The mapping between a constant and its value.
      */
-    protected static Map<String, String> constantMap;
-
-    ConstantSetNode(){
-        if (constantMap == null) {
-            constantMap = new HashMap<String, String>();
-        }
-    }
+    protected static final Map<String, String> constantMap = new HashMap<String, String>();
 
     void prune() {
         List<Node> addons = new ArrayList<Node>();
@@ -95,9 +89,6 @@ class ConstantSetNode extends AbstractNamedNode {
     }
 
     public static String getConstant(String key){
-        if (constantMap == null) {
-            return "";
-        }
         String com = constantMap.get(key);
         if(com == null){
             return "";
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/Main.java b/jdk/make/tools/src/build/tools/jdwpgen/Main.java
index 2562dd10da6..c7ce8e3c86d 100644
--- a/jdk/make/tools/src/build/tools/jdwpgen/Main.java
+++ b/jdk/make/tools/src/build/tools/jdwpgen/Main.java
@@ -25,13 +25,11 @@
 
 package build.tools.jdwpgen;
 
-import java.util.*;
 import java.io.*;
 
 class Main {
 
     static String specSource;
-    static Map nameMap = new HashMap();
     static boolean genDebug = true;
 
     static void usage() {
@@ -43,7 +41,6 @@ class Main {
         System.err.println("-doc <doc_output>");
         System.err.println("-jdi <java_output>");
         System.err.println("-include <include_file_output>");
-        System.exit(1);
     }
 
     public static void main(String args[]) throws IOException {
@@ -66,6 +63,7 @@ class Main {
                 } else {
                     System.err.println("Invalid option: " + arg);
                     usage();
+                    return;
                 }
             } else {
                 specSource = arg;
@@ -75,6 +73,7 @@ class Main {
         if (reader == null) {
             System.err.println("<spec_input> must be specified");
             usage();
+            return;
         }
 
         Parse parse = new Parse(reader);
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/Node.java b/jdk/make/tools/src/build/tools/jdwpgen/Node.java
index 2f79688186a..4dd33d07a11 100644
--- a/jdk/make/tools/src/build/tools/jdwpgen/Node.java
+++ b/jdk/make/tools/src/build/tools/jdwpgen/Node.java
@@ -36,7 +36,7 @@ abstract class Node {
     int lineno;
     List<String> commentList = new ArrayList<String>();
     Node parent = null;
-    Context context;
+    Context context = null;
 
     static final int maxStructIndent = 5;
     static int structIndent = 0; // horrible hack
@@ -82,7 +82,7 @@ abstract class Node {
     }
 
     void indent(PrintWriter writer, int depth) {
-        for (int i = depth; i > 0; --i) {
+        for (int i = 0; i < depth; i++) {
             writer.print("    ");
         }
     }
@@ -195,6 +195,6 @@ abstract class Node {
         System.err.println(Main.specSource + ":" + lineno + ": " +
                            kind + " - " + errmsg);
         System.err.println();
-        System.exit(1);
+        throw new RuntimeException("Error: " + errmsg);
     }
 }
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/Parse.java b/jdk/make/tools/src/build/tools/jdwpgen/Parse.java
index f5e3ebb9ed4..aac5b1f5290 100644
--- a/jdk/make/tools/src/build/tools/jdwpgen/Parse.java
+++ b/jdk/make/tools/src/build/tools/jdwpgen/Parse.java
@@ -146,8 +146,12 @@ class Parse {
                             Node node = (Node)proto.getClass().newInstance();
                             node.set(kind, list, izer.lineno());
                             return node;
-                        } catch (Exception exc) {
+                        } catch (InstantiationException exc) {
                             error(exc.toString());
+                            return null;
+                        } catch (IllegalAccessException exc) {
+                            error(exc.toString());
+                            return null;
                         }
                     }
                 } else {
@@ -166,6 +170,6 @@ class Parse {
     void error(String errmsg) {
         System.err.println(Main.specSource + ":" + izer.lineno() +
                            ": " + errmsg);
-        System.exit(1);
+        throw new RuntimeException("Error: " + errmsg);
     }
 }
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/RepeatNode.java b/jdk/make/tools/src/build/tools/jdwpgen/RepeatNode.java
index 107072a52d3..c841b913154 100644
--- a/jdk/make/tools/src/build/tools/jdwpgen/RepeatNode.java
+++ b/jdk/make/tools/src/build/tools/jdwpgen/RepeatNode.java
@@ -30,7 +30,7 @@ import java.io.*;
 
 class RepeatNode extends AbstractTypeNode {
 
-    Node member;
+    Node member = null;
 
     void constrain(Context ctx) {
         super.constrain(ctx);
diff --git a/jdk/make/tools/src/build/tools/jdwpgen/SelectNode.java b/jdk/make/tools/src/build/tools/jdwpgen/SelectNode.java
index cfe0c97cfe6..dd57afb7b07 100644
--- a/jdk/make/tools/src/build/tools/jdwpgen/SelectNode.java
+++ b/jdk/make/tools/src/build/tools/jdwpgen/SelectNode.java
@@ -30,7 +30,7 @@ import java.io.*;
 
 class SelectNode extends AbstractGroupNode implements TypeNode {
 
-    AbstractSimpleTypeNode typeNode;
+    AbstractSimpleTypeNode typeNode = null;
 
     void prune() {
         super.prune();
diff --git a/jdk/make/tools/swing-nimbus/Makefile b/jdk/make/tools/swing-nimbus/Makefile
deleted file mode 100644
index 36df571c5f5..00000000000
--- a/jdk/make/tools/swing-nimbus/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright 1998-2005 Sun Microsystems, Inc.  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.  Sun designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-
-#
-# Makefile for building the Nimbus generator
-#
-
-BUILDDIR = ../..
-PACKAGE = org.jdesktop.synthdesigner.generator
-PRODUCT = tools
-PROGRAM = nimbus_generator
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = classes
-BUILDTOOL_MAIN        = $(PKGDIR)/Generator.java
-
-#
-# Files
-#
-
-MAIN_CLASS_FILE = $(BUILDTOOLCLASSDIR)/$(BUILDTOOL_MAIN:%.java=%.class)
-SOURCE_FILES    = $(shell $(FIND) $(BUILDTOOL_SOURCE_ROOT) -name '*.java' -print)
-
-TEMPLATE_FILES  = $(SHARE_SRC)/classes/javax/swing/plaf/nimbus/Defaults.template \
-                  $(SHARE_SRC)/classes/javax/swing/plaf/nimbus/PainterImpl.template \
-                  $(SHARE_SRC)/classes/javax/swing/plaf/nimbus/StateImpl.template
-TEMPLATE_DEST   = $(BUILDTOOLCLASSDIR)/org/jdesktop/synthdesigner/generator/resources
-
-JIBX_FILES      = $(BUILDTOOL_SOURCE_ROOT)/org/jdesktop/swingx/designer/Designer.jibx.xml \
-                  $(BUILDTOOL_SOURCE_ROOT)/org/jdesktop/synthdesigner/synthmodel/SynthModel.jibx.xml
-JIBX_LIBS_CP    = $(JIBX_LIBS_PATH)/bcel.jar$(CLASSPATH_SEPARATOR)$(JIBX_LIBS_PATH)/xpp3.jar$(CLASSPATH_SEPARATOR)$(JIBX_LIBS_PATH)/jibx-bind.jar$(CLASSPATH_SEPARATOR)$(JIBX_LIBS_PATH)/jibx-run.jar
-JIBX_LIBS_LIST  = $(subst $(CLASSPATH_SEPARATOR), ,$(JIBX_LIBS_CP))
-
-
-#
-# Rules
-#
-
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
-$(MAIN_CLASS_FILE): $(SOURCE_FILES) $(JIBX_LIBS_LIST)
-	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
-	$(BOOT_JAVAC_CMD) -classpath "$(JIBX_LIBS_CP)" \
-	    -d $(BUILDTOOLCLASSDIR) -sourcepath $(BUILDTOOL_SOURCE_ROOT) \
-	    $(SOURCE_FILES)
-
-$(TEMPLATE_DEST): $(TEMPLATE_FILES)
-	$(MKDIR) -p $(TEMPLATE_DEST)
-	$(RM) $(TEMPLATE_DEST)/*.template
-	$(CP) $(TEMPLATE_FILES) $(TEMPLATE_DEST)
-
-$(BUILDTOOL_MANIFEST_FILE): $(MAIN_CLASS_FILE)
-	$(ECHO) "Main-Class: $(BUILTTOOL_MAINCLASS)" > $@
-	$(ECHO) "Class-Path: $(JIBX_LIBS_LIST:$(JIBX_LIBS_PATH)/%=%)" >> $@
-	$(CP) $(JIBX_LIBS_LIST) $(BUILDTOOLJARDIR)
-
-$(BUILDTOOL_JAR_FILE): $(MAIN_CLASS_FILE) $(TEMPLATE_DEST) \
-    $(JIBX_FILES) $(BUILDTOOL_MANIFEST_FILE)
-	@$(prep-target)
-	$(BOOT_JAVA_CMD) \
-	  -classpath "$(JIBX_LIBS_CP)$(CLASSPATH_SEPARATOR)$(BUILDTOOLCLASSDIR)" \
-	  org.jibx.binding.Compile $(JIBX_FILES)
-	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
-	    -C $(BUILDTOOLCLASSDIR) org \
-	    $(BOOT_JAR_JFLAGS) || $(RM) $@
-	@$(java-vm-cleanup)
-
-clean clobber::
-	$(RM) -r $(TEMPLATE_DEST)
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java
deleted file mode 100644
index 91325319b1a..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.beans;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.beans.PropertyVetoException;
-import java.beans.VetoableChangeListener;
-import java.beans.VetoableChangeSupport;
-
-/**
- * <p>A convenience class from which to extend all non-visual AbstractBeans. It
- * manages the PropertyChange notification system, making it relatively trivial
- * to add support for property change events in getters/setters.</p>
- *
- * <p>A non-visual java bean is a Java class that conforms to the AbstractBean
- * patterns to allow visual manipulation of the bean's properties and event
- * handlers at design-time.</p>
- *
- * <p>Here is a simple example bean that contains one property, foo, and the
- * proper pattern for implementing property change notification:
- * <pre><code>
- *  public class ABean extends AbstractBean {
- *    private String foo;
- *
- *    public void setFoo(String newFoo) {
- *      String old = getFoo();
- *      this.foo = newFoo;
- *      firePropertyChange("foo", old, getFoo());
- *    }
- *
- *    public String getFoo() {
- *      return foo;
- *    }
- *  }
- * </code></pre></p>
- *
- * <p>You will notice that "getFoo()" is used in the setFoo method rather than
- * accessing "foo" directly for the gets. This is done intentionally so that if
- * a subclass overrides getFoo() to return, for instance, a constant value the
- * property change notification system will continue to work properly.</p>
- *
- * <p>The firePropertyChange method takes into account the old value and the new
- * value. Only if the two differ will it fire a property change event. So you can
- * be assured from the above code fragment that a property change event will only
- * occur if old is indeed different from getFoo()</p>
- *
- * <p><code>AbstractBean</code> also supports {@link VetoablePropertyChange} events.
- * These events are similar to <code>PropertyChange</code> events, except a special
- * exception can be used to veto changing the property. For example, perhaps the
- * property is changing from "fred" to "red", but a listener deems that "red" is
- * unexceptable. In this case, the listener can fire a veto exception and the property must
- * remain "fred". For example:
- * <pre><code>
- *  public class ABean extends AbstractBean {
- *    private String foo;
- *
- *    public void setFoo(String newFoo) throws PropertyVetoException {
- *      String old = getFoo();
- *      this.foo = newFoo;
- *      fireVetoableChange("foo", old, getFoo());
- *    }
- *
- *    public String getFoo() {
- *      return foo;
- *    }
- *  }
- *
- *  public class Tester {
- *    public static void main(String... args) {
- *      try {
- *        ABean a = new ABean();
- *        a.setFoo("fred");
- *        a.addVetoableChangeListener(new VetoableChangeListener() {
- *          public void vetoableChange(PropertyChangeEvent evt) throws PropertyVetoException {
- *            if ("red".equals(evt.getNewValue()) {
- *              throw new PropertyVetoException("Cannot be red!", evt);
- *            }
- *          }
- *        }
- *        a.setFoo("red");
- *      } catch (Exception e) {
- *        e.printStackTrace(); // this will be executed
- *      }
- *    }
- *  }
- * </code></pre></p>
- *
- * @status REVIEWED
- * @author rbair
- */
-public abstract class AbstractBean {
-    /**
-     * Helper class that manages all the property change notification machinery.
-     * PropertyChangeSupport cannot be extended directly because it requires
-     * a bean in the constructor, and the "this" argument is not valid until
-     * after super construction. Hence, delegation instead of extension
-     */
-    private transient PropertyChangeSupport pcs;
-
-    /**
-     * Helper class that manages all the veto property change notification machinery.
-     */
-    private transient VetoableChangeSupport vcs;
-
-    /** Creates a new instance of AbstractBean */
-    protected AbstractBean() {
-        pcs = new PropertyChangeSupport(this);
-        vcs = new VetoableChangeSupport(this);
-    }
-
-    /**
-     * Creates a new instance of AbstractBean, using the supplied PropertyChangeSupport and
-     * VetoableChangeSupport delegates. Neither of these may be null.
-     */
-    protected AbstractBean(PropertyChangeSupport pcs, VetoableChangeSupport vcs) {
-        if (pcs == null) {
-            throw new NullPointerException("PropertyChangeSupport must not be null");
-        }
-        if (vcs == null) {
-            throw new NullPointerException("VetoableChangeSupport must not be null");
-        }
-
-        this.pcs = pcs;
-        this.vcs = vcs;
-    }
-
-    /**
-     * Add a PropertyChangeListener to the listener list.
-     * The listener is registered for all properties.
-     * The same listener object may be added more than once, and will be called
-     * as many times as it is added.
-     * If <code>listener</code> is null, no exception is thrown and no action
-     * is taken.
-     *
-     * @param listener  The PropertyChangeListener to be added
-     */
-    public final void addPropertyChangeListener(PropertyChangeListener listener) {
-        pcs.addPropertyChangeListener(listener);
-    }
-
-    /**
-     * Remove a PropertyChangeListener from the listener list.
-     * This removes a PropertyChangeListener that was registered
-     * for all properties.
-     * If <code>listener</code> was added more than once to the same event
-     * source, it will be notified one less time after being removed.
-     * If <code>listener</code> is null, or was never added, no exception is
-     * thrown and no action is taken.
-     *
-     * @param listener  The PropertyChangeListener to be removed
-     */
-    public final void removePropertyChangeListener(PropertyChangeListener listener) {
-        pcs.removePropertyChangeListener(listener);
-    }
-
-    /**
-     * Returns an array of all the listeners that were added to the
-     * PropertyChangeSupport object with addPropertyChangeListener().
-     * <p>
-     * If some listeners have been added with a named property, then
-     * the returned array will be a mixture of PropertyChangeListeners
-     * and <code>PropertyChangeListenerProxy</code>s. If the calling
-     * method is interested in distinguishing the listeners then it must
-     * test each element to see if it's a
-     * <code>PropertyChangeListenerProxy</code>, perform the cast, and examine
-     * the parameter.
-     *
-     * <pre>
-     * PropertyChangeListener[] listeners = bean.getPropertyChangeListeners();
-     * for (int i = 0; i < listeners.length; i++) {
-     *   if (listeners[i] instanceof PropertyChangeListenerProxy) {
-     *     PropertyChangeListenerProxy proxy =
-     *                    (PropertyChangeListenerProxy)listeners[i];
-     *     if (proxy.getPropertyName().equals("foo")) {
-     *       // proxy is a PropertyChangeListener which was associated
-     *       // with the property named "foo"
-     *     }
-     *   }
-     * }
-     *</pre>
-     *
-     * @see java.beans.PropertyChangeListenerProxy
-     * @return all of the <code>PropertyChangeListeners</code> added or an
-     *         empty array if no listeners have been added
-     */
-    public final PropertyChangeListener[] getPropertyChangeListeners() {
-        return pcs.getPropertyChangeListeners();
-    }
-
-    /**
-     * Add a PropertyChangeListener for a specific property.  The listener
-     * will be invoked only when a call on firePropertyChange names that
-     * specific property.
-     * The same listener object may be added more than once.  For each
-     * property,  the listener will be invoked the number of times it was added
-     * for that property.
-     * If <code>propertyName</code> or <code>listener</code> is null, no
-     * exception is thrown and no action is taken.
-     *
-     * @param propertyName  The name of the property to listen on.
-     * @param listener  The PropertyChangeListener to be added
-     */
-    public final void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-        pcs.addPropertyChangeListener(propertyName, listener);
-    }
-
-    /**
-     * Remove a PropertyChangeListener for a specific property.
-     * If <code>listener</code> was added more than once to the same event
-     * source for the specified property, it will be notified one less time
-     * after being removed.
-     * If <code>propertyName</code> is null,  no exception is thrown and no
-     * action is taken.
-     * If <code>listener</code> is null, or was never added for the specified
-     * property, no exception is thrown and no action is taken.
-     *
-     * @param propertyName  The name of the property that was listened on.
-     * @param listener  The PropertyChangeListener to be removed
-     */
-    public final void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-        pcs.removePropertyChangeListener(propertyName, listener);
-    }
-
-    /**
-     * Returns an array of all the listeners which have been associated
-     * with the named property.
-     *
-     * @param propertyName  The name of the property being listened to
-     * @return all of the <code>PropertyChangeListeners</code> associated with
-     *         the named property.  If no such listeners have been added,
-     *         or if <code>propertyName</code> is null, an empty array is
-     *         returned.
-     */
-    public final PropertyChangeListener[] getPropertyChangeListeners(String propertyName) {
-            return pcs.getPropertyChangeListeners(propertyName);
-    }
-
-    /**
-     * Report a bound property update to any registered listeners.
-     * No event is fired if old and new are equal and non-null.
-     *
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * firePropertyChange method that takes {@code
-     * PropertyChangeEvent} value.
-     *
-     * @param propertyName  The programmatic name of the property
-     *                      that was changed.
-     * @param oldValue  The old value of the property.
-     * @param newValue  The new value of the property.
-     */
-    protected final void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
-        pcs.firePropertyChange(propertyName, oldValue, newValue);
-    }
-
-    /**
-     * Fire an existing PropertyChangeEvent to any registered listeners.
-     * No event is fired if the given event's old and new values are
-     * equal and non-null.
-     * @param evt  The PropertyChangeEvent object.
-     */
-    protected final void firePropertyChange(PropertyChangeEvent evt) {
-        pcs.firePropertyChange(evt);
-    }
-
-
-    /**
-     * Report a bound indexed property update to any registered
-     * listeners.
-     * <p>
-     * No event is fired if old and new values are equal
-     * and non-null.
-     *
-     * <p>
-     * This is merely a convenience wrapper around the more general
-     * firePropertyChange method that takes {@code PropertyChangeEvent} value.
-     *
-     * @param propertyName The programmatic name of the property that
-     *                     was changed.
-     * @param index        index of the property element that was changed.
-     * @param oldValue     The old value of the property.
-     * @param newValue     The new value of the property.
-     */
-    protected final void fireIndexedPropertyChange(String propertyName,
-            int index, Object oldValue, Object newValue) {
-        pcs.fireIndexedPropertyChange(propertyName, index, oldValue, newValue);
-    }
-
-    /**
-     * Check if there are any listeners for a specific property, including
-     * those registered on all properties.  If <code>propertyName</code>
-     * is null, only check for listeners registered on all properties.
-     *
-     * @param propertyName  the property name.
-     * @return true if there are one or more listeners for the given property
-     */
-    protected final boolean hasPropertyChangeListeners(String propertyName) {
-        return pcs.hasListeners(propertyName);
-    }
-
-    /**
-     * Check if there are any listeners for a specific property, including
-     * those registered on all properties.  If <code>propertyName</code>
-     * is null, only check for listeners registered on all properties.
-     *
-     * @param propertyName  the property name.
-     * @return true if there are one or more listeners for the given property
-     */
-    protected final boolean hasVetoableChangeListeners(String propertyName) {
-        return vcs.hasListeners(propertyName);
-    }
-
-    /**
-     * Add a VetoableListener to the listener list.
-     * The listener is registered for all properties.
-     * The same listener object may be added more than once, and will be called
-     * as many times as it is added.
-     * If <code>listener</code> is null, no exception is thrown and no action
-     * is taken.
-     *
-     * @param listener  The VetoableChangeListener to be added
-     */
-
-    public final void addVetoableChangeListener(VetoableChangeListener listener) {
-        vcs.addVetoableChangeListener(listener);
-    }
-
-    /**
-     * Remove a VetoableChangeListener from the listener list.
-     * This removes a VetoableChangeListener that was registered
-     * for all properties.
-     * If <code>listener</code> was added more than once to the same event
-     * source, it will be notified one less time after being removed.
-     * If <code>listener</code> is null, or was never added, no exception is
-     * thrown and no action is taken.
-     *
-     * @param listener  The VetoableChangeListener to be removed
-     */
-    public final void removeVetoableChangeListener(VetoableChangeListener listener) {
-        vcs.removeVetoableChangeListener(listener);
-    }
-
-    /**
-     * Returns the list of VetoableChangeListeners. If named vetoable change listeners
-     * were added, then VetoableChangeListenerProxy wrappers will returned
-     * <p>
-     * @return List of VetoableChangeListeners and VetoableChangeListenerProxys
-     *         if named property change listeners were added.
-     */
-    public final VetoableChangeListener[] getVetoableChangeListeners(){
-        return vcs.getVetoableChangeListeners();
-    }
-
-    /**
-     * Add a VetoableChangeListener for a specific property.  The listener
-     * will be invoked only when a call on fireVetoableChange names that
-     * specific property.
-     * The same listener object may be added more than once.  For each
-     * property,  the listener will be invoked the number of times it was added
-     * for that property.
-     * If <code>propertyName</code> or <code>listener</code> is null, no
-     * exception is thrown and no action is taken.
-     *
-     * @param propertyName  The name of the property to listen on.
-     * @param listener  The VetoableChangeListener to be added
-     */
-
-    public final void addVetoableChangeListener(String propertyName,
-                VetoableChangeListener listener) {
-        vcs.addVetoableChangeListener(propertyName, listener);
-    }
-
-    /**
-     * Remove a VetoableChangeListener for a specific property.
-     * If <code>listener</code> was added more than once to the same event
-     * source for the specified property, it will be notified one less time
-     * after being removed.
-     * If <code>propertyName</code> is null, no exception is thrown and no
-     * action is taken.
-     * If <code>listener</code> is null, or was never added for the specified
-     * property, no exception is thrown and no action is taken.
-     *
-     * @param propertyName  The name of the property that was listened on.
-     * @param listener  The VetoableChangeListener to be removed
-     */
-
-    public final void removeVetoableChangeListener(String propertyName,
-                VetoableChangeListener listener) {
-        vcs.removeVetoableChangeListener(propertyName, listener);
-    }
-
-    /**
-     * Returns an array of all the listeners which have been associated
-     * with the named property.
-     *
-     * @param propertyName  The name of the property being listened to
-     * @return all the <code>VetoableChangeListeners</code> associated with
-     *         the named property.  If no such listeners have been added,
-     *         or if <code>propertyName</code> is null, an empty array is
-     *         returned.
-     */
-    public final VetoableChangeListener[] getVetoableChangeListeners(String propertyName) {
-        return vcs.getVetoableChangeListeners(propertyName);
-    }
-
-    /**
-     * Report a vetoable property update to any registered listeners.  If
-     * anyone vetos the change, then fire a new event reverting everyone to
-     * the old value and then rethrow the PropertyVetoException.
-     * <p>
-     * No event is fired if old and new are equal and non-null.
-     *
-     * @param propertyName  The programmatic name of the property
-     *                      that is about to change..
-     * @param oldValue  The old value of the property.
-     * @param newValue  The new value of the property.
-     * @exception PropertyVetoException if the recipient wishes the property
-     *              change to be rolled back.
-     */
-    protected final void fireVetoableChange(String propertyName,
-                                            Object oldValue, Object newValue)
-                                            throws PropertyVetoException {
-         vcs.fireVetoableChange(propertyName, oldValue, newValue);
-    }
-
-    /**
-     * Fire a vetoable property update to any registered listeners.  If
-     * anyone vetos the change, then fire a new event reverting everyone to
-     * the old value and then rethrow the PropertyVetoException.
-     * <p>
-     * No event is fired if old and new are equal and non-null.
-     *
-     * @param evt  The PropertyChangeEvent to be fired.
-     * @exception PropertyVetoException if the recipient wishes the property
-     *              change to be rolled back.
-     */
-    protected final void fireVetoableChange(PropertyChangeEvent evt)
-                    throws PropertyVetoException {
-        vcs.fireVetoableChange(evt);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public Object clone() throws CloneNotSupportedException {
-        AbstractBean result = (AbstractBean) super.clone();
-        result.pcs = new PropertyChangeSupport(result);
-        result.vcs = new VetoableChangeSupport(result);
-        return result;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java
deleted file mode 100644
index be2bc4efbd9..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import java.awt.BasicStroke;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * BezierControlPoint
- *
- * @author Created by Jasper Potts (May 29, 2007)
- */
-public class BezierControlPoint extends ControlPoint {
-    private HandleControlPoint cp1 = new HandleControlPoint();
-    private HandleControlPoint cp2 = new HandleControlPoint();
-    private transient boolean makingChange = false;
-    private transient PropertyChangeListener cpListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-//            if (!makingChange) {
-//                makingChange = true;
-//                if (evt.getSource() == cp1) {
-//                    double angle = Math.tan((cp1.getY() - getY())/(cp1.getX() - getX()));
-//                    double cp2len = Math.sqrt(
-//                            Math.pow(cp2.getX() - getX(),2) +
-//                            Math.pow(cp2.getY() - getY(),2)
-//                    );
-//                    double offsetX = cp2len * Math.sin(angle);
-//                    double offsetY = cp2len * Math.cos(angle);
-//                    cp2.setPosition(getX() - offsetX, getY() - offsetY);
-//                } else {
-//                    double angle = Math.tan((cp2.getY() - getY())/(cp2.getX() - getX()));
-//                    double cp1len = Math.sqrt(
-//                            Math.pow(cp1.getX() - getX(),2) +
-//                            Math.pow(cp1.getY() - getY(),2)
-//                    );
-//                    double offsetX = cp1len * Math.sin(angle);
-//                    double offsetY = cp1len * Math.cos(angle);
-//                    cp1.setPosition(getX() - offsetX, getY() - offsetY);
-//                }
-////                if (evt.getSource() == cp1) {
-////                    double offsetX = cp1.getX() - getX();
-////                    double offsetY = cp1.getY() - getY();
-////                    cp2.setPosition(getX() - offsetX, getY() - offsetY);
-////                } else {
-////                    double offsetX = cp2.getX() - getX();
-////                    double offsetY = cp2.getY() - getY();
-////                    cp1.setPosition(getX() - offsetX, getY() - offsetY);
-////                }
-//                makingChange = false;
-//                firePropertyChange("cp1", null, cp1);
-//                firePropertyChange("cp2", null, cp1);
-//            }
-            firePropertyChange("shape",null,getShape());
-        }
-    };
-
-    public BezierControlPoint() {
-        cp1.addPropertyChangeListener(cpListener);
-        cp2.addPropertyChangeListener(cpListener);
-    }
-
-    public BezierControlPoint(double x, double y) {
-        super(x, y);
-        cp1.addPropertyChangeListener(cpListener);
-        cp2.addPropertyChangeListener(cpListener);
-        cp1.setPosition(x, y);
-        cp2.setPosition(x, y);
-    }
-
-    public boolean isSharpCorner() {
-        return
-                (cp1.getX() == x.getValue()) &&
-                        (cp1.getY() == y.getValue()) &&
-                        (cp2.getX() == x.getValue()) &&
-                        (cp2.getY() == y.getValue());
-    }
-
-    public void flip(int width, int height){
-        makingChange = true;
-        if (width > 0){
-            x.setValue(width - x.getValue());
-            cp1.x.setValue(width - cp1.x.getValue());
-            cp2.x.setValue(width - cp2.x.getValue());
-        }
-        if (height > 0){
-            y.setValue(height - y.getValue());
-            cp1.y.setValue(height - cp1.y.getValue());
-            cp2.y.setValue(height - cp2.y.getValue());
-        }
-        makingChange = false;
-    }
-
-    public void convertToSharpCorner() {
-        cp1.setPosition(x.getValue(), y.getValue());
-        cp2.setPosition(x.getValue(), y.getValue());
-    }
-
-    public List<ControlPoint> getControlPoints() {
-        if (isSharpCorner()) {
-            return Collections.emptyList();
-        } else {
-            List<ControlPoint> points = new ArrayList<ControlPoint>();
-            points.add(cp1);
-            points.add(cp2);
-            return points;
-        }
-    }
-
-    public HandleControlPoint getCp1() {
-        return cp1;
-    }
-
-    public HandleControlPoint getCp2() {
-        return cp2;
-    }
-
-    public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-        g2.setStroke(new BasicStroke((float) pixelSize));
-        // paint control line
-        g2.setColor(GraphicsHelper.BEZIER_CONTROL_LINE);
-        g2.draw(new Line2D.Double(cp1.getX(), cp1.getY(), getX(), getY()));
-        g2.draw(new Line2D.Double(getX(), getY(), cp2.getX(), cp2.getY()));
-        // paint this control point
-        Shape s;
-        if (isSharpCorner()) {
-            double size = pixelSize * 4d;
-            GeneralPath path = new GeneralPath();
-            path.moveTo(getX() - size, getY());
-            path.lineTo(getX(), getY() + size);
-            path.lineTo(getX() + size, getY());
-            path.lineTo(getX(), getY() - size);
-            path.closePath();
-            s = path;
-        } else {
-            double size = pixelSize * 3d;
-            s = new Ellipse2D.Double(getX() - size, getY() - size,
-                    size * 2, size * 2);
-        }
-        g2.setColor(GraphicsHelper.BEZIER_CONTROL_POINT_FILL);
-        g2.fill(s);
-        g2.setColor(GraphicsHelper.BEZIER_CONTROL_POINT_LINE);
-        g2.draw(s);
-        // paint child control points
-        if (!isSharpCorner()) {
-            cp1.paintControls(g2, pixelSize, true);
-            cp2.paintControls(g2, pixelSize, true);
-        }
-    }
-
-
-    public void move(double moveX, double moveY, boolean snapPixels) {
-        makingChange = true;
-        super.move(moveX, moveY, snapPixels);
-        cp1.move(moveX, moveY, snapPixels);
-        cp2.move(moveX, moveY, snapPixels);
-        makingChange = false;
-    }
-
-    public double getCp1X() {
-        return cp1.getX();
-    }
-
-    public void setCp1X(double v) {
-        cp1.setX(v);
-    }
-
-    public double getCp1Y() {
-        return cp1.getY();
-    }
-
-    public void setCp1Y(double v) {
-        cp1.setY(v);
-    }
-
-    public double getCp2X() {
-        return cp2.getX();
-    }
-
-    public void setCp2X(double v) {
-        cp2.setX(v);
-    }
-
-    public double getCp2Y() {
-        return cp2.getY();
-    }
-
-    public void setCp2Y(double v) {
-        cp2.setY(v);
-    }
-
-    // =================================================================================================================
-    // Bezier handle control point
-
-    public class HandleControlPoint extends ControlPoint {
-
-        public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-            if (!isSharp()){
-                double size = pixelSize * 3d;
-                Shape s = new Ellipse2D.Double(getX() - size, getY() - size,
-                        size * 2, size * 2);
-                g2.setColor(GraphicsHelper.BEZIER_CONTROL_POINT_FILL);
-                g2.fill(s);
-                g2.setColor(GraphicsHelper.BEZIER_CONTROL_POINT_LINE);
-                g2.draw(s);
-                g2.draw(new Rectangle2D.Double(getX() - (pixelSize / 2), getY() - (pixelSize / 2), pixelSize, pixelSize));
-            }
-        }
-
-        public boolean isHit(Point2D p, double pixelSize) {
-            return !isSharp() && super.isHit(p, pixelSize);
-        }
-
-        /**
-         * Is the line controled by this handle in or out of the parent BezierControlPoint sharp.
-         *
-         * @return <code>true</code> If this is the exact same point as the parent BezierControlPoint.
-         */
-        public boolean isSharp(){
-            return x.getValue() == BezierControlPoint.this.x.getValue() &&
-                y.getValue() == BezierControlPoint.this.y.getValue();
-        }
-
-        public void convertToSharp(){
-            setPosition(BezierControlPoint.this.x.getValue(),BezierControlPoint.this.y.getValue());
-        }
-
-        public BezierControlPoint getParentControlPoint(){
-            return BezierControlPoint.this;
-        }
-    }
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java
deleted file mode 100644
index ade7d08c39e..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-
-/**
- * BlendingMode - Enum of composite blending modes, setup to match photoshop as closely as possible
- *
- * @author Created by Jasper Potts (May 31, 2007)
- */
-public enum BlendingMode {
-    NORMAL,
-    // DISSOLVE, missing
-    // -----------------------------
-    DARKEN,
-    MULTIPLY,
-    COLOR_BURN,
-    LINEAR_BURN, // (SUBTRACT)
-    // -----------------------------
-    LIGHTEN,
-    SCREEN,
-    COLOR_DODGE,
-    LINEAR_DODGE, // (ADD)
-    // -----------------------------
-    OVERLAY,
-    SOFT_LIGHT,
-    HARD_LIGHT,
-    VIVID_LIGHT, // (HEAT) is close
-    LINEAR_LIGHT, // (GLOW) is close
-    //PIN_LIGHT, missing
-    //HARD_MIX, missing
-    // -----------------------------
-    DIFFERENCE,
-    EXCLUSION,
-    // -----------------------------
-    HUE, // nowhere close
-    SATURATION,
-    COLOR,
-    LUMINOSITY, // close but not exact
-    //LIGHTER_COLOR, missing
-    //DARKER_COLOR, missing
-    ;
-
-
-    // =================================================================================================================
-    // Helper methods for creating Blending Mode Combo Box
-
-    public static final Object[] BLENDING_MODES = new Object[]{
-            BlendingMode.NORMAL,
-            // DISSOLVE, missing
-            "-",
-            BlendingMode.DARKEN,
-            BlendingMode.MULTIPLY,
-            BlendingMode.COLOR_BURN,
-            BlendingMode.LINEAR_BURN, // (SUBTRACT)
-            "-",
-            BlendingMode.LIGHTEN,
-            BlendingMode.SCREEN,
-            BlendingMode.COLOR_DODGE,
-            BlendingMode.LINEAR_DODGE, // (ADD)
-            "-",
-            BlendingMode.OVERLAY,
-            BlendingMode.SOFT_LIGHT,
-            BlendingMode.HARD_LIGHT,
-            BlendingMode.VIVID_LIGHT, // (HEAT) is close
-            BlendingMode.LINEAR_LIGHT, // (GLOW) is close
-            //PIN_LIGHT, missing
-            //HARD_MIX, missing
-            "-",
-            BlendingMode.DIFFERENCE,
-            BlendingMode.EXCLUSION,
-            "-",
-            BlendingMode.HUE, // nowhere close
-            BlendingMode.SATURATION,
-            BlendingMode.COLOR,
-            BlendingMode.LUMINOSITY, // close but not exact
-    };
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Canvas.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Canvas.java
deleted file mode 100644
index 43f9cc62179..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Canvas.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingx.designer.utils.HasResources;
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-import org.jibx.runtime.IUnmarshallingContext;
-
-import javax.swing.UIDefaults;
-import java.awt.AlphaComposite;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * ComponentRegion
- *
- * @author Created by Jasper Potts (May 22, 2007)
- */
-public class Canvas extends AbstractBean implements LayerContainer, HasUIDefaults, HasResources {
-    private Dimension size;
-    /** list of all layers in the canvas, the first layer is painted on top */
-    private List<Layer> layers;
-    private int nextLayerNameIndex = 1;
-    private BufferedImage buffer;
-    private boolean isValid = false;
-    private Insets stretchingInsets = null;
-    private Layer workingLayer = null;
-    private PropertyChangeListener layersPropertyChangeListener;
-    private UIDefaults canvasUIDefaults = null;
-    private transient File resourcesDir;
-    private transient File imagesDir;
-    private transient File templatesDir;
-
-    // =================================================================================================================
-    // Constructor
-
-    /** Private constructor for JIBX */
-    protected Canvas() {
-        layersPropertyChangeListener = new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                isValid = false;
-                // pass on layer change
-                int index = layers.indexOf((Layer) evt.getSource());
-                if (index != -1) {
-                    firePropertyChange("layers[" + index + "]." + evt.getPropertyName(), evt.getOldValue(),
-                            evt.getNewValue());
-                }
-            }
-        };
-    }
-
-    public Canvas(int width, int height) {
-        this();
-        stretchingInsets = new Insets(1, 1, 1, 1);
-        layers = new ArrayList<Layer>();
-        setSize(new Dimension(width, height));
-        addLayer(new Layer());
-    }
-
-    // =================================================================================================================
-    // JIBX Methods
-
-    /**
-     * Called by JIBX before all fields have been set
-     *
-     * @param context The JIBX Unmarshalling Context
-     */
-    private void preSet(IUnmarshallingContext context) {
-        canvasUIDefaults = (UIDefaults) context.getUserContext();
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    /**
-     * Get the UIDefaults for this canvas. The UIDefaults is used to store default pallet of colors, fonts etc.
-     *
-     * @return Canvas UIDefaults
-     */
-    public UIDefaults getUiDefaults() {
-        return canvasUIDefaults;
-    }
-
-    /**
-     * Set the UIDefaults for this canvas. The UIDefaults is used to store default pallet of colors, fonts etc.
-     *
-     * @param canvasUIDefaults Canvas UIDefaults
-     */
-    public void setUiDefaults(UIDefaults canvasUIDefaults) {
-        this.canvasUIDefaults = canvasUIDefaults;
-    }
-
-    /**
-     * Get the current working layer, is is the layer that new shapes will be drawn into
-     *
-     * @return The current working layer, may be null if there is no working layer
-     */
-    public Layer getWorkingLayer() {
-        return workingLayer;
-    }
-
-    /**
-     * Set the current working layer, is is the layer that new shapes will be drawn into
-     *
-     * @param workingLayer the new working layer, must be a child of this canvas
-     */
-    public void setWorkingLayer(Layer workingLayer) {
-        Layer old = getWorkingLayer();
-        this.workingLayer = workingLayer;
-        firePropertyChange("workingLayer", old, getWorkingLayer());
-    }
-
-    public int getNextLayerNameIndex() {
-        return nextLayerNameIndex++;
-    }
-
-    public Dimension getSize() {
-        return size;
-    }
-
-    public void setSize(Dimension size) {
-        Dimension old = getSize();
-        this.size = size;
-        buffer = new BufferedImage(this.size.width, this.size.height, BufferedImage.TYPE_INT_ARGB);
-        isValid = false;
-        firePropertyChange("size", old, getSize());
-    }
-
-
-    public Insets getStretchingInsets() {
-        return stretchingInsets;
-    }
-
-    public void setStretchingInsets(Insets stretchingInsets) {
-        Insets old = getStretchingInsets();
-        this.stretchingInsets = stretchingInsets;
-        firePropertyChange("stretchingInsets", old, getStretchingInsets());
-    }
-
-    public BufferedImage getRenderedImage() {
-        if (!isValid) {
-            Graphics2D g2 = buffer.createGraphics();
-            // clear
-            g2.setComposite(AlphaComposite.Clear);
-            g2.fillRect(0, 0, buffer.getWidth(), buffer.getHeight());
-            // paint
-            g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            g2.setComposite(AlphaComposite.SrcOver);
-            for (int i = layers.size() - 1; i >= 0; i--) {
-                layers.get(i).paint(g2, 1);
-            }
-            g2.dispose();
-        }
-        return buffer;
-    }
-
-    /**
-     * @return true if this Canvas has not been edited.
-     *         <p/>
-     *         TODO Currently this is not a bound property, but should be. That is, when the Canvas becomes edited
-     *         (usually due to the Layer having a shape added to it), then a property change event should be fired.
-     */
-    public boolean isBlank() {
-        return layers.size() == 0 || (layers.size() == 1 && layers.get(0).isEmpty());
-    }
-
-    public File getResourcesDir() {
-        return resourcesDir;
-    }
-
-    public void setResourcesDir(File resourcesDir) {
-        File old = getResourcesDir();
-        this.resourcesDir = resourcesDir;
-        firePropertyChange("resourcesDir", old, getResourcesDir());
-    }
-
-    public File getImagesDir() {
-        return imagesDir;
-    }
-
-    public void setImagesDir(File imagesDir) {
-        File old = getImagesDir();
-        this.imagesDir = imagesDir;
-        firePropertyChange("imagesDir", old, getImagesDir());
-    }
-
-    public File getTemplatesDir() {
-        return templatesDir;
-    }
-
-    public void setTemplatesDir(File templatesDir) {
-        File old = getTemplatesDir();
-        this.templatesDir = templatesDir;
-        firePropertyChange("templatesDir", old, getTemplatesDir());
-    }
-
-    // =================================================================================================================
-    // LayerContainer Methods
-
-    public LayerContainer getParent() {
-        // we are root so null
-        return null;
-    }
-
-    public void addLayerToBottom(Layer layer) {
-        layers.add(layer);
-        layer.setParent(this);
-        layer.addPropertyChangeListener(layersPropertyChangeListener);
-        // no single layer changes so fire all changed event
-        firePropertyChange("layers", null, layers);
-    }
-
-    public void addLayer(int i, Layer layer) {
-        layers.add(i, layer);
-        layer.setParent(this);
-        layer.addPropertyChangeListener(layersPropertyChangeListener);
-        // no single layer changes so fire all changed event
-        firePropertyChange("layers", null, layers);
-    }
-
-    public void addLayer(Layer layer) {
-        layers.add(0, layer);
-        layer.setParent(this);
-        layer.addPropertyChangeListener(layersPropertyChangeListener);
-        // no single layer changes so fire all changed event
-        firePropertyChange("layers", null, layers);
-    }
-
-    public Layer getLayer(int index) {
-        return layers.get(index);
-    }
-
-    public int getLayerCount() {
-        return layers.size();
-    }
-
-    public Iterator<Layer> getLayerIterator() {
-        return Collections.unmodifiableList(layers).iterator();
-    }
-
-    public Collection<Layer> getLayers() {
-        return Collections.unmodifiableList(layers);
-    }
-
-    public int indexOfLayer(Layer layer) {
-        return layers.indexOf(layer);
-    }
-
-    public void removeLayer(Layer layer) {
-        int index = layers.indexOf(layer);
-        if (index != -1) {
-            layers.remove(layer);
-            layer.removePropertyChangeListener(layersPropertyChangeListener);
-            fireIndexedPropertyChange("layers", index, layer, null);
-        }
-    }
-
-    public Dimension getRootSize() {
-        return getSize();
-    }
-
-    // =================================================================================================================
-    // JIBX Helper Methods
-
-    /** Called by JIBX after "layers" has been filled so we can set parents and listeners */
-    private void setupLayers() {
-        for (Layer layer : layers) {
-            layer.setParent(this);
-            layer.addPropertyChangeListener(layersPropertyChangeListener);
-        }
-        // no single layer changes so fire all changed event
-        firePropertyChange("layers", null, layers);
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/ControlPoint.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/ControlPoint.java
deleted file mode 100644
index b4d231c5ca9..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/ControlPoint.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * ControlPoint
- *
- * @author Created by Jasper Potts (May 24, 2007)
- */
-public class ControlPoint extends SimpleShape {
-    protected Color fillColor;
-    protected Color lineColor;
-    protected DoubleBean x, y;
-
-    public ControlPoint() {
-        this(new DoubleBean(), new DoubleBean());
-    }
-
-    public ControlPoint(Color fillColor, Color lineColor) {
-        this(new DoubleBean(), new DoubleBean(), fillColor, lineColor);
-    }
-
-    public ControlPoint(double x, double y) {
-        this(new DoubleBean(x), new DoubleBean(y));
-    }
-
-    public ControlPoint(DoubleBean x, DoubleBean y) {
-        this(x, y, GraphicsHelper.CONTROL_POINT_FILL, GraphicsHelper.CONTROL_POINT_LINE);
-    }
-
-    public ControlPoint(DoubleBean x, DoubleBean y, Color fillColor, Color lineColor) {
-        this.x = x;
-        this.y = y;
-        this.fillColor = fillColor;
-        this.lineColor = lineColor;
-        x.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("position",
-                        new Point2D.Double((Double) evt.getOldValue(), getY()),
-                        getPosition());
-            }
-        });
-        y.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("position",
-                        new Point2D.Double(getX(), (Double) evt.getOldValue()),
-                        getPosition());
-            }
-        });
-    }
-
-    public double getX() {
-        return x.getValue();
-    }
-
-    public double getY() {
-        return y.getValue();
-    }
-
-    public void setX(double x) {
-        this.x.setValue(x);
-    }
-
-    public void setY(double y) {
-        this.y.setValue(y);
-    }
-
-    public void setPosition(Point2D position) {
-        x.setValue(position.getX());
-        y.setValue(position.getY());
-    }
-
-    public void setPosition(double x, double y) {
-        setPosition(new Point2D.Double(x, y));
-    }
-
-    public Point2D getPosition() {
-        return new Point2D.Double(getX(), getY());
-    }
-
-    public Rectangle2D getBounds(double pixelSize) {
-        double size = pixelSize * 4d;
-        return new Rectangle2D.Double(getX() - size, getY() - size,
-                size * 2, size * 2);
-    }
-
-    public boolean isHit(Point2D p, double pixelSize) {
-        return getBounds(pixelSize).contains(p);
-    }
-
-
-    public Shape getShape() {
-        return getBounds(0);
-    }
-
-    public void paint(Graphics2D g2, double pixelSize) {
-    }
-
-    public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-        g2.setStroke(new BasicStroke((float) pixelSize));
-        Shape s = getBounds(pixelSize);
-        g2.setColor(fillColor);
-        g2.fill(s);
-        g2.setColor(lineColor);
-        g2.draw(s);
-    }
-
-    public List<ControlPoint> getControlPoints() {
-        return Collections.emptyList();
-    }
-
-
-    public void move(double moveX, double moveY, boolean snapPixels) {
-        if (snapPixels) {
-            setPosition(
-                    Math.round(x.getValue() + moveX),
-                    Math.round(y.getValue() + moveY));
-        } else {
-            setPosition(x.getValue() + moveX, y.getValue() + moveY);
-        }
-    }
-
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Designer.jibx.xml b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Designer.jibx.xml
deleted file mode 100644
index 0f80bcf4098..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Designer.jibx.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright 1998-2004 Sun Microsystems, Inc.  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.  Sun designates this
- particular file as subject to the "Classpath" exception as provided
- by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
--->
-
-<!DOCTYPE binding SYSTEM "http://jibx.sourceforge.net">
-<binding>
-    <!-- == PAINTS =========================================================================================== -->
-    <mapping class="java.awt.Color"
-             marshaller="org.jdesktop.swingx.designer.jibxhelpers.ColorMapper"
-             unmarshaller="org.jdesktop.swingx.designer.jibxhelpers.ColorMapper"/>
-    <mapping name="matte" class="org.jdesktop.swingx.designer.paint.Matte" post-set="postSet">
-        <value name="red" field="red" style="attribute"/>
-        <value name="green" field="green" style="attribute"/>
-        <value name="blue" field="blue" style="attribute"/>
-        <value name="alpha" field="alpha" style="attribute"/>
-        <value name="uiDefaultParentName" field="uiDefaultParentName" style="attribute" usage="optional"/>
-        <value name="componentPropertyName" field="componentPropertyName" style="attribute" usage="optional"/>
-        <value name="hueOffset" field="hueOffset" style="attribute"/>
-        <value name="saturationOffset" field="saturationOffset" style="attribute"/>
-        <value name="brightnessOffset" field="brightnessOffset" style="attribute"/>
-        <value name="alphaOffset" field="alphaOffset" style="attribute"/>
-        <value name="uiResource" field="uiResource" style="attribute" usage="optional" default="true"/>
-    </mapping>
-    <mapping class="org.jdesktop.swingx.designer.paint.AbstractGradient" abstract="true">
-        <value name="cycleMethod" field="cycleMethod" style="attribute"/>
-        <collection field="stops" set-method="setStops" pre-set="clear" create-type="java.util.ArrayList">
-            <structure name="stop" type="org.jdesktop.swingx.designer.paint.GradientStop">
-                <value name="position" field="position" style="attribute"/>
-                <value name="midpoint" field="midpoint" style="attribute"/>
-                <structure field="color" set-method="setColor"/>
-            </structure>
-        </collection>
-    </mapping>
-    <mapping name="gradient" class="org.jdesktop.swingx.designer.paint.Gradient"
-             extends="org.jdesktop.swingx.designer.paint.AbstractGradient">
-        <structure map-as="org.jdesktop.swingx.designer.paint.AbstractGradient"/>
-    </mapping>
-    <mapping name="radialGradient" class="org.jdesktop.swingx.designer.paint.RadialGradient"
-             extends="org.jdesktop.swingx.designer.paint.AbstractGradient">
-        <structure map-as="org.jdesktop.swingx.designer.paint.AbstractGradient"/>
-    </mapping>
-    <!-- == SHAPES =========================================================================================== -->
-    <mapping class="org.jdesktop.swingx.designer.SimpleShape" abstract="true">
-        <!--protected AffineTransform transform = new AffineTransform();-->
-    </mapping>
-    <mapping class="org.jdesktop.swingx.designer.PaintedShape" abstract="true"
-             extends="org.jdesktop.swingx.designer.SimpleShape">
-        <structure map-as="org.jdesktop.swingx.designer.SimpleShape"/>
-        <structure field="paint"/>
-        <structure name="paintPoints">
-            <value name="x1" get-method="getPaintX1" set-method="setPaintX1" style="attribute"/>
-            <value name="y1" get-method="getPaintY1" set-method="setPaintY1" style="attribute"/>
-            <value name="x2" get-method="getPaintX2" set-method="setPaintX2" style="attribute"/>
-            <value name="y2" get-method="getPaintY2" set-method="setPaintY2" style="attribute"/>
-        </structure>
-    </mapping>
-    <mapping name="rectangle" class="org.jdesktop.swingx.designer.RectangleShape"
-             extends="org.jdesktop.swingx.designer.PaintedShape">
-        <structure map-as="org.jdesktop.swingx.designer.PaintedShape"/>
-        <value name="x1" get-method="getX1" set-method="setX1" style="attribute"/>
-        <value name="x2" get-method="getX2" set-method="setX2" style="attribute"/>
-        <value name="y1" get-method="getY1" set-method="setY1" style="attribute"/>
-        <value name="y2" get-method="getY2" set-method="setY2" style="attribute"/>
-        <value name="rounding" get-method="getRounding" set-method="setRounding" style="attribute"/>
-    </mapping>
-    <mapping name="ellipse" class="org.jdesktop.swingx.designer.EllipseShape"
-             extends="org.jdesktop.swingx.designer.PaintedShape">
-        <structure map-as="org.jdesktop.swingx.designer.PaintedShape"/>
-        <value name="x1" get-method="getX1" set-method="setX1" style="attribute"/>
-        <value name="x2" get-method="getX2" set-method="setX2" style="attribute"/>
-        <value name="y1" get-method="getY1" set-method="setY1" style="attribute"/>
-        <value name="y2" get-method="getY2" set-method="setY2" style="attribute"/>
-    </mapping>
-    <mapping name="path" class="org.jdesktop.swingx.designer.PathShape"
-             extends="org.jdesktop.swingx.designer.PaintedShape">
-        <structure map-as="org.jdesktop.swingx.designer.PaintedShape"/>
-        <collection name="points" get-method="getBezierControlPoints"
-                    set-method="setControlPoints" create-type="java.util.ArrayList">
-            <structure name="point" type="org.jdesktop.swingx.designer.BezierControlPoint">
-                <value name="x" get-method="getX" set-method="setX" style="attribute"/>
-                <value name="y" get-method="getY" set-method="setY" style="attribute"/>
-                <value name="cp1x" get-method="getCp1X" set-method="setCp1X" style="attribute"/>
-                <value name="cp1y" get-method="getCp1Y" set-method="setCp1Y" style="attribute"/>
-                <value name="cp2x" get-method="getCp2X" set-method="setCp2X" style="attribute"/>
-                <value name="cp2y" get-method="getCp2Y" set-method="setCp2Y" style="attribute"/>
-            </structure>
-        </collection>
-    </mapping>
-    <!-- == EFFECTS =========================================================================================== -->
-    <mapping class="org.jdesktop.swingx.designer.effects.ShadowEffect" abstract="true">
-        <structure field="color"/>
-        <value name="blendingMode" field="blendingMode" style="attribute"/>
-        <value name="opacity" field="opacity" style="attribute"/>
-        <value name="angle" field="angle" style="attribute"/>
-        <value name="distance" field="distance" style="attribute"/>
-        <value name="spread" field="spread" style="attribute"/>
-        <value name="size" field="size" style="attribute"/>
-    </mapping>
-    <mapping name="dropShadow" class="org.jdesktop.swingx.designer.effects.DropShadowEffect"
-             extends="org.jdesktop.swingx.designer.effects.ShadowEffect">
-        <structure map-as="org.jdesktop.swingx.designer.effects.ShadowEffect"/>
-    </mapping>
-    <mapping name="innerShadow" class="org.jdesktop.swingx.designer.effects.InnerShadowEffect"
-             extends="org.jdesktop.swingx.designer.effects.ShadowEffect">
-        <structure map-as="org.jdesktop.swingx.designer.effects.ShadowEffect"/>
-    </mapping>
-    <mapping name="innerGlow" class="org.jdesktop.swingx.designer.effects.InnerGlowEffect"
-             extends="org.jdesktop.swingx.designer.effects.ShadowEffect">
-        <structure map-as="org.jdesktop.swingx.designer.effects.ShadowEffect"/>
-    </mapping>
-    <mapping name="outerGlow" class="org.jdesktop.swingx.designer.effects.OuterGlowEffect"
-             extends="org.jdesktop.swingx.designer.effects.ShadowEffect">
-        <structure map-as="org.jdesktop.swingx.designer.effects.ShadowEffect"/>
-    </mapping>
-    <!-- == TEMPLATE LAYER ================================================================================== -->
-    <mapping name="templateLayer" class="org.jdesktop.swingx.designer.TemplateLayer"
-             extends="org.jdesktop.swingx.designer.Layer" post-set="postInit">
-        <structure map-as="org.jdesktop.swingx.designer.Layer"/>
-        <value name="fileName" field="fileName" style="attribute"/>
-    </mapping>
-    <!-- == LAYER =========================================================================================== -->
-    <mapping name="layer" class="org.jdesktop.swingx.designer.Layer"
-             extends="org.jdesktop.swingx.designer.SimpleShape" post-set="postInit">
-        <structure map-as="org.jdesktop.swingx.designer.SimpleShape"/>
-        <value name="name" field="name" style="attribute"/>
-        <value name="type" field="type" style="attribute" default="standard"/>
-        <value name="opacity" field="opacity"/>
-        <value name="fillOpacity" field="fillOpacity"/>
-        <value name="blendingMode" field="blendingMode"/>
-        <value name="locked" field="locked"/>
-        <value name="visible" field="visible"/>
-        <structure name="shapes">
-            <collection field="shapes" create-type="java.util.ArrayList"/>
-        </structure>
-        <structure name="effects">
-            <collection field="effects" create-type="java.util.ArrayList"/>
-        </structure>
-    </mapping>
-    <!-- == CANVAS =========================================================================================== -->
-    <mapping name="canvas" class="org.jdesktop.swingx.designer.Canvas" pre-set="preSet" post-set="setupLayers">
-        <structure name="size" get-method="getSize" set-method="setSize"
-                   marshaller="org.jdesktop.swingx.designer.jibxhelpers.DimensionMapper"
-                   unmarshaller="org.jdesktop.swingx.designer.jibxhelpers.DimensionMapper"/>
-        <value name="nextLayerNameIndex" field="nextLayerNameIndex"/>
-        <structure name="stretchingInsets" field="stretchingInsets"
-                   marshaller="org.jdesktop.swingx.designer.jibxhelpers.InsetsMapper"
-                   unmarshaller="org.jdesktop.swingx.designer.jibxhelpers.InsetsMapper"/>
-        <collection field="layers" create-type="java.util.ArrayList"/>
-    </mapping>
-</binding>
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java
deleted file mode 100644
index 7297b809bfe..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import org.jdesktop.beans.AbstractBean;
-
-/**
- * DoubleBean - Simple bean for a observable double value
- *
- * @author Created by Jasper Potts (May 25, 2007)
- */
-public class DoubleBean extends AbstractBean {
-    private double value = 0;
-
-    public DoubleBean() {}
-
-    public DoubleBean(double value) {
-        this.value = value;
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-    public void setValue(double value) {
-        double old = this.value;
-        this.value = value;
-        firePropertyChange("value", old, this.value);
-    }
-
-
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        DoubleBean that = (DoubleBean) o;
-
-        if (Double.compare(that.value, value) != 0) return false;
-
-        return true;
-    }
-
-    public int hashCode() {
-        long temp = value != +0.0d ? Double.doubleToLongBits(value) : 0L;
-        return (int) (temp ^ (temp >>> 32));
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/EllipseShape.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/EllipseShape.java
deleted file mode 100644
index e0d12371697..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/EllipseShape.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * EllipseShape
- *
- * @author Created by Jasper Potts (May 22, 2007)
- */
-public class EllipseShape extends PaintedShape {
-
-    private DoubleBean x1 = new DoubleBean();
-    private DoubleBean x2 = new DoubleBean();
-    private DoubleBean y1 = new DoubleBean();
-    private DoubleBean y2 = new DoubleBean();
-    private ControlPoint tl = new ControlPoint(x1, y1);
-    private ControlPoint tr = new ControlPoint(x2, y1);
-    private ControlPoint bl = new ControlPoint(x1, y2);
-    private ControlPoint br = new ControlPoint(x2, y2);
-
-    // =================================================================================================================
-    // Constructors
-
-    /** private noargs constructor for JIBX */
-    private EllipseShape() {
-        this(null);
-    }
-
-    public EllipseShape(UIDefaults canvasUiDefaults) {
-        super(canvasUiDefaults);
-        PropertyChangeListener listener = new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("bounds", null, getBounds(0));
-            }
-        };
-        x1.addPropertyChangeListener(listener);
-        y1.addPropertyChangeListener(listener);
-        x2.addPropertyChangeListener(listener);
-        y2.addPropertyChangeListener(listener);
-    }
-
-    public EllipseShape(double x, double y, double w, double h) {
-        this();
-        x1.setValue(x);
-        y1.setValue(y);
-        x2.setValue(x + w);
-        y2.setValue(y + h);
-    }
-
-    public Rectangle2D getBounds(double pixelSize) {
-        double left = Math.min(x1.getValue(), x2.getValue());
-        double right = Math.max(x1.getValue(), x2.getValue());
-        double top = Math.min(y1.getValue(), y2.getValue());
-        double bottom = Math.max(y1.getValue(), y2.getValue());
-        return new Rectangle2D.Double(left, top, right - left, bottom - top);
-    }
-
-    public Ellipse2D getShape() {
-        double left = Math.min(x1.getValue(), x2.getValue());
-        double right = Math.max(x1.getValue(), x2.getValue());
-        double top = Math.min(y1.getValue(), y2.getValue());
-        double bottom = Math.max(y1.getValue(), y2.getValue());
-        return new Ellipse2D.Double(left, top, right - left, bottom - top);
-    }
-
-    public boolean isHit(Point2D p, double pixelSize) {
-        return getBounds(pixelSize).contains(p);
-    }
-
-    public void paint(Graphics2D g2, double pixelSize) {
-        g2.setPaint(getPaint());
-        g2.fill(getShape());
-    }
-
-    public void setFrame(double x1, double y1, double x2, double y2) {
-        this.x1.setValue(x1);
-        this.y1.setValue(y1);
-        this.x2.setValue(x2);
-        this.y2.setValue(y2);
-    }
-
-    @Override
-    public String toString() {
-        Rectangle2D bounds = getBounds(0);
-        return "ELLIPSE { x=" +  bounds.getX() + ", y=" + bounds.getY() + ", w=" + bounds.getWidth() + ", h=" + bounds.getHeight() + " }";
-    }
-
-    public List<ControlPoint> getControlPoints() {
-        List<ControlPoint> points = new ArrayList<ControlPoint>();
-        points.addAll(super.getControlPoints());
-        points.add(tl);
-        points.add(tr);
-        points.add(bl);
-        points.add(br);
-        return points;
-    }
-
-    public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-        if (paintControlLines) {
-            g2.setStroke(new BasicStroke((float) pixelSize));
-            g2.setColor(GraphicsHelper.CONTROL_LINE);
-            g2.draw(getShape());
-        }
-        tl.paintControls(g2, pixelSize, true);
-        tr.paintControls(g2, pixelSize, true);
-        bl.paintControls(g2, pixelSize, true);
-        br.paintControls(g2, pixelSize, true);
-//        super.paintControls(g2, pixelSize, paintControlLines);
-    }
-
-    public void move(double moveX, double moveY, boolean snapPixels) {
-        if (snapPixels) {
-            x1.setValue(Math.round(x1.getValue() + moveX));
-            x2.setValue(Math.round(x2.getValue() + moveX));
-            y1.setValue(Math.round(y1.getValue() + moveY));
-            y2.setValue(Math.round(y2.getValue() + moveY));
-        } else {
-            x1.setValue(x1.getValue() + moveX);
-            x2.setValue(x2.getValue() + moveX);
-            y1.setValue(y1.getValue() + moveY);
-            y2.setValue(y2.getValue() + moveY);
-        }
-    }
-
-    public double getX1() {
-        return x1.getValue();
-    }
-
-    public void setX1(double x1) {
-        this.x1.setValue(x1);
-    }
-
-    public double getX2() {
-        return x2.getValue();
-    }
-
-    public void setX2(double x2) {
-        this.x2.setValue(x2);
-    }
-
-    public double getY1() {
-        return y1.getValue();
-    }
-
-    public void setY1(double y1) {
-        this.y1.setValue(y1);
-    }
-
-    public double getY2() {
-        return y2.getValue();
-    }
-
-    public void setY2(double y2) {
-        this.y2.setValue(y2);
-    }
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/GraphicsHelper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/GraphicsHelper.java
deleted file mode 100644
index 519c42e94e5..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/GraphicsHelper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import java.awt.Color;
-
-/**
- * GraphicsHelper
- *
- * @author Created by Jasper Potts (May 29, 2007)
- */
-public class GraphicsHelper {
-    public static final Color FILL_LINE = Color.BLUE;
-    public static final Color FILL_CP_LINE = Color.BLUE;
-    public static final Color FILL_CP_FILL = Color.WHITE;
-    public static final Color CONTROL_LINE = Color.RED;
-    public static final Color CONTROL_POINT_LINE = Color.RED;
-    public static final Color CONTROL_POINT_FILL = Color.WHITE;
-    public static final Color BEZIER_CONTROL_POINT_LINE = CONTROL_POINT_LINE;
-    public static final Color BEZIER_CONTROL_POINT_FILL = CONTROL_POINT_FILL;
-    public static final Color BEZIER_CONTROL_LINE = Color.DARK_GRAY;
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Layer.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Layer.java
deleted file mode 100644
index 3b112ae93fb..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Layer.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import org.jdesktop.swingx.designer.effects.Effect;
-
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Layer
- *
- * @author Created by Jasper Potts (May 22, 2007)
- */
-public class Layer extends SimpleShape implements Iterable<SimpleShape>, LayerContainer {
-    public static enum LayerType {
-        standard, template
-    }
-
-    private String name;
-    protected LayerType type = LayerType.standard;
-    /** List of shapes in this layer, first shape is painted on top */
-    private List<SimpleShape> shapes = new ArrayList<SimpleShape>();
-    private List<Effect> effects = new ArrayList<Effect>();
-    private double opacity = 1;
-    private double fillOpacity = 1;
-    private BlendingMode blendingMode = BlendingMode.NORMAL;
-    private boolean locked = false;
-    private boolean visible = true;
-    private PropertyChangeListener shapeChangeListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            int index = shapes.indexOf((SimpleShape) evt.getSource());
-            firePropertyChange("shapes[" + index + "]." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-        }
-    };
-    private PropertyChangeListener effectChangeListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            int index = effects.indexOf((Effect) evt.getSource());
-            System.out.println(
-                    "Layer.propertyChange EFFECT PROPERTY CHANGED " + evt.getSource() + " -- " + evt.getPropertyName());
-            firePropertyChange("effects[" + index + "]." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-        }
-    };
-    private BufferedImage buffer = null;
-    // =================================================================================================================
-    // Constructors
-
-    public Layer() {
-    }
-
-    public Layer(String name) {
-        this();
-        this.name = name;
-    }
-
-    /** Called by JIBX after populating this layer so we can add listeners to children */
-    protected void postInit() {
-        for (SimpleShape shape : shapes) {
-            shape.addPropertyChangeListener(shapeChangeListener);
-            shape.setParent(this);
-        }
-        for (Effect effect : effects) {
-            effect.addPropertyChangeListener(effectChangeListener);
-        }
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    public LayerType getType() {
-        return type;
-    }
-
-    public boolean isLocked() {
-        return locked;
-    }
-
-    public void setLocked(boolean locked) {
-        boolean old = isLocked();
-        this.locked = locked;
-        firePropertyChange("locked", old, isLocked());
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    public void setVisible(boolean visible) {
-        boolean old = isVisible();
-        this.visible = visible;
-        firePropertyChange("visible", old, isVisible());
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        String old = getName();
-        this.name = name;
-        firePropertyChange("name", old, getName());
-    }
-
-    public void setParent(LayerContainer parent) {
-        super.setParent(parent);
-        // generate a name if null
-        if (name == null) {
-            Canvas c = null;
-            LayerContainer p = parent;
-            while (true) {
-                if (p instanceof Canvas) {
-                    c = (Canvas) p;
-                    break;
-                } else if (p == null) {
-                    break;
-                }
-                p = p.getParent();
-            }
-            if (c != null) {
-                setName("Layer " + c.getNextLayerNameIndex());
-            }
-        }
-    }
-
-    /**
-     * Add shape to top of layer so it paints above all other shapes
-     *
-     * @param shape The shape to add
-     */
-    public void add(SimpleShape shape) {
-        shapes.add(0, shape);
-        shape.setParent(this);
-        shape.addPropertyChangeListener(shapeChangeListener);
-        fireIndexedPropertyChange("shapes", 0, null, shape);
-    }
-
-    public void remove(SimpleShape shape) {
-        int index = shapes.indexOf(shape);
-        if (index != -1) {
-            shapes.remove(shape);
-            shape.setParent(null);
-            fireIndexedPropertyChange("shapes", index, shape, null);
-        }
-    }
-
-    /**
-     * Returns an unmodifianle iterator over a set of elements of type SimpleShape.
-     *
-     * @return an Iterator.
-     */
-    public Iterator<SimpleShape> iterator() {
-        return Collections.unmodifiableList(shapes).iterator();
-    }
-
-
-    public List<Effect> getEffects() {
-        return Collections.unmodifiableList(effects);
-    }
-
-    public void addEffect(Effect effect) {
-        int index = effects.size();
-        effects.add(effect);
-        effect.addPropertyChangeListener(effectChangeListener);
-        fireIndexedPropertyChange("effects", index, null, effects);
-    }
-
-    public void removeEffect(Effect effect) {
-        int index = effects.indexOf(effect);
-        if (index != -1) {
-            effects.remove(effect);
-            effect.removePropertyChangeListener(effectChangeListener);
-            fireIndexedPropertyChange("effects", index, effect, null);
-        }
-    }
-
-    public double getOpacity() {
-        return opacity;
-    }
-
-    public void setOpacity(double opacity) {
-        if (opacity < 0 || opacity > 1) return;
-        double old = getOpacity();
-        this.opacity = opacity;
-        firePropertyChange("opacity", old, getOpacity());
-    }
-
-    public double getFillOpacity() {
-        return fillOpacity;
-    }
-
-    public void setFillOpacity(double fillOpacity) {
-        if (fillOpacity < 0 || fillOpacity > 1) return;
-        double old = getFillOpacity();
-        this.fillOpacity = fillOpacity;
-        firePropertyChange("fillOpacity", old, getFillOpacity());
-    }
-
-    public BlendingMode getBlendingMode() {
-        return blendingMode;
-    }
-
-    public void setBlendingMode(BlendingMode blendingMode) {
-        BlendingMode old = getBlendingMode();
-        this.blendingMode = blendingMode;
-        firePropertyChange("blendingMode", old, getBlendingMode());
-    }
-
-    // =================================================================================================================
-    // Layer Methods
-
-    /**
-     * Get the parent canvas that contains this layer
-     *
-     * @return Parant canvas, or null if the layer is not in a canvas
-     */
-    public Canvas getCanvas() {
-        LayerContainer lc = this;
-        while (lc != null) {
-            if (lc instanceof Canvas) return (Canvas) lc;
-            lc = lc.getParent();
-        }
-        return null;
-    }
-
-    public List<SimpleShape> getShapes() {
-        return new ArrayList<SimpleShape>(shapes);
-    }
-
-    public List<SimpleShape> getIntersectingShapes(Point2D p, double pixelSize) {
-        if (isLocked() || !isVisible()) return Collections.emptyList();
-        List<SimpleShape> intersectingShapes = new ArrayList<SimpleShape>();
-        for (SimpleShape shape : shapes) {
-            if (shape instanceof Layer) {
-                intersectingShapes.addAll(((Layer) shape).getIntersectingShapes(p, pixelSize));
-            } else {
-                if (shape.isHit(p, pixelSize)) intersectingShapes.add(shape);
-            }
-        }
-        return intersectingShapes;
-    }
-
-    public List<SimpleShape> getIntersectingShapes(Rectangle2D rect, double pixelSize) {
-        if (isLocked() || !isVisible()) return Collections.emptyList();
-        List<SimpleShape> intersectingShapes = new ArrayList<SimpleShape>();
-        for (SimpleShape shape : shapes) {
-            if (shape instanceof Layer) {
-                intersectingShapes.addAll(((Layer) shape).getIntersectingShapes(rect, pixelSize));
-            } else {
-                if (shape.intersects(rect, pixelSize)) intersectingShapes.add(shape);
-            }
-        }
-        return intersectingShapes;
-
-    }
-
-    public boolean isEmpty() {
-        return shapes.isEmpty();
-    }
-
-    // =================================================================================================================
-    // SimpleShape Methods
-
-    public Rectangle2D getBounds(double pixelSize) {
-        Rectangle2D.Double rect = new Rectangle2D.Double();
-        for (SimpleShape shape : shapes) {
-            rect.add(shape.getBounds(pixelSize));
-        }
-        return rect;
-    }
-
-
-    public Shape getShape() {
-        return getBounds(0);
-    }
-
-    public boolean isHit(Point2D p, double pixelSize) {
-        if (isLocked() || !isVisible()) return false;
-        for (SimpleShape shape : shapes) {
-            if (shape.isHit(p, pixelSize)) return true;
-        }
-        return false;
-    }
-
-    public boolean intersects(Rectangle2D rect, double pixelSize) {
-        if (isLocked() || !isVisible()) return false;
-        for (SimpleShape shape : shapes) {
-            if (shape.intersects(rect, pixelSize)) return true;
-        }
-        return false;
-    }
-
-    public List<ControlPoint> getControlPoints() {
-        return Collections.emptyList();
-    }
-
-    public void paint(Graphics2D g2, double pixelSize) {
-    }
-
-    public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-
-    }
-
-    public String toString() {
-        return getName();
-    }
-
-    // =================================================================================================================
-    // LayerContainer Methods
-
-    public void addLayer(int i, Layer layer) {
-        // get existing layer at index i
-        Layer existingLayer = getLayer(i);
-        if (existingLayer == null) {
-            addLayer(layer);
-        } else {
-            int index = indexOfLayer(existingLayer);
-            shapes.add(index, layer);
-            layer.setParent(this);
-            layer.addPropertyChangeListener(shapeChangeListener);
-            fireIndexedPropertyChange("layers", index, null, layer);
-        }
-    }
-
-    public void addLayer(Layer layer) {
-        shapes.add(layer);
-        layer.setParent(this);
-        layer.addPropertyChangeListener(shapeChangeListener);
-        int index = indexOfLayer(layer);
-        fireIndexedPropertyChange("layers", index, null, layer);
-    }
-
-    public Layer getLayer(int index) {
-        int i = -1;
-        for (SimpleShape shape : shapes) {
-            if (shape instanceof Layer) i++;
-            if (i == index) return (Layer) shape;
-        }
-        return null;
-    }
-
-    public int getLayerCount() {
-        int count = 0;
-        for (SimpleShape shape : shapes) {
-            if (shape instanceof Layer) count++;
-        }
-        return count;
-    }
-
-
-    public Collection<Layer> getLayers() {
-        List<Layer> layers = new ArrayList<Layer>();
-        for (SimpleShape shape : shapes) {
-            if (shape instanceof Layer) layers.add((Layer) shape);
-        }
-        return Collections.unmodifiableList(layers);
-    }
-
-    public Iterator<Layer> getLayerIterator() {
-        return new Iterator<Layer>() {
-            private int index = 0;
-
-            public boolean hasNext() {
-                for (int i = index; i < shapes.size(); i++) {
-                    if (shapes.get(i) instanceof Layer) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            public Layer next() {
-                for (; index < shapes.size(); index++) {
-                    if (shapes.get(index) instanceof Layer) {
-                        Layer nextLayer = (Layer) shapes.get(index);
-                        index++; // increment index so we don't find the same one again
-                        return nextLayer;
-                    }
-                }
-                return null;
-            }
-
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-
-    public int indexOfLayer(Layer layer) {
-        int i = -1;
-        for (SimpleShape s : shapes) {
-            if (s instanceof Layer) i++;
-            if (s == layer) return i;
-        }
-        return -1;
-    }
-
-    public void removeLayer(Layer layer) {
-        int index = indexOfLayer(layer);
-        if (index != -1) {
-            shapes.remove(layer);
-            layer.removePropertyChangeListener(shapeChangeListener);
-            fireIndexedPropertyChange("layers", index, layer, null);
-        }
-    }
-
-
-    public Dimension getRootSize() {
-        return getParent().getRootSize();
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PaintedShape.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PaintedShape.java
deleted file mode 100644
index 2d6d3cbf599..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PaintedShape.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import org.jdesktop.swingx.designer.paint.Matte;
-import org.jdesktop.swingx.designer.paint.PaintModel;
-
-import javax.swing.UIDefaults;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.LinearGradientPaint;
-import java.awt.Paint;
-import java.awt.RadialGradientPaint;
-import java.awt.Shape;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * PaintedShape
- *
- * @author Created by Jasper Potts (May 22, 2007)
- */
-public abstract class PaintedShape extends SimpleShape {
-
-    private PaintModel paint;
-    // control points for paint control types
-    private DoubleBean px1 = new DoubleBean(0.25);
-    private DoubleBean px2 = new DoubleBean(0.75);
-    private DoubleBean py1 = new DoubleBean(0);
-    private DoubleBean py2 = new DoubleBean(1);
-    private ControlPoint ptl = new PaintControlPoint(px1, py1);
-    private ControlPoint ptr = new PaintControlPoint(px2, py1);
-    private ControlPoint pbl = new PaintControlPoint(px1, py2);
-    private ControlPoint pbr = new PaintControlPoint(px2, py2);
-    private PropertyChangeListener paintListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            firePropertyChange("paint." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-        }
-    };
-
-    protected PaintedShape() {
-        px1.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("x1", evt.getOldValue(), evt.getNewValue());
-            }
-        });
-        py1.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("y1", evt.getOldValue(), evt.getNewValue());
-            }
-        });
-        px2.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("x2", evt.getOldValue(), evt.getNewValue());
-            }
-        });
-        py2.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("y2", evt.getOldValue(), evt.getNewValue());
-            }
-        });
-    }
-
-    protected PaintedShape(UIDefaults canvasUiDefaults) {
-        this();
-        setPaintModel(new Matte(Color.ORANGE, canvasUiDefaults));
-    }
-
-    public PaintModel getPaintModel() {
-        return paint;
-    }
-
-    public void setPaintModel(PaintModel paint) {
-        PaintModel old = getPaintModel();
-        if (old != null) old.removePropertyChangeListener(paintListener);
-        this.paint = paint;
-        this.paint.addPropertyChangeListener(paintListener);
-        firePropertyChange("paintModel", old, getPaintModel());
-    }
-
-    public Paint getPaint() {
-        Paint p = getPaintModel().getPaint();
-        if (p instanceof Color) {
-            return p;
-        }
-        //resize p as necessary to fit the bounds of this PaintedShape
-        Rectangle2D bounds = getBounds(0);
-        if (p instanceof LinearGradientPaint) {
-            LinearGradientPaint lgp = (LinearGradientPaint) p;
-            return new LinearGradientPaint(
-                    convertLocalPoint(ptl.getPosition(), bounds),
-                    convertLocalPoint(pbr.getPosition(), bounds),
-                    lgp.getFractions(),
-                    lgp.getColors());
-        } else if (p instanceof RadialGradientPaint) {
-            RadialGradientPaint rgp = (RadialGradientPaint) p;
-            Point2D outer = convertLocalPoint(ptl.getPosition(), bounds);
-            Point2D center = convertLocalPoint(pbr.getPosition(), bounds);
-            double deltaX = Math.abs(center.getX() - outer.getX());
-            double deltaY = Math.abs(center.getY() - outer.getY());
-            float radius = (float) Math.sqrt((deltaX * deltaX) + (deltaY * deltaY));
-            return new RadialGradientPaint(
-                    center,
-                    radius,
-                    rgp.getFractions(),
-                    rgp.getColors());
-        } else {
-            return p;
-        }
-    }
-
-    public List<? extends ControlPoint> getControlPoints() {
-        switch (paint.getPaintControlType()) {
-            case control_line:
-                return Arrays.asList(ptl, pbr);
-            case control_rect:
-                return Arrays.asList(ptl, ptr, pbl, pbr);
-            default:
-                return Collections.emptyList();
-        }
-    }
-
-    public void paintFillControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-        switch (paint.getPaintControlType()) {
-            case control_line:
-                Point2D p1 = convertLocalPoint(ptl.getPosition(), PaintedShape.this.getBounds(0));
-                Point2D p2 = convertLocalPoint(pbr.getPosition(), PaintedShape.this.getBounds(0));
-                g2.setStroke(new BasicStroke((float) pixelSize));
-                g2.setColor(GraphicsHelper.FILL_LINE);
-                g2.draw(new Line2D.Double(p1.getX(), p1.getY(), p2.getX(), p2.getY()));
-                ptl.paintControls(g2, pixelSize, true);
-                pbr.paintControls(g2, pixelSize, true);
-                break;
-            case control_rect:
-                g2.setStroke(new BasicStroke((float) pixelSize));
-                g2.setColor(GraphicsHelper.FILL_LINE);
-                g2.draw(new Rectangle2D.Double(
-                        px1.getValue(),
-                        py1.getValue(),
-                        px2.getValue() - px1.getValue(),
-                        py2.getValue() - py1.getValue()));
-                ptl.paintControls(g2, pixelSize, true);
-                ptr.paintControls(g2, pixelSize, true);
-                pbl.paintControls(g2, pixelSize, true);
-                pbr.paintControls(g2, pixelSize, true);
-                break;
-        }
-    }
-
-    public void move(double moveX, double moveY, boolean snapPixels) {
-        for (ControlPoint controlPoint : getControlPoints()) {
-            if (!(controlPoint instanceof PaintControlPoint)) controlPoint.move(moveX, moveY, snapPixels);
-        }
-    }
-
-    public double getPaintX1() {
-        return px1.getValue();
-    }
-
-    public void setPaintX1(double x1) {
-        this.px1.setValue(x1);
-    }
-
-    public double getPaintX2() {
-        return px2.getValue();
-    }
-
-    public void setPaintX2(double x2) {
-        this.px2.setValue(x2);
-    }
-
-    public double getPaintY1() {
-        return py1.getValue();
-    }
-
-    public void setPaintY1(double y1) {
-        this.py1.setValue(y1);
-    }
-
-    public double getPaintY2() {
-        return py2.getValue();
-    }
-
-    public void setPaintY2(double y2) {
-        this.py2.setValue(y2);
-    }
-
-    // =================================================================================================================
-    // Private helper methods
-
-    private Point2D convertLocalPoint(Point2D point, Rectangle2D bounds) {
-        point.setLocation(
-                bounds.getX() + (point.getX() * bounds.getWidth()),
-                bounds.getY() + (point.getY() * bounds.getHeight())
-        );
-        return point;
-    }
-
-    private Point2D convertScreenPoint(Point2D point, Rectangle2D bounds) {
-        return new Point2D.Double(
-                (point.getX() - bounds.getX()) / bounds.getWidth(),
-                (point.getY() - bounds.getY()) / bounds.getHeight()
-        );
-    }
-
-    // =================================================================================================================
-    // Gradient ControlPoint
-
-    /**
-     * A Special ControlPoint thats internal values are in coordinates relative to the shapes bounds. With 0,0 being the
-     * top left of the shape and 1.0X == shape width and 1.0Y == shapes height.
-     */
-    public class PaintControlPoint extends ControlPoint {
-        public PaintControlPoint() {
-            super(GraphicsHelper.FILL_CP_FILL, GraphicsHelper.FILL_CP_LINE);
-        }
-
-        public PaintControlPoint(DoubleBean x, DoubleBean y) {
-            super(x, y, GraphicsHelper.FILL_CP_FILL, GraphicsHelper.FILL_CP_LINE);
-        }
-
-        public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-            Point2D p = convertLocalPoint(getPosition(), PaintedShape.this.getBounds(0));
-            g2.setStroke(new BasicStroke((float) pixelSize));
-            double size = pixelSize * 4d;
-            Shape s = new Ellipse2D.Double(p.getX() - size, p.getY() - size,
-                    size * 2, size * 2);
-            g2.setPaint(new GradientPaint(
-                    (float) p.getX(), (float) (p.getY() - size), Color.CYAN,
-                    (float) p.getX(), (float) (p.getY() + size), Color.WHITE
-            ));
-            g2.fill(s);
-            g2.setColor(GraphicsHelper.FILL_CP_LINE);
-            g2.draw(s);
-        }
-
-        public void move(double moveX, double moveY, boolean snapPixels) {
-            Rectangle2D bounds = PaintedShape.this.getBounds(0);
-            moveX = moveX / bounds.getWidth();
-            moveY = moveY / bounds.getHeight();
-            if (snapPixels) {
-                // snap to neareast 0.5
-                double newX = Math.round((x.getValue() + moveX) * 2d) / 2d;
-                double newY = Math.round((y.getValue() + moveY) * 2d) / 2d;
-                setPosition(newX, newY);
-            } else {
-                setPosition(x.getValue() + moveX, y.getValue() + moveY);
-            }
-        }
-
-        public Rectangle2D getBounds(double pixelSize) {
-            Point2D p = convertLocalPoint(getPosition(), PaintedShape.this.getBounds(0));
-            double size = pixelSize * 4d;
-            return new Rectangle2D.Double(p.getX() - size, p.getY() - size,
-                    size * 2, size * 2);
-        }
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PathShape.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PathShape.java
deleted file mode 100644
index 96997264363..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PathShape.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * PathShape
- *
- * @author Created by Jasper Potts (May 29, 2007)
- */
-public class PathShape extends PaintedShape {
-
-    private Shape cachedShape = null;
-    private List<BezierControlPoint> controlPoints = new ArrayList<BezierControlPoint>();
-    private PropertyChangeListener cpListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            rebuildShape();
-        }
-    };
-
-    // =================================================================================================================
-    // Constructors
-
-    /** private noargs constructor for JIBX */
-    private PathShape() {
-        this(null);
-    }
-
-    public PathShape(UIDefaults canvasUiDefaults) {
-        super(canvasUiDefaults);
-    }
-
-    public BezierControlPoint addPoint(double x, double y) {
-        BezierControlPoint cp = new BezierControlPoint(x, y);
-        controlPoints.add(cp);
-        cp.addPropertyChangeListener(cpListener);
-        // update shape
-        rebuildShape();
-        // return new control point
-        return cp;
-    }
-
-    public Shape getShape() {
-        if (cachedShape == null) {
-            rebuildShape();
-        }
-        return cachedShape;
-    }
-
-    private void rebuildShape() {
-        GeneralPath path = new GeneralPath();
-        BezierControlPoint first, last;
-        first = last = controlPoints.get(0);
-        path.moveTo((float) first.getX(), (float) first.getY());
-        for (int i = 0; i < controlPoints.size(); i++) {
-            BezierControlPoint controlPoint = controlPoints.get(i);
-            if (last.getCp2().isSharp() && controlPoint.getCp1().isSharp()) {
-                path.lineTo(controlPoint.getX(), controlPoint.getY());
-            } else {
-                path.curveTo(
-                        (float) last.getCp2().getX(), (float) last.getCp2().getY(),
-                        (float) controlPoint.getCp1().getX(), (float) controlPoint.getCp1().getY(),
-                        (float) controlPoint.getX(), (float) controlPoint.getY()
-                );
-            }
-            last = controlPoint;
-        }
-        // close path
-        if (last.getCp2().isSharp() && first.getCp1().isSharp()) {
-            path.lineTo(first.getX(), first.getY());
-        } else {
-            path.curveTo(
-                    (float) last.getCp2().getX(), (float) last.getCp2().getY(),
-                    (float) first.getCp1().getX(), (float) first.getCp1().getY(),
-                    (float) first.getX(), (float) first.getY()
-            );
-        }
-        path.closePath();
-        // fire change
-        cachedShape = path;
-        firePropertyChange("shape", null, cachedShape);
-    }
-
-    @Override
-    public String toString() {
-        String p = "PATH {\n";
-        BezierControlPoint first, last;
-        first = last = controlPoints.get(0);
-        p += "   path.moveTo(" + first.getX() + "," + first.getY() + ");";
-        for (int i = 0; i < controlPoints.size(); i++) {
-            BezierControlPoint controlPoint = controlPoints.get(i);
-            p += "   path.curveTo(" +
-                    (float) last.getCp2().getX() + "," + (float) last.getCp2().getY() + "," +
-                    (float) controlPoint.getCp1().getX() + "," + (float) controlPoint.getCp1().getY() + "," +
-                    (float) controlPoint.getX() + "," + (float) controlPoint.getY() +
-                    ");\n";
-            last = controlPoint;
-        }
-        // close path
-        p += "   path.curveTo(" +
-                (float) last.getCp2().getX() + "," + (float) last.getCp2().getY() + "," +
-                (float) first.getCp1().getX() + "," + (float) first.getCp1().getY() + "," +
-                (float) first.getX() + "," + (float) first.getY() +
-                ");\n";
-        p += "}\n";
-        return p;
-    }
-
-    // =================================================================================================================
-    // Shape Methods
-
-    public Rectangle2D getBounds(double pixelSize) {
-        return getShape().getBounds2D();
-    }
-
-    public List<? extends ControlPoint> getControlPoints() {
-        List<ControlPoint> pts = new ArrayList<ControlPoint>();
-        for (BezierControlPoint controlPoint : controlPoints) {
-            pts.add(controlPoint);
-        }
-        for (ControlPoint controlPoint : super.getControlPoints()) {
-            pts.add(controlPoint);
-        }
-        return pts;
-    }
-
-    public void setControlPoints(List<BezierControlPoint> controlPoints) {
-        List<BezierControlPoint> old = this.controlPoints;
-        for (BezierControlPoint cp : old) {
-            cp.removePropertyChangeListener(cpListener);
-        }
-        this.controlPoints = controlPoints;
-        for (BezierControlPoint cp : this.controlPoints) {
-            cp.addPropertyChangeListener(cpListener);
-        }
-        // update shape
-        rebuildShape();
-    }
-
-    public boolean isHit(Point2D p, double pixelSize) {
-        return getShape().contains(p);
-    }
-
-    public void paint(Graphics2D g2, double pixelSize) {
-        g2.setPaint(getPaint());
-        g2.fill(getShape());
-    }
-
-    public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-        if (paintControlLines) {
-            g2.setStroke(new BasicStroke((float) pixelSize));
-            g2.setColor(GraphicsHelper.CONTROL_LINE);
-            g2.draw(getShape());
-        }
-        for (BezierControlPoint controlPoint : controlPoints) {
-            if (!controlPoint.isSharpCorner()) controlPoint.paintControls(g2, pixelSize, true);
-        }
-    }
-
-    public List<BezierControlPoint> getBezierControlPoints() {
-        return controlPoints;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/RectangleShape.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/RectangleShape.java
deleted file mode 100644
index d93ef3f1ef5..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/RectangleShape.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * RectangleShape
- *
- * @author Created by Jasper Potts (May 22, 2007)
- */
-public class RectangleShape extends PaintedShape {
-
-    private DoubleBean x1 = new DoubleBean();
-    private DoubleBean x2 = new DoubleBean();
-    private DoubleBean y1 = new DoubleBean();
-    private DoubleBean y2 = new DoubleBean();
-    private ControlPoint tl = new ControlPoint(x1, y1);
-    private ControlPoint tr = new ControlPoint(x2, y1);
-    private ControlPoint bl = new ControlPoint(x1, y2);
-    private ControlPoint br = new ControlPoint(x2, y2);
-    private DoubleBean roundingX = new DoubleBean() {
-        public void setValue(double value) {
-            // contrain y = y1 and x is between x1+1 and (x2-x1)/2
-            boolean x1isLess = x1.getValue() < x2.getValue();
-            double min = x1isLess ? x1.getValue() + 1 : x1.getValue() - 1;
-            double max = x1isLess ? x1.getValue() + ((x2.getValue() - x1.getValue()) / 2) :
-                    x2.getValue() + ((x1.getValue() - x2.getValue()) / 2);
-            double newX = value;
-            if (newX < min) newX = min;
-            if (newX > max) newX = max;
-            super.setValue(newX);
-        }
-    };
-    private ControlPoint rounding = new ControlPoint(roundingX, y1) {
-        public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-            double size = pixelSize * 3d;
-            Shape s = new Ellipse2D.Double(getX() - size, getY() - size,
-                    size * 2, size * 2);
-            g2.setColor(GraphicsHelper.BEZIER_CONTROL_POINT_FILL);
-            g2.fill(s);
-            g2.setColor(GraphicsHelper.BEZIER_CONTROL_POINT_LINE);
-            g2.draw(s);
-        }
-
-        public void setPosition(Point2D position) {
-            // only alow X to change
-            x.setValue(position.getX());
-        }
-
-    };
-
-    // =================================================================================================================
-    // Constructors
-
-    /** private noargs constructor for JIBX */
-    private RectangleShape() {
-        this(null);
-    }
-
-    public RectangleShape(UIDefaults canvasUiDefaults) {
-        super(canvasUiDefaults);
-        x1.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                // keep rounding point in sync
-                roundingX.setValue(roundingX.getValue() +
-                        ((Double) evt.getNewValue() - (Double) evt.getOldValue()));
-                firePropertyChange("bounds", null, getBounds(0));
-            }
-        });
-        x2.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                // keep rounding point in sync
-                double distanceFromX1 = Math.abs(roundingX.getValue() - x1.getValue());
-                roundingX.setValue(
-                        (x1.getValue() < x2.getValue()) ? x1.getValue() + distanceFromX1 :
-                                x1.getValue() - distanceFromX1
-                );
-                firePropertyChange("bounds", null, getBounds(0));
-            }
-        });
-        PropertyChangeListener listener = new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("bounds", null, getBounds(0));
-            }
-        };
-        y1.addPropertyChangeListener(listener);
-        y2.addPropertyChangeListener(listener);
-        rounding.addPropertyChangeListener(listener);
-    }
-
-    public RectangleShape(double x, double y, double w, double h) {
-        this();
-        x1.setValue(x);
-        y1.setValue(y);
-        x2.setValue(x + w);
-        y2.setValue(y + h);
-    }
-
-    public Shape getShape() {
-        double rounding = getRounding();
-        double left = Math.min(x1.getValue(), x2.getValue());
-        double right = Math.max(x1.getValue(), x2.getValue());
-        double top = Math.min(y1.getValue(), y2.getValue());
-        double bottom = Math.max(y1.getValue(), y2.getValue());
-        if (rounding > 0) {
-            return new RoundRectangle2D.Double(
-                    left, top, right - left, bottom - top, rounding, rounding
-            );
-        } else {
-            return new Rectangle2D.Double(left, top, right - left, bottom - top);
-        }
-    }
-
-    public double getRounding() {
-        double rounding = Math.abs(roundingX.getValue() - x1.getValue()) * 2;
-        return rounding > 2 ? rounding : 0;
-    }
-
-    public void setRounding(double rounding) {
-        if (rounding > 0 && rounding < 2) rounding = 0;
-        roundingX.setValue((rounding / 2d) + x1.getValue());
-    }
-
-    public boolean isRounded() {
-        return getRounding() > 0;
-    }
-
-    public double getX1() {
-        return x1.getValue();
-    }
-
-    public void setX1(double x1) {
-        this.x1.setValue(x1);
-    }
-
-    public double getX2() {
-        return x2.getValue();
-    }
-
-    public void setX2(double x2) {
-        this.x2.setValue(x2);
-    }
-
-    public double getY1() {
-        return y1.getValue();
-    }
-
-    public void setY1(double y1) {
-        this.y1.setValue(y1);
-    }
-
-    public double getY2() {
-        return y2.getValue();
-    }
-
-    public void setY2(double y2) {
-        this.y2.setValue(y2);
-    }
-
-    // =================================================================================================================
-    // SimpleShape Methods
-
-    public Rectangle2D getBounds(double pixelSize) {
-        double left = Math.min(x1.getValue(), x2.getValue());
-        double right = Math.max(x1.getValue(), x2.getValue());
-        double top = Math.min(y1.getValue(), y2.getValue());
-        double bottom = Math.max(y1.getValue(), y2.getValue());
-        return new Rectangle2D.Double(left, top, right - left, bottom - top);
-    }
-
-    public boolean isHit(Point2D p, double pixelSize) {
-        return getShape().contains(p);
-    }
-
-    public void paint(Graphics2D g2, double pixelSize) {
-        g2.setPaint(getPaint());
-        g2.fill(getShape());
-    }
-
-    public void setFrame(double x1, double y1, double x2, double y2) {
-        this.x1.setValue(x1);
-        this.y1.setValue(y1);
-        this.x2.setValue(x2);
-        this.y2.setValue(y2);
-    }
-
-    @Override
-    public String toString() {
-        Rectangle2D bounds = getBounds(0);
-        if (isRounded()) {
-            return "ROUND RECT { x=" +  bounds.getX() + ", y=" + bounds.getY() + ", w=" + bounds.getWidth() + ", h=" + bounds.getHeight() + ", rounding=" + getRounding() + " }";
-        } else {
-            return "ROUND RECT { x=" +  bounds.getX() + ", y=" + bounds.getY() + ", w=" + bounds.getWidth() + ", h=" + bounds.getHeight() + " }";
-        }
-    }
-
-    public List<ControlPoint> getControlPoints() {
-        List<ControlPoint> points = new ArrayList<ControlPoint>();
-        points.addAll(super.getControlPoints());
-        points.add(tl);
-        points.add(tr);
-        points.add(bl);
-        points.add(br);
-        points.add(rounding);
-        return points;
-    }
-
-    public void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines) {
-        if (paintControlLines) {
-            g2.setStroke(new BasicStroke((float) pixelSize));
-            g2.setColor(GraphicsHelper.CONTROL_LINE);
-            g2.draw(getShape());
-        }
-        tl.paintControls(g2, pixelSize, true);
-        tr.paintControls(g2, pixelSize, true);
-        bl.paintControls(g2, pixelSize, true);
-        br.paintControls(g2, pixelSize, true);
-        rounding.paintControls(g2, pixelSize, true);
-    }
-
-    public void move(double moveX, double moveY, boolean snapPixels) {
-        if (snapPixels) {
-            x1.setValue(Math.round(x1.getValue() + moveX));
-            x2.setValue(Math.round(x2.getValue() + moveX));
-            y1.setValue(Math.round(y1.getValue() + moveY));
-            y2.setValue(Math.round(y2.getValue() + moveY));
-        } else {
-            x1.setValue(x1.getValue() + moveX);
-            x2.setValue(x2.getValue() + moveX);
-            y1.setValue(y1.getValue() + moveY);
-            y2.setValue(y2.getValue() + moveY);
-        }
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java
deleted file mode 100644
index c001c0f42b1..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import org.jdesktop.beans.AbstractBean;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-/**
- * SimpleShape
- *
- * @author Created by Jasper Potts (May 22, 2007)
- */
-public abstract class SimpleShape extends AbstractBean {
-
-    protected AffineTransform transform = new AffineTransform();
-    protected LayerContainer parent = null;
-
-    public void applyTransform(AffineTransform t) {
-        transform.concatenate(t);
-    }
-
-    public abstract Rectangle2D getBounds(double pixelSize);
-
-    public abstract void paint(Graphics2D g2, double pixelSize);
-
-    public abstract boolean isHit(Point2D p, double pixelSize);
-
-    public boolean intersects(Rectangle2D rect, double pixelSize) {
-        return getBounds(pixelSize).intersects(rect);
-    }
-
-    public abstract List<? extends ControlPoint> getControlPoints();
-
-    public abstract void paintControls(Graphics2D g2, double pixelSize, boolean paintControlLines);
-
-    public void move(double moveX, double moveY, boolean snapPixels) {
-        for (ControlPoint controlPoint : getControlPoints()) {
-            controlPoint.move(moveX, moveY, snapPixels);
-        }
-    }
-
-    public LayerContainer getParent() {
-        return parent;
-    }
-
-    public void setParent(LayerContainer parent) {
-        LayerContainer old = getParent();
-        this.parent = parent;
-        firePropertyChange("parent", old, getParent());
-    }
-
-    public abstract Shape getShape();
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/TemplateLayer.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/TemplateLayer.java
deleted file mode 100644
index d0e51c29ed9..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/TemplateLayer.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer;
-
-import org.jdesktop.swingx.designer.effects.Effect;
-
-import javax.imageio.ImageIO;
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-import java.awt.Color;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Image;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.lang.ref.SoftReference;
-
-/**
- * TemplateLayer
- *
- * @author Created by Jasper Potts (Jul 2, 2007)
- */
-public class TemplateLayer extends Layer {
-
-    private String fileName;
-    private transient SoftReference<BufferedImage> imgRef = null;
-
-    public TemplateLayer() {
-        type = LayerType.template;
-    }
-
-    public TemplateLayer(String fileName, BufferedImage templateImage) {
-        super("Template");
-        this.fileName = fileName;
-        type = LayerType.template;
-        if (templateImage != null) {
-            imgRef = new SoftReference<BufferedImage>(templateImage);
-        }
-    }
-
-    // =================================================================================================================
-    // Methods
-
-    public String getName() {
-        return super.getName();
-    }
-
-    /**
-     * template layers are always locked
-     *
-     * @return <code>true</code>
-     */
-    public boolean isLocked() {
-        return true;
-    }
-
-    public void add(SimpleShape shape) {
-        throw new IllegalStateException("Template layers can't contain shapes");
-    }
-
-    public void addEffect(Effect effect) {
-        throw new IllegalStateException("Template layers can't contain effects");
-    }
-
-    public void addLayer(int i, Layer layer) {
-        throw new IllegalStateException("Template layers can't contain sub layers");
-    }
-
-    public void addLayer(Layer layer) {
-        throw new IllegalStateException("Template layers can't contain sub layers");
-    }
-
-    public void paint(Graphics2D g2, double pixelSize) {
-        if (isVisible()) {
-            BufferedImage img = getTemplateImage();
-            if (img != null) g2.drawImage(img, 0, 0, null);
-        }
-    }
-
-
-    public Image getBuffer(GraphicsConfiguration graphicsConfiguration) {
-        return getTemplateImage();
-    }
-
-    public BufferedImage getTemplateImage() {
-        BufferedImage img = null;
-        if (imgRef == null || (img = imgRef.get()) == null) {
-
-            // can not access canvas
-            final File templateImgFile = new File(getCanvas().getTemplatesDir(), fileName);
-            System.out.println("templateImgFile = " + templateImgFile.getAbsolutePath());
-            System.out.println("templateImgFile.exists = " + templateImgFile.exists());
-            try {
-                img = ImageIO.read(templateImgFile);
-                imgRef = new SoftReference<BufferedImage>(img);
-            } catch (IOException e) {
-                e.printStackTrace();
-                // create error image
-                img = new BufferedImage(getCanvas().getSize().width, getCanvas().getSize().height,
-                        BufferedImage.TYPE_INT_RGB);
-                Graphics2D g2 = img.createGraphics();
-                g2.setColor(Color.RED);
-                g2.fillRect(0, 0, img.getWidth(), img.getHeight());
-                g2.setColor(Color.WHITE);
-                g2.setFont(g2.getFont().deriveFont(8f));
-                FontMetrics fontMetrics = g2.getFontMetrics();
-                Rectangle2D stringBounds = fontMetrics.getStringBounds("Missing Image", g2);
-                int offsetX = (int) ((img.getWidth() - stringBounds.getWidth()) / 2d);
-                int offsetY = (int) (((img.getHeight() - stringBounds.getHeight()) / 2d) - stringBounds.getY());
-                g2.drawString("Missing Image", offsetX, offsetY);
-                g2.dispose();
-                imgRef = new SoftReference<BufferedImage>(img);
-            }
-        }
-        return img;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/DropShadowEffect.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/DropShadowEffect.java
deleted file mode 100644
index ae95ea50ce3..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/DropShadowEffect.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.effects;
-
-import org.jdesktop.swingx.designer.paint.Matte;
-
-import javax.swing.UIDefaults;
-import java.awt.Color;
-import java.awt.image.BufferedImage;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.util.Arrays;
-
-/**
- * DropShadowEffect
- *
- * @author Created by Jasper Potts (Jun 18, 2007)
- */
-public class DropShadowEffect extends ShadowEffect {
-
-    protected DropShadowEffect() {}
-
-    ;
-
-    public DropShadowEffect(UIDefaults uiDefaults) {
-        color = new Matte(Color.BLACK, uiDefaults);
-    }
-
-    // =================================================================================================================
-    // Effect Methods
-
-    /**
-     * Get the display name for this effect
-     *
-     * @return The user displayable name
-     */
-    public String getDisplayName() {
-        return "Drop Shadow";
-    }
-
-    /**
-     * Get the type of this effect, one of UNDER,BLENDED,OVER. UNDER means the result of apply effect should be painted
-     * under the src image. BLENDED means the result of apply sffect contains a modified src image so just it should be
-     * painted. OVER means the result of apply effect should be painted over the src image.
-     *
-     * @return The effect type
-     */
-    public EffectType getEffectType() {
-        return EffectType.UNDER;
-    }
-
-    /**
-     * Apply the effect to the src image generating the result . The result image may or may not contain the source
-     * image depending on what the effect type is.
-     *
-     * @param src The source image for applying the effect to
-     * @param dst The dstination image to paint effect result into. If this is null then a new image will be created
-     * @param w   The width of the src image to apply effect to, this allow the src and dst buffers to be bigger than
-     *            the area the need effect applied to it
-     * @param h   The height of the src image to apply effect to, this allow the src and dst buffers to be bigger than
-     *            the area the need effect applied to it
-     * @return The result of appl
-     */
-    public BufferedImage applyEffect(BufferedImage src, BufferedImage dst, int w, int h) {
-        // calculate offset
-        double trangleAngle = Math.toRadians(angle - 90);
-        int offsetX = (int) (Math.sin(trangleAngle) * distance);
-        int offsetY = (int) (Math.cos(trangleAngle) * distance);
-        // clac expanded size
-        int tmpOffX = offsetX + size;
-        int tmpOffY = offsetY + size;
-        int tmpW = w + offsetX + size + size;
-        int tmpH = h + offsetY + size + size;
-        // create tmp buffers
-        int[] lineBuf = getTmpIntArray(w);
-        byte[] tmpBuf1 = getTmpByteArray1(tmpW * tmpH);
-        Arrays.fill(tmpBuf1, (byte) 0x00);
-        byte[] tmpBuf2 = getTmpByteArray2(tmpW * tmpH);
-        // extract src image alpha channel and inverse and offset
-        Raster srcRaster = src.getRaster();
-        for (int y = 0; y < h; y++) {
-            int dy = (y + tmpOffY);
-            int offset = dy * tmpW;
-            srcRaster.getDataElements(0, y, w, 1, lineBuf);
-            for (int x = 0; x < w; x++) {
-                int dx = x + tmpOffX;
-                tmpBuf1[offset + dx] = (byte) ((lineBuf[x] & 0xFF000000) >>> 24);
-            }
-        }
-        // blur
-        float[] kernel = EffectUtils.createGaussianKernel(size);
-        EffectUtils.blur(tmpBuf1, tmpBuf2, tmpW, tmpH, kernel, size); // horizontal pass
-        EffectUtils.blur(tmpBuf2, tmpBuf1, tmpH, tmpW, kernel, size);// vertical pass
-        //rescale
-        float spread = Math.min(1 / (1 - (0.01f * this.spread)), 255);
-        for (int i = 0; i < tmpBuf1.length; i++) {
-            int val = (int) (((int) tmpBuf1[i] & 0xFF) * spread);
-            tmpBuf1[i] = (val > 255) ? (byte) 0xFF : (byte) val;
-        }
-        // create color image with shadow color and greyscale image as alpha
-        if (dst == null) dst = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
-        WritableRaster shadowRaster = dst.getRaster();
-        int red = color.getRed(), green = color.getGreen(), blue = color.getBlue();
-        for (int y = 0; y < h; y++) {
-            int srcY = y + tmpOffY;
-            int shadowOffset = (srcY - offsetY) * tmpW;
-            for (int x = 0; x < w; x++) {
-                int srcX = x + tmpOffX;
-                lineBuf[x] = tmpBuf1[shadowOffset + (srcX - offsetX)] << 24 | red << 16 | green << 8 | blue;
-            }
-            shadowRaster.setDataElements(0, y, w, 1, lineBuf);
-        }
-        return dst;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/Effect.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/Effect.java
deleted file mode 100644
index 7b8b697caaf..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/Effect.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.effects;
-
-import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingx.designer.BlendingMode;
-
-import java.awt.image.BufferedImage;
-import java.lang.ref.SoftReference;
-
-/**
- * Effect
- *
- * @author Created by Jasper Potts (Jun 18, 2007)
- */
-public abstract class Effect extends AbstractBean {
-    protected boolean visible = true;
-
-    public enum EffectType {
-        UNDER, BLENDED, OVER
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    public void setVisible(boolean visible) {
-        boolean old = isVisible();
-        this.visible = visible;
-        firePropertyChange("visible", old, isVisible());
-    }
-
-    public String toString() {
-        return getDisplayName();
-    }
-
-    // =================================================================================================================
-    // Abstract Methods
-
-    /**
-     * Get the display name for this effect
-     *
-     * @return The user displayable name
-     */
-    public abstract String getDisplayName();
-
-    /**
-     * Get the type of this effect, one of UNDER,BLENDED,OVER. UNDER means the result of apply effect should be painted
-     * under the src image. BLENDED means the result of apply sffect contains a modified src image so just it should be
-     * painted. OVER means the result of apply effect should be painted over the src image.
-     *
-     * @return The effect type
-     */
-    public abstract EffectType getEffectType();
-
-    /**
-     * Get the blending mode to use to paint the result effected image if the EffectType is UNDER or OVER.
-     *
-     * @return The blending mode for the effect
-     */
-    public abstract BlendingMode getBlendingMode();
-
-    /**
-     * Get the opacity to use to paint the result effected image if the EffectType is UNDER or OVER.
-     *
-     * @return The opactity for the effect, 0.0f -> 1.0f
-     */
-    public abstract float getOpacity();
-
-    /**
-     * Apply the effect to the src image generating the result . The result image may or may not contain the source
-     * image depending on what the effect type is.
-     *
-     * @param src The source image for applying the effect to
-     * @param dst The dstination image to paint effect result into. If this is null then a new image will be created
-     * @param w   The width of the src image to apply effect to, this allow the src and dst buffers to be bigger than
-     *            the area the need effect applied to it
-     * @param h   The height of the src image to apply effect to, this allow the src and dst buffers to be bigger than
-     *            the area the need effect applied to it
-     * @return The result of appl
-     */
-    public abstract BufferedImage applyEffect(BufferedImage src, BufferedImage dst, int w, int h);
-
-    // =================================================================================================================
-    // Static data cache
-
-    private static SoftReference<int[]> tmpIntArray = null;
-    private static SoftReference<byte[]> tmpByteArray1 = null;
-    private static SoftReference<byte[]> tmpByteArray2 = null;
-    private static SoftReference<byte[]> tmpByteArray3 = null;
-
-    protected static int[] getTmpIntArray(int size) {
-        int[] tmp;
-        if (tmpIntArray == null || (tmp = tmpIntArray.get()) == null || tmp.length < size) {
-            // create new array
-            tmp = new int[size];
-            tmpIntArray = new SoftReference<int[]>(tmp);
-        }
-        return tmp;
-    }
-
-    protected static byte[] getTmpByteArray1(int size) {
-        byte[] tmp;
-        if (tmpByteArray1 == null || (tmp = tmpByteArray1.get()) == null || tmp.length < size) {
-            // create new array
-            tmp = new byte[size];
-            tmpByteArray1 = new SoftReference<byte[]>(tmp);
-        }
-        return tmp;
-    }
-
-    protected static byte[] getTmpByteArray2(int size) {
-        byte[] tmp;
-        if (tmpByteArray2 == null || (tmp = tmpByteArray2.get()) == null || tmp.length < size) {
-            // create new array
-            tmp = new byte[size];
-            tmpByteArray2 = new SoftReference<byte[]>(tmp);
-        }
-        return tmp;
-    }
-
-    protected static byte[] getTmpByteArray3(int size) {
-        byte[] tmp;
-        if (tmpByteArray3 == null || (tmp = tmpByteArray3.get()) == null || tmp.length < size) {
-            // create new array
-            tmp = new byte[size];
-            tmpByteArray3 = new SoftReference<byte[]>(tmp);
-        }
-        return tmp;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtils.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtils.java
deleted file mode 100644
index 9a6876b5a5a..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.effects;
-
-
-/**
- * EffectUtils
- *
- * @author Created by Jasper Potts (Jun 18, 2007)
- */
-public class EffectUtils {
-
-    /**
-     * <p>Blurs the source pixels into the destination pixels. The force of the blur is specified by the radius which
-     * must be greater than 0.</p> <p>The source and destination pixels arrays are expected to be in the BYTE_GREY
-     * format.</p> <p>After this method is executed, dstPixels contains a transposed and filtered copy of
-     * srcPixels.</p>
-     *
-     * @param srcPixels the source pixels
-     * @param dstPixels the destination pixels
-     * @param width     the width of the source picture
-     * @param height    the height of the source picture
-     * @param kernel    the kernel of the blur effect
-     * @param radius    the radius of the blur effect
-     */
-    public static void blur(byte[] srcPixels, byte[] dstPixels,
-                            int width, int height,
-                            float[] kernel, int radius) {
-        float p;
-        int cp;
-        for (int y = 0; y < height; y++) {
-            int index = y;
-            int offset = y * width;
-            for (int x = 0; x < width; x++) {
-                p = 0.0f;
-                for (int i = -radius; i <= radius; i++) {
-                    int subOffset = x + i;
-                    if (subOffset < 0 || subOffset >= width) {
-                        subOffset = (x + width) % width;
-                    }
-                    int pixel = srcPixels[offset + subOffset] & 0xFF;
-                    float blurFactor = kernel[radius + i];
-                    p += blurFactor * pixel;
-                }
-                cp = (int) (p + 0.5f);
-                dstPixels[index] = (byte) (cp > 255 ? 255 : cp);
-                index += height;
-            }
-        }
-    }
-
-    public static float[] createGaussianKernel(int radius) {
-        if (radius < 1) {
-            throw new IllegalArgumentException("Radius must be >= 1");
-        }
-
-        float[] data = new float[radius * 2 + 1];
-
-        float sigma = radius / 3.0f;
-        float twoSigmaSquare = 2.0f * sigma * sigma;
-        float sigmaRoot = (float) Math.sqrt(twoSigmaSquare * Math.PI);
-        float total = 0.0f;
-
-        for (int i = -radius; i <= radius; i++) {
-            float distance = i * i;
-            int index = i + radius;
-            data[index] = (float) Math.exp(-distance / twoSigmaSquare) / sigmaRoot;
-            total += data[index];
-        }
-
-        for (int i = 0; i < data.length; i++) {
-            data[i] /= total;
-        }
-
-        return data;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtilsTemp.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtilsTemp.java
deleted file mode 100644
index 17bfd333f9b..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtilsTemp.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.effects;
-
-import java.awt.Composite;
-import java.awt.CompositeContext;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-
-/**
- * EffectUtilsTemp - effect utils methods that are not being used for now but we might want later
- *
- * @author Created by Jasper Potts (Jun 18, 2007)
- */
-public class EffectUtilsTemp {
-
-    /**
-     * Extract the alpha channel of a image into new greyscale buffered image
-     *
-     * @param src Must but INT_ARGB buffered image
-     * @return new TYPE_BYTE_GRAY image of just the alpha channel
-     */
-    public static BufferedImage extractAlpha(BufferedImage src) {
-        int w = src.getWidth();
-        int h = src.getHeight();
-        // extract image alpha channel as greyscale image
-        final BufferedImage greyImg = new BufferedImage(w, h, BufferedImage.TYPE_BYTE_GRAY);
-        Graphics2D g2 = greyImg.createGraphics();
-        g2.setComposite(new Composite() {
-            public CompositeContext createContext(ColorModel srcColorModel, ColorModel dstColorModel,
-                                                  RenderingHints hints) {
-                return new CompositeContext() {
-                    public void dispose() {}
-
-                    public void compose(Raster src, Raster dstIn, WritableRaster dstOut) {
-                        int width = Math.min(src.getWidth(), dstIn.getWidth());
-                        int height = Math.min(src.getHeight(), dstIn.getHeight());
-                        int[] srcPixels = new int[width];
-                        byte[] dstPixels = new byte[width];
-                        for (int y = 0; y < height; y++) {
-                            src.getDataElements(0, y, width, 1, srcPixels);
-                            for (int x = 0; x < width; x++) {
-                                dstPixels[x] = (byte) ((srcPixels[x] & 0xFF000000) >>> 24);
-                            }
-                            dstOut.setDataElements(0, y, width, 1, dstPixels);
-                        }
-                    }
-                };
-            }
-        });
-        g2.drawImage(src, 0, 0, null);
-        g2.dispose();
-        return greyImg;
-    }
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerShadowEffect.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerShadowEffect.java
deleted file mode 100644
index 502c4a0537e..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerShadowEffect.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.effects;
-
-import org.jdesktop.swingx.designer.paint.Matte;
-
-import javax.swing.UIDefaults;
-import java.awt.Color;
-import java.awt.image.BufferedImage;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.util.Arrays;
-
-/**
- * InnerShadowEffect
- *
- * @author Created by Jasper Potts (Jun 18, 2007)
- */
-public class InnerShadowEffect extends ShadowEffect {
-
-    protected InnerShadowEffect() {}
-
-    ;
-
-    public InnerShadowEffect(UIDefaults uiDefaults) {
-        color = new Matte(Color.BLACK, uiDefaults);
-    }
-
-    // =================================================================================================================
-    // Effect Methods
-
-    /**
-     * Get the display name for this effect
-     *
-     * @return The user displayable name
-     */
-    public String getDisplayName() {
-        return "Inner Shadow";
-    }
-
-    /**
-     * Get the type of this effect, one of UNDER,BLENDED,OVER. UNDER means the result of apply effect should be painted
-     * under the src image. BLENDED means the result of apply sffect contains a modified src image so just it should be
-     * painted. OVER means the result of apply effect should be painted over the src image.
-     *
-     * @return The effect type
-     */
-    public Effect.EffectType getEffectType() {
-        return Effect.EffectType.OVER;
-    }
-
-    /**
-     * Apply the effect to the src image generating the result . The result image may or may not contain the source
-     * image depending on what the effect type is.
-     *
-     * @param src The source image for applying the effect to
-     * @param dst The dstination image to paint effect result into. If this is null then a new image will be created
-     * @param w   The width of the src image to apply effect to, this allow the src and dst buffers to be bigger than
-     *            the area the need effect applied to it
-     * @param h   The height of the src image to apply effect to, this allow the src and dst buffers to be bigger than
-     *            the area the need effect applied to it
-     * @return The result of appl
-     */
-    public BufferedImage applyEffect(BufferedImage src, BufferedImage dst, int w, int h) {
-        // calculate offset
-        double trangleAngle = Math.toRadians(angle - 90);
-        int offsetX = (int) (Math.sin(trangleAngle) * distance);
-        int offsetY = (int) (Math.cos(trangleAngle) * distance);
-        // clac expanded size
-        int tmpOffX = offsetX + size;
-        int tmpOffY = offsetY + size;
-        int tmpW = w + offsetX + size + size;
-        int tmpH = h + offsetY + size + size;
-        // create tmp buffers
-        int[] lineBuf = getTmpIntArray(w);
-        byte[] srcAlphaBuf = getTmpByteArray1(tmpW * tmpH);
-        Arrays.fill(srcAlphaBuf, (byte) 0xFF);
-        byte[] tmpBuf1 = getTmpByteArray2(tmpW * tmpH);
-        byte[] tmpBuf2 = getTmpByteArray3(tmpW * tmpH);
-        // extract src image alpha channel and inverse and offset
-        Raster srcRaster = src.getRaster();
-        for (int y = 0; y < h; y++) {
-            int dy = (y + tmpOffY);
-            int offset = dy * tmpW;
-            srcRaster.getDataElements(0, y, w, 1, lineBuf);
-            for (int x = 0; x < w; x++) {
-                int dx = x + tmpOffX;
-                srcAlphaBuf[offset + dx] = (byte) ((255 - ((lineBuf[x] & 0xFF000000) >>> 24)) & 0xFF);
-            }
-        }
-        // blur
-        float[] kernel = EffectUtils.createGaussianKernel(size * 2);
-        EffectUtils.blur(srcAlphaBuf, tmpBuf2, tmpW, tmpH, kernel, size * 2); // horizontal pass
-        EffectUtils.blur(tmpBuf2, tmpBuf1, tmpH, tmpW, kernel, size * 2);// vertical pass
-        //rescale
-        float spread = Math.min(1 / (1 - (0.01f * this.spread)), 255);
-        for (int i = 0; i < tmpBuf1.length; i++) {
-            int val = (int) (((int) tmpBuf1[i] & 0xFF) * spread);
-            tmpBuf1[i] = (val > 255) ? (byte) 0xFF : (byte) val;
-        }
-        // create color image with shadow color and greyscale image as alpha
-        if (dst == null) dst = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
-        WritableRaster shadowRaster = dst.getRaster();
-        int red = color.getRed(), green = color.getGreen(), blue = color.getBlue();
-        for (int y = 0; y < h; y++) {
-            int srcY = y + tmpOffY;
-            int offset = srcY * tmpW;
-            int shadowOffset = (srcY - offsetY) * tmpW;
-            for (int x = 0; x < w; x++) {
-                int srcX = x + tmpOffX;
-                int origianlAlphaVal = 255 - ((int) srcAlphaBuf[offset + srcX] & 0xFF);
-                int shadowVal = (int) tmpBuf1[shadowOffset + (srcX - offsetX)] & 0xFF;
-                int alphaVal = Math.min(origianlAlphaVal, shadowVal);
-                lineBuf[x] = ((byte) alphaVal & 0xFF) << 24 | red << 16 | green << 8 | blue;
-            }
-            shadowRaster.setDataElements(0, y, w, 1, lineBuf);
-        }
-        return dst;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/ShadowEffect.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/ShadowEffect.java
deleted file mode 100644
index 39620d54911..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/ShadowEffect.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.effects;
-
-import org.jdesktop.swingx.designer.BlendingMode;
-import org.jdesktop.swingx.designer.paint.Matte;
-
-import javax.swing.UIDefaults;
-import java.awt.Color;
-
-/**
- * ShadowEffect - base class with all the standard properties for shadow effects
- *
- * @author Created by Jasper Potts (Jun 18, 2007)
- */
-public abstract class ShadowEffect extends Effect {
-    protected Matte color;
-    protected BlendingMode blendingMode = BlendingMode.NORMAL;
-    /** Opacity a float 0-1 for percentage */
-    protected float opacity = 0.75f;
-    /** Angle in degrees between 0-360 */
-    protected int angle = 135;
-    /** Distance in pixels */
-    protected int distance = 5;
-    /** The shadow spread between 0-100 % */
-    protected int spread = 0;
-    /** Size in pixels */
-    protected int size = 5;
-
-    protected ShadowEffect() {}
-
-    ;
-
-    public ShadowEffect(UIDefaults uiDefaults) {
-        color = new Matte(Color.BLACK, uiDefaults);
-    }
-
-    // =================================================================================================================
-    // Bean methods
-
-    public Matte getColor() {
-        return color;
-    }
-
-    public void setColor(Matte color) {
-        Matte old = getColor();
-        this.color = color;
-        firePropertyChange("color", old, getColor());
-    }
-
-    public BlendingMode getBlendingMode() {
-        return blendingMode;
-    }
-
-    public void setBlendingMode(BlendingMode blendingMode) {
-        BlendingMode old = getBlendingMode();
-        this.blendingMode = blendingMode;
-        firePropertyChange("blendingMode", old, getBlendingMode());
-    }
-
-    public float getOpacity() {
-        return opacity;
-    }
-
-    public void setOpacity(float opacity) {
-        float old = getOpacity();
-        this.opacity = opacity;
-        firePropertyChange("opacity", old, getOpacity());
-    }
-
-    public int getAngle() {
-        return angle;
-    }
-
-    public void setAngle(int angle) {
-        int old = getAngle();
-        this.angle = angle;
-        firePropertyChange("angle", old, getAngle());
-    }
-
-    public int getDistance() {
-        return distance;
-    }
-
-    public void setDistance(int distance) {
-        int old = getDistance();
-        this.distance = distance;
-        firePropertyChange("distance", old, getDistance());
-    }
-
-    public int getSpread() {
-        return spread;
-    }
-
-    public void setSpread(int spread) {
-        int old = getSpread();
-        this.spread = spread;
-        firePropertyChange("spread", old, getSpread());
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public void setSize(int size) {
-        int old = getSize();
-        this.size = size;
-        firePropertyChange("size", old, getSize());
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java
deleted file mode 100644
index 89d4675f374..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.font;
-
-import java.awt.Font;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import javax.swing.UIDefaults;
-import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-import org.jibx.runtime.IUnmarshallingContext;
-
-/**
- * I don't think the name is technically correct (ie: a typeface is not a font),
- * but I wanted something besides "font" so, here it is.
- *
- * This is a mutable font, much like Matte is a mutable color. Also like Matte,
- * Typeface can be derived.
- *
- * @author rbair
- */
-public class Typeface extends AbstractBean {
-    //specifies whether to derive bold, or italic.
-    //Default means, get my value from my parent.
-    //Off means, leave bold/italic off.
-    //On means, make bold/italic on.
-    public enum DeriveStyle { Default, Off, On }
-
-    private String uiDefaultParentName;
-    /** This is a local UIDefaults that contains all the UIDefaults in the Model. */
-    private transient UIDefaults uiDefaults = new UIDefaults();
-    private PropertyChangeListener uiDefaultsChangeListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            if (uiDefaultParentName != null && uiDefaultParentName.equals(evt.getPropertyName())) {
-                updateFontFromOffsets();
-            }
-        }
-    };
-
-    /**
-     * The name of the font. If uiDefaultParentName is specified, then this name
-     * will be set to be equal to the name of the parent font.
-     */
-    private String name;
-    /**
-     * The size of the font. If uiDefaultParentName is set, then this value is
-     * updated to reflect the size of the parent font * the sizeOffset.
-     */
-    private int size;
-
-    //this field is not publically accessible. Rather, it is updated based on
-    //"bold" and "italic" as necessary.
-    private int style = Font.PLAIN;
-    private DeriveStyle bold = DeriveStyle.Default;
-    private DeriveStyle italic = DeriveStyle.Default;
-
-    /**
-     * The size offset. Only used if uiDefaultParentName is specified. This offset
-     * will be multiplied with the parent font's size to determine the size of this
-     * typeface. The offset is specified as a percentage, either positive or negative.
-     *
-     * The reason a percentage was used, was so that things would look correctly
-     * when scaled, such as with high DPI situations.
-     */
-    private float sizeOffset;
-
-    /**
-     * Create a new Typeface. Note that, without specifying the uiDefaults,
-     * you cannot have font derivation. Thus, this constructor should never
-     * be called, except for the XML binding stuff.
-     */
-    public Typeface() { }
-
-    /**
-     * Creates a new Typeface.
-     *
-     * @param f The font from which to get the font name, size, and style to use
-     * to initialize this typeface. Note that this font is not used as a parent
-     * font for derivation purposes. Rather, it is used as a source from which to
-     * copy initial settings.
-     *
-     * @param uiDefaults The uiDefaults to use for font derivation purposes.
-     * When the uiDefaultParentName is specified, then this Typeface will inspect
-     * the given UIDefaults for that parent <em>font</em>. Note that the UIDefaults
-     * should be populated with a font, and not with a typeface.
-     */
-    public Typeface(Font f, UIDefaults uiDefaults) {
-        if (f != null) {
-            this.name = f.getName();
-            this.size = f.getSize();
-            this.style = f.getStyle();
-        }
-        setUiDefaults(uiDefaults);
-    }
-
-    // =================================================================================================================
-    // JIBX Methods
-
-    /**
-     * Called by JIBX after all fields have been set
-     *
-     * @param context The JIBX Unmarshalling Context
-     */
-    protected void postSet(IUnmarshallingContext context) {
-        // walk up till we get synth model
-        for (int i = 0; i < context.getStackDepth(); i++) {
-            if (context.getStackObject(i) instanceof HasUIDefaults) {
-                UIDefaults uiDefaults = ((HasUIDefaults) context.getStackObject(i)).getUiDefaults();
-                if (uiDefaults != null) {
-                    setUiDefaults(uiDefaults);
-                    break;
-                }
-            }
-        }
-    }
-
-    // =================================================================================================================
-    // Typeface methods
-
-    /**
-     * Is the Typeface an absolute Font not derived from a parent ui default
-     *
-     * @return <code>true</code> if this is a absolute not uidefault derived font
-     */
-    public boolean isAbsolute() {
-        return uiDefaultParentName == null;
-    }
-
-    /**
-     * Set all properties of this Typeface to be the same as <code>src</code> and fire all the change events
-     *
-     * @param src the Typeface to copy properties from
-     */
-    public void copy(Typeface src) {
-        // keep old values
-        Font oldFont = getFont();
-        String oldParentName = uiDefaultParentName;
-        String oldName = name;
-        int oldSize = size;
-        float oldSizeOffset = sizeOffset;
-        DeriveStyle oldBold = bold, oldItalic = italic;
-
-        style = src.style;
-
-        //Note, I don't just call the setters here, because I want to make
-        //sure the "font" PCE is only fired once, at the end.
-        name = src.name;
-        firePropertyChange("name", oldName, name);
-        size = src.size;
-        firePropertyChange("size", oldSize, size);
-        bold = src.bold;
-        firePropertyChange("bold", oldBold, bold);
-        italic = src.italic;
-        firePropertyChange("italic", oldItalic, italic);
-        sizeOffset = src.sizeOffset;
-        firePropertyChange("sizeOffset", oldSizeOffset, sizeOffset);
-        uiDefaultParentName = src.uiDefaultParentName;
-        firePropertyChange("uiDefaultParentName", oldParentName, uiDefaultParentName);
-        setUiDefaults(src.uiDefaults);
-        firePropertyChange("font", oldFont, getFont());
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    /**
-     * Get the local UIDefaults that contains all the UIDefaults in the Model.
-     *
-     * @return The UIDefaults for the model that contains this Typeface, can be null if this Typeface is not part of a bigger
-     *         model
-     */
-    public UIDefaults getUiDefaults() {
-        return uiDefaults;
-    }
-
-    /**
-     * Set the local UIDefaults that contains all the UIDefaults in the Model.
-     *
-     * @param uiDefaults The UIDefaults for the model that contains this Typeface, can be null if this Typeface is not part of
-     *                   a bigger model
-     */
-    public void setUiDefaults(UIDefaults uiDefaults) {
-        if (uiDefaults != this.uiDefaults) {
-            UIDefaults old = getUiDefaults();
-            if (old != null) old.removePropertyChangeListener(uiDefaultsChangeListener);
-            this.uiDefaults = uiDefaults;
-            if (uiDefaults != null) this.uiDefaults.addPropertyChangeListener(uiDefaultsChangeListener);
-            firePropertyChange("uiDefaults", old, getUiDefaults());
-        }
-    }
-
-    /**
-     * Get the name if the uidefault font that is the parent that this Typeface is derived from. If null then this is a
-     * absolute font.
-     *
-     * @return Parent font ui default name
-     */
-    public String getUiDefaultParentName() {
-        return uiDefaultParentName;
-    }
-
-    /**
-     * Set the name if the uidefault font that is the parent that this Typeface is derived from. If null then this is a
-     * absolute font.
-     *
-     * @param uiDefaultParentName Parent font ui default name
-     */
-    public void setUiDefaultParentName(String uiDefaultParentName) {
-        String old = getUiDefaultParentName();
-        this.uiDefaultParentName = uiDefaultParentName;
-        firePropertyChange("uiDefaultParentName", old, getUiDefaultParentName());
-        if (isAbsolute()) {
-            // reset offsets
-            float oldSizeOffset = sizeOffset;
-            sizeOffset = 0;
-            firePropertyChange("sizeOffset", oldSizeOffset, sizeOffset);
-        } else {
-            updateFontFromOffsets();
-        }
-    }
-
-    /**
-     * @return Gets the name of the font
-     */
-    public final String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the name of the font. This method call <em>only</em> works if
-     * <code>isAbsolute</code> returns true. Otherwise, it is ignored.
-     * @param name the name of the font
-     */
-    public void setName(String name) {
-        if (isAbsolute()) {
-            String old = this.name;
-            Font oldF = getFont();
-            this.name = name;
-            firePropertyChange("name", old, this.name);
-            firePropertyChange("font", oldF, getFont());
-        }
-    }
-
-    /**
-     * @return gets the size of the font.
-     */
-    public final int getSize() {
-        return size;
-    }
-
-    /**
-     * <p>Sets the size of the font. THis method call will work whether
-     * <code>isAbsolute</code> returns true or false. If this is an absolute
-     * typeface, then the size is set directly. Otherwise, if this is a
-     * derived typeface, then the sizeOffset will be updated to reflect the
-     * proper offset based on this size, and the size of the parent font.</p>
-     *
-     * <p>For example, if the parent font's size was 12, and the sizeOffset was
-     * -2 (thus yielding as size on this typeface of 10), and you call setSize
-     * passing in "14" as the size, then the sizeOffset will be updated to be
-     * equal to "2".</p>
-     *
-     * @param size the new size for this typeface.
-     */
-    public void setSize(int size) {
-        int old = this.size;
-        Font oldF = getFont();
-        this.size = size;
-        firePropertyChange("size", old, this.size);
-        firePropertyChange("font", oldF, getFont());
-        updateOffsetsFromFont();
-    }
-
-    /**
-     * @return the size offset
-     */
-    public final float getSizeOffset() {
-        return sizeOffset;
-    }
-
-    /**
-     * Sets the percentage by which the size of this font should be different
-     * from its parent font. This property is kept in synch with the size property.
-     *
-     * @param sizeOffset the size offset. May be any float. The value "1" means,
-     * 100%. -1 means "-100%". 2 means "200%", and so on.
-     */
-    public void setSizeOffset(float sizeOffset) {
-        float old = this.sizeOffset;
-        Font oldF = getFont();
-        this.sizeOffset = sizeOffset;
-        firePropertyChange("sizeOffset", old, this.sizeOffset);
-        firePropertyChange("font", oldF, getFont());
-        updateFontFromOffsets();
-    }
-
-    public DeriveStyle getBold() {
-        return bold;
-    }
-
-    public void setBold(DeriveStyle bold) {
-        DeriveStyle old = this.bold;
-        this.bold = bold == null ? DeriveStyle.Default : bold;
-        firePropertyChange("bold", old, this.bold);
-        updateFontFromOffsets();
-    }
-
-    public DeriveStyle getItalic() {
-        return italic;
-    }
-
-    public void setItalic(DeriveStyle italic) {
-        DeriveStyle old = this.italic;
-        this.italic = italic == null ? DeriveStyle.Default : italic;
-        firePropertyChange("italic", old, this.italic);
-        updateFontFromOffsets();
-    }
-
-    /**
-     * @return whether or not the font represented by this typeface is supported
-     * on this operating system platform.
-     */
-    public boolean isFontSupported() {
-        return true;//Font.getFont(name) != null;
-    }
-
-    /**
-     * @return Gets the font associated with this Typeface. If font derivation is
-     * being used, then the Font returned is the result of that derivation.
-     */
-    public Font getFont() {
-        return new Font(name, style, size);
-    }
-
-    /**
-     * Sets the font from which this Typeface should extract the font name, style,
-     * and size. If font derivation is being used, then the font name will be ignored,
-     * the style will be used (and always override the parent font), and the size
-     * will be set and the sizeOffset updated appropriately.
-     *
-     * @param f the Font
-     */
-    public void setFont(Font f) {
-        Font oldFont = getFont();
-        String oldName = name;
-        int oldSize = size;
-        DeriveStyle oldBold = bold, oldItalic = italic;
-        name = f.getName();
-        size = f.getSize();
-        style = f.getStyle();
-        updateOffsetsFromFont();
-        firePropertyChange("name", oldName, name);
-        firePropertyChange("size", oldSize, size);
-        firePropertyChange("bold", oldBold, bold);
-        firePropertyChange("italic", oldItalic, italic);
-        firePropertyChange("font", oldFont, getFont());
-    }
-
-    /**
-     * @inheritDoc
-     *
-     * @return A formatted string representing this Typeface. This String should
-     * not be considered public API, as it may change in a future release.
-     */
-    @Override public String toString() {
-        Font f = getFont();
-        String  strStyle;
-        if (f.isBold()) {
-            strStyle = f.isItalic() ? "bolditalic" : "bold";
-        } else {
-            strStyle = f.isItalic() ? "italic" : "plain";
-        }
-
-        if (isAbsolute()) {
-            return Typeface.class.getName() + "[name=" + name + ", size=" + size + ", style=" + strStyle + "]";
-        } else {
-            return Typeface.class.getName() + "[base=" + uiDefaultParentName +
-                    ", name=" + name + ", size=" + size + "(offset " + sizeOffset + ")" +
-                    ", style=" + strStyle + "]";
-        }
-    }
-
-    @Override public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Typeface typeface = (Typeface) o;
-        if (!typeface.name.equals(name)) return false;
-        if (size != typeface.size) return false;
-        if (bold != typeface.bold) return false;
-        if (italic != typeface.italic) return false;
-        if (sizeOffset != typeface.sizeOffset) return false;
-        if (uiDefaultParentName != null ? !uiDefaultParentName.equals(typeface.uiDefaultParentName) :
-                typeface.uiDefaultParentName != null) return false;
-        return true;
-    }
-
-    @Override public int hashCode() {
-        int result;
-        result = name.hashCode();
-        result = 31 * result + size;
-        result = 31 * result + bold.ordinal();
-        result = 31 * result + italic.ordinal();
-        result = 31 * result + (int)(sizeOffset*100);
-        result = 31 * result + (uiDefaultParentName != null ? uiDefaultParentName.hashCode() : 0);
-        return result;
-    }
-
-    @Override public Typeface clone() {
-        Typeface clone = new Typeface();
-        clone.name = name;
-        clone.size = size;
-        clone.style = style;
-        clone.bold = bold;
-        clone.italic = italic;
-        clone.sizeOffset = sizeOffset;
-        clone.uiDefaultParentName = uiDefaultParentName;
-        clone.setUiDefaults(uiDefaults);
-        return clone;
-    }
-
-    // =================================================================================================================
-    // Private Helper Methods
-
-    private void updateOffsetsFromFont() {
-        if (!isAbsolute()) {
-            float oldSizeOffset = sizeOffset;
-            Font parentFont = uiDefaults.getFont(uiDefaultParentName);
-            if (parentFont != null) {
-                float s = size;
-                float p = parentFont.getSize();
-                sizeOffset = (s/p) - 1f;
-                firePropertyChange("sizeOffset", oldSizeOffset, sizeOffset);
-            }
-        }
-    }
-
-    private void updateFontFromOffsets() {
-        if (!isAbsolute()) {
-            Font oldFont = getFont();
-            // get parent font data
-            Font parentFont = uiDefaults.getFont(uiDefaultParentName);
-            if (parentFont != null) {
-                String oldName = name;
-                int oldSize = size;
-
-                name = parentFont.getName();
-                size = Math.round(parentFont.getSize() * (1f + sizeOffset));
-
-                boolean isBold = (bold == DeriveStyle.Default && parentFont.isBold()) || bold == DeriveStyle.On;
-                boolean isItalic = (italic == DeriveStyle.Default && parentFont.isItalic()) || italic == DeriveStyle.On;
-                style = Font.PLAIN;
-                if (isBold) style = style | Font.BOLD;
-                if (isItalic) style = style | Font.ITALIC;
-
-                // update fire events
-                firePropertyChange("name", oldName, name);
-                firePropertyChange("size", oldSize, size);
-                firePropertyChange("font", oldFont, getFont());
-            }
-        }
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/CanvasMapper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/CanvasMapper.java
deleted file mode 100644
index 6c201fd0fee..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/CanvasMapper.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.jibxhelpers;
-
-import org.jdesktop.swingx.designer.Canvas;
-import org.jdesktop.swingx.designer.utils.HasPath;
-import org.jdesktop.swingx.designer.utils.HasResources;
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-import org.jibx.runtime.BindingDirectory;
-import org.jibx.runtime.IBindingFactory;
-import org.jibx.runtime.IMarshallable;
-import org.jibx.runtime.IMarshaller;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.IUnmarshaller;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.UnmarshallingContext;
-
-import javax.swing.UIDefaults;
-import java.io.File;
-
-/**
- * CanvasMapper
- *
- * @author Created by Jasper Potts (Jun 12, 2007)
- */
-public class CanvasMapper implements IMarshaller, IUnmarshaller {
-    private static final String ELEMENT_NAME = "canvas";
-    private IBindingFactory bindingFactory;
-
-
-    public CanvasMapper() {
-        try {
-            bindingFactory = BindingDirectory.getFactory(Canvas.class);
-        } catch (JiBXException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public boolean isExtension(int i) {
-        return false;
-    }
-
-    public boolean isPresent(IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        return iUnmarshallingContext.isAt(null, ELEMENT_NAME);
-    }
-
-    public void marshal(Object object, IMarshallingContext iMarshallingContext) throws JiBXException {
-        if (!(object instanceof Canvas)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else if (!(iMarshallingContext instanceof MarshallingContext)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else {
-            // version found, create marshaller for the associated binding
-//            IBindingFactory bindingFactory = BindingDirectory.getFactory(object.getClass());
-            MarshallingContext context = (MarshallingContext) bindingFactory.createMarshallingContext();
-            // configure marshaller for writing document
-            context.setXmlWriter(iMarshallingContext.getXmlWriter());
-            // output object as document
-            ((IMarshallable) object).marshal(context);
-        }
-    }
-
-    public Object unmarshal(Object object, IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        // make sure we're at the appropriate start tag
-        UnmarshallingContext ctx = (UnmarshallingContext) iUnmarshallingContext;
-        if (!ctx.isAt(null, ELEMENT_NAME)) {
-            ctx.throwStartTagNameError(null, ELEMENT_NAME);
-        }
-
-//        IBindingFactory bindingFactory = BindingDirectory.getFactory(Canvas.class);
-        UnmarshallingContext uctx = (UnmarshallingContext) bindingFactory.createUnmarshallingContext();
-        uctx.setFromContext(ctx);
-        // get the uiDefaults from SynthModel and set them as user context
-        UIDefaults uiDefaults = ((HasUIDefaults) ctx.getStackObject(ctx.getStackDepth() - 1)).getUiDefaults();
-        uctx.setUserContext(uiDefaults);
-        // get has resources
-        HasResources hasResources = (HasResources) ctx.getStackObject(ctx.getStackDepth() - 1);
-        // get path
-        HasPath hasPath = null;
-        for (int i = 0; i < ctx.getStackDepth(); i++) {
-            if (ctx.getStackObject(i) instanceof HasPath) {
-                hasPath = (HasPath) ctx.getStackObject(i);
-                break;
-            }
-        }
-        // Unmarshal the Canvas
-        Canvas canvas = (Canvas) uctx.unmarshalElement();
-        // set canvas's ui defaults
-        canvas.setUiDefaults(uiDefaults);
-        // get canvas path
-        String canvasPath = hasPath.getPath();
-        // calc and set resources
-        canvas.setResourcesDir(new File(hasResources.getResourcesDir(), canvasPath));
-        canvas.setTemplatesDir(new File(hasResources.getTemplatesDir(), canvasPath));
-        canvas.setImagesDir(new File(hasResources.getImagesDir(), canvasPath));
-        // return canvas
-        return canvas;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/ColorMapper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/ColorMapper.java
deleted file mode 100644
index 81cc738506f..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/ColorMapper.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.jibxhelpers;
-
-import org.jibx.runtime.IMarshaller;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.IUnmarshaller;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.UnmarshallingContext;
-
-import java.awt.Color;
-
-/**
- * ColorMapper
- *
- * @author Created by Jasper Potts (Jun 8, 2007)
- */
-public class ColorMapper implements IMarshaller, IUnmarshaller {
-    private static final String ELEMENT_NAME = "color";
-    private static final String RED_NAME = "red";
-    private static final String GREEN_NAME = "green";
-    private static final String BLUE_NAME = "blue";
-    private static final String ALPHA_NAME = "alpha";
-
-    public boolean isExtension(int i) {
-        return false;
-    }
-
-    public boolean isPresent(IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        return iUnmarshallingContext.isAt(null, ELEMENT_NAME);
-    }
-
-    public void marshal(Object object, IMarshallingContext iMarshallingContext) throws JiBXException {
-        if (!(object instanceof Color)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else if (!(iMarshallingContext instanceof MarshallingContext)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else {
-            MarshallingContext ctx = (MarshallingContext) iMarshallingContext;
-            Color color = (Color) object;
-            ctx.startTagAttributes(0, ELEMENT_NAME).
-                    attribute(0, RED_NAME, color.getRed()).
-                    attribute(0, GREEN_NAME, color.getGreen()).
-                    attribute(0, BLUE_NAME, color.getBlue()).
-                    attribute(0, ALPHA_NAME, color.getAlpha()).
-                    closeStartEmpty();
-        }
-    }
-
-    public Object unmarshal(Object object, IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        // make sure we're at the appropriate start tag
-        UnmarshallingContext ctx = (UnmarshallingContext) iUnmarshallingContext;
-        if (!ctx.isAt(null, ELEMENT_NAME)) {
-            ctx.throwStartTagNameError(null, ELEMENT_NAME);
-        }
-        // get values
-        int red = ctx.attributeInt(null, RED_NAME, 0);
-        int green = ctx.attributeInt(null, GREEN_NAME, 0);
-        int blue = ctx.attributeInt(null, BLUE_NAME, 0);
-        int alpha = ctx.attributeInt(null, ALPHA_NAME, 0);
-        ctx.parsePastEndTag(null, ELEMENT_NAME);
-        // create
-        return new Color(red, green, blue, alpha);
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/DimensionMapper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/DimensionMapper.java
deleted file mode 100644
index 44a0f264bf0..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/DimensionMapper.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.jibxhelpers;
-
-import org.jibx.runtime.IAliasable;
-import org.jibx.runtime.IMarshaller;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.IUnmarshaller;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.UnmarshallingContext;
-
-import java.awt.Dimension;
-
-/**
- * DimensionMapper
- *
- * @author Created by Jasper Potts (Jun 12, 2007)
- */
-public class DimensionMapper implements IMarshaller, IUnmarshaller, IAliasable {
-    private static final String ELEMENT_NAME = "dimension";
-    private static final String WIDTH_NAME = "width";
-    private static final String HEIGHT_NAME = "height";
-
-    private String uri;
-    private int index;
-    private String name;
-
-    public DimensionMapper() {
-        uri = null;
-        index = 0;
-        name = ELEMENT_NAME;
-    }
-
-    public DimensionMapper(String uri, int index, String name) {
-        this.uri = uri;
-        this.index = index;
-        this.name = name;
-    }
-
-    public boolean isExtension(int i) {
-        return false;
-    }
-
-    public boolean isPresent(IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        return iUnmarshallingContext.isAt(uri, ELEMENT_NAME);
-    }
-
-    public void marshal(Object object, IMarshallingContext iMarshallingContext) throws JiBXException {
-        if (!(object instanceof Dimension)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else if (!(iMarshallingContext instanceof MarshallingContext)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else {
-            MarshallingContext ctx = (MarshallingContext) iMarshallingContext;
-            Dimension dimension = (Dimension) object;
-            ctx.startTagAttributes(index, name).
-                    attribute(index, WIDTH_NAME, dimension.width).
-                    attribute(index, HEIGHT_NAME, dimension.height).
-                    closeStartEmpty();
-        }
-    }
-
-    public Object unmarshal(Object object, IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        // make sure we're at the appropriate start tag
-        UnmarshallingContext ctx = (UnmarshallingContext) iUnmarshallingContext;
-        if (!ctx.isAt(uri, name)) {
-            ctx.throwStartTagNameError(uri, name);
-        }
-        // get values
-        int width = ctx.attributeInt(uri, WIDTH_NAME, index);
-        int height = ctx.attributeInt(uri, HEIGHT_NAME, index);
-        // state finished parsing
-        ctx.parsePastEndTag(uri, name);
-        // create
-        return new Dimension(width, height);
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/InsetsMapper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/InsetsMapper.java
deleted file mode 100644
index e50cb149551..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/InsetsMapper.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.jibxhelpers;
-
-import org.jibx.runtime.IAliasable;
-import org.jibx.runtime.IMarshaller;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.IUnmarshaller;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.UnmarshallingContext;
-
-import java.awt.Insets;
-
-/**
- * InsetsMapper
- *
- * @author Created by Jasper Potts (Jun 8, 2007)
- */
-public class InsetsMapper implements IMarshaller, IUnmarshaller, IAliasable {
-    private static final String ELEMENT_NAME = "insets";
-    private static final String TOP_NAME = "top";
-    private static final String BOTTOM_NAME = "bottom";
-    private static final String LEFT_NAME = "left";
-    private static final String RIGHT_NAME = "right";
-
-    private String uri;
-    private int index;
-    private String name;
-
-    public InsetsMapper() {
-        uri = null;
-        index = 0;
-        name = ELEMENT_NAME;
-    }
-
-    public InsetsMapper(String uri, int index, String name) {
-        this.uri = uri;
-        this.index = index;
-        this.name = name;
-//        System.out.println("InsetsMapper.CONSTRCUTED with uri="+uri+" index="+index+" name="+name);
-    }
-
-    public boolean isExtension(int i) {
-        return false;
-    }
-
-    public boolean isPresent(IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        return iUnmarshallingContext.isAt(uri, ELEMENT_NAME);
-    }
-
-    public void marshal(Object object, IMarshallingContext iMarshallingContext) throws JiBXException {
-        if (!(object instanceof Insets)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else if (!(iMarshallingContext instanceof MarshallingContext)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else {
-//            System.out.println("InsetsMapper.marshal name="+name);
-            MarshallingContext ctx = (MarshallingContext) iMarshallingContext;
-            Insets insets = (Insets) object;
-            ctx.startTagAttributes(index, name).
-                    attribute(index, TOP_NAME, insets.top).
-                    attribute(index, BOTTOM_NAME, insets.bottom).
-                    attribute(index, LEFT_NAME, insets.left).
-                    attribute(index, RIGHT_NAME, insets.right).
-                    closeStartEmpty();
-        }
-    }
-
-    public Object unmarshal(Object object, IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        // make sure we're at the appropriate start tag
-        UnmarshallingContext ctx = (UnmarshallingContext) iUnmarshallingContext;
-        if (!ctx.isAt(uri, name)) {
-//            System.out.println("InsetsMapper.unmarshal name="+name+" uri="+uri+" currentNode="+ctx.getName());
-            ctx.throwStartTagNameError(uri, name);
-        } else {
-//        System.out.println("InsetsMapper.unmarshal name="+name+" uri="+uri+" currentNode="+ctx.getName());
-        }
-        // get values
-        int top = ctx.attributeInt(uri, TOP_NAME, index);
-        int bottom = ctx.attributeInt(uri, BOTTOM_NAME, index);
-        int left = ctx.attributeInt(uri, LEFT_NAME, index);
-        int right = ctx.attributeInt(uri, RIGHT_NAME, index);
-        // create new hashmap if needed
-        Insets insets = (Insets) object;
-        if (insets == null) {
-            insets = new Insets(top, left, bottom, right);
-        } else {
-            insets.set(top, left, bottom, right);
-        }
-        ctx.parsePastEndTag(uri, name);
-        return insets;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/AbstractGradient.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/AbstractGradient.java
deleted file mode 100644
index 5a94abc2cb4..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/AbstractGradient.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.paint;
-
-import java.awt.Color;
-import java.awt.MultipleGradientPaint.CycleMethod;
-import java.awt.Paint;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/** @author rbair */
-public abstract class AbstractGradient extends PaintModel {
-    private final Comparator<GradientStop> sorter = new Comparator<GradientStop>() {
-        public int compare(GradientStop s1, GradientStop s2) {
-            //since a float value may be -.001 or .001, and since casting
-            //this to an int will round off to 0, I have to do a more direct
-            //comparison
-            float v = s1.getPosition() - s2.getPosition();
-
-            if (v < 0) return -1;
-            else if (v == 0) return 0;
-            else return 1;
-        }
-    };
-    private PropertyChangeListener stopListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            if (evt.getPropertyName().equals("position")) {
-                if (stops.contains((GradientStop) evt.getSource())) {
-                    resortModel(true);
-                } else {
-                    System.err.println("[WARNING] The position of an orphaned stop was changed.");
-                }
-            } else {
-                firePropertyChange("paint", null, getPaint());
-            }
-        }
-    };
-
-    private List<GradientStop> stops = new ArrayList<GradientStop>();
-    private List<GradientStop> unmodifiable;
-    private CycleMethod cycleMethod;
-
-    protected AbstractGradient() {
-        unmodifiable = Collections.unmodifiableList(stops);
-        cycleMethod = CycleMethod.NO_CYCLE;
-        setStops(new GradientStop(0, new Matte(Color.BLUE, null)),
-                new GradientStop(1, new Matte(Color.WHITE, null)));
-    }
-
-    /**
-     * Copy stops and cycleMethod from src to dst
-     *
-     * @param dst The gradient to update to same stops and cycle method as this gradient
-     */
-    protected void copyTo(AbstractGradient dst) {
-        dst.stops.clear();
-        List<GradientStop> stops = new ArrayList<GradientStop>();
-        for (GradientStop stop : this.stops) {
-            stops.add(stop.clone());
-        }
-        dst.setStops(stops);
-        dst.cycleMethod = this.cycleMethod;
-    }
-
-
-    public PaintControlType getPaintControlType() {
-        return PaintControlType.control_line;
-    }
-
-    public void setCycleMethod(CycleMethod method) {
-        CycleMethod old = cycleMethod;
-        Paint oldp = getPaint();
-        cycleMethod = method == null ? CycleMethod.NO_CYCLE : method;
-        firePropertyChange("cycleMethod", old, cycleMethod);
-        firePropertyChange("paint", oldp, getPaint());
-    }
-
-    public final CycleMethod getCycleMethod() {
-        return cycleMethod;
-    }
-
-    public void setStops(GradientStop... stops) {
-        if (stops == null || stops.length < 1) {
-            throw new IllegalArgumentException("Must have more than one stop");
-        }
-        List<GradientStop> old = new ArrayList<GradientStop>(this.stops);
-        for (GradientStop stop : old) {
-            stop.removePropertyChangeListener(stopListener);
-        }
-        Paint oldp = getPaint();
-        this.stops.clear();
-        Collections.addAll(this.stops, stops);
-        for (GradientStop stop : this.stops) {
-            stop.addPropertyChangeListener(stopListener);
-        }
-        resortModel(false);
-        firePropertyChange("stops", old, getStops());
-        firePropertyChange("paint", oldp, getPaint());
-    }
-
-    public final void setStops(List<GradientStop> stops) {
-        setStops(stops == null ? null : stops.toArray(new GradientStop[0]));
-    }
-
-    public final List<GradientStop> getStops() {
-        return unmodifiable;
-    }
-
-    private void resortModel(boolean fireEvent) {
-        Collections.sort(this.stops, sorter);
-        if (fireEvent) {
-            Paint oldp = getPaint();
-            firePropertyChange("stops", null, getStops());
-            firePropertyChange("paint", oldp, getPaint());
-        }
-    }
-
-    //adds a new stop, and interoplates the proper color to use based on
-    //its position
-    public GradientStop addStop(float position) {
-        GradientStop prevStop = null;
-        GradientStop nextStop = null;
-        for (GradientStop stop : stops) {
-            if (stop.getPosition() <= position) {
-                prevStop = stop;
-            } else if (stop.getPosition() >= position) {
-                nextStop = stop;
-            }
-        }
-
-        Matte c = null;
-        if (prevStop != null && nextStop != null) {
-            //interpolate the value of c
-            c = interpolate(prevStop.getColor(), nextStop.getColor(),
-                    position / (nextStop.getPosition() - prevStop.getPosition()));
-        } else if (prevStop != null) {
-            c = prevStop.getColor().clone();
-        } else if (nextStop != null) {
-            c = nextStop.getColor().clone();
-        }
-
-        return addStop(position, c);
-    }
-
-    public GradientStop addStop(float position, Matte color) {
-        GradientStop s = new GradientStop(position, color);
-        s.addPropertyChangeListener(stopListener);
-        List<GradientStop> old = new ArrayList<GradientStop>(stops);
-        Paint oldp = getPaint();
-        stops.add(s);
-        resortModel(false);
-        firePropertyChange("stops", old, getStops());
-        firePropertyChange("paint", oldp, getPaint());
-
-        return s;
-    }
-
-    public GradientStop removeStop(GradientStop s) {
-        List<GradientStop> old = new ArrayList<GradientStop>(stops);
-        Paint oldp = getPaint();
-        stops.remove(s);
-        s.removePropertyChangeListener(stopListener);
-        resortModel(false);
-        firePropertyChange("stops", old, getStops());
-        firePropertyChange("paint", oldp, getPaint());
-        return s;
-    }
-
-    @Override public Paint getPaint() {
-        if (stops.size() == 0) {
-            return null;
-        }
-
-        //there are stops.size() number of main stops. Between each is
-        //a fractional stop. Thus, there are:
-        //stops.size() + stops.size() - 1
-        //number of fractions and colors.
-
-        float[] fractions = new float[stops.size() + stops.size() - 1];
-        Matte[] colors = new Matte[fractions.length];
-
-        //for each stop, create the stop and it's associated fraction
-        int index = 0; // the index into fractions and colors
-        for (int i = 0; i < stops.size(); i++) {
-            GradientStop s = stops.get(i);
-            //copy over the stop's data
-            colors[index] = s.getColor();
-            fractions[index] = s.getPosition();
-
-            //If this isn't the last stop, then add in the fraction
-            if (index < fractions.length - 1) {
-                float f1 = s.getPosition();
-                float f2 = stops.get(i + 1).getPosition();
-
-                index++;
-                fractions[index] = f1 + (f2 - f1) * s.getMidpoint();
-                colors[index] = interpolate(colors[index - 1], stops.get(i + 1).getColor(), .5f);
-            }
-
-            index++;
-        }
-
-        for (int i = 1; i < fractions.length; i++) {
-            //to avoid an error with LinearGradientPaint where two fractions
-            //are identical, bump up the fraction value by a miniscule amount
-            //if it is identical to the previous one
-            //NOTE: The <= is critical because the previous value may already
-            //have been bumped up
-            if (fractions[i] <= fractions[i - 1]) {
-                fractions[i] = fractions[i - 1] + .000001f;
-            }
-        }
-
-        //another boundary condition where multiple stops are all at the end. The
-        //previous loop bumped all but one of these past 1.0, which is bad.
-        //so remove any fractions (and their colors!) that are beyond 1.0
-        int outOfBoundsIndex = -1;
-        for (int i = 0; i < fractions.length; i++) {
-            if (fractions[i] > 1) {
-                outOfBoundsIndex = i;
-                break;
-            }
-        }
-
-        if (outOfBoundsIndex >= 0) {
-            float[] f = fractions;
-            Matte[] c = colors;
-            fractions = new float[outOfBoundsIndex];
-            colors = new Matte[outOfBoundsIndex];
-            System.arraycopy(f, 0, fractions, 0, outOfBoundsIndex);
-            System.arraycopy(c, 0, colors, 0, outOfBoundsIndex);
-        }
-
-        return createPaint(fractions, colors, cycleMethod);
-    }
-
-    protected abstract Paint createPaint(float[] fractions, Matte[] colors, CycleMethod method);
-
-    protected static Matte interpolate(Matte v0, Matte v1, float fraction) {
-        return new Matte(interpolate(v0.getColor(), v1.getColor(), fraction), v0.getUiDefaults());
-    }
-
-    protected static Color interpolate(Color v0, Color v1, float fraction) {
-        int r = v0.getRed() +
-                (int) ((v1.getRed() - v0.getRed()) * fraction + 0.5f);
-        int g = v0.getGreen() +
-                (int) ((v1.getGreen() - v0.getGreen()) * fraction + 0.5f);
-        int b = v0.getBlue() +
-                (int) ((v1.getBlue() - v0.getBlue()) * fraction + 0.5f);
-        int a = v0.getAlpha() +
-                (int) ((v1.getAlpha() - v0.getAlpha()) * fraction + 0.5f);
-        return new Color(r, g, b, a);
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java
deleted file mode 100644
index ed239ed370b..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.paint;
-
-import java.awt.Color;
-import java.awt.LinearGradientPaint;
-import java.awt.MultipleGradientPaint.CycleMethod;
-import java.awt.Paint;
-
-/**
- * Represents a GradientPaint or LinearGradientPaint.
- *
- * @author rbair
- */
-public class Gradient extends AbstractGradient implements Cloneable {
-    protected Paint createPaint(float[] fractions, Matte[] mattes, CycleMethod method) {
-        Color[] colors = new Color[mattes.length];
-        for (int i = 0; i < colors.length; i++) {
-            colors[i] = mattes[i].getColor();
-        }
-        return new LinearGradientPaint(0, 0, 1, 0, fractions, colors, method);
-    }
-
-    @Override public Gradient clone() {
-        Gradient gradient = new Gradient();
-        copyTo(gradient);
-        return gradient;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/GradientStop.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/GradientStop.java
deleted file mode 100644
index f462fedde7d..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/GradientStop.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.paint;
-
-import org.jdesktop.beans.AbstractBean;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-/** Each stop is defined linearly, at positions between 0 and 1. */
-public final class GradientStop extends AbstractBean implements Cloneable {
-    private float position;
-    private Matte color;
-    private PropertyChangeListener matteListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            firePropertyChange("color", null, color);
-        }
-    };
-
-    /**
-     * The midpoint to the right of the stop. Must be 0 &lt;= midpoint &lt;= 1. The midpoint value of the last Stop is
-     * ignored.
-     */
-    private float midpoint;
-
-    public GradientStop() {}
-
-    public GradientStop(float position, Matte color) {
-        if (color == null) {
-            throw new IllegalArgumentException("Color must not be null");
-        }
-
-        this.position = clamp(0, 1, position);
-        this.color = color;
-        this.midpoint = .5f;
-
-        if (this.color != null) {
-            this.color.addPropertyChangeListener("color", matteListener);
-        }
-    }
-
-
-    public GradientStop clone() {
-        GradientStop clone = new GradientStop(this.position, this.color.clone());
-        clone.midpoint = midpoint;
-        return clone;
-    }
-
-    public final float getPosition() {
-        return position;
-    }
-
-    public final void setPosition(float position) {
-        float old = this.position;
-        this.position = clamp(0, 1, position);
-        firePropertyChange("position", old, this.position);
-    }
-
-    public final Matte getColor() {
-        return color;
-    }
-
-    public final void setColor(Matte c) {
-        if (c == null) throw new IllegalArgumentException("Color must not be null");
-        Matte old = this.color;
-        if (old != null) old.removePropertyChangeListener(matteListener);
-        this.color = c;
-        if (this.color != null) this.color.addPropertyChangeListener(matteListener);
-        firePropertyChange("color", old, c);
-    }
-
-    public final void setOpacity(int opacity) {
-        int old = getOpacity();
-        color.setAlpha(opacity);
-        firePropertyChange("opacity", old, getOpacity());
-    }
-
-    public final int getOpacity() {
-        return color.getAlpha();
-    }
-
-    public final float getMidpoint() {
-        return midpoint;
-    }
-
-    public final void setMidpoint(float midpoint) {
-        float old = this.midpoint;
-        this.midpoint = clamp(0, 1, midpoint);
-        firePropertyChange("midpoint", old, this.midpoint);
-    }
-
-    private float clamp(float lo, float hi, float value) {
-        if (value < lo) {
-            return lo;
-        } else if (value > hi) {
-            return hi;
-        } else {
-            return value;
-        }
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Matte.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Matte.java
deleted file mode 100644
index 634909f30a1..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Matte.java
+++ /dev/null
@@ -1,610 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.paint;
-
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-import org.jibx.runtime.IUnmarshallingContext;
-
-import javax.swing.UIDefaults;
-import java.awt.Color;
-import java.awt.Paint;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-/**
- * Representing a single uniform color. Basically, it represents the java.awt.Color. It can either be absolute or
- * derived from a UIDefault color.
- *
- * @author rbair & jasper potts
- */
-public class Matte extends PaintModel implements HasUIDefaults {
-    private float[] tmpf1 = new float[3];
-    private float[] tmpf2 = new float[3];
-
-    private int red;
-    private int green;
-    private int blue;
-    private int alpha;
-    private Color cached = null;
-
-    /**
-     * The name of the ui default key to derive this color from.
-     */
-    private String uiDefaultParentName = null;
-    /**
-     * The name of the bean property, or client property, on this component
-     * from which to extract a color used for painting. So for example the color
-     * used in a painter could be the background of the component.
-     */
-    private String componentPropertyName = null;
-    private float hueOffset = 0, saturationOffset = 0, brightnessOffset = 0;
-    private int alphaOffset = 0;
-    /**
-     * When true this color will become a UIResource in the UIManager defaults
-     * table. If false, then it will not be a UIResource. This is sometimes
-     * required, such as with colors installed on renderers.
-     */
-    private boolean uiResource = true;
-
-    /** This is a local UIDefaults that contains all the UIDefaults in the Model. */
-    private transient UIDefaults uiDefaults = new UIDefaults();
-    private PropertyChangeListener uiDefaultsChangeListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            if (uiDefaultParentName != null && uiDefaultParentName.equals(evt.getPropertyName())) {
-                updateARGBFromOffsets();
-            }
-        }
-    };
-
-    // =================================================================================================================
-    // Constructors
-
-    /** propected constructor for JIBX */
-    protected Matte() {}
-
-    public Matte(Color c, UIDefaults uiDefaults) {
-        if (c != null) {
-            this.red = c.getRed();
-            this.green = c.getGreen();
-            this.blue = c.getBlue();
-            this.alpha = c.getAlpha();
-        }
-        setUiDefaults(uiDefaults);
-    }
-
-    // =================================================================================================================
-    // JIBX Methods
-
-    /**
-     * Called by JIBX after all fields have been set
-     *
-     * @param context The JIBX Unmarshalling Context
-     */
-    protected void postSet(IUnmarshallingContext context) {
-        // walk up till we get synth model
-        for (int i = 0; i < context.getStackDepth(); i++) {
-            if (context.getStackObject(i) instanceof HasUIDefaults) {
-                UIDefaults uiDefaults = ((HasUIDefaults) context.getStackObject(i)).getUiDefaults();
-                if (uiDefaults != null) {
-                    setUiDefaults(uiDefaults);
-                    break;
-                }
-            }
-        }
-    }
-
-    // =================================================================================================================
-    // Matte methods
-
-    /**
-     * Is the matte an absolute color ot derived from a parent ui default
-     *
-     * @return <code>true</code> if this is a absolute not uidefault derived color
-     */
-    public boolean isAbsolute() {
-        return uiDefaultParentName == null;
-    }
-
-    /**
-     * Set all properties of this matte to be the same as <code>srcMatte</code> and fire all the change events
-     *
-     * @param srcMatte the matte to copy properties from
-     */
-    public void copy(Matte srcMatte) {
-        // keep old values
-        Color oldColor = getColor();
-        String oldParentName = uiDefaultParentName;
-        String oldComponentPropertyName = componentPropertyName;
-        boolean oldUiResource = uiResource;
-        int oldR = red, oldG = green, oldB = blue, oldA = alpha;
-        float oldH = hueOffset, oldS = saturationOffset, oldBr = brightnessOffset;
-        // set properties
-        if (uiResource != srcMatte.uiResource) {
-            uiResource = srcMatte.uiResource;
-            firePropertyChange("uiResource", oldUiResource, isUiResource());
-        }
-        if (red != srcMatte.red) {
-            red = srcMatte.red;
-            firePropertyChange("red", oldR, getRed());
-        }
-        if (green != srcMatte.green) {
-            green = srcMatte.green;
-            firePropertyChange("green", oldG, getGreen());
-        }
-        if (blue != srcMatte.blue) {
-            blue = srcMatte.blue;
-            firePropertyChange("blue", oldB, getBlue());
-        }
-        if (alpha != srcMatte.alpha) {
-            alpha = srcMatte.alpha;
-            firePropertyChange("alpha", oldA, getAlpha());
-        }
-        if (hueOffset != srcMatte.hueOffset) {
-            hueOffset = srcMatte.hueOffset;
-            firePropertyChange("hueOffset", oldH, getHueOffset());
-        }
-        if (saturationOffset != srcMatte.saturationOffset) {
-            saturationOffset = srcMatte.saturationOffset;
-            firePropertyChange("saturationOffset", oldS, getSaturationOffset());
-        }
-        if (brightnessOffset != srcMatte.brightnessOffset) {
-            brightnessOffset = srcMatte.brightnessOffset;
-            firePropertyChange("brightnessOffset", oldBr, getBrightnessOffset());
-        }
-        if (alphaOffset != srcMatte.alphaOffset) {
-            alphaOffset = srcMatte.alphaOffset;
-            firePropertyChange("alphaOffset", oldA, getAlphaOffset());
-        }
-        if (uiDefaultParentName != srcMatte.uiDefaultParentName) {
-            uiDefaultParentName = srcMatte.uiDefaultParentName;
-            firePropertyChange("uiDefaultParentName", oldParentName, getUiDefaultParentName());
-        }
-        if (componentPropertyName != srcMatte.componentPropertyName) {
-            componentPropertyName = srcMatte.componentPropertyName;
-            firePropertyChange("componentPropertyName", oldComponentPropertyName, getComponentPropertyName());
-        }
-        if (uiDefaults != srcMatte.uiDefaults) {
-            setUiDefaults(srcMatte.uiDefaults);
-        }
-        if (!oldColor.equals(srcMatte.getColor())) {
-            firePropertyChange("paint", oldColor, getColor());
-            firePropertyChange("color", oldColor, getColor());
-            fireHSBChange(oldR, oldG, oldB);
-        }
-    }
-
-    // =================================================================================================================
-    // PaintModel methods
-
-    public PaintControlType getPaintControlType() {
-        return PaintControlType.none;
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    /**
-     * Get the local UIDefaults that contains all the UIDefaults in the Model.
-     *
-     * @return The UIDefaults for the model that contains this Matte, can be null if this Matte is not part of a bigger
-     *         model
-     */
-    public UIDefaults getUiDefaults() {
-        return uiDefaults;
-    }
-
-    /**
-     * Set the local UIDefaults that contains all the UIDefaults in the Model.
-     *
-     * @param uiDefaults The UIDefaults for the model that contains this Matte, can be null if this Matte is not part of
-     *                   a bigger model
-     */
-    public void setUiDefaults(UIDefaults uiDefaults) {
-        if (uiDefaults != this.uiDefaults) {
-            UIDefaults old = getUiDefaults();
-            if (old != null) old.removePropertyChangeListener(uiDefaultsChangeListener);
-            this.uiDefaults = uiDefaults;
-            if (uiDefaults != null) this.uiDefaults.addPropertyChangeListener(uiDefaultsChangeListener);
-            firePropertyChange("uiDefaults", old, getUiDefaults());
-        }
-    }
-
-    /**
-     * Get the name if the uidefault color that is the parent that this matte is derived from. If null then this is a
-     * absolute color.
-     *
-     * @return Parent color ui default name
-     */
-    public String getUiDefaultParentName() {
-        return uiDefaultParentName;
-    }
-
-    /**
-     * Set the name if the uidefault color that is the parent that this matte is derived from. If null then this is a
-     * absolute color.
-     *
-     * @param uiDefaultParentName Parent color ui default name
-     */
-    public void setUiDefaultParentName(String uiDefaultParentName) {
-        String old = getUiDefaultParentName();
-        this.uiDefaultParentName = uiDefaultParentName;
-        firePropertyChange("uiDefaultParentName", old, getUiDefaultParentName());
-        if (isAbsolute()) {
-            // reset offsets
-            float oldH = hueOffset, oldS = saturationOffset, oldB = brightnessOffset;
-            int oldA = alphaOffset;
-            hueOffset = 0;
-            saturationOffset = 0;
-            brightnessOffset = 0;
-            alphaOffset = 0;
-            firePropertyChange("hueOffset", oldH, getHueOffset());
-            firePropertyChange("saturationOffset", oldS, getSaturationOffset());
-            firePropertyChange("brightnessOffset", oldB, getBrightnessOffset());
-            firePropertyChange("alphaOffset", oldA, getAlphaOffset());
-        }
-        updateARGBFromOffsets();
-    }
-
-    /**
-     * Sets the property to use for extracting the color for whatever component
-     * is passed to the painter. Can be a key in client properties. Can be null.
-     * @param name
-     */
-    public void setComponentPropertyName(String name) {
-        String old = componentPropertyName;
-        firePropertyChange("componentPropertyName", old, componentPropertyName = name);
-    }
-
-    /**
-     * Gets the name of the bean property, or client property, on this component
-     * from which to extract a color used for painting. So for example the color
-     * used in a painter could be the background of the component.
-     *
-     * @return
-     */
-    public String getComponentPropertyName() {
-        return componentPropertyName;
-    }
-
-    /**
-     * Sets whether this color should be represented as a UIResource in UIDefaults
-     * @param b true if the color should be a ui resource
-     */
-    public void setUiResource(boolean b) {
-        boolean old = uiResource;
-        firePropertyChange("uiResource", old, uiResource = b);
-    }
-
-    /**
-     * When false this color will become a non-UIResource in the UIManager defaults
-     * table. This is sometimes required to force swing to use the given color,
-     * such as with renderers.
-     * @return false if the color should not be a uiresource
-     */
-    public boolean isUiResource() {
-        return uiResource;
-    }
-
-    public float getHueOffset() {
-        return hueOffset;
-    }
-
-    public void setHueOffset(float hueOffset) {
-        float old = getHueOffset();
-        this.hueOffset = hueOffset;
-        firePropertyChange("hueOffset", old, getHueOffset());
-        updateARGBFromOffsets();
-    }
-
-    public float getSaturationOffset() {
-        return saturationOffset;
-    }
-
-    public void setSaturationOffset(float satOffset) {
-        float old = getSaturationOffset();
-        this.saturationOffset = satOffset;
-        firePropertyChange("saturationOffset", old, getSaturationOffset());
-        updateARGBFromOffsets();
-    }
-
-    public float getBrightnessOffset() {
-        return brightnessOffset;
-    }
-
-    public void setBrightnessOffset(float brightOffset) {
-        float old = getBrightnessOffset();
-        this.brightnessOffset = brightOffset;
-        firePropertyChange("brightnessOffset", old, getBrightnessOffset());
-        updateARGBFromOffsets();
-    }
-
-    public int getAlphaOffset() {
-        return alphaOffset;
-    }
-
-    public void setAlphaOffset(int alphaOffset) {
-        int old = getAlphaOffset();
-        this.alphaOffset = alphaOffset;
-        firePropertyChange("alphaOffset", old, alphaOffset);
-        updateARGBFromOffsets();
-    }
-
-
-    public void setRed(int red) {
-        red = clamp(red);
-        if (this.red != red) {
-            Color old = getColor();
-            int oldr = this.red;
-            this.red = red;
-            firePropertyChange("paint", old, getColor());
-            firePropertyChange("color", old, getColor());
-            firePropertyChange("red", oldr, red);
-            fireHSBChange(oldr, green, blue);
-            updateOffsetsFromARGB();
-        }
-    }
-
-    public final int getRed() {
-        return red;
-    }
-
-    public void setGreen(int green) {
-        green = clamp(green);
-        if (this.green != green) {
-            Color old = getColor();
-            int oldg = this.green;
-            this.green = green;
-            firePropertyChange("paint", old, getColor());
-            firePropertyChange("color", old, getColor());
-            firePropertyChange("green", oldg, green);
-            fireHSBChange(red, oldg, blue);
-            updateOffsetsFromARGB();
-        }
-    }
-
-    public final int getGreen() {
-        return green;
-    }
-
-    public void setBlue(int blue) {
-        blue = clamp(blue);
-        if (this.blue != blue) {
-            Color old = getColor();
-            int oldb = this.blue;
-            this.blue = blue;
-            firePropertyChange("paint", old, getColor());
-            firePropertyChange("color", old, getColor());
-            firePropertyChange("blue", oldb, blue);
-            fireHSBChange(red, green, oldb);
-            updateOffsetsFromARGB();
-        }
-    }
-
-    public final int getBlue() {
-        return blue;
-    }
-
-    public void setAlpha(int alpha) {
-        alpha = clamp(alpha);
-        if (this.alpha != alpha) {
-            int old = getAlpha();
-            this.alpha = alpha;
-            firePropertyChange("alpha", old, alpha);
-            firePropertyChange("paint", old, getColor());
-            firePropertyChange("color", old, getColor());
-            updateOffsetsFromARGB();
-        }
-    }
-
-    public final int getAlpha() {
-        return alpha;
-    }
-
-    public Color getColor() {
-        if (cached == null || red != cached.getRed() || green != cached.getGreen() ||
-                blue != cached.getBlue() || alpha != cached.getAlpha()) {
-            cached = new Color(red, green, blue, alpha);
-        }
-        return cached;
-    }
-
-    public void setColor(Color c) {
-        setColor(c, false);
-    }
-
-    public void setColor(Color c, boolean dontSetAlpha) {
-        Color oldColor = getColor();
-        int oldR = red, oldG = green, oldB = blue, oldA = alpha;
-        cached = c;
-        red = c.getRed();
-        green = c.getGreen();
-        blue = c.getBlue();
-        if (!dontSetAlpha) alpha = c.getAlpha();
-        updateOffsetsFromARGB();
-        firePropertyChange("red", oldR, getRed());
-        firePropertyChange("green", oldG, getGreen());
-        firePropertyChange("blue", oldB, getBlue());
-        fireHSBChange(oldR, oldG, oldB);
-        if (!dontSetAlpha) firePropertyChange("alpha", oldA, getAlpha());
-        firePropertyChange("paint", oldColor, getColor());
-        firePropertyChange("color", oldColor, getColor());
-    }
-
-    @Override public Paint getPaint() {
-        return getColor();
-    }
-
-
-    @Override public String toString() {
-        if (isAbsolute()) {
-            return Matte.class.getName() + "[r=" + red + ", g=" + green + ", b=" + blue + ", a=" + alpha + "]";
-        } else {
-            return Matte.class.getName() + "[base=" + uiDefaultParentName + ", H+" + hueOffset +
-                    ", S+" + saturationOffset + ", B+" + brightnessOffset + ", A+" + alphaOffset + "]";
-        }
-    }
-
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Matte matte = (Matte) o;
-        if (alpha != matte.alpha) return false;
-        if (alphaOffset != matte.alphaOffset) return false;
-        if (Float.compare(matte.alpha, alpha) != 0) return false;
-        if (blue != matte.blue) return false;
-        if (Float.compare(matte.brightnessOffset, brightnessOffset) != 0)
-            return false;
-        if (green != matte.green) return false;
-        if (Float.compare(matte.hueOffset, hueOffset) != 0) return false;
-        if (red != matte.red) return false;
-        if (uiResource != matte.uiResource) return false;
-        if (Float.compare(matte.saturationOffset, saturationOffset) != 0)
-            return false;
-        if (componentPropertyName != null ?
-                !componentPropertyName.equals(componentPropertyName) :
-                matte.componentPropertyName != null) return false;
-
-        if (uiDefaultParentName != null ?
-                !uiDefaultParentName.equals(matte.uiDefaultParentName) :
-                matte.uiDefaultParentName != null) return false;
-        return true;
-    }
-
-    public int hashCode() {
-        int result;
-        result = red;
-        result = 31 * result + green;
-        result = 31 * result + blue;
-        result = 31 * result + alpha;
-        result = 31 * result + (uiDefaultParentName != null ?
-            uiDefaultParentName.hashCode() : 0);
-        result = 31 * result + (componentPropertyName != null ?
-            componentPropertyName.hashCode() : 0);
-        result = 31 * result + hueOffset != +0.0f ?
-            Float.floatToIntBits(hueOffset) : 0;
-        result = 31 * result + saturationOffset != +0.0f ?
-            Float.floatToIntBits(saturationOffset) : 0;
-        result = 31 * result + brightnessOffset != +0.0f ?
-            Float.floatToIntBits(brightnessOffset) : 0;
-        result = 31 * result + (uiResource ? 1 : 0);
-        return result;
-    }
-
-    @Override public Matte clone() {
-        Matte m = new Matte();
-        m.red = red;
-        m.green = green;
-        m.blue = blue;
-        m.alpha = alpha;
-        m.brightnessOffset = brightnessOffset;
-        m.hueOffset = hueOffset;
-        m.saturationOffset = saturationOffset;
-        m.alphaOffset = alphaOffset;
-        m.uiDefaultParentName = uiDefaultParentName;
-        m.componentPropertyName = componentPropertyName;
-        m.uiResource = uiResource;
-        m.setUiDefaults(uiDefaults);
-        return m;
-    }
-
-    // =================================================================================================================
-    // Private Helper Methods
-
-    private void updateOffsetsFromARGB() {
-        if (!isAbsolute()) {
-            tmpf1 = Color.RGBtoHSB(red, green, blue, tmpf1);
-            Color parentColor = uiDefaults.getColor(uiDefaultParentName);
-            tmpf2 = Color.RGBtoHSB(parentColor.getRed(), parentColor.getGreen(), parentColor.getBlue(), tmpf2);
-            // update offset properties and fire events
-            float oldH = hueOffset, oldS = saturationOffset, oldB = brightnessOffset;
-            int oldA = alphaOffset;
-            hueOffset = tmpf1[0] - tmpf2[0];
-            saturationOffset = tmpf1[1] - tmpf2[1];
-            brightnessOffset = tmpf1[2] - tmpf2[2];
-            alphaOffset = alpha - parentColor.getAlpha();
-            firePropertyChange("hueOffset", oldH, getHueOffset());
-            firePropertyChange("saturationOffset", oldS, getSaturationOffset());
-            firePropertyChange("brightnessOffset", oldB, getBrightnessOffset());
-            firePropertyChange("alphaOffset", oldA, getAlphaOffset());
-        }
-    }
-
-    private void updateARGBFromOffsets() {
-        if (!isAbsolute()) {
-            Color oldColor = getColor();
-            // get parent color HSB
-            Color parentColor = uiDefaults.getColor(uiDefaultParentName);
-            tmpf1 = Color.RGBtoHSB(parentColor.getRed(), parentColor.getGreen(), parentColor.getBlue(), tmpf1);
-            // apply offsets
-            tmpf1[0] = clamp(tmpf1[0] + hueOffset);
-            tmpf1[1] = clamp(tmpf1[1] + saturationOffset);
-            tmpf1[2] = clamp(tmpf1[2] + brightnessOffset);
-            int oldA = getAlpha();
-            alpha = clamp(parentColor.getAlpha() + alphaOffset);
-            updateRGB(tmpf1);
-            // update fire events
-            firePropertyChange("alpha", oldA, getAlpha());
-            firePropertyChange("paint", oldColor, getColor());
-            firePropertyChange("color", oldColor, getColor());
-        }
-    }
-
-    private void updateRGB(float[] hsb) {
-        int oldR = red, oldG = green, oldB = blue;
-        int rgb = Color.HSBtoRGB(hsb[0], hsb[1], hsb[2]);
-        red = (rgb >> 16) & 0xFF;
-        green = (rgb >> 8) & 0xFF;
-        blue = rgb & 0xFF;
-        firePropertyChange("red", oldR, getRed());
-        firePropertyChange("green", oldG, getGreen());
-        firePropertyChange("blue", oldB, getBlue());
-    }
-
-    private void fireHSBChange(int oldR, int oldG, int oldB) {
-        tmpf1 = Color.RGBtoHSB(oldR, oldG, oldB, tmpf1);
-        tmpf2 = Color.RGBtoHSB(red, green, blue, tmpf2);
-        firePropertyChange("hue", tmpf1[0], tmpf2[0]);
-        firePropertyChange("saturation", tmpf1[1], tmpf2[1]);
-        firePropertyChange("brightness", tmpf1[2], tmpf2[2]);
-    }
-
-    private float clamp(float value) {
-        if (value < 0) {
-            value = 0;
-        } else if (value > 1) {
-            value = 1;
-        }
-        return value;
-    }
-
-    private int clamp(int value) {
-        if (value < 0) {
-            value = 0;
-        } else if (value > 255) {
-            value = 255;
-        }
-        return value;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java
deleted file mode 100644
index 15b67f55a2e..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.paint;
-
-import org.jdesktop.beans.AbstractBean;
-
-import java.awt.Paint;
-
-/**
- * I'd have just called it Paint, but sadly, that name was already taken, and would have been too confusing.
- * <p/>
- * Whenever size or position values are required (for example with Texture or Gradient), they are specified in the unit
- * square: that is, between 0 and 1 inclusive. They can then later be scaled as necessary by any painting code.
- *
- * @author rbair
- */
-public abstract class PaintModel extends AbstractBean implements Cloneable {
-    public static enum PaintControlType {
-        none, control_line, control_rect
-    }
-
-    protected PaintModel() { }
-
-    /**
-     * @return an instance of Paint that is represented by this PaintModel. This is often not a reversable operation,
-     *         and hence there is no "setPaint" method. Rather, tweaking the exposed properties of the PaintModel fires,
-     *         when necessary, property change events for the "paint" property, and results in different values returned
-     *         from this method.
-     */
-    public abstract Paint getPaint();
-
-    /**
-     * Get the type of controls for this paint model
-     *
-     * @return The type of paint controls, one of PaintControlType.none, PaintControlType.control_line or
-     *         PaintControlType.control_rect
-     */
-    public abstract PaintControlType getPaintControlType();
-
-
-    public abstract PaintModel clone();
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java
deleted file mode 100644
index 3e66092320b..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.paint;
-
-import java.awt.Color;
-import java.awt.MultipleGradientPaint.CycleMethod;
-import java.awt.Paint;
-import java.awt.RadialGradientPaint;
-
-/**
- * Represents a RadialGradientPaint.
- *
- * @author rbair
- */
-public class RadialGradient extends AbstractGradient {
-    protected Paint createPaint(float[] fractions, Matte[] mattes, CycleMethod method) {
-        Color[] colors = new Color[mattes.length];
-        for (int i = 0; i < colors.length; i++) {
-            colors[i] = mattes[i].getColor();
-        }
-        return new RadialGradientPaint(.5f, .5f, 1, fractions, colors, method);
-    }
-
-    @Override public RadialGradient clone() {
-        RadialGradient gradient = new RadialGradient();
-        copyTo(gradient);
-        return gradient;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Texture.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Texture.java
deleted file mode 100644
index 8fd4b2a7b39..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Texture.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.swingx.designer.paint;
-
-import java.awt.Paint;
-import java.awt.TexturePaint;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-
-/**
- * Represents a TexturePaint.
- *
- * @author rbair
- */
-public class Texture extends PaintModel {
-    private static final Rectangle2D RECT = new Rectangle2D.Double(0, 0, 1, 1);
-    private BufferedImage img;
-
-    public Texture() {
-    }
-
-    public PaintControlType getPaintControlType() {
-        return PaintControlType.control_rect;
-    }
-
-    public void setImage(BufferedImage img) {
-        BufferedImage old = this.img;
-        this.img = img;
-        firePropertyChange("paint", old, this.img);
-        firePropertyChange("image", old, this.img);
-    }
-
-    public final BufferedImage getImage() {
-        return img;
-    }
-
-    public Paint getPaint() {
-        return new TexturePaint(img, RECT);
-    }
-
-
-    public Texture clone() {
-        Texture newTexture = new Texture();
-        newTexture.img = this.img;
-        return newTexture;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/DefaultsGenerator.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/DefaultsGenerator.java
deleted file mode 100644
index 948686cb024..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/DefaultsGenerator.java
+++ /dev/null
@@ -1,726 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.generator;
-
-import org.jdesktop.swingx.designer.Canvas;
-import org.jdesktop.swingx.designer.font.Typeface;
-import org.jdesktop.swingx.designer.paint.Matte;
-import org.jdesktop.swingx.designer.paint.PaintModel;
-import static org.jdesktop.synthdesigner.generator.GeneratorUtils.makePretty;
-import static org.jdesktop.synthdesigner.generator.GeneratorUtils.toConstantName;
-import static org.jdesktop.synthdesigner.generator.ObjectCodeConvertors.convert;
-import static org.jdesktop.synthdesigner.generator.TemplateWriter.read;
-import static org.jdesktop.synthdesigner.generator.TemplateWriter.writeSrcFile;
-import org.jdesktop.synthdesigner.synthmodel.SynthModel;
-import org.jdesktop.synthdesigner.synthmodel.UIComponent;
-import org.jdesktop.synthdesigner.synthmodel.UIFont;
-import org.jdesktop.synthdesigner.synthmodel.UIIconRegion;
-import org.jdesktop.synthdesigner.synthmodel.UIPaint;
-import org.jdesktop.synthdesigner.synthmodel.UIProperty;
-import org.jdesktop.synthdesigner.synthmodel.UIRegion;
-import org.jdesktop.synthdesigner.synthmodel.UIState;
-import org.jdesktop.synthdesigner.synthmodel.UIStateType;
-import org.jdesktop.synthdesigner.synthmodel.UIStyle;
-
-import javax.swing.border.BevelBorder;
-import javax.swing.border.Border;
-import javax.swing.border.CompoundBorder;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.EtchedBorder;
-import javax.swing.border.LineBorder;
-import javax.swing.border.MatteBorder;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Insets;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import org.jdesktop.synthdesigner.synthmodel.PainterBorder;
-
-/**
- * DefaultsGenerator
- * <p/>
- * There are two main sets of defaults that must be configured. The first is
- * the actual UI defaults tree. The second is a map of components + regions, which
- * are used to decide what SynthStyle to use.
- *
- * @author Jasper Potts
- * @author Richard Bair
- */
-public class DefaultsGenerator {
-    private static String stateTypeImplTemplate;
-
-    private static String getStateTypeTemplate() {
-        if (stateTypeImplTemplate == null) {
-            //load the painter template file into an in-memory string to improve performance
-            //when generating a lot of classes
-            try {
-                stateTypeImplTemplate = read("resources/StateImpl.template");
-            } catch (IOException e) {
-                System.err.println("Failed to read template files.");
-                throw new RuntimeException(e);
-            }
-        }
-        return stateTypeImplTemplate;
-    }
-
-    /**
-     * Generate the defaults file and all painter files for a SynthModel. This method
-     * is the main entry point, called by the Generator class.
-     *
-     * @param uiDefaultInit      The buffer to write ui default put methods of the form <code>d.put("activeCaption", new
-     *                           ColorUIResource(123, 45, 200));</code>
-     * @param styleInit          The buffer to write out code to generate Synth Style populating the styles map <code>m
-     *                           = new HashMap<Key, LazyStyle>()</code>
-     * @param model              The Synth Model we are writing out defaults class for
-     * @param variables          The variables map pre populated with "PACKAGE" and "LAF_NAME"
-     * @param packageNamePrefix  The package name associated with this synth look and feel. For example,
-     *                           org.mypackage.mylaf
-     * @param painterPackageRoot The directory to write painters out to
-     */
-    public static void generateDefaults(StringBuilder uiDefaultInit, StringBuilder styleInit, SynthModel model,
-                                        Map<String, String> variables, String packageNamePrefix,
-                                        File painterPackageRoot) {
-        // write color palette
-        uiDefaultInit.append("        //Color palette\n");
-        writeColorPalette(uiDefaultInit, model.getColorPalette());
-        uiDefaultInit.append("\n");
-        // write fonts palette
-        uiDefaultInit.append("        //Font palette\n");
-        uiDefaultInit.append("        d.put(\"defaultFont\", new FontUIResource(defaultFont));\n");
-        writeFontPalette(uiDefaultInit, model.getFontPalette());
-        uiDefaultInit.append("\n");
-        // TODO: Other palettes
-        uiDefaultInit.append("        //Border palette\n");
-        uiDefaultInit.append("\n");
-        // write global style
-        uiDefaultInit.append("        //The global style definition\n");
-        writeStyle(model.getStyle(), uiDefaultInit, "");
-        uiDefaultInit.append("\n");
-        // write components
-        for (UIComponent c : model.getComponents()) {
-            String prefix = escape(c.getKey());
-            uiDefaultInit.append("        //Initialize ").append(prefix)
-                    .append("\n");
-            writeRegion(c, c, prefix, uiDefaultInit,
-                    styleInit, variables, packageNamePrefix, painterPackageRoot);
-            uiDefaultInit.append("\n");
-        }
-    }
-
-    private static void writeColorPalette(StringBuilder uiDefaultInit, List<UIPaint> colors) {
-        for (UIPaint color : colors) {
-            uiDefaultInit.append("        d.put(\"")
-                    .append(color.getName())
-                    .append("\",")
-                    .append(convertPaint(color.getValue()))
-                    .append(");\n");
-        }
-    }
-
-    private static void writeFontPalette(StringBuilder uiDefaultInit, List<UIFont> fonts) {
-        for (UIFont font : fonts) {
-            // We have no way of doing CSS style font lists yet so will just
-            // just the first font
-            if (!font.getFonts().isEmpty()){
-                Typeface t = font.getFonts().get(0);
-                if (t.isAbsolute()){
-                    Font f = t.getFont();
-                    uiDefaultInit.append("        d.put(\"")
-                        .append(font.getName())
-                        .append("\", new javax.swing.plaf.FontUIResource(\"")
-                        .append(f.getName())
-                        .append("\", ")
-                        .append(f.getStyle())
-                        .append(", ")
-                        .append(f.getSize())
-                        .append("));\n");
-                } else {
-                    uiDefaultInit.append("        d.put(\"")
-                        .append(font.getName())
-                        .append("\", new DerivedFont(\"")
-                        .append(t.getUiDefaultParentName())
-                        .append("\", ")
-                        .append(t.getSizeOffset())
-                        .append("f, ");
-                    switch (t.getBold()){
-                        case Default:
-                            uiDefaultInit.append("null");
-                            break;
-                        case On:
-                            uiDefaultInit.append("true");
-                            break;
-                        case Off:
-                            uiDefaultInit.append("false");
-                            break;
-                    }
-                    uiDefaultInit.append(", ");
-                    switch (t.getItalic()){
-                        case Default:
-                            uiDefaultInit.append("null");
-                            break;
-                        case On:
-                            uiDefaultInit.append("true");
-                            break;
-                        case Off:
-                            uiDefaultInit.append("false");
-                            break;
-                    }
-                    uiDefaultInit.append("));\n");
-                }
-            }
-        }
-    }
-
-    /**
-     * Write out the UIDefaults entries for a style
-     *
-     * @param style         The style to write defaults entries for
-     * @param uiDefaultInit The buffer to write ui default put methods of the form <code>d.put("activeCaption", new
-     *                      ColorUIResource(123, 45, 200));</code>
-     * @param prefix        The prefix for the style property names, for the model path where the style is from, should
-     *                      end with a "."
-     */
-    private static void writeStyle(UIStyle style, StringBuilder uiDefaultInit, String prefix) {
-        if (!style.isTextForegroundInherited()) writeMatte(prefix + "textForeground", style.getTextForeground(), uiDefaultInit);
-        if (!style.isTextBackgroundInherited()) writeMatte(prefix + "textBackground", style.getTextBackground(), uiDefaultInit);
-        if (!style.isBackgroundInherited()) writeMatte(prefix + "background", style.getBackground(), uiDefaultInit);
-        if (!style.isFontInherited()) writeTypeFace(prefix + "font", style.getFont(), uiDefaultInit);
-        for (UIProperty property : style.getUiProperties()) {
-            switch (property.getType()) {
-                case BOOLEAN:
-                    Boolean b = ((Boolean)property.getValue());
-                    if (b != null) {
-                        uiDefaultInit.append("        d.put(\"")
-                                .append(prefix)
-                                .append(property.getName())
-                                .append("\", ")
-                                .append(b ? "Boolean.TRUE" : "Boolean.FALSE")
-                                .append(");\n");
-                    }
-                    break;
-                case STRING:
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(property.getName())
-                            .append("\", \"")
-                            .append(property.getValue().toString())
-                            .append("\");\n");
-                    break;
-                case INT:
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(property.getName())
-                            .append("\", new Integer(")
-                            .append(((Integer) property.getValue()).intValue())
-                            .append("));\n");
-                    break;
-                case FLOAT:
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(property.getName())
-                            .append("\", new Float(")
-                            .append(((Float) property.getValue()).floatValue())
-                            .append("f));\n");
-                    break;
-                case DOUBLE:
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(property.getName())
-                            .append("\", new Double(")
-                            .append(((Double) property.getValue()).doubleValue())
-                            .append("));\n");
-                    break;
-                case COLOR:
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(property.getName())
-                            .append("\", ")
-                            .append(convertPaint((Matte)property.getValue()))
-                            .append(");\n");
-                    break;
-                case FONT:
-                    writeTypeFace(prefix.replace("\"", "\\\"") + property.getName(),
-                            (Typeface) property.getValue(), uiDefaultInit);
-                    break;
-                case INSETS:
-                    Insets i = (Insets) property.getValue();
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(property.getName())
-                            .append("\", new InsetsUIResource(")
-                            .append(i.top).append(", ").append(i.left).append(", ").append(i.bottom).append(", ")
-                            .append(i.right)
-                            .append("));\n");
-                    break;
-                case DIMENSION:
-                    Dimension d = (Dimension) property.getValue();
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(property.getName())
-                            .append("\", new DimensionUIResource(")
-                            .append(d.width).append(", ").append(d.height)
-                            .append("));\n");
-                    break;
-                case BORDER:
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(property.getName())
-                            .append("\", new BorderUIResource(");
-                    uiDefaultInit.append(convertBorder(
-                            (Border)property.getValue()));
-                    uiDefaultInit.append("));\n");
-                    break;
-            }
-        }
-    }
-
-    private static void writeMatte(String propertyName, Matte matte, StringBuilder uiDefaultInit) {
-        if (matte==null) System.err.println("Error matte is NULL for ["+propertyName+"]");
-        uiDefaultInit.append("        d.put(\"")
-                    .append(propertyName)
-                    .append("\", ")
-                    .append(convertPaint(matte))
-                    .append(");\n");
-    }
-
-    private static void writeTypeFace(String propertyName, Typeface typeface, StringBuilder uiDefaultInit) {
-        uiDefaultInit.append("        d.put(\"")
-                .append(propertyName)
-                .append("\", new DerivedFont(\"")
-                .append(typeface.getUiDefaultParentName())
-                .append("\", ")
-                .append(typeface.getSizeOffset())
-                .append("f, ");
-        switch (typeface.getBold()) {
-            case Default:
-                uiDefaultInit.append("null,");
-                break;
-            case Off:
-                uiDefaultInit.append("Boolean.FALSE,");
-                break;
-            case On:
-                uiDefaultInit.append("Boolean.TRUE,");
-                break;
-        }
-        switch (typeface.getItalic()) {
-            case Default:
-                uiDefaultInit.append("null");
-                break;
-            case Off:
-                uiDefaultInit.append("Boolean.FALSE");
-                break;
-            case On:
-                uiDefaultInit.append("Boolean.TRUE");
-                break;
-        }
-        uiDefaultInit.append("));\n");
-    }
-
-
-    /**
-     * Write out code for a Component or Region
-     *
-     * @param comp               This may be the same as the region <code>reg</code> or is the parent component
-     *                           containing the region
-     * @param region             The region we are writing out
-     * @param prefix             This is dot sperated path of component and sub regions to and including the region
-     *                           <code>reg</code> of the form [Comp].[Region]......[Region] path
-     * @param uiDefaultInit      This is for inserting into org.mypackage.mylaf.MyDefaults#getDefaults() method
-     * @param styleInit          This is for inserting into org.mypackage.mylaf.MyDefaults#initialize() method
-     * @param variables          The variables map pre populated with "PACKAGE" and "LAF_NAME"
-     * @param packageNamePrefix  The package name associated with this synth look and feel. For example,
-     *                           org.mypackage.mylaf
-     * @param painterPackageRoot The directory to write painters out to
-     */
-    private static void writeRegion(UIComponent comp, UIRegion region, String prefix, StringBuilder uiDefaultInit,
-                                    StringBuilder styleInit, Map<String, String> variables,
-                                    String packageNamePrefix, File painterPackageRoot) {
-        // register component with LAF
-        String regionCode = GeneratorUtils.getRegionNameCaps(region.getName());
-        if (regionCode == null) {
-            throw new IllegalStateException("We were asked to encode a region we know nothing about: " + region.getName());
-        } else {
-            regionCode = "Region." + regionCode;
-        }
-
-        //construct the list of States that accompany this registration.
-        StringBuffer regString = new StringBuffer(); //like: Enabled,Disabled,Foo,Default,Etc
-        List<UIStateType> types = comp.getStateTypes(); //state types are only defined on the UIComponent level
-        if (types != null && types.size() > 0) {
-            for (UIStateType type : types) {
-                regString.append(type.getKey());
-                regString.append(",");
-            }
-            //remove the last ","
-            regString.deleteCharAt(regString.length()-1);
-        }
-
-        styleInit.append("        register(")
-                .append(regionCode)
-                .append(", \"")
-                .append(prefix);
-        styleInit.append("\"");
-        styleInit.append(");\n");
-
-        // write content margins
-        Insets i = (Insets) region.getContentMargins();
-        uiDefaultInit.append("        d.put(\"")
-                .append(prefix)
-                .append(".contentMargins")
-                .append("\", new InsetsUIResource(")
-                .append(i.top).append(", ").append(i.left).append(", ").append(i.bottom).append(", ").append(i.right)
-                .append("));\n");
-        // write opaque if true
-        if (region instanceof UIComponent && ((UIComponent)region).isOpaque()) {
-            uiDefaultInit.append("        d.put(\"")
-                    .append(prefix)
-                    .append(".opaque")
-                    .append("\", Boolean.TRUE);\n");
-        }
-        //write the State, if necessary
-        if (!regString.equals("Enabled,MouseOver,Pressed,Disabled,Focused,Selected,Default") && types.size() > 0) {
-            //there were either custom states, or the normal states were in a custom order
-            //so go ahead and write out prefix.State
-            uiDefaultInit.append("        d.put(\"")
-                    .append(prefix)
-                    .append(".States")
-                    .append("\", \"")
-                    .append(regString)
-                    .append("\");\n");
-        }
-        //write out any custom states, if necessary
-        for (UIStateType type : types) {
-            String synthState = type.getKey();
-            if (!"Enabled".equals(synthState) &&
-                !"MouseOver".equals(synthState) &&
-                !"Pressed".equals(synthState) &&
-                !"Disabled".equals(synthState) &&
-                !"Focused".equals(synthState) &&
-                !"Selected".equals(synthState) &&
-                !"Default".equals(synthState)) {
-                //what we have here, gentlemen, is a bona-fide custom state.
-                try {
-                    //if the type is not one of the standard types, then construct a name for
-                    //the new type, and write out a new subclass of State.
-                    java.lang.String className = makePretty(prefix) + synthState + "State";
-                    java.lang.String body = type.getCodeSnippet();
-                    variables.put("STATE_NAME", className);
-                    variables.put("STATE_KEY", synthState);
-                    variables.put("BODY", body);
-
-                    writeSrcFile(getStateTypeTemplate(), variables, new java.io.File(painterPackageRoot, className + ".java"));
-
-                    variables.remove("STATE_NAME");
-                    variables.remove("STATE_KEY");
-                    variables.remove("BODY");
-
-                    uiDefaultInit.append("        d.put(\"")
-                            .append(prefix)
-                            .append(".")
-                            .append(synthState)
-                            .append("\", new ")
-                            .append(className)
-                            .append("());\n");
-                } catch (IOException ex) {
-                    ex.printStackTrace();
-                }
-            }
-        }
-        // write region style
-        writeStyle(region.getStyle(), uiDefaultInit, prefix + ".");
-
-        try {
-            boolean hasCanvas = hasCanvas(region);
-            if (hasCanvas) {
-                PainterGenerator.writePainter(region, variables, painterPackageRoot, prefix);
-            }
-            String fileNamePrefix = makePretty(prefix) + "Painter";
-            // write states ui defaults
-            for (UIState state : region.getBackgroundStates()) {
-                String statePrefix = prefix + "[" + state.getName() + "]";
-                // write state style
-                writeStyle(state.getStyle(), uiDefaultInit, statePrefix + ".");
-                // write painter
-                if (hasCanvas) {
-                    writeLazyPainter(state, uiDefaultInit, statePrefix, packageNamePrefix, fileNamePrefix, "background");
-                }
-            }
-            for (UIState state : region.getForegroundStates()) {
-                String statePrefix = prefix + "[" + state.getName() + "]";
-                // write state style
-                writeStyle(state.getStyle(), uiDefaultInit, statePrefix + ".");
-                // write painter
-                if (hasCanvas) {
-                    writeLazyPainter(state, uiDefaultInit, statePrefix, packageNamePrefix, fileNamePrefix, "foreground");
-                }
-            }
-            for (UIState state : region.getBorderStates()) {
-                String statePrefix = prefix + "[" + state.getName() + "]";
-                // write state style
-                writeStyle(state.getStyle(), uiDefaultInit, statePrefix + ".");
-                // write painter
-                if (hasCanvas) {
-                    writeLazyPainter(state, uiDefaultInit, statePrefix, packageNamePrefix, fileNamePrefix, "border");
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        // handle sub regions
-        for (UIRegion subRegion : region.getSubRegions()) {
-            String subregionName = prefix + ":" + escape(subRegion.getKey());
-            if (subRegion instanceof UIIconRegion) {
-                writeIconRegion(comp, (UIIconRegion) subRegion, prefix, uiDefaultInit,
-                        variables, packageNamePrefix, painterPackageRoot);
-            } else if (subRegion instanceof UIComponent) {
-                // inner named component
-                UIComponent subComponent = (UIComponent) subRegion;
-                writeRegion(subComponent, subRegion, subregionName,
-                        uiDefaultInit, styleInit, variables, packageNamePrefix, painterPackageRoot);
-            } else {
-                writeRegion(comp, subRegion, subregionName, uiDefaultInit, styleInit, variables,
-                        packageNamePrefix, painterPackageRoot);
-            }
-        }
-    }
-
-    private static void writeLazyPainter(UIState state, StringBuilder uiDefaultInit, String statePrefix, String packageNamePrefix, String fileNamePrefix, String painterSuffix) {
-        Canvas canvas = state.getCanvas();
-        if (!canvas.isBlank()) {
-            Insets si = canvas.getStretchingInsets();
-            boolean inverted = state.isInverted();
-            UIStyle.CacheMode cache = state.getStyle().getCacheMode();
-            String cacheModeString = null;
-            switch (cache) {
-                case NO_CACHING: cacheModeString = "AbstractRegionPainter.PaintContext.CacheMode.NO_CACHING"; break;
-                case FIXED_SIZES: cacheModeString = "AbstractRegionPainter.PaintContext.CacheMode.FIXED_SIZES"; break;
-                case NINE_SQUARE_SCALE: cacheModeString = "AbstractRegionPainter.PaintContext.CacheMode.NINE_SQUARE_SCALE"; break;
-            }
-            double maxH = state.getStyle().getMaxHozCachedImgScaling();
-            double maxV = state.getStyle().getMaxVertCachedImgScaling();
-            String stateConstant = toConstantName(painterSuffix + "_" + UIState.keysToString(state.getStateKeys()));
-
-            uiDefaultInit.append("        d.put(\"")
-                    .append(statePrefix)
-                    .append(".").append(painterSuffix).append("Painter\", new LazyPainter(\"")
-                    .append(packageNamePrefix).append(".").append(fileNamePrefix)
-                    .append("\", ")
-                    .append(fileNamePrefix).append(".").append(stateConstant).append(", ")
-                    .append(convert(si)).append(", ")
-                    .append(convert(canvas.getSize())).append(", ")
-                    .append(inverted).append(", ")
-                    .append(cacheModeString).append(", ")
-                    .append(maxH == Double.POSITIVE_INFINITY ? "Double.POSITIVE_INFINITY" : maxH).append(", ")
-                    .append(maxV == Double.POSITIVE_INFINITY ? "Double.POSITIVE_INFINITY" : maxV).append("));\n");
-        }
-    }
-
-
-    /**
-     * Write out code for a IconRegion
-     *
-     * @param comp               This may be the same as the region <code>region</code> or is the parent component
-     *                           containing the region
-     * @param region             The region we are writing out
-     * @param prefix             This is [Comp][Region]......[Region] path
-     * @param key                The key for this icon.
-     * @param uiDefaultInit      This is for inserting into org.mypackage.mylaf.MyDefaults#getDefaults() method
-     * @param variables          The variables map pre populated with "PACKAGE" and "LAF_NAME"
-     * @param packageNamePrefix  The package name associated with this synth look and feel. For example,
-     *                           org.mypackage.mylaf
-     * @param painterPackageRoot The directory to write painters out to
-     */
-    private static void writeIconRegion(UIComponent comp, UIIconRegion region, String prefix,
-                                        StringBuilder uiDefaultInit, Map<String, String> variables,
-                                        String packageNamePrefix, File painterPackageRoot) {
-
-        Dimension size = null;
-        String fileNamePrefix = makePretty(prefix) + "Painter";
-        // write states ui defaults
-        for (UIState state : region.getBackgroundStates()) {// TODO: Handle Background,Foreground and Borders States Lists? Actually not sure that IconRegions need support borders or foregrounds
-            Canvas canvas = state.getCanvas();
-            if (!canvas.isBlank()) {
-                String statePrefix = prefix + "[" + state.getName() + "]";
-                // Put Painter in UiDefaults
-                writeLazyPainter(state, uiDefaultInit, statePrefix, packageNamePrefix, fileNamePrefix, region.getKey());
-                size = canvas.getSize();
-            }
-        }
-
-        if (size != null) {
-            // Put SynthIconImpl wrapper in UiDefaults
-            String key = region.getBasicKey() == null ? prefix + "." + region.getKey() : region.getBasicKey();
-            uiDefaultInit.append("        d.put(\"")
-                    .append(key)
-                    .append("\", new NimbusIcon(\"") //TODO should this be wrapped in an IconUIResource?
-                    .append(prefix)
-                    .append("\", \"")
-                    .append(region.getKey())
-                    .append("Painter")
-                    .append("\", ")
-                    .append(size.width)
-                    .append(", ")
-                    .append(size.height)
-                    .append("));\n");
-        }
-
-        // handle sub regions
-        if (region.getSubRegions().length > 0) {
-            // there is no meaning to a sub region inside a IconRegion
-            throw new IllegalStateException("You can not have sub regions inside UiIconRegions. \"" +
-                    comp.getSubRegions()[0].getName() + "\" is inside \""
-                    + prefix.substring(0, prefix.length() - 1) + "\"");
-        }
-    }
-
-    /**
-     * Utility method for escaping all double quotes with backslash double-quote.
-     */
-    private static String escape(String s) {
-        return s.replace("\"", "\\\"");
-    }
-
-    private static String convertPaint(PaintModel paint){
-        if (paint instanceof Matte){
-            Matte matte = (Matte)paint;
-            if (matte.isAbsolute()){
-                String colorParams = convert(matte.getColor());
-                if (matte.isUiResource()) {
-                    return "new ColorUIResource(" + colorParams + ")";
-                } else {
-                    return colorParams;
-                }
-            } else {
-                String s = "getDerivedColor(\"" +
-                            matte.getUiDefaultParentName()+"\","+
-                            matte.getHueOffset()+"f,"+matte.getSaturationOffset()+
-                            "f,"+matte.getBrightnessOffset()+"f,"+
-                            matte.getAlphaOffset();
-                if (matte.isUiResource()) {
-                    return s + ")";
-                } else {
-                    return s + ",false)";
-                }
-            }
-        } else {
-            //TODO: What about gradients etc here?
-            System.err.println("Error: Could not write paint in " +
-                    "DefaultsGenerator as it was not a Matte. = "+
-                    paint.getClass().getName());
-            return "";
-        }
-    }
-
-    private static String convertBorder(Border val) {
-        StringBuilder uiDefaultInit = new StringBuilder();
-        Insets i;
-        if (val instanceof PainterBorder) {
-            PainterBorder pb = (PainterBorder) val;
-            i = pb.getBorderInsets();
-            uiDefaultInit.append("new PainterBorder(\"")
-                    .append(pb.getPainterName())
-                    .append("\", new Insets(")
-                    .append(i.top).append(", ")
-                    .append(i.left).append(", ")
-                    .append(i.bottom).append(", ")
-                    .append(i.right)
-                    .append("))");
-        } else if (val instanceof EmptyBorder) {
-            i = ((EmptyBorder) val).getBorderInsets();
-            uiDefaultInit.append("BorderFactory.createEmptyBorder(")
-                    .append(i.top).append(", ")
-                    .append(i.left).append(", ")
-                    .append(i.bottom).append(", ")
-                    .append(i.right)
-                    .append(")");
-        } else if (val instanceof LineBorder) {
-            LineBorder border = (LineBorder) val;
-            uiDefaultInit.append("BorderFactory.createLineBorder(")
-                    .append(convert(border.getLineColor()))
-                    .append(",")
-                    .append(border.getThickness())
-                    .append(")");
-        } else if (val instanceof EtchedBorder) {
-            EtchedBorder border = (EtchedBorder) val;
-            uiDefaultInit.append("BorderFactory.createEtchedBorder(")
-                    .append(border.getEtchType())
-                    .append(",")
-                    .append(convert(border.getHighlightColor()))
-                    .append(",")
-                    .append(convert(border.getShadowColor()))
-                    .append(")");
-        } else if (val instanceof BevelBorder) {
-            BevelBorder border = (BevelBorder) val;
-            uiDefaultInit.append("BorderFactory.createEtchedBorder(")
-                    .append(border.getBevelType())
-                    .append(",")
-                    .append(convert(border.getHighlightOuterColor()))
-                    .append(",")
-                    .append(convert(border.getHighlightInnerColor()))
-                    .append(",")
-                    .append(convert(border.getShadowOuterColor()))
-                    .append(",")
-                    .append(convert(border.getShadowInnerColor()))
-                    .append(")");
-        } else if (val instanceof MatteBorder) {
-            MatteBorder border = (MatteBorder) val;
-            i = border.getBorderInsets();
-            uiDefaultInit.append("BorderFactory.createEmptyBorder(")
-                    .append(i.top).append(", ")
-                    .append(i.left).append(", ")
-                    .append(i.bottom).append(", ")
-                    .append(i.right).append(", ")
-                    .append(convert(border.getMatteColor()))
-                    .append(")");
-        } else if (val instanceof CompoundBorder) {
-            CompoundBorder border = (CompoundBorder) val;
-            uiDefaultInit.append("BorderFactory.createEmptyBorder(")
-                    .append(convertBorder(border.getOutsideBorder()))
-                    .append(",")
-                    .append(convertBorder(border.getInsideBorder()))
-                    .append(")");
-        }
-        return uiDefaultInit.toString();
-    }
-
-    private static boolean hasCanvas(UIRegion region) {
-        for (UIState s : region.getBackgroundStates()) {
-            if (!s.getCanvas().isBlank()) return true;
-        }
-        for (UIState s : region.getBorderStates()) {
-            if (!s.getCanvas().isBlank()) return true;
-        }
-        for (UIState s : region.getForegroundStates()) {
-            if (!s.getCanvas().isBlank()) return true;
-        }
-        for (UIRegion subregion : region.getSubRegions()) {
-            if (hasCanvas(subregion)) return true;
-        }
-        return false;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java
deleted file mode 100644
index 88b1e9baff6..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.generator;
-
-import java.awt.*;
-
-/**
- * ObjectCodeConvertors
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class ObjectCodeConvertors {
-    static java.math.MathContext ctx = new java.math.MathContext(3);
-
-    /**
-     * Given a value (x), encode it such that 0 -> 1 is to the left of a, 1 -> 2 is between a and b, and 2 -> 3
-     * is to the right of b.
-     *
-     * @param w width in the case of the x axis, height in the case of the y axis.
-     */
-    static float encode(float x, float a, float b, float w) {
-        float r = 0;
-        if (x < a) {
-            r = (x / a);
-        } else if (x > b) {
-            r = 2 + ((x - b) / (w - b));
-        } else if (x == a && x == b) {
-            return 1.5f;
-        } else {
-            r = 1 + ((x - a) / (b - a));
-        }
-
-        if (Float.isNaN(r)) {
-            System.err.println("[Error] Encountered NaN: encode(" + x + ", " + a + ", " + b + ", " + w + ")");
-            return 0;
-        } else if (Float.isInfinite(r)) {
-            System.err.println("[Error] Encountered Infinity: encode(" + x + ", " + a + ", " + b + ", " + w + ")");
-            return 0;
-        } else if (r < 0) {
-            System.err.println("[Error] encoded value was less than 0: encode(" + x + ", " + a + ", " + b + ", " + w + ")");
-            return 0;
-        } else if (r > 3) {
-            System.err.println("[Error] encoded value was greater than 3: encode(" + x + ", " + a + ", " + b + ", " + w + ")");
-            return 3;
-        } else {
-            //for prettyness sake (and since we aren't really going to miss
-            //any accuracy here) I'm rounding this to 3 decimal places
-//                return java.math.BigDecimal.valueOf(r).round(ctx).doubleValue();
-            return r;
-        }
-    }
-
-    static String convert(Paint paint) {
-        //TODO need to support writing out other Paints, such as gradients
-        if (paint instanceof Color) {
-            return convert((Color) paint);
-        } else {
-            System.err.println("[WARNING] Unable to encode a paint in the encode(Paint) method: " + paint);
-            return "null";
-        }
-    }
-
-    /**
-     * Given a Color, write out the java code required to create a new Color.
-     *
-     * @param color The color to convert
-     * @return String of the code for the color
-     */
-    static String convert(Color color) {
-        return "new Color(" +
-                color.getRed() + ", " +
-                color.getGreen() + ", " +
-                color.getBlue() + ", " +
-                color.getAlpha() + ")";
-    }
-
-    static String convert(Insets i) {
-        return "new Insets(" + i.top + ", " + i.left + ", " + i.bottom + ", " + i.right + ")";
-    }
-
-    static String convert(Dimension d) {
-        return "new Dimension(" + d.width + ", " + d.height + ")";
-    }
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/TemplateWriter.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/TemplateWriter.java
deleted file mode 100644
index 9a76c80a784..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/TemplateWriter.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.generator;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.util.Map;
-
-/**
- * TemplateWriter - Class for writing Java Source files using a src template and variable subsitution
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class TemplateWriter {
-
-    /**
-     * Write a Java source file by taking a template file and applying variable substitution and writing to the output
-     * file.
-     *
-     * @param template  The template to use
-     * @param variables Map of the variable names and values to substitute in the template
-     * @param output    The file to write to
-     * @throws IOException If there was a problem writing the Java source file
-     */
-    static void writeSrcFile(String template, Map<String, String> variables, File output) throws IOException {
-        TemplateReader in = new TemplateReader(variables, template);
-        PrintWriter out =
-                new PrintWriter(new FileWriter(output));
-
-        String line = in.readLine();
-        while (line != null) {
-            out.println(line);
-            line = in.readLine();
-        }
-
-        out.close();
-    }
-
-    /**
-     * Read a template file into a string
-     *
-     * @param name The template file path relative to Generator class
-     * @return The contents of the template file as string
-     * @throws IOException If there was a problem reading the template file
-     */
-    static String read(String name) throws IOException {
-        InputStream in = Generator.class.getResourceAsStream(name);
-        if (in==null) throw new IOException("Could not find template ["+name+
-                "] relative to class ["+Generator.class.getName()+"]");
-        byte[] data = new byte[4096];
-        int length = -1;
-        StringBuilder buffer = new StringBuilder();
-        while ((length = in.read(data)) != -1) {
-            buffer.append(new String(data, 0, length));
-        }
-        return buffer.toString();
-    }
-
-    /** A BufferedReader implementation that automatically performs string replacements as needed. */
-    private static final class TemplateReader extends BufferedReader {
-        private Map<String, String> variables;
-
-        TemplateReader(Map<String, String> variables, String template) {
-            super(new StringReader(template));
-            this.variables = variables;
-        }
-
-        /**
-         * @return a line of text from the template but with variables substituted. Other methods will return the text
-         *         sans substitution. Call this method.
-         * @throws java.io.IOException
-         */
-        public String readLine() throws IOException {
-            return substituteVariables(super.readLine());
-        }
-
-        private String substituteVariables(String input) {
-            if (input == null) return null;
-            for (Map.Entry<String, String> variable : variables.entrySet()) {
-                input = input.replace("${" + variable.getKey() + "}", variable.getValue());
-            }
-            return input;
-        }
-    }
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/PainterBorder.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/PainterBorder.java
deleted file mode 100644
index b3e53db3c94..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/PainterBorder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import javax.swing.border.EmptyBorder;
-
-/**
- * Represents a border that refers to a Painter to do it's work. This border
- * doesn't actually render -- it is just used as part of the model.
- *
- * @author Richard Bair
- */
-public class PainterBorder extends EmptyBorder {
-    private String painterName;
-    public PainterBorder(String painterName, int top, int left, int bottom, int right) {
-        super(top, left, bottom, right);
-        this.painterName = painterName;
-    }
-
-    public String getPainterName() { return painterName; }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.java
deleted file mode 100644
index 70a18c50ea5..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Copyright 2002-2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingx.designer.utils.HasResources;
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-import org.jibx.runtime.IUnmarshallingContext;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JColorChooser;
-import javax.swing.JComboBox;
-import javax.swing.JDesktopPane;
-import javax.swing.JEditorPane;
-import javax.swing.JFileChooser;
-import javax.swing.JFormattedTextField;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JPopupMenu;
-import javax.swing.JProgressBar;
-import javax.swing.JRadioButton;
-import javax.swing.JRadioButtonMenuItem;
-import javax.swing.JRootPane;
-import javax.swing.JScrollBar;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JSlider;
-import javax.swing.JSpinner;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.JToggleButton;
-import javax.swing.JToolBar;
-import javax.swing.JToolTip;
-import javax.swing.JTree;
-import javax.swing.JViewport;
-import javax.swing.UIDefaults;
-import javax.swing.plaf.basic.BasicLookAndFeel;
-import javax.swing.plaf.metal.MetalLookAndFeel;
-import static javax.swing.plaf.synth.SynthConstants.*;
-import javax.swing.table.JTableHeader;
-import java.awt.Insets;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Models a Synth look and feel. Contains all of the colors, fonts, painters, states, etc that compose a synth look and
- * feel.
- * <p/>
- * To model Synth properly, I need to both Model the way Synth works (with styles, and so forth) and the way a look and
- * feel works (UIDefaults table, etc) since both of these are supported ways of doing things in Synth.
- * <p/>
- * One important (but non-visual) thing that needs to be configurable is the support for InputMaps per component. In
- * Synth, an input map can be associated with the main Synth element, meaning it applies to everything. Or it can be
- * associated with a single style. An Inputmap can have an id, and it can contain multiple key/action pairs (where
- * actions are denoted by name).
- * <p/>
- * It looks like Regions can have InputMaps? Sounds fishy to me. I think only Components really have input maps.
- * <p/>
- * I would like some way of denoting special keys between mac and other platforms. For example, cut, copy, paste etc
- * should be different. In general, the ctrl key and apple (meta) key are reversed from what is typically on windows.
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class SynthModel extends AbstractBean implements HasUIDefaults, HasUIStyle, HasResources {
-    //I'm going to want:
-    //entries related to the Control color, and other colors of the Basic LAF
-    //entries related to fonts (standard fonts) used in the Basic LAF
-    //entries related to standard insets, borders, dimensions, icons
-    //entries related to component specific entries in the LAF
-    private List<UIPaint> colors;
-    private List<UIFont> fonts;
-    private List<UIInsets> insets;
-    private List<UIBorder> borders;
-    private List<UIDimension> dimensions;
-    private List<UIIcon> icons;
-    private List<UIComponent> components;
-    /**
-     * This is a local UIDefaults that contains all the UIDefaults in this synth model. It is kept uptodate by the
-     * indervidual UIDefaults nodes
-     */
-    private transient UIDefaults modelDefaults = new UIDefaults();
-    private transient UIStyle globalStyle = new UIStyle();
-
-    private transient File resourcesDir;
-    private transient File imagesDir;
-    private transient File templatesDir;
-
-    /** Default constructor used by JIBX to create new empty SynthModel */
-    protected SynthModel() {
-        this(false);
-    }
-
-    public SynthModel(boolean populateWithDefaults) {
-        // create observable lists that fire changes on as property changes
-        colors = new ArrayList<UIPaint>();
-        fonts = new ArrayList<UIFont>();
-        insets = new ArrayList<UIInsets>();
-        borders = new ArrayList<UIBorder>();
-        dimensions = new ArrayList<UIDimension>();
-        icons = new ArrayList<UIIcon>();
-        components = new ArrayList<UIComponent>();
-
-        if (populateWithDefaults) {
-            //get the ui defaults from the SynthLookAndFeel. Using the UIDefaults table,
-            //pre initialize everything.
-//        SynthLookAndFeel synth = new SynthLookAndFeel();
-            BasicLookAndFeel synth = new MetalLookAndFeel();
-            UIDefaults defaults = synth.getDefaults();
-
-            //pre-init the palettes
-            colors.add(new UIColor("desktop", defaults.getColor("desktop"), modelDefaults));
-            colors.add(new UIColor("activeCaption", defaults.getColor("activeCaption"), modelDefaults));
-            colors.add(new UIColor("activeCaptionText", defaults.getColor("activeCaptionText"), modelDefaults));
-            colors.add(new UIColor("activeCaptionBorder", defaults.getColor("activeCaptionBorder"), modelDefaults));
-            colors.add(new UIColor("inactiveCaption", defaults.getColor("inactiveCaption"), modelDefaults));
-            colors.add(new UIColor("inactiveCaptionText", defaults.getColor("inactiveCaptionText"), modelDefaults));
-            colors.add(new UIColor("inactiveCaptionBorder", defaults.getColor("inactiveCaptionBorder"), modelDefaults));
-            colors.add(new UIColor("window", defaults.getColor("window"), modelDefaults));
-            colors.add(new UIColor("windowBorder", defaults.getColor("windowBorder"), modelDefaults));
-            colors.add(new UIColor("windowText", defaults.getColor("windowText"), modelDefaults));
-            colors.add(new UIColor("menu", defaults.getColor("menu"), modelDefaults));
-            colors.add(new UIColor("menuText", defaults.getColor("menuText"), modelDefaults));
-            colors.add(new UIColor("text", defaults.getColor("text"), modelDefaults));
-            colors.add(new UIColor("textText", defaults.getColor("textText"), modelDefaults));
-            colors.add(new UIColor("textHighlight", defaults.getColor("textHighlight"), modelDefaults));
-            colors.add(new UIColor("textHighlightText", defaults.getColor("textHighlightText"), modelDefaults));
-            colors.add(new UIColor("textInactiveText", defaults.getColor("textInactiveText"), modelDefaults));
-            colors.add(new UIColor("control", defaults.getColor("control"), modelDefaults));
-            colors.add(new UIColor("controlText", defaults.getColor("controlText"), modelDefaults));
-            colors.add(new UIColor("controlHighlight", defaults.getColor("controlHighlight"), modelDefaults));
-            colors.add(new UIColor("controlLHighlight", defaults.getColor("controlLHighlight"), modelDefaults));
-            colors.add(new UIColor("controlShadow", defaults.getColor("controlShadow"), modelDefaults));
-            colors.add(new UIColor("controlDkShadow", defaults.getColor("controlDkShadow"), modelDefaults));
-            colors.add(new UIColor("scrollbar", defaults.getColor("scrollbar"), modelDefaults));
-            colors.add(new UIColor("info", defaults.getColor("info"), modelDefaults));
-            colors.add(new UIColor("infoText", defaults.getColor("infoText"), modelDefaults));
-
-            fonts.add(new UIFont("dialogPlain", defaults.getFont("Button.font"), modelDefaults));
-            fonts.add(new UIFont("serifPlain", defaults.getFont("TextPane.font"), modelDefaults));
-            fonts.add(new UIFont("sansSerifPlain", defaults.getFont("ToolTip.font"), modelDefaults));
-            fonts.add(new UIFont("monospacedPlain", defaults.getFont("TextArea.font"), modelDefaults));
-            fonts.add(new UIFont("dialogBold", defaults.getFont("InternalFrame.titleFont"), modelDefaults));
-
-            insets.add(new UIInsets("zeroInsets", new Insets(0, 0, 0, 0)));
-            insets.add(new UIInsets("twoInsets", new Insets(2, 2, 2, 2)));
-            insets.add(new UIInsets("threeInsets", new Insets(3, 3, 3, 3)));
-
-            borders.add(new UIBorder("marginBorder", defaults.getBorder("MenuItem.border")));
-            borders.add(new UIBorder("etchedBorder", defaults.getBorder("TitledBorder.border")));
-            borders.add(new UIBorder("loweredBevelBorder", defaults.getBorder("Table.scrollPaneBorder")));
-            borders.add(new UIBorder("blackLineBorder", defaults.getBorder("ToolTip.border")));
-
-            //TODO have to deal with the special arrow button region
-
-            //pre-init the list of UI components
-            UIComponent button = new UIComponent("Button", JButton.class.getName(), "ButtonUI");
-            addStates(this, button, DEFAULT, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(button);
-
-            UIComponent toggleButton =
-                    new UIComponent("ToggleButton", JToggleButton.class.getName(), "ToggleButtonUI");
-            addStates(this, toggleButton, DEFAULT, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED, SELECTED,
-                    SELECTED | PRESSED, SELECTED | MOUSE_OVER, DISABLED | SELECTED);
-            components.add(toggleButton);
-
-            UIComponent radioButton =
-                    new UIComponent("RadioButton", JRadioButton.class.getName(), "RadioButtonUI");
-            addStates(this, radioButton, DEFAULT, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED, SELECTED,
-                    SELECTED | PRESSED, SELECTED | MOUSE_OVER, DISABLED | SELECTED);
-            components.add(radioButton);
-
-            UIComponent checkBox =
-                    new UIComponent("CheckBox", JCheckBox.class.getName(), "CheckBoxUI");
-            addStates(this, checkBox, DEFAULT, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED, SELECTED,
-                    SELECTED | PRESSED, SELECTED | MOUSE_OVER, DISABLED | SELECTED);
-            components.add(checkBox);
-
-            UIComponent colorChooser =
-                    new UIComponent("ColorChooser", JColorChooser.class.getName(), "ColorChooserUI");
-            addStates(this, colorChooser, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(colorChooser);
-
-            UIComponent comboBox =
-                    new UIComponent("ComboBox", JComboBox.class.getName(), "ComboBoxUI");
-            addStates(this, comboBox, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(comboBox);
-
-            UIComponent fileChooser =
-                    new UIComponent("FileChooser", JFileChooser.class.getName(), "FileChooserUI");
-            addStates(this, fileChooser, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(fileChooser);
-
-            //not represented in Synth
-//        UIComponent  fileView = new UIComponent ("FileView",
-//                list(DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-
-            UIComponent internalFrame =
-                    new UIComponent("InternalFrame", JInternalFrame.class.getName(), "InternalFrameUI");
-            addStates(this, internalFrame, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            //has an internal frame title pane region
-            components.add(internalFrame);
-
-            //TODO DesktopIcon ???
-
-            UIComponent desktop =
-                    new UIComponent("Desktop", JDesktopPane.class.getName(), "DesktopPaneUI");
-            addStates(this, desktop, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(desktop);
-
-            UIComponent label = new UIComponent("Label", JLabel.class.getName(), "LabelUI");
-            addStates(this, label, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(label);
-
-            UIComponent list = new UIComponent("List", JList.class.getName(), "ListUI");
-            addStates(this, list, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(list);
-
-            UIComponent menuBar = new UIComponent("MenuBar", JMenuBar.class.getName(), "MenuBarUI");
-            addStates(this, menuBar, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(menuBar);
-
-            UIComponent menuItem =
-                    new UIComponent("MenuItem", JMenuItem.class.getName(), "MenuItemUI");
-            addStates(this, menuItem, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            //has a menuItemAccelerator region
-            components.add(menuItem);
-
-            UIComponent radioButtonMenuItem =
-                    new UIComponent("RadioButtonMenuItem", JRadioButtonMenuItem.class.getName(),
-                            "RadioButtonMenuItemUI");
-            addStates(this, radioButtonMenuItem, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(radioButtonMenuItem);
-
-            UIComponent checkBoxMenuItem =
-                    new UIComponent("CheckBoxMenuItem", JCheckBoxMenuItem.class.getName(),
-                            "CheckBoxMenuItemUI");
-            addStates(this, checkBoxMenuItem, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(checkBoxMenuItem);
-
-            UIComponent menu = new UIComponent("Menu", JMenu.class.getName(), "MenuUI");
-            addStates(this, menu, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(menu);
-
-            UIComponent popupMenu =
-                    new UIComponent("PopupMenu", JPopupMenu.class.getName(), "PopupMenuUI");
-            addStates(this, popupMenu, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            //has a popupMenuSeparator region
-            components.add(popupMenu);
-
-            UIComponent optionPane =
-                    new UIComponent("OptionPane", JOptionPane.class.getName(), "OptionPaneUI");
-            addStates(this, optionPane, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(optionPane);
-
-            UIComponent panel = new UIComponent("Panel", JPanel.class.getName(), "PanelUI");
-            addStates(this, panel, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(panel);
-
-            UIComponent progressBar =
-                    new UIComponent("ProgressBar", JProgressBar.class.getName(), "ProgressBarUI");
-            addStates(this, progressBar, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(progressBar);
-
-            UIComponent separator =
-                    new UIComponent("Separator", JSeparator.class.getName(), "SeparatorUI");
-            addStates(this, separator, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(separator);
-
-            UIRegion scrollBarThumb = new UIRegion("ScrollBar.Thumb");
-            addStates(this, scrollBarThumb, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            UIRegion scrollBarTrack = new UIRegion("ScrollBar.Track");
-            addStates(this, scrollBarTrack, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            UIComponent scrollBar =
-                    new UIComponent("ScrollBar", JScrollBar.class.getName(), "ScrollBarUI", scrollBarThumb,
-                            scrollBarTrack);
-            addStates(this, scrollBar, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(scrollBar);
-
-            UIComponent scrollPane =
-                    new UIComponent("ScrollPane", JScrollPane.class.getName(), "ScrollPaneUI");
-            addStates(this, scrollPane, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(scrollPane);
-
-            UIComponent viewport =
-                    new UIComponent("Viewport", JViewport.class.getName(), "ViewportUI");
-            addStates(this, viewport, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(viewport);
-
-            UIComponent slider = new UIComponent("Slider", JSlider.class.getName(), "SliderUI");
-            addStates(this, slider, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            //has sliderThumb and sliderTrack sub regions
-            components.add(slider);
-
-            UIComponent spinner = new UIComponent("Spinner", JSpinner.class.getName(), "SpinnerUI");
-            addStates(this, spinner, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(spinner);
-
-            UIComponent splitPane =
-                    new UIComponent("SplitPane", JSplitPane.class.getName(), "SplitPaneUI");
-            addStates(this, splitPane, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            //has splitPaneDivider sub region
-            components.add(splitPane);
-
-            UIComponent tabbedPane =
-                    new UIComponent("TabbedPane", JTabbedPane.class.getName(), "TabbedPaneUI");
-            addStates(this, tabbedPane, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            //has tabbedPaneContent and tabbedPaneTab and TabbedPaneTabArea sub regions
-            components.add(tabbedPane);
-
-            UIComponent table = new UIComponent("Table", JTable.class.getName(), "TableUI");
-            addStates(this, table, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(table);
-
-            UIComponent tableHeader =
-                    new UIComponent("TableHeader", JTableHeader.class.getName(), "TableHeaderUI");
-            addStates(this, tableHeader, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(tableHeader);
-
-            UIComponent textField =
-                    new UIComponent("TextField", JTextField.class.getName(), "TextFieldUI");
-            addStates(this, textField, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(textField);
-
-            UIComponent formattedTextField =
-                    new UIComponent("FormattedTextField", JFormattedTextField.class.getName(),
-                            "FormattedTextFieldUI");
-            addStates(this, formattedTextField, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(formattedTextField);
-
-            UIComponent passwordField =
-                    new UIComponent("PasswordField", JPasswordField.class.getName(), "PasswordFieldUI");
-            addStates(this, passwordField, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(passwordField);
-
-            UIComponent textArea =
-                    new UIComponent("TextArea", JTextArea.class.getName(), "TextAreaUI");
-            addStates(this, textArea, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(textArea);
-
-            UIComponent textPane =
-                    new UIComponent("TextPane", JTextPane.class.getName(), "TextPaneUI");
-            addStates(this, textPane, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(textPane);
-
-            UIComponent editorPane =
-                    new UIComponent("EditorPane", JEditorPane.class.getName(), "EditorPaneUI");
-            addStates(this, editorPane, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(editorPane);
-
-            /*
-            * The only thing not represented in Synth as a region. I suppose we'll have
-            * to make it a CustomUIComponent
-            */
-//        UIComponent  titledBorder = new UIComponent ("TitledBorder",
-//                list(DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-
-            UIComponent toolBar = new UIComponent("ToolBar", JToolBar.class.getName(), "ToolBarUI");
-            addStates(this, toolBar, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            //toolBarContent, toolBarDragWindow, toolBarSeparator sub regions
-            components.add(toolBar);
-
-            UIComponent toolTip = new UIComponent("ToolTip", JToolTip.class.getName(), "ToolTipUI");
-            addStates(this, toolTip, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(toolTip);
-
-            //tooltip manager
-
-            UIComponent tree = new UIComponent("Tree", JTree.class.getName(), "TreeUI");
-            addStates(this, tree, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            //treeCell sub region
-            components.add(tree);
-
-            UIComponent rootPane =
-                    new UIComponent("RootPane", JRootPane.class.getName(), "RootPaneUI");
-            addStates(this, rootPane, DISABLED, ENABLED, FOCUSED, MOUSE_OVER, PRESSED);
-            components.add(rootPane);
-        }
-    }
-
-    public List<UIPaint> getColorPalette() {
-        return colors;
-    }
-
-    public List<UIFont> getFontPalette() {
-        return fonts;
-    }
-
-    public List<UIInsets> getInsetPalette() {
-        return insets;
-    }
-
-    public List<UIBorder> getBorderPalette() {
-        return borders;
-    }
-
-    public List<UIDimension> getDimensionPalette() {
-        return dimensions;
-    }
-
-    public List<UIIcon> getIconPalette() {
-        return icons;
-    }
-
-    public List<UIComponent> getComponents() {
-        return components;
-    }
-
-    /**
-     * Get the local UIDefaults that contains all the UIDefaults in this synth model. It is kept uptodate by the
-     * indervidual UIDefaults nodes
-     *
-     * @return The UIDefaults for the synth model
-     */
-    public UIDefaults getUiDefaults() {
-        return modelDefaults;
-    }
-
-    public UIStyle getStyle() {
-        return globalStyle;
-    }
-
-    // by default there are no painters assigned to the various states
-    private static void addStates(SynthModel model, UIRegion parentRegion, int... states) {
-        for (int state : states) {
-            List<String> stateList = new ArrayList<String>();
-            if ((state & ENABLED) != 0) {
-                stateList.add(UIStateType.ENABLED_KEY);
-            }
-            if ((state & MOUSE_OVER) != 0) {
-                stateList.add(UIStateType.MOUSE_OVER_KEY);
-            }
-            if ((state & PRESSED) != 0) {
-                stateList.add(UIStateType.PRESSED_KEY);
-            }
-            if ((state & DISABLED) != 0) {
-                stateList.add(UIStateType.DISABLED_KEY);
-            }
-            if ((state & FOCUSED) != 0) {
-                stateList.add(UIStateType.FOCUSED_KEY);
-            }
-            if ((state & SELECTED) != 0) {
-                stateList.add(UIStateType.SELECTED_KEY);
-            }
-            if ((state & DEFAULT) != 0) {
-                stateList.add(UIStateType.DEFAULT_KEY);
-            }
-            parentRegion.addBackgroundState(new UIState(model, parentRegion, stateList.toArray(new String[stateList.size()])));
-        }
-    }
-
-    public File getResourcesDir() {
-        return resourcesDir;
-    }
-
-    public void setResourcesDir(File resourcesDir) {
-        System.out.println("SynthModel.setResourcesDir(" + resourcesDir + ")");
-        File old = getResourcesDir();
-        this.resourcesDir = resourcesDir;
-        firePropertyChange("resourcesDir", old, getResourcesDir());
-    }
-
-    public File getImagesDir() {
-        return imagesDir;
-    }
-
-    public void setImagesDir(File imagesDir) {
-        System.out.println("SynthModel.setImagesDir(" + imagesDir + ")");
-        File old = getImagesDir();
-        this.imagesDir = imagesDir;
-        firePropertyChange("imagesDir", old, getImagesDir());
-    }
-
-    public File getTemplatesDir() {
-        return templatesDir;
-    }
-
-    public void setTemplatesDir(File templatesDir) {
-        System.out.println("SynthModel.setTemplatesDir(" + templatesDir + ")");
-        File old = getTemplatesDir();
-        this.templatesDir = templatesDir;
-        firePropertyChange("templatesDir", old, getTemplatesDir());
-    }
-
-    // =================================================================================================================
-    // JIBX Methods
-
-    public void preSet(IUnmarshallingContext context) {
-        File resourcesDir = (File) context.getUserContext();
-        this.resourcesDir = resourcesDir;
-        this.imagesDir = new File(resourcesDir, "images");
-        this.templatesDir = new File(resourcesDir, "templates");
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.jibx.xml b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.jibx.xml
deleted file mode 100644
index 981772abc2b..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.jibx.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Copyright 1998-2004 Sun Microsystems, Inc.  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.  Sun designates this
- particular file as subject to the "Classpath" exception as provided
- by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
--->
-
-<!DOCTYPE binding SYSTEM "http://jibx.sourceforge.net">
-<binding>
-    <mapping class="org.jdesktop.synthdesigner.synthmodel.UIDefault" abstract="true" post-set="postSet">
-        <value name="name" field="name" style="attribute"/>
-    </mapping>
-    <!-- == AWT TYPES =========================================================================================== -->
-    <mapping class="java.awt.Color"
-             marshaller="org.jdesktop.swingx.designer.jibxhelpers.ColorMapper"
-             unmarshaller="org.jdesktop.swingx.designer.jibxhelpers.ColorMapper"/>
-    <mapping class="java.lang.Class"
-             marshaller="org.jdesktop.synthdesigner.synthmodel.jibxhelpers.ClassMapper"
-             unmarshaller="org.jdesktop.synthdesigner.synthmodel.jibxhelpers.ClassMapper"/>
-    <!-- == UI FONT =========================================================================================== -->
-    <mapping name="typeface" class="org.jdesktop.swingx.designer.font.Typeface" post-set="postSet">
-        <value name="family" field="name" style="attribute" usage="optional"/>
-        <value name="bold" field="bold" style="attribute" usage="optional" default="Default"/>
-        <value name="italic" field="italic" style="attribute" usage="optional" default="Default"/>
-        <value name="size" field="size" style="attribute" usage="optional"/>
-        <value name="sizeOffset" field="sizeOffset" style="attribute" usage="optional" default="1"/>
-        <value name="uiDefaultParentName" field="uiDefaultParentName" style="attribute" usage="optional"/>
-    </mapping>
-    <mapping name="uiFont" class="org.jdesktop.synthdesigner.synthmodel.UIFont"
-             extends="org.jdesktop.synthdesigner.synthmodel.UIDefault">
-        <structure map-as="org.jdesktop.synthdesigner.synthmodel.UIDefault"/>
-        <collection get-method="getFonts" set-method="setFonts" create-type="java.util.ArrayList"/>
-    </mapping>
-    <!-- == UI INSETS =========================================================================================== -->
-    <mapping name="uiInsets" class="org.jdesktop.synthdesigner.synthmodel.UIInsets"
-             extends="org.jdesktop.synthdesigner.synthmodel.UIDefault">
-        <structure map-as="org.jdesktop.synthdesigner.synthmodel.UIDefault"/>
-        <structure name="insets" get-method="getInsets" set-method="setInsets"
-                   marshaller="org.jdesktop.swingx.designer.jibxhelpers.InsetsMapper"
-                   unmarshaller="org.jdesktop.swingx.designer.jibxhelpers.InsetsMapper"/>
-    </mapping>
-    <!-- == UI PAINT =========================================================================================== -->
-    <mapping name="matte" class="org.jdesktop.swingx.designer.paint.Matte" post-set="postSet">
-        <value name="red" field="red" style="attribute"/>
-        <value name="green" field="green" style="attribute"/>
-        <value name="blue" field="blue" style="attribute"/>
-        <value name="alpha" field="alpha" style="attribute"/>
-        <value name="uiDefaultParentName" field="uiDefaultParentName" style="attribute" usage="optional"/>
-        <value name="componentPropertyName" field="componentPropertyName" style="attribute" usage="optional"/>
-        <value name="hueOffset" field="hueOffset" style="attribute"/>
-        <value name="saturationOffset" field="saturationOffset" style="attribute"/>
-        <value name="brightnessOffset" field="brightnessOffset" style="attribute"/>
-        <value name="alphaOffset" field="alphaOffset" style="attribute"/>
-        <value name="uiResource" field="uiResource" style="attribute" usage="optional" default="true"/>
-    </mapping>
-    <mapping class="org.jdesktop.synthdesigner.synthmodel.UIPaint" abstract="true" type-name="uipaint"
-             extends="org.jdesktop.synthdesigner.synthmodel.UIDefault">
-        <structure map-as="org.jdesktop.synthdesigner.synthmodel.UIDefault"/>
-        <structure get-method="getPaint" set-method="setPaint"/>
-    </mapping>
-    <mapping name="uiPaint" class="org.jdesktop.synthdesigner.synthmodel.UIPaint"
-             extends="org.jdesktop.synthdesigner.synthmodel.UIDefault">
-        <structure map-as="uipaint"/>
-    </mapping>
-    <mapping name="uiColor" class="org.jdesktop.synthdesigner.synthmodel.UIColor"
-             extends="org.jdesktop.synthdesigner.synthmodel.UIPaint">
-        <structure map-as="uipaint"/>
-    </mapping>
-    <!-- == UI STYLE =========================================================================================== -->
-    <mapping class="org.jdesktop.synthdesigner.synthmodel.UIStyle" abstract="true" post-set="postSet">
-        <structure field="font" usage="optional"/>
-        <structure name="textForeground" usage="optional">
-            <structure field="textForeground" usage="optional"/>
-        </structure>
-        <structure name="textBackground" usage="optional">
-            <structure field="textBackground" usage="optional"/>
-        </structure>
-        <structure name="background" usage="optional">
-            <structure field="background" usage="optional"/>
-        </structure>
-        <value name="inherit-font" field="fontInherited" usage="optional" default="true"/>
-        <value name="inherit-textForeground" field="textForegroundInherited" usage="optional" default="true"/>
-        <value name="inherit-textBackground" field="textBackgroundInherited" usage="optional" default="true"/>
-        <value name="inherit-background" field="backgroundInherited" usage="optional" default="true"/>
-        <value name="hintAlphaInterpolation" field="hintAlphaInterpolation" usage="optional"/>
-        <value name="hintAntialiasing" field="hintAntialiasing" usage="optional"/>
-        <value name="hintColorRendering" field="hintColorRendering" usage="optional"/>
-        <value name="hintDithering" field="hintDithering" usage="optional"/>
-        <value name="hintFractionalMetrics" field="hintFractionalMetrics" usage="optional"/>
-        <value name="hintInterpolation" field="hintInterpolation" usage="optional"/>
-        <value name="hintRendering" field="hintRendering" usage="optional"/>
-        <value name="hintStrokeControl" field="hintStrokeControl" usage="optional"/>
-        <value name="hintTextAntialiasing" field="hintTextAntialiasing" usage="optional"/>
-        <value name="cacheSettingsInherited" field="cacheSettingsInherited" usage="optional" default="true"/>
-        <value name="cacheMode" field="cacheMode" usage="optional" default="FIXED_SIZES"/>
-        <value name="maxHozCachedImgScaling" field="maxHozCachedImgScaling" usage="optional" default="1"/>
-        <value name="maxVertCachedImgScaling" field="maxVertCachedImgScaling" usage="optional" default="1"/>
-        <collection name="uiproperties" field="uiProperties" create-type="java.util.ArrayList">
-            <structure marshaller="org.jdesktop.synthdesigner.synthmodel.jibxhelpers.UIPropertyMapper"
-                       unmarshaller="org.jdesktop.synthdesigner.synthmodel.jibxhelpers.UIPropertyMapper"/>
-        </collection>
-    </mapping>
-    <!-- == UI STATE =========================================================================================== -->
-    <mapping name="stateType" class="org.jdesktop.synthdesigner.synthmodel.UIStateType">
-        <value name="key" field="key" style="attribute"/>
-        <structure name="codeSnippet" usage="optional" test-method="hasCodeSnippet">
-            <value field="codeSnippet" style="cdata" usage="optional"/>
-        </structure>
-    </mapping>
-    <mapping name="state" class="org.jdesktop.synthdesigner.synthmodel.UIState" post-set="postSet" pre-set="preSet">
-        <value name="stateKeys" field="stateKeys" style="attribute" get-method="getStateKeys" set-method="setStateKeys"
-               serializer="org.jdesktop.synthdesigner.synthmodel.UIState.keysToString"
-               deserializer="org.jdesktop.synthdesigner.synthmodel.UIState.stringToKeys"/>
-        <value name="inverted" field="inverted" style="attribute" usage="optional"/>
-        <structure name="style" field="style"/>
-        <structure field="canvas"
-                   marshaller="org.jdesktop.swingx.designer.jibxhelpers.CanvasMapper"
-                   unmarshaller="org.jdesktop.swingx.designer.jibxhelpers.CanvasMapper"/>
-    </mapping>
-    <!-- == REGIONS =========================================================================================== -->
-    <mapping class="org.jdesktop.synthdesigner.synthmodel.UIRegion" abstract="true"
-             type-name="region" pre-set="preSet">
-        <value name="name" field="name" style="attribute"/>
-        <value name="ui" field="ui" style="attribute" usage="optional"/>
-        <value name="subregion" field="subregion" style="attribute"/>
-        <value name="key" field="key" style="attribute" usage="optional"/>
-        <value name="title" field="title" style="attribute" usage="optional"/>
-        <structure name="contentMargins" field="contentMargins"
-                   marshaller="org.jdesktop.swingx.designer.jibxhelpers.InsetsMapper"
-                   unmarshaller="org.jdesktop.swingx.designer.jibxhelpers.InsetsMapper"/>
-        <structure name="style" field="style"/>
-        <collection name="backgroundStates" field="backgroundStates" create-type="java.util.ArrayList"/>
-        <collection name="foregroundStates" field="foregroundStates" create-type="java.util.ArrayList"/>
-        <collection name="borderStates" field="borderStates" create-type="java.util.ArrayList"/>
-        <collection name="regions" field="subRegions" create-type="java.util.ArrayList"/>
-    </mapping>
-    <mapping name="region" class="org.jdesktop.synthdesigner.synthmodel.UIRegion">
-        <structure map-as="region"/>
-    </mapping>
-    <mapping name="uiIconRegion" class="org.jdesktop.synthdesigner.synthmodel.UIIconRegion"
-             extends="org.jdesktop.synthdesigner.synthmodel.UIRegion">
-        <structure map-as="region"/>
-        <value name="basicKey" field="basicKey" style="attribute" usage="optional"/>
-    </mapping>
-    <mapping name="uiComponent" class="org.jdesktop.synthdesigner.synthmodel.UIComponent"
-             extends="org.jdesktop.synthdesigner.synthmodel.UIRegion">
-        <value name="opaque" field="opaque" style="attribute"/>
-        <value name="componentName" field="componentName" style="attribute" usage="optional"/>
-        <value name="type" field="type" style="attribute"/>
-        <collection name="stateTypes" field="stateTypes" create-type="java.util.ArrayList"/>
-        <structure map-as="region"/>
-    </mapping>
-    <!-- == BASE MODEL =========================================================================================== -->
-    <mapping name="synthModel" class="org.jdesktop.synthdesigner.synthmodel.SynthModel" pre-set="preSet">
-        <collection name="insets" field="insets" create-type="java.util.ArrayList"/>
-        <collection name="colors" field="colors" create-type="java.util.ArrayList"/>
-        <collection name="fonts" field="fonts" create-type="java.util.ArrayList"/>
-        <structure name="style" field="globalStyle"/>
-        <collection name="components" field="components" create-type="java.util.ArrayList"/>
-    </mapping>
-</binding>
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIComponent.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIComponent.java
deleted file mode 100644
index 028124ab363..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIComponent.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * UIComponent - model node that represents the designs for a single swing component
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIComponent extends UIRegion implements HasUIDefaults {
-
-    /** The classname of the swing component that this UIComponent represents */
-    private String type;
-    /** The name of the component if its a named component or null if its a generic component */
-    private String componentName = null;
-    /** If this components is opaque which means that when it is painted all of its bounds are filled */
-    private boolean opaque = false;
-    /**
-     * A list of state types that are available to this region and sub regions of this component but not subcomponents
-     * of this component. If this list is empty then the standard synth set of state types are assumed.
-     */
-    private List<UIStateType> stateTypes;
-
-    // =================================================================================================================
-    // Contructors
-
-    /** no-args contructor for JIBX */
-    protected UIComponent() {
-        super();
-        // create new observable list for state types so we get events for when the model changes
-        stateTypes = new ArrayList<UIStateType>();
-    }
-
-    public UIComponent(String name, String type, String ui, UIRegion... subRegions) {
-        super(name, ui, subRegions);
-        this.type = type;
-        for (UIRegion r : subRegions) {
-            r.setRegion(this);
-        }
-        // create new observable list for state types so we get events for when the model changes
-        stateTypes = new ArrayList<UIStateType>();
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    public String getComponentName() {
-        return componentName;
-    }
-
-    public void setComponentName(String componentName) {
-        String old = getComponentName();
-        this.componentName = componentName;
-        firePropertyChange("componentName", old, getComponentName());
-    }
-
-    public boolean isOpaque() {
-        return opaque;
-    }
-
-    public void setOpaque(boolean opaque) {
-        boolean old = isOpaque();
-        this.opaque = opaque;
-        firePropertyChange("opaque", old, isOpaque());
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        String old = getType();
-        this.type = type;
-        firePropertyChange("type", old, getType());
-    }
-
-    /**
-     * Get the list of state types that are available to this region and sub regions of this component but not
-     * subcomponents of this component. If this list is empty then the standard synth set of state types are assumed.
-     *
-     * @return List of available state types
-     */
-    public List<UIStateType> getStateTypes() {
-        return stateTypes;
-    }
-
-    @Override public String getKey() {
-        if (key == null || "".equals(key)) {
-            if (componentName == null || "".equals(componentName)) {
-                return getName();
-            } else {
-                return "\"" + componentName + "\"";
-            }
-        } else {
-            return key;
-        }
-    }
-
-    @Override public String getTitle() {
-        if (title == null || "".equals(title)) {
-            if (componentName == null || "".equals(componentName)) {
-                return getName();
-            } else {
-                return componentName;
-            }
-        } else {
-            return title;
-        }
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java
deleted file mode 100644
index 2f0bf09a8d6..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-import org.jibx.runtime.IUnmarshallingContext;
-
-import javax.swing.UIDefaults;
-
-/**
- * Represents an entry in the UI defaults table.
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIDefault<T> extends AbstractBean implements HasUIDefaults {
-    private String name;
-    private T value;
-    /**
-     * This is a local UIDefaults that contains all the UIDefaults in the synth model. It is kept uptodate by the
-     * indervidual UIDefaults nodes
-     */
-    private transient UIDefaults modelDefaults = null;
-
-    public UIDefault() {
-    }
-
-    public UIDefault(String name, T value) {
-        this.name = name;
-        this.value = value;
-    }
-
-    public UIDefault(String name, T value, UIDefaults modelDefaults) {
-        this.name = name;
-        this.value = value;
-        this.modelDefaults = modelDefaults;
-    }
-
-    // =================================================================================================================
-    // JIBX Methods
-
-    /**
-     * Called by JIBX after all fields have been set
-     *
-     * @param context The JIBX Unmarshalling Context
-     */
-    private void postSet(IUnmarshallingContext context) {
-        // walk up till we get synth model
-        for (int i = 0; i < context.getStackDepth(); i++) {
-            if (context.getStackObject(i) instanceof HasUIDefaults) {
-                modelDefaults = ((HasUIDefaults) context.getStackObject(i)).getUiDefaults();
-                if (modelDefaults != null) break;
-            }
-        }
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    /**
-     * Get the local UIDefaults that contains all the UIDefaults in the synth model. It is kept uptodate by the
-     * indervidual UIDefaults nodes
-     *
-     * @return The UIDefaults for the synth model
-     */
-    public UIDefaults getUiDefaults() {
-        return modelDefaults;
-    }
-
-    public void setValue(T t) {
-        T old = this.value;
-        this.value = t;
-        firePropertyChange("value", old, getValue());
-    }
-
-    public T getValue() {
-        return value;
-    }
-
-    public final String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        String old = this.name;
-        firePropertyChange("name", old, name);
-        this.name = name;
-        // update model defaults
-        if (old != null) modelDefaults.remove(old);
-        modelDefaults.put(getName(), getValue());
-    }
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIFont.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIFont.java
deleted file mode 100644
index efb6fdba35c..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIFont.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import java.awt.Font;
-import org.jdesktop.swingx.designer.font.Typeface;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ArrayList;
-import javax.swing.UIDefaults;
-
-/**
- * Represents a single font entry in the UIDefaults table. Each UIFont takes a
- * list of Typefaces. These typefaces are listed by order of preference. Thus,
- * when putting a font into UIDefaults, the code can check whether each font
- * exists, and when it finds the first font that does, insert it.
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIFont extends UIDefault<List<Typeface>> implements Cloneable {
-
-    private void updateUIDefaults() {
-        if (getUiDefaults() != null) {
-            for (Typeface t : getFonts()) {
-                if (t.isFontSupported()) {
-                    getUiDefaults().put(getName(), t.getFont());
-                    return;
-                }
-            }
-        }
-
-        //TODO must not have found any. Default to the Default platform font
-        getUiDefaults().put(getName(), new Font("Arial", Font.PLAIN, 12));
-    }
-
-    public UIFont() {
-        setValue(new ArrayList<Typeface>());
-    }
-
-    public UIFont(String id, List<Typeface> values, UIDefaults defaults) {
-        super(id, values, defaults);
-        updateUIDefaults();
-    }
-
-    public UIFont(String id, Font font, UIDefaults modelDefaults) {
-        this(id, Arrays.asList(new Typeface(font, modelDefaults)), modelDefaults);
-    }
-
-    public List<Typeface> getFonts() {
-        return super.getValue();
-    }
-
-    private void setFonts(List<Typeface> values) {
-        super.setValue(values);
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIconRegion.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIconRegion.java
deleted file mode 100644
index 74590ee9789..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIconRegion.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-/**
- * A UIRegion subclass which is used for generating icons. For example, JRadioButton and JCheckBox represent themselves
- * mainly via their icons. However, from the designers perspective, the main design isn't an "icon", but just a region
- * on the button.
- * <p/>
- * That type of region is represented by a UIIconRegion. UIIconRegion contains a string which references the UIDefault
- * value associated with this icon. For example, RadioButton.icon.
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIIconRegion extends UIRegion {
-    /** The UiDefaults key which this icon should be stored for basic LaF to find it. This is absolute */
-    private String basicKey = null;
-
-    public UIIconRegion() {
-        super();
-    }
-
-    public String getBasicKey() {
-        return basicKey;
-    }
-
-    public void setBasicKey(String basicKey) {
-        String old = getBasicKey();
-        this.basicKey = basicKey;
-        firePropertyChange("basicKey",old,getBasicKey());
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIPaint.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIPaint.java
deleted file mode 100644
index 931b3f41fee..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIPaint.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.swingx.designer.paint.Matte;
-import org.jdesktop.swingx.designer.paint.PaintModel;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-/**
- * UIPaint
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIPaint extends UIDefault<PaintModel> {
-
-    /** Listener to keep model UiDefaults up to date for this UiPaint */
-    private PropertyChangeListener matteListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            PaintModel paintModel = getValue();
-            if (paintModel instanceof Matte) {
-                getUiDefaults().put(getName(), ((Matte) paintModel).getColor());
-            }
-            // propogate the paint change up as PaintModel is a mutable object
-            if (evt.getPropertyName().equals("paint")) {
-                firePropertyChange("paint", null, getPaint());
-                firePropertyChange("value", null, getPaint());
-            }
-        }
-    };
-
-    public UIPaint() {}
-
-    public UIPaint(String id, PaintModel value) {
-        super(id, value, (value instanceof Matte) ? ((Matte) value).getUiDefaults() : null);
-        // update model defaults
-        if (value instanceof Matte) {
-            Matte matte = (Matte) value;
-            if (getUiDefaults() != null) getUiDefaults().put(getName(), matte.getColor());
-            matte.addPropertyChangeListener(matteListener);
-        }
-    }
-
-    public PaintModel getPaint() {
-        return super.getValue();
-    }
-
-    public void setPaint(PaintModel c) {
-        PaintModel old = getPaint();
-        if (old instanceof Matte) old.removePropertyChangeListener(matteListener);
-        super.setValue(c);
-        firePropertyChange("paint", old, c);
-        // update model defaults
-        if (c instanceof Matte) {
-            Matte matte = (Matte) c;
-            getUiDefaults().put(getName(), matte.getColor());
-            matte.addPropertyChangeListener(matteListener);
-        }
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIProperty.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIProperty.java
deleted file mode 100644
index 1a57a58f816..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIProperty.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.beans.AbstractBean;
-
-/**
- * UIProperty
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIProperty extends AbstractBean {
-    public static enum PropertyType {
-        BOOLEAN, INT, FLOAT, DOUBLE, STRING, FONT, COLOR, INSETS, DIMENSION, BORDER
-    }
-
-    private String name;
-    private PropertyType type;
-    private Object value;
-
-    protected UIProperty() {
-    }
-
-    public UIProperty(String name, PropertyType type, Object value) {
-        this.name = name;
-        this.type = type;
-        this.value = value;
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        String old = getName();
-        this.name = name;
-        firePropertyChange("name", old, getName());
-    }
-
-    public PropertyType getType() {
-        return type;
-    }
-
-    public void setType(PropertyType type) {
-        PropertyType old = getType();
-        this.type = type;
-        firePropertyChange("type", old, getType());
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        Object old = getValue();
-        this.value = value;
-        firePropertyChange("value", old, getValue());
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIRegion.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIRegion.java
deleted file mode 100644
index 1ee4f35653a..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIRegion.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-import org.jibx.runtime.IUnmarshallingContext;
-
-import javax.swing.UIDefaults;
-import java.awt.Insets;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * Represents a "Region" in synth, which also includes entire components.
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIRegion extends AbstractBean implements HasUIDefaults, HasUIStyle {
-    private String name;//the code-wise name of the region
-    protected String key; //the UIdefaults key for this region
-    protected String title; //the user friendly name/title of this region
-    /** List of background states */
-    private List<UIState> backgroundStates;
-    /** List of foreground states */
-    private List<UIState> foregroundStates;
-    /** List of border states */
-    private List<UIState> borderStates;
-    private UIStyle style = new UIStyle();
-    protected Insets contentMargins = new Insets(0, 0, 0, 0);
-    /** Sub regions, if any */
-    private List<UIRegion> subRegions;
-
-    //together with name, these two fields allow me to reconstruct, in
-    //code, a synth Region, including a custom Region, if you make one.
-    private String ui;
-    private boolean subregion;
-    /**
-     * This is a local UIDefaults that contains all the UIDefaults in the synth model. It is kept uptodate by the
-     * indervidual UIDefaults nodes
-     */
-    private transient UIDefaults modelDefaults = null;
-
-    private UIRegion region; //the region that this region belongs to
-
-    // =================================================================================================================
-    // Constructors
-
-    /** no-args contructor for JIBX */
-    protected UIRegion() {
-        subRegions = new ArrayList<UIRegion>();
-        backgroundStates = new ArrayList<UIState>();
-        foregroundStates = new ArrayList<UIState>();
-        borderStates = new ArrayList<UIState>();
-        style.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("style." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-            }
-        });
-    }
-
-    public UIRegion(String name, UIRegion... subRegions) {
-        this(name, null, true, subRegions);
-    }
-
-    public UIRegion(String name, String ui, UIRegion... subRegions) {
-        this(name, ui, false, subRegions);
-    }
-
-    public UIRegion(String name, String ui, boolean subregion, UIRegion... subRegions) {
-        this();
-        this.name = name;
-        this.ui = ui;
-        this.subregion = subregion;
-        if (subRegions != null) {
-            for (UIRegion r : subRegions) {
-                if (r != null) {
-                    this.subRegions.add(r);
-                    r.getStyle().setParentStyle(getStyle());
-                }
-            }
-        }
-    }
-
-    // =================================================================================================================
-    // JIBX Methods
-
-    /**
-     * Called by JIBX after all fields have been set
-     *
-     * @param context The JIBX Unmarshalling Context
-     */
-    private void preSet(IUnmarshallingContext context) {
-        // walk up till we get synth model
-        for (int i = 0; i < context.getStackDepth(); i++) {
-            if (context.getStackObject(i) instanceof HasUIDefaults) {
-                modelDefaults = ((HasUIDefaults) context.getStackObject(i)).getUiDefaults();
-                if (modelDefaults != null) break;
-            }
-        }
-        for (int i = 0; i < context.getStackDepth(); i++) {
-            if (context.getStackObject(i) instanceof UIRegion && context.getStackObject(i) != this) {
-                region = (UIRegion) context.getStackObject(i);
-                break;
-            }
-        }
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    public Insets getContentMargins() {
-        return contentMargins;
-    }
-
-    public void setContentMargins(Insets contentMargins) {
-        Insets old = getContentMargins();
-        this.contentMargins = contentMargins;
-        firePropertyChange("contentMargins", old, getContentMargins());
-    }
-
-    void setRegion(UIRegion r) {
-        this.region = r;
-    }
-
-    public UIRegion getRegion() {
-        return region;
-    }
-
-    /**
-     * Get the local UIDefaults that contains all the UIDefaults in the synth model. It is kept uptodate by the
-     * indervidual UIDefaults nodes
-     *
-     * @return The UIDefaults for the synth model
-     */
-    public UIDefaults getUiDefaults() {
-        return modelDefaults;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public final UIRegion[] getSubRegions() {
-        return subRegions.toArray(new UIRegion[0]);
-    }
-
-    public final UIState[] getBackgroundStates() {
-        return backgroundStates.toArray(new UIState[0]);
-    }
-
-    public final UIState[] getForegroundStates() {
-        return foregroundStates.toArray(new UIState[0]);
-    }
-
-    public final UIState[] getBorderStates() {
-        return borderStates.toArray(new UIState[0]);
-    }
-
-    public UIStyle getStyle() {
-        return style;
-    }
-
-    public final boolean isSubRegion() {
-        return subregion;
-    }
-
-    public final String getUi() {
-        return ui;
-    }
-
-    public void addBackgroundState(UIState state) {
-        // check if we already have that state
-        for (UIState uiState : backgroundStates) {
-            if (uiState.getName().equals(state.getName())) return;
-        }
-        backgroundStates.add(state);
-        state.setRegion(this);
-        firePropertyChange("backgroundStates", null, backgroundStates);
-    }
-
-    public void removeBackgroundState(UIState state) {
-        if (backgroundStates.remove(state)) {
-            firePropertyChange("backgroundStates", null, backgroundStates);
-        }
-    }
-
-    public void addForegroundState(UIState state) {
-        // check if we already have that state
-        for (UIState uiState : foregroundStates) {
-            if (uiState.getName().equals(state.getName())) return;
-        }
-        foregroundStates.add(state);
-        state.setRegion(this);
-        firePropertyChange("foregroundStates", null, foregroundStates);
-    }
-
-    public void removeForegroundState(UIState state) {
-        if (foregroundStates.remove(state)) {
-            firePropertyChange("foregroundStates", null, foregroundStates);
-        }
-    }
-
-    public void addBorderState(UIState state) {
-        // check if we already have that state
-        for (UIState uiState : borderStates) {
-            if (uiState.getName().equals(state.getName())) return;
-        }
-        borderStates.add(state);
-        state.setRegion(this);
-        firePropertyChange("borderStates", null, borderStates);
-    }
-
-    public void removeBorderState(UIState state) {
-        if (borderStates.remove(state)) {
-            firePropertyChange("borderStates", null, borderStates);
-        }
-    }
-
-
-    public String getKey() {
-        return key == null || "".equals(key) ? name : key;
-    }
-
-    public String getTitle() {
-        return title == null || "".equals(title) ? name : title;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java
deleted file mode 100644
index 4d747a4e2d4..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingx.designer.Canvas;
-import org.jdesktop.swingx.designer.utils.HasPath;
-import org.jdesktop.swingx.designer.utils.HasUIDefaults;
-import org.jibx.runtime.IUnmarshallingContext;
-
-import javax.swing.UIDefaults;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Represents a State in the Synth LAF.
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIState extends AbstractBean implements HasUIStyle, HasPath {
-
-    private List<String> stateKeys;
-    private boolean inverted; //indicates whether to invert the meaning of the 9-square stretching insets
-    /** A cached string representing the list of stateKeys deliminated with "+" */
-    private String cachedName = null;
-    private Canvas canvas;
-    private UIStyle style;
-    /** the region that this state belongs to */
-    private UIRegion region;
-    /**
-     * This is a local UIDefaults that contains all the UIDefaults in the synth model. It is kept uptodate by the
-     * indervidual UIDefaults nodes
-     */
-    private transient UIDefaults modelDefaults = null;
-
-    // =================================================================================================================
-    // Contructors
-
-    public UIState() {
-        // Create state keys as event list so model changes are propogated
-        stateKeys = new ArrayList<String>();
-    }
-
-    public UIState(SynthModel model, UIRegion parentRegion, String... stateTypeKeys) {
-        // Create state keys as event list so model changes are propogated
-        stateKeys = new ArrayList<String>();
-        this.stateKeys.addAll(Arrays.asList(stateTypeKeys));
-        //
-        modelDefaults = model.getUiDefaults();
-        region = parentRegion;
-        // create new canvas
-        canvas = new Canvas(100, 30);
-        canvas.setUiDefaults(modelDefaults);
-        String canvasPath = getPath();
-        canvas.setResourcesDir(new File(model.getResourcesDir(), canvasPath));
-        canvas.setTemplatesDir(new File(model.getTemplatesDir(), canvasPath));
-        canvas.setImagesDir(new File(model.getImagesDir(), canvasPath));
-        canvas.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("canvas." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-            }
-        });
-        // create new style
-        style = new UIStyle();
-        style.setParentStyle(region.getStyle());
-        style.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("style." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-            }
-        });
-    }
-
-    // =================================================================================================================
-    // JIBX Methods
-
-    /**
-     * JIBX needs this
-     *
-     * @param stateKeys The new list of states
-     */
-    private void setStateKeys(List<String> stateKeys) {
-        if (stateKeys != this.stateKeys) {
-            this.stateKeys.clear();
-            this.stateKeys.addAll(stateKeys);
-        }
-    }
-
-    /**
-     * Called by JIBX after all fields have been set
-     *
-     * @param context The JIBX Unmarshalling Context
-     */
-    private void preSet(IUnmarshallingContext context) {
-        // walk up till we get synth model
-        for (int i = 0; i < context.getStackDepth(); i++) {
-            if (context.getStackObject(i) instanceof HasUIDefaults) {
-                modelDefaults = ((HasUIDefaults) context.getStackObject(i)).getUiDefaults();
-                if (modelDefaults != null) break;
-            }
-        }
-        for (int i = 0; i < context.getStackDepth(); i++) {
-            if (context.getStackObject(i) instanceof UIRegion) {
-                region = (UIRegion) context.getStackObject(i);
-                break;
-            }
-        }
-    }
-
-    /**
-     * Called by JIBX after all fields have been set
-     *
-     * @param context The JIBX Unmarshalling Context
-     */
-    private void postSet(IUnmarshallingContext context) {
-        // add listeners to pass canvas and style events up tree
-        canvas.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("canvas." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-            }
-        });
-        style.addPropertyChangeListener(new PropertyChangeListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                firePropertyChange("style." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-            }
-        });
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    /**
-     * Get path to this UI State of the form /RegionA/RegionB/StateName
-     *
-     * @return Path to this state
-     */
-    public String getPath() {
-        StringBuilder buf = new StringBuilder(getName());
-        UIRegion region = getRegion();
-        // check if we are foreground background or border
-        boolean found = false;
-        for (UIState state : region.getBackgroundStates()) {
-            if (state == this) {
-                buf.insert(0, "Background/");
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            for (UIState state : region.getForegroundStates()) {
-                if (state == this) {
-                    buf.insert(0, "Foreground/");
-                    found = true;
-                    break;
-                }
-            }
-        }
-        if (!found) {
-            for (UIState state : region.getBorderStates()) {
-                if (state == this) {
-                    buf.insert(0, "Border/");
-                    found = true;
-                    break;
-                }
-            }
-        }
-        // add parent regions
-        while (region != null) {
-            buf.insert(0, '/');
-            if (region instanceof UIComponent && ((UIComponent) region).getComponentName() != null) {
-                buf.insert(0, ((UIComponent) region).getComponentName());
-            } else {
-                buf.insert(0, region.getName());
-            }
-            region = region.getRegion();
-        }
-        return buf.toString();
-    }
-
-    void setRegion(UIRegion r) {
-        this.region = r;
-        this.style.setParentStyle(r.getStyle());
-    }
-
-    public UIRegion getRegion() {
-        return region;
-    }
-
-    /**
-     * Get the local UIDefaults that contains all the UIDefaults in the synth model. It is kept uptodate by the
-     * indervidual UIDefaults nodes
-     *
-     * @return The UIDefaults for the synth model
-     */
-    public UIDefaults getUIDefaults() {
-        return modelDefaults;
-    }
-
-
-    /**
-     * Get the list of state type keys for this state. This state is applied when the current component state matches as
-     * many as possible of these state types.
-     *
-     * @return List of state types that need to be true for this state. This is direct access to the data and changes to
-     *         the returned list will effect this UiState.
-     */
-    public List<String> getStateKeys() {
-        return stateKeys;
-    }
-
-    public void setInverted(boolean b) {
-        boolean old = inverted;
-        inverted = b;
-        firePropertyChange("invert", old, b);
-    }
-
-    public final boolean isInverted() {
-        return inverted;
-    }
-
-    /**
-     * Get the name of this state
-     *
-     * @return
-     */
-    public String getName() {
-        if (cachedName == null) {
-            StringBuilder buf = new StringBuilder();
-            List<String> keys = new ArrayList<String>(stateKeys);
-            Collections.sort(keys);
-            for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
-                buf.append(iter.next());
-                if (iter.hasNext()) buf.append('+');
-            }
-            cachedName = buf.toString();
-        }
-        return cachedName;
-    }
-
-    public final Canvas getCanvas() {
-        return canvas;
-    }
-
-    public void setCanvas(Canvas c) {
-        Canvas old = canvas;
-        canvas = c;
-        firePropertyChange("canvas", old, c);
-    }
-
-    public UIStyle getStyle() {
-        return style;
-    }
-
-    // =================================================================================================================
-    // JIBX Helper Methods
-
-    public static String keysToString(List<String> keys) {
-        StringBuilder buf = new StringBuilder();
-        for (Iterator<String> iter = keys.iterator(); iter.hasNext();) {
-            buf.append(iter.next());
-            if (iter.hasNext()) buf.append('+');
-        }
-        return buf.toString();
-    }
-
-    public static List<String> stringToKeys(String keysString) {
-        return Arrays.asList(keysString.split("\\+"));
-    }
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStateType.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStateType.java
deleted file mode 100644
index 811ca8fa17c..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStateType.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.beans.AbstractBean;
-
-/**
- * UIStateType - A UIComponents has a collection of these which constitute the avilables states which can be chosen in
- * the components regions. A UIStateType can be either a custom state or one of the predefined standard states.
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIStateType extends AbstractBean {
-    /* Keys for standard synth states */
-    public static final String ENABLED_KEY = "Enabled";
-    public static final String MOUSE_OVER_KEY = "MouseOver";
-    public static final String PRESSED_KEY = "Pressed";
-    public static final String DISABLED_KEY = "Disabled";
-    public static final String FOCUSED_KEY = "Focused";
-    public static final String SELECTED_KEY = "Selected";
-    public static final String DEFAULT_KEY = "Default";
-    public static final String[] STANDARD_SYNTH_STATE_KEYS = new String[]{
-            ENABLED_KEY, MOUSE_OVER_KEY, PRESSED_KEY, DISABLED_KEY, FOCUSED_KEY, SELECTED_KEY, DEFAULT_KEY
-    };
-    public static final UIStateType[] STANDARD_SYNTH_STATES = new UIStateType[]{
-            new UIStateType(ENABLED_KEY),
-            new UIStateType(MOUSE_OVER_KEY),
-            new UIStateType(PRESSED_KEY),
-            new UIStateType(DISABLED_KEY),
-            new UIStateType(FOCUSED_KEY),
-            new UIStateType(SELECTED_KEY),
-            new UIStateType(DEFAULT_KEY)
-    };
-
-    /** Unique string for the ui key for this state, must be unique within a components set of UiStateTypes */
-    private String key;
-    /**
-     * Snippet of java code that defines calculates the value of this state for a particular component. The varaiable
-     * <code>c</code> is the component. You end with a return statement returning boolean true/false for the current
-     * value of this state for this component. This can be null if the key is one of that standard synth states defined
-     * in constants in this class.
-     */
-    private String codeSnippet;
-
-    /** JIBX no-args contructor */
-    private UIStateType() {}
-
-    private UIStateType(String key) {
-        this.key = key;
-        this.codeSnippet = null;
-    }
-
-    public UIStateType(String key, String codeSnippet) {
-        this.key = key;
-        this.codeSnippet = codeSnippet;
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    /**
-     * Get the ui defaults key for this state type. Unique string for the ui key for this state, must be unique within a
-     * components set of UiStateTypes.
-     *
-     * @return Unique ui default key
-     */
-    public String getKey() {
-        return key;
-    }
-
-    /**
-     * Get the snippet of java code that defines calculates the value of this state for a particular component. The
-     * varaiable <code>c</code> is the component. You end with a return statement returning boolean true/false for the
-     * current value of this state for this component. This can be null if the key is one of that standard synth states
-     * defined in constants in this class.
-     *
-     * @return Snippet of java code or null if this is a synth standard state
-     */
-    public String getCodeSnippet() {
-        return codeSnippet;
-    }
-
-    /**
-     * Set the snippet of java code that defines calculates the value of this state for a particular component. The
-     * varaiable <code>c</code> is the component. You end with a return statement returning boolean true/false for the
-     * current value of this state for this component. This can be null if the key is one of that standard synth states
-     * defined in constants in this class.
-     *
-     * @param codeSnippet Snippet of java code or null if this is a synth standard state
-     */
-    public void setCodeSnippet(String codeSnippet) {
-        this.codeSnippet = codeSnippet;
-    }
-
-    /**
-     * Returns if this state type is a standard synth type and has no code snippet or a custom type that has a code
-     * snippet. It is used by JIBX to determin if the code snippet should be written to XML.
-     *
-     * @return <code>true</code> if codeSnippet is non null
-     */
-    public boolean hasCodeSnippet() {
-        return codeSnippet != null;
-    }
-
-
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStyle.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStyle.java
deleted file mode 100644
index 3e926bf8e4a..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStyle.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel;
-
-import org.jdesktop.beans.AbstractBean;
-import org.jdesktop.swingx.designer.font.Typeface;
-import org.jdesktop.swingx.designer.paint.Matte;
-import org.jibx.runtime.IUnmarshallingContext;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * UIStyle
- *
- * @author  Richard Bair
- * @author  Jasper Potts
- */
-public class UIStyle extends AbstractBean {
-    public static enum CacheMode {NO_CACHING,FIXED_SIZES,NINE_SQUARE_SCALE}
-    public static enum HintAlphaInterpolation {
-        DEFAULT, QUALITY, SPEED
-    }
-
-    public static enum HintAntialiasing {
-        DEFAULT, ON, OFF
-    }
-
-    public static enum HintColorRendering {
-        DEFAULT, QUALITY, SPEED
-    }
-
-    public static enum HintDithering {
-        DEFAULT, DISABLE, ENABLE
-    }
-
-    public static enum HintFractionalMetrics {
-        DEFAULT, ON, OFF
-    }
-
-    public static enum HintInterpolation {
-        NEAREST_NEIGHBOR, BILINEAR, BICUBIC
-    }
-
-    public static enum HintRendering {
-        DEFAULT, QUALITY, SPEED
-    }
-
-    public static enum HintStrokeControl {
-        DEFAULT, NORMALIZE, PURE
-    }
-
-    public static enum HintTextAntialiasing {
-        DEFAULT, ON, OFF, GASP, LCD_HBGR, LCD_HRGB, LCD_VBGR, LCD_VRGB
-    }
-
-    private Typeface font = null;
-    private boolean fontInherited = true;
-    private Matte textForeground = null;
-    private boolean textForegroundInherited = true;
-    private Matte textBackground = null;
-    private boolean textBackgroundInherited = true;
-    private Matte background = null;
-    private boolean backgroundInherited = true;
-
-    private boolean cacheSettingsInherited = true;
-    private CacheMode cacheMode = CacheMode.FIXED_SIZES;
-    private double maxHozCachedImgScaling = 1;
-    private double maxVertCachedImgScaling = 1;
-
-    private HintAlphaInterpolation hintAlphaInterpolation = null;
-    private HintAntialiasing hintAntialiasing = null;
-    private HintColorRendering hintColorRendering = null;
-    private HintDithering hintDithering = null;
-    private HintFractionalMetrics hintFractionalMetrics = null;
-    private HintInterpolation hintInterpolation = null;
-    private HintRendering hintRendering = null;
-    private HintStrokeControl hintStrokeControl = null;
-    private HintTextAntialiasing hintTextAntialiasing = null;
-    private List<UIProperty> uiProperties;
-    private UIStyle parentStyle = null;
-
-    private PropertyChangeListener textForegoundListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            firePropertyChange("textForeground." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-        }
-    };
-    private PropertyChangeListener textBackgroundListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            firePropertyChange("textBackground." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-        }
-    };
-    private PropertyChangeListener backgroundListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            firePropertyChange("background." + evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-        }
-    };
-
-    // =================================================================================================================
-    // Constructors
-
-    public UIStyle() {
-        uiProperties = new ArrayList<UIProperty>();
-    }
-
-    // =================================================================================================================
-    // JIBX Methods
-
-    /**
-     * Called by JIBX after all fields have been set
-     *
-     * @param context The JIBX Unmarshalling Context
-     */
-    private void postSet(IUnmarshallingContext context) {
-        // walk up till we get a parent style
-        for (int i = 0; i < context.getStackDepth(); i++) {
-            if (context.getStackObject(i) instanceof HasUIStyle) {
-                HasUIStyle hasStyle = (HasUIStyle) context.getStackObject(i);
-                if (hasStyle.getStyle() != this) {
-                    parentStyle = hasStyle.getStyle();
-                    if (parentStyle != null) break;
-                }
-            }
-        }
-    }
-
-    // =================================================================================================================
-    // Bean Methods
-
-    public UIStyle getParentStyle() {
-        return parentStyle;
-    }
-
-    public void setParentStyle(UIStyle parentStyle) {
-        UIStyle old = getParentStyle();
-        this.parentStyle = parentStyle;
-        firePropertyChange("parentStyle", old, getParentStyle());
-    }
-
-    public List<UIProperty> getUiProperties() {
-        return uiProperties;
-    }
-
-    public void addUiProperty(UIProperty uiProperty) {
-        uiProperties.add(uiProperty);
-        // todo not quite sure what events we want here
-        fireIndexedPropertyChange("uiProperties", uiProperties.size(), null, uiProperty);
-//        firePropertyChange("uiProperties", null, uiProperties);
-    }
-
-    public void removeUiProperty(UIProperty uiProperty) {
-        int index = uiProperties.indexOf(uiProperty);
-        if (index != -1) {
-            uiProperties.remove(uiProperty);
-            // todo not quite sure what events we want here
-            fireIndexedPropertyChange("uiProperties", index, null, uiProperty);
-//            firePropertyChange("uiProperties", null, uiProperties);
-        }
-    }
-
-    public Typeface getFont() {
-        if (isFontInherited()) {
-            return parentStyle == null ? font : parentStyle.getFont();
-        } else {
-            return font;
-        }
-    }
-
-    public void setFont(Typeface font) {
-        Typeface old = getFont();
-        this.font = font;
-        firePropertyChange("font", old, font);
-    }
-
-    public boolean isFontInherited() {
-        return fontInherited;
-    }
-
-    public void setFontInherited(boolean b) {
-        boolean old = isFontInherited();
-        fontInherited = b;
-        firePropertyChange("fontInherited", old, b);
-
-        if (!fontInherited && font == null && parentStyle != null && parentStyle.getFont() != null) {
-            font = parentStyle.getFont().clone();
-            firePropertyChange("font", null, font);
-        }
-    }
-
-    public Matte getTextForeground() {
-        if (isTextForegroundInherited()) {
-            return parentStyle == null ? null : parentStyle.getTextForeground();
-        } else {
-            return textForeground;
-        }
-    }
-
-    public boolean isTextForegroundInherited() {
-        return textForegroundInherited;
-    }
-
-    public void setTextForegroundInherited(boolean b) {
-        boolean old = isTextForegroundInherited();
-        textForegroundInherited = b;
-        firePropertyChange("foregroundInherited", old, b);
-
-        if (!textForegroundInherited && textForeground == null && parentStyle != null &&
-                parentStyle.getTextForeground() != null) {
-            textForeground = parentStyle.getTextForeground().clone();
-            firePropertyChange("textForeground", null, textForeground);
-        }
-    }
-
-    public void setTextForeground(Matte textForeground) {
-        Matte old = this.textForeground;
-        if (old != null) old.removePropertyChangeListener(textForegoundListener);
-        this.textForeground = textForeground;
-        if (this.textForeground != null) this.textForeground.addPropertyChangeListener(textForegoundListener);
-        firePropertyChange("textForeground", old, this.textForeground);
-    }
-
-    public Matte getTextBackground() {
-        if (isTextBackgroundInherited()) {
-            return parentStyle == null ? null : parentStyle.getBackground();
-        } else {
-            return textBackground;
-        }
-    }
-
-    public boolean isTextBackgroundInherited() {
-        return textBackgroundInherited;
-    }
-
-    public void setTextBackgroundInherited(boolean b) {
-        boolean old = isBackgroundInherited();
-        textBackgroundInherited = b;
-        firePropertyChange("textBackgroundInherited", old, b);
-
-        if (!textBackgroundInherited && textBackground == null && parentStyle != null &&
-                parentStyle.getTextBackground() != null) {
-            textBackground = parentStyle.getTextBackground().clone();
-            firePropertyChange("textBackground", null, textBackground);
-        }
-    }
-
-    public void setTextBackground(Matte textBackground) {
-        Matte old = this.textBackground;
-        if (old != null) old.removePropertyChangeListener(textBackgroundListener);
-        this.textBackground = textBackground;
-        if (this.textBackground != null) this.textBackground.addPropertyChangeListener(textBackgroundListener);
-        firePropertyChange("textBackground", old, this.textBackground);
-    }
-
-    public Matte getBackground() {
-        if (isBackgroundInherited()) {
-            return parentStyle == null ? null : parentStyle.getBackground();
-        } else {
-            return background;
-        }
-    }
-
-    public boolean isBackgroundInherited() {
-        return backgroundInherited;
-    }
-
-    public void setBackgroundInherited(boolean b) {
-        boolean old = isBackgroundInherited();
-        backgroundInherited = b;
-        firePropertyChange("backgroundInherited", old, b);
-
-        if (!backgroundInherited && background == null && parentStyle != null && parentStyle.getBackground() != null) {
-            background = parentStyle.getBackground().clone();
-            firePropertyChange("background", null, background);
-        }
-    }
-
-    public void setBackground(Matte background) {
-        Matte old = this.background;
-        if (old != null) old.removePropertyChangeListener(backgroundListener);
-        this.background = background;
-        if (this.background != null) this.background.addPropertyChangeListener(backgroundListener);
-        firePropertyChange("background", old, this.background);
-    }
-
-    public HintAlphaInterpolation getHintAlphaInterpolation() {
-        return hintAlphaInterpolation;
-    }
-
-    public void setHintAlphaInterpolation(HintAlphaInterpolation hintAlphaInterpolation) {
-        HintAlphaInterpolation old = getHintAlphaInterpolation();
-        this.hintAlphaInterpolation = hintAlphaInterpolation;
-        firePropertyChange("hintAlphaInterpolation", old, getHintAlphaInterpolation());
-    }
-
-    public HintAntialiasing getHintAntialiasing() {
-        return hintAntialiasing;
-    }
-
-    public void setHintAntialiasing(HintAntialiasing hintAntialiasing) {
-        HintAntialiasing old = getHintAntialiasing();
-        this.hintAntialiasing = hintAntialiasing;
-        firePropertyChange("hintAntialiasing", old, getHintAntialiasing());
-    }
-
-    public HintColorRendering getHintColorRendering() {
-        return hintColorRendering;
-    }
-
-    public void setHintColorRendering(HintColorRendering hintColorRendering) {
-        HintColorRendering old = getHintColorRendering();
-        this.hintColorRendering = hintColorRendering;
-        firePropertyChange("hintColorRendering", old, getHintColorRendering());
-    }
-
-    public HintDithering getHintDithering() {
-        return hintDithering;
-    }
-
-    public void setHintDithering(HintDithering hintDithering) {
-        HintDithering old = getHintDithering();
-        this.hintDithering = hintDithering;
-        firePropertyChange("hintDithering", old, getHintDithering());
-    }
-
-    public HintFractionalMetrics getHintFractionalMetrics() {
-        return hintFractionalMetrics;
-    }
-
-    public void setHintFractionalMetrics(HintFractionalMetrics hintFractionalMetrics) {
-        HintFractionalMetrics old = getHintFractionalMetrics();
-        this.hintFractionalMetrics = hintFractionalMetrics;
-        firePropertyChange("hintFractionalMetrics", old, getHintFractionalMetrics());
-    }
-
-    public HintInterpolation getHintInterpolation() {
-        return hintInterpolation;
-    }
-
-    public void setHintInterpolation(HintInterpolation hintInterpolation) {
-        HintInterpolation old = getHintInterpolation();
-        this.hintInterpolation = hintInterpolation;
-        firePropertyChange("hintInterpolation", old, getHintInterpolation());
-    }
-
-    public HintRendering getHintRendering() {
-        return hintRendering;
-    }
-
-    public void setHintRendering(HintRendering hintRendering) {
-        HintRendering old = getHintRendering();
-        this.hintRendering = hintRendering;
-        firePropertyChange("hintRendering", old, getHintRendering());
-    }
-
-    public HintStrokeControl getHintStrokeControl() {
-        return hintStrokeControl;
-    }
-
-    public void setHintStrokeControl(HintStrokeControl hintStrokeControl) {
-        HintStrokeControl old = getHintStrokeControl();
-        this.hintStrokeControl = hintStrokeControl;
-        firePropertyChange("hintStrokeControl", old, getHintStrokeControl());
-    }
-
-    public HintTextAntialiasing getHintTextAntialiasing() {
-        return hintTextAntialiasing;
-    }
-
-    public void setHintTextAntialiasing(HintTextAntialiasing hintTextAntialiasing) {
-        HintTextAntialiasing old = getHintTextAntialiasing();
-        this.hintTextAntialiasing = hintTextAntialiasing;
-        firePropertyChange("hintTextAntialiasing", old, getHintTextAntialiasing());
-    }
-
-    public boolean isCacheSettingsInherited() {
-        return cacheSettingsInherited;
-    }
-
-    public void setCacheSettingsInherited(boolean cacheSettingsInherited) {
-        boolean old = isCacheSettingsInherited();
-        this.cacheSettingsInherited = cacheSettingsInherited;
-        firePropertyChange("cacheSettingsInherited", old, isCacheSettingsInherited());
-    }
-
-    public CacheMode getCacheMode() {
-        if (isCacheSettingsInherited()) {
-            return (parentStyle == null)?CacheMode.FIXED_SIZES : parentStyle.getCacheMode();
-        } else {
-            return cacheMode;
-        }
-    }
-
-    public void setCacheMode(CacheMode cacheMode) {
-        CacheMode old = this.cacheMode;
-        this.cacheMode = cacheMode;
-        if (isCacheSettingsInherited()) {
-            setCacheSettingsInherited(false);
-            UIStyle parent = getParentStyle();
-            setMaxHozCachedImgScaling(parent == null ? 1 : parent.getMaxHozCachedImgScaling());
-            setMaxVertCachedImgScaling(parent == null ? 1 : parent.getMaxVertCachedImgScaling());
-        }
-        firePropertyChange("cacheMode",old,cacheMode);
-    }
-
-    public double getMaxHozCachedImgScaling() {
-        if (isCacheSettingsInherited()) {
-            return parentStyle == null ? 1 : parentStyle.getMaxHozCachedImgScaling();
-        } else {
-            return maxHozCachedImgScaling;
-        }
-    }
-
-    public void setMaxHozCachedImgScaling(double maxHozCachedImgScaling) {
-        double old = getMaxHozCachedImgScaling();
-        this.maxHozCachedImgScaling = maxHozCachedImgScaling;
-        if (isCacheSettingsInherited()) {
-            setCacheSettingsInherited(false);
-            setCacheMode((parentStyle == null)?CacheMode.FIXED_SIZES : parentStyle.getCacheMode());
-            setMaxVertCachedImgScaling(parentStyle == null ? 1 : parentStyle.getMaxVertCachedImgScaling());
-        }
-        firePropertyChange("maxHozCachedImgScaling", old, getMaxHozCachedImgScaling());
-    }
-
-    public double getMaxVertCachedImgScaling() {
-        if (isCacheSettingsInherited()) {
-            return parentStyle == null ? 1 : parentStyle.getMaxVertCachedImgScaling();
-        } else {
-            return maxVertCachedImgScaling;
-        }
-    }
-
-    public void setMaxVertCachedImgScaling(double maxVertCachedImgScaling) {
-        double old = getMaxVertCachedImgScaling();
-        this.maxVertCachedImgScaling = maxVertCachedImgScaling;
-        if (isCacheSettingsInherited()) {
-            setCacheSettingsInherited(false);
-            setCacheMode((parentStyle == null)?CacheMode.FIXED_SIZES : parentStyle.getCacheMode());
-            setMaxHozCachedImgScaling(parentStyle == null ? 1 : parentStyle.getMaxHozCachedImgScaling());
-        }
-        firePropertyChange("maxVertCachedImgScaling", old, getMaxVertCachedImgScaling());
-    }
-}
-
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/BorderMapper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/BorderMapper.java
deleted file mode 100644
index da35f401bc4..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/BorderMapper.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel.jibxhelpers;
-
-import org.jibx.runtime.IMarshaller;
-import org.jibx.runtime.IUnmarshaller;
-import org.jibx.runtime.IAliasable;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.UnmarshallingContext;
-import org.jdesktop.swingx.designer.jibxhelpers.ColorMapper;
-
-import javax.swing.border.LineBorder;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.EtchedBorder;
-import javax.swing.border.BevelBorder;
-import javax.swing.border.MatteBorder;
-import javax.swing.border.CompoundBorder;
-import javax.swing.border.Border;
-import javax.swing.BorderFactory;
-import java.awt.Insets;
-import java.awt.Color;
-import org.jdesktop.synthdesigner.synthmodel.PainterBorder;
-
-/**
- * BorderMapper - JIBX xml mapper for swing standard borders
- *
- * @author Jasper Potts
- */
-public class BorderMapper implements IMarshaller, IUnmarshaller, IAliasable {
-    private static enum BorderType {
-        empty, line, etched, bevel, matte, compound, painter
-    }
-    private static enum SubType {
-        raised(EtchedBorder.RAISED), lowered(EtchedBorder.LOWERED);
-        private int subtype;
-
-        SubType(int type) {
-            this.subtype = type;
-        }
-
-        public int getSubType() {
-            return subtype;
-        }
-    }
-    private static final String ELEMENT_NAME = "border";
-    private static final String TYPE_NAME = "type";
-    private static final String SUB_TYPE_NAME = "subtype";
-    private static final String TOP_NAME = "top";
-    private static final String BOTTOM_NAME = "bottom";
-    private static final String LEFT_NAME = "left";
-    private static final String RIGHT_NAME = "right";
-    private static final String THICKNESS_NAME = "thickness";
-    private static final String INSIDE_NAME = "inside";
-    private static final String OUTSIDE_NAME = "outside";
-    private static final String PAINTER_NAME = "painter";
-
-    private String uri;
-    private int index;
-    private String name;
-
-    public BorderMapper() {
-        uri = null;
-        index = 0;
-        name = ELEMENT_NAME;
-    }
-
-    public BorderMapper(String uri, int index, String name) {
-        this.uri = uri;
-        this.index = index;
-        this.name = name;
-    }
-
-    public boolean isExtension(int i) {
-        return false;
-    }
-
-    public boolean isPresent(IUnmarshallingContext iUnmarshallingContext) throws
-            JiBXException {
-        return iUnmarshallingContext.isAt(uri, ELEMENT_NAME);
-    }
-
-    public void marshal(Object object, IMarshallingContext iMarshallingContext)
-            throws JiBXException {
-        if (!(iMarshallingContext instanceof MarshallingContext)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else {
-            MarshallingContext ctx = (MarshallingContext) iMarshallingContext;
-            if (object instanceof PainterBorder) {
-                PainterBorder border = (PainterBorder) object;
-                Insets insets = border.getBorderInsets();
-                ctx.startTagAttributes(index, name)
-                        .attribute(index, TYPE_NAME, BorderType.painter.toString())
-                        .attribute(index, PAINTER_NAME, border.getPainterName())
-                        .attribute(index, TOP_NAME, insets.top)
-                        .attribute(index, BOTTOM_NAME, insets.bottom)
-                        .attribute(index, LEFT_NAME, insets.left)
-                        .attribute(index, RIGHT_NAME, insets.right)
-                        .closeStartContent();
-                ctx.endTag(index, name);
-            } else if (object instanceof EmptyBorder) {
-                Insets insets = ((EmptyBorder) object).getBorderInsets();
-                ctx.startTagAttributes(index, name)
-                        .attribute(index, TYPE_NAME,
-                                BorderType.empty.toString())
-                        .attribute(index, TOP_NAME, insets.top)
-                        .attribute(index, BOTTOM_NAME, insets.bottom)
-                        .attribute(index, LEFT_NAME, insets.left)
-                        .attribute(index, RIGHT_NAME, insets.right)
-                        .closeStartEmpty();
-            } else if (object instanceof LineBorder) {
-                LineBorder border = (LineBorder) object;
-                ctx.startTagAttributes(index, name).
-                        attribute(index, TYPE_NAME, BorderType.line.toString()).
-                        attribute(index, THICKNESS_NAME, border.getThickness()).
-                        closeStartContent();
-                new ColorMapper().marshal(border.getLineColor(), ctx);
-                ctx.endTag(index, name);
-            } else if (object instanceof EtchedBorder) {
-                EtchedBorder border = (EtchedBorder) object;
-                ctx.startTagAttributes(index, name).
-                        attribute(index, TYPE_NAME,
-                                BorderType.etched.toString()).
-                        attribute(index, SUB_TYPE_NAME,
-                                border.getEtchType()==EtchedBorder.RAISED?
-                                        SubType.raised.toString():
-                                        SubType.lowered.toString()).
-                        closeStartContent();
-                new ColorMapper().marshal(border.getHighlightColor(), ctx);
-                new ColorMapper().marshal(border.getShadowColor(), ctx);
-                ctx.endTag(index, name);
-            } else if (object instanceof BevelBorder) {
-                BevelBorder border = (BevelBorder) object;
-                ctx.startTagAttributes(index, name).
-                        attribute(index, TYPE_NAME,
-                                BorderType.bevel.toString()).
-                        attribute(index, SUB_TYPE_NAME,
-                                border.getBevelType()==BevelBorder.RAISED?
-                                        SubType.raised.toString():
-                                        SubType.lowered.toString()).
-                        closeStartContent();
-                new ColorMapper().marshal(border.getHighlightInnerColor(), ctx);
-                new ColorMapper().marshal(border.getHighlightOuterColor(), ctx);
-                new ColorMapper().marshal(border.getShadowInnerColor(), ctx);
-                new ColorMapper().marshal(border.getHighlightOuterColor(), ctx);
-                ctx.endTag(index, name);
-            } else if (object instanceof MatteBorder) {
-                MatteBorder border = (MatteBorder) object;
-                Insets insets = ((EmptyBorder) object).getBorderInsets();
-                ctx.startTagAttributes(index, name)
-                        .attribute(index, TYPE_NAME,
-                                BorderType.matte.toString())
-                        .attribute(index, TOP_NAME, insets.top)
-                        .attribute(index, BOTTOM_NAME, insets.bottom)
-                        .attribute(index, LEFT_NAME, insets.left)
-                        .attribute(index, RIGHT_NAME, insets.right)
-                        .closeStartContent();
-                new ColorMapper().marshal(border.getMatteColor(), ctx);
-                // todo: we should support tiled icons here to be 100% complete
-                ctx.endTag(index, name);
-            } else if (object instanceof CompoundBorder) {
-                CompoundBorder border = (CompoundBorder) object;
-                ctx.startTagAttributes(index, name)
-                        .attribute(index, TYPE_NAME,
-                                BorderType.compound.toString())
-                        .closeStartContent();
-                new BorderMapper(null,0, INSIDE_NAME).marshal(border.getInsideBorder(),ctx);
-                new BorderMapper(null,0, OUTSIDE_NAME).marshal(border.getOutsideBorder(),ctx);
-                ctx.endTag(index, name);
-            } else {
-                throw new JiBXException("Invalid object type for marshaller");
-            }
-        }
-    }
-
-    public Object unmarshal(Object object,
-                            IUnmarshallingContext iUnmarshallingContext)
-            throws JiBXException {
-        Border border = null;
-        // make sure we're at the appropriate start tag
-        UnmarshallingContext ctx = (UnmarshallingContext) iUnmarshallingContext;
-        if (!ctx.isAt(uri, name)) {
-            ctx.throwStartTagNameError(uri, name);
-        }
-        // get type
-        BorderType type = BorderType.valueOf(ctx.attributeText(uri, TYPE_NAME)
-                .toLowerCase());
-        int top,bottom,left,right;
-        Color color;
-        switch(type){
-            case empty:
-                top = ctx.attributeInt(uri, TOP_NAME, index);
-                bottom = ctx.attributeInt(uri, BOTTOM_NAME, index);
-                left = ctx.attributeInt(uri, LEFT_NAME, index);
-                right = ctx.attributeInt(uri, RIGHT_NAME, index);
-                border = BorderFactory.createEmptyBorder(top,left,bottom,right);
-                break;
-            case line:
-                int thickness = ctx.attributeInt(uri, THICKNESS_NAME, index);
-                ctx.parsePastStartTag(uri,name);
-                color = (Color)new ColorMapper().unmarshal(null,ctx);
-                border = BorderFactory.createLineBorder(color,thickness);
-                break;
-            case etched:
-                SubType etchedType = SubType.valueOf(
-                        ctx.attributeText(uri, SUB_TYPE_NAME).toLowerCase());
-                ctx.parsePastStartTag(uri,name);
-                Color highColor = (Color)new ColorMapper()
-                        .unmarshal(null,ctx);
-                Color shadowColor = (Color)new ColorMapper()
-                        .unmarshal(null,ctx);
-                border = BorderFactory.createEtchedBorder(
-                        etchedType.getSubType(),highColor,shadowColor);
-                break;
-            case bevel:
-                SubType bevelType = SubType.valueOf(
-                        ctx.attributeText(uri, SUB_TYPE_NAME).toLowerCase());
-                ctx.parsePastStartTag(uri,name);
-                Color innerHighColor = (Color)new ColorMapper()
-                        .unmarshal(null,ctx);
-                Color outerHighColor = (Color)new ColorMapper()
-                        .unmarshal(null,ctx);
-                Color innerShadowColor = (Color)new ColorMapper()
-                        .unmarshal(null,ctx);
-                Color outerShadowColor = (Color)new ColorMapper()
-                        .unmarshal(null,ctx);
-                border = BorderFactory.createBevelBorder(
-                        bevelType.getSubType(),outerHighColor,innerHighColor,
-                        outerShadowColor,innerShadowColor);
-                break;
-            case matte:
-                top = ctx.attributeInt(uri, TOP_NAME, index);
-                bottom = ctx.attributeInt(uri, BOTTOM_NAME, index);
-                left = ctx.attributeInt(uri, LEFT_NAME, index);
-                right = ctx.attributeInt(uri, RIGHT_NAME, index);
-                ctx.parsePastStartTag(uri,name);
-                color = (Color)new ColorMapper().unmarshal(null,ctx);
-                border = BorderFactory.createMatteBorder(top,left,bottom,right,
-                        color);
-                break;
-            case compound:
-                ctx.parsePastStartTag(uri,name);
-                Border inside = (Border) new BorderMapper(null,0, INSIDE_NAME)
-                        .unmarshal(null,ctx);
-                Border outside = (Border) new BorderMapper(null,0, OUTSIDE_NAME)
-                        .unmarshal(null,ctx);
-                border = BorderFactory.createCompoundBorder(outside, inside);
-                break;
-            case painter:
-                String painterName = ctx.attributeText(uri, PAINTER_NAME);
-                top = ctx.attributeInt(uri, TOP_NAME, index);
-                bottom = ctx.attributeInt(uri, BOTTOM_NAME, index);
-                left = ctx.attributeInt(uri, LEFT_NAME, index);
-                right = ctx.attributeInt(uri, RIGHT_NAME, index);
-                border = new PainterBorder(painterName, top, left, bottom, right);
-        }
-        ctx.parsePastEndTag(uri, name);
-        return border;
-    }
-}
-
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassMapper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassMapper.java
deleted file mode 100644
index 5d3d7650fbc..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassMapper.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel.jibxhelpers;
-
-import org.jibx.runtime.IMarshaller;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.IUnmarshaller;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.UnmarshallingContext;
-
-
-public class ClassMapper implements IMarshaller, IUnmarshaller {
-    private static final String ELEMENT_NAME = "type";
-
-    public boolean isExtension(int i) {
-        return false;
-    }
-
-    public boolean isPresent(IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        return iUnmarshallingContext.isAt(null, ELEMENT_NAME);
-    }
-
-    public void marshal(Object object, IMarshallingContext iMarshallingContext) throws JiBXException {
-        if (!(object instanceof Class)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else if (!(iMarshallingContext instanceof MarshallingContext)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else {
-            MarshallingContext ctx = (MarshallingContext) iMarshallingContext;
-            Class clazz = (Class) object;
-            ctx.startTagAttributes(0, ELEMENT_NAME).
-                    attribute(0, "value", clazz.getName()).
-                    closeStartEmpty();
-        }
-    }
-
-    public Object unmarshal(Object object, IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        // make sure we're at the appropriate start tag
-        UnmarshallingContext ctx = (UnmarshallingContext) iUnmarshallingContext;
-        if (!ctx.isAt(null, ELEMENT_NAME)) {
-            ctx.throwStartTagNameError(null, ELEMENT_NAME);
-        }
-        // get values
-        String value = ctx.attributeText(null, "value", null);
-        ctx.parsePastEndTag(null, ELEMENT_NAME);
-        // create
-        try {
-            return Class.forName(value);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java
deleted file mode 100644
index b815c0c4b97..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel.jibxhelpers;
-
-import org.jibx.runtime.IMarshaller;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.IUnmarshaller;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.UnmarshallingContext;
-
-import java.awt.Font;
-
-/**
- * FontMapper
- *
- * @author Created by Jasper Potts (Jun 8, 2007)
- */
-public class FontMapper implements IMarshaller, IUnmarshaller {
-    private static final String ELEMENT_NAME = "font";
-    private static final String FAMILY_NAME = "family";
-    private static final String STYLE_NAME = "style";
-    private static final String SIZE_NAME = "size";
-
-    public boolean isExtension(int i) {
-        return false;
-    }
-
-    public boolean isPresent(IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        return iUnmarshallingContext.isAt(null, ELEMENT_NAME);
-    }
-
-    public void marshal(Object object, IMarshallingContext iMarshallingContext) throws JiBXException {
-        if (!(object instanceof Font)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else if (!(iMarshallingContext instanceof MarshallingContext)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else {
-            MarshallingContext ctx = (MarshallingContext) iMarshallingContext;
-            Font font = (Font) object;
-            ctx.startTagAttributes(0, ELEMENT_NAME).
-                    attribute(0, FAMILY_NAME, font.getFamily()).
-                    attribute(0, STYLE_NAME, font.getStyle()).
-                    attribute(0, SIZE_NAME, font.getSize()).
-                    closeStartEmpty();
-        }
-    }
-
-    public Object unmarshal(Object object, IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        // make sure we're at the appropriate start tag
-        UnmarshallingContext ctx = (UnmarshallingContext) iUnmarshallingContext;
-        if (!ctx.isAt(null, ELEMENT_NAME)) {
-            ctx.throwStartTagNameError(null, ELEMENT_NAME);
-        }
-        // get values
-        String name = ctx.attributeText(null, FAMILY_NAME, null);
-        int style = ctx.attributeInt(null, STYLE_NAME, 0);
-        int size = ctx.attributeInt(null, SIZE_NAME, 0);
-        ctx.parsePastEndTag(null, ELEMENT_NAME);
-        // create
-        return new Font(name, style, size);
-    }
-}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/UIPropertyMapper.java b/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/UIPropertyMapper.java
deleted file mode 100644
index 002ab6b9def..00000000000
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/UIPropertyMapper.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright 2005-2006 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-package org.jdesktop.synthdesigner.synthmodel.jibxhelpers;
-
-import org.jdesktop.swingx.designer.jibxhelpers.DimensionMapper;
-import org.jdesktop.swingx.designer.jibxhelpers.InsetsMapper;
-import org.jdesktop.synthdesigner.synthmodel.UIProperty;
-import org.jibx.runtime.IMarshallable;
-import org.jibx.runtime.IMarshaller;
-import org.jibx.runtime.IMarshallingContext;
-import org.jibx.runtime.IUnmarshaller;
-import org.jibx.runtime.IUnmarshallingContext;
-import org.jibx.runtime.JiBXException;
-import org.jibx.runtime.impl.MarshallingContext;
-import org.jibx.runtime.impl.UnmarshallingContext;
-
-/**
- * UIPropertyMapper
- *
- * @author Created by Jasper Potts (Jul 10, 2007)
- */
-public class UIPropertyMapper implements IMarshaller, IUnmarshaller {
-    private static final String ELEMENT_NAME = "uiProperty";
-    private static final String NAME_NAME = "name";
-    private static final String TYPE_NAME = "type";
-    private static final String VALUE_NAME = "value";
-
-    public boolean isExtension(int i) {
-        return false;
-    }
-
-    public boolean isPresent(IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        return iUnmarshallingContext.isAt(null, ELEMENT_NAME);
-    }
-
-    public void marshal(Object object, IMarshallingContext iMarshallingContext) throws JiBXException {
-        if (!(object instanceof UIProperty)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else if (!(iMarshallingContext instanceof MarshallingContext)) {
-            throw new JiBXException("Invalid object type for marshaller");
-        } else {
-            MarshallingContext ctx = (MarshallingContext) iMarshallingContext;
-            UIProperty property = (UIProperty) object;
-            ctx.startTagAttributes(0, ELEMENT_NAME);
-            ctx.attribute(0, NAME_NAME, property.getName());
-            ctx.attribute(0, TYPE_NAME, property.getType().toString());
-            switch (property.getType()) {
-                case BOOLEAN:
-                case DOUBLE:
-                case INT:
-                case FLOAT:
-                case STRING:
-                    ctx.attribute(0, VALUE_NAME, property.getValue().toString());
-                    ctx.closeStartEmpty();
-                    break;
-                case INSETS:
-                    ctx.closeStartContent();
-                    new InsetsMapper().marshal(property.getValue(), ctx);
-                    ctx.endTag(0, ELEMENT_NAME);
-                    break;
-                case COLOR:
-                case FONT:
-                    ctx.closeStartContent();
-                    if (property.getValue() instanceof IMarshallable) {
-                        ((IMarshallable) property.getValue()).marshal(ctx);
-                    } else {
-                        throw new JiBXException("Mapped value is not marshallable");
-                    }
-                    ctx.endTag(0, ELEMENT_NAME);
-                    break;
-                case DIMENSION:
-                    ctx.closeStartContent();
-                    new DimensionMapper().marshal(property.getValue(), ctx);
-                    ctx.endTag(0, ELEMENT_NAME);
-                    break;
-                case BORDER:
-                    ctx.closeStartContent();
-                    new BorderMapper().marshal(property.getValue(), ctx);
-                    ctx.endTag(0, ELEMENT_NAME);
-                    break;
-            }
-        }
-    }
-
-    public Object unmarshal(Object object, IUnmarshallingContext iUnmarshallingContext) throws JiBXException {
-        // make sure we're at the appropriate start tag
-        UnmarshallingContext ctx = (UnmarshallingContext) iUnmarshallingContext;
-        if (!ctx.isAt(null, ELEMENT_NAME)) {
-            ctx.throwStartTagNameError(null, ELEMENT_NAME);
-        }
-        // get values
-        Object value = null;
-        String name = ctx.attributeText(null, NAME_NAME, null);
-        UIProperty.PropertyType type = UIProperty.PropertyType.valueOf(ctx.attributeText(null, TYPE_NAME, null));
-        switch (type) {
-            case BOOLEAN:
-                value = Boolean.parseBoolean(ctx.attributeText(null, VALUE_NAME, null));
-                break;
-            case DOUBLE:
-                value = Double.parseDouble(ctx.attributeText(null, VALUE_NAME, null));
-                break;
-            case INT:
-                value = Integer.parseInt(ctx.attributeText(null, VALUE_NAME, null));
-                break;
-            case FLOAT:
-                value = Float.parseFloat(ctx.attributeText(null, VALUE_NAME, null));
-                break;
-            case STRING:
-                value = ctx.attributeText(null, VALUE_NAME, null);
-                break;
-            case INSETS:
-                ctx.parsePastStartTag(null, ELEMENT_NAME);
-                value = new InsetsMapper().unmarshal(value, ctx);
-                break;
-            case COLOR:
-            case FONT:
-                ctx.parsePastStartTag(null, ELEMENT_NAME);
-                value = ctx.unmarshalElement();
-                break;
-            case DIMENSION:
-                ctx.parsePastStartTag(null, ELEMENT_NAME);
-                value = new DimensionMapper().unmarshal(value, ctx);
-                break;
-            case BORDER:
-                ctx.parsePastStartTag(null, ELEMENT_NAME);
-                value = new BorderMapper().unmarshal(value, ctx);
-                break;
-        }
-        ctx.parsePastEndTag(null, ELEMENT_NAME);
-        // create
-        return new UIProperty(name, type, value);
-    }
-}
diff --git a/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java b/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
index 3e1c37c2d57..5dda4dfa1a3 100644
--- a/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
+++ b/jdk/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java
@@ -48,12 +48,18 @@ public final class BeanInfoFinder
     }
 
     private static boolean isValid(Class<?> type, Method method) {
-        return (method != null) && type.equals(method.getDeclaringClass());
+        return (method != null) && method.getDeclaringClass().isAssignableFrom(type);
     }
 
     @Override
-    protected BeanInfo instantiate(Class<?> type, String name) {
-        BeanInfo info = super.instantiate(type, name);
+    protected BeanInfo instantiate(Class<?> type, String prefix, String name) {
+        // this optimization will only use the BeanInfo search path
+        // if is has changed from the original
+        // or trying to get the ComponentBeanInfo
+        BeanInfo info = !DEFAULT.equals(prefix) || "ComponentBeanInfo".equals(name)
+                ? super.instantiate(type, prefix, name)
+                : null;
+
         if (info != null) {
             // make sure that the returned BeanInfo matches the class
             BeanDescriptor bd = info.getBeanDescriptor();
@@ -89,14 +95,4 @@ public final class BeanInfoFinder
         }
         return null;
     }
-
-    @Override
-    protected BeanInfo instantiate(Class<?> type, String prefix, String name) {
-        // this optimization will only use the BeanInfo search path
-        // if is has changed from the original
-        // or trying to get the ComponentBeanInfo
-        return !DEFAULT.equals(prefix) || "ComponentBeanInfo".equals(name)
-                ? super.instantiate(type, prefix, name)
-                : null;
-    }
 }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/AESCipher.java
index 1809f6d82ae..1d58e21edd0 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/AESCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/AESCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  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
@@ -56,12 +56,8 @@ public final class AESCipher extends CipherSpi {
     /**
      * Creates an instance of AES cipher with default ECB mode and
      * PKCS5Padding.
-     *
-     * @exception SecurityException if this constructor fails to verify
-     * its own integrity
      */
     public AESCipher() {
-        SunJCE.ensureIntegrity(getClass());
         core = new CipherCore(new AESCrypt(), AESConstants.AES_BLOCK_SIZE);
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
index d6a715d8e55..83cf3223d75 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  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
@@ -48,16 +48,9 @@ public final class AESKeyGenerator extends KeyGeneratorSpi {
     private int keySize = 16; // default keysize (in number of bytes)
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor.
      */
     public AESKeyGenerator() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java
index 5bdcb135442..501e2b69936 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  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
@@ -65,12 +65,8 @@ public final class AESWrapCipher extends CipherSpi {
     /**
      * Creates an instance of AES KeyWrap cipher with default
      * mode, i.e. "ECB" and padding scheme, i.e. "NoPadding".
-     *
-     * @exception SecurityException if this constructor fails to verify
-     * its own integrity
      */
     public AESWrapCipher() {
-        SunJCE.ensureIntegrity(getClass());
         cipher = new AESCrypt();
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
index 5876a45dbb3..62affa324b6 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -62,7 +62,6 @@ public final class ARCFOURCipher extends CipherSpi {
 
     // called by the JCE framework
     public ARCFOURCipher() {
-        SunJCE.ensureIntegrity(getClass());
         S = new int[256];
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java
index 2b5f0fb7300..14d049f8037 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -60,12 +60,8 @@ public final class BlowfishCipher extends CipherSpi {
     /**
      * Creates an instance of Blowfish cipher with default ECB mode and
      * PKCS5Padding.
-     *
-     * @exception SecurityException if this constructor fails to verify
-     * its own integrity
      */
     public BlowfishCipher() {
-        SunJCE.ensureIntegrity(getClass());
         core = new CipherCore(new BlowfishCrypt(),
                               BlowfishConstants.BLOWFISH_BLOCK_SIZE);
     }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java
index 2d8fb85c420..96a2c7186e3 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/BlowfishKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -46,16 +46,9 @@ public final class BlowfishKeyGenerator extends KeyGeneratorSpi {
     private int keysize = 16; // default keysize (in number of bytes)
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public BlowfishKeyGenerator() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/DESCipher.java
index 07ddf318ff2..30f36f3b982 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DESCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DESCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -56,12 +56,8 @@ public final class DESCipher extends CipherSpi {
     /**
      * Creates an instance of DES cipher with default ECB mode and
      * PKCS5Padding.
-     *
-     * @exception SecurityException if this constructor fails to verify
-     * its own integrity
      */
     public DESCipher() {
-        SunJCE.ensureIntegrity(getClass());
         core = new CipherCore(new DESCrypt(), DESConstants.DES_BLOCK_SIZE);
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java b/jdk/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java
index 3ffa89d996c..968d6f78f43 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -42,17 +42,11 @@ import java.security.spec.InvalidKeySpecException;
 public final class DESKeyFactory extends SecretKeyFactorySpi {
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public DESKeyFactory() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
     }
+
     /**
      * Generates a <code>SecretKey</code> object from the provided key
      * specification (key material).
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java
index 2a7ac8e0771..cd028d4ac73 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -46,16 +46,9 @@ public final class DESKeyGenerator extends KeyGeneratorSpi {
     private SecureRandom random = null;
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public DESKeyGenerator() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/DESedeCipher.java
index 1514f44eddb..394a784215a 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DESedeCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DESedeCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -53,12 +53,8 @@ public final class DESedeCipher extends CipherSpi {
     /**
      * Creates an instance of DESede cipher with default ECB mode and
      * PKCS5Padding.
-     *
-     * @exception SecurityException if this constructor fails to verify
-     * its own integrity
      */
     public DESedeCipher() {
-        SunJCE.ensureIntegrity(getClass());
         core = new CipherCore(new DESedeCrypt(), DESConstants.DES_BLOCK_SIZE);
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java b/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java
index 831ca8cd7ad..fcd619b7af6 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -42,16 +42,9 @@ import java.security.spec.InvalidKeySpecException;
 public final class DESedeKeyFactory extends SecretKeyFactorySpi {
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public DESedeKeyFactory() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have been " +
-                                        "tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java
index 439c8facc91..333375e3edb 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -47,16 +47,9 @@ public final class DESedeKeyGenerator extends KeyGeneratorSpi {
     private int keysize = 168;
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public DESedeKeyGenerator() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have been " +
-                                        "tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
index 48cbb1edbc3..c3a36d1e9ce 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2004-2009 Sun Microsystems, Inc.  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
@@ -74,12 +74,8 @@ public final class DESedeWrapCipher extends CipherSpi {
     /**
      * Creates an instance of CMS DESede KeyWrap cipher with default
      * mode, i.e. "CBC" and padding scheme, i.e. "NoPadding".
-     *
-     * @exception SecurityException if this constructor fails to verify
-     * its own integrity.
      */
     public DESedeWrapCipher() {
-        SunJCE.ensureIntegrity(getClass());
         cipher = new CipherBlockChaining(new DESedeCrypt());
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java b/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
index 30bec726117..e2a3cf08daf 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -58,16 +58,9 @@ extends KeyAgreementSpi {
     private BigInteger y = BigInteger.ZERO;
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public DHKeyAgreement() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have been " +
-                                        "tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java b/jdk/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java
index e7c5f53b4d4..01a449c6a2f 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -49,16 +49,9 @@ import javax.crypto.spec.DHParameterSpec;
 public final class DHKeyFactory extends KeyFactorySpi {
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public DHKeyFactory() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java b/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java
index 9950d112ff1..87d9e04bc0e 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/HmacCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  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
@@ -241,7 +241,6 @@ final class HmacCore implements Cloneable {
     public static final class HmacSHA256 extends MacSpi implements Cloneable {
         private final HmacCore core;
         public HmacSHA256() throws NoSuchAlgorithmException {
-            SunJCE.ensureIntegrity(getClass());
             core = new HmacCore("SHA-256", 64);
         }
         private HmacSHA256(HmacSHA256 base) throws CloneNotSupportedException {
@@ -278,7 +277,6 @@ final class HmacCore implements Cloneable {
     public static final class HmacSHA384 extends MacSpi implements Cloneable {
         private final HmacCore core;
         public HmacSHA384() throws NoSuchAlgorithmException {
-            SunJCE.ensureIntegrity(getClass());
             core = new HmacCore("SHA-384", 128);
         }
         private HmacSHA384(HmacSHA384 base) throws CloneNotSupportedException {
@@ -315,7 +313,6 @@ final class HmacCore implements Cloneable {
     public static final class HmacSHA512 extends MacSpi implements Cloneable {
         private final HmacCore core;
         public HmacSHA512() throws NoSuchAlgorithmException {
-            SunJCE.ensureIntegrity(getClass());
             core = new HmacCore("SHA-512", 128);
         }
         private HmacSHA512(HmacSHA512 base) throws CloneNotSupportedException {
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5.java b/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5.java
index 26e76389d4f..ce3793c917a 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -44,16 +44,8 @@ public final class HmacMD5 extends MacSpi implements Cloneable {
 
     /**
      * Standard constructor, creates a new HmacMD5 instance.
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
      */
     public HmacMD5() throws NoSuchAlgorithmException {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
         hmac = new HmacCore(MessageDigest.getInstance("MD5"),
                             MD5_BLOCK_LENGTH);
     }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
index c1b65264571..1f73f32c7e9 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  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
@@ -46,16 +46,9 @@ public final class HmacMD5KeyGenerator extends KeyGeneratorSpi {
     private int keysize = 64; // default keysize (in number of bytes)
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public HmacMD5KeyGenerator() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java b/jdk/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java
index 150477c5ea1..4508c242e96 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -48,13 +48,8 @@ public final class HmacPKCS12PBESHA1 extends MacSpi implements Cloneable {
 
     /**
      * Standard constructor, creates a new HmacSHA1 instance.
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
      */
     public HmacPKCS12PBESHA1() throws NoSuchAlgorithmException {
-        SunJCE.ensureIntegrity(this.getClass());
         this.hmac = new HmacCore(MessageDigest.getInstance("SHA1"),
                                  SHA1_BLOCK_LENGTH);
     }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1.java b/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1.java
index 1421e855b9b..0b4bea2c7f7 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -44,16 +44,8 @@ public final class HmacSHA1 extends MacSpi implements Cloneable {
 
     /**
      * Standard constructor, creates a new HmacSHA1 instance.
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
      */
     public HmacSHA1() throws NoSuchAlgorithmException {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
         this.hmac = new HmacCore(MessageDigest.getInstance("SHA1"),
                                  SHA1_BLOCK_LENGTH);
     }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
index 561e4f1593c..2bf214280ce 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  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
@@ -46,16 +46,9 @@ public final class HmacSHA1KeyGenerator extends KeyGeneratorSpi {
     private int keysize = 64; // default keysize (in number of bytes)
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public HmacSHA1KeyGenerator() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/JarVerifier.java b/jdk/src/share/classes/com/sun/crypto/provider/JarVerifier.java
deleted file mode 100644
index ea5f856955a..00000000000
--- a/jdk/src/share/classes/com/sun/crypto/provider/JarVerifier.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package com.sun.crypto.provider;
-
-// NOTE: this class is duplicated amongst SunJCE, SunPKCS11, and SunMSCAPI.
-// All files should be kept in sync.
-
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.net.URL;
-import java.net.JarURLConnection;
-import java.net.MalformedURLException;
-
-import java.security.*;
-import java.security.cert.*;
-import java.security.cert.Certificate;
-
-/**
- * This class verifies JAR files (and any supporting JAR files), and
- * determines whether they may be used in this implementation.
- *
- * The JCE in OpenJDK has an open cryptographic interface, meaning it
- * does not restrict which providers can be used.  Compliance with
- * United States export controls and with local law governing the
- * import/export of products incorporating the JCE in the OpenJDK is
- * the responsibility of the licensee.
- *
- * @since 1.7
- */
-final class JarVerifier {
-
-    private static final boolean debug = false;
-
-    /**
-     * Verify the JAR file is signed by an entity which has a certificate
-     * issued by a trusted CA.
-     *
-     * Note: this is a temporary method and will change soon to use the
-     * exception chaining mechanism, which can provide more details
-     * as to why the verification failed.
-     *
-     * @param c the class to be verified.
-     * @return true if verification is successful.
-     */
-    static boolean verify(final Class c) {
-        return true;
-    }
-}
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java b/jdk/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java
index 242db61d83f..6864dad5f7b 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -109,7 +109,6 @@ final class KeyGeneratorCore {
     public static final class HmacSHA256KG extends KeyGeneratorSpi {
         private final KeyGeneratorCore core;
         public HmacSHA256KG() {
-            SunJCE.ensureIntegrity(getClass());
             core = new KeyGeneratorCore("HmacSHA256", 256);
         }
         protected void engineInit(SecureRandom random) {
@@ -131,7 +130,6 @@ final class KeyGeneratorCore {
     public static final class HmacSHA384KG extends KeyGeneratorSpi {
         private final KeyGeneratorCore core;
         public HmacSHA384KG() {
-            SunJCE.ensureIntegrity(getClass());
             core = new KeyGeneratorCore("HmacSHA384", 384);
         }
         protected void engineInit(SecureRandom random) {
@@ -153,7 +151,6 @@ final class KeyGeneratorCore {
     public static final class HmacSHA512KG extends KeyGeneratorSpi {
         private final KeyGeneratorCore core;
         public HmacSHA512KG() {
-            SunJCE.ensureIntegrity(getClass());
             core = new KeyGeneratorCore("HmacSHA512", 512);
         }
         protected void engineInit(SecureRandom random) {
@@ -175,7 +172,6 @@ final class KeyGeneratorCore {
     public static final class RC2KeyGenerator extends KeyGeneratorSpi {
         private final KeyGeneratorCore core;
         public RC2KeyGenerator() {
-            SunJCE.ensureIntegrity(getClass());
             core = new KeyGeneratorCore("RC2", 128);
         }
         protected void engineInit(SecureRandom random) {
@@ -201,7 +197,6 @@ final class KeyGeneratorCore {
     public static final class ARCFOURKeyGenerator extends KeyGeneratorSpi {
         private final KeyGeneratorCore core;
         public ARCFOURKeyGenerator() {
-            SunJCE.ensureIntegrity(getClass());
             core = new KeyGeneratorCore("ARCFOUR", 128);
         }
         protected void engineInit(SecureRandom random) {
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java b/jdk/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java
index 23478f8fc0e..f86dad561bf 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -49,16 +49,9 @@ abstract class PBEKeyFactory extends SecretKeyFactorySpi {
     private static HashSet<String> validTypes;
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Simple constructor
      */
     private PBEKeyFactory(String keytype) {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
         type = keytype;
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java
index 1bf6d6f89e2..8eec23d3998 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -55,16 +55,9 @@ public final class PBEWithMD5AndDESCipher extends CipherSpi {
      * unavailable
      * @exception NoSuchPaddingException if the required padding mechanism
      * (PKCS5Padding) is unavailable
-     *
-     * @exception SecurityException if this constructor fails to verify
-     * its own integrity
      */
     public PBEWithMD5AndDESCipher()
         throws NoSuchAlgorithmException, NoSuchPaddingException {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
         core = new PBECipherCore("DES");
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java b/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java
index 7af04b6d810..c121bd12bfc 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -61,23 +61,14 @@ public final class PBEWithMD5AndTripleDESCipher extends CipherSpi {
      * Creates an instance of this cipher, and initializes its mode (CBC) and
      * padding (PKCS5).
      *
-     * Verify the SunJCE provider in the constructor.
-     *
      * @exception NoSuchAlgorithmException if the required cipher mode (CBC) is
      * unavailable
      * @exception NoSuchPaddingException if the required padding mechanism
      * (PKCS5Padding) is unavailable
-     * @exception SecurityException if fails to verify
-     * its own integrity
      */
     public PBEWithMD5AndTripleDESCipher()
         throws NoSuchAlgorithmException, NoSuchPaddingException
     {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
-
         // set the encapsulated cipher to do triple DES
         core = new PBECipherCore("DESede");
     }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java b/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java
index 9ba53036a5e..205e38cf729 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -45,16 +45,9 @@ import javax.crypto.spec.SecretKeySpec;
 public final class PBKDF2HmacSHA1Factory extends SecretKeyFactorySpi {
 
     /**
-     * Verify the SunJCE provider in the constructor.
-     *
-     * @exception SecurityException if fails to verify
-     * its own integrity
+     * Empty constructor
      */
     public PBKDF2HmacSHA1Factory() {
-        if (!SunJCE.verifySelfIntegrity(this.getClass())) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
     }
 
     /**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java b/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java
index 277a7b30045..ba7e7fec4f2 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -370,7 +370,6 @@ final class PKCS12PBECipherCore {
     public static final class PBEWithSHA1AndDESede extends CipherSpi {
         private final PKCS12PBECipherCore core;
         public PBEWithSHA1AndDESede() throws NoSuchAlgorithmException {
-            SunJCE.ensureIntegrity(this.getClass());
             core = new PKCS12PBECipherCore("DESede", 24);
         }
         protected byte[] engineDoFinal(byte[] in, int inOff, int inLen)
@@ -446,7 +445,6 @@ final class PKCS12PBECipherCore {
     public static final class PBEWithSHA1AndRC2_40 extends CipherSpi {
         private final PKCS12PBECipherCore core;
         public PBEWithSHA1AndRC2_40() throws NoSuchAlgorithmException {
-            SunJCE.ensureIntegrity(this.getClass());
             core = new PKCS12PBECipherCore("RC2", 5);
         }
         protected byte[] engineDoFinal(byte[] in, int inOff, int inLen)
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/RC2Cipher.java b/jdk/src/share/classes/com/sun/crypto/provider/RC2Cipher.java
index c96d07f726a..d119a0688cd 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/RC2Cipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/RC2Cipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -45,7 +45,6 @@ public final class RC2Cipher extends CipherSpi {
     private final RC2Crypt embeddedCipher;
 
     public RC2Cipher() {
-        SunJCE.ensureIntegrity(getClass());
         embeddedCipher = new RC2Crypt();
         core = new CipherCore(embeddedCipher, 8);
     }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java b/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java
index e5c6c019e0f..9f5179e3325 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/RSACipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -111,7 +111,6 @@ public final class RSACipher extends CipherSpi {
     private String oaepHashAlgorithm = "SHA-1";
 
     public RSACipher() {
-        SunJCE.ensureIntegrity(getClass());
         paddingType = PAD_PKCS1;
     }
 
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/SslMacCore.java b/jdk/src/share/classes/com/sun/crypto/provider/SslMacCore.java
index 7756e73ce77..8046a22ed71 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/SslMacCore.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/SslMacCore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -226,9 +226,6 @@ final class SslMacCore {
 
         static final byte[] md5Pad1 = genPad((byte)0x36, 48);
         static final byte[] md5Pad2 = genPad((byte)0x5c, 48);
-        static {
-            SunJCE.ensureIntegrity(SslMacMD5.class);
-        }
     }
 
     // nested static class for the SslMacMD5 implementation
@@ -262,9 +259,6 @@ final class SslMacCore {
 
         static final byte[] shaPad1 = genPad((byte)0x36, 40);
         static final byte[] shaPad2 = genPad((byte)0x5c, 40);
-        static {
-            SunJCE.ensureIntegrity(SslMacSHA1.class);
-        }
     }
 
 }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java b/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java
index 13691b0167b..af46b030a6f 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/SunJCE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -93,10 +93,6 @@ public final class SunJCE extends Provider {
 
     static final SecureRandom RANDOM = new SecureRandom();
 
-    // After the SunJCE passed self-integrity checking,
-    // verifiedSelfIntegrity will be set to true.
-    private static boolean verifiedSelfIntegrity = false;
-
     public SunJCE() {
         /* We are the "SunJCE" provider */
         super("SunJCE", 1.7d, info);
@@ -441,21 +437,4 @@ public final class SunJCE extends Provider {
             }
         });
     }
-
-    // set to true once self verification is complete
-    private static volatile boolean integrityVerified;
-
-    static void ensureIntegrity(Class c) {
-        if (verifySelfIntegrity(c) == false) {
-            throw new SecurityException("The SunJCE provider may have " +
-                                        "been tampered.");
-        }
-    }
-
-    static final boolean verifySelfIntegrity(Class c) {
-        if (verifiedSelfIntegrity) {
-            return true;
-        }
-        return (integrityVerified = JarVerifier.verify(c));
-    }
 }
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
index 260fdd8a946..8f27f74c6ee 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -52,7 +52,6 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
     private int protocolVersion;
 
     public TlsKeyMaterialGenerator() {
-        SunJCE.ensureIntegrity(getClass());
     }
 
     protected void engineInit(SecureRandom random) {
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java
index ad47dda2d32..d56c3b9afc6 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -51,7 +51,6 @@ public final class TlsMasterSecretGenerator extends KeyGeneratorSpi {
     private int protocolVersion;
 
     public TlsMasterSecretGenerator() {
-        SunJCE.ensureIntegrity(getClass());
     }
 
     protected void engineInit(SecureRandom random) {
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
index 5306a720fc5..f2c885f5a30 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -109,7 +109,6 @@ public final class TlsPrfGenerator extends KeyGeneratorSpi {
     private TlsPrfParameterSpec spec;
 
     public TlsPrfGenerator() {
-        SunJCE.ensureIntegrity(getClass());
     }
 
     protected void engineInit(SecureRandom random) {
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java
index 6986dec21ce..742d3e1bdfd 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -48,7 +48,6 @@ public final class TlsRsaPremasterSecretGenerator extends KeyGeneratorSpi {
     private SecureRandom random;
 
     public TlsRsaPremasterSecretGenerator() {
-        SunJCE.ensureIntegrity(getClass());
     }
 
     protected void engineInit(SecureRandom random) {
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
index 9cea55911f7..2966a4b883c 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java
@@ -51,7 +51,7 @@ public class BMPImageReaderSpi extends ImageReaderSpi {
               entensions,
               mimeType,
               "com.sun.imageio.plugins.bmp.BMPImageReader",
-              STANDARD_INPUT_TYPE,
+              new Class[] { ImageInputStream.class },
               writerSpiNames,
               false,
               null, null, null, null,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
index f5e322e01da..4ae73d4c897 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java
@@ -32,6 +32,7 @@ import java.awt.image.SinglePixelPackedSampleModel;
 import javax.imageio.spi.ImageWriterSpi;
 import javax.imageio.spi.ServiceRegistry;
 import javax.imageio.spi.IIORegistry;
+import javax.imageio.stream.ImageOutputStream;
 import javax.imageio.ImageWriter;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.IIOException;
@@ -55,7 +56,7 @@ public class BMPImageWriterSpi extends ImageWriterSpi {
               entensions,
               mimeType,
               "com.sun.imageio.plugins.bmp.BMPImageWriter",
-              STANDARD_OUTPUT_TYPE,
+              new Class[] { ImageOutputStream.class },
               readerSpiNames,
               false,
               null, null, null, null,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
index 0dc0a40a6d7..3832b1eb923 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java
@@ -60,7 +60,7 @@ public class GIFImageReaderSpi extends ImageReaderSpi {
               suffixes,
               MIMETypes,
               readerClassName,
-              STANDARD_INPUT_TYPE,
+              new Class[] { ImageInputStream.class },
               writerSpiNames,
               true,
               GIFStreamMetadata.nativeMetadataFormatName,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
index 796e3b2a458..42b81e4c8b8 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java
@@ -31,6 +31,7 @@ import java.util.Locale;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.ImageWriter;
 import javax.imageio.spi.ImageWriterSpi;
+import javax.imageio.stream.ImageOutputStream;
 import com.sun.imageio.plugins.common.PaletteBuilder;
 
 public class GIFImageWriterSpi extends ImageWriterSpi {
@@ -59,7 +60,7 @@ public class GIFImageWriterSpi extends ImageWriterSpi {
               suffixes,
               MIMETypes,
               writerClassName,
-              STANDARD_OUTPUT_TYPE,
+              new Class[] { ImageOutputStream.class },
               readerSpiNames,
               true,
               GIFWritableStreamMetadata.NATIVE_FORMAT_NAME,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
index 13327e3ea9c..25aabe32e90 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java
@@ -46,7 +46,7 @@ public class JPEGImageReaderSpi extends ImageReaderSpi {
               JPEG.suffixes,
               JPEG.MIMETypes,
               "com.sun.imageio.plugins.jpeg.JPEGImageReader",
-              STANDARD_INPUT_TYPE,
+              new Class[] { ImageInputStream.class },
               writerSpiNames,
               true,
               JPEG.nativeStreamMetadataFormatName,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
index 717b4360794..02fade632ed 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java
@@ -28,6 +28,7 @@ package com.sun.imageio.plugins.jpeg;
 import javax.imageio.spi.ImageWriterSpi;
 import javax.imageio.spi.ServiceRegistry;
 import javax.imageio.spi.IIORegistry;
+import javax.imageio.stream.ImageOutputStream;
 import javax.imageio.ImageWriter;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.IIOException;
@@ -49,7 +50,7 @@ public class JPEGImageWriterSpi extends ImageWriterSpi {
               JPEG.suffixes,
               JPEG.MIMETypes,
               "com.sun.imageio.plugins.jpeg.JPEGImageWriter",
-              STANDARD_OUTPUT_TYPE,
+              new Class[] { ImageOutputStream.class },
               readerSpiNames,
               true,
               JPEG.nativeStreamMetadataFormatName,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
index 44ee5b80101..6576b83df58 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java
@@ -60,7 +60,7 @@ public class PNGImageReaderSpi extends ImageReaderSpi {
               suffixes,
               MIMETypes,
               readerClassName,
-              STANDARD_INPUT_TYPE,
+              new Class[] { ImageInputStream.class },
               writerSpiNames,
               false,
               null, null,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
index 0dabd881816..4f69fcd70de 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java
@@ -34,6 +34,7 @@ import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.metadata.IIOMetadataFormat;
 import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.spi.ImageWriterSpi;
+import javax.imageio.stream.ImageOutputStream;
 
 public class PNGImageWriterSpi extends ImageWriterSpi {
 
@@ -61,7 +62,7 @@ public class PNGImageWriterSpi extends ImageWriterSpi {
                 suffixes,
                 MIMETypes,
                 writerClassName,
-                STANDARD_OUTPUT_TYPE,
+                new Class[] { ImageOutputStream.class },
                 readerSpiNames,
                 false,
                 null, null,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
index cb4f3bce205..98914dea5bf 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java
@@ -55,7 +55,7 @@ public class WBMPImageReaderSpi extends ImageReaderSpi {
               entensions,
               mimeType,
               "com.sun.imageio.plugins.wbmp.WBMPImageReader",
-              STANDARD_INPUT_TYPE,
+              new Class[] { ImageInputStream.class },
               writerSpiNames,
               true,
               null, null, null, null,
diff --git a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java b/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
index 1da8420dc32..82106f981f5 100644
--- a/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java
@@ -28,6 +28,7 @@ package com.sun.imageio.plugins.wbmp;
 import javax.imageio.spi.ImageWriterSpi;
 import javax.imageio.spi.ServiceRegistry;
 import javax.imageio.spi.IIORegistry;
+import javax.imageio.stream.ImageOutputStream;
 import javax.imageio.ImageWriter;
 import javax.imageio.ImageTypeSpecifier;
 import javax.imageio.IIOException;
@@ -54,7 +55,7 @@ public class WBMPImageWriterSpi extends ImageWriterSpi {
               entensions,
               mimeType,
               "com.sun.imageio.plugins.wbmp.WBMPImageWriter",
-              STANDARD_OUTPUT_TYPE,
+              new Class[] { ImageOutputStream.class },
               readerSpiNames,
               true,
               null, null, null, null,
diff --git a/jdk/src/share/classes/com/sun/imageio/stream/StreamCloser.java b/jdk/src/share/classes/com/sun/imageio/stream/StreamCloser.java
index 03c6ce32364..96e5646f782 100644
--- a/jdk/src/share/classes/com/sun/imageio/stream/StreamCloser.java
+++ b/jdk/src/share/classes/com/sun/imageio/stream/StreamCloser.java
@@ -43,35 +43,35 @@ import javax.imageio.stream.ImageInputStream;
  */
 public class StreamCloser {
 
-    private static WeakHashMap<ImageInputStream, Object> toCloseQueue;
+    private static WeakHashMap<CloseAction, Object> toCloseQueue;
     private static Thread streamCloser;
 
-    public static void addToQueue(ImageInputStream iis) {
+    public static void addToQueue(CloseAction ca) {
         synchronized (StreamCloser.class) {
             if (toCloseQueue == null) {
                 toCloseQueue =
-                    new WeakHashMap<ImageInputStream, Object>();
+                    new WeakHashMap<CloseAction, Object>();
             }
 
-            toCloseQueue.put(iis, null);
+            toCloseQueue.put(ca, null);
 
             if (streamCloser == null) {
                 final Runnable streamCloserRunnable = new Runnable() {
                     public void run() {
                         if (toCloseQueue != null) {
                             synchronized (StreamCloser.class) {
-                                Set<ImageInputStream> set =
+                                Set<CloseAction> set =
                                     toCloseQueue.keySet();
                                 // Make a copy of the set in order to avoid
                                 // concurrent modification (the is.close()
                                 // will in turn call removeFromQueue())
-                                ImageInputStream[] streams =
-                                    new ImageInputStream[set.size()];
-                                streams = set.toArray(streams);
-                                for (ImageInputStream is : streams) {
-                                    if (is != null) {
+                                CloseAction[] actions =
+                                    new CloseAction[set.size()];
+                                actions = set.toArray(actions);
+                                for (CloseAction ca : actions) {
+                                    if (ca != null) {
                                         try {
-                                            is.close();
+                                            ca.performAction();
                                         } catch (IOException e) {
                                         }
                                     }
@@ -106,10 +106,28 @@ public class StreamCloser {
         }
     }
 
-    public static void removeFromQueue(ImageInputStream iis) {
+    public static void removeFromQueue(CloseAction ca) {
         synchronized (StreamCloser.class) {
             if (toCloseQueue != null) {
-                toCloseQueue.remove(iis);
+                toCloseQueue.remove(ca);
+            }
+        }
+    }
+
+    public static CloseAction createCloseAction(ImageInputStream iis) {
+        return new CloseAction(iis);
+    }
+
+    public static final class CloseAction {
+        private ImageInputStream iis;
+
+        private CloseAction(ImageInputStream iis) {
+            this.iis = iis;
+        }
+
+        public void performAction() throws IOException {
+            if (iis != null) {
+                iis.close();
             }
         }
     }
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java
index 11807239c34..cfcf6194ec3 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc.  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
@@ -49,7 +49,7 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
     /**
      * ReferenceQueue of unreferenced WeakPCLs.
      */
-    private static ReferenceQueue<DesktopProperty> queue;
+    private static final ReferenceQueue<DesktopProperty> queue = new ReferenceQueue<DesktopProperty>();
 
     /**
      * PropertyChangeListener attached to the Toolkit.
@@ -58,7 +58,7 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
     /**
      * Key used to lookup value from desktop.
      */
-    private String key;
+    private final String key;
     /**
      * Value to return.
      */
@@ -66,17 +66,8 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
     /**
      * Fallback value in case we get null from desktop.
      */
-    private Object fallback;
+    private final Object fallback;
 
-    /**
-     * Toolkit.
-     */
-    private Toolkit toolkit;
-
-
-    static {
-        queue = new ReferenceQueue<DesktopProperty>();
-    }
 
     /**
      * Cleans up any lingering state held by unrefeernced
@@ -138,13 +129,10 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
      *
      * @param key Key used in looking up desktop value.
      * @param fallback Value used if desktop property is null.
-     * @param toolkit Toolkit used to fetch property from, can be null
-     *        in which default will be used.
      */
-    public DesktopProperty(String key, Object fallback, Toolkit toolkit) {
+    public DesktopProperty(String key, Object fallback) {
         this.key = key;
         this.fallback = fallback;
-        this.toolkit = toolkit;
         // The only sure fire way to clear our references is to create a
         // Thread and wait for a reference to be added to the queue.
         // Because it is so rare that you will actually change the look
@@ -175,13 +163,14 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
      * Returns the value from the desktop.
      */
     protected Object getValueFromDesktop() {
-        if (this.toolkit == null) {
-            this.toolkit = Toolkit.getDefaultToolkit();
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+
+        if (pcl == null) {
+            pcl = new WeakPCL(this, getKey(), UIManager.getLookAndFeel());
+            toolkit.addPropertyChangeListener(getKey(), pcl);
         }
-        Object value = toolkit.getDesktopProperty(getKey());
-        pcl = new WeakPCL(this, toolkit, getKey(), UIManager.getLookAndFeel());
-        toolkit.addPropertyChangeListener(getKey(), pcl);
-        return value;
+
+        return toolkit.getDesktopProperty(getKey());
     }
 
     /**
@@ -205,12 +194,7 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
      * <code>createValue</code> will ask for the property again.
      */
     public void invalidate() {
-        if (pcl != null) {
-            toolkit.removePropertyChangeListener(getKey(), pcl);
-            toolkit = null;
-            pcl = null;
-            value = null;
-        }
+        value = null;
     }
 
     /**
@@ -271,13 +255,11 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
      */
     private static class WeakPCL extends WeakReference<DesktopProperty>
                                implements PropertyChangeListener {
-        private Toolkit kit;
         private String key;
         private LookAndFeel laf;
 
-        WeakPCL(DesktopProperty target, Toolkit kit, String key, LookAndFeel laf) {
+        WeakPCL(DesktopProperty target, String key, LookAndFeel laf) {
             super(target, queue);
-            this.kit = kit;
             this.key = key;
             this.laf = laf;
         }
@@ -297,7 +279,7 @@ public class DesktopProperty implements UIDefaults.ActiveValue {
         }
 
         void dispose() {
-            kit.removePropertyChangeListener(key, this);
+            Toolkit.getDefaultToolkit().removePropertyChangeListener(key, this);
         }
     }
 }
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
index 79d06782e8b..f1657cc27c1 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -43,7 +43,6 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 
 import sun.awt.shell.ShellFolder;
-import sun.awt.OSInfo;
 import sun.swing.*;
 
 import javax.accessibility.*;
@@ -58,8 +57,6 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
     // The following are private because the implementation of the
     // Windows FileChooser L&F is not complete yet.
 
-    private static final OSInfo.WindowsVersion OS_VERSION = OSInfo.getWindowsVersion();
-
     private JPanel centerPanel;
 
     private JLabel lookInLabel;
@@ -118,18 +115,9 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
     private String upFolderToolTipText = null;
     private String upFolderAccessibleName = null;
 
-    private String homeFolderToolTipText = null;
-    private String homeFolderAccessibleName = null;
-
     private String newFolderToolTipText = null;
     private String newFolderAccessibleName = null;
 
-    private String listViewButtonToolTipText = null;
-    private String listViewButtonAccessibleName = null;
-
-    private String detailsViewButtonToolTipText = null;
-    private String detailsViewButtonAccessibleName = null;
-
     private String viewMenuButtonToolTipText = null;
     private String viewMenuButtonAccessibleName = null;
 
@@ -231,9 +219,7 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
         // Directory manipulation buttons
         JToolBar topPanel = new JToolBar();
         topPanel.setFloatable(false);
-        if (OS_VERSION.compareTo(OSInfo.WINDOWS_ME) >= 0) {
-            topPanel.putClientProperty("JToolBar.isRollover", Boolean.TRUE);
-        }
+        topPanel.putClientProperty("JToolBar.isRollover", Boolean.TRUE);
 
         // Add the top panel to the fileChooser
         fc.add(topPanel, BorderLayout.NORTH);
@@ -287,218 +273,103 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
         topPanel.add(Box.createRigidArea(hstrut10));
 
         // Up Button
-        JButton upFolderButton = new JButton(getChangeToParentDirectoryAction());
-        upFolderButton.setText(null);
-        upFolderButton.setIcon(upFolderIcon);
-        upFolderButton.setToolTipText(upFolderToolTipText);
-        upFolderButton.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY,
-                                         upFolderAccessibleName);
-        upFolderButton.putClientProperty(WindowsLookAndFeel.HI_RES_DISABLED_ICON_CLIENT_KEY,
-                                         Boolean.TRUE);
-        upFolderButton.setAlignmentX(JComponent.LEFT_ALIGNMENT);
-        upFolderButton.setAlignmentY(JComponent.CENTER_ALIGNMENT);
-        upFolderButton.setMargin(shrinkwrap);
-        upFolderButton.setFocusPainted(false);
+        JButton upFolderButton = createToolButton(getChangeToParentDirectoryAction(), upFolderIcon,
+            upFolderToolTipText, upFolderAccessibleName);
         topPanel.add(upFolderButton);
-        if (OS_VERSION.compareTo(OSInfo.WINDOWS_ME) < 0) {
-            topPanel.add(Box.createRigidArea(hstrut10));
-        }
-
-        JButton b;
-
-        if (OS_VERSION == OSInfo.WINDOWS_98) {
-            // Desktop Button
-            File homeDir = fsv.getHomeDirectory();
-            String toolTipText = homeFolderToolTipText;
-            if (fsv.isRoot(homeDir)) {
-                toolTipText = getFileView(fc).getName(homeDir); // Probably "Desktop".
-            }
-            b = new JButton(getFileView(fc).getIcon(homeDir));
-            b.setToolTipText(toolTipText);
-            b.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY,
-                                toolTipText);
-            b.setAlignmentX(JComponent.LEFT_ALIGNMENT);
-            b.setAlignmentY(JComponent.CENTER_ALIGNMENT);
-            b.setMargin(shrinkwrap);
-            b.setFocusPainted(false);
-            b.addActionListener(getGoHomeAction());
-            topPanel.add(b);
-            topPanel.add(Box.createRigidArea(hstrut10));
-        }
 
         // New Directory Button
         if (!UIManager.getBoolean("FileChooser.readOnly")) {
-            b = new JButton(filePane.getNewFolderAction());
-            b.setText(null);
-            b.setIcon(newFolderIcon);
-            b.setToolTipText(newFolderToolTipText);
-            b.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY,
-                                newFolderAccessibleName);
-            b.putClientProperty(WindowsLookAndFeel.HI_RES_DISABLED_ICON_CLIENT_KEY,
-                                Boolean.TRUE);
-            b.setAlignmentX(JComponent.LEFT_ALIGNMENT);
-            b.setAlignmentY(JComponent.CENTER_ALIGNMENT);
-            b.setMargin(shrinkwrap);
-            b.setFocusPainted(false);
-            topPanel.add(b);
+            JButton newFolderButton = createToolButton(filePane.getNewFolderAction(), newFolderIcon,
+                newFolderToolTipText, newFolderAccessibleName);
+            topPanel.add(newFolderButton);
         }
-        if (OS_VERSION.compareTo(OSInfo.WINDOWS_ME) < 0) {
-            topPanel.add(Box.createRigidArea(hstrut10));
 
-            // View button group
-            ButtonGroup viewButtonGroup = new ButtonGroup();
+        // View button group
+        ButtonGroup viewButtonGroup = new ButtonGroup();
 
-            // List Button
-            final JToggleButton listViewButton = new JToggleButton(listViewIcon);
-            listViewButton.setToolTipText(listViewButtonToolTipText);
-            listViewButton.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY,
-                    listViewButtonAccessibleName);
-            listViewButton.putClientProperty(WindowsLookAndFeel.HI_RES_DISABLED_ICON_CLIENT_KEY,
-                    Boolean.TRUE);
-            listViewButton.setFocusPainted(false);
-            listViewButton.setSelected(true);
-            listViewButton.setAlignmentX(JComponent.LEFT_ALIGNMENT);
-            listViewButton.setAlignmentY(JComponent.CENTER_ALIGNMENT);
-            listViewButton.setMargin(shrinkwrap);
-            listViewButton.addActionListener(filePane.getViewTypeAction(FilePane.VIEWTYPE_LIST));
-            topPanel.add(listViewButton);
-            viewButtonGroup.add(listViewButton);
+        // Popup Menu
+        final JPopupMenu viewTypePopupMenu = new JPopupMenu();
 
-            // Details Button
-            final JToggleButton detailsViewButton = new JToggleButton(detailsViewIcon);
-            detailsViewButton.setToolTipText(detailsViewButtonToolTipText);
-            detailsViewButton.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY,
-                    detailsViewButtonAccessibleName);
-            detailsViewButton.putClientProperty(WindowsLookAndFeel.HI_RES_DISABLED_ICON_CLIENT_KEY,
-                    Boolean.TRUE);
-            detailsViewButton.setFocusPainted(false);
-            detailsViewButton.setAlignmentX(JComponent.LEFT_ALIGNMENT);
-            detailsViewButton.setAlignmentY(JComponent.CENTER_ALIGNMENT);
-            detailsViewButton.setMargin(shrinkwrap);
-            detailsViewButton.addActionListener(filePane.getViewTypeAction(FilePane.VIEWTYPE_DETAILS));
-            topPanel.add(detailsViewButton);
-            viewButtonGroup.add(detailsViewButton);
+        final JRadioButtonMenuItem listViewMenuItem = new JRadioButtonMenuItem(
+                filePane.getViewTypeAction(FilePane.VIEWTYPE_LIST));
+        listViewMenuItem.setSelected(filePane.getViewType() == FilePane.VIEWTYPE_LIST);
+        viewTypePopupMenu.add(listViewMenuItem);
+        viewButtonGroup.add(listViewMenuItem);
 
-            topPanel.add(Box.createRigidArea(new Dimension(60, 0)));
+        final JRadioButtonMenuItem detailsViewMenuItem = new JRadioButtonMenuItem(
+                filePane.getViewTypeAction(FilePane.VIEWTYPE_DETAILS));
+        detailsViewMenuItem.setSelected(filePane.getViewType() == FilePane.VIEWTYPE_DETAILS);
+        viewTypePopupMenu.add(detailsViewMenuItem);
+        viewButtonGroup.add(detailsViewMenuItem);
 
-            filePane.addPropertyChangeListener(new PropertyChangeListener() {
-                public void propertyChange(PropertyChangeEvent e) {
-                    if ("viewType".equals(e.getPropertyName())) {
-                        int viewType = filePane.getViewType();
+        // Create icon for viewMenuButton
+        BufferedImage image = new BufferedImage(viewMenuIcon.getIconWidth() + 7, viewMenuIcon.getIconHeight(),
+                BufferedImage.TYPE_INT_ARGB);
+        Graphics graphics = image.getGraphics();
+        viewMenuIcon.paintIcon(filePane, graphics, 0, 0);
+        int x = image.getWidth() - 5;
+        int y = image.getHeight() / 2 - 1;
+        graphics.setColor(Color.BLACK);
+        graphics.fillPolygon(new int[]{x, x + 5, x + 2}, new int[]{y, y, y + 3}, 3);
 
-                        switch (viewType) {
-                            case FilePane.VIEWTYPE_LIST:
-                                listViewButton.setSelected(true);
-                                break;
+        // Details Button
+        final JButton viewMenuButton = createToolButton(null, new ImageIcon(image), viewMenuButtonToolTipText,
+                viewMenuButtonAccessibleName);
 
-                            case FilePane.VIEWTYPE_DETAILS:
-                                detailsViewButton.setSelected(true);
-                                break;
-                        }
+        viewMenuButton.addMouseListener(new MouseAdapter() {
+            public void mousePressed(MouseEvent e) {
+                if (SwingUtilities.isLeftMouseButton(e) && !viewMenuButton.isSelected()) {
+                    viewMenuButton.setSelected(true);
+
+                    viewTypePopupMenu.show(viewMenuButton, 0, viewMenuButton.getHeight());
+                }
+            }
+        });
+        viewMenuButton.addKeyListener(new KeyAdapter() {
+            public void keyPressed(KeyEvent e) {
+                // Forbid keyboard actions if the button is not in rollover state
+                if (e.getKeyCode() == KeyEvent.VK_SPACE && viewMenuButton.getModel().isRollover()) {
+                    viewMenuButton.setSelected(true);
+
+                    viewTypePopupMenu.show(viewMenuButton, 0, viewMenuButton.getHeight());
+                }
+            }
+        });
+        viewTypePopupMenu.addPopupMenuListener(new PopupMenuListener() {
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+            }
+
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                SwingUtilities.invokeLater(new Runnable() {
+                    public void run() {
+                        viewMenuButton.setSelected(false);
+                    }
+                });
+            }
+
+            public void popupMenuCanceled(PopupMenuEvent e) {
+            }
+        });
+
+        topPanel.add(viewMenuButton);
+
+        topPanel.add(Box.createRigidArea(new Dimension(80, 0)));
+
+        filePane.addPropertyChangeListener(new PropertyChangeListener() {
+            public void propertyChange(PropertyChangeEvent e) {
+                if ("viewType".equals(e.getPropertyName())) {
+                    switch (filePane.getViewType()) {
+                        case FilePane.VIEWTYPE_LIST:
+                            listViewMenuItem.setSelected(true);
+                            break;
+
+                        case FilePane.VIEWTYPE_DETAILS:
+                            detailsViewMenuItem.setSelected(true);
+                            break;
                     }
                 }
-            });
-        } else { // After Windows Me
-            // View button group
-            ButtonGroup viewButtonGroup = new ButtonGroup();
-
-            // Popup Menu
-            final JPopupMenu viewTypePopupMenu = new JPopupMenu();
-
-            final JRadioButtonMenuItem listViewMenuItem = new JRadioButtonMenuItem(
-                    filePane.getViewTypeAction(FilePane.VIEWTYPE_LIST));
-            listViewMenuItem.setSelected(filePane.getViewType() == FilePane.VIEWTYPE_LIST);
-            viewTypePopupMenu.add(listViewMenuItem);
-            viewButtonGroup.add(listViewMenuItem);
-
-            final JRadioButtonMenuItem detailsViewMenuItem = new JRadioButtonMenuItem(
-                    filePane.getViewTypeAction(FilePane.VIEWTYPE_DETAILS));
-            detailsViewMenuItem.setSelected(filePane.getViewType() == FilePane.VIEWTYPE_DETAILS);
-            viewTypePopupMenu.add(detailsViewMenuItem);
-            viewButtonGroup.add(detailsViewMenuItem);
-
-            // Create icon for viewMenuButton
-            BufferedImage image = new BufferedImage(viewMenuIcon.getIconWidth() + 7, viewMenuIcon.getIconHeight(),
-                    BufferedImage.TYPE_INT_ARGB);
-            Graphics graphics = image.getGraphics();
-            viewMenuIcon.paintIcon(filePane, graphics, 0, 0);
-            int x = image.getWidth() - 5;
-            int y = image.getHeight() / 2 - 1;
-            graphics.setColor(Color.BLACK);
-            graphics.fillPolygon(new int[]{x, x + 5, x + 2}, new int[]{y, y, y + 3}, 3);
-
-            // Details Button
-            final JButton viewMenuButton = new JButton(new ImageIcon(image));
-            viewMenuButton.setToolTipText(viewMenuButtonToolTipText);
-            viewMenuButton.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY, viewMenuButtonAccessibleName);
-            viewMenuButton.putClientProperty(WindowsLookAndFeel.HI_RES_DISABLED_ICON_CLIENT_KEY, Boolean.TRUE);
-            viewMenuButton.setFocusable(false);
-            viewMenuButton.setAlignmentX(JComponent.LEFT_ALIGNMENT);
-            viewMenuButton.setAlignmentY(JComponent.CENTER_ALIGNMENT);
-            viewMenuButton.setMargin(shrinkwrap);
-            viewMenuButton.setModel(new DefaultButtonModel() {
-                public void setPressed(boolean b) {
-                }
-
-                public void setArmed(boolean b) {
-                }
-
-                public void setSelected(boolean b) {
-                    super.setSelected(b);
-
-                    if (b) {
-                        stateMask |= PRESSED | ARMED;
-                    } else {
-                        stateMask &= ~(PRESSED | ARMED);
-                    }
-                }
-            });
-            viewMenuButton.addMouseListener(new MouseAdapter() {
-                public void mousePressed(MouseEvent e) {
-                    if (SwingUtilities.isLeftMouseButton(e)) {
-                        viewMenuButton.setSelected(!viewMenuButton.isSelected());
-
-                        if (viewMenuButton.isSelected()) {
-                            viewTypePopupMenu.show(viewMenuButton, 0, viewMenuButton.getHeight());
-                        }
-                    }
-                }
-            });
-            viewTypePopupMenu.addPopupMenuListener(new PopupMenuListener() {
-                public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-                }
-
-                public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            viewMenuButton.setSelected(false);
-                        }
-                    });
-                }
-
-                public void popupMenuCanceled(PopupMenuEvent e) {
-                }
-            });
-            topPanel.add(viewMenuButton);
-
-            topPanel.add(Box.createRigidArea(new Dimension(80, 0)));
-
-            filePane.addPropertyChangeListener(new PropertyChangeListener() {
-                public void propertyChange(PropertyChangeEvent e) {
-                    if ("viewType".equals(e.getPropertyName())) {
-                        switch (filePane.getViewType()) {
-                            case FilePane.VIEWTYPE_LIST:
-                                listViewMenuItem.setSelected(true);
-                                break;
-
-                            case FilePane.VIEWTYPE_DETAILS:
-                                detailsViewMenuItem.setSelected(true);
-                                break;
-                        }
-                    }
-                }
-            });
-        }
+            }
+        });
 
         // ************************************** //
         // ******* Add the directory pane ******* //
@@ -622,19 +493,18 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
         // Decide whether to use the ShellFolder class to populate shortcut
         // panel and combobox.
         JFileChooser fc = getFileChooser();
-        if (OS_VERSION.compareTo(OSInfo.WINDOWS_ME) >= 0) {
-            if (FilePane.usesShellFolder(fc)) {
-                if (placesBar == null && !UIManager.getBoolean("FileChooser.noPlacesBar")) {
-                    placesBar = new WindowsPlacesBar(fc, XPStyle.getXP() != null);
-                    fc.add(placesBar, BorderLayout.BEFORE_LINE_BEGINS);
-                    fc.addPropertyChangeListener(placesBar);
-                }
-            } else {
-                if (placesBar != null) {
-                    fc.remove(placesBar);
-                    fc.removePropertyChangeListener(placesBar);
-                    placesBar = null;
-                }
+
+        if (FilePane.usesShellFolder(fc)) {
+            if (placesBar == null && !UIManager.getBoolean("FileChooser.noPlacesBar")) {
+                placesBar = new WindowsPlacesBar(fc, XPStyle.getXP() != null);
+                fc.add(placesBar, BorderLayout.BEFORE_LINE_BEGINS);
+                fc.addPropertyChangeListener(placesBar);
+            }
+        } else {
+            if (placesBar != null) {
+                fc.remove(placesBar);
+                fc.removePropertyChangeListener(placesBar);
+                placesBar = null;
             }
         }
     }
@@ -673,18 +543,9 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
         upFolderToolTipText =  UIManager.getString("FileChooser.upFolderToolTipText",l);
         upFolderAccessibleName = UIManager.getString("FileChooser.upFolderAccessibleName",l);
 
-        homeFolderToolTipText =  UIManager.getString("FileChooser.homeFolderToolTipText",l);
-        homeFolderAccessibleName = UIManager.getString("FileChooser.homeFolderAccessibleName",l);
-
         newFolderToolTipText = UIManager.getString("FileChooser.newFolderToolTipText",l);
         newFolderAccessibleName = UIManager.getString("FileChooser.newFolderAccessibleName",l);
 
-        listViewButtonToolTipText = UIManager.getString("FileChooser.listViewButtonToolTipText",l);
-        listViewButtonAccessibleName = UIManager.getString("FileChooser.listViewButtonAccessibleName",l);
-
-        detailsViewButtonToolTipText = UIManager.getString("FileChooser.detailsViewButtonToolTipText",l);
-        detailsViewButtonAccessibleName = UIManager.getString("FileChooser.detailsViewButtonAccessibleName",l);
-
         viewMenuButtonToolTipText = UIManager.getString("FileChooser.viewMenuButtonToolTipText",l);
         viewMenuButtonAccessibleName = UIManager.getString("FileChooser.viewMenuButtonAccessibleName",l);
     }
@@ -1052,6 +913,65 @@ public class WindowsFileChooserUI extends BasicFileChooserUI {
         return new DirectoryComboBoxRenderer();
     }
 
+    private static JButton createToolButton(Action a, Icon defaultIcon, String toolTipText, String accessibleName) {
+        final JButton result = new JButton(a);
+
+        result.setText(null);
+        result.setIcon(defaultIcon);
+        result.setToolTipText(toolTipText);
+        result.setRequestFocusEnabled(false);
+        result.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY, accessibleName);
+        result.putClientProperty(WindowsLookAndFeel.HI_RES_DISABLED_ICON_CLIENT_KEY, Boolean.TRUE);
+        result.setAlignmentX(JComponent.LEFT_ALIGNMENT);
+        result.setAlignmentY(JComponent.CENTER_ALIGNMENT);
+        result.setMargin(shrinkwrap);
+        result.setFocusPainted(false);
+
+        result.setModel(new DefaultButtonModel() {
+            public void setPressed(boolean b) {
+                // Forbid keyboard actions if the button is not in rollover state
+                if (!b || isRollover()) {
+                    super.setPressed(b);
+                }
+            }
+
+            public void setRollover(boolean b) {
+                if (b && !isRollover()) {
+                    // Reset other buttons
+                    for (Component component : result.getParent().getComponents()) {
+                        if (component instanceof JButton && component != result) {
+                            ((JButton) component).getModel().setRollover(false);
+                        }
+                    }
+                }
+
+                super.setRollover(b);
+            }
+
+            public void setSelected(boolean b) {
+                super.setSelected(b);
+
+                if (b) {
+                    stateMask |= PRESSED | ARMED;
+                } else {
+                    stateMask &= ~(PRESSED | ARMED);
+                }
+            }
+        });
+
+        result.addFocusListener(new FocusAdapter() {
+            public void focusGained(FocusEvent e) {
+                result.getModel().setRollover(true);
+            }
+
+            public void focusLost(FocusEvent e) {
+                result.getModel().setRollover(false);
+            }
+        });
+
+        return result;
+    }
+
     //
     // Renderer for DirectoryComboBox
     //
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index b23b087cfdf..0572802c7dc 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -104,7 +104,6 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
         new StringUIClientPropertyKey(
             "WindowsLookAndFeel.generateHiResDisabledIcon");
 
-    private Toolkit toolkit;
     private boolean updatePending = false;
 
     private boolean useSystemFontSettings = true;
@@ -149,7 +148,6 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
 
     public void initialize() {
         super.initialize();
-        toolkit = Toolkit.getDefaultToolkit();
 
         // Set the flag which determines which version of Windows should
         // be rendered. This flag only need to be set once.
@@ -470,80 +468,61 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
 
         Object ControlBackgroundColor = new DesktopProperty(
                                                        "win.3d.backgroundColor",
-                                                        table.get("control"),
-                                                       toolkit);
+                                                        table.get("control"));
         Object ControlLightColor      = new DesktopProperty(
                                                        "win.3d.lightColor",
-                                                        table.get("controlHighlight"),
-                                                       toolkit);
+                                                        table.get("controlHighlight"));
         Object ControlHighlightColor  = new DesktopProperty(
                                                        "win.3d.highlightColor",
-                                                        table.get("controlLtHighlight"),
-                                                       toolkit);
+                                                        table.get("controlLtHighlight"));
         Object ControlShadowColor     = new DesktopProperty(
                                                        "win.3d.shadowColor",
-                                                        table.get("controlShadow"),
-                                                       toolkit);
+                                                        table.get("controlShadow"));
         Object ControlDarkShadowColor = new DesktopProperty(
                                                        "win.3d.darkShadowColor",
-                                                        table.get("controlDkShadow"),
-                                                       toolkit);
+                                                        table.get("controlDkShadow"));
         Object ControlTextColor       = new DesktopProperty(
                                                        "win.button.textColor",
-                                                        table.get("controlText"),
-                                                       toolkit);
+                                                        table.get("controlText"));
         Object MenuBackgroundColor    = new DesktopProperty(
                                                        "win.menu.backgroundColor",
-                                                        table.get("menu"),
-                                                       toolkit);
+                                                        table.get("menu"));
         Object MenuBarBackgroundColor = new DesktopProperty(
                                                        "win.menubar.backgroundColor",
-                                                        table.get("menu"),
-                                                       toolkit);
+                                                        table.get("menu"));
         Object MenuTextColor          = new DesktopProperty(
                                                        "win.menu.textColor",
-                                                        table.get("menuText"),
-                                                       toolkit);
+                                                        table.get("menuText"));
         Object SelectionBackgroundColor = new DesktopProperty(
                                                        "win.item.highlightColor",
-                                                        table.get("textHighlight"),
-                                                       toolkit);
+                                                        table.get("textHighlight"));
         Object SelectionTextColor     = new DesktopProperty(
                                                        "win.item.highlightTextColor",
-                                                        table.get("textHighlightText"),
-                                                       toolkit);
+                                                        table.get("textHighlightText"));
         Object WindowBackgroundColor  = new DesktopProperty(
                                                        "win.frame.backgroundColor",
-                                                        table.get("window"),
-                                                       toolkit);
+                                                        table.get("window"));
         Object WindowTextColor        = new DesktopProperty(
                                                        "win.frame.textColor",
-                                                        table.get("windowText"),
-                                                       toolkit);
+                                                        table.get("windowText"));
         Object WindowBorderWidth      = new DesktopProperty(
                                                        "win.frame.sizingBorderWidth",
-                                                       Integer.valueOf(1),
-                                                       toolkit);
+                                                       Integer.valueOf(1));
         Object TitlePaneHeight        = new DesktopProperty(
                                                        "win.frame.captionHeight",
-                                                       Integer.valueOf(18),
-                                                       toolkit);
+                                                       Integer.valueOf(18));
         Object TitleButtonWidth       = new DesktopProperty(
                                                        "win.frame.captionButtonWidth",
-                                                       Integer.valueOf(16),
-                                                       toolkit);
+                                                       Integer.valueOf(16));
         Object TitleButtonHeight      = new DesktopProperty(
                                                        "win.frame.captionButtonHeight",
-                                                       Integer.valueOf(16),
-                                                       toolkit);
+                                                       Integer.valueOf(16));
         Object InactiveTextColor      = new DesktopProperty(
                                                        "win.text.grayedTextColor",
-                                                        table.get("textInactiveText"),
-                                                       toolkit);
+                                                        table.get("textInactiveText"));
         Object ScrollbarBackgroundColor = new DesktopProperty(
                                                        "win.scrollbar.backgroundColor",
-                                                        table.get("scrollbar"),
-                                                       toolkit);
+                                                        table.get("scrollbar"));
 
         Object TextBackground         = new XPColorValue(Part.EP_EDIT, null, Prop.FILLCOLOR,
                                                          WindowBackgroundColor);
@@ -566,32 +545,22 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
         Object ToolTipFont = sansSerifPlain12;
         Object IconFont = ControlFont;
 
-        Object scrollBarWidth = new DesktopProperty("win.scrollbar.width",
-                                                    Integer.valueOf(16), toolkit);
+        Object scrollBarWidth = new DesktopProperty("win.scrollbar.width", Integer.valueOf(16));
 
-        Object menuBarHeight = new DesktopProperty("win.menu.height",
-                                                   null, toolkit);
+        Object menuBarHeight = new DesktopProperty("win.menu.height", null);
 
-        Object hotTrackingOn = new DesktopProperty("win.item.hotTrackingOn",
-                                                   true, toolkit);
+        Object hotTrackingOn = new DesktopProperty("win.item.hotTrackingOn", true);
 
-        Object showMnemonics = new DesktopProperty("win.menu.keyboardCuesOn",
-                                                     Boolean.TRUE, toolkit);
+        Object showMnemonics = new DesktopProperty("win.menu.keyboardCuesOn", Boolean.TRUE);
 
         if (useSystemFontSettings) {
-            MenuFont = getDesktopFontValue("win.menu.font", MenuFont, toolkit);
-            FixedControlFont = getDesktopFontValue("win.ansiFixed.font",
-                                                   FixedControlFont, toolkit);
-            ControlFont = getDesktopFontValue("win.defaultGUI.font",
-                                              ControlFont, toolkit);
-            MessageFont = getDesktopFontValue("win.messagebox.font",
-                                              MessageFont, toolkit);
-            WindowFont = getDesktopFontValue("win.frame.captionFont",
-                                             WindowFont, toolkit);
-            IconFont    = getDesktopFontValue("win.icon.font",
-                                              IconFont, toolkit);
-            ToolTipFont = getDesktopFontValue("win.tooltip.font", ToolTipFont,
-                                              toolkit);
+            MenuFont = getDesktopFontValue("win.menu.font", MenuFont);
+            FixedControlFont = getDesktopFontValue("win.ansiFixed.font", FixedControlFont);
+            ControlFont = getDesktopFontValue("win.defaultGUI.font", ControlFont);
+            MessageFont = getDesktopFontValue("win.messagebox.font", MessageFont);
+            WindowFont = getDesktopFontValue("win.frame.captionFont", WindowFont);
+            IconFont    = getDesktopFontValue("win.icon.font", IconFont);
+            ToolTipFont = getDesktopFontValue("win.tooltip.font", ToolTipFont);
 
             /* Put the desktop AA settings in the defaults.
              * JComponent.setUI() retrieves this and makes it available
@@ -605,26 +574,14 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
                 new FontDesktopProperty(SunToolkit.DESKTOPFONTHINTS);
         }
         if (useSystemFontSizeSettings) {
-            MenuFont = new WindowsFontSizeProperty("win.menu.font.height",
-                                  toolkit, Font.DIALOG, Font.PLAIN, 12);
-            FixedControlFont = new WindowsFontSizeProperty(
-                       "win.ansiFixed.font.height", toolkit, Font.MONOSPACED,
+            MenuFont = new WindowsFontSizeProperty("win.menu.font.height", Font.DIALOG, Font.PLAIN, 12);
+            FixedControlFont = new WindowsFontSizeProperty("win.ansiFixed.font.height", Font.MONOSPACED,
                        Font.PLAIN, 12);
-            ControlFont = new WindowsFontSizeProperty(
-                        "win.defaultGUI.font.height", toolkit, Font.DIALOG,
-                        Font.PLAIN, 12);
-            MessageFont = new WindowsFontSizeProperty(
-                              "win.messagebox.font.height",
-                              toolkit, Font.DIALOG, Font.PLAIN, 12);
-            WindowFont = new WindowsFontSizeProperty(
-                             "win.frame.captionFont.height", toolkit,
-                             Font.DIALOG, Font.BOLD, 12);
-            ToolTipFont = new WindowsFontSizeProperty(
-                              "win.tooltip.font.height", toolkit, Font.SANS_SERIF,
-                              Font.PLAIN, 12);
-            IconFont    = new WindowsFontSizeProperty(
-                              "win.icon.font.height", toolkit, Font.DIALOG,
-                              Font.PLAIN, 12);
+            ControlFont = new WindowsFontSizeProperty("win.defaultGUI.font.height", Font.DIALOG, Font.PLAIN, 12);
+            MessageFont = new WindowsFontSizeProperty("win.messagebox.font.height", Font.DIALOG, Font.PLAIN, 12);
+            WindowFont = new WindowsFontSizeProperty("win.frame.captionFont.height", Font.DIALOG, Font.BOLD, 12);
+            ToolTipFont = new WindowsFontSizeProperty("win.tooltip.font.height", Font.SANS_SERIF, Font.PLAIN, 12);
+            IconFont    = new WindowsFontSizeProperty("win.icon.font.height", Font.DIALOG, Font.PLAIN, 12);
         }
 
 
@@ -752,8 +709,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
             // DeskTop.
             "Desktop.background", new DesktopProperty(
                                                  "win.desktop.backgroundColor",
-                                                  table.get("desktop"),
-                                                 toolkit),
+                                                  table.get("desktop")),
             "Desktop.ancestorInputMap",
                new UIDefaults.LazyInputMap(new Object[] {
                    "ctrl F5", "restore",
@@ -819,7 +775,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
             "FileChooser.filesOfTypeLabelMnemonic", Integer.valueOf(KeyEvent.VK_T),
             "FileChooser.usesSingleFilePane", Boolean.TRUE,
             "FileChooser.noPlacesBar", new DesktopProperty("win.comdlg.noPlacesBar",
-                                                           Boolean.FALSE, toolkit),
+                                                           Boolean.FALSE),
             "FileChooser.ancestorInputMap",
                new UIDefaults.LazyInputMap(new Object[] {
                      "ESCAPE", "cancelSelection",
@@ -861,36 +817,28 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
             "InternalFrame.resizeIconShadow", ControlShadowColor,
             "InternalFrame.activeBorderColor", new DesktopProperty(
                                                        "win.frame.activeBorderColor",
-                                                       table.get("windowBorder"),
-                                                       toolkit),
+                                                       table.get("windowBorder")),
             "InternalFrame.inactiveBorderColor", new DesktopProperty(
                                                        "win.frame.inactiveBorderColor",
-                                                       table.get("windowBorder"),
-                                                       toolkit),
+                                                       table.get("windowBorder")),
             "InternalFrame.activeTitleBackground", new DesktopProperty(
                                                         "win.frame.activeCaptionColor",
-                                                         table.get("activeCaption"),
-                                                        toolkit),
+                                                         table.get("activeCaption")),
             "InternalFrame.activeTitleGradient", new DesktopProperty(
                                                         "win.frame.activeCaptionGradientColor",
-                                                         table.get("activeCaption"),
-                                                        toolkit),
+                                                         table.get("activeCaption")),
             "InternalFrame.activeTitleForeground", new DesktopProperty(
                                                         "win.frame.captionTextColor",
-                                                         table.get("activeCaptionText"),
-                                                        toolkit),
+                                                         table.get("activeCaptionText")),
             "InternalFrame.inactiveTitleBackground", new DesktopProperty(
                                                         "win.frame.inactiveCaptionColor",
-                                                         table.get("inactiveCaption"),
-                                                        toolkit),
+                                                         table.get("inactiveCaption")),
             "InternalFrame.inactiveTitleGradient", new DesktopProperty(
                                                         "win.frame.inactiveCaptionGradientColor",
-                                                         table.get("inactiveCaption"),
-                                                        toolkit),
+                                                         table.get("inactiveCaption")),
             "InternalFrame.inactiveTitleForeground", new DesktopProperty(
                                                         "win.frame.inactiveCaptionTextColor",
-                                                         table.get("inactiveCaptionText"),
-                                                        toolkit),
+                                                         table.get("inactiveCaptionText")),
 
             "InternalFrame.maximizeIcon",
                 WindowsIconFactory.createFrameMaximizeIcon(),
@@ -1529,12 +1477,8 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
 
             // *** ToolTip
             "ToolTip.font", ToolTipFont,
-            "ToolTip.background", new DesktopProperty(
-                                           "win.tooltip.backgroundColor",
-                                            table.get("info"), toolkit),
-            "ToolTip.foreground", new DesktopProperty(
-                                           "win.tooltip.textColor",
-                                            table.get("infoText"), toolkit),
+            "ToolTip.background", new DesktopProperty("win.tooltip.backgroundColor", table.get("info")),
+            "ToolTip.foreground", new DesktopProperty("win.tooltip.textColor", table.get("infoText")),
 
         // *** ToolTipManager
             "ToolTipManager.enableToolTipMode", "activeApplication",
@@ -1798,10 +1742,9 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
      * represented in the current encoding this will return null and
      * turn off the use of system fonts.
      */
-    private Object getDesktopFontValue(String fontName, Object backup,
-                                       Toolkit kit) {
+    private Object getDesktopFontValue(String fontName, Object backup) {
         if (useSystemFontSettings) {
-            return new WindowsFontProperty(fontName, backup, kit);
+            return new WindowsFontProperty(fontName, backup);
         }
         return null;
     }
@@ -1989,7 +1932,6 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
 
     public void uninitialize() {
         super.uninitialize();
-        toolkit = null;
 
         if (WindowsPopupMenuUI.mnemonicListener != null) {
             MenuSelectionManager.defaultManager().
@@ -2309,8 +2251,8 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
      * is returned, it is mapped to 'Microsoft Sans Serif'.
      */
     private static class WindowsFontProperty extends DesktopProperty {
-        WindowsFontProperty(String key, Object backup, Toolkit kit) {
-            super(key, backup, kit);
+        WindowsFontProperty(String key, Object backup) {
+            super(key, backup);
         }
 
         public void invalidate(LookAndFeel laf) {
@@ -2373,9 +2315,9 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
         private int fontSize;
         private int fontStyle;
 
-        WindowsFontSizeProperty(String key, Toolkit toolkit, String fontName,
+        WindowsFontSizeProperty(String key, String fontName,
                                 int fontStyle, int fontSize) {
-            super(key, null, toolkit);
+            super(key, null);
             this.fontName = fontName;
             this.fontSize = fontSize;
             this.fontStyle = fontStyle;
@@ -2509,7 +2451,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
 
     private class TriggerDesktopProperty extends DesktopProperty {
         TriggerDesktopProperty(String key) {
-            super(key, null, toolkit);
+            super(key, null);
             // This call adds a property change listener for the property,
             // which triggers a call to updateUI(). The value returned
             // is not interesting here.
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/DnsContext.java b/jdk/src/share/classes/com/sun/jndi/dns/DnsContext.java
index a5c8f01f3c1..4375af2db55 100644
--- a/jdk/src/share/classes/com/sun/jndi/dns/DnsContext.java
+++ b/jdk/src/share/classes/com/sun/jndi/dns/DnsContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -922,7 +922,7 @@ public class DnsContext extends ComponentDirContext {
 
     //---------- Debugging
 
-    public static boolean debug = false;
+    private static final boolean debug = false;
 
     private static final void dprint(String msg) {
         if (debug) {
@@ -972,14 +972,11 @@ class NameClassPairEnumeration implements NamingEnumeration {
     }
 
     /*
-     * ctx will be closed when no longer needed by the enumeration.
+     * ctx will be set to null when no longer needed by the enumeration.
      */
-    public void close () {
+    public void close() {
         nodes = null;
-        if (ctx != null) {
-            ctx.close();
-            ctx = null;
-        }
+        ctx = null;
     }
 
     public boolean hasMore() {
diff --git a/jdk/src/share/classes/com/sun/jndi/ldap/Filter.java b/jdk/src/share/classes/com/sun/jndi/ldap/Filter.java
index 6a002190fda..17f5eb22038 100644
--- a/jdk/src/share/classes/com/sun/jndi/ldap/Filter.java
+++ b/jdk/src/share/classes/com/sun/jndi/ldap/Filter.java
@@ -93,9 +93,7 @@ final class Filter {
 
         int filtOffset[] = new int[1];
 
-        for (filtOffset[0] = filterStart;
-             filtOffset[0] < filterEnd;
-             filtOffset[0]++) {
+        for (filtOffset[0] = filterStart; filtOffset[0] < filterEnd;) {
             switch (filter[filtOffset[0]]) {
             case '(':
                 filtOffset[0]++;
@@ -104,18 +102,21 @@ final class Filter {
                 case '&':
                     encodeComplexFilter(ber, filter,
                         LDAP_FILTER_AND, filtOffset, filterEnd);
+                    // filtOffset[0] has pointed to char after right paren
                     parens--;
                     break;
 
                 case '|':
                     encodeComplexFilter(ber, filter,
                         LDAP_FILTER_OR, filtOffset, filterEnd);
+                    // filtOffset[0] has pointed to char after right paren
                     parens--;
                     break;
 
                 case '!':
                     encodeComplexFilter(ber, filter,
                         LDAP_FILTER_NOT, filtOffset, filterEnd);
+                    // filtOffset[0] has pointed to char after right paren
                     parens--;
                     break;
 
@@ -143,8 +144,8 @@ final class Filter {
 
                     encodeSimpleFilter(ber, filter, filtOffset[0], nextOffset);
 
-                    // points to right parens; for loop will increment beyond parens
-                    filtOffset[0] = nextOffset;
+                    // points to the char after right paren.
+                    filtOffset[0] = nextOffset + 1;
 
                     parens--;
                     break;
@@ -170,9 +171,14 @@ final class Filter {
                 filtOffset[0] = filterEnd; // force break from outer
                 break;
             }
+
+            if (parens < 0) {
+                throw new InvalidSearchFilterException(
+                                                "Unbalanced parenthesis");
+            }
         }
 
-        if (parens > 0) {
+        if (parens != 0) {
             throw new InvalidSearchFilterException("Unbalanced parenthesis");
         }
 
diff --git a/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java b/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java
index 2b588ceef8d..fd477285770 100644
--- a/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java
+++ b/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  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
@@ -41,6 +41,15 @@ import javax.sound.midi.spi.MidiFileWriter;
 import javax.sound.midi.spi.SoundbankReader;
 import javax.sound.midi.spi.MidiDeviceProvider;
 
+import javax.sound.midi.Receiver;
+import javax.sound.midi.Sequencer;
+import javax.sound.midi.Synthesizer;
+import javax.sound.midi.Transmitter;
+import javax.sound.sampled.Clip;
+import javax.sound.sampled.Port;
+import javax.sound.sampled.SourceDataLine;
+import javax.sound.sampled.TargetDataLine;
+
 
 /**
  * JDK13Services uses the Service class in JDK 1.3
@@ -186,6 +195,16 @@ public class JDK13Services {
         If the property is not set, null is returned.
      */
     private static synchronized String getDefaultProvider(Class typeClass) {
+        if (!SourceDataLine.class.equals(typeClass)
+                && !TargetDataLine.class.equals(typeClass)
+                && !Clip.class.equals(typeClass)
+                && !Port.class.equals(typeClass)
+                && !Receiver.class.equals(typeClass)
+                && !Transmitter.class.equals(typeClass)
+                && !Synthesizer.class.equals(typeClass)
+                && !Sequencer.class.equals(typeClass)) {
+            return null;
+        }
         String value;
         String propertyName = typeClass.getName();
         value = JSSecurityManager.getProperty(propertyName);
diff --git a/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java b/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java
index 253d22c1e93..064e5c4ba04 100644
--- a/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java
+++ b/jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  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
@@ -283,28 +283,37 @@ class JSSecurityManager {
 
 
     static List getProviders(final Class providerClass) {
-        PrivilegedAction action = new PrivilegedAction() {
-                public Object run() {
-                    List p = new ArrayList();
-                    Iterator ps = Service.providers(providerClass);
-                    while (ps.hasNext()) {
-                        try {
-                            Object provider = ps.next();
-                            if (providerClass.isInstance(provider)) {
-                                // $$mp 2003-08-22
-                                // Always adding at the beginning reverses the
-                                // order of the providers. So we no longer have
-                                // to do this in AudioSystem and MidiSystem.
-                                p.add(0, provider);
-                            }
-                        } catch (Throwable t) {
-                            //$$fb 2002-11-07: do not fail on SPI not found
-                            if (Printer.err) t.printStackTrace();
-                        }                                                                  }
-                    return p;
+        List p = new ArrayList();
+        // Service.providers(Class) just creates "lazy" iterator instance,
+        // so it doesn't require do be called from privileged section
+        final Iterator ps = Service.providers(providerClass);
+
+        // the iterator's hasNext() method looks through classpath for
+        // the provider class names, so it requires read permissions
+        PrivilegedAction<Boolean> hasNextAction = new PrivilegedAction<Boolean>() {
+            public Boolean run() {
+                return ps.hasNext();
+            }
+        };
+
+        while (AccessController.doPrivileged(hasNextAction)) {
+            try {
+                // the iterator's next() method creates instances of the
+                // providers and it should be called in the current security
+                // context
+                Object provider = ps.next();
+                if (providerClass.isInstance(provider)) {
+                    // $$mp 2003-08-22
+                    // Always adding at the beginning reverses the
+                    // order of the providers. So we no longer have
+                    // to do this in AudioSystem and MidiSystem.
+                    p.add(0, provider);
                 }
-            };
-        List providers = (List) AccessController.doPrivileged(action);
-        return providers;
+            } catch (Throwable t) {
+                //$$fb 2002-11-07: do not fail on SPI not found
+                if (Printer.err) t.printStackTrace();
+            }
+        }
+        return p;
     }
 }
diff --git a/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java b/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
index 533104fa707..fce29478ada 100644
--- a/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
+++ b/jdk/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1999-2009 Sun Microsystems, Inc.  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
@@ -82,7 +82,7 @@ public class StandardMidiFileWriter extends MidiFileWriter {
     /**
      * MIDI parser types
      */
-    public static final int types[] = {
+    private static final int types[] = {
         MIDI_TYPE_0,
         MIDI_TYPE_1
     };
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java
index d3495bb567f..7231b069a18 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java
@@ -60,8 +60,14 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
     */
    public abstract String engineGetURI();
 
+   /**
+    * Returns the output length of the hash/digest.
+    */
+   abstract int getDigestLength();
+
    /** Field _macAlgorithm */
    private Mac _macAlgorithm = null;
+   private boolean _HMACOutputLengthSet = false;
 
    /** Field _HMACOutputLength */
    int _HMACOutputLength = 0;
@@ -100,7 +106,9 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
    }
 
    public void reset() {
-           _HMACOutputLength=0;
+       _HMACOutputLength=0;
+       _HMACOutputLengthSet = false;
+       _macAlgorithm.reset();
    }
 
    /**
@@ -115,14 +123,16 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
            throws XMLSignatureException {
 
       try {
-         byte[] completeResult = this._macAlgorithm.doFinal();
-
-         if ((this._HMACOutputLength == 0) || (this._HMACOutputLength >= 160)) {
+         if (this._HMACOutputLengthSet && this._HMACOutputLength < getDigestLength()) {
+            if (log.isLoggable(java.util.logging.Level.FINE)) {
+                log.log(java.util.logging.Level.FINE,
+                    "HMACOutputLength must not be less than " + getDigestLength());
+            }
+            throw new XMLSignatureException("errorMessages.XMLSignatureException");
+         } else {
+            byte[] completeResult = this._macAlgorithm.doFinal();
             return MessageDigestAlgorithm.isEqual(completeResult, signature);
          }
-         byte[] stripped = IntegrityHmac.reduceBitLength(completeResult,
-                                 this._HMACOutputLength);
-         return MessageDigestAlgorithm.isEqual(stripped, signature);
       } catch (IllegalStateException ex) {
          throw new XMLSignatureException("empty", ex);
       }
@@ -176,14 +186,15 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
    protected byte[] engineSign() throws XMLSignatureException {
 
       try {
-         byte[] completeResult = this._macAlgorithm.doFinal();
-
-         if ((this._HMACOutputLength == 0) || (this._HMACOutputLength >= 160)) {
-            return completeResult;
+         if (this._HMACOutputLengthSet && this._HMACOutputLength < getDigestLength()) {
+            if (log.isLoggable(java.util.logging.Level.FINE)) {
+                log.log(java.util.logging.Level.FINE,
+                    "HMACOutputLength must not be less than " + getDigestLength());
+            }
+            throw new XMLSignatureException("errorMessages.XMLSignatureException");
+         } else {
+            return this._macAlgorithm.doFinal();
          }
-          return IntegrityHmac.reduceBitLength(completeResult,
-                                                 this._HMACOutputLength);
-
       } catch (IllegalStateException ex) {
          throw new XMLSignatureException("empty", ex);
       }
@@ -361,6 +372,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
     */
    protected void engineSetHMACOutputLength(int HMACOutputLength) {
       this._HMACOutputLength = HMACOutputLength;
+      this._HMACOutputLengthSet = true;
    }
 
    /**
@@ -376,12 +388,13 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
          throw new IllegalArgumentException("element null");
       }
 
-             Text hmaclength =XMLUtils.selectDsNodeText(element.getFirstChild(),
-                    Constants._TAG_HMACOUTPUTLENGTH,0);
+      Text hmaclength =XMLUtils.selectDsNodeText(element.getFirstChild(),
+         Constants._TAG_HMACOUTPUTLENGTH,0);
 
-            if (hmaclength != null) {
-               this._HMACOutputLength = Integer.parseInt(hmaclength.getData());
-            }
+      if (hmaclength != null) {
+         this._HMACOutputLength = Integer.parseInt(hmaclength.getData());
+         this._HMACOutputLengthSet = true;
+      }
 
    }
 
@@ -390,14 +403,13 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
     *
     * @param element
     */
-   public void engineAddContextToElement(Element element)
-           {
+   public void engineAddContextToElement(Element element) {
 
       if (element == null) {
          throw new IllegalArgumentException("null element");
       }
 
-      if (this._HMACOutputLength != 0) {
+      if (this._HMACOutputLengthSet) {
          Document doc = element.getOwnerDocument();
          Element HMElem = XMLUtils.createElementInSignatureSpace(doc,
                              Constants._TAG_HMACOUTPUTLENGTH);
@@ -436,6 +448,10 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
       public String engineGetURI() {
          return XMLSignature.ALGO_ID_MAC_HMAC_SHA1;
       }
+
+      int getDigestLength() {
+          return 160;
+      }
    }
 
    /**
@@ -463,6 +479,10 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
       public String engineGetURI() {
          return XMLSignature.ALGO_ID_MAC_HMAC_SHA256;
       }
+
+      int getDigestLength() {
+          return 256;
+      }
    }
 
    /**
@@ -490,6 +510,10 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
       public String engineGetURI() {
          return XMLSignature.ALGO_ID_MAC_HMAC_SHA384;
       }
+
+      int getDigestLength() {
+          return 384;
+      }
    }
 
    /**
@@ -517,6 +541,10 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
       public String engineGetURI() {
          return XMLSignature.ALGO_ID_MAC_HMAC_SHA512;
       }
+
+      int getDigestLength() {
+          return 512;
+      }
    }
 
    /**
@@ -544,6 +572,10 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
       public String engineGetURI() {
          return XMLSignature.ALGO_ID_MAC_HMAC_RIPEMD160;
       }
+
+      int getDigestLength() {
+          return 160;
+      }
    }
 
    /**
@@ -571,5 +603,9 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
       public String engineGetURI() {
          return XMLSignature.ALGO_ID_MAC_HMAC_NOT_RECOMMENDED_MD5;
       }
+
+      int getDigestLength() {
+          return 128;
+      }
    }
 }
diff --git a/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java b/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
index 9a21dc9ddfe..43d38d935dd 100644
--- a/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
+++ b/jdk/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java
@@ -129,7 +129,7 @@ public class TextCallbackHandler implements CallbackHandler {
                 System.err.print(pc.getPrompt());
                 System.err.flush();
 
-                pc.setPassword(Password.readPassword(System.in));
+                pc.setPassword(Password.readPassword(System.in, pc.isEchoOn()));
 
             } else if (callbacks[i] instanceof ConfirmationCallback) {
                 confirmation = (ConfirmationCallback) callbacks[i];
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/OuterGlowEffect.java b/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
similarity index 54%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/OuterGlowEffect.java
rename to jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
index c431ed747ea..0386792a7c2 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/OuterGlowEffect.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  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
@@ -22,34 +22,47 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.swingx.designer.effects;
 
-import org.jdesktop.swingx.designer.paint.Matte;
-
-import javax.swing.UIDefaults;
-import java.awt.Color;
+package com.sun.security.jgss;
 
 /**
- * OuterGlowEffect
- *
- * @author Created by Jasper Potts (Jun 21, 2007)
+ * Kerberos 5 AuthorizationData entry.
  */
-public class OuterGlowEffect extends DropShadowEffect {
+final public class AuthorizationDataEntry {
 
-    protected OuterGlowEffect() {
-        distance = 0;
-    }
+    private final int type;
+    private final byte[] data;
 
-    public OuterGlowEffect(UIDefaults uiDefaults) {
-        color = new Matte(new Color(255, 255, 211), uiDefaults);
+    /**
+     * Create an AuthorizationDataEntry object.
+     * @param type the ad-type
+     * @param data the ad-data, a copy of the data will be saved
+     * inside the object.
+     */
+    public AuthorizationDataEntry(int type, byte[] data) {
+        this.type = type;
+        this.data = data.clone();
     }
 
     /**
-     * Get the display name for this effect
-     *
-     * @return The user displayable name
+     * Get the ad-type field.
+     * @return ad-type
      */
-    public String getDisplayName() {
-        return "Outer Glow";
+    public int getType() {
+        return type;
+    }
+
+    /**
+     * Get a copy of the ad-data field.
+     * @return ad-data
+     */
+    public byte[] getData() {
+        return data.clone();
+    }
+
+    public String toString() {
+        return "AuthorizationDataEntry: type="+type+", data=" +
+                data.length + " bytes:\n" +
+                new sun.misc.HexDumpEncoder().encode(data);
     }
 }
diff --git a/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java b/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
new file mode 100644
index 00000000000..dc7a3556d7d
--- /dev/null
+++ b/jdk/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.security.jgss;
+
+import org.ietf.jgss.*;
+
+/**
+ * The extended GSSContext interface for supporting additional
+ * functionalities not defined by {@code org.ietf.jgss.GSSContext},
+ * such as querying context-specific attributes.
+ */
+public interface ExtendedGSSContext extends GSSContext {
+    /**
+     * Return the mechanism-specific attribute associated with {@code type}.
+     * <br><br>
+     * For each supported attribute type, the type for the output are
+     * defined below.
+     * <ol>
+     * <li>{@code KRB5_GET_TKT_FLAGS}:
+     * the returned object is a boolean array for the service ticket flags,
+     * which is long enough to contain all true bits. This means if
+     * the user wants to get the <em>n</em>'th bit but the length of the
+     * returned array is less than <em>n</em>, it is regarded as false.
+     * <li>{@code KRB5_GET_SESSION_KEY}:
+     * the returned object is an instance of {@link java.security.Key},
+     * which has the following properties:
+     *    <ul>
+     *    <li>Algorithm: enctype as a string, where
+     *        enctype is defined in RFC 3961, section 8.
+     *    <li>Format: "RAW"
+     *    <li>Encoded form: the raw key bytes, not in any ASN.1 encoding
+     *    </ul>
+     * <li>{@code KRB5_GET_AUTHZ_DATA}:
+     * the returned object is an array of
+     * {@link com.sun.security.jgss.AuthorizationDataEntry}, or null if the
+     * optional field is missing in the service ticket.
+     * <li>{@code KRB5_GET_AUTHTIME}:
+     * the returned object is a String object in the standard KerberosTime
+     * format defined in RFC 4120 5.2.3
+     * </ol>
+     *
+     * If there is a security manager, an {@link InquireSecContextPermission}
+     * with the name {@code type.mech} must be granted. Otherwise, this could
+     * result in a {@link SecurityException}.<p>
+     *
+     * Example:
+     * <pre>
+     *      GSSContext ctxt = m.createContext(...)
+     *      // Establishing the context
+     *      if (ctxt instanceof ExtendedGSSContext) {
+     *          ExtendedGSSContext ex = (ExtendedGSSContext)ctxt;
+     *          try {
+     *              Key key = (key)ex.inquireSecContext(
+     *                      InquireType.KRB5_GET_SESSION_KEY);
+     *              // read key info
+     *          } catch (GSSException gsse) {
+     *              // deal with exception
+     *          }
+     *      }
+     * </pre>
+     * @param type the type of the attribute requested
+     * @return the attribute, see the method documentation for details.
+     * @throws GSSException containing  the following
+     * major error codes:
+     *   {@link GSSException#BAD_MECH GSSException.BAD_MECH} if the mechanism
+     *   does not support this method,
+     *   {@link GSSException#UNAVAILABLE GSSException.UNAVAILABLE} if the
+     *   type specified is not supported,
+     *   {@link GSSException#NO_CONTEXT GSSException.NO_CONTEXT} if the
+     *   security context is invalid,
+     *   {@link GSSException#FAILURE GSSException.FAILURE} for other
+     *   unspecified failures.
+     * @throws SecurityException if a security manager exists and a proper
+     *   {@link InquireSecContextPermission} is not granted.
+     * @see InquireSecContextPermission
+     */
+    public Object inquireSecContext(InquireType type)
+            throws GSSException;
+}
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java b/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
similarity index 53%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java
rename to jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
index b5af519cc39..2acb9ab9e97 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  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
@@ -22,46 +22,33 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.swingx.designer;
 
-import java.awt.Dimension;
-import java.beans.PropertyChangeListener;
-import java.util.Collection;
-import java.util.Iterator;
+package com.sun.security.jgss;
+
+import java.security.BasicPermission;
 
 /**
- * LayerContainer
+ * This class is used to protect various attributes of an established
+ * GSS security context that can be accessed using the
+ * {@link com.sun.security.jgss.ExtendedGSSContext#inquireSecContext}
+ * method.
  *
- * @author Created by Jasper Potts (May 31, 2007)
+ * <p>The target name is the {@link InquireType} allowed.
  */
-public interface LayerContainer {
-    public void addPropertyChangeListener(PropertyChangeListener listener);
-
-    public void removePropertyChangeListener(PropertyChangeListener listener);
-
-    public LayerContainer getParent();
-
-    public void addLayer(Layer layer);
-
-    public void addLayer(int i, Layer layer);
-
-    public void removeLayer(Layer layer);
-
-    public int getLayerCount();
-
-    public Layer getLayer(int index);
-
-    public int indexOfLayer(Layer layer);
-
-    public Iterator<Layer> getLayerIterator();
-
-    public Collection<Layer> getLayers();
+public final class InquireSecContextPermission extends BasicPermission {
 
     /**
-     * Get the size in pixels of the root of the layer tree, this is usualy a canvas
+     * Constructs a new {@code InquireSecContextPermission} object with
+     * the specified name. The name is the symbolic name of the
+     * {@link InquireType} allowed.
      *
-     * @return The size of the whole layer tree
+     * @param name the {@link InquireType} allowed by this
+     * permission. "*" means all {@link InquireType}s are allowed.
+     *
+     * @throws NullPointerException if <code>name</code> is <code>null</code>.
+     * @throws IllegalArgumentException if <code>name</code> is empty.
      */
-    public Dimension getRootSize();
-
+    public InquireSecContextPermission(String name) {
+        super(name);
+    }
 }
diff --git a/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java b/jdk/src/share/classes/com/sun/security/jgss/InquireType.java
similarity index 56%
rename from jdk/src/share/classes/sun/nio/ch/AbstractFuture.java
rename to jdk/src/share/classes/com/sun/security/jgss/InquireType.java
index f79dc7abbbf..b9ea04098b5 100644
--- a/jdk/src/share/classes/sun/nio/ch/AbstractFuture.java
+++ b/jdk/src/share/classes/com/sun/security/jgss/InquireType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  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
@@ -23,41 +23,32 @@
  * have any questions.
  */
 
-package sun.nio.ch;
-
-import java.nio.channels.AsynchronousChannel;
-import java.util.concurrent.Future;
+package com.sun.security.jgss;
 
 /**
- * Base implementation of Future used for asynchronous I/O
+ * Attribute types that can be specified as an argument of
+ * {@link com.sun.security.jgss.ExtendedGSSContext#inquireSecContext}
  */
-
-abstract class AbstractFuture<V,A>
-    implements Future<V>
-{
-    private final AsynchronousChannel channel;
-    private final A attachment;
-
-    protected AbstractFuture(AsynchronousChannel channel, A attachment) {
-        this.channel = channel;
-        this.attachment = attachment;
-    }
-
-    final AsynchronousChannel channel() {
-        return channel;
-    }
-
-    final A attachment() {
-        return attachment;
-    }
-
+public enum InquireType {
     /**
-     * Returns the result of the operation if it has completed successfully.
+     * Attribute type for retrieving the session key of an
+     * established Kerberos 5 security context.
      */
-    abstract V value();
-
+    KRB5_GET_SESSION_KEY,
     /**
-     * Returns the exception if the operation has failed.
+     * Attribute type for retrieving the service ticket flags of an
+     * established Kerberos 5 security context.
      */
-    abstract Throwable exception();
+    KRB5_GET_TKT_FLAGS,
+    /**
+     * Attribute type for retrieving the authorization data in the
+     * service ticket of an established Kerberos 5 security context.
+     * Only supported on the acceptor side.
+     */
+    KRB5_GET_AUTHZ_DATA,
+    /**
+     * Attribute type for retrieving the authtime in the service ticket
+     * of an established Kerberos 5 security context.
+     */
+    KRB5_GET_AUTHTIME
 }
diff --git a/jdk/src/share/classes/com/sun/security/sasl/Provider.java b/jdk/src/share/classes/com/sun/security/sasl/Provider.java
index c1900e582fb..effc5b7bbc3 100644
--- a/jdk/src/share/classes/com/sun/security/sasl/Provider.java
+++ b/jdk/src/share/classes/com/sun/security/sasl/Provider.java
@@ -51,7 +51,7 @@ public final class Provider extends java.security.Provider {
         " server mechanisms for: DIGEST-MD5, GSSAPI, CRAM-MD5)";
 
     public Provider() {
-        super("SunSASL", 1.5, info);
+        super("SunSASL", 1.7d, info);
 
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
diff --git a/jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java b/jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java
index 9c24b55ecf6..ac6fa258632 100644
--- a/jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java
+++ b/jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -48,10 +48,6 @@ import sun.misc.HexDumpEncoder;
  * @author Rosanna Lee
  */
 public abstract class AbstractSaslImpl {
-    /**
-     * Logger for debug messages
-     */
-    protected static Logger logger;  // set in initLogger(); lazily loads logger
 
     protected boolean completed = false;
     protected boolean privacy = false;
@@ -68,7 +64,6 @@ public abstract class AbstractSaslImpl {
     protected String myClassName;
 
     protected AbstractSaslImpl(Map props, String className) throws SaslException {
-        initLogger();
         myClassName = className;
 
         // Parse properties  to set desired context options
@@ -325,19 +320,15 @@ public abstract class AbstractSaslImpl {
         }
     }
 
-    /**
-     * Sets logger field.
-     */
-    private static synchronized void initLogger() {
-        if (logger == null) {
-            logger = Logger.getLogger(SASL_LOGGER_NAME);
-        }
-    }
-
     // ---------------- Constants  -----------------
     private static final String SASL_LOGGER_NAME = "javax.security.sasl";
     protected static final String MAX_SEND_BUF = "javax.security.sasl.sendmaxbuffer";
 
+    /**
+     * Logger for debug messages
+     */
+    protected static final Logger logger = Logger.getLogger(SASL_LOGGER_NAME);
+
     // default 0 (no protection); 1 (integrity only)
     protected static final byte NO_PROTECTION = (byte)1;
     protected static final byte INTEGRITY_ONLY_PROTECTION = (byte)2;
diff --git a/jdk/src/share/classes/java/awt/Component.java b/jdk/src/share/classes/java/awt/Component.java
index 603d0ee5644..bcb9c22d5bf 100644
--- a/jdk/src/share/classes/java/awt/Component.java
+++ b/jdk/src/share/classes/java/awt/Component.java
@@ -6672,6 +6672,9 @@ public abstract class Component implements ImageObserver, MenuContainer,
                 Container parent = this.parent;
                 if (parent != null && parent.peer instanceof LightweightPeer) {
                     relocateComponent();
+                    if (!isRecursivelyVisible()) {
+                        peer.setVisible(false);
+                    }
                 }
             }
             invalidate();
@@ -9579,6 +9582,13 @@ public abstract class Component implements ImageObserver, MenuContainer,
                     return comp.getPeer();
                 }
             }
+            // traversing the hierarchy up to the closest HW container;
+            // further traversing may return a component that is not actually
+            // a native sibling of this component and this kind of z-order
+            // request may not be allowed by the underlying system (6852051).
+            if (!cont.isLightweight()) {
+                break;
+            }
 
             indexAbove = cont.getSiblingIndexAbove();
             cont = cont.getContainer();
diff --git a/jdk/src/share/classes/java/awt/Cursor.java b/jdk/src/share/classes/java/awt/Cursor.java
index cc1b20b999a..b5e7e362271 100644
--- a/jdk/src/share/classes/java/awt/Cursor.java
+++ b/jdk/src/share/classes/java/awt/Cursor.java
@@ -118,8 +118,18 @@ public class Cursor implements java.io.Serializable {
      */
     public static final int     MOVE_CURSOR                     = 13;
 
+    /**
+      * @deprecated As of JDK version 1.7, the {@link #getPredefinedCursor(int)}
+      * method should be used instead.
+      */
+    @Deprecated
     protected static Cursor predefined[] = new Cursor[14];
 
+    /**
+     * This field is a private replacement for 'predefined' array.
+     */
+    private final static Cursor[] predefinedPrivate = new Cursor[14];
+
     /* Localization names and default values */
     static final String[][] cursorProperties = {
         { "AWT.DefaultCursor", "Default Cursor" },
@@ -253,10 +263,15 @@ public class Cursor implements java.io.Serializable {
         if (type < Cursor.DEFAULT_CURSOR || type > Cursor.MOVE_CURSOR) {
             throw new IllegalArgumentException("illegal cursor type");
         }
-        if (predefined[type] == null) {
-            predefined[type] = new Cursor(type);
+        Cursor c = predefinedPrivate[type];
+        if (c == null) {
+            predefinedPrivate[type] = c = new Cursor(type);
         }
-        return predefined[type];
+        // fill 'predefined' array for backwards compatibility.
+        if (predefined[type] == null) {
+            predefined[type] = c;
+        }
+        return c;
     }
 
     /**
diff --git a/jdk/src/share/classes/java/awt/Window.java b/jdk/src/share/classes/java/awt/Window.java
index b419c437c9e..a342f37879f 100644
--- a/jdk/src/share/classes/java/awt/Window.java
+++ b/jdk/src/share/classes/java/awt/Window.java
@@ -3347,7 +3347,7 @@ public class Window extends Container implements Accessible {
      *
      * @return the opacity of the window
      *
-     * @see Window#setOpacity
+     * @see Window#setOpacity(float)
      * @see GraphicsDevice.WindowTranslucency
      *
      * @since 1.7
@@ -3366,7 +3366,7 @@ public class Window extends Container implements Accessible {
      * window. This is a platform-dependent behavior.
      * <p>
      * In order for this method to enable the translucency effect, the {@link
-     * GraphicsDevice#isWindowTranslucencySupported()} method must indicate that
+     * GraphicsDevice#isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency)} method must indicate that
      * the {@link GraphicsDevice.WindowTranslucency#TRANSLUCENT TRANSLUCENT}
      * translucency is supported.
      * <p>
@@ -3375,8 +3375,8 @@ public class Window extends Container implements Accessible {
      * IllegalComponentStateException} is thrown.
      * <p>
      * The translucency levels of individual pixels may also be effected by the
-     * alpha component of their color (see {@link setBackground()}) and the
-     * current shape of this window (see {@link setShape()}).
+     * alpha component of their color (see {@link Window#setBackground(Color)}) and the
+     * current shape of this window (see {@link #setShape(Shape)}).
      *
      * @param opacity the opacity level to set to the window
      *
@@ -3389,10 +3389,10 @@ public class Window extends Container implements Accessible {
      *     translucency kind is not supported and the opacity is less than 1.0f
      *
      * @see Window#getOpacity
-     * @see Window#setBackground()
-     * @see Window#setShape()
+     * @see Window#setBackground(Color)
+     * @see Window#setShape(Shape)
      * @see GraphicsDevice.WindowTranslucency
-     * @see GraphicsDevice#isWindowTranslucencySupported()
+     * @see GraphicsDevice#isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency)
      *
      * @since 1.7
      */
@@ -3434,7 +3434,7 @@ public class Window extends Container implements Accessible {
      * @return the shape of the window or {@code null} if no
      *     shape is specified for the window
      *
-     * @see Window#setShape
+     * @see Window#setShape(Shape)
      * @see GraphicsDevice.WindowTranslucency
      *
      * @since 1.7
@@ -3458,19 +3458,19 @@ public class Window extends Container implements Accessible {
      * <ul>
      * <li>The {@link GraphicsDevice.WindowTranslucency#PERPIXEL_TRANSPARENT
      * PERPIXEL_TRANSPARENT} translucency kind must be supported by the
-     * underlying system (see {@link })
+     * underlying system
      * <i>and</i>
      * <li>The window must not be in the full-screen mode (see
-     * {@link GraphicsDevice#setFullScreenWindow()})
+     * {@link GraphicsDevice#setFullScreenWindow(Window)})
      * </ul>
      * If a certain condition is not met, either the {@code
      * UnsupportedOperationException} or {@code IllegalComponentStateException}
      * is thrown.
      * <p>
      * The tranlucency levels of individual pixels may also be effected by the
-     * alpha component of their color (see {@link setBackground()}) and the
-     * opacity value (see {@link setOpacity()}). See {@link
-     * GraphicsDevice#WindowTranslucency} for more details.
+     * alpha component of their color (see {@link Window#setBackground(Color)}) and the
+     * opacity value (see {@link #setOpacity(float)}). See {@link
+     * GraphicsDevice.WindowTranslucency} for more details.
      *
      * @param shape the shape to set to the window
      *
@@ -3481,10 +3481,10 @@ public class Window extends Container implements Accessible {
      *     PERPIXEL_TRANSPARENT} translucency is not supported
      *
      * @see Window#getShape()
-     * @see Window#setBackgound()
-     * @see Window#setOpacity()
+     * @see Window#setBackground(Color)
+     * @see Window#setOpacity(float)
      * @see GraphicsDevice.WindowTranslucency
-     * @see GraphicsDevice#isWindowTranslucencySupported()
+     * @see GraphicsDevice#isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency)
      *
      * @since 1.7
      */
@@ -3520,7 +3520,7 @@ public class Window extends Container implements Accessible {
      *
      * @return this component's background color
      *
-     * @see Window#setBackground
+     * @see Window#setBackground(Color)
      * @see Window#isOpaque
      * @see GraphicsDevice.WindowTranslucency
      */
@@ -3544,7 +3544,7 @@ public class Window extends Container implements Accessible {
      * PERPIXEL_TRANSLUCENT} translucency must be supported
      * by the graphics device where this window is located <i>and</i>
      * <li>The window must not be in the full-screen mode (see {@link
-     * GraphicsDevice#setFullScreenWindow()})
+     * GraphicsDevice#setFullScreenWindow(Window)})
      * </ul>
      * If a certain condition is not met at the time of calling this method,
      * the alpha component of the given background color will not effect the
@@ -3561,8 +3561,8 @@ public class Window extends Container implements Accessible {
      * method is equal to zero.)
      * <p>
      * The actual level of translucency of a given pixel also depends on window
-     * opacity (see {@link setOpacity()}), as well as the current shape of
-     * this window (see {@link setShape()}).
+     * opacity (see {@link #setOpacity(float)}), as well as the current shape of
+     * this window (see {@link #setShape(Shape)}).
      * <p>
      * Note that painting a pixel with the alpha value of 0 may or may not
      * disable the mouse event handling on this pixel. This is a
@@ -3585,10 +3585,10 @@ public class Window extends Container implements Accessible {
      *
      * @see Window#getBackground
      * @see Window#isOpaque
-     * @see Window#setOpacity()
-     * @see Window#setShape()
+     * @see Window#setOpacity(float)
+     * @see Window#setShape(Shape)
      * @see GraphicsDevice.WindowTranslucency
-     * @see GraphicsDevice#isWindowTranslucencySupported()
+     * @see GraphicsDevice#isWindowTranslucencySupported(GraphicsDevice.WindowTranslucency)
      * @see GraphicsConfiguration#isTranslucencyCapable()
      */
     @Override
@@ -3635,7 +3635,7 @@ public class Window extends Container implements Accessible {
      * @return {@code true} if the window is opaque, {@code false} otherwise
      *
      * @see Window#getBackground
-     * @see Window#setBackground
+     * @see Window#setBackground(Color)
      * @since 1.7
      */
     @Override
@@ -3743,16 +3743,58 @@ public class Window extends Container implements Accessible {
 
     // ****************** END OF MIXING CODE ********************************
 
-    // This method gets the window location/size as reported by the native
-    // system since the locally cached values may represent outdated data.
-    // NOTE: this method is invoked on the toolkit thread, and therefore
-    // is not supposed to become public/user-overridable.
+    /**
+     * Limit the given double value with the given range.
+     */
+    private static double limit(double value, double min, double max) {
+        value = Math.max(value, min);
+        value = Math.min(value, max);
+        return value;
+    }
+
+    /**
+     * Calculate the position of the security warning.
+     *
+     * This method gets the window location/size as reported by the native
+     * system since the locally cached values may represent outdated data.
+     *
+     * The method is used from the native code, or via AWTAccessor.
+     *
+     * NOTE: this method is invoked on the toolkit thread, and therefore is not
+     * supposed to become public/user-overridable.
+     */
     private Point2D calculateSecurityWarningPosition(double x, double y,
             double w, double h)
     {
-        return new Point2D.Double(
-                x + w * securityWarningAlignmentX + securityWarningPointX,
-                y + h * securityWarningAlignmentY + securityWarningPointY);
+        // The position according to the spec of SecurityWarning.setPosition()
+        double wx = x + w * securityWarningAlignmentX + securityWarningPointX;
+        double wy = y + h * securityWarningAlignmentY + securityWarningPointY;
+
+        // First, make sure the warning is not too far from the window bounds
+        wx = Window.limit(wx,
+                x - securityWarningWidth - 2,
+                x + w + 2);
+        wy = Window.limit(wy,
+                y - securityWarningHeight - 2,
+                y + h + 2);
+
+        // Now make sure the warning window is visible on the screen
+        GraphicsConfiguration graphicsConfig =
+            getGraphicsConfiguration_NoClientCode();
+        Rectangle screenBounds = graphicsConfig.getBounds();
+        Insets screenInsets =
+            Toolkit.getDefaultToolkit().getScreenInsets(graphicsConfig);
+
+        wx = Window.limit(wx,
+                screenBounds.x + screenInsets.left,
+                screenBounds.x + screenBounds.width - screenInsets.right
+                - securityWarningWidth);
+        wy = Window.limit(wy,
+                screenBounds.y + screenInsets.top,
+                screenBounds.y + screenBounds.height - screenInsets.bottom
+                - securityWarningHeight);
+
+        return new Point2D.Double(wx, wy);
     }
 
     static {
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java b/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java
index 07768598fd5..9899fedc275 100644
--- a/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java
+++ b/jdk/src/share/classes/java/awt/dnd/DragSourceContext.java
@@ -275,7 +275,7 @@ public class DragSourceContext
      *
      * @param c     the initial {@code Cursor} for this drag operation,
      *                       or {@code null} for the default cursor handling;
-     *                       see {@linkplain #defaultCursor class
+     *                       see {@linkplain Cursor class
      *                       level documentation} for more details
      *                       on the cursor handling during drag and drop
      *
diff --git a/jdk/src/share/classes/java/beans/Introspector.java b/jdk/src/share/classes/java/beans/Introspector.java
index 1c90f205a88..3d56599576d 100644
--- a/jdk/src/share/classes/java/beans/Introspector.java
+++ b/jdk/src/share/classes/java/beans/Introspector.java
@@ -114,8 +114,8 @@ public class Introspector {
     // Static Caches to speed up introspection.
     private static Map declaredMethodCache =
         Collections.synchronizedMap(new WeakHashMap());
-    private static Map beanInfoCache =
-        Collections.synchronizedMap(new WeakHashMap());
+
+    private static final Object BEANINFO_CACHE = new Object();
 
     private Class beanClass;
     private BeanInfo explicitBeanInfo;
@@ -174,10 +174,18 @@ public class Introspector {
         if (!ReflectUtil.isPackageAccessible(beanClass)) {
             return (new Introspector(beanClass, null, USE_ALL_BEANINFO)).getBeanInfo();
         }
-        BeanInfo bi = (BeanInfo)beanInfoCache.get(beanClass);
+        Map<Class<?>, BeanInfo> map;
+        synchronized (BEANINFO_CACHE) {
+            map = (Map<Class<?>, BeanInfo>) AppContext.getAppContext().get(BEANINFO_CACHE);
+            if (map == null) {
+                map = Collections.synchronizedMap(new WeakHashMap<Class<?>, BeanInfo>());
+                AppContext.getAppContext().put(BEANINFO_CACHE, map);
+            }
+        }
+        BeanInfo bi = map.get(beanClass);
         if (bi == null) {
             bi = (new Introspector(beanClass, null, USE_ALL_BEANINFO)).getBeanInfo();
-            beanInfoCache.put(beanClass, bi);
+            map.put(beanClass, bi);
         }
         return bi;
     }
@@ -351,7 +359,10 @@ public class Introspector {
      */
 
     public static void flushCaches() {
-        beanInfoCache.clear();
+        Map map = (Map) AppContext.getAppContext().get(BEANINFO_CACHE);
+        if (map != null) {
+            map.clear();
+        }
         declaredMethodCache.clear();
     }
 
@@ -374,7 +385,10 @@ public class Introspector {
         if (clz == null) {
             throw new NullPointerException();
         }
-        beanInfoCache.remove(clz);
+        Map map = (Map) AppContext.getAppContext().get(BEANINFO_CACHE);
+        if (map != null) {
+            map.remove(clz);
+        }
         declaredMethodCache.remove(clz);
     }
 
diff --git a/jdk/src/share/classes/java/beans/MetaData.java b/jdk/src/share/classes/java/beans/MetaData.java
index 96607db806f..fa67901b7a1 100644
--- a/jdk/src/share/classes/java/beans/MetaData.java
+++ b/jdk/src/share/classes/java/beans/MetaData.java
@@ -335,31 +335,6 @@ abstract class java_util_Collections extends PersistenceDelegate {
         return (oldC.size() == newC.size()) && oldC.containsAll(newC);
     }
 
-    static Object getPrivateField(final Object instance, final String name) {
-        return AccessController.doPrivileged(
-                new PrivilegedAction() {
-                    public Object run() {
-                        Class type = instance.getClass();
-                        while ( true ) {
-                            try {
-                                Field field = type.getDeclaredField(name);
-                                field.setAccessible(true);
-                                return field.get( instance );
-                            }
-                            catch (NoSuchFieldException exception) {
-                                type = type.getSuperclass();
-                                if (type == null) {
-                                    throw new IllegalStateException("Could not find field " + name, exception);
-                                }
-                            }
-                            catch (Exception exception) {
-                                throw new IllegalStateException("Could not get value " + type.getName() + '.' + name, exception);
-                            }
-                        }
-                    }
-                } );
-    }
-
     static final class EmptyList_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
             return new Expression(oldInstance, Collections.class, "emptyList", null);
@@ -500,7 +475,7 @@ abstract class java_util_Collections extends PersistenceDelegate {
 
     static final class CheckedCollection_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
-            Object type = getPrivateField(oldInstance, "type");
+            Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type");
             List list = new ArrayList((Collection) oldInstance);
             return new Expression(oldInstance, Collections.class, "checkedCollection", new Object[]{list, type});
         }
@@ -508,7 +483,7 @@ abstract class java_util_Collections extends PersistenceDelegate {
 
     static final class CheckedList_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
-            Object type = getPrivateField(oldInstance, "type");
+            Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type");
             List list = new LinkedList((Collection) oldInstance);
             return new Expression(oldInstance, Collections.class, "checkedList", new Object[]{list, type});
         }
@@ -516,7 +491,7 @@ abstract class java_util_Collections extends PersistenceDelegate {
 
     static final class CheckedRandomAccessList_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
-            Object type = getPrivateField(oldInstance, "type");
+            Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type");
             List list = new ArrayList((Collection) oldInstance);
             return new Expression(oldInstance, Collections.class, "checkedList", new Object[]{list, type});
         }
@@ -524,7 +499,7 @@ abstract class java_util_Collections extends PersistenceDelegate {
 
     static final class CheckedSet_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
-            Object type = getPrivateField(oldInstance, "type");
+            Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type");
             Set set = new HashSet((Set) oldInstance);
             return new Expression(oldInstance, Collections.class, "checkedSet", new Object[]{set, type});
         }
@@ -532,7 +507,7 @@ abstract class java_util_Collections extends PersistenceDelegate {
 
     static final class CheckedSortedSet_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
-            Object type = getPrivateField(oldInstance, "type");
+            Object type = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedCollection.type");
             SortedSet set = new TreeSet((SortedSet) oldInstance);
             return new Expression(oldInstance, Collections.class, "checkedSortedSet", new Object[]{set, type});
         }
@@ -540,8 +515,8 @@ abstract class java_util_Collections extends PersistenceDelegate {
 
     static final class CheckedMap_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
-            Object keyType = getPrivateField(oldInstance, "keyType");
-            Object valueType = getPrivateField(oldInstance, "valueType");
+            Object keyType   = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedMap.keyType");
+            Object valueType = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedMap.valueType");
             Map map = new HashMap((Map) oldInstance);
             return new Expression(oldInstance, Collections.class, "checkedMap", new Object[]{map, keyType, valueType});
         }
@@ -549,8 +524,8 @@ abstract class java_util_Collections extends PersistenceDelegate {
 
     static final class CheckedSortedMap_PersistenceDelegate extends java_util_Collections {
         protected Expression instantiate(Object oldInstance, Encoder out) {
-            Object keyType = getPrivateField(oldInstance, "keyType");
-            Object valueType = getPrivateField(oldInstance, "valueType");
+            Object keyType   = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedMap.keyType");
+            Object valueType = MetaData.getPrivateFieldValue(oldInstance, "java.util.Collections$CheckedMap.valueType");
             SortedMap map = new TreeMap((SortedMap) oldInstance);
             return new Expression(oldInstance, Collections.class, "checkedSortedMap", new Object[]{map, keyType, valueType});
         }
@@ -572,7 +547,7 @@ class java_util_EnumMap_PersistenceDelegate extends PersistenceDelegate {
     }
 
     private static Object getType(Object instance) {
-        return java_util_Collections.getPrivateField(instance, "keyType");
+        return MetaData.getPrivateFieldValue(instance, "java.util.EnumMap.keyType");
     }
 }
 
@@ -591,7 +566,7 @@ class java_util_EnumSet_PersistenceDelegate extends PersistenceDelegate {
     }
 
     private static Object getType(Object instance) {
-        return java_util_Collections.getPrivateField(instance, "elementType");
+        return MetaData.getPrivateFieldValue(instance, "java.util.EnumSet.elementType");
     }
 }
 
@@ -1282,7 +1257,7 @@ class javax_swing_Box_PersistenceDelegate extends DefaultPersistenceDelegate {
 
     private Integer getAxis(Object object) {
         Box box = (Box) object;
-        return (Integer) java_util_Collections.getPrivateField(box.getLayout(), "axis");
+        return (Integer) MetaData.getPrivateFieldValue(box.getLayout(), "javax.swing.BoxLayout.axis");
     }
 }
 
@@ -1365,6 +1340,7 @@ final class sun_swing_PrintColorUIResource_PersistenceDelegate extends Persisten
 }
 
 class MetaData {
+    private static final Map<String,Field> fields = Collections.synchronizedMap(new WeakHashMap<String, Field>());
     private static Hashtable internalPersistenceDelegates = new Hashtable();
 
     private static PersistenceDelegate nullPersistenceDelegate = new NullPersistenceDelegate();
@@ -1503,4 +1479,35 @@ class MetaData {
             return null;
         }
     }
+
+    static Object getPrivateFieldValue(Object instance, String name) {
+        Field field = fields.get(name);
+        if (field == null) {
+            int index = name.lastIndexOf('.');
+            final String className = name.substring(0, index);
+            final String fieldName = name.substring(1 + index);
+            field = AccessController.doPrivileged(new PrivilegedAction<Field>() {
+                public Field run() {
+                    try {
+                        Field field = Class.forName(className).getDeclaredField(fieldName);
+                        field.setAccessible(true);
+                        return field;
+                    }
+                    catch (ClassNotFoundException exception) {
+                        throw new IllegalStateException("Could not find class", exception);
+                    }
+                    catch (NoSuchFieldException exception) {
+                        throw new IllegalStateException("Could not find field", exception);
+                    }
+                }
+            });
+            fields.put(name, field);
+        }
+        try {
+            return field.get(instance);
+        }
+        catch (IllegalAccessException exception) {
+            throw new IllegalStateException("Could not get value of the field", exception);
+        }
+    }
 }
diff --git a/jdk/src/share/classes/java/lang/Character.java b/jdk/src/share/classes/java/lang/Character.java
index 9b9c938fa1e..bc4284c20df 100644
--- a/jdk/src/share/classes/java/lang/Character.java
+++ b/jdk/src/share/classes/java/lang/Character.java
@@ -38,7 +38,7 @@ import java.util.Locale;
  * a character's category (lowercase letter, digit, etc.) and for converting
  * characters from uppercase to lowercase and vice versa.
  * <p>
- * Character information is based on the Unicode Standard, version 4.0.
+ * Character information is based on the Unicode Standard, version 5.1.0.
  * <p>
  * The methods and data of class <code>Character</code> are defined by
  * the information in the <i>UnicodeData</i> file that is part of the
@@ -162,7 +162,7 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
      *
      * @since   1.0.2
      */
-    public static final char   MAX_VALUE = '\uffff';
+    public static final char   MAX_VALUE = '\uFFFF';
 
     /**
      * The <code>Class</code> instance representing the primitive type
@@ -518,75 +518,91 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
     public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = 18;
 
     /**
-     * The minimum value of a Unicode high-surrogate code unit in the
-     * UTF-16 encoding. A high-surrogate is also known as a
-     * <i>leading-surrogate</i>.
+     * The minimum value of a
+     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
+     * Unicode high-surrogate code unit</a>
+     * in the UTF-16 encoding, constant <code>'&#92;uD800'</code>.
+     * A high-surrogate is also known as a <i>leading-surrogate</i>.
      *
      * @since 1.5
      */
     public static final char MIN_HIGH_SURROGATE = '\uD800';
 
     /**
-     * The maximum value of a Unicode high-surrogate code unit in the
-     * UTF-16 encoding. A high-surrogate is also known as a
-     * <i>leading-surrogate</i>.
+     * The maximum value of a
+     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
+     * Unicode high-surrogate code unit</a>
+     * in the UTF-16 encoding, constant <code>'&#92;uDBFF'</code>.
+     * A high-surrogate is also known as a <i>leading-surrogate</i>.
      *
      * @since 1.5
      */
     public static final char MAX_HIGH_SURROGATE = '\uDBFF';
 
     /**
-     * The minimum value of a Unicode low-surrogate code unit in the
-     * UTF-16 encoding. A low-surrogate is also known as a
-     * <i>trailing-surrogate</i>.
+     * The minimum value of a
+     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
+     * Unicode low-surrogate code unit</a>
+     * in the UTF-16 encoding, constant <code>'&#92;uDC00'</code>.
+     * A low-surrogate is also known as a <i>trailing-surrogate</i>.
      *
      * @since 1.5
      */
     public static final char MIN_LOW_SURROGATE  = '\uDC00';
 
     /**
-     * The maximum value of a Unicode low-surrogate code unit in the
-     * UTF-16 encoding. A low-surrogate is also known as a
-     * <i>trailing-surrogate</i>.
+     * The maximum value of a
+     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
+     * Unicode low-surrogate code unit</a>
+     * in the UTF-16 encoding, constant <code>'&#92;uDFFF'</code>.
+     * A low-surrogate is also known as a <i>trailing-surrogate</i>.
      *
      * @since 1.5
      */
     public static final char MAX_LOW_SURROGATE  = '\uDFFF';
 
     /**
-     * The minimum value of a Unicode surrogate code unit in the UTF-16 encoding.
+     * The minimum value of a Unicode surrogate code unit in the
+     * UTF-16 encoding, constant <code>'&#92;uD800'</code>.
      *
      * @since 1.5
      */
     public static final char MIN_SURROGATE = MIN_HIGH_SURROGATE;
 
     /**
-     * The maximum value of a Unicode surrogate code unit in the UTF-16 encoding.
+     * The maximum value of a Unicode surrogate code unit in the
+     * UTF-16 encoding, constant <code>'&#92;uDFFF'</code>.
      *
      * @since 1.5
      */
     public static final char MAX_SURROGATE = MAX_LOW_SURROGATE;
 
     /**
-     * The minimum value of a supplementary code point.
+     * The minimum value of a
+     * <a href="http://www.unicode.org/glossary/#supplementary_code_point">
+     * Unicode supplementary code point</a>, constant {@code U+10000}.
      *
      * @since 1.5
      */
     public static final int MIN_SUPPLEMENTARY_CODE_POINT = 0x010000;
 
     /**
-     * The minimum value of a Unicode code point.
+     * The minimum value of a
+     * <a href="http://www.unicode.org/glossary/#code_point">
+     * Unicode code point</a>, constant {@code U+0000}.
      *
      * @since 1.5
      */
     public static final int MIN_CODE_POINT = 0x000000;
 
     /**
-     * The maximum value of a Unicode code point.
+     * The maximum value of a
+     * <a href="http://www.unicode.org/glossary/#code_point">
+     * Unicode code point</a>, constant {@code U+10FFFF}.
      *
      * @since 1.5
      */
-    public static final int MAX_CODE_POINT = 0x10ffff;
+    public static final int MAX_CODE_POINT = 0X10FFFF;
 
 
     /**
@@ -2571,9 +2587,9 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
      * significantly better space and time performance by caching
      * frequently requested values.
      *
-     * This method will always cache values in the range '&#92;u0000'
-     * to '&#92;u007f'", inclusive, and may cache other values outside
-     * of this range.
+     * This method will always cache values in the range {@code
+     * '\u005Cu0000'} to {@code '\u005Cu007f'}, inclusive, and may
+     * cache other values outside of this range.
      *
      * @param  c a char value.
      * @return a <tt>Character</tt> instance representing <tt>c</tt>.
@@ -2648,19 +2664,15 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
     }
 
     /**
-     * Determines whether the specified code point is a valid Unicode
-     * code point value in the range of <code>0x0000</code> to
-     * <code>0x10FFFF</code> inclusive. This method is equivalent to
-     * the expression:
-     *
-     * <blockquote><pre>
-     * codePoint >= 0x0000 && codePoint <= 0x10FFFF
-     * </pre></blockquote>
+     * Determines whether the specified code point is a valid
+     * <a href="http://www.unicode.org/glossary/#code_point">
+     * Unicode code point value</a>.
      *
      * @param  codePoint the Unicode code point to be tested
-     * @return <code>true</code> if the specified code point value
-     * is a valid code point value;
-     * <code>false</code> otherwise.
+     * @return {@code true} if the specified code point value is between
+     *         {@link #MIN_CODE_POINT} and
+     *         {@link #MAX_CODE_POINT} inclusive;
+     *         {@code false} otherwise.
      * @since  1.5
      */
     public static boolean isValidCodePoint(int codePoint) {
@@ -2669,15 +2681,13 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
 
     /**
      * Determines whether the specified character (Unicode code point)
-     * is in the supplementary character range. The method call is
-     * equivalent to the expression:
-     * <blockquote><pre>
-     * codePoint >= 0x10000 && codePoint <= 0x10FFFF
-     * </pre></blockquote>
+     * is in the <a href="#supplementary">supplementary character</a> range.
      *
      * @param  codePoint the character (Unicode code point) to be tested
-     * @return <code>true</code> if the specified character is in the Unicode
-     *         supplementary character range; <code>false</code> otherwise.
+     * @return {@code true} if the specified code point is between
+     *         {@link #MIN_SUPPLEMENTARY_CODE_POINT} and
+     *         {@link #MAX_CODE_POINT} inclusive;
+     *         {@code false} otherwise.
      * @since  1.5
      */
     public static boolean isSupplementaryCodePoint(int codePoint) {
@@ -2686,56 +2696,83 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
     }
 
     /**
-     * Determines if the given <code>char</code> value is a
-     * high-surrogate code unit (also known as <i>leading-surrogate
-     * code unit</i>). Such values do not represent characters by
-     * themselves, but are used in the representation of <a
-     * href="#supplementary">supplementary characters</a> in the
-     * UTF-16 encoding.
+     * Determines if the given {@code char} value is a
+     * <a href="http://www.unicode.org/glossary/#high_surrogate_code_unit">
+     * Unicode high-surrogate code unit</a>
+     * (also known as <i>leading-surrogate code unit</i>).
      *
-     * <p>This method returns <code>true</code> if and only if
-     * <blockquote><pre>ch >= '&#92;uD800' && ch <= '&#92;uDBFF'
-     * </pre></blockquote>
-     * is <code>true</code>.
+     * <p>Such values do not represent characters by themselves,
+     * but are used in the representation of
+     * <a href="#supplementary">supplementary characters</a>
+     * in the UTF-16 encoding.
      *
-     * @param   ch   the <code>char</code> value to be tested.
-     * @return  <code>true</code> if the <code>char</code> value
-     *          is between '&#92;uD800' and '&#92;uDBFF' inclusive;
-     *          <code>false</code> otherwise.
-     * @see     java.lang.Character#isLowSurrogate(char)
-     * @see     Character.UnicodeBlock#of(int)
-     * @since   1.5
+     * @param  ch the {@code char} value to be tested.
+     * @return {@code true} if the {@code char} value is between
+     *         {@link #MIN_HIGH_SURROGATE} and
+     *         {@link #MAX_HIGH_SURROGATE} inclusive;
+     *         {@code false} otherwise.
+     * @see    #isLowSurrogate(char)
+     * @see    Character.UnicodeBlock#of(int)
+     * @since  1.5
      */
     public static boolean isHighSurrogate(char ch) {
         return ch >= MIN_HIGH_SURROGATE && ch <= MAX_HIGH_SURROGATE;
     }
 
     /**
-     * Determines if the given <code>char</code> value is a
-     * low-surrogate code unit (also known as <i>trailing-surrogate code
-     * unit</i>). Such values do not represent characters by themselves,
-     * but are used in the representation of <a
-     * href="#supplementary">supplementary characters</a> in the UTF-16 encoding.
+     * Determines if the given {@code char} value is a
+     * <a href="http://www.unicode.org/glossary/#low_surrogate_code_unit">
+     * Unicode low-surrogate code unit</a>
+     * (also known as <i>trailing-surrogate code unit</i>).
      *
-     * <p> This method returns <code>true</code> if and only if
-     * <blockquote><pre>ch >= '&#92;uDC00' && ch <= '&#92;uDFFF'
-     * </pre></blockquote> is <code>true</code>.
+     * <p>Such values do not represent characters by themselves,
+     * but are used in the representation of
+     * <a href="#supplementary">supplementary characters</a>
+     * in the UTF-16 encoding.
      *
-     * @param   ch   the <code>char</code> value to be tested.
-     * @return  <code>true</code> if the <code>char</code> value
-     *          is between '&#92;uDC00' and '&#92;uDFFF' inclusive;
-     *          <code>false</code> otherwise.
-     * @see java.lang.Character#isHighSurrogate(char)
-     * @since   1.5
+     * @param  ch the {@code char} value to be tested.
+     * @return {@code true} if the {@code char} value is between
+     *         {@link #MIN_LOW_SURROGATE} and
+     *         {@link #MAX_LOW_SURROGATE} inclusive;
+     *         {@code false} otherwise.
+     * @see    #isHighSurrogate(char)
+     * @since  1.5
      */
     public static boolean isLowSurrogate(char ch) {
         return ch >= MIN_LOW_SURROGATE && ch <= MAX_LOW_SURROGATE;
     }
 
+    /**
+     * Determines if the given {@code char} value is a Unicode
+     * <i>surrogate code unit</i>.
+     *
+     * <p>Such values do not represent characters by themselves,
+     * but are used in the representation of
+     * <a href="#supplementary">supplementary characters</a>
+     * in the UTF-16 encoding.
+     *
+     * <p>A char value is a surrogate code unit if and only if it is either
+     * a {@linkplain #isLowSurrogate(char) low-surrogate code unit} or
+     * a {@linkplain #isHighSurrogate(char) high-surrogate code unit}.
+     *
+     * @param  ch the {@code char} value to be tested.
+     * @return {@code true} if the {@code char} value is between
+     *         {@link #MIN_SURROGATE} and
+     *         {@link #MAX_SURROGATE} inclusive;
+     *         {@code false} otherwise.
+     * @since  1.7
+     */
+    public static boolean isSurrogate(char ch) {
+        return ch >= MIN_SURROGATE && ch <= MAX_SURROGATE;
+    }
+
     /**
      * Determines whether the specified pair of <code>char</code>
-     * values is a valid surrogate pair. This method is equivalent to
-     * the expression:
+     * values is a valid
+     * <a href="http://www.unicode.org/glossary/#surrogate_pair">
+     * Unicode surrogate pair</a>.
+
+     * <p>This method is equivalent to the expression:
      * <blockquote><pre>
      * isHighSurrogate(high) && isLowSurrogate(low)
      * </pre></blockquote>
@@ -2784,8 +2821,13 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
      * @since  1.5
      */
     public static int toCodePoint(char high, char low) {
-        return ((high - MIN_HIGH_SURROGATE) << 10)
-            + (low - MIN_LOW_SURROGATE) + MIN_SUPPLEMENTARY_CODE_POINT;
+        // Optimized form of:
+        // return ((high - MIN_HIGH_SURROGATE) << 10)
+        //         + (low - MIN_LOW_SURROGATE)
+        //         + MIN_SUPPLEMENTARY_CODE_POINT;
+        return ((high << 10) + low) + (MIN_SUPPLEMENTARY_CODE_POINT
+                                       - (MIN_HIGH_SURROGATE << 10)
+                                       - MIN_LOW_SURROGATE);
     }
 
     /**
@@ -3071,9 +3113,10 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
     }
 
     static void toSurrogates(int codePoint, char[] dst, int index) {
-        int offset = codePoint - MIN_SUPPLEMENTARY_CODE_POINT;
-        dst[index+1] = (char)((offset & 0x3ff) + MIN_LOW_SURROGATE);
-        dst[index] = (char)((offset >>> 10) + MIN_HIGH_SURROGATE);
+        // We write elements "backwards" to guarantee all-or-nothing
+        dst[index+1] = (char)((codePoint & 0x3ff) + MIN_LOW_SURROGATE);
+        dst[index] = (char)((codePoint >>> 10)
+            + (MIN_HIGH_SURROGATE - (MIN_SUPPLEMENTARY_CODE_POINT >>> 10)));
     }
 
     /**
@@ -4962,7 +5005,7 @@ class Character extends Object implements java.io.Serializable, Comparable<Chara
 
     /**
      * The number of bits used to represent a <tt>char</tt> value in unsigned
-     * binary form.
+     * binary form, constant {@code 16}.
      *
      * @since 1.5
      */
diff --git a/jdk/src/share/classes/java/lang/ClassNotFoundException.java b/jdk/src/share/classes/java/lang/ClassNotFoundException.java
index 8da84456726..af3af4246a5 100644
--- a/jdk/src/share/classes/java/lang/ClassNotFoundException.java
+++ b/jdk/src/share/classes/java/lang/ClassNotFoundException.java
@@ -50,7 +50,7 @@ package java.lang;
  * @see     java.lang.ClassLoader#loadClass(java.lang.String, boolean)
  * @since   JDK1.0
  */
-public class ClassNotFoundException extends Exception {
+public class ClassNotFoundException extends ReflectiveOperationException {
     /**
      * use serialVersionUID from JDK 1.1.X for interoperability
      */
diff --git a/jdk/src/share/classes/java/lang/Double.java b/jdk/src/share/classes/java/lang/Double.java
index 9866d5d4aee..8efb241b808 100644
--- a/jdk/src/share/classes/java/lang/Double.java
+++ b/jdk/src/share/classes/java/lang/Double.java
@@ -529,6 +529,7 @@ public final class Double extends Number implements Comparable<Double> {
      * @param  s   the string to be parsed.
      * @return the {@code double} value represented by the string
      *         argument.
+     * @throws NullPointerException  if the string is null
      * @throws NumberFormatException if the string does not contain
      *         a parsable {@code double}.
      * @see    java.lang.Double#valueOf(String)
diff --git a/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java b/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java
index 4807691b210..a16b0e5bdfb 100644
--- a/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java
+++ b/jdk/src/share/classes/java/lang/EnumConstantNotPresentException.java
@@ -28,8 +28,12 @@ package java.lang;
 /**
  * Thrown when an application tries to access an enum constant by name
  * and the enum type contains no constant with the specified name.
+ * This exception can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since   1.5
  */
 public class EnumConstantNotPresentException extends RuntimeException {
diff --git a/jdk/src/share/classes/java/lang/Float.java b/jdk/src/share/classes/java/lang/Float.java
index 1c89a458fa7..eb133016f6b 100644
--- a/jdk/src/share/classes/java/lang/Float.java
+++ b/jdk/src/share/classes/java/lang/Float.java
@@ -438,12 +438,13 @@ public final class Float extends Number implements Comparable<Float> {
      * represented by the specified {@code String}, as performed
      * by the {@code valueOf} method of class {@code Float}.
      *
-     * @param      s   the string to be parsed.
+     * @param  s the string to be parsed.
      * @return the {@code float} value represented by the string
      *         argument.
-     * @throws  NumberFormatException  if the string does not contain a
+     * @throws NullPointerException  if the string is null
+     * @throws NumberFormatException if the string does not contain a
      *               parsable {@code float}.
-     * @see        java.lang.Float#valueOf(String)
+     * @see    java.lang.Float#valueOf(String)
      * @since 1.2
      */
     public static float parseFloat(String s) throws NumberFormatException {
diff --git a/jdk/src/share/classes/java/lang/IllegalAccessException.java b/jdk/src/share/classes/java/lang/IllegalAccessException.java
index 19b51b90fef..2dc609978fc 100644
--- a/jdk/src/share/classes/java/lang/IllegalAccessException.java
+++ b/jdk/src/share/classes/java/lang/IllegalAccessException.java
@@ -56,7 +56,7 @@ package java.lang;
  * @see     java.lang.reflect.Constructor#newInstance(Object[])
  * @since   JDK1.0
  */
-public class IllegalAccessException extends Exception {
+public class IllegalAccessException extends ReflectiveOperationException {
     private static final long serialVersionUID = 6616958222490762034L;
 
     /**
diff --git a/jdk/src/share/classes/java/lang/InstantiationException.java b/jdk/src/share/classes/java/lang/InstantiationException.java
index ace382ae437..fac48397cc8 100644
--- a/jdk/src/share/classes/java/lang/InstantiationException.java
+++ b/jdk/src/share/classes/java/lang/InstantiationException.java
@@ -43,7 +43,7 @@ package java.lang;
  * @since   JDK1.0
  */
 public
-class InstantiationException extends Exception {
+class InstantiationException extends ReflectiveOperationException {
     private static final long serialVersionUID = -8441929162975509110L;
 
     /**
diff --git a/jdk/src/share/classes/java/lang/NoSuchFieldException.java b/jdk/src/share/classes/java/lang/NoSuchFieldException.java
index b44fb173ebb..ce3adf2d289 100644
--- a/jdk/src/share/classes/java/lang/NoSuchFieldException.java
+++ b/jdk/src/share/classes/java/lang/NoSuchFieldException.java
@@ -31,7 +31,7 @@ package java.lang;
  * @author  unascribed
  * @since   JDK1.1
  */
-public class NoSuchFieldException extends Exception {
+public class NoSuchFieldException extends ReflectiveOperationException {
     private static final long serialVersionUID = -6143714805279938260L;
 
     /**
diff --git a/jdk/src/share/classes/java/lang/NoSuchMethodException.java b/jdk/src/share/classes/java/lang/NoSuchMethodException.java
index 720fbfcbbc6..dc8954b6cd0 100644
--- a/jdk/src/share/classes/java/lang/NoSuchMethodException.java
+++ b/jdk/src/share/classes/java/lang/NoSuchMethodException.java
@@ -32,7 +32,7 @@ package java.lang;
  * @since      JDK1.0
  */
 public
-class NoSuchMethodException extends Exception {
+class NoSuchMethodException extends ReflectiveOperationException {
     private static final long serialVersionUID = 5034388446362600923L;
 
     /**
diff --git a/jdk/src/share/classes/java/lang/ReflectiveOperationException.java b/jdk/src/share/classes/java/lang/ReflectiveOperationException.java
new file mode 100644
index 00000000000..d06613c6d2b
--- /dev/null
+++ b/jdk/src/share/classes/java/lang/ReflectiveOperationException.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package java.lang;
+
+/**
+ * Common superclass of exceptions thrown by reflective operations in
+ * core reflection.
+ *
+ * @see LinkageError
+ * @since 1.7
+ */
+public class ReflectiveOperationException extends Exception {
+    static final long serialVersionUID = 123456789L;
+
+    /**
+     * Constructs a new exception with {@code null} as its detail
+     * message.  The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     */
+    public ReflectiveOperationException() {
+        super();
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message.
+     * The cause is not initialized, and may subsequently be
+     * initialized by a call to {@link #initCause}.
+     *
+     * @param   message   the detail message. The detail message is saved for
+     *          later retrieval by the {@link #getMessage()} method.
+     */
+    public ReflectiveOperationException(String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new exception with the specified detail message
+     * and cause.
+     *
+     * <p>Note that the detail message associated with
+     * {@code cause} is <em>not</em> automatically incorporated in
+     * this exception's detail message.
+     *
+     * @param  message the detail message (which is saved for later retrieval
+     *         by the {@link #getMessage()} method).
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     */
+    public ReflectiveOperationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Constructs a new exception with the specified cause and a detail
+     * message of {@code (cause==null ? null : cause.toString())} (which
+     * typically contains the class and detail message of {@code cause}).
+     *
+     * @param  cause the cause (which is saved for later retrieval by the
+     *         {@link #getCause()} method).  (A {@code null} value is
+     *         permitted, and indicates that the cause is nonexistent or
+     *         unknown.)
+     */
+    public ReflectiveOperationException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/jdk/src/share/classes/java/lang/String.java b/jdk/src/share/classes/java/lang/String.java
index 316da645f3c..e4327434c38 100644
--- a/jdk/src/share/classes/java/lang/String.java
+++ b/jdk/src/share/classes/java/lang/String.java
@@ -2301,6 +2301,54 @@ public final class String
      * @spec JSR-51
      */
     public String[] split(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.count == 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<String>();
+            while ((next = indexOf(ch, off)) != -1) {
+                if (!limited || list.size() < limit - 1) {
+                    list.add(substring(off, next));
+                    off = next + 1;
+                } else {    // last one
+                    //assert (list.size() == limit - 1);
+                    list.add(substring(off, count));
+                    off = count;
+                    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(substring(off, count));
+
+            // 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);
     }
 
diff --git a/jdk/src/share/classes/java/lang/TypeNotPresentException.java b/jdk/src/share/classes/java/lang/TypeNotPresentException.java
index d7fa0d6bdeb..72b708393d1 100644
--- a/jdk/src/share/classes/java/lang/TypeNotPresentException.java
+++ b/jdk/src/share/classes/java/lang/TypeNotPresentException.java
@@ -35,8 +35,12 @@ package java.lang;
  * <p>Note that this exception may be used when undefined type variables
  * are accessed as well as when types (e.g., classes, interfaces or
  * annotation types) are loaded.
+ * In particular, this exception can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since 1.5
  */
 public class TypeNotPresentException extends RuntimeException {
diff --git a/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java b/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java
index 0bc2fd15169..0263907cdba 100644
--- a/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java
+++ b/jdk/src/share/classes/java/lang/annotation/AnnotationFormatError.java
@@ -28,8 +28,12 @@ package java.lang.annotation;
 /**
  * Thrown when the annotation parser attempts to read an annotation
  * from a class file and determines that the annotation is malformed.
+ * This error can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since   1.5
  */
 public class AnnotationFormatError extends Error {
diff --git a/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java b/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
index c4cb7534c31..830b1f98dfe 100644
--- a/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
+++ b/jdk/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java
@@ -30,8 +30,12 @@ import java.lang.reflect.Method;
  * Thrown to indicate that a program has attempted to access an element of
  * an annotation whose type has changed after the annotation was compiled
  * (or serialized).
+ * This exception can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since 1.5
  */
 public class AnnotationTypeMismatchException extends RuntimeException {
diff --git a/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java b/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
index 04070a1bbd4..9d5f43e1ad6 100644
--- a/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
+++ b/jdk/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java
@@ -30,8 +30,12 @@ package java.lang.annotation;
  * an annotation type that was added to the annotation type definition after
  * the annotation was compiled (or serialized).  This exception will not be
  * thrown if the new element has a default value.
+ * This exception can be thrown by the {@linkplain
+ * java.lang.reflect.AnnotatedElement API used to read annotations
+ * reflectively}.
  *
  * @author  Josh Bloch
+ * @see     java.lang.reflect.AnnotatedElement
  * @since 1.5
  */
 public class IncompleteAnnotationException extends RuntimeException {
diff --git a/jdk/src/share/classes/java/lang/instrument/Instrumentation.java b/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
index e2b58b54872..4c2dc1ae976 100644
--- a/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
+++ b/jdk/src/share/classes/java/lang/instrument/Instrumentation.java
@@ -81,7 +81,7 @@ public interface Instrumentation {
      * an exception during execution, the JVM will still call the other registered
      * transformers in order. The same transformer may be added more than once,
      * but it is strongly discouraged -- avoid this by creating a new instance of
-     * tranformer class.
+     * transformer class.
      * <P>
      * This method is intended for use in instrumentation, as described in the
      * {@linkplain Instrumentation class specification}.
@@ -183,7 +183,7 @@ public interface Instrumentation {
      * <P>
      *
      * The order of transformation is described in the
-     * ({@link java.lang.instrument.ClassFileTransformer#transform transform} method.
+     * {@link java.lang.instrument.ClassFileTransformer#transform transform} method.
      * This same order is used in the automatic reapplication of retransformation
      * incapable transforms.
      * <P>
@@ -424,7 +424,7 @@ public interface Instrumentation {
      * classes or resources other than those to be defined by the bootstrap
      * class loader for the purpose of instrumentation.
      * Failure to observe this warning could result in unexpected
-     * behaviour that is difficult to diagnose. For example, suppose there is a
+     * behavior that is difficult to diagnose. For example, suppose there is a
      * loader L, and L's parent for delegation is the bootstrap class loader.
      * Furthermore, a method in class C, a class defined by L, makes reference to
      * a non-public accessor class C$1. If the JAR file contains a class C$1 then
@@ -475,9 +475,9 @@ public interface Instrumentation {
      * classes or resources other than those to be defined by the system class
      * loader for the purpose of instrumentation.
      * Failure to observe this warning could result in unexpected
-     * behaviour that is difficult to diagnose (see
+     * behavior that is difficult to diagnose (see
      * {@link #appendToBootstrapClassLoaderSearch
-     * appendToBootstrapClassLoaderSearch}.
+     * appendToBootstrapClassLoaderSearch}).
      *
      * <p> The system class loader supports adding a JAR file to be searched if
      * it implements a method named <code>appendToClassPathForInstrumentation</code>
@@ -485,7 +485,7 @@ public interface Instrumentation {
      * method is not required to have <code>public</code> access. The name of
      * the JAR file is obtained by invoking the {@link java.util.zip.ZipFile#getName
      * getName()} method on the <code>jarfile</code> and this is provided as the
-     * parameter to the <code>appendtoClassPathForInstrumentation</code> method.
+     * parameter to the <code>appendToClassPathForInstrumentation</code> method.
      *
      * <p> The <a href="http://java.sun.com/docs/books/vmspec/">Java Virtual Machine
      * Specification</a> specifies that a subsequent attempt to resolve a symbolic
diff --git a/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java b/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
index 41436d63c0e..0601168a0a0 100644
--- a/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
@@ -50,6 +50,11 @@ import java.lang.annotation.Annotation;
  * java.lang.annotation.AnnotationTypeMismatchException} or an
  * {@link java.lang.annotation.IncompleteAnnotationException}.
  *
+ * @see java.lang.EnumConstantNotPresentException
+ * @see java.lang.TypeNotPresentException
+ * @see java.lang.annotation.AnnotationFormatError
+ * @see java.lang.annotation.AnnotationTypeMismatchException
+ * @see java.lang.annotation.IncompleteAnnotationException
  * @since 1.5
  * @author Josh Bloch
  */
diff --git a/jdk/src/share/classes/java/lang/reflect/Constructor.java b/jdk/src/share/classes/java/lang/reflect/Constructor.java
index 0c101ccacb8..bdd158a3eb8 100644
--- a/jdk/src/share/classes/java/lang/reflect/Constructor.java
+++ b/jdk/src/share/classes/java/lang/reflect/Constructor.java
@@ -82,10 +82,6 @@ public final
     // remembering the last Class for which the check succeeded.
     private volatile Class securityCheckCache;
 
-    // Modifiers that can be applied to a constructor in source code
-    private static final int LANGUAGE_MODIFIERS =
-        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE;
-
     // Generics infrastructure
     // Accessor for factory
     private GenericsFactory getFactory() {
@@ -359,7 +355,7 @@ public final
     public String toString() {
         try {
             StringBuffer sb = new StringBuffer();
-            int mod = getModifiers() & LANGUAGE_MODIFIERS;
+            int mod = getModifiers() & Modifier.constructorModifiers();
             if (mod != 0) {
                 sb.append(Modifier.toString(mod) + " ");
             }
@@ -423,7 +419,7 @@ public final
     public String toGenericString() {
         try {
             StringBuilder sb = new StringBuilder();
-            int mod = getModifiers() & LANGUAGE_MODIFIERS;
+            int mod = getModifiers() & Modifier.constructorModifiers();
             if (mod != 0) {
                 sb.append(Modifier.toString(mod) + " ");
             }
diff --git a/jdk/src/share/classes/java/lang/reflect/InvocationTargetException.java b/jdk/src/share/classes/java/lang/reflect/InvocationTargetException.java
index 28f3b206297..048d04cacbf 100644
--- a/jdk/src/share/classes/java/lang/reflect/InvocationTargetException.java
+++ b/jdk/src/share/classes/java/lang/reflect/InvocationTargetException.java
@@ -39,7 +39,7 @@ package java.lang.reflect;
  * @see Method
  * @see Constructor
  */
-public class InvocationTargetException extends Exception {
+public class InvocationTargetException extends ReflectiveOperationException {
     /**
      * Use serialVersionUID from JDK 1.1.X for interoperability
      */
diff --git a/jdk/src/share/classes/java/lang/reflect/Method.java b/jdk/src/share/classes/java/lang/reflect/Method.java
index c638869cd38..1c660f2dca8 100644
--- a/jdk/src/share/classes/java/lang/reflect/Method.java
+++ b/jdk/src/share/classes/java/lang/reflect/Method.java
@@ -88,12 +88,6 @@ public final
     private Class securityCheckCache;
     private Class securityCheckTargetClassCache;
 
-    // Modifiers that can be applied to a method in source code
-    private static final int LANGUAGE_MODIFIERS =
-        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
-        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.FINAL   |
-        Modifier.SYNCHRONIZED   | Modifier.NATIVE;
-
    // Generics infrastructure
 
     private String getGenericSignature() {return signature;}
@@ -408,12 +402,12 @@ public final
      * {@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 synchronized}, {@code native}, {@code strictfp}.
      */
     public String toString() {
         try {
             StringBuffer sb = new StringBuffer();
-            int mod = getModifiers() & LANGUAGE_MODIFIERS;
+            int mod = getModifiers() & Modifier.methodModifiers();
             if (mod != 0) {
                 sb.append(Modifier.toString(mod) + " ");
             }
@@ -473,7 +467,7 @@ public final
      * {@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 synchronized}, {@code native}, {@code strictfp}.
      *
      * @return a string describing this {@code Method},
      * include type parameters
@@ -483,7 +477,7 @@ public final
     public String toGenericString() {
         try {
             StringBuilder sb = new StringBuilder();
-            int mod = getModifiers() & LANGUAGE_MODIFIERS;
+            int mod = getModifiers() & Modifier.methodModifiers();
             if (mod != 0) {
                 sb.append(Modifier.toString(mod) + " ");
             }
diff --git a/jdk/src/share/classes/java/lang/reflect/Modifier.java b/jdk/src/share/classes/java/lang/reflect/Modifier.java
index 2882f04722f..f32822c2f09 100644
--- a/jdk/src/share/classes/java/lang/reflect/Modifier.java
+++ b/jdk/src/share/classes/java/lang/reflect/Modifier.java
@@ -235,6 +235,11 @@ class Modifier {
      * possible validity of the combination of modifiers represented
      * by the input.
      *
+     * Note that to perform such checking for a known kind of entity,
+     * such as a constructor or method, first AND the argument of
+     * {@code toString} with the appropriate mask from a method like
+     * {@link #constructorModifiers} or {@link #methodModifiers}.
+     *
      * @param   mod a set of modifiers
      * @return  a string representation of the set of modifiers
      * represented by {@code mod}
@@ -353,4 +358,108 @@ class Modifier {
     static boolean isSynthetic(int mod) {
       return (mod & SYNTHETIC) != 0;
     }
+
+    /**
+     * See JLSv3 section 8.1.1.
+     */
+    private static final int CLASS_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
+        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.FINAL   |
+        Modifier.STRICT;
+
+    /**
+     * See JLSv3 section 9.1.1.
+     */
+    private static final int INTERFACE_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
+        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.STRICT;
+
+
+    /**
+     * See JLSv3 section 8.8.3.
+     */
+    private static final int CONSTRUCTOR_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE;
+
+    /**
+     * See JLSv3 section 8.4.3.
+     */
+    private static final int METHOD_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
+        Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.FINAL   |
+        Modifier.SYNCHRONIZED   | Modifier.NATIVE       | Modifier.STRICT;
+
+    /**
+     * See JLSv3 section 8.3.1.
+     */
+    private static final int FIELD_MODIFIERS =
+        Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
+        Modifier.STATIC         | Modifier.FINAL        | Modifier.TRANSIENT |
+        Modifier.VOLATILE;
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a class.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a class.
+     *
+     * @jls3 8.1.1 Class Modifiers
+     * @since 1.7
+     */
+    public static int classModifiers() {
+        return CLASS_MODIFIERS;
+    }
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to an interface.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to an inteface.
+     *
+     * @jls3 9.1.1 Interface Modifiers
+     * @since 1.7
+     */
+    public static int interfaceModifiers() {
+        return INTERFACE_MODIFIERS;
+    }
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a constructor.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a constructor.
+     *
+     * @jls3 8.8.3 Constructor Modifiers
+     * @since 1.7
+     */
+    public static int constructorModifiers() {
+        return CONSTRUCTOR_MODIFIERS;
+    }
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a method.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a method.
+     *
+     * @jls3 8.4.3 Method Modifiers
+     * @since 1.7
+     */
+    public static int methodModifiers() {
+        return METHOD_MODIFIERS;
+    }
+
+
+    /**
+     * Return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a field.
+     * @return an {@code int} value OR-ing together the source language
+     * modifiers that can be applied to a field.
+     *
+     * @jls3 8.3.1 Field Modifiers
+     * @since 1.7
+     */
+    public static int fieldModifiers() {
+        return FIELD_MODIFIERS;
+    }
 }
diff --git a/jdk/src/share/classes/java/math/BigDecimal.java b/jdk/src/share/classes/java/math/BigDecimal.java
index 0feec208bb9..4d76b4010e7 100644
--- a/jdk/src/share/classes/java/math/BigDecimal.java
+++ b/jdk/src/share/classes/java/math/BigDecimal.java
@@ -315,6 +315,10 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
         new BigDecimal(BigInteger.ZERO, 0, 15, 1),
     };
 
+    // Half of Long.MIN_VALUE & Long.MAX_VALUE.
+    private static final long HALF_LONG_MAX_VALUE = Long.MAX_VALUE / 2;
+    private static final long HALF_LONG_MIN_VALUE = Long.MIN_VALUE / 2;
+
     // Constants
     /**
      * The value 0, with a scale of 0.
@@ -1455,10 +1459,15 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
             } else if (roundingMode == ROUND_FLOOR) {   // Towards -infinity
                 increment = (qsign < 0);
             } else {
-                if (isLongDivision || ldivisor != INFLATED)
-                    cmpFracHalf = longCompareMagnitude(2 * r, ldivisor);
-                else
+                if (isLongDivision || ldivisor != INFLATED) {
+                    if (r <= HALF_LONG_MIN_VALUE || r > HALF_LONG_MAX_VALUE) {
+                        cmpFracHalf = 1;    // 2 * r can't fit into long
+                    } else {
+                        cmpFracHalf = longCompareMagnitude(2 * r, ldivisor);
+                    }
+                } else {
                     cmpFracHalf = mr.compareHalf(mdivisor);
+                }
                 if (cmpFracHalf < 0)
                     increment = false;     // We're closer to higher digit
                 else if (cmpFracHalf > 0)  // We're closer to lower digit
diff --git a/jdk/src/share/classes/java/net/Socket.java b/jdk/src/share/classes/java/net/Socket.java
index e0769176af3..39dfebd4180 100644
--- a/jdk/src/share/classes/java/net/Socket.java
+++ b/jdk/src/share/classes/java/net/Socket.java
@@ -114,9 +114,14 @@ class Socket implements java.io.Closeable {
      * @since   1.5
      */
     public Socket(Proxy proxy) {
-        if (proxy != null && proxy.type() == Proxy.Type.SOCKS) {
+        // Create a copy of Proxy as a security measure
+        if (proxy == null) {
+            throw new IllegalArgumentException("Invalid Proxy");
+        }
+        Proxy p = proxy == Proxy.NO_PROXY ? Proxy.NO_PROXY : sun.net.ApplicationProxy.create(proxy);
+        if (p.type() == Proxy.Type.SOCKS) {
             SecurityManager security = System.getSecurityManager();
-            InetSocketAddress epoint = (InetSocketAddress) proxy.address();
+            InetSocketAddress epoint = (InetSocketAddress) p.address();
             if (security != null) {
                 if (epoint.isUnresolved())
                     security.checkConnect(epoint.getHostName(),
@@ -125,10 +130,10 @@ class Socket implements java.io.Closeable {
                     security.checkConnect(epoint.getAddress().getHostAddress(),
                                           epoint.getPort());
             }
-            impl = new SocksSocketImpl(proxy);
+            impl = new SocksSocketImpl(p);
             impl.setSocket(this);
         } else {
-            if (proxy == Proxy.NO_PROXY) {
+            if (p == Proxy.NO_PROXY) {
                 if (factory == null) {
                     impl = new PlainSocketImpl();
                     impl.setSocket(this);
diff --git a/jdk/src/share/classes/java/net/SocksSocketImpl.java b/jdk/src/share/classes/java/net/SocksSocketImpl.java
index 549f910798b..383ac2fcbf6 100644
--- a/jdk/src/share/classes/java/net/SocksSocketImpl.java
+++ b/jdk/src/share/classes/java/net/SocksSocketImpl.java
@@ -46,6 +46,9 @@ class SocksSocketImpl extends PlainSocketImpl implements SocksConsts {
     private Socket cmdsock = null;
     private InputStream cmdIn = null;
     private OutputStream cmdOut = null;
+    /* true if the Proxy has been set programatically */
+    private boolean applicationSetProxy;  /* false */
+
 
     SocksSocketImpl() {
         // Nothing needed
@@ -237,8 +240,7 @@ class SocksSocketImpl extends PlainSocketImpl implements SocksConsts {
         out.write((endpoint.getPort() >> 8) & 0xff);
         out.write((endpoint.getPort() >> 0) & 0xff);
         out.write(endpoint.getAddress().getAddress());
-        String userName = java.security.AccessController.doPrivileged(
-               new sun.security.action.GetPropertyAction("user.name"));
+        String userName = getUserName();
         try {
             out.write(userName.getBytes("ISO-8859-1"));
         } catch (java.io.UnsupportedEncodingException uee) {
@@ -554,8 +556,7 @@ class SocksSocketImpl extends PlainSocketImpl implements SocksConsts {
         out.write((super.getLocalPort() >> 8) & 0xff);
         out.write((super.getLocalPort() >> 0) & 0xff);
         out.write(addr1);
-        String userName = java.security.AccessController.doPrivileged(
-               new sun.security.action.GetPropertyAction("user.name"));
+        String userName = getUserName();
         try {
             out.write(userName.getBytes("ISO-8859-1"));
         } catch (java.io.UnsupportedEncodingException uee) {
@@ -1022,4 +1023,16 @@ class SocksSocketImpl extends PlainSocketImpl implements SocksConsts {
         super.close();
     }
 
+    private String getUserName() {
+        String userName = "";
+        if (applicationSetProxy) {
+            try {
+                userName = System.getProperty("user.name");
+            } catch (SecurityException se) { /* swallow Exception */ }
+        } else {
+            userName = java.security.AccessController.doPrivileged(
+                new sun.security.action.GetPropertyAction("user.name"));
+        }
+        return userName;
+    }
 }
diff --git a/jdk/src/share/classes/java/net/URL.java b/jdk/src/share/classes/java/net/URL.java
index bb934d9b745..33cfe039654 100644
--- a/jdk/src/share/classes/java/net/URL.java
+++ b/jdk/src/share/classes/java/net/URL.java
@@ -1004,16 +1004,18 @@ public final class URL implements java.io.Serializable {
             throw new IllegalArgumentException("proxy can not be null");
         }
 
+        // Create a copy of Proxy as a security measure
+        Proxy p = proxy == Proxy.NO_PROXY ? Proxy.NO_PROXY : sun.net.ApplicationProxy.create(proxy);
         SecurityManager sm = System.getSecurityManager();
-        if (proxy.type() != Proxy.Type.DIRECT && sm != null) {
-            InetSocketAddress epoint = (InetSocketAddress) proxy.address();
+        if (p.type() != Proxy.Type.DIRECT && sm != null) {
+            InetSocketAddress epoint = (InetSocketAddress) p.address();
             if (epoint.isUnresolved())
                 sm.checkConnect(epoint.getHostName(), epoint.getPort());
             else
                 sm.checkConnect(epoint.getAddress().getHostAddress(),
                                 epoint.getPort());
         }
-        return handler.openConnection(this, proxy);
+        return handler.openConnection(this, p);
     }
 
     /**
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
index 7bc43357479..2b2c8226d4f 100644
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousByteChannel.java
@@ -56,18 +56,18 @@ public interface AsynchronousByteChannel
     /**
      * Reads a sequence of bytes from this channel into the given buffer.
      *
-     * <p> This method initiates an operation to read a sequence of bytes from
-     * this channel into the given buffer. The method returns a {@link Future}
-     * representing the pending result of the operation. The result of the
-     * operation, obtained by invoking the {@code Future} 's {@link
-     * Future#get() get} method, is the number of bytes read or {@code -1} if
-     * all bytes have been read and the channel has reached end-of-stream.
+     * <p> This method initiates an asynchronous read operation to read a
+     * sequence of bytes from this channel into the given buffer. The {@code
+     * handler} parameter is a completion handler that is invoked when the read
+     * operation completes (or fails). The result passed to the completion
+     * handler is the number of bytes read or {@code -1} if no bytes could be
+     * read because the channel has reached end-of-stream.
      *
-     * <p> This method initiates a read operation to read up to <i>r</i> bytes
-     * from the channel, where <i>r</i> is the number of bytes remaining in the
-     * buffer, that is, {@code dst.remaining()} at the time that the read is
-     * attempted. Where <i>r</i> is 0, the read operation completes immediately
-     * with a result of {@code 0} without initiating an I/O operation.
+     * <p> The read operation may read up to <i>r</i> bytes from the channel,
+     * where <i>r</i> is the number of bytes remaining in the buffer, that is,
+     * {@code dst.remaining()} at the time that the read is attempted. Where
+     * <i>r</i> is 0, the read operation completes immediately with a result of
+     * {@code 0} without initiating an I/O operation.
      *
      * <p> Suppose that a byte sequence of length <i>n</i> is read, where
      * <tt>0</tt>&nbsp;<tt>&lt;</tt>&nbsp;<i>n</i>&nbsp;<tt>&lt;=</tt>&nbsp;<i>r</i>.
@@ -79,44 +79,46 @@ public interface AsynchronousByteChannel
      * <i>p</i>&nbsp;<tt>+</tt>&nbsp;<i>n</i>; its limit will not have changed.
      *
      * <p> Buffers are not safe for use by multiple concurrent threads so care
-     * should be taken to not to access the buffer until the operaton has completed.
+     * should be taken to not access the buffer until the operation has
+     * completed.
      *
      * <p> This method may be invoked at any time. Some channel types may not
      * allow more than one read to be outstanding at any given time. If a thread
      * initiates a read operation before a previous read operation has
      * completed then a {@link ReadPendingException} will be thrown.
      *
-     * <p> The <tt>handler</tt> parameter is used to specify a {@link
-     * CompletionHandler}. When the read operation completes the handler's
-     * {@link CompletionHandler#completed completed} method is executed.
-     *
-     *
      * @param   dst
      *          The buffer into which bytes are to be transferred
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The completion handler object; can be {@code null}
-     *
-     * @return  A Future representing the result of the operation
+     *          The completion handler
      *
      * @throws  IllegalArgumentException
      *          If the buffer is read-only
      * @throws  ReadPendingException
      *          If the channel does not allow more than one read to be outstanding
      *          and a previous read has not completed
+     * @throws  ShutdownChannelGroupException
+     *          If the channel is associated with a {@link AsynchronousChannelGroup
+     *          group} that has terminated
      */
-    <A> Future<Integer> read(ByteBuffer dst,
-                             A attachment,
-                             CompletionHandler<Integer,? super A> handler);
+    <A> void read(ByteBuffer dst,
+                  A attachment,
+                  CompletionHandler<Integer,? super A> handler);
 
     /**
      * Reads a sequence of bytes from this channel into the given buffer.
      *
-     * <p> An invocation of this method of the form <tt>c.read(dst)</tt>
-     * behaves in exactly the same manner as the invocation
-     * <blockquote><pre>
-     * c.read(dst, null, null);</pre></blockquote>
+     * <p> This method initiates an asynchronous read operation to read a
+     * sequence of bytes from this channel into the given buffer. The method
+     * behaves in exactly the same manner as the {@link
+     * #read(ByteBuffer,Object,CompletionHandler)
+     * read(ByteBuffer,Object,CompletionHandler)} method except that instead
+     * of specifying a completion handler, this method returns a {@code Future}
+     * representing the pending result. The {@code Future}'s {@link Future#get()
+     * get} method returns the number of bytes read or {@code -1} if no bytes
+     * could be read because the channel has reached end-of-stream.
      *
      * @param   dst
      *          The buffer into which bytes are to be transferred
@@ -134,17 +136,17 @@ public interface AsynchronousByteChannel
     /**
      * Writes a sequence of bytes to this channel from the given buffer.
      *
-     * <p> This method initiates an operation to write a sequence of bytes to
-     * this channel from the given buffer. This method returns a {@link
-     * Future} representing the pending result of the operation. The result
-     * of the operation, obtained by invoking the <tt>Future</tt>'s {@link
-     * Future#get() get} method, is the number of bytes written, possibly zero.
+     * <p> This method initiates an asynchronous write operation to write a
+     * sequence of bytes to this channel from the given buffer. The {@code
+     * handler} parameter is a completion handler that is invoked when the write
+     * operation completes (or fails). The result passed to the completion
+     * handler is the number of bytes written.
      *
-     * <p> This method initiates a write operation to write up to <i>r</i> bytes
-     * to the channel, where <i>r</i> is the number of bytes remaining in the
-     * buffer, that is, {@code src.remaining()}  at the moment the write is
-     * attempted. Where <i>r</i> is 0, the write operation completes immediately
-     * with a result of {@code 0} without initiating an I/O operation.
+     * <p> The write operation may write up to <i>r</i> bytes to the channel,
+     * where <i>r</i> is the number of bytes remaining in the buffer, that is,
+     * {@code src.remaining()} at the time that the write is attempted. Where
+     * <i>r</i> is 0, the write operation completes immediately with a result of
+     * {@code 0} without initiating an I/O operation.
      *
      * <p> Suppose that a byte sequence of length <i>n</i> is written, where
      * <tt>0</tt>&nbsp;<tt>&lt;</tt>&nbsp;<i>n</i>&nbsp;<tt>&lt;=</tt>&nbsp;<i>r</i>.
@@ -156,41 +158,43 @@ public interface AsynchronousByteChannel
      * <i>p</i>&nbsp;<tt>+</tt>&nbsp;<i>n</i>; its limit will not have changed.
      *
      * <p> Buffers are not safe for use by multiple concurrent threads so care
-     * should be taken to not to access the buffer until the operaton has completed.
+     * should be taken to not access the buffer until the operation has
+     * completed.
      *
      * <p> This method may be invoked at any time. Some channel types may not
      * allow more than one write to be outstanding at any given time. If a thread
      * initiates a write operation before a previous write operation has
      * completed then a {@link WritePendingException} will be thrown.
      *
-     * <p> The <tt>handler</tt> parameter is used to specify a {@link
-     * CompletionHandler}. When the write operation completes the handler's
-     * {@link CompletionHandler#completed completed} method is executed.
-     *
      * @param   src
      *          The buffer from which bytes are to be retrieved
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The completion handler object; can be {@code null}
-     *
-     * @return  A Future representing the result of the operation
+     *          The completion handler object
      *
      * @throws  WritePendingException
      *          If the channel does not allow more than one write to be outstanding
      *          and a previous write has not completed
+     * @throws  ShutdownChannelGroupException
+     *          If the channel is associated with a {@link AsynchronousChannelGroup
+     *          group} that has terminated
      */
-    <A> Future<Integer> write(ByteBuffer src,
-                              A attachment,
-                              CompletionHandler<Integer,? super A> handler);
+    <A> void write(ByteBuffer src,
+                   A attachment,
+                   CompletionHandler<Integer,? super A> handler);
 
     /**
      * Writes a sequence of bytes to this channel from the given buffer.
      *
-     * <p> An invocation of this method of the form <tt>c.write(src)</tt>
-     * behaves in exactly the same manner as the invocation
-     * <blockquote><pre>
-     * c.write(src, null, null);</pre></blockquote>
+     * <p> This method initiates an asynchronous write operation to write a
+     * sequence of bytes to this channel from the given buffer. The method
+     * behaves in exactly the same manner as the {@link
+     * #write(ByteBuffer,Object,CompletionHandler)
+     * write(ByteBuffer,Object,CompletionHandler)} method except that instead
+     * of specifying a completion handler, this method returns a {@code Future}
+     * representing the pending result. The {@code Future}'s {@link Future#get()
+     * get} method returns the number of bytes written.
      *
      * @param   src
      *          The buffer from which bytes are to be retrieved
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java
index f3e4ffe4ea5..69ee8bd65d7 100644
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousChannel.java
@@ -34,7 +34,8 @@ import java.util.concurrent.Future;  // javadoc
  *
  * <ol>
  * <li><pre>{@link Future}&lt;V&gt; <em>operation</em>(<em>...</em>)</pre></li>
- * <li><pre>Future&lt;V&gt; <em>operation</em>(<em>...</em> A attachment, {@link CompletionHandler}&lt;V,? super A&gt handler)</pre></li>
+ * <li><pre>void <em>operation</em>(<em>...</em> A attachment, {@link
+ *   CompletionHandler}&lt;V,? super A&gt; handler)</pre></li>
  * </ol>
  *
  * where <i>operation</i> is the name of the I/O operation (read or write for
@@ -48,7 +49,7 @@ import java.util.concurrent.Future;  // javadoc
  * interface may be used to check if the operation has completed, wait for its
  * completion, and to retrieve the result. In the second form, a {@link
  * CompletionHandler} is invoked to consume the result of the I/O operation when
- * it completes, fails, or is cancelled.
+ * it completes or fails.
  *
  * <p> A channel that implements this interface is <em>asynchronously
  * closeable</em>: If an I/O operation is outstanding on the channel and the
@@ -63,33 +64,33 @@ import java.util.concurrent.Future;  // javadoc
  * <h4>Cancellation</h4>
  *
  * <p> The {@code Future} interface defines the {@link Future#cancel cancel}
- * method to cancel execution of a task.
+ * method to cancel execution. This causes all threads waiting on the result of
+ * the I/O operation to throw {@link java.util.concurrent.CancellationException}.
+ * Whether the underlying I/O operation can be cancelled is highly implementation
+ * specific and therefore not specified. Where cancellation leaves the channel,
+ * or the entity to which it is connected, in an inconsistent state, then the
+ * channel is put into an implementation specific <em>error state</em> that
+ * prevents further attempts to initiate I/O operations that are <i>similar</i>
+ * to the operation that was cancelled. For example, if a read operation is
+ * cancelled but the implementation cannot guarantee that bytes have not been
+ * read from the channel then it puts the channel into an error state; further
+ * attempts to initiate a {@code read} operation cause an unspecified runtime
+ * exception to be thrown. Similarly, if a write operation is cancelled but the
+ * implementation cannot guarantee that bytes have not been written to the
+ * channel then subsequent attempts to initiate a {@code write} will fail with
+ * an unspecified runtime exception.
  *
- * <p> Where the {@code cancel} method is invoked with the {@code
+ * <p> Where the {@link Future#cancel cancel} method is invoked with the {@code
  * mayInterruptIfRunning} parameter set to {@code true} then the I/O operation
- * may be interrupted by closing the channel. This will cause any other I/O
- * operations outstanding on the channel to complete with the exception {@link
- * AsynchronousCloseException}.
- *
- * <p> If a {@code CompletionHandler} is specified when initiating an I/O
- * operation, and the {@code cancel} method is invoked to cancel the I/O
- * operation before it completes, then the {@code CompletionHandler}'s {@link
- * CompletionHandler#cancelled cancelled} method is invoked.
- *
- * <p> If an implementation of this interface supports a means to cancel I/O
- * operations, and where cancellation may leave the channel, or the entity to
- * which it is connected, in an inconsistent state, then the channel is put into
- * an implementation specific <em>error state</em> that prevents further
- * attempts to initiate I/O operations on the channel. For example, if a read
- * operation is cancelled but the implementation cannot guarantee that bytes
- * have not been read from the channel then it puts the channel into error state
- * state; further attempts to initiate a {@code read} operation causes an
- * unspecified runtime exception to be thrown.
+ * may be interrupted by closing the channel. In that case all threads waiting
+ * on the result of the I/O operation throw {@code CancellationException} and
+ * any other I/O operations outstanding on the channel complete with the
+ * exception {@link AsynchronousCloseException}.
  *
  * <p> Where the {@code cancel} method is invoked to cancel read or write
- * operations then it recommended that all buffers used in the I/O operations be
- * discarded or care taken to ensure that the buffers are not accessed while the
- * channel remains open.
+ * operations then it is recommended that all buffers used in the I/O operations
+ * be discarded or care taken to ensure that the buffers are not accessed while
+ * the channel remains open.
  *
  *  @since 1.7
  */
@@ -102,7 +103,7 @@ public interface AsynchronousChannel
      *
      * <p> Any outstanding asynchronous operations upon this channel will
      * complete with the exception {@link AsynchronousCloseException}. After a
-     * channel is closed then further attempts to initiate asynchronous I/O
+     * channel is closed, further attempts to initiate asynchronous I/O
      * operations complete immediately with cause {@link ClosedChannelException}.
      *
      * <p>  This method otherwise behaves exactly as specified by the {@link
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
index 65b90d0f29d..a229ce62737 100644
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
@@ -109,19 +109,13 @@ import java.nio.ByteBuffer;
  *  // print the source address of all packets that we receive
  *  dc.receive(buffer, buffer, new CompletionHandler&lt;SocketAddress,ByteBuffer&gt;() {
  *      public void completed(SocketAddress sa, ByteBuffer buffer) {
- *          try {
- *               System.out.println(sa);
- *
- *               buffer.clear();
- *               dc.receive(buffer, buffer, this);
- *           } catch (...) { ... }
+ *          System.out.println(sa);
+ *          buffer.clear();
+ *          dc.receive(buffer, buffer, this);
  *      }
  *      public void failed(Throwable exc, ByteBuffer buffer) {
  *          ...
  *      }
- *      public void cancelled(ByteBuffer buffer) {
- *          ...
- *      }
  *  });
  * </pre>
  *
@@ -314,10 +308,10 @@ public abstract class AsynchronousDatagramChannel
     /**
      * Receives a datagram via this channel.
      *
-     * <p> This method initiates the receiving of a datagram, returning a
-     * {@code Future} representing the pending result of the operation.
-     * The {@code Future}'s {@link Future#get() get} method returns
-     * the source address of the datagram upon successful completion.
+     * <p> This method initiates the receiving of a datagram into the given
+     * buffer. The {@code handler} parameter is a completion handler that is
+     * invoked when the receive operation completes (or fails). The result
+     * passed to the completion handler is the datagram's source address.
      *
      * <p> The datagram is transferred into the given byte buffer starting at
      * its current position, as if by a regular {@link AsynchronousByteChannel#read
@@ -350,28 +344,26 @@ public abstract class AsynchronousDatagramChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  a {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IllegalArgumentException
      *          If the timeout is negative or the buffer is read-only
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public abstract <A> Future<SocketAddress> receive(ByteBuffer dst,
-                                                      long timeout,
-                                                      TimeUnit unit,
-                                                      A attachment,
-                                                      CompletionHandler<SocketAddress,? super A> handler);
+    public abstract <A> void receive(ByteBuffer dst,
+                                     long timeout,
+                                     TimeUnit unit,
+                                     A attachment,
+                                     CompletionHandler<SocketAddress,? super A> handler);
 
     /**
      * Receives a datagram via this channel.
      *
-     * <p> This method initiates the receiving of a datagram, returning a
-     * {@code Future} representing the pending result of the operation.
-     * The {@code Future}'s {@link Future#get() get} method returns
-     * the source address of the datagram upon successful completion.
+     * <p> This method initiates the receiving of a datagram into the given
+     * buffer. The {@code handler} parameter is a completion handler that is
+     * invoked when the receive operation completes (or fails). The result
+     * passed to the completion handler is the datagram's source address.
      *
      * <p> This method is equivalent to invoking {@link
      * #receive(ByteBuffer,long,TimeUnit,Object,CompletionHandler)} with a
@@ -382,34 +374,30 @@ public abstract class AsynchronousDatagramChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  a {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IllegalArgumentException
      *          If the buffer is read-only
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public final <A> Future<SocketAddress> receive(ByteBuffer dst,
-                                                   A attachment,
-                                                   CompletionHandler<SocketAddress,? super A> handler)
+    public final <A> void receive(ByteBuffer dst,
+                                  A attachment,
+                                  CompletionHandler<SocketAddress,? super A> handler)
     {
-        return receive(dst, 0L, TimeUnit.MILLISECONDS, attachment, handler);
+        receive(dst, 0L, TimeUnit.MILLISECONDS, attachment, handler);
     }
 
     /**
      * Receives a datagram via this channel.
      *
-     * <p> This method initiates the receiving of a datagram, returning a
-     * {@code Future} representing the pending result of the operation.
-     * The {@code Future}'s {@link Future#get() get} method returns
-     * the source address of the datagram upon successful completion.
-     *
-     * <p> This method is equivalent to invoking {@link
-     * #receive(ByteBuffer,long,TimeUnit,Object,CompletionHandler)} with a
-     * timeout of {@code 0L}, and an attachment and completion handler
-     * of {@code null}.
+     * <p> This method initiates the receiving of a datagram into the given
+     * buffer. The method behaves in exactly the same manner as the {@link
+     * #receive(ByteBuffer,Object,CompletionHandler)
+     * receive(ByteBuffer,Object,CompletionHandler)} method except that instead
+     * of specifying a completion handler, this method returns a {@code Future}
+     * representing the pending result. The {@code Future}'s {@link Future#get()
+     * get} method returns the datagram's source address.
      *
      * @param   dst
      *          The buffer into which the datagram is to be transferred
@@ -419,84 +407,19 @@ public abstract class AsynchronousDatagramChannel
      * @throws  IllegalArgumentException
      *          If the buffer is read-only
      */
-    public final <A> Future<SocketAddress> receive(ByteBuffer dst) {
-        return receive(dst, 0L, TimeUnit.MILLISECONDS, null, null);
-    }
+    public abstract Future<SocketAddress> receive(ByteBuffer dst);
 
     /**
      * Sends a datagram via this channel.
      *
-     * <p> This method initiates sending of a datagram, returning a
-     * {@code Future} representing the pending result of the operation.
-     * The operation sends the remaining bytes in the given buffer as a single
-     * datagram to the given target address. The result of the operation, obtained
-     * by invoking the {@code Future}'s {@link Future#get() get}
-     * method, is the number of bytes sent.
+     * <p> This method initiates sending of a datagram from the given buffer to
+     * the given address. The {@code handler} parameter is a completion handler
+     * that is invoked when the send completes (or fails). The result passed to
+     * the completion handler is the number of bytes sent.
      *
-     * <p> The datagram is transferred from the byte buffer as if by a regular
-     * {@link AsynchronousByteChannel#write write} operation.
-     *
-     * <p> If a timeout is specified and the timeout elapses before the operation
-     * completes then the operation completes with the exception {@link
-     * InterruptedByTimeoutException}. When a timeout elapses then the state of
-     * the {@link ByteBuffer} is not defined. The buffers should be discarded or
-     * at least care must be taken to ensure that the buffer is not accessed
-     * while the channel remains open.
-     *
-     * <p> If there is a security manager installed and the channel is not
-     * connected then this method verifies that the target address and port number
-     * are permitted by the security manager's {@link SecurityManager#checkConnect
-     * checkConnect} method.  The overhead of this security check can be avoided
-     * by first connecting the socket via the {@link #connect connect} method.
-     *
-     * @param   src
-     *          The buffer containing the datagram to be sent
-     * @param   target
-     *          The address to which the datagram is to be sent
-     * @param   timeout
-     *          The timeout, or {@code 0L} for no timeout
-     * @param   unit
-     *          The time unit of the {@code timeout} argument
-     * @param   attachment
-     *          The object to attach to the I/O operation; can be {@code null}
-     * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  a {@code Future} object representing the pending result
-     *
-     * @throws  UnresolvedAddressException
-     *          If the given remote address is not fully resolved
-     * @throws  UnsupportedAddressTypeException
-     *          If the type of the given remote address is not supported
-     * @throws  IllegalArgumentException
-     *          If the timeout is negative, or if the channel's socket is
-     *          connected to an address that is not equal to {@code target}
-     * @throws  SecurityException
-     *          If a security manager has been installed and it does not permit
-     *          datagrams to be sent to the given address
-     * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
-     */
-    public abstract <A> Future<Integer> send(ByteBuffer src,
-                                             SocketAddress target,
-                                             long timeout,
-                                             TimeUnit unit,
-                                             A attachment,
-                                             CompletionHandler<Integer,? super A> handler);
-
-    /**
-     * Sends a datagram via this channel.
-     *
-     * <p> This method initiates sending of a datagram, returning a
-     * {@code Future} representing the pending result of the operation.
-     * The operation sends the remaining bytes in the given buffer as a single
-     * datagram to the given target address. The result of the operation, obtained
-     * by invoking the {@code Future}'s {@link Future#get() get}
-     * method, is the number of bytes sent.
-     *
-     * <p> This method is equivalent to invoking {@link
-     * #send(ByteBuffer,SocketAddress,long,TimeUnit,Object,CompletionHandler)}
-     * with a timeout of {@code 0L}.
+     * <p> Otherwise this method works in the same manner as the {@link
+     * AsynchronousByteChannel#write(ByteBuffer,Object,CompletionHandler)}
+     * method.
      *
      * @param   src
      *          The buffer containing the datagram to be sent
@@ -505,9 +428,7 @@ public abstract class AsynchronousDatagramChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  a {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  UnresolvedAddressException
      *          If the given remote address is not fully resolved
@@ -520,30 +441,23 @@ public abstract class AsynchronousDatagramChannel
      *          If a security manager has been installed and it does not permit
      *          datagrams to be sent to the given address
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public final <A> Future<Integer> send(ByteBuffer src,
-                                          SocketAddress target,
-                                          A attachment,
-                                          CompletionHandler<Integer,? super A> handler)
-    {
-        return send(src, target, 0L, TimeUnit.MILLISECONDS, attachment, handler);
-    }
+    public abstract <A> void send(ByteBuffer src,
+                                  SocketAddress target,
+                                  A attachment,
+                                  CompletionHandler<Integer,? super A> handler);
 
     /**
      * Sends a datagram via this channel.
      *
-     * <p> This method initiates sending of a datagram, returning a
-     * {@code Future} representing the pending result of the operation.
-     * The operation sends the remaining bytes in the given buffer as a single
-     * datagram to the given target address. The result of the operation, obtained
-     * by invoking the {@code Future}'s {@link Future#get() get}
-     * method, is the number of bytes sent.
-     *
-     * <p> This method is equivalent to invoking {@link
-     * #send(ByteBuffer,SocketAddress,long,TimeUnit,Object,CompletionHandler)}
-     * with a timeout of {@code 0L} and an attachment and completion handler
-     * of {@code null}.
+     * <p> This method initiates sending of a datagram from the given buffer to
+     * the given address. The method behaves in exactly the same manner as the
+     * {@link #send(ByteBuffer,SocketAddress,Object,CompletionHandler)
+     * send(ByteBuffer,SocketAddress,Object,CompletionHandler)} method except
+     * that instead of specifying a completion handler, this method returns a
+     * {@code Future} representing the pending result. The {@code Future}'s
+     * {@link Future#get() get} method returns the number of bytes sent.
      *
      * @param   src
      *          The buffer containing the datagram to be sent
@@ -563,17 +477,15 @@ public abstract class AsynchronousDatagramChannel
      *          If a security manager has been installed and it does not permit
      *          datagrams to be sent to the given address
      */
-    public final Future<Integer> send(ByteBuffer src, SocketAddress target) {
-        return send(src, target, 0L, TimeUnit.MILLISECONDS, null, null);
-    }
+    public abstract Future<Integer> send(ByteBuffer src, SocketAddress target);
 
     /**
      * Receives a datagram via this channel.
      *
-     * <p> This method initiates the receiving of a datagram, returning a
-     * {@code Future} representing the pending result of the operation.
-     * The {@code Future}'s {@link Future#get() get} method returns
-     * the number of bytes transferred upon successful completion.
+     * <p> This method initiates the receiving of a datagram into the given
+     * buffer. The {@code handler} parameter is a completion handler that is
+     * invoked when the receive operation completes (or fails). The result
+     * passed to the completion handler is number of bytes read.
      *
      * <p> This method may only be invoked if this channel is connected, and it
      * only accepts datagrams from the peer that the channel is connected too.
@@ -599,120 +511,62 @@ public abstract class AsynchronousDatagramChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  a {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IllegalArgumentException
      *          If the timeout is negative or buffer is read-only
      * @throws  NotYetConnectedException
      *          If this channel is not connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public abstract <A> Future<Integer> read(ByteBuffer dst,
-                                             long timeout,
-                                             TimeUnit unit,
-                                             A attachment,
-                                             CompletionHandler<Integer,? super A> handler);
+    public abstract <A> void read(ByteBuffer dst,
+                                  long timeout,
+                                  TimeUnit unit,
+                                  A attachment,
+                                  CompletionHandler<Integer,? super A> handler);
 
     /**
      * @throws  NotYetConnectedException
      *          If this channel is not connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
     @Override
-    public final <A> Future<Integer> read(ByteBuffer dst,
-                                          A attachment,
-                                          CompletionHandler<Integer,? super A> handler)
+    public final <A> void read(ByteBuffer dst,
+                               A attachment,
+                               CompletionHandler<Integer,? super A> handler)
     {
-        return read(dst, 0L, TimeUnit.MILLISECONDS, attachment, handler);
+        read(dst, 0L, TimeUnit.MILLISECONDS, attachment, handler);
     }
 
     /**
      * @throws  NotYetConnectedException
      *          If this channel is not connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
     @Override
-    public final Future<Integer> read(ByteBuffer dst) {
-        return read(dst, 0L, TimeUnit.MILLISECONDS, null, null);
-    }
-
-    /**
-     * Writes a datagram to this channel.
-     *
-     * <p> This method initiates sending of a datagram, returning a
-     * {@code Future} representing the pending result of the operation.
-     * The operation sends the remaining bytes in the given buffer as a single
-     * datagram. The result of the operation, obtained by invoking the
-     * {@code Future}'s {@link Future#get() get} method, is the
-     * number of bytes sent.
-     *
-     * <p> The datagram is transferred from the byte buffer as if by a regular
-     * {@link AsynchronousByteChannel#write write} operation.
-     *
-     * <p> This method may only be invoked if this channel is connected,
-     * in which case it sends datagrams directly to the socket's peer.  Otherwise
-     * it behaves exactly as specified in the {@link
-     * AsynchronousByteChannel} interface.
-     *
-     * <p> If a timeout is specified and the timeout elapses before the operation
-     * completes then the operation completes with the exception {@link
-     * InterruptedByTimeoutException}. When a timeout elapses then the state of
-     * the {@link ByteBuffer} is not defined. The buffers should be discarded or
-     * at least care must be taken to ensure that the buffer is not accessed
-     * while the channel remains open.
-     *
-     * @param   src
-     *          The buffer containing the datagram to be sent
-     * @param   timeout
-     *          The timeout, or {@code 0L} for no timeout
-     * @param   unit
-     *          The time unit of the {@code timeout} argument
-     * @param   attachment
-     *          The object to attach to the I/O operation; can be {@code null}
-     * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  a {@code Future} object representing the pending result
-     *
-     * @throws  IllegalArgumentException
-     *          If the timeout is negative
-     * @throws  NotYetConnectedException
-     *          If this channel is not connected
-     * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
-     */
-    public abstract <A> Future<Integer> write(ByteBuffer src,
-                                              long timeout,
-                                              TimeUnit unit,
-                                              A attachment,
-                                              CompletionHandler<Integer,? super A> handler);
-    /**
-     * @throws  NotYetConnectedException
-     *          If this channel is not connected
-     * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
-     */
-    @Override
-    public final <A> Future<Integer> write(ByteBuffer src,
-                                           A attachment,
-                                           CompletionHandler<Integer,? super A> handler)
-    {
-        return write(src, 0L, TimeUnit.MILLISECONDS, attachment, handler);
-    }
+    public abstract Future<Integer> read(ByteBuffer dst);
 
     /**
      * @throws  NotYetConnectedException
      *          If this channel is not connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
     @Override
-    public final Future<Integer> write(ByteBuffer src) {
-        return write(src, 0L, TimeUnit.MILLISECONDS, null, null);
-    }
+    public abstract <A> void  write(ByteBuffer src,
+                                    A attachment,
+                                    CompletionHandler<Integer,? super A> handler);
+
+
+    /**
+     * @throws  NotYetConnectedException
+     *          If this channel is not connected
+     * @throws  ShutdownChannelGroupException
+     *          If the channel group has terminated
+     */
+    @Override
+    public abstract Future<Integer> write(ByteBuffer src);
 }
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
index a9bff5f16d4..9d37b9d8da8 100644
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousFileChannel.java
@@ -48,7 +48,12 @@ import java.util.Collections;
  *
  * <p> An asynchronous file channel does not have a <i>current position</i>
  * within the file. Instead, the file position is specified to each read and
- * write operation.
+ * write methd that initiate asynchronous operations. A {@link CompletionHandler}
+ * is specified as a parameter and is invoked to consume the result of the I/O
+ * operation. This class also defines read and write methods that initiate
+ * asynchronous operations, returning a {@link Future} to represent the pending
+ * result of the operation. The {@code Future} may be used to check if the
+ * operation has completed, to wait for its completion.
  *
  * <p> In addition to read and write operations, this class defines the
  * following operations: </p>
@@ -59,18 +64,11 @@ import java.util.Collections;
  *   out</i>} to the underlying storage device, ensuring that data are not
  *   lost in the event of a system crash.  </p></li>
  *
- *   <li><p> A region of a file may be {@link FileLock <i>locked</i>}
- *   against access by other programs.  </p></li>
+ *   <li><p> A region of a file may be {@link #lock <i>locked</i>} against
+ *   access by other programs.  </p></li>
  *
  * </ul>
  *
- * <p> The {@link #read read}, {@link #write write}, and {@link #lock lock}
- * methods defined by this class are asynchronous  and return a {@link Future}
- * to represent the pending result of the operation. This may be used to check
- * if the operation has completed, to wait for its completion, and to retrieve
- * the result. These method may optionally specify a {@link CompletionHandler}
- * that is invoked to consume the result of the I/O operation when it completes.
- *
  * <p> An {@code AsynchronousFileChannel} is associated with a thread pool to
  * which tasks are submitted to handle I/O events and dispatch to completion
  * handlers that consume the results of I/O operations on the channel. The
@@ -122,22 +120,6 @@ public abstract class AsynchronousFileChannel
     protected AsynchronousFileChannel() {
     }
 
-    /**
-     * Closes this channel.
-     *
-     * <p> If this channel is associated with its own thread pool then closing
-     * the channel causes the thread pool to shutdown after all actively
-     * executing completion handlers have completed. No attempt is made to stop
-     * or interrupt actively completion handlers.
-     *
-     * <p> This method otherwise behaves exactly as specified by the {@link
-     * AsynchronousChannel} interface.
-     *
-     * @throws  IOException     {@inheritDoc}
-     */
-    @Override
-    public abstract void close() throws IOException;
-
     /**
      * Opens or creates a file for reading and/or writing, returning an
      * asynchronous file channel to access the file.
@@ -215,9 +197,8 @@ public abstract class AsynchronousFileChannel
      * should be taken when configuring the {@code Executor}. Minimally it
      * should support an unbounded work queue and should not run tasks on the
      * caller thread of the {@link ExecutorService#execute execute} method.
-     * {@link #close Closing} the channel results in the orderly {@link
-     * ExecutorService#shutdown shutdown} of the executor service. Shutting down
-     * the executor service by other means results in unspecified behavior.
+     * Shutting down the executor service while the channel is open results in
+     * unspecified behavior.
      *
      * <p> The {@code attrs} parameter is an optional array of file {@link
      * FileAttribute file-attributes} to set atomically when creating the file.
@@ -276,7 +257,8 @@ public abstract class AsynchronousFileChannel
      * <p> An invocation of this method behaves in exactly the same way as the
      * invocation
      * <pre>
-     *     ch.{@link #open(Path,Set,ExecutorService,FileAttribute[]) open}(file, opts, null, new FileAttribute&lt;?&gt;[0]);
+     *     ch.{@link #open(Path,Set,ExecutorService,FileAttribute[])
+     *       open}(file, opts, null, new FileAttribute&lt;?&gt;[0]);
      * </pre>
      * where {@code opts} is a {@code Set} containing the options specified to
      * this method.
@@ -405,10 +387,11 @@ public abstract class AsynchronousFileChannel
     /**
      * Acquires a lock on the given region of this channel's file.
      *
-     * <p> This method initiates an operation to acquire a lock on the given region
-     * of this channel's file. The method returns a {@code Future} representing
-     * the pending result of the operation. Its {@link Future#get() get}
-     * method returns the {@link FileLock} on successful completion.
+     * <p> This method initiates an operation to acquire a lock on the given
+     * region of this channel's file. The {@code handler} parameter is a
+     * completion handler that is invoked when the lock is acquired (or the
+     * operation fails). The result passed to the completion handler is the
+     * resulting {@code FileLock}.
      *
      * <p> The region specified by the {@code position} and {@code size}
      * parameters need not be contained within, or even overlap, the actual
@@ -455,9 +438,7 @@ public abstract class AsynchronousFileChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  a {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  OverlappingFileLockException
      *          If a lock that overlaps the requested region is already held by
@@ -466,26 +447,24 @@ public abstract class AsynchronousFileChannel
      * @throws  IllegalArgumentException
      *          If the preconditions on the parameters do not hold
      * @throws  NonReadableChannelException
-     *          If {@code shared} is true this channel but was not opened for reading
+     *          If {@code shared} is true but this channel was not opened for reading
      * @throws  NonWritableChannelException
      *          If {@code shared} is false but this channel was not opened for writing
-     * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, the channel is closed, and the channel
-     *          was originally created with its own thread pool
      */
-    public abstract <A> Future<FileLock> lock(long position,
-                                              long size,
-                                              boolean shared,
-                                              A attachment,
-                                              CompletionHandler<FileLock,? super A> handler);
+    public abstract <A> void lock(long position,
+                                  long size,
+                                  boolean shared,
+                                  A attachment,
+                                  CompletionHandler<FileLock,? super A> handler);
 
     /**
      * Acquires an exclusive lock on this channel's file.
      *
-     * <p> This method initiates an operation to acquire an exclusive lock on this
-     * channel's file. The method returns a {@code Future} representing
-     * the pending result of the operation. Its {@link Future#get() get}
-     * method returns the {@link FileLock} on successful completion.
+     * <p> This method initiates an operation to acquire a lock on the given
+     * region of this channel's file. The {@code handler} parameter is a
+     * completion handler that is invoked when the lock is acquired (or the
+     * operation fails). The result passed to the completion handler is the
+     * resulting {@code FileLock}.
      *
      * <p> An invocation of this method of the form {@code ch.lock(att,handler)}
      * behaves in exactly the same way as the invocation
@@ -496,7 +475,70 @@ public abstract class AsynchronousFileChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
+     *          The handler for consuming the result
+     *
+     * @throws  OverlappingFileLockException
+     *          If a lock is already held by this Java virtual machine, or there
+     *          is already a pending attempt to lock a region
+     * @throws  NonWritableChannelException
+     *          If this channel was not opened for writing
+     */
+    public final <A> void lock(A attachment,
+                               CompletionHandler<FileLock,? super A> handler)
+    {
+        lock(0L, Long.MAX_VALUE, false, attachment, handler);
+    }
+
+    /**
+     * Acquires a lock on the given region of this channel's file.
+     *
+     * <p> This method initiates an operation to acquire a lock on the given
+     * region of this channel's file.  The method behaves in exactly the same
+     * manner as the {@link #lock(long, long, boolean, Object, CompletionHandler)}
+     * method except that instead of specifying a completion handler, this
+     * method returns a {@code Future} representing the pending result. The
+     * {@code Future}'s {@link Future#get() get} method returns the {@link
+     * FileLock} on successful completion.
+     *
+     * @param   position
+     *          The position at which the locked region is to start; must be
+     *          non-negative
+     * @param   size
+     *          The size of the locked region; must be non-negative, and the sum
+     *          {@code position}&nbsp;+&nbsp;{@code size} must be non-negative
+     * @param   shared
+     *          {@code true} to request a shared lock, in which case this
+     *          channel must be open for reading (and possibly writing);
+     *          {@code false} to request an exclusive lock, in which case this
+     *          channel must be open for writing (and possibly reading)
+     *
+     * @return  a {@code Future} object representing the pending result
+     *
+     * @throws  OverlappingFileLockException
+     *          If a lock is already held by this Java virtual machine, or there
+     *          is already a pending attempt to lock a region
+     * @throws  IllegalArgumentException
+     *          If the preconditions on the parameters do not hold
+     * @throws  NonReadableChannelException
+     *          If {@code shared} is true but this channel was not opened for reading
+     * @throws  NonWritableChannelException
+     *          If {@code shared} is false but this channel was not opened for writing
+     */
+    public abstract Future<FileLock> lock(long position, long size, boolean shared);
+
+    /**
+     * Acquires an exclusive lock on this channel's file.
+     *
+     * <p> This method initiates an operation to acquire an exclusive lock on this
+     * channel's file. The method returns a {@code Future} representing the
+     * pending result of the operation. The {@code Future}'s {@link Future#get()
+     * get} method returns the {@link FileLock} on successful completion.
+     *
+     * <p> An invocation of this method behaves in exactly the same way as the
+     * invocation
+     * <pre>
+     *     ch.{@link #lock(long,long,boolean) lock}(0L, Long.MAX_VALUE, false)
+     * </pre>
      *
      * @return  a {@code Future} object representing the pending result
      *
@@ -505,40 +547,9 @@ public abstract class AsynchronousFileChannel
      *          is already a pending attempt to lock a region
      * @throws  NonWritableChannelException
      *          If this channel was not opened for writing
-     * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, the channel is closed, and the channel
-     *          was originally created with its own thread pool
-     */
-    public final <A> Future<FileLock> lock(A attachment,
-                                           CompletionHandler<FileLock,? super A> handler)
-    {
-        return lock(0L, Long.MAX_VALUE, false, attachment, handler);
-    }
-
-    /**
-     * Acquires an exclusive lock on this channel's file.
-     *
-     * <p> This method initiates an operation to acquire an exclusive lock on this
-     * channel's file. The method returns a {@code Future} representing the
-     * pending result of the operation. Its {@link Future#get() get} method
-     * returns the {@link FileLock} on successful completion.
-     *
-     * <p> An invocation of this method behaves in exactly the same way as the
-     * invocation
-     * <pre>
-     *     ch.{@link #lock(long,long,boolean,Object,CompletionHandler) lock}(0L, Long.MAX_VALUE, false, null, null)
-     * </pre>
-     *
-     * @return  A {@code Future} object representing the pending result
-     *
-     * @throws  OverlappingFileLockException
-     *          If a lock is already held by this Java virtual machine, or there
-     *          is already a pending attempt to lock a region
-     * @throws  NonWritableChannelException
-     *          If this channel was not opened for writing
      */
     public final Future<FileLock> lock() {
-        return lock(0L, Long.MAX_VALUE, false, null, null);
+        return lock(0L, Long.MAX_VALUE, false);
     }
 
     /**
@@ -576,7 +587,7 @@ public abstract class AsynchronousFileChannel
      *          blocked in this method and is attempting to lock an overlapping
      *          region of the same file
      * @throws  NonReadableChannelException
-     *          If {@code shared} is true this channel but was not opened for reading
+     *          If {@code shared} is true but this channel was not opened for reading
      * @throws  NonWritableChannelException
      *          If {@code shared} is false but this channel was not opened for writing
      *
@@ -629,11 +640,10 @@ public abstract class AsynchronousFileChannel
      * starting at the given file position.
      *
      * <p> This method initiates the reading of a sequence of bytes from this
-     * channel into the given buffer, starting at the given file position. This
-     * method returns a {@code Future} representing the pending result of the
-     * operation. The Future's {@link Future#get() get} method returns the
-     * number of bytes read or {@code -1} if the given position is greater than
-     * or equal to the file's size at the time that the read is attempted.
+     * channel into the given buffer, starting at the given file position. The
+     * result of the read is the number of bytes read or {@code -1} if the given
+     * position is greater than or equal to the file's size at the time that the
+     * read is attempted.
      *
      * <p> This method works in the same manner as the {@link
      * AsynchronousByteChannel#read(ByteBuffer,Object,CompletionHandler)}
@@ -649,22 +659,17 @@ public abstract class AsynchronousFileChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  A {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IllegalArgumentException
      *          If the position is negative or the buffer is read-only
      * @throws  NonReadableChannelException
      *          If this channel was not opened for reading
-     * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, the channel is closed, and the channel
-     *          was originally created with its own thread pool
      */
-    public abstract <A> Future<Integer> read(ByteBuffer dst,
-                                             long position,
-                                             A attachment,
-                                             CompletionHandler<Integer,? super A> handler);
+    public abstract <A> void read(ByteBuffer dst,
+                                  long position,
+                                  A attachment,
+                                  CompletionHandler<Integer,? super A> handler);
 
     /**
      * Reads a sequence of bytes from this channel into the given buffer,
@@ -673,13 +678,15 @@ public abstract class AsynchronousFileChannel
      * <p> This method initiates the reading of a sequence of bytes from this
      * channel into the given buffer, starting at the given file position. This
      * method returns a {@code Future} representing the pending result of the
-     * operation. The Future's {@link Future#get() get} method returns the
-     * number of bytes read or {@code -1} if the given position is greater
+     * operation. The {@code Future}'s {@link Future#get() get} method returns
+     * the number of bytes read or {@code -1} if the given position is greater
      * than or equal to the file's size at the time that the read is attempted.
      *
-     * <p> This method is equivalent to invoking {@link
-     * #read(ByteBuffer,long,Object,CompletionHandler)} with the {@code attachment}
-     * and handler parameters set to {@code null}.
+     * <p> This method works in the same manner as the {@link
+     * AsynchronousByteChannel#read(ByteBuffer)} method, except that bytes are
+     * read starting at the given file position. If the given file position is
+     * greater than the file's size at the time that the read is attempted then
+     * no bytes are read.
      *
      * @param   dst
      *          The buffer into which bytes are to be transferred
@@ -694,20 +701,12 @@ public abstract class AsynchronousFileChannel
      * @throws  NonReadableChannelException
      *          If this channel was not opened for reading
      */
-    public final Future<Integer> read(ByteBuffer dst, long position) {
-        return read(dst, position, null, null);
-    }
+    public abstract Future<Integer> read(ByteBuffer dst, long position);
 
     /**
      * Writes a sequence of bytes to this channel from the given buffer, starting
      * at the given file position.
      *
-     * <p> This method initiates the writing of a sequence of bytes to this channel
-     * from the given buffer, starting at the given file position. The method
-     * returns a {@code Future} representing the pending result of the write
-     * operation. The Future's {@link Future#get() get} method returns the
-     * number of bytes written.
-     *
      * <p> This method works in the same manner as the {@link
      * AsynchronousByteChannel#write(ByteBuffer,Object,CompletionHandler)}
      * method, except that bytes are written starting at the given file position.
@@ -724,36 +723,35 @@ public abstract class AsynchronousFileChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  A {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IllegalArgumentException
      *          If the position is negative
      * @throws  NonWritableChannelException
      *          If this channel was not opened for writing
-     * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, the channel is closed, and the channel
-     *          was originally created with its own thread pool
      */
-    public abstract <A> Future<Integer> write(ByteBuffer src,
-                                              long position,
-                                              A attachment,
-                                              CompletionHandler<Integer,? super A> handler);
+    public abstract <A> void write(ByteBuffer src,
+                                   long position,
+                                   A attachment,
+                                   CompletionHandler<Integer,? super A> handler);
 
     /**
      * Writes a sequence of bytes to this channel from the given buffer, starting
      * at the given file position.
      *
-     * <p> This method initiates the writing of a sequence of bytes to this channel
-     * from the given buffer, starting at the given file position. The method
-     * returns a {@code Future} representing the pending result of the write
-     * operation. The Future's {@link Future#get() get} method returns the
-     * number of bytes written.
+     * <p> This method initiates the writing of a sequence of bytes to this
+     * channel from the given buffer, starting at the given file position. The
+     * method returns a {@code Future} representing the pending result of the
+     * write operation. The {@code Future}'s {@link Future#get() get} method
+     * returns the number of bytes written.
      *
-     * <p> This method is equivalent to invoking {@link
-     * #write(ByteBuffer,long,Object,CompletionHandler)} with the {@code attachment}
-     * and handler parameters set to {@code null}.
+     * <p> This method works in the same manner as the {@link
+     * AsynchronousByteChannel#write(ByteBuffer)} method, except that bytes are
+     * written starting at the given file position. If the given position is
+     * greater than the file's size, at the time that the write is attempted,
+     * then the file will be grown to accommodate the new bytes; the values of
+     * any bytes between the previous end-of-file and the newly-written bytes
+     * are unspecified.
      *
      * @param   src
      *          The buffer from which bytes are to be transferred
@@ -768,7 +766,5 @@ public abstract class AsynchronousFileChannel
      * @throws  NonWritableChannelException
      *          If this channel was not opened for writing
      */
-    public final Future<Integer> write(ByteBuffer src, long position) {
-        return write(src, position, null, null);
-    }
+    public abstract Future<Integer> write(ByteBuffer src, long position);
 }
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
index 99c56fa59c0..9428f1a5ea6 100644
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
@@ -85,9 +85,6 @@ import java.io.IOException;
  *      public void failed(Throwable exc, Void att) {
  *          ...
  *      }
- *      public void cancelled(Void att) {
- *          ...
- *      }
  *  });
  * </pre>
  *
@@ -240,11 +237,11 @@ public abstract class AsynchronousServerSocketChannel
     /**
      * Accepts a connection.
      *
-     * <p> This method initiates accepting a connection made to this channel's
-     * socket, returning a {@link Future} representing the pending result
-     * of the operation. The {@code Future}'s {@link Future#get() get}
-     * method will return the {@link AsynchronousSocketChannel} for the new
-     * connection on successful completion.
+     * <p> This method initiates an asynchronous operation to accept a
+     * connection made to this channel's socket. The {@code handler} parameter is
+     * a completion handler that is invoked when a connection is accepted (or
+     * the operation fails). The result passed to the completion handler is
+     * the {@link AsynchronousSocketChannel} to the new connection.
      *
      * <p> When a new connection is accepted then the resulting {@code
      * AsynchronousSocketChannel} will be bound to the same {@link
@@ -269,35 +266,35 @@ public abstract class AsynchronousServerSocketChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  an <tt>Future</tt> object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  AcceptPendingException
      *          If an accept operation is already in progress on this channel
      * @throws  NotYetBoundException
      *          If this channel's socket has not yet been bound
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public abstract <A> Future<AsynchronousSocketChannel>
-        accept(A attachment, CompletionHandler<AsynchronousSocketChannel,? super A> handler);
+    public abstract <A> void accept(A attachment,
+                                    CompletionHandler<AsynchronousSocketChannel,? super A> handler);
 
     /**
      * Accepts a connection.
      *
-     * <p> This method is equivalent to invoking {@link
-     * #accept(Object,CompletionHandler)} with the {@code attachment}
-     * and {@code handler} parameters set to {@code null}.
+     * <p> This method initiates an asynchronous operation to accept a
+     * connection made to this channel's socket. The method behaves in exactly
+     * the same manner as the {@link #accept(Object, CompletionHandler)} method
+     * except that instead of specifying a completion handler, this method
+     * returns a {@code Future} representing the pending result. The {@code
+     * Future}'s {@link Future#get() get} method returns the {@link
+     * AsynchronousSocketChannel} to the new connection on successful completion.
      *
-     * @return  an <tt>Future</tt> object representing the pending result
+     * @return  a {@code Future} object representing the pending result
      *
      * @throws  AcceptPendingException
      *          If an accept operation is already in progress on this channel
      * @throws  NotYetBoundException
      *          If this channel's socket has not yet been bound
      */
-    public final Future<AsynchronousSocketChannel> accept() {
-        return accept(null, null);
-    }
+    public abstract Future<AsynchronousSocketChannel> accept();
 }
diff --git a/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java b/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java
index b6a5da8105d..a6d80490e1d 100644
--- a/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java
@@ -274,14 +274,11 @@ public abstract class AsynchronousSocketChannel
     /**
      * Connects this channel.
      *
-     * <p> This method initiates an operation to connect this channel, returning
-     * a {@code Future} representing the pending result of the operation. If
-     * the connection is successfully established then the {@code Future}'s
-     * {@link Future#get() get} method will return {@code null}. If the
-     * connection cannot be established then the channel is closed. In that case,
-     * invoking the {@code get} method throws {@link
-     * java.util.concurrent.ExecutionException} with an {@code IOException} as
-     * the cause.
+     * <p> This method initiates an operation to connect this channel. The
+     * {@code handler} parameter is a completion handler that is invoked when
+     * the connection is successfully established or connection cannot be
+     * established. If the connection cannot be established then the channel is
+     * closed.
      *
      * <p> This method performs exactly the same security checks as the {@link
      * java.net.Socket} class.  That is, if a security manager has been
@@ -294,9 +291,7 @@ public abstract class AsynchronousSocketChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  A {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  UnresolvedAddressException
      *          If the given remote address is not fully resolved
@@ -307,23 +302,26 @@ public abstract class AsynchronousSocketChannel
      * @throws  ConnectionPendingException
      *          If a connection operation is already in progress on this channel
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      * @throws  SecurityException
      *          If a security manager has been installed
      *          and it does not permit access to the given remote endpoint
      *
      * @see #getRemoteAddress
      */
-    public abstract <A> Future<Void> connect(SocketAddress remote,
-                                             A attachment,
-                                             CompletionHandler<Void,? super A> handler);
+    public abstract <A> void connect(SocketAddress remote,
+                                     A attachment,
+                                     CompletionHandler<Void,? super A> handler);
 
     /**
      * Connects this channel.
      *
-     * <p> This method is equivalent to invoking {@link
-     * #connect(SocketAddress,Object,CompletionHandler)} with the {@code attachment}
-     * and handler parameters set to {@code null}.
+     * <p> This method initiates an operation to connect this channel. This
+     * method behaves in exactly the same manner as the {@link
+     * #connect(SocketAddress, Object, CompletionHandler)} method except that
+     * instead of specifying a completion handler, this method returns a {@code
+     * Future} representing the pending result. The {@code Future}'s {@link
+     * Future#get() get} method returns {@code null} on successful completion.
      *
      * @param   remote
      *          The remote address to which this channel is to be connected
@@ -342,18 +340,17 @@ public abstract class AsynchronousSocketChannel
      *          If a security manager has been installed
      *          and it does not permit access to the given remote endpoint
      */
-    public final Future<Void> connect(SocketAddress remote) {
-        return connect(remote, null, null);
-    }
+    public abstract Future<Void> connect(SocketAddress remote);
 
     /**
      * Reads a sequence of bytes from this channel into the given buffer.
      *
-     * <p> This method initiates the reading of a sequence of bytes from this
-     * channel into the given buffer, returning a {@code Future} representing
-     * the pending result of the operation. The {@code Future}'s {@link
-     * Future#get() get} method returns the number of bytes read or {@code -1}
-     * if all bytes have been read and channel has reached end-of-stream.
+     * <p> This method initiates an asynchronous read operation to read a
+     * sequence of bytes from this channel into the given buffer. The {@code
+     * handler} parameter is a completion handler that is invoked when the read
+     * operation completes (or fails). The result passed to the completion
+     * handler is the number of bytes read or {@code -1} if no bytes could be
+     * read because the channel has reached end-of-stream.
      *
      * <p> If a timeout is specified and the timeout elapses before the operation
      * completes then the operation completes with the exception {@link
@@ -376,9 +373,7 @@ public abstract class AsynchronousSocketChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  A {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IllegalArgumentException
      *          If the {@code timeout} parameter is negative or the buffer is
@@ -388,13 +383,13 @@ public abstract class AsynchronousSocketChannel
      * @throws  NotYetConnectedException
      *          If this channel is not yet connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public abstract <A> Future<Integer> read(ByteBuffer dst,
-                                             long timeout,
-                                             TimeUnit unit,
-                                             A attachment,
-                                             CompletionHandler<Integer,? super A> handler);
+    public abstract <A> void read(ByteBuffer dst,
+                                  long timeout,
+                                  TimeUnit unit,
+                                  A attachment,
+                                  CompletionHandler<Integer,? super A> handler);
 
     /**
      * @throws  IllegalArgumentException        {@inheritDoc}
@@ -402,14 +397,14 @@ public abstract class AsynchronousSocketChannel
      * @throws  NotYetConnectedException
      *          If this channel is not yet connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
     @Override
-    public final <A> Future<Integer> read(ByteBuffer dst,
-                                          A attachment,
-                                          CompletionHandler<Integer,? super A> handler)
+    public final <A> void read(ByteBuffer dst,
+                               A attachment,
+                               CompletionHandler<Integer,? super A> handler)
     {
-        return read(dst, 0L, TimeUnit.MILLISECONDS, attachment, handler);
+        read(dst, 0L, TimeUnit.MILLISECONDS, attachment, handler);
     }
 
     /**
@@ -419,16 +414,18 @@ public abstract class AsynchronousSocketChannel
      *          If this channel is not yet connected
      */
     @Override
-    public final Future<Integer> read(ByteBuffer dst) {
-        return read(dst, 0L, TimeUnit.MILLISECONDS, null, null);
-    }
+    public abstract Future<Integer> read(ByteBuffer dst);
 
     /**
      * Reads a sequence of bytes from this channel into a subsequence of the
      * given buffers. This operation, sometimes called a <em>scattering read</em>,
      * is often useful when implementing network protocols that group data into
      * segments consisting of one or more fixed-length headers followed by a
-     * variable-length body.
+     * variable-length body. The {@code handler} parameter is a completion
+     * handler that is invoked when the read operation completes (or fails). The
+     * result passed to the completion handler is the number of bytes read or
+     * {@code -1} if no bytes could be read because the channel has reached
+     * end-of-stream.
      *
      * <p> This method initiates a read of up to <i>r</i> bytes from this channel,
      * where <i>r</i> is the total number of bytes remaining in the specified
@@ -456,11 +453,6 @@ public abstract class AsynchronousSocketChannel
      * I/O operation is performed with the maximum number of buffers allowed by
      * the operating system.
      *
-     * <p> The return value from this method is a {@code Future} representing
-     * the pending result of the operation. The {@code Future}'s {@link
-     * Future#get() get} method returns the number of bytes read or {@code -1L}
-     * if all bytes have been read and the channel has reached end-of-stream.
-     *
      * <p> If a timeout is specified and the timeout elapses before the operation
      * completes then it completes with the exception {@link
      * InterruptedByTimeoutException}. Where a timeout occurs, and the
@@ -485,9 +477,7 @@ public abstract class AsynchronousSocketChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  A {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IndexOutOfBoundsException
      *          If the pre-conditions for the {@code offset}  and {@code length}
@@ -500,23 +490,24 @@ public abstract class AsynchronousSocketChannel
      * @throws  NotYetConnectedException
      *          If this channel is not yet connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public abstract <A> Future<Long> read(ByteBuffer[] dsts,
-                                          int offset,
-                                          int length,
-                                          long timeout,
-                                          TimeUnit unit,
-                                          A attachment,
-                                          CompletionHandler<Long,? super A> handler);
+    public abstract <A> void read(ByteBuffer[] dsts,
+                                  int offset,
+                                  int length,
+                                  long timeout,
+                                  TimeUnit unit,
+                                  A attachment,
+                                  CompletionHandler<Long,? super A> handler);
 
     /**
      * Writes a sequence of bytes to this channel from the given buffer.
      *
-     * <p> This method initiates the writing of a sequence of bytes to this channel
-     * from the given buffer, returning a {@code Future} representing the
-     * pending result of the operation. The {@code Future}'s {@link Future#get()
-     * get} method will return the number of bytes written.
+     * <p> This method initiates an asynchronous write operation to write a
+     * sequence of bytes to this channel from the given buffer. The {@code
+     * handler} parameter is a completion handler that is invoked when the write
+     * operation completes (or fails). The result passed to the completion
+     * handler is the number of bytes written.
      *
      * <p> If a timeout is specified and the timeout elapses before the operation
      * completes then it completes with the exception {@link
@@ -539,9 +530,7 @@ public abstract class AsynchronousSocketChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  A {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IllegalArgumentException
      *          If the {@code timeout} parameter is negative
@@ -550,28 +539,28 @@ public abstract class AsynchronousSocketChannel
      * @throws  NotYetConnectedException
      *          If this channel is not yet connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public abstract <A> Future<Integer> write(ByteBuffer src,
-                                              long timeout,
-                                              TimeUnit unit,
-                                              A attachment,
-                                              CompletionHandler<Integer,? super A> handler);
+    public abstract <A> void write(ByteBuffer src,
+                                   long timeout,
+                                   TimeUnit unit,
+                                   A attachment,
+                                   CompletionHandler<Integer,? super A> handler);
 
     /**
      * @throws  WritePendingException          {@inheritDoc}
      * @throws  NotYetConnectedException
      *          If this channel is not yet connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
     @Override
-    public final <A> Future<Integer> write(ByteBuffer src,
-                                           A attachment,
-                                           CompletionHandler<Integer,? super A> handler)
+    public final <A> void write(ByteBuffer src,
+                                A attachment,
+                                CompletionHandler<Integer,? super A> handler)
 
     {
-        return write(src, 0L, TimeUnit.MILLISECONDS, attachment, handler);
+        write(src, 0L, TimeUnit.MILLISECONDS, attachment, handler);
     }
 
     /**
@@ -580,16 +569,16 @@ public abstract class AsynchronousSocketChannel
      *          If this channel is not yet connected
      */
     @Override
-    public final Future<Integer> write(ByteBuffer src) {
-        return write(src, 0L, TimeUnit.MILLISECONDS, null, null);
-    }
+    public abstract Future<Integer> write(ByteBuffer src);
 
     /**
      * Writes a sequence of bytes to this channel from a subsequence of the given
      * buffers. This operation, sometimes called a <em>gathering write</em>, is
      * often useful when implementing network protocols that group data into
      * segments consisting of one or more fixed-length headers followed by a
-     * variable-length body.
+     * variable-length body. The {@code handler} parameter is a completion
+     * handler that is invoked when the write operation completes (or fails).
+     * The result passed to the completion handler is the number of bytes written.
      *
      * <p> This method initiates a write of up to <i>r</i> bytes to this channel,
      * where <i>r</i> is the total number of bytes remaining in the specified
@@ -616,10 +605,6 @@ public abstract class AsynchronousSocketChannel
      * remaining), exceeds this limit, then the I/O operation is performed with
      * the maximum number of buffers allowed by the operating system.
      *
-     * <p> The return value from this method is a {@code Future} representing
-     * the pending result of the operation. The {@code Future}'s {@link
-     * Future#get() get} method will return the number of bytes written.
-     *
      * <p> If a timeout is specified and the timeout elapses before the operation
      * completes then it completes with the exception {@link
      * InterruptedByTimeoutException}. Where a timeout occurs, and the
@@ -644,9 +629,7 @@ public abstract class AsynchronousSocketChannel
      * @param   attachment
      *          The object to attach to the I/O operation; can be {@code null}
      * @param   handler
-     *          The handler for consuming the result; can be {@code null}
-     *
-     * @return  A {@code Future} object representing the pending result
+     *          The handler for consuming the result
      *
      * @throws  IndexOutOfBoundsException
      *          If the pre-conditions for the {@code offset}  and {@code length}
@@ -658,13 +641,13 @@ public abstract class AsynchronousSocketChannel
      * @throws  NotYetConnectedException
      *          If this channel is not yet connected
      * @throws  ShutdownChannelGroupException
-     *          If a handler is specified, and the channel group is shutdown
+     *          If the channel group has terminated
      */
-    public abstract <A> Future<Long> write(ByteBuffer[] srcs,
-                                           int offset,
-                                           int length,
-                                           long timeout,
-                                           TimeUnit unit,
-                                           A attachment,
-                                           CompletionHandler<Long,? super A> handler);
+    public abstract <A> void write(ByteBuffer[] srcs,
+                                   int offset,
+                                   int length,
+                                   long timeout,
+                                   TimeUnit unit,
+                                   A attachment,
+                                   CompletionHandler<Long,? super A> handler);
 }
diff --git a/jdk/src/share/classes/java/nio/channels/Channels.java b/jdk/src/share/classes/java/nio/channels/Channels.java
index 4fdcef8abb0..88f5e0eb8cf 100644
--- a/jdk/src/share/classes/java/nio/channels/Channels.java
+++ b/jdk/src/share/classes/java/nio/channels/Channels.java
@@ -182,7 +182,6 @@ public final class Channels {
     }
 
     /**
-     * {@note new}
      * Constructs a stream that reads bytes from the given channel.
      *
      * <p> The stream will not be buffered, and it will not support the {@link
@@ -258,7 +257,6 @@ public final class Channels {
     }
 
     /**
-     * {@note new}
      * Constructs a stream that writes bytes to the given channel.
      *
      * <p> The stream will not be buffered. The stream will be safe for access
diff --git a/jdk/src/share/classes/java/nio/channels/CompletionHandler.java b/jdk/src/share/classes/java/nio/channels/CompletionHandler.java
index c4d4add8ff9..43e5abeafb4 100644
--- a/jdk/src/share/classes/java/nio/channels/CompletionHandler.java
+++ b/jdk/src/share/classes/java/nio/channels/CompletionHandler.java
@@ -32,11 +32,9 @@ package java.nio.channels;
  * handler to be specified to consume the result of an asynchronous operation.
  * The {@link #completed completed} method is invoked when the I/O operation
  * completes successfully. The {@link #failed failed} method is invoked if the
- * I/O operations fails. The {@link #cancelled cancelled} method is invoked when
- * the I/O operation is cancelled by invoking the {@link
- * java.util.concurrent.Future#cancel cancel} method. The implementations of
- * these methods should complete in a timely manner so as to avoid keeping the
- * invoking thread from dispatching to other completion handlers.
+ * I/O operations fails. The implementations of these methods should complete
+ * in a timely manner so as to avoid keeping the invoking thread from dispatching
+ * to other completion handlers.
  *
  * @param   <V>     The result type of the I/O operation
  * @param   <A>     The type of the object attached to the I/O operation
@@ -65,13 +63,4 @@ public interface CompletionHandler<V,A> {
      *          The object attached to the I/O operation when it was initiated.
      */
     void failed(Throwable exc, A attachment);
-
-    /**
-     * Invoked when an operation is cancelled by invoking the {@link
-     * java.util.concurrent.Future#cancel cancel} method.
-     *
-     * @param   attachment
-     *          The object attached to the I/O operation when it was initiated.
-     */
-    void cancelled(A attachment);
 }
diff --git a/jdk/src/share/classes/java/nio/channels/DatagramChannel.java b/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
index cbf402f5933..1dde1d7a399 100644
--- a/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/DatagramChannel.java
@@ -421,7 +421,7 @@ public abstract class DatagramChannel
      * invocation of this method will block until the first operation is
      * complete. If this channel's socket is not bound then this method will
      * first cause the socket to be bound to an address that is assigned
-     * automatically, as if by invoking the {@link #bind bind) method with a
+     * automatically, as if by invoking the {@link #bind bind} method with a
      * parameter of {@code null}. </p>
      *
      * @param  src
diff --git a/jdk/src/share/classes/java/nio/channels/FileChannel.java b/jdk/src/share/classes/java/nio/channels/FileChannel.java
index ab780a520a9..2a7713bd312 100644
--- a/jdk/src/share/classes/java/nio/channels/FileChannel.java
+++ b/jdk/src/share/classes/java/nio/channels/FileChannel.java
@@ -39,8 +39,7 @@ import java.util.Collections;
 /**
  * A channel for reading, writing, mapping, and manipulating a file.
  *
- * <p> {@note revised}
- * A file channel is a {@link SeekableByteChannel} that is connected to
+ * <p> A file channel is a {@link SeekableByteChannel} that is connected to
  * a file. It has a current <i>position</i> within its file which can
  * be both {@link #position() <i>queried</i>} and {@link #position(long)
  * <i>modified</i>}.  The file itself contains a variable-length sequence
@@ -151,7 +150,6 @@ import java.util.Collections;
  * @author Mike McCloskey
  * @author JSR-51 Expert Group
  * @since 1.4
- * @updated 1.7
  */
 
 public abstract class FileChannel
@@ -164,7 +162,6 @@ public abstract class FileChannel
     protected FileChannel() { }
 
     /**
-     * {@note new}
      * Opens or creates a file, returning a file channel to access the file.
      *
      * <p> The {@code options} parameter determines how the file is opened.
@@ -293,7 +290,6 @@ public abstract class FileChannel
     private static final FileAttribute<?>[] NO_ATTRIBUTES = new FileAttribute[0];
 
     /**
-     * {@note new}
      * Opens or creates a file, returning a file channel to access the file.
      *
      * <p> An invocation of this method behaves in exactly the same way as the
diff --git a/jdk/src/share/classes/java/nio/channels/FileLock.java b/jdk/src/share/classes/java/nio/channels/FileLock.java
index b0ec37f1ba5..8e1321144b5 100644
--- a/jdk/src/share/classes/java/nio/channels/FileLock.java
+++ b/jdk/src/share/classes/java/nio/channels/FileLock.java
@@ -114,7 +114,6 @@ import java.io.IOException;
  * @author Mark Reinhold
  * @author JSR-51 Expert Group
  * @since 1.4
- * @updated 1.7
  */
 
 public abstract class FileLock {
@@ -161,7 +160,7 @@ public abstract class FileLock {
     }
 
     /**
-     * {@note new} Initializes a new instance of this class.
+     * Initializes a new instance of this class.
      *
      * @param  channel
      *         The channel upon whose file this lock is held
@@ -199,7 +198,6 @@ public abstract class FileLock {
     }
 
     /**
-     * {@note revised}
      * Returns the file channel upon whose file this lock was acquired.
      *
      * <p> This method has been superseded by the {@link #acquiredBy acquiredBy}
@@ -213,7 +211,6 @@ public abstract class FileLock {
     }
 
     /**
-     * {@note new}
      * Returns the channel upon whose file this lock was acquired.
      *
      * @return  The channel upon whose file this lock was acquired.
diff --git a/jdk/src/share/classes/java/nio/channels/exceptions b/jdk/src/share/classes/java/nio/channels/exceptions
index fed9f72ab2e..d78ea57738f 100644
--- a/jdk/src/share/classes/java/nio/channels/exceptions
+++ b/jdk/src/share/classes/java/nio/channels/exceptions
@@ -190,5 +190,5 @@ gen WritePendingException "
 gen ShutdownChannelGroupException "
  * Unchecked exception thrown when an attempt is made to construct a channel in 
  * a group that is shutdown or the completion handler for an I/O operation 
- * cannot be invoked because the channel group is shutdown." \
+ * cannot be invoked because the channel group has terminated." \
  -3903801676350154157L
diff --git a/jdk/src/share/classes/java/nio/channels/package-info.java b/jdk/src/share/classes/java/nio/channels/package-info.java
index 47a1cb5f979..d5bf5110e31 100644
--- a/jdk/src/share/classes/java/nio/channels/package-info.java
+++ b/jdk/src/share/classes/java/nio/channels/package-info.java
@@ -115,8 +115,8 @@
  *     <td>Reads, writes, maps, and manipulates files</td></tr>
  * <tr><td valign=top><tt>{@link java.nio.channels.FileLock}</tt></td>
  *     <td>A lock on a (region of a) file</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.MappedByteBuffer}/{@link java.nio.MappedBigByteBuffer}&nbsp;&nbsp;</tt></td>
- *     <td>A direct byte buffer or big byte buffer mapped to a region of a&nbsp;file</td></tr>
+ * <tr><td valign=top><tt>{@link java.nio.MappedByteBuffer}&nbsp;&nbsp;</tt></td>
+ *     <td>A direct byte buffer mapped to a region of a&nbsp;file</td></tr>
  * </table></blockquote>
  *
  * <p> The {@link java.nio.channels.FileChannel} class supports the usual
@@ -285,7 +285,6 @@
  * java.lang.NullPointerException NullPointerException} to be thrown.
  *
  * @since 1.4
- * @updated 1.7
  * @author Mark Reinhold
  * @author JSR-51 Expert Group
  */
diff --git a/jdk/src/share/classes/java/nio/file/DirectoryStream.java b/jdk/src/share/classes/java/nio/file/DirectoryStream.java
index 001f22b0723..f0be02172d6 100644
--- a/jdk/src/share/classes/java/nio/file/DirectoryStream.java
+++ b/jdk/src/share/classes/java/nio/file/DirectoryStream.java
@@ -53,7 +53,7 @@ import java.io.IOException;
  * invoking the {@link #close close} method. Closing the directory stream
  * releases any resources associated with the stream. Once a directory stream
  * is closed, all further method invocations on the iterator throw {@link
- * java.util.concurrent.ConcurrentModificationException} with cause {@link
+ * java.util.ConcurrentModificationException} with cause {@link
  * ClosedDirectoryStreamException}.
  *
  * <p> A directory stream is not required to be <i>asynchronously closeable</i>.
diff --git a/jdk/src/share/classes/java/nio/file/FileRef.java b/jdk/src/share/classes/java/nio/file/FileRef.java
index 8a19ce285c2..c2bfee92916 100644
--- a/jdk/src/share/classes/java/nio/file/FileRef.java
+++ b/jdk/src/share/classes/java/nio/file/FileRef.java
@@ -39,8 +39,6 @@ import java.io.IOException;
  * metadata or file attributes.
  *
  * @since 1.7
- * @see java.io.Inputs
- * @see java.io.Outputs
  * @see java.nio.file.attribute.Attributes
  * @see java.io.File#toPath
  */
diff --git a/jdk/src/share/classes/java/nio/file/Files.java b/jdk/src/share/classes/java/nio/file/Files.java
index 00e1014526c..bf596409e5a 100644
--- a/jdk/src/share/classes/java/nio/file/Files.java
+++ b/jdk/src/share/classes/java/nio/file/Files.java
@@ -133,10 +133,11 @@ public final class Files {
      * <p> This method walks a file tree rooted at a given starting file. The
      * file tree traversal is <em>depth-first</em> with the given {@link
      * FileVisitor} invoked for each file encountered. File tree traversal
-     * completes when all accessible files in the tree have been visited, a
-     * visitor returns a result of {@link FileVisitResult#TERMINATE TERMINATE},
-     * or the visitor terminates due to an uncaught {@code Error} or {@code
-     * RuntimeException}.
+     * completes when all accessible files in the tree have been visited, or a
+     * visit method returns a result of {@link FileVisitResult#TERMINATE
+     * TERMINATE}. Where a visit method terminates due an uncaught error or
+     * runtime exception then the traversal is terminated and the error or
+     * exception is propagated to the caller of this method.
      *
      * <p> For each file encountered this method attempts to gets its {@link
      * java.nio.file.attribute.BasicFileAttributes}. If the file is not a
diff --git a/jdk/src/share/classes/java/nio/file/Path.java b/jdk/src/share/classes/java/nio/file/Path.java
index 113a7c58067..d9ba6de7835 100644
--- a/jdk/src/share/classes/java/nio/file/Path.java
+++ b/jdk/src/share/classes/java/nio/file/Path.java
@@ -987,7 +987,7 @@ public abstract class Path
      * exception then it is propogated to the iterator's {@link Iterator#hasNext()
      * hasNext} or {@link Iterator#next() next} method. Where an {@code
      * IOException} is thrown, it is propogated as a {@link
-     * java.util.concurrent.ConcurrentModificationException} with the {@code
+     * java.util.ConcurrentModificationException} with the {@code
      * IOException} as the cause.
      *
      * <p> When an implementation supports operations on entries in the
diff --git a/jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java b/jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java
index 36852392327..f252ef03eea 100644
--- a/jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java
+++ b/jdk/src/share/classes/java/nio/file/SimpleFileVisitor.java
@@ -47,6 +47,14 @@ public class SimpleFileVisitor<T> implements FileVisitor<T> {
     protected SimpleFileVisitor() {
     }
 
+    /**
+     * Throws NullPointerException if obj is null.
+     */
+    private static void checkNotNull(Object obj) {
+        if (obj == null)
+            throw new NullPointerException();
+    }
+
     /**
      * Invoked for a directory before entries in the directory are visited.
      *
@@ -55,6 +63,7 @@ public class SimpleFileVisitor<T> implements FileVisitor<T> {
      */
     @Override
     public FileVisitResult preVisitDirectory(T dir) {
+        checkNotNull(dir);
         return FileVisitResult.CONTINUE;
     }
 
@@ -70,6 +79,8 @@ public class SimpleFileVisitor<T> implements FileVisitor<T> {
      */
     @Override
     public FileVisitResult preVisitDirectoryFailed(T dir, IOException exc) {
+        checkNotNull(dir);
+        checkNotNull(exc);
         throw new IOError(exc);
     }
 
@@ -81,6 +92,8 @@ public class SimpleFileVisitor<T> implements FileVisitor<T> {
      */
     @Override
     public FileVisitResult visitFile(T file, BasicFileAttributes attrs) {
+        checkNotNull(file);
+        checkNotNull(attrs);
         return FileVisitResult.CONTINUE;
     }
 
@@ -96,6 +109,8 @@ public class SimpleFileVisitor<T> implements FileVisitor<T> {
      */
     @Override
     public FileVisitResult visitFileFailed(T file, IOException exc) {
+        checkNotNull(file);
+        checkNotNull(exc);
         throw new IOError(exc);
     }
 
@@ -109,11 +124,12 @@ public class SimpleFileVisitor<T> implements FileVisitor<T> {
      * cause.
      *
      * @throws  IOError
-     *          if iteration of the directory completed prematurely due to an
-     *          I/O error
+     *          with the I/O exception thrown when iteration of the directory
+     *          completed prematurely due to an I/O error
      */
     @Override
     public FileVisitResult postVisitDirectory(T dir, IOException exc) {
+        checkNotNull(dir);
         if (exc != null)
             throw new IOError(exc);
         return FileVisitResult.CONTINUE;
diff --git a/jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java b/jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java
index 4127a78e942..13583381cbb 100644
--- a/jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java
+++ b/jdk/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java
@@ -75,7 +75,7 @@ import java.io.IOException;
  *         .lookupPrincipalByName("joe");
  *
  *     // get view
- *     AclFileAttributeView view = file.newFileAttributeView(AclFileAttributeView.class);
+ *     AclFileAttributeView view = file.getFileAttributeView(AclFileAttributeView.class);
  *
  *     // create ACE to give "joe" read access
  *     AclEntry entry = AclEntry.newBuilder()
diff --git a/jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java b/jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
index aeec36a941a..2dfb2c92eac 100644
--- a/jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
+++ b/jdk/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
@@ -61,7 +61,7 @@ import java.io.IOException;
  * Suppose we need to print out the owner and access permissions of a file:
  * <pre>
  *     FileRef file = ...
- *     PosixFileAttributes attrs = file.newFileAttributeView(PosixFileAttributeView.class)
+ *     PosixFileAttributes attrs = file.getFileAttributeView(PosixFileAttributeView.class)
  *         .readAttributes();
  *     System.out.format("%s %s%n",
  *         attrs.owner().getName(),
diff --git a/jdk/src/share/classes/java/nio/file/attribute/package-info.java b/jdk/src/share/classes/java/nio/file/attribute/package-info.java
index c5301b1f840..b2192b89237 100644
--- a/jdk/src/share/classes/java/nio/file/attribute/package-info.java
+++ b/jdk/src/share/classes/java/nio/file/attribute/package-info.java
@@ -102,9 +102,9 @@
  *   <p><li> The {@link java.nio.file.attribute.UserPrincipalLookupService}
  *   interface defines methods to lookup user or group principals. </li>
  *
- *   <p><li> The {@link java.nio.file.attribute.Attribute} interface
+ *   <p><li> The {@link java.nio.file.attribute.FileAttribute} interface
  *   represents the value of an attribute for cases where the attribute value is
- *   require to be set atomically when creating an object in the file system. </li>
+ *   required to be set atomically when creating an object in the file system. </li>
  *
  * </ul>
  *
diff --git a/jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java b/jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java
index a9998282a25..b279392d442 100644
--- a/jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java
+++ b/jdk/src/share/classes/java/security/cert/CertPathHelperImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  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
@@ -46,7 +46,7 @@ class CertPathHelperImpl extends CertPathHelper {
     /**
      * Initialize the helper framework. This method must be called from
      * the static initializer of each class that is the target of one of
-     * the methods in this class. This ensures that the helper if initialized
+     * the methods in this class. This ensures that the helper is initialized
      * prior to a tunneled call from the Sun provider.
      */
     synchronized static void initialize() {
@@ -59,4 +59,8 @@ class CertPathHelperImpl extends CertPathHelper {
             Set<GeneralNameInterface> names) {
         sel.setPathToNamesInternal(names);
     }
+
+    protected void implSetDateAndTime(X509CRLSelector sel, Date date, long skew) {
+        sel.setDateAndTime(date, skew);
+    }
 }
diff --git a/jdk/src/share/classes/java/security/cert/X509CRLSelector.java b/jdk/src/share/classes/java/security/cert/X509CRLSelector.java
index b602aee12c5..1fc750db4d0 100644
--- a/jdk/src/share/classes/java/security/cert/X509CRLSelector.java
+++ b/jdk/src/share/classes/java/security/cert/X509CRLSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -72,6 +72,10 @@ import sun.security.x509.X500Name;
  */
 public class X509CRLSelector implements CRLSelector {
 
+    static {
+        CertPathHelperImpl.initialize();
+    }
+
     private static final Debug debug = Debug.getInstance("certpath");
     private HashSet<Object> issuerNames;
     private HashSet<X500Principal> issuerX500Principals;
@@ -79,6 +83,7 @@ public class X509CRLSelector implements CRLSelector {
     private BigInteger maxCRL;
     private Date dateAndTime;
     private X509Certificate certChecking;
+    private long skew = 0;
 
     /**
      * Creates an <code>X509CRLSelector</code>. Initially, no criteria are set
@@ -417,7 +422,18 @@ public class X509CRLSelector implements CRLSelector {
         if (dateAndTime == null)
             this.dateAndTime = null;
         else
-            this.dateAndTime = (Date) dateAndTime.clone();
+            this.dateAndTime = new Date(dateAndTime.getTime());
+        this.skew = 0;
+    }
+
+    /**
+     * Sets the dateAndTime criterion and allows for the specified clock skew
+     * (in milliseconds) when checking against the validity period of the CRL.
+     */
+    void setDateAndTime(Date dateAndTime, long skew) {
+        this.dateAndTime =
+            (dateAndTime == null ? null : new Date(dateAndTime.getTime()));
+        this.skew = skew;
     }
 
     /**
@@ -657,8 +673,14 @@ public class X509CRLSelector implements CRLSelector {
                 }
                 return false;
             }
-            if (crlThisUpdate.after(dateAndTime)
-                  || nextUpdate.before(dateAndTime)) {
+            Date nowPlusSkew = dateAndTime;
+            Date nowMinusSkew = dateAndTime;
+            if (skew > 0) {
+                nowPlusSkew = new Date(dateAndTime.getTime() + skew);
+                nowMinusSkew = new Date(dateAndTime.getTime() - skew);
+            }
+            if (nowMinusSkew.after(nextUpdate)
+                || nowPlusSkew.before(crlThisUpdate)) {
                 if (debug != null) {
                     debug.println("X509CRLSelector.match: update out of range");
                 }
diff --git a/jdk/src/share/classes/java/util/Arrays.java b/jdk/src/share/classes/java/util/Arrays.java
index 313c686eb36..eac5521cd86 100644
--- a/jdk/src/share/classes/java/util/Arrays.java
+++ b/jdk/src/share/classes/java/util/Arrays.java
@@ -1065,29 +1065,103 @@ public class Arrays {
                 (x[b] > x[c] ? b : x[a] > x[c] ? c : a));
     }
 
+    /**
+     * Old merge sort implementation can be selected (for
+     * compatibility with broken comparators) using a system property.
+     * Cannot be a static boolean in the enclosing class due to
+     * circular dependencies.  To be removed in a future release.
+     */
+    static final class LegacyMergeSort {
+        private static final boolean userRequested =
+            java.security.AccessController.doPrivileged(
+                new sun.security.action.GetBooleanAction(
+                    "java.util.Arrays.useLegacyMergeSort")).booleanValue();
+    }
+
+    /*
+     * If this platform has an optimizing VM, check whether ComparableTimSort
+     * offers any performance benefit over TimSort in conjunction with a
+     * comparator that returns:
+     *    {@code ((Comparable)first).compareTo(Second)}.
+     * If not, you are better off deleting ComparableTimSort to
+     * eliminate the code duplication.  In other words, the commented
+     * out code below is the preferable implementation for sorting
+     * arrays of Comparables if it offers sufficient performance.
+     */
+
+//    /**
+//     * A comparator that implements the natural ordering of a group of
+//     * mutually comparable elements.  Using this comparator saves us
+//     * from duplicating most of the code in this file (one version for
+//     * Comparables, one for explicit Comparators).
+//     */
+//    private static final Comparator<Object> NATURAL_ORDER =
+//            new Comparator<Object>() {
+//        @SuppressWarnings("unchecked")
+//        public int compare(Object first, Object second) {
+//            return ((Comparable<Object>)first).compareTo(second);
+//        }
+//    };
+//
+//    public static void sort(Object[] a) {
+//        sort(a, 0, a.length, NATURAL_ORDER);
+//    }
+//
+//    public static void sort(Object[] a, int fromIndex, int toIndex) {
+//        sort(a, fromIndex, toIndex, NATURAL_ORDER);
+//    }
 
     /**
-     * Sorts the specified array of objects into ascending order, according to
-     * the {@linkplain Comparable natural ordering}
-     * of its elements.  All elements in the array
-     * must implement the {@link Comparable} interface.  Furthermore, all
-     * elements in the array must be <i>mutually comparable</i> (that is,
-     * <tt>e1.compareTo(e2)</tt> must not throw a <tt>ClassCastException</tt>
-     * for any elements <tt>e1</tt> and <tt>e2</tt> in the array).<p>
+     * Sorts the specified array of objects into ascending order, according
+     * to the {@linkplain Comparable natural ordering} of its elements.
+     * All elements in the array must implement the {@link Comparable}
+     * interface.  Furthermore, all elements in the array must be
+     * <i>mutually comparable</i> (that is, {@code e1.compareTo(e2)} must
+     * not throw a {@code ClassCastException} for any elements {@code e1}
+     * and {@code e2} in the array).
      *
-     * This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.<p>
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
      *
-     * The sorting algorithm is a modified mergesort (in which the merge is
-     * omitted if the highest element in the low sublist is less than the
-     * lowest element in the high sublist).  This algorithm offers guaranteed
-     * n*log(n) performance.
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
      *
      * @param a the array to be sorted
-     * @throws  ClassCastException if the array contains elements that are not
-     *          <i>mutually comparable</i> (for example, strings and integers).
+     * @throws ClassCastException if the array contains elements that are not
+     *         <i>mutually comparable</i> (for example, strings and integers)
+     * @throws IllegalArgumentException (optional) if the natural
+     *         ordering of the array elements is found to violate the
+     *         {@link Comparable} contract
      */
     public static void sort(Object[] a) {
+        if (LegacyMergeSort.userRequested)
+            legacyMergeSort(a);
+        else
+            ComparableTimSort.sort(a);
+    }
+
+    /** To be removed in a future release. */
+    private static void legacyMergeSort(Object[] a) {
         Object[] aux = a.clone();
         mergeSort(aux, a, 0, a.length, 0);
     }
@@ -1097,34 +1171,63 @@ public class Arrays {
      * ascending order, according to the
      * {@linkplain Comparable natural ordering} of its
      * elements.  The range to be sorted extends from index
-     * <tt>fromIndex</tt>, inclusive, to index <tt>toIndex</tt>, exclusive.
-     * (If <tt>fromIndex==toIndex</tt>, the range to be sorted is empty.)  All
+     * {@code fromIndex}, inclusive, to index {@code toIndex}, exclusive.
+     * (If {@code fromIndex==toIndex}, the range to be sorted is empty.)  All
      * elements in this range must implement the {@link Comparable}
      * interface.  Furthermore, all elements in this range must be <i>mutually
-     * comparable</i> (that is, <tt>e1.compareTo(e2)</tt> must not throw a
-     * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
-     * <tt>e2</tt> in the array).<p>
+     * comparable</i> (that is, {@code e1.compareTo(e2)} must not throw a
+     * {@code ClassCastException} for any elements {@code e1} and
+     * {@code e2} in the array).
      *
-     * This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.<p>
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
      *
-     * The sorting algorithm is a modified mergesort (in which the merge is
-     * omitted if the highest element in the low sublist is less than the
-     * lowest element in the high sublist).  This algorithm offers guaranteed
-     * n*log(n) performance.
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
      *
      * @param a the array to be sorted
      * @param fromIndex the index of the first element (inclusive) to be
      *        sorted
      * @param toIndex the index of the last element (exclusive) to be sorted
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
-     * @throws    ClassCastException if the array contains elements that are
-     *            not <i>mutually comparable</i> (for example, strings and
-     *            integers).
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex} or
+     *         (optional) if the natural ordering of the array elements is
+     *         found to violate the {@link Comparable} contract
+     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+     *         {@code toIndex > a.length}
+     * @throws ClassCastException if the array contains elements that are
+     *         not <i>mutually comparable</i> (for example, strings and
+     *         integers).
      */
     public static void sort(Object[] a, int fromIndex, int toIndex) {
+        if (LegacyMergeSort.userRequested)
+            legacyMergeSort(a, fromIndex, toIndex);
+        else
+            ComparableTimSort.sort(a, fromIndex, toIndex);
+    }
+
+    /** To be removed in a future release. */
+    private static void legacyMergeSort(Object[] a,
+                                        int fromIndex, int toIndex) {
         rangeCheck(a.length, fromIndex, toIndex);
         Object[] aux = copyOfRange(a, fromIndex, toIndex);
         mergeSort(aux, a, fromIndex, toIndex, -fromIndex);
@@ -1133,6 +1236,7 @@ public class Arrays {
     /**
      * Tuning parameter: list size at or below which insertion sort will be
      * used in preference to mergesort or quicksort.
+     * To be removed in a future release.
      */
     private static final int INSERTIONSORT_THRESHOLD = 7;
 
@@ -1142,6 +1246,7 @@ public class Arrays {
      * low is the index in dest to start sorting
      * high is the end index in dest to end sorting
      * off is the offset to generate corresponding low, high in src
+     * To be removed in a future release.
      */
     private static void mergeSort(Object[] src,
                                   Object[] dest,
@@ -1197,25 +1302,53 @@ public class Arrays {
      * Sorts the specified array of objects according to the order induced by
      * the specified comparator.  All elements in the array must be
      * <i>mutually comparable</i> by the specified comparator (that is,
-     * <tt>c.compare(e1, e2)</tt> must not throw a <tt>ClassCastException</tt>
-     * for any elements <tt>e1</tt> and <tt>e2</tt> in the array).<p>
+     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
+     * for any elements {@code e1} and {@code e2} in the array).
      *
-     * This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.<p>
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
      *
-     * The sorting algorithm is a modified mergesort (in which the merge is
-     * omitted if the highest element in the low sublist is less than the
-     * lowest element in the high sublist).  This algorithm offers guaranteed
-     * n*log(n) performance.
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
      *
      * @param a the array to be sorted
      * @param c the comparator to determine the order of the array.  A
-     *        <tt>null</tt> value indicates that the elements'
+     *        {@code null} value indicates that the elements'
      *        {@linkplain Comparable natural ordering} should be used.
-     * @throws  ClassCastException if the array contains elements that are
-     *          not <i>mutually comparable</i> using the specified comparator.
+     * @throws ClassCastException if the array contains elements that are
+     *         not <i>mutually comparable</i> using the specified comparator
+     * @throws IllegalArgumentException (optional) if the comparator is
+     *         found to violate the {@link Comparator} contract
      */
     public static <T> void sort(T[] a, Comparator<? super T> c) {
+        if (LegacyMergeSort.userRequested)
+            legacyMergeSort(a, c);
+        else
+            TimSort.sort(a, c);
+    }
+
+    /** To be removed in a future release. */
+    private static <T> void legacyMergeSort(T[] a, Comparator<? super T> c) {
         T[] aux = a.clone();
         if (c==null)
             mergeSort(aux, a, 0, a.length, 0);
@@ -1226,36 +1359,65 @@ public class Arrays {
     /**
      * Sorts the specified range of the specified array of objects according
      * to the order induced by the specified comparator.  The range to be
-     * sorted extends from index <tt>fromIndex</tt>, inclusive, to index
-     * <tt>toIndex</tt>, exclusive.  (If <tt>fromIndex==toIndex</tt>, the
+     * sorted extends from index {@code fromIndex}, inclusive, to index
+     * {@code toIndex}, exclusive.  (If {@code fromIndex==toIndex}, the
      * range to be sorted is empty.)  All elements in the range must be
      * <i>mutually comparable</i> by the specified comparator (that is,
-     * <tt>c.compare(e1, e2)</tt> must not throw a <tt>ClassCastException</tt>
-     * for any elements <tt>e1</tt> and <tt>e2</tt> in the range).<p>
+     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
+     * for any elements {@code e1} and {@code e2} in the range).
      *
-     * This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.<p>
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
      *
-     * The sorting algorithm is a modified mergesort (in which the merge is
-     * omitted if the highest element in the low sublist is less than the
-     * lowest element in the high sublist).  This algorithm offers guaranteed
-     * n*log(n) performance.
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
      *
      * @param a the array to be sorted
      * @param fromIndex the index of the first element (inclusive) to be
      *        sorted
      * @param toIndex the index of the last element (exclusive) to be sorted
      * @param c the comparator to determine the order of the array.  A
-     *        <tt>null</tt> value indicates that the elements'
+     *        {@code null} value indicates that the elements'
      *        {@linkplain Comparable natural ordering} should be used.
      * @throws ClassCastException if the array contains elements that are not
      *         <i>mutually comparable</i> using the specified comparator.
-     * @throws IllegalArgumentException if <tt>fromIndex &gt; toIndex</tt>
-     * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex &lt; 0</tt> or
-     *         <tt>toIndex &gt; a.length</tt>
+     * @throws IllegalArgumentException if {@code fromIndex > toIndex} or
+     *         (optional) if the comparator is found to violate the
+     *         {@link Comparator} contract
+     * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+     *         {@code toIndex > a.length}
      */
     public static <T> void sort(T[] a, int fromIndex, int toIndex,
                                 Comparator<? super T> c) {
+        if (LegacyMergeSort.userRequested)
+            legacyMergeSort(a, fromIndex, toIndex, c);
+        else
+            TimSort.sort(a, fromIndex, toIndex, c);
+    }
+
+    /** To be removed in a future release. */
+    private static <T> void legacyMergeSort(T[] a, int fromIndex, int toIndex,
+                                            Comparator<? super T> c) {
         rangeCheck(a.length, fromIndex, toIndex);
         T[] aux = copyOfRange(a, fromIndex, toIndex);
         if (c==null)
@@ -1270,6 +1432,7 @@ public class Arrays {
      * low is the index in dest to start sorting
      * high is the end index in dest to end sorting
      * off is the offset into src corresponding to low in dest
+     * To be removed in a future release.
      */
     private static void mergeSort(Object[] src,
                                   Object[] dest,
diff --git a/jdk/src/share/classes/java/util/Collections.java b/jdk/src/share/classes/java/util/Collections.java
index caec3ffd11c..8597888dfa5 100644
--- a/jdk/src/share/classes/java/util/Collections.java
+++ b/jdk/src/share/classes/java/util/Collections.java
@@ -100,23 +100,42 @@ public class Collections {
 
     /**
      * Sorts the specified list into ascending order, according to the
-     * <i>natural ordering</i> of its elements.  All elements in the list must
-     * implement the <tt>Comparable</tt> interface.  Furthermore, all elements
-     * in the list must be <i>mutually comparable</i> (that is,
-     * <tt>e1.compareTo(e2)</tt> must not throw a <tt>ClassCastException</tt>
-     * for any elements <tt>e1</tt> and <tt>e2</tt> in the list).<p>
+     * {@linkplain Comparable natural ordering} of its elements.
+     * All elements in the list must implement the {@link Comparable}
+     * interface.  Furthermore, all elements in the list must be
+     * <i>mutually comparable</i> (that is, {@code e1.compareTo(e2)}
+     * must not throw a {@code ClassCastException} for any elements
+     * {@code e1} and {@code e2} in the list).
      *
-     * This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.<p>
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
      *
-     * The specified list must be modifiable, but need not be resizable.<p>
+     * <p>The specified list must be modifiable, but need not be resizable.
      *
-     * The sorting algorithm is a modified mergesort (in which the merge is
-     * omitted if the highest element in the low sublist is less than the
-     * lowest element in the high sublist).  This algorithm offers guaranteed
-     * n log(n) performance.
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
      *
-     * This implementation dumps the specified list into an array, sorts
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
+     *
+     * <p>This implementation dumps the specified list into an array, sorts
      * the array, and iterates over the list resetting each element
      * from the corresponding position in the array.  This avoids the
      * n<sup>2</sup> log(n) performance that would result from attempting
@@ -126,8 +145,10 @@ public class Collections {
      * @throws ClassCastException if the list contains elements that are not
      *         <i>mutually comparable</i> (for example, strings and integers).
      * @throws UnsupportedOperationException if the specified list's
-     *         list-iterator does not support the <tt>set</tt> operation.
-     * @see Comparable
+     *         list-iterator does not support the {@code set} operation.
+     * @throws IllegalArgumentException (optional) if the implementation
+     *         detects that the natural ordering of the list elements is
+     *         found to violate the {@link Comparable} contract
      */
     public static <T extends Comparable<? super T>> void sort(List<T> list) {
         Object[] a = list.toArray();
@@ -143,19 +164,38 @@ public class Collections {
      * Sorts the specified list according to the order induced by the
      * specified comparator.  All elements in the list must be <i>mutually
      * comparable</i> using the specified comparator (that is,
-     * <tt>c.compare(e1, e2)</tt> must not throw a <tt>ClassCastException</tt>
-     * for any elements <tt>e1</tt> and <tt>e2</tt> in the list).<p>
+     * {@code c.compare(e1, e2)} must not throw a {@code ClassCastException}
+     * for any elements {@code e1} and {@code e2} in the list).
      *
-     * This sort is guaranteed to be <i>stable</i>:  equal elements will
-     * not be reordered as a result of the sort.<p>
+     * <p>This sort is guaranteed to be <i>stable</i>:  equal elements will
+     * not be reordered as a result of the sort.
      *
-     * The sorting algorithm is a modified mergesort (in which the merge is
-     * omitted if the highest element in the low sublist is less than the
-     * lowest element in the high sublist).  This algorithm offers guaranteed
-     * n log(n) performance.
+     * <p>The specified list must be modifiable, but need not be resizable.
      *
-     * The specified list must be modifiable, but need not be resizable.
-     * This implementation dumps the specified list into an array, sorts
+     * <p>Implementation note: This implementation is a stable, adaptive,
+     * iterative mergesort that requires far fewer than n lg(n) comparisons
+     * when the input array is partially sorted, while offering the
+     * performance of a traditional mergesort when the input array is
+     * randomly ordered.  If the input array is nearly sorted, the
+     * implementation requires approximately n comparisons.  Temporary
+     * storage requirements vary from a small constant for nearly sorted
+     * input arrays to n/2 object references for randomly ordered input
+     * arrays.
+     *
+     * <p>The implementation takes equal advantage of ascending and
+     * descending order in its input array, and can take advantage of
+     * ascending and descending order in different parts of the the same
+     * input array.  It is well-suited to merging two or more sorted arrays:
+     * simply concatenate the arrays and sort the resulting array.
+     *
+     * <p>The implementation was adapted from Tim Peters's list sort for Python
+     * (<a href="http://svn.python.org/projects/python/trunk/Objects/listsort.txt">
+     * TimSort</a>).  It uses techiques from Peter McIlroy's "Optimistic
+     * Sorting and Information Theoretic Complexity", in Proceedings of the
+     * Fourth Annual ACM-SIAM Symposium on Discrete Algorithms, pp 467-474,
+     * January 1993.
+     *
+     * <p>This implementation dumps the specified list into an array, sorts
      * the array, and iterates over the list resetting each element
      * from the corresponding position in the array.  This avoids the
      * n<sup>2</sup> log(n) performance that would result from attempting
@@ -163,13 +203,14 @@ public class Collections {
      *
      * @param  list the list to be sorted.
      * @param  c the comparator to determine the order of the list.  A
-     *        <tt>null</tt> value indicates that the elements' <i>natural
+     *        {@code null} value indicates that the elements' <i>natural
      *        ordering</i> should be used.
      * @throws ClassCastException if the list contains elements that are not
      *         <i>mutually comparable</i> using the specified comparator.
      * @throws UnsupportedOperationException if the specified list's
-     *         list-iterator does not support the <tt>set</tt> operation.
-     * @see Comparator
+     *         list-iterator does not support the {@code set} operation.
+     * @throws IllegalArgumentException (optional) if the comparator is
+     *         found to violate the {@link Comparator} contract
      */
     public static <T> void sort(List<T> list, Comparator<? super T> c) {
         Object[] a = list.toArray();
diff --git a/jdk/src/share/classes/java/util/ComparableTimSort.java b/jdk/src/share/classes/java/util/ComparableTimSort.java
new file mode 100644
index 00000000000..750a89bebaa
--- /dev/null
+++ b/jdk/src/share/classes/java/util/ComparableTimSort.java
@@ -0,0 +1,895 @@
+/*
+ * Copyright 2009 Google Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package java.util;
+
+/**
+ * This is a near duplicate of {@link TimSort}, modified for use with
+ * arrays of objects that implement {@link Comparable}, instead of using
+ * explicit comparators.
+ *
+ * <p>If you are using an optimizing VM, you may find that ComparableTimSort
+ * offers no performance benefit over TimSort in conjunction with a
+ * comparator that simply returns {@code ((Comparable)first).compareTo(Second)}.
+ * If this is the case, you are better off deleting ComparableTimSort to
+ * eliminate the code duplication.  (See Arrays.java for details.)
+ *
+ * @author Josh Bloch
+ */
+class ComparableTimSort {
+    /**
+     * This is the minimum sized sequence that will be merged.  Shorter
+     * sequences will be lengthened by calling binarySort.  If the entire
+     * array is less than this length, no merges will be performed.
+     *
+     * This constant should be a power of two.  It was 64 in Tim Peter's C
+     * implementation, but 32 was empirically determined to work better in
+     * this implementation.  In the unlikely event that you set this constant
+     * to be a number that's not a power of two, you'll need to change the
+     * {@link #minRunLength} computation.
+     *
+     * If you decrease this constant, you must change the stackLen
+     * computation in the TimSort constructor, or you risk an
+     * ArrayOutOfBounds exception.  See listsort.txt for a discussion
+     * of the minimum stack length required as a function of the length
+     * of the array being sorted and the minimum merge sequence length.
+     */
+    private static final int MIN_MERGE = 32;
+
+    /**
+     * The array being sorted.
+     */
+    private final Object[] a;
+
+    /**
+     * When we get into galloping mode, we stay there until both runs win less
+     * often than MIN_GALLOP consecutive times.
+     */
+    private static final int  MIN_GALLOP = 7;
+
+    /**
+     * This controls when we get *into* galloping mode.  It is initialized
+     * to MIN_GALLOP.  The mergeLo and mergeHi methods nudge it higher for
+     * random data, and lower for highly structured data.
+     */
+    private int minGallop = MIN_GALLOP;
+
+    /**
+     * Maximum initial size of tmp array, which is used for merging.  The array
+     * can grow to accommodate demand.
+     *
+     * Unlike Tim's original C version, we do not allocate this much storage
+     * when sorting smaller arrays.  This change was required for performance.
+     */
+    private static final int INITIAL_TMP_STORAGE_LENGTH = 256;
+
+    /**
+     * Temp storage for merges.
+     */
+    private Object[] tmp;
+
+    /**
+     * A stack of pending runs yet to be merged.  Run i starts at
+     * address base[i] and extends for len[i] elements.  It's always
+     * true (so long as the indices are in bounds) that:
+     *
+     *     runBase[i] + runLen[i] == runBase[i + 1]
+     *
+     * so we could cut the storage for this, but it's a minor amount,
+     * and keeping all the info explicit simplifies the code.
+     */
+    private int stackSize = 0;  // Number of pending runs on stack
+    private final int[] runBase;
+    private final int[] runLen;
+
+    /**
+     * Creates a TimSort instance to maintain the state of an ongoing sort.
+     *
+     * @param a the array to be sorted
+     */
+    private ComparableTimSort(Object[] a) {
+        this.a = a;
+
+        // Allocate temp storage (which may be increased later if necessary)
+        int len = a.length;
+        @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+        Object[] newArray = new Object[len < 2 * INITIAL_TMP_STORAGE_LENGTH ?
+                                       len >>> 1 : INITIAL_TMP_STORAGE_LENGTH];
+        tmp = newArray;
+
+        /*
+         * Allocate runs-to-be-merged stack (which cannot be expanded).  The
+         * stack length requirements are described in listsort.txt.  The C
+         * version always uses the same stack length (85), but this was
+         * measured to be too expensive when sorting "mid-sized" arrays (e.g.,
+         * 100 elements) in Java.  Therefore, we use smaller (but sufficiently
+         * large) stack lengths for smaller arrays.  The "magic numbers" in the
+         * computation below must be changed if MIN_MERGE is decreased.  See
+         * the MIN_MERGE declaration above for more information.
+         */
+        int stackLen = (len <    120  ?  5 :
+                        len <   1542  ? 10 :
+                        len < 119151  ? 19 : 40);
+        runBase = new int[stackLen];
+        runLen = new int[stackLen];
+    }
+
+    /*
+     * The next two methods (which are package private and static) constitute
+     * the entire API of this class.  Each of these methods obeys the contract
+     * of the public method with the same signature in java.util.Arrays.
+     */
+
+    static void sort(Object[] a) {
+          sort(a, 0, a.length);
+    }
+
+    static void sort(Object[] a, int lo, int hi) {
+        rangeCheck(a.length, lo, hi);
+        int nRemaining  = hi - lo;
+        if (nRemaining < 2)
+            return;  // Arrays of size 0 and 1 are always sorted
+
+        // If array is small, do a "mini-TimSort" with no merges
+        if (nRemaining < MIN_MERGE) {
+            int initRunLen = countRunAndMakeAscending(a, lo, hi);
+            binarySort(a, lo, hi, lo + initRunLen);
+            return;
+        }
+
+        /**
+         * March over the array once, left to right, finding natural runs,
+         * extending short natural runs to minRun elements, and merging runs
+         * to maintain stack invariant.
+         */
+        ComparableTimSort ts = new ComparableTimSort(a);
+        int minRun = minRunLength(nRemaining);
+        do {
+            // Identify next run
+            int runLen = countRunAndMakeAscending(a, lo, hi);
+
+            // If run is short, extend to min(minRun, nRemaining)
+            if (runLen < minRun) {
+                int force = nRemaining <= minRun ? nRemaining : minRun;
+                binarySort(a, lo, lo + force, lo + runLen);
+                runLen = force;
+            }
+
+            // Push run onto pending-run stack, and maybe merge
+            ts.pushRun(lo, runLen);
+            ts.mergeCollapse();
+
+            // Advance to find next run
+            lo += runLen;
+            nRemaining -= runLen;
+        } while (nRemaining != 0);
+
+        // Merge all remaining runs to complete sort
+        assert lo == hi;
+        ts.mergeForceCollapse();
+        assert ts.stackSize == 1;
+    }
+
+    /**
+     * Sorts the specified portion of the specified array using a binary
+     * insertion sort.  This is the best method for sorting small numbers
+     * of elements.  It requires O(n log n) compares, but O(n^2) data
+     * movement (worst case).
+     *
+     * If the initial part of the specified range is already sorted,
+     * this method can take advantage of it: the method assumes that the
+     * elements from index {@code lo}, inclusive, to {@code start},
+     * exclusive are already sorted.
+     *
+     * @param a the array in which a range is to be sorted
+     * @param lo the index of the first element in the range to be sorted
+     * @param hi the index after the last element in the range to be sorted
+     * @param start the index of the first element in the range that is
+     *        not already known to be sorted (@code lo <= start <= hi}
+     */
+    @SuppressWarnings("fallthrough")
+    private static void binarySort(Object[] a, int lo, int hi, int start) {
+        assert lo <= start && start <= hi;
+        if (start == lo)
+            start++;
+        for ( ; start < hi; start++) {
+            @SuppressWarnings("unchecked")
+            Comparable<Object> pivot = (Comparable) a[start];
+
+            // Set left (and right) to the index where a[start] (pivot) belongs
+            int left = lo;
+            int right = start;
+            assert left <= right;
+            /*
+             * Invariants:
+             *   pivot >= all in [lo, left).
+             *   pivot <  all in [right, start).
+             */
+            while (left < right) {
+                int mid = (left + right) >>> 1;
+                if (pivot.compareTo(a[mid]) < 0)
+                    right = mid;
+                else
+                    left = mid + 1;
+            }
+            assert left == right;
+
+            /*
+             * The invariants still hold: pivot >= all in [lo, left) and
+             * pivot < all in [left, start), so pivot belongs at left.  Note
+             * that if there are elements equal to pivot, left points to the
+             * first slot after them -- that's why this sort is stable.
+             * Slide elements over to make room to make room for pivot.
+             */
+            int n = start - left;  // The number of elements to move
+            // Switch is just an optimization for arraycopy in default case
+            switch(n) {
+                case 2:  a[left + 2] = a[left + 1];
+                case 1:  a[left + 1] = a[left];
+                         break;
+                default: System.arraycopy(a, left, a, left + 1, n);
+            }
+            a[left] = pivot;
+        }
+    }
+
+    /**
+     * Returns the length of the run beginning at the specified position in
+     * the specified array and reverses the run if it is descending (ensuring
+     * that the run will always be ascending when the method returns).
+     *
+     * A run is the longest ascending sequence with:
+     *
+     *    a[lo] <= a[lo + 1] <= a[lo + 2] <= ...
+     *
+     * or the longest descending sequence with:
+     *
+     *    a[lo] >  a[lo + 1] >  a[lo + 2] >  ...
+     *
+     * For its intended use in a stable mergesort, the strictness of the
+     * definition of "descending" is needed so that the call can safely
+     * reverse a descending sequence without violating stability.
+     *
+     * @param a the array in which a run is to be counted and possibly reversed
+     * @param lo index of the first element in the run
+     * @param hi index after the last element that may be contained in the run.
+              It is required that @code{lo < hi}.
+     * @return  the length of the run beginning at the specified position in
+     *          the specified array
+     */
+    @SuppressWarnings("unchecked")
+    private static int countRunAndMakeAscending(Object[] a, int lo, int hi) {
+        assert lo < hi;
+        int runHi = lo + 1;
+        if (runHi == hi)
+            return 1;
+
+        // Find end of run, and reverse range if descending
+        if (((Comparable) a[runHi++]).compareTo(a[lo]) < 0) { // Descending
+            while(runHi < hi && ((Comparable) a[runHi]).compareTo(a[runHi - 1]) < 0)
+                runHi++;
+            reverseRange(a, lo, runHi);
+        } else {                              // Ascending
+            while (runHi < hi && ((Comparable) a[runHi]).compareTo(a[runHi - 1]) >= 0)
+                runHi++;
+        }
+
+        return runHi - lo;
+    }
+
+    /**
+     * Reverse the specified range of the specified array.
+     *
+     * @param a the array in which a range is to be reversed
+     * @param lo the index of the first element in the range to be reversed
+     * @param hi the index after the last element in the range to be reversed
+     */
+    private static void reverseRange(Object[] a, int lo, int hi) {
+        hi--;
+        while (lo < hi) {
+            Object t = a[lo];
+            a[lo++] = a[hi];
+            a[hi--] = t;
+        }
+    }
+
+    /**
+     * Returns the minimum acceptable run length for an array of the specified
+     * length. Natural runs shorter than this will be extended with
+     * {@link #binarySort}.
+     *
+     * Roughly speaking, the computation is:
+     *
+     *  If n < MIN_MERGE, return n (it's too small to bother with fancy stuff).
+     *  Else if n is an exact power of 2, return MIN_MERGE/2.
+     *  Else return an int k, MIN_MERGE/2 <= k <= MIN_MERGE, such that n/k
+     *   is close to, but strictly less than, an exact power of 2.
+     *
+     * For the rationale, see listsort.txt.
+     *
+     * @param n the length of the array to be sorted
+     * @return the length of the minimum run to be merged
+     */
+    private static int minRunLength(int n) {
+        assert n >= 0;
+        int r = 0;      // Becomes 1 if any 1 bits are shifted off
+        while (n >= MIN_MERGE) {
+            r |= (n & 1);
+            n >>= 1;
+        }
+        return n + r;
+    }
+
+    /**
+     * Pushes the specified run onto the pending-run stack.
+     *
+     * @param runBase index of the first element in the run
+     * @param runLen  the number of elements in the run
+     */
+    private void pushRun(int runBase, int runLen) {
+        this.runBase[stackSize] = runBase;
+        this.runLen[stackSize] = runLen;
+        stackSize++;
+    }
+
+    /**
+     * Examines the stack of runs waiting to be merged and merges adjacent runs
+     * until the stack invariants are reestablished:
+     *
+     *     1. runLen[i - 3] > runLen[i - 2] + runLen[i - 1]
+     *     2. runLen[i - 2] > runLen[i - 1]
+     *
+     * This method is called each time a new run is pushed onto the stack,
+     * so the invariants are guaranteed to hold for i < stackSize upon
+     * entry to the method.
+     */
+    private void mergeCollapse() {
+        while (stackSize > 1) {
+            int n = stackSize - 2;
+            if (n > 0 && runLen[n-1] <= runLen[n] + runLen[n+1]) {
+                if (runLen[n - 1] < runLen[n + 1])
+                    n--;
+                mergeAt(n);
+            } else if (runLen[n] <= runLen[n + 1]) {
+                mergeAt(n);
+            } else {
+                break; // Invariant is established
+            }
+        }
+    }
+
+    /**
+     * Merges all runs on the stack until only one remains.  This method is
+     * called once, to complete the sort.
+     */
+    private void mergeForceCollapse() {
+        while (stackSize > 1) {
+            int n = stackSize - 2;
+            if (n > 0 && runLen[n - 1] < runLen[n + 1])
+                n--;
+            mergeAt(n);
+        }
+    }
+
+    /**
+     * Merges the two runs at stack indices i and i+1.  Run i must be
+     * the penultimate or antepenultimate run on the stack.  In other words,
+     * i must be equal to stackSize-2 or stackSize-3.
+     *
+     * @param i stack index of the first of the two runs to merge
+     */
+    @SuppressWarnings("unchecked")
+    private void mergeAt(int i) {
+        assert stackSize >= 2;
+        assert i >= 0;
+        assert i == stackSize - 2 || i == stackSize - 3;
+
+        int base1 = runBase[i];
+        int len1 = runLen[i];
+        int base2 = runBase[i + 1];
+        int len2 = runLen[i + 1];
+        assert len1 > 0 && len2 > 0;
+        assert base1 + len1 == base2;
+
+        /*
+         * Record the length of the combined runs; if i is the 3rd-last
+         * run now, also slide over the last run (which isn't involved
+         * in this merge).  The current run (i+1) goes away in any case.
+         */
+        runLen[i] = len1 + len2;
+        if (i == stackSize - 3) {
+            runBase[i + 1] = runBase[i + 2];
+            runLen[i + 1] = runLen[i + 2];
+        }
+        stackSize--;
+
+        /*
+         * Find where the first element of run2 goes in run1. Prior elements
+         * in run1 can be ignored (because they're already in place).
+         */
+        int k = gallopRight((Comparable<Object>) a[base2], a, base1, len1, 0);
+        assert k >= 0;
+        base1 += k;
+        len1 -= k;
+        if (len1 == 0)
+            return;
+
+        /*
+         * Find where the last element of run1 goes in run2. Subsequent elements
+         * in run2 can be ignored (because they're already in place).
+         */
+        len2 = gallopLeft((Comparable<Object>) a[base1 + len1 - 1], a,
+                base2, len2, len2 - 1);
+        assert len2 >= 0;
+        if (len2 == 0)
+            return;
+
+        // Merge remaining runs, using tmp array with min(len1, len2) elements
+        if (len1 <= len2)
+            mergeLo(base1, len1, base2, len2);
+        else
+            mergeHi(base1, len1, base2, len2);
+    }
+
+    /**
+     * Locates the position at which to insert the specified key into the
+     * specified sorted range; if the range contains an element equal to key,
+     * returns the index of the leftmost equal element.
+     *
+     * @param key the key whose insertion point to search for
+     * @param a the array in which to search
+     * @param base the index of the first element in the range
+     * @param len the length of the range; must be > 0
+     * @param hint the index at which to begin the search, 0 <= hint < n.
+     *     The closer hint is to the result, the faster this method will run.
+     * @return the int k,  0 <= k <= n such that a[b + k - 1] < key <= a[b + k],
+     *    pretending that a[b - 1] is minus infinity and a[b + n] is infinity.
+     *    In other words, key belongs at index b + k; or in other words,
+     *    the first k elements of a should precede key, and the last n - k
+     *    should follow it.
+     */
+    private static int gallopLeft(Comparable<Object> key, Object[] a,
+            int base, int len, int hint) {
+        assert len > 0 && hint >= 0 && hint < len;
+
+        int lastOfs = 0;
+        int ofs = 1;
+        if (key.compareTo(a[base + hint]) > 0) {
+            // Gallop right until a[base+hint+lastOfs] < key <= a[base+hint+ofs]
+            int maxOfs = len - hint;
+            while (ofs < maxOfs && key.compareTo(a[base + hint + ofs]) > 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to base
+            lastOfs += hint;
+            ofs += hint;
+        } else { // key <= a[base + hint]
+            // Gallop left until a[base+hint-ofs] < key <= a[base+hint-lastOfs]
+            final int maxOfs = hint + 1;
+            while (ofs < maxOfs && key.compareTo(a[base + hint - ofs]) <= 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to base
+            int tmp = lastOfs;
+            lastOfs = hint - ofs;
+            ofs = hint - tmp;
+        }
+        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
+
+        /*
+         * Now a[base+lastOfs] < key <= a[base+ofs], so key belongs somewhere
+         * to the right of lastOfs but no farther right than ofs.  Do a binary
+         * search, with invariant a[base + lastOfs - 1] < key <= a[base + ofs].
+         */
+        lastOfs++;
+        while (lastOfs < ofs) {
+            int m = lastOfs + ((ofs - lastOfs) >>> 1);
+
+            if (key.compareTo(a[base + m]) > 0)
+                lastOfs = m + 1;  // a[base + m] < key
+            else
+                ofs = m;          // key <= a[base + m]
+        }
+        assert lastOfs == ofs;    // so a[base + ofs - 1] < key <= a[base + ofs]
+        return ofs;
+    }
+
+    /**
+     * Like gallopLeft, except that if the range contains an element equal to
+     * key, gallopRight returns the index after the rightmost equal element.
+     *
+     * @param key the key whose insertion point to search for
+     * @param a the array in which to search
+     * @param base the index of the first element in the range
+     * @param len the length of the range; must be > 0
+     * @param hint the index at which to begin the search, 0 <= hint < n.
+     *     The closer hint is to the result, the faster this method will run.
+     * @return the int k,  0 <= k <= n such that a[b + k - 1] <= key < a[b + k]
+     */
+    private static int gallopRight(Comparable<Object> key, Object[] a,
+            int base, int len, int hint) {
+        assert len > 0 && hint >= 0 && hint < len;
+
+        int ofs = 1;
+        int lastOfs = 0;
+        if (key.compareTo(a[base + hint]) < 0) {
+            // Gallop left until a[b+hint - ofs] <= key < a[b+hint - lastOfs]
+            int maxOfs = hint + 1;
+            while (ofs < maxOfs && key.compareTo(a[base + hint - ofs]) < 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to b
+            int tmp = lastOfs;
+            lastOfs = hint - ofs;
+            ofs = hint - tmp;
+        } else { // a[b + hint] <= key
+            // Gallop right until a[b+hint + lastOfs] <= key < a[b+hint + ofs]
+            int maxOfs = len - hint;
+            while (ofs < maxOfs && key.compareTo(a[base + hint + ofs]) >= 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to b
+            lastOfs += hint;
+            ofs += hint;
+        }
+        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
+
+        /*
+         * Now a[b + lastOfs] <= key < a[b + ofs], so key belongs somewhere to
+         * the right of lastOfs but no farther right than ofs.  Do a binary
+         * search, with invariant a[b + lastOfs - 1] <= key < a[b + ofs].
+         */
+        lastOfs++;
+        while (lastOfs < ofs) {
+            int m = lastOfs + ((ofs - lastOfs) >>> 1);
+
+            if (key.compareTo(a[base + m]) < 0)
+                ofs = m;          // key < a[b + m]
+            else
+                lastOfs = m + 1;  // a[b + m] <= key
+        }
+        assert lastOfs == ofs;    // so a[b + ofs - 1] <= key < a[b + ofs]
+        return ofs;
+    }
+
+    /**
+     * Merges two adjacent runs in place, in a stable fashion.  The first
+     * element of the first run must be greater than the first element of the
+     * second run (a[base1] > a[base2]), and the last element of the first run
+     * (a[base1 + len1-1]) must be greater than all elements of the second run.
+     *
+     * For performance, this method should be called only when len1 <= len2;
+     * its twin, mergeHi should be called if len1 >= len2.  (Either method
+     * may be called if len1 == len2.)
+     *
+     * @param base1 index of first element in first run to be merged
+     * @param len1  length of first run to be merged (must be > 0)
+     * @param base2 index of first element in second run to be merged
+     *        (must be aBase + aLen)
+     * @param len2  length of second run to be merged (must be > 0)
+     */
+    @SuppressWarnings("unchecked")
+    private void mergeLo(int base1, int len1, int base2, int len2) {
+        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
+
+        // Copy first run into temp array
+        Object[] a = this.a; // For performance
+        Object[] tmp = ensureCapacity(len1);
+        System.arraycopy(a, base1, tmp, 0, len1);
+
+        int cursor1 = 0;       // Indexes into tmp array
+        int cursor2 = base2;   // Indexes int a
+        int dest = base1;      // Indexes int a
+
+        // Move first element of second run and deal with degenerate cases
+        a[dest++] = a[cursor2++];
+        if (--len2 == 0) {
+            System.arraycopy(tmp, cursor1, a, dest, len1);
+            return;
+        }
+        if (len1 == 1) {
+            System.arraycopy(a, cursor2, a, dest, len2);
+            a[dest + len2] = tmp[cursor1]; // Last elt of run 1 to end of merge
+            return;
+        }
+
+        int minGallop = this.minGallop;  // Use local variable for performance
+    outer:
+        while (true) {
+            int count1 = 0; // Number of times in a row that first run won
+            int count2 = 0; // Number of times in a row that second run won
+
+            /*
+             * Do the straightforward thing until (if ever) one run starts
+             * winning consistently.
+             */
+            do {
+                assert len1 > 1 && len2 > 0;
+                if (((Comparable) a[cursor2]).compareTo(tmp[cursor1]) < 0) {
+                    a[dest++] = a[cursor2++];
+                    count2++;
+                    count1 = 0;
+                    if (--len2 == 0)
+                        break outer;
+                } else {
+                    a[dest++] = tmp[cursor1++];
+                    count1++;
+                    count2 = 0;
+                    if (--len1 == 1)
+                        break outer;
+                }
+            } while ((count1 | count2) < minGallop);
+
+            /*
+             * One run is winning so consistently that galloping may be a
+             * huge win. So try that, and continue galloping until (if ever)
+             * neither run appears to be winning consistently anymore.
+             */
+            do {
+                assert len1 > 1 && len2 > 0;
+                count1 = gallopRight((Comparable) a[cursor2], tmp, cursor1, len1, 0);
+                if (count1 != 0) {
+                    System.arraycopy(tmp, cursor1, a, dest, count1);
+                    dest += count1;
+                    cursor1 += count1;
+                    len1 -= count1;
+                    if (len1 <= 1)  // len1 == 1 || len1 == 0
+                        break outer;
+                }
+                a[dest++] = a[cursor2++];
+                if (--len2 == 0)
+                    break outer;
+
+                count2 = gallopLeft((Comparable) tmp[cursor1], a, cursor2, len2, 0);
+                if (count2 != 0) {
+                    System.arraycopy(a, cursor2, a, dest, count2);
+                    dest += count2;
+                    cursor2 += count2;
+                    len2 -= count2;
+                    if (len2 == 0)
+                        break outer;
+                }
+                a[dest++] = tmp[cursor1++];
+                if (--len1 == 1)
+                    break outer;
+                minGallop--;
+            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
+            if (minGallop < 0)
+                minGallop = 0;
+            minGallop += 2;  // Penalize for leaving gallop mode
+        }  // End of "outer" loop
+        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
+
+        if (len1 == 1) {
+            assert len2 > 0;
+            System.arraycopy(a, cursor2, a, dest, len2);
+            a[dest + len2] = tmp[cursor1]; //  Last elt of run 1 to end of merge
+        } else if (len1 == 0) {
+            throw new IllegalArgumentException(
+                "Comparison method violates its general contract!");
+        } else {
+            assert len2 == 0;
+            assert len1 > 1;
+            System.arraycopy(tmp, cursor1, a, dest, len1);
+        }
+    }
+
+    /**
+     * Like mergeLo, except that this method should be called only if
+     * len1 >= len2; mergeLo should be called if len1 <= len2.  (Either method
+     * may be called if len1 == len2.)
+     *
+     * @param base1 index of first element in first run to be merged
+     * @param len1  length of first run to be merged (must be > 0)
+     * @param base2 index of first element in second run to be merged
+     *        (must be aBase + aLen)
+     * @param len2  length of second run to be merged (must be > 0)
+     */
+    @SuppressWarnings("unchecked")
+    private void mergeHi(int base1, int len1, int base2, int len2) {
+        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
+
+        // Copy second run into temp array
+        Object[] a = this.a; // For performance
+        Object[] tmp = ensureCapacity(len2);
+        System.arraycopy(a, base2, tmp, 0, len2);
+
+        int cursor1 = base1 + len1 - 1;  // Indexes into a
+        int cursor2 = len2 - 1;          // Indexes into tmp array
+        int dest = base2 + len2 - 1;     // Indexes into a
+
+        // Move last element of first run and deal with degenerate cases
+        a[dest--] = a[cursor1--];
+        if (--len1 == 0) {
+            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
+            return;
+        }
+        if (len2 == 1) {
+            dest -= len1;
+            cursor1 -= len1;
+            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
+            a[dest] = tmp[cursor2];
+            return;
+        }
+
+        int minGallop = this.minGallop;  // Use local variable for performance
+    outer:
+        while (true) {
+            int count1 = 0; // Number of times in a row that first run won
+            int count2 = 0; // Number of times in a row that second run won
+
+            /*
+             * Do the straightforward thing until (if ever) one run
+             * appears to win consistently.
+             */
+            do {
+                assert len1 > 0 && len2 > 1;
+                if (((Comparable) tmp[cursor2]).compareTo(a[cursor1]) < 0) {
+                    a[dest--] = a[cursor1--];
+                    count1++;
+                    count2 = 0;
+                    if (--len1 == 0)
+                        break outer;
+                } else {
+                    a[dest--] = tmp[cursor2--];
+                    count2++;
+                    count1 = 0;
+                    if (--len2 == 1)
+                        break outer;
+                }
+            } while ((count1 | count2) < minGallop);
+
+            /*
+             * One run is winning so consistently that galloping may be a
+             * huge win. So try that, and continue galloping until (if ever)
+             * neither run appears to be winning consistently anymore.
+             */
+            do {
+                assert len1 > 0 && len2 > 1;
+                count1 = len1 - gallopRight((Comparable) tmp[cursor2], a, base1, len1, len1 - 1);
+                if (count1 != 0) {
+                    dest -= count1;
+                    cursor1 -= count1;
+                    len1 -= count1;
+                    System.arraycopy(a, cursor1 + 1, a, dest + 1, count1);
+                    if (len1 == 0)
+                        break outer;
+                }
+                a[dest--] = tmp[cursor2--];
+                if (--len2 == 1)
+                    break outer;
+
+                count2 = len2 - gallopLeft((Comparable) a[cursor1], tmp, 0, len2, len2 - 1);
+                if (count2 != 0) {
+                    dest -= count2;
+                    cursor2 -= count2;
+                    len2 -= count2;
+                    System.arraycopy(tmp, cursor2 + 1, a, dest + 1, count2);
+                    if (len2 <= 1)
+                        break outer; // len2 == 1 || len2 == 0
+                }
+                a[dest--] = a[cursor1--];
+                if (--len1 == 0)
+                    break outer;
+                minGallop--;
+            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
+            if (minGallop < 0)
+                minGallop = 0;
+            minGallop += 2;  // Penalize for leaving gallop mode
+        }  // End of "outer" loop
+        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
+
+        if (len2 == 1) {
+            assert len1 > 0;
+            dest -= len1;
+            cursor1 -= len1;
+            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
+            a[dest] = tmp[cursor2];  // Move first elt of run2 to front of merge
+        } else if (len2 == 0) {
+            throw new IllegalArgumentException(
+                "Comparison method violates its general contract!");
+        } else {
+            assert len1 == 0;
+            assert len2 > 0;
+            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
+        }
+    }
+
+    /**
+     * Ensures that the external array tmp has at least the specified
+     * number of elements, increasing its size if necessary.  The size
+     * increases exponentially to ensure amortized linear time complexity.
+     *
+     * @param minCapacity the minimum required capacity of the tmp array
+     * @return tmp, whether or not it grew
+     */
+    private Object[]  ensureCapacity(int minCapacity) {
+        if (tmp.length < minCapacity) {
+            // Compute smallest power of 2 > minCapacity
+            int newSize = minCapacity;
+            newSize |= newSize >> 1;
+            newSize |= newSize >> 2;
+            newSize |= newSize >> 4;
+            newSize |= newSize >> 8;
+            newSize |= newSize >> 16;
+            newSize++;
+
+            if (newSize < 0) // Not bloody likely!
+                newSize = minCapacity;
+            else
+                newSize = Math.min(newSize, a.length >>> 1);
+
+            @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+            Object[] newArray = new Object[newSize];
+            tmp = newArray;
+        }
+        return tmp;
+    }
+
+    /**
+     * Checks that fromIndex and toIndex are in range, and throws an
+     * appropriate exception if they aren't.
+     *
+     * @param arrayLen the length of the array
+     * @param fromIndex the index of the first element of the range
+     * @param toIndex the index after the last element of the range
+     * @throws IllegalArgumentException if fromIndex > toIndex
+     * @throws ArrayIndexOutOfBoundsException if fromIndex < 0
+     *         or toIndex > arrayLen
+     */
+    private static void rangeCheck(int arrayLen, int fromIndex, int toIndex) {
+        if (fromIndex > toIndex)
+            throw new IllegalArgumentException("fromIndex(" + fromIndex +
+                       ") > toIndex(" + toIndex+")");
+        if (fromIndex < 0)
+            throw new ArrayIndexOutOfBoundsException(fromIndex);
+        if (toIndex > arrayLen)
+            throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+}
diff --git a/jdk/src/share/classes/java/util/Formatter.java b/jdk/src/share/classes/java/util/Formatter.java
index eb49ec9c5da..027e36dcc81 100644
--- a/jdk/src/share/classes/java/util/Formatter.java
+++ b/jdk/src/share/classes/java/util/Formatter.java
@@ -2818,15 +2818,18 @@ public final class Formatter implements Closeable, Flushable {
         }
 
         private void printString(Object arg, Locale l) throws IOException {
-            if (arg == null) {
-                print("null");
-            } else if (arg instanceof Formattable) {
+            if (arg instanceof Formattable) {
                 Formatter fmt = formatter;
                 if (formatter.locale() != l)
                     fmt = new Formatter(formatter.out(), l);
                 ((Formattable)arg).formatTo(fmt, f.valueOf(), width, precision);
             } else {
-                print(arg.toString());
+                if (f.contains(Flags.ALTERNATE))
+                    failMismatch(Flags.ALTERNATE, 's');
+                if (arg == null)
+                    print("null");
+                else
+                    print(arg.toString());
             }
         }
 
diff --git a/jdk/src/share/classes/java/util/Properties.java b/jdk/src/share/classes/java/util/Properties.java
index 29363b1fec3..d93a18f97f2 100644
--- a/jdk/src/share/classes/java/util/Properties.java
+++ b/jdk/src/share/classes/java/util/Properties.java
@@ -101,12 +101,12 @@ import java.io.BufferedWriter;
  *    &lt;!ATTLIST entry key CDATA #REQUIRED&gt;
  * </pre>
  *
- * @see <a href="../../../technotes/tools/solaris/native2ascii.html">native2ascii tool for Solaris</a>
- * @see <a href="../../../technotes/tools/windows/native2ascii.html">native2ascii tool for Windows</a>
- *
  * <p>This class is thread-safe: multiple threads can share a single
  * <tt>Properties</tt> object without the need for external synchronization.
  *
+ * @see <a href="../../../technotes/tools/solaris/native2ascii.html">native2ascii tool for Solaris</a>
+ * @see <a href="../../../technotes/tools/windows/native2ascii.html">native2ascii tool for Windows</a>
+ *
  * @author  Arthur van Hoff
  * @author  Michael McCloskey
  * @author  Xueming Shen
diff --git a/jdk/src/share/classes/java/util/Scanner.java b/jdk/src/share/classes/java/util/Scanner.java
index c1032337bd2..b7ec4b847d2 100644
--- a/jdk/src/share/classes/java/util/Scanner.java
+++ b/jdk/src/share/classes/java/util/Scanner.java
@@ -674,7 +674,6 @@ public final class Scanner implements Iterator<String> {
     }
 
     /**
-     * {@note new}
      * Constructs a new <code>Scanner</code> that produces values scanned
      * from the specified file. Bytes from the file are converted into
      * characters using the underlying platform's
@@ -694,7 +693,6 @@ public final class Scanner implements Iterator<String> {
     }
 
     /**
-     * {@note new}
      * Constructs a new <code>Scanner</code> that produces values scanned
      * from the specified file. Bytes from the file are converted into
      * characters using the specified charset.
diff --git a/jdk/src/share/classes/java/util/SimpleTimeZone.java b/jdk/src/share/classes/java/util/SimpleTimeZone.java
index b0fd57de8df..d97d6f59a03 100644
--- a/jdk/src/share/classes/java/util/SimpleTimeZone.java
+++ b/jdk/src/share/classes/java/util/SimpleTimeZone.java
@@ -1372,7 +1372,7 @@ public class SimpleTimeZone extends TimeZone {
                 throw new IllegalArgumentException(
                         "Illegal start month " + startMonth);
             }
-            if (startTime < 0 || startTime >= millisPerDay) {
+            if (startTime < 0 || startTime > millisPerDay) {
                 throw new IllegalArgumentException(
                         "Illegal start time " + startTime);
             }
@@ -1419,7 +1419,7 @@ public class SimpleTimeZone extends TimeZone {
                 throw new IllegalArgumentException(
                         "Illegal end month " + endMonth);
             }
-            if (endTime < 0 || endTime >= millisPerDay) {
+            if (endTime < 0 || endTime > millisPerDay) {
                 throw new IllegalArgumentException(
                         "Illegal end time " + endTime);
             }
diff --git a/jdk/src/share/classes/java/util/TimSort.java b/jdk/src/share/classes/java/util/TimSort.java
new file mode 100644
index 00000000000..1d4e710a499
--- /dev/null
+++ b/jdk/src/share/classes/java/util/TimSort.java
@@ -0,0 +1,928 @@
+/*
+ * Copyright 2009 Google Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package java.util;
+
+/**
+ * A stable, adaptive, iterative mergesort that requires far fewer than
+ * n lg(n) comparisons when running on partially sorted arrays, while
+ * offering performance comparable to a traditional mergesort when run
+ * on random arrays.  Like all proper mergesorts, this sort is stable and
+ * runs O(n log n) time (worst case).  In the worst case, this sort requires
+ * temporary storage space for n/2 object references; in the best case,
+ * it requires only a small constant amount of space.
+ *
+ * This implementation was adapted from Tim Peters's list sort for
+ * Python, which is described in detail here:
+ *
+ *   http://svn.python.org/projects/python/trunk/Objects/listsort.txt
+ *
+ * Tim's C code may be found here:
+ *
+ *   http://svn.python.org/projects/python/trunk/Objects/listobject.c
+ *
+ * The underlying techniques are described in this paper (and may have
+ * even earlier origins):
+ *
+ *  "Optimistic Sorting and Information Theoretic Complexity"
+ *  Peter McIlroy
+ *  SODA (Fourth Annual ACM-SIAM Symposium on Discrete Algorithms),
+ *  pp 467-474, Austin, Texas, 25-27 January 1993.
+ *
+ * While the API to this class consists solely of static methods, it is
+ * (privately) instantiable; a TimSort instance holds the state of an ongoing
+ * sort, assuming the input array is large enough to warrant the full-blown
+ * TimSort. Small arrays are sorted in place, using a binary insertion sort.
+ *
+ * @author Josh Bloch
+ */
+class TimSort<T> {
+    /**
+     * This is the minimum sized sequence that will be merged.  Shorter
+     * sequences will be lengthened by calling binarySort.  If the entire
+     * array is less than this length, no merges will be performed.
+     *
+     * This constant should be a power of two.  It was 64 in Tim Peter's C
+     * implementation, but 32 was empirically determined to work better in
+     * this implementation.  In the unlikely event that you set this constant
+     * to be a number that's not a power of two, you'll need to change the
+     * {@link #minRunLength} computation.
+     *
+     * If you decrease this constant, you must change the stackLen
+     * computation in the TimSort constructor, or you risk an
+     * ArrayOutOfBounds exception.  See listsort.txt for a discussion
+     * of the minimum stack length required as a function of the length
+     * of the array being sorted and the minimum merge sequence length.
+     */
+    private static final int MIN_MERGE = 32;
+
+    /**
+     * The array being sorted.
+     */
+    private final T[] a;
+
+    /**
+     * The comparator for this sort.
+     */
+    private final Comparator<? super T> c;
+
+    /**
+     * When we get into galloping mode, we stay there until both runs win less
+     * often than MIN_GALLOP consecutive times.
+     */
+    private static final int  MIN_GALLOP = 7;
+
+    /**
+     * This controls when we get *into* galloping mode.  It is initialized
+     * to MIN_GALLOP.  The mergeLo and mergeHi methods nudge it higher for
+     * random data, and lower for highly structured data.
+     */
+    private int minGallop = MIN_GALLOP;
+
+    /**
+     * Maximum initial size of tmp array, which is used for merging.  The array
+     * can grow to accommodate demand.
+     *
+     * Unlike Tim's original C version, we do not allocate this much storage
+     * when sorting smaller arrays.  This change was required for performance.
+     */
+    private static final int INITIAL_TMP_STORAGE_LENGTH = 256;
+
+    /**
+     * Temp storage for merges.
+     */
+    private T[] tmp; // Actual runtime type will be Object[], regardless of T
+
+    /**
+     * A stack of pending runs yet to be merged.  Run i starts at
+     * address base[i] and extends for len[i] elements.  It's always
+     * true (so long as the indices are in bounds) that:
+     *
+     *     runBase[i] + runLen[i] == runBase[i + 1]
+     *
+     * so we could cut the storage for this, but it's a minor amount,
+     * and keeping all the info explicit simplifies the code.
+     */
+    private int stackSize = 0;  // Number of pending runs on stack
+    private final int[] runBase;
+    private final int[] runLen;
+
+    /**
+     * Creates a TimSort instance to maintain the state of an ongoing sort.
+     *
+     * @param a the array to be sorted
+     * @param c the comparator to determine the order of the sort
+     */
+    private TimSort(T[] a, Comparator<? super T> c) {
+        this.a = a;
+        this.c = c;
+
+        // Allocate temp storage (which may be increased later if necessary)
+        int len = a.length;
+        @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+        T[] newArray = (T[]) new Object[len < 2 * INITIAL_TMP_STORAGE_LENGTH ?
+                                        len >>> 1 : INITIAL_TMP_STORAGE_LENGTH];
+        tmp = newArray;
+
+        /*
+         * Allocate runs-to-be-merged stack (which cannot be expanded).  The
+         * stack length requirements are described in listsort.txt.  The C
+         * version always uses the same stack length (85), but this was
+         * measured to be too expensive when sorting "mid-sized" arrays (e.g.,
+         * 100 elements) in Java.  Therefore, we use smaller (but sufficiently
+         * large) stack lengths for smaller arrays.  The "magic numbers" in the
+         * computation below must be changed if MIN_MERGE is decreased.  See
+         * the MIN_MERGE declaration above for more information.
+         */
+        int stackLen = (len <    120  ?  5 :
+                        len <   1542  ? 10 :
+                        len < 119151  ? 19 : 40);
+        runBase = new int[stackLen];
+        runLen = new int[stackLen];
+    }
+
+    /*
+     * The next two methods (which are package private and static) constitute
+     * the entire API of this class.  Each of these methods obeys the contract
+     * of the public method with the same signature in java.util.Arrays.
+     */
+
+    static <T> void sort(T[] a, Comparator<? super T> c) {
+        sort(a, 0, a.length, c);
+    }
+
+    static <T> void sort(T[] a, int lo, int hi, Comparator<? super T> c) {
+        if (c == null) {
+            Arrays.sort(a, lo, hi);
+            return;
+        }
+
+        rangeCheck(a.length, lo, hi);
+        int nRemaining  = hi - lo;
+        if (nRemaining < 2)
+            return;  // Arrays of size 0 and 1 are always sorted
+
+        // If array is small, do a "mini-TimSort" with no merges
+        if (nRemaining < MIN_MERGE) {
+            int initRunLen = countRunAndMakeAscending(a, lo, hi, c);
+            binarySort(a, lo, hi, lo + initRunLen, c);
+            return;
+        }
+
+        /**
+         * March over the array once, left to right, finding natural runs,
+         * extending short natural runs to minRun elements, and merging runs
+         * to maintain stack invariant.
+         */
+        TimSort<T> ts = new TimSort<T>(a, c);
+        int minRun = minRunLength(nRemaining);
+        do {
+            // Identify next run
+            int runLen = countRunAndMakeAscending(a, lo, hi, c);
+
+            // If run is short, extend to min(minRun, nRemaining)
+            if (runLen < minRun) {
+                int force = nRemaining <= minRun ? nRemaining : minRun;
+                binarySort(a, lo, lo + force, lo + runLen, c);
+                runLen = force;
+            }
+
+            // Push run onto pending-run stack, and maybe merge
+            ts.pushRun(lo, runLen);
+            ts.mergeCollapse();
+
+            // Advance to find next run
+            lo += runLen;
+            nRemaining -= runLen;
+        } while (nRemaining != 0);
+
+        // Merge all remaining runs to complete sort
+        assert lo == hi;
+        ts.mergeForceCollapse();
+        assert ts.stackSize == 1;
+    }
+
+    /**
+     * Sorts the specified portion of the specified array using a binary
+     * insertion sort.  This is the best method for sorting small numbers
+     * of elements.  It requires O(n log n) compares, but O(n^2) data
+     * movement (worst case).
+     *
+     * If the initial part of the specified range is already sorted,
+     * this method can take advantage of it: the method assumes that the
+     * elements from index {@code lo}, inclusive, to {@code start},
+     * exclusive are already sorted.
+     *
+     * @param a the array in which a range is to be sorted
+     * @param lo the index of the first element in the range to be sorted
+     * @param hi the index after the last element in the range to be sorted
+     * @param start the index of the first element in the range that is
+     *        not already known to be sorted (@code lo <= start <= hi}
+     * @param c comparator to used for the sort
+     */
+    @SuppressWarnings("fallthrough")
+    private static <T> void binarySort(T[] a, int lo, int hi, int start,
+                                       Comparator<? super T> c) {
+        assert lo <= start && start <= hi;
+        if (start == lo)
+            start++;
+        for ( ; start < hi; start++) {
+            T pivot = a[start];
+
+            // Set left (and right) to the index where a[start] (pivot) belongs
+            int left = lo;
+            int right = start;
+            assert left <= right;
+            /*
+             * Invariants:
+             *   pivot >= all in [lo, left).
+             *   pivot <  all in [right, start).
+             */
+            while (left < right) {
+                int mid = (left + right) >>> 1;
+                if (c.compare(pivot, a[mid]) < 0)
+                    right = mid;
+                else
+                    left = mid + 1;
+            }
+            assert left == right;
+
+            /*
+             * The invariants still hold: pivot >= all in [lo, left) and
+             * pivot < all in [left, start), so pivot belongs at left.  Note
+             * that if there are elements equal to pivot, left points to the
+             * first slot after them -- that's why this sort is stable.
+             * Slide elements over to make room to make room for pivot.
+             */
+            int n = start - left;  // The number of elements to move
+            // Switch is just an optimization for arraycopy in default case
+            switch(n) {
+                case 2:  a[left + 2] = a[left + 1];
+                case 1:  a[left + 1] = a[left];
+                         break;
+                default: System.arraycopy(a, left, a, left + 1, n);
+            }
+            a[left] = pivot;
+        }
+    }
+
+    /**
+     * Returns the length of the run beginning at the specified position in
+     * the specified array and reverses the run if it is descending (ensuring
+     * that the run will always be ascending when the method returns).
+     *
+     * A run is the longest ascending sequence with:
+     *
+     *    a[lo] <= a[lo + 1] <= a[lo + 2] <= ...
+     *
+     * or the longest descending sequence with:
+     *
+     *    a[lo] >  a[lo + 1] >  a[lo + 2] >  ...
+     *
+     * For its intended use in a stable mergesort, the strictness of the
+     * definition of "descending" is needed so that the call can safely
+     * reverse a descending sequence without violating stability.
+     *
+     * @param a the array in which a run is to be counted and possibly reversed
+     * @param lo index of the first element in the run
+     * @param hi index after the last element that may be contained in the run.
+              It is required that @code{lo < hi}.
+     * @param c the comparator to used for the sort
+     * @return  the length of the run beginning at the specified position in
+     *          the specified array
+     */
+    private static <T> int countRunAndMakeAscending(T[] a, int lo, int hi,
+                                                    Comparator<? super T> c) {
+        assert lo < hi;
+        int runHi = lo + 1;
+        if (runHi == hi)
+            return 1;
+
+        // Find end of run, and reverse range if descending
+        if (c.compare(a[runHi++], a[lo]) < 0) { // Descending
+            while(runHi < hi && c.compare(a[runHi], a[runHi - 1]) < 0)
+                runHi++;
+            reverseRange(a, lo, runHi);
+        } else {                              // Ascending
+            while (runHi < hi && c.compare(a[runHi], a[runHi - 1]) >= 0)
+                runHi++;
+        }
+
+        return runHi - lo;
+    }
+
+    /**
+     * Reverse the specified range of the specified array.
+     *
+     * @param a the array in which a range is to be reversed
+     * @param lo the index of the first element in the range to be reversed
+     * @param hi the index after the last element in the range to be reversed
+     */
+    private static void reverseRange(Object[] a, int lo, int hi) {
+        hi--;
+        while (lo < hi) {
+            Object t = a[lo];
+            a[lo++] = a[hi];
+            a[hi--] = t;
+        }
+    }
+
+    /**
+     * Returns the minimum acceptable run length for an array of the specified
+     * length. Natural runs shorter than this will be extended with
+     * {@link #binarySort}.
+     *
+     * Roughly speaking, the computation is:
+     *
+     *  If n < MIN_MERGE, return n (it's too small to bother with fancy stuff).
+     *  Else if n is an exact power of 2, return MIN_MERGE/2.
+     *  Else return an int k, MIN_MERGE/2 <= k <= MIN_MERGE, such that n/k
+     *   is close to, but strictly less than, an exact power of 2.
+     *
+     * For the rationale, see listsort.txt.
+     *
+     * @param n the length of the array to be sorted
+     * @return the length of the minimum run to be merged
+     */
+    private static int minRunLength(int n) {
+        assert n >= 0;
+        int r = 0;      // Becomes 1 if any 1 bits are shifted off
+        while (n >= MIN_MERGE) {
+            r |= (n & 1);
+            n >>= 1;
+        }
+        return n + r;
+    }
+
+    /**
+     * Pushes the specified run onto the pending-run stack.
+     *
+     * @param runBase index of the first element in the run
+     * @param runLen  the number of elements in the run
+     */
+    private void pushRun(int runBase, int runLen) {
+        this.runBase[stackSize] = runBase;
+        this.runLen[stackSize] = runLen;
+        stackSize++;
+    }
+
+    /**
+     * Examines the stack of runs waiting to be merged and merges adjacent runs
+     * until the stack invariants are reestablished:
+     *
+     *     1. runLen[i - 3] > runLen[i - 2] + runLen[i - 1]
+     *     2. runLen[i - 2] > runLen[i - 1]
+     *
+     * This method is called each time a new run is pushed onto the stack,
+     * so the invariants are guaranteed to hold for i < stackSize upon
+     * entry to the method.
+     */
+    private void mergeCollapse() {
+        while (stackSize > 1) {
+            int n = stackSize - 2;
+            if (n > 0 && runLen[n-1] <= runLen[n] + runLen[n+1]) {
+                if (runLen[n - 1] < runLen[n + 1])
+                    n--;
+                mergeAt(n);
+            } else if (runLen[n] <= runLen[n + 1]) {
+                mergeAt(n);
+            } else {
+                break; // Invariant is established
+            }
+        }
+    }
+
+    /**
+     * Merges all runs on the stack until only one remains.  This method is
+     * called once, to complete the sort.
+     */
+    private void mergeForceCollapse() {
+        while (stackSize > 1) {
+            int n = stackSize - 2;
+            if (n > 0 && runLen[n - 1] < runLen[n + 1])
+                n--;
+            mergeAt(n);
+        }
+    }
+
+    /**
+     * Merges the two runs at stack indices i and i+1.  Run i must be
+     * the penultimate or antepenultimate run on the stack.  In other words,
+     * i must be equal to stackSize-2 or stackSize-3.
+     *
+     * @param i stack index of the first of the two runs to merge
+     */
+    private void mergeAt(int i) {
+        assert stackSize >= 2;
+        assert i >= 0;
+        assert i == stackSize - 2 || i == stackSize - 3;
+
+        int base1 = runBase[i];
+        int len1 = runLen[i];
+        int base2 = runBase[i + 1];
+        int len2 = runLen[i + 1];
+        assert len1 > 0 && len2 > 0;
+        assert base1 + len1 == base2;
+
+        /*
+         * Record the length of the combined runs; if i is the 3rd-last
+         * run now, also slide over the last run (which isn't involved
+         * in this merge).  The current run (i+1) goes away in any case.
+         */
+        runLen[i] = len1 + len2;
+        if (i == stackSize - 3) {
+            runBase[i + 1] = runBase[i + 2];
+            runLen[i + 1] = runLen[i + 2];
+        }
+        stackSize--;
+
+        /*
+         * Find where the first element of run2 goes in run1. Prior elements
+         * in run1 can be ignored (because they're already in place).
+         */
+        int k = gallopRight(a[base2], a, base1, len1, 0, c);
+        assert k >= 0;
+        base1 += k;
+        len1 -= k;
+        if (len1 == 0)
+            return;
+
+        /*
+         * Find where the last element of run1 goes in run2. Subsequent elements
+         * in run2 can be ignored (because they're already in place).
+         */
+        len2 = gallopLeft(a[base1 + len1 - 1], a, base2, len2, len2 - 1, c);
+        assert len2 >= 0;
+        if (len2 == 0)
+            return;
+
+        // Merge remaining runs, using tmp array with min(len1, len2) elements
+        if (len1 <= len2)
+            mergeLo(base1, len1, base2, len2);
+        else
+            mergeHi(base1, len1, base2, len2);
+    }
+
+    /**
+     * Locates the position at which to insert the specified key into the
+     * specified sorted range; if the range contains an element equal to key,
+     * returns the index of the leftmost equal element.
+     *
+     * @param key the key whose insertion point to search for
+     * @param a the array in which to search
+     * @param base the index of the first element in the range
+     * @param len the length of the range; must be > 0
+     * @param hint the index at which to begin the search, 0 <= hint < n.
+     *     The closer hint is to the result, the faster this method will run.
+     * @param c the comparator used to order the range, and to search
+     * @return the int k,  0 <= k <= n such that a[b + k - 1] < key <= a[b + k],
+     *    pretending that a[b - 1] is minus infinity and a[b + n] is infinity.
+     *    In other words, key belongs at index b + k; or in other words,
+     *    the first k elements of a should precede key, and the last n - k
+     *    should follow it.
+     */
+    private static <T> int gallopLeft(T key, T[] a, int base, int len, int hint,
+                                      Comparator<? super T> c) {
+        assert len > 0 && hint >= 0 && hint < len;
+        int lastOfs = 0;
+        int ofs = 1;
+        if (c.compare(key, a[base + hint]) > 0) {
+            // Gallop right until a[base+hint+lastOfs] < key <= a[base+hint+ofs]
+            int maxOfs = len - hint;
+            while (ofs < maxOfs && c.compare(key, a[base + hint + ofs]) > 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to base
+            lastOfs += hint;
+            ofs += hint;
+        } else { // key <= a[base + hint]
+            // Gallop left until a[base+hint-ofs] < key <= a[base+hint-lastOfs]
+            final int maxOfs = hint + 1;
+            while (ofs < maxOfs && c.compare(key, a[base + hint - ofs]) <= 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to base
+            int tmp = lastOfs;
+            lastOfs = hint - ofs;
+            ofs = hint - tmp;
+        }
+        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
+
+        /*
+         * Now a[base+lastOfs] < key <= a[base+ofs], so key belongs somewhere
+         * to the right of lastOfs but no farther right than ofs.  Do a binary
+         * search, with invariant a[base + lastOfs - 1] < key <= a[base + ofs].
+         */
+        lastOfs++;
+        while (lastOfs < ofs) {
+            int m = lastOfs + ((ofs - lastOfs) >>> 1);
+
+            if (c.compare(key, a[base + m]) > 0)
+                lastOfs = m + 1;  // a[base + m] < key
+            else
+                ofs = m;          // key <= a[base + m]
+        }
+        assert lastOfs == ofs;    // so a[base + ofs - 1] < key <= a[base + ofs]
+        return ofs;
+    }
+
+    /**
+     * Like gallopLeft, except that if the range contains an element equal to
+     * key, gallopRight returns the index after the rightmost equal element.
+     *
+     * @param key the key whose insertion point to search for
+     * @param a the array in which to search
+     * @param base the index of the first element in the range
+     * @param len the length of the range; must be > 0
+     * @param hint the index at which to begin the search, 0 <= hint < n.
+     *     The closer hint is to the result, the faster this method will run.
+     * @param c the comparator used to order the range, and to search
+     * @return the int k,  0 <= k <= n such that a[b + k - 1] <= key < a[b + k]
+     */
+    private static <T> int gallopRight(T key, T[] a, int base, int len,
+                                       int hint, Comparator<? super T> c) {
+        assert len > 0 && hint >= 0 && hint < len;
+
+        int ofs = 1;
+        int lastOfs = 0;
+        if (c.compare(key, a[base + hint]) < 0) {
+            // Gallop left until a[b+hint - ofs] <= key < a[b+hint - lastOfs]
+            int maxOfs = hint + 1;
+            while (ofs < maxOfs && c.compare(key, a[base + hint - ofs]) < 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to b
+            int tmp = lastOfs;
+            lastOfs = hint - ofs;
+            ofs = hint - tmp;
+        } else { // a[b + hint] <= key
+            // Gallop right until a[b+hint + lastOfs] <= key < a[b+hint + ofs]
+            int maxOfs = len - hint;
+            while (ofs < maxOfs && c.compare(key, a[base + hint + ofs]) >= 0) {
+                lastOfs = ofs;
+                ofs = (ofs << 1) + 1;
+                if (ofs <= 0)   // int overflow
+                    ofs = maxOfs;
+            }
+            if (ofs > maxOfs)
+                ofs = maxOfs;
+
+            // Make offsets relative to b
+            lastOfs += hint;
+            ofs += hint;
+        }
+        assert -1 <= lastOfs && lastOfs < ofs && ofs <= len;
+
+        /*
+         * Now a[b + lastOfs] <= key < a[b + ofs], so key belongs somewhere to
+         * the right of lastOfs but no farther right than ofs.  Do a binary
+         * search, with invariant a[b + lastOfs - 1] <= key < a[b + ofs].
+         */
+        lastOfs++;
+        while (lastOfs < ofs) {
+            int m = lastOfs + ((ofs - lastOfs) >>> 1);
+
+            if (c.compare(key, a[base + m]) < 0)
+                ofs = m;          // key < a[b + m]
+            else
+                lastOfs = m + 1;  // a[b + m] <= key
+        }
+        assert lastOfs == ofs;    // so a[b + ofs - 1] <= key < a[b + ofs]
+        return ofs;
+    }
+
+    /**
+     * Merges two adjacent runs in place, in a stable fashion.  The first
+     * element of the first run must be greater than the first element of the
+     * second run (a[base1] > a[base2]), and the last element of the first run
+     * (a[base1 + len1-1]) must be greater than all elements of the second run.
+     *
+     * For performance, this method should be called only when len1 <= len2;
+     * its twin, mergeHi should be called if len1 >= len2.  (Either method
+     * may be called if len1 == len2.)
+     *
+     * @param base1 index of first element in first run to be merged
+     * @param len1  length of first run to be merged (must be > 0)
+     * @param base2 index of first element in second run to be merged
+     *        (must be aBase + aLen)
+     * @param len2  length of second run to be merged (must be > 0)
+     */
+    private void mergeLo(int base1, int len1, int base2, int len2) {
+        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
+
+        // Copy first run into temp array
+        T[] a = this.a; // For performance
+        T[] tmp = ensureCapacity(len1);
+        System.arraycopy(a, base1, tmp, 0, len1);
+
+        int cursor1 = 0;       // Indexes into tmp array
+        int cursor2 = base2;   // Indexes int a
+        int dest = base1;      // Indexes int a
+
+        // Move first element of second run and deal with degenerate cases
+        a[dest++] = a[cursor2++];
+        if (--len2 == 0) {
+            System.arraycopy(tmp, cursor1, a, dest, len1);
+            return;
+        }
+        if (len1 == 1) {
+            System.arraycopy(a, cursor2, a, dest, len2);
+            a[dest + len2] = tmp[cursor1]; // Last elt of run 1 to end of merge
+            return;
+        }
+
+        Comparator<? super T> c = this.c;  // Use local variable for performance
+        int minGallop = this.minGallop;    //  "    "       "     "      "
+    outer:
+        while (true) {
+            int count1 = 0; // Number of times in a row that first run won
+            int count2 = 0; // Number of times in a row that second run won
+
+            /*
+             * Do the straightforward thing until (if ever) one run starts
+             * winning consistently.
+             */
+            do {
+                assert len1 > 1 && len2 > 0;
+                if (c.compare(a[cursor2], tmp[cursor1]) < 0) {
+                    a[dest++] = a[cursor2++];
+                    count2++;
+                    count1 = 0;
+                    if (--len2 == 0)
+                        break outer;
+                } else {
+                    a[dest++] = tmp[cursor1++];
+                    count1++;
+                    count2 = 0;
+                    if (--len1 == 1)
+                        break outer;
+                }
+            } while ((count1 | count2) < minGallop);
+
+            /*
+             * One run is winning so consistently that galloping may be a
+             * huge win. So try that, and continue galloping until (if ever)
+             * neither run appears to be winning consistently anymore.
+             */
+            do {
+                assert len1 > 1 && len2 > 0;
+                count1 = gallopRight(a[cursor2], tmp, cursor1, len1, 0, c);
+                if (count1 != 0) {
+                    System.arraycopy(tmp, cursor1, a, dest, count1);
+                    dest += count1;
+                    cursor1 += count1;
+                    len1 -= count1;
+                    if (len1 <= 1) // len1 == 1 || len1 == 0
+                        break outer;
+                }
+                a[dest++] = a[cursor2++];
+                if (--len2 == 0)
+                    break outer;
+
+                count2 = gallopLeft(tmp[cursor1], a, cursor2, len2, 0, c);
+                if (count2 != 0) {
+                    System.arraycopy(a, cursor2, a, dest, count2);
+                    dest += count2;
+                    cursor2 += count2;
+                    len2 -= count2;
+                    if (len2 == 0)
+                        break outer;
+                }
+                a[dest++] = tmp[cursor1++];
+                if (--len1 == 1)
+                    break outer;
+                minGallop--;
+            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
+            if (minGallop < 0)
+                minGallop = 0;
+            minGallop += 2;  // Penalize for leaving gallop mode
+        }  // End of "outer" loop
+        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
+
+        if (len1 == 1) {
+            assert len2 > 0;
+            System.arraycopy(a, cursor2, a, dest, len2);
+            a[dest + len2] = tmp[cursor1]; //  Last elt of run 1 to end of merge
+        } else if (len1 == 0) {
+            throw new IllegalArgumentException(
+                "Comparison method violates its general contract!");
+        } else {
+            assert len2 == 0;
+            assert len1 > 1;
+            System.arraycopy(tmp, cursor1, a, dest, len1);
+        }
+    }
+
+    /**
+     * Like mergeLo, except that this method should be called only if
+     * len1 >= len2; mergeLo should be called if len1 <= len2.  (Either method
+     * may be called if len1 == len2.)
+     *
+     * @param base1 index of first element in first run to be merged
+     * @param len1  length of first run to be merged (must be > 0)
+     * @param base2 index of first element in second run to be merged
+     *        (must be aBase + aLen)
+     * @param len2  length of second run to be merged (must be > 0)
+     */
+    private void mergeHi(int base1, int len1, int base2, int len2) {
+        assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
+
+        // Copy second run into temp array
+        T[] a = this.a; // For performance
+        T[] tmp = ensureCapacity(len2);
+        System.arraycopy(a, base2, tmp, 0, len2);
+
+        int cursor1 = base1 + len1 - 1;  // Indexes into a
+        int cursor2 = len2 - 1;          // Indexes into tmp array
+        int dest = base2 + len2 - 1;     // Indexes into a
+
+        // Move last element of first run and deal with degenerate cases
+        a[dest--] = a[cursor1--];
+        if (--len1 == 0) {
+            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
+            return;
+        }
+        if (len2 == 1) {
+            dest -= len1;
+            cursor1 -= len1;
+            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
+            a[dest] = tmp[cursor2];
+            return;
+        }
+
+        Comparator<? super T> c = this.c;  // Use local variable for performance
+        int minGallop = this.minGallop;    //  "    "       "     "      "
+    outer:
+        while (true) {
+            int count1 = 0; // Number of times in a row that first run won
+            int count2 = 0; // Number of times in a row that second run won
+
+            /*
+             * Do the straightforward thing until (if ever) one run
+             * appears to win consistently.
+             */
+            do {
+                assert len1 > 0 && len2 > 1;
+                if (c.compare(tmp[cursor2], a[cursor1]) < 0) {
+                    a[dest--] = a[cursor1--];
+                    count1++;
+                    count2 = 0;
+                    if (--len1 == 0)
+                        break outer;
+                } else {
+                    a[dest--] = tmp[cursor2--];
+                    count2++;
+                    count1 = 0;
+                    if (--len2 == 1)
+                        break outer;
+                }
+            } while ((count1 | count2) < minGallop);
+
+            /*
+             * One run is winning so consistently that galloping may be a
+             * huge win. So try that, and continue galloping until (if ever)
+             * neither run appears to be winning consistently anymore.
+             */
+            do {
+                assert len1 > 0 && len2 > 1;
+                count1 = len1 - gallopRight(tmp[cursor2], a, base1, len1, len1 - 1, c);
+                if (count1 != 0) {
+                    dest -= count1;
+                    cursor1 -= count1;
+                    len1 -= count1;
+                    System.arraycopy(a, cursor1 + 1, a, dest + 1, count1);
+                    if (len1 == 0)
+                        break outer;
+                }
+                a[dest--] = tmp[cursor2--];
+                if (--len2 == 1)
+                    break outer;
+
+                count2 = len2 - gallopLeft(a[cursor1], tmp, 0, len2, len2 - 1, c);
+                if (count2 != 0) {
+                    dest -= count2;
+                    cursor2 -= count2;
+                    len2 -= count2;
+                    System.arraycopy(tmp, cursor2 + 1, a, dest + 1, count2);
+                    if (len2 <= 1)  // len2 == 1 || len2 == 0
+                        break outer;
+                }
+                a[dest--] = a[cursor1--];
+                if (--len1 == 0)
+                    break outer;
+                minGallop--;
+            } while (count1 >= MIN_GALLOP | count2 >= MIN_GALLOP);
+            if (minGallop < 0)
+                minGallop = 0;
+            minGallop += 2;  // Penalize for leaving gallop mode
+        }  // End of "outer" loop
+        this.minGallop = minGallop < 1 ? 1 : minGallop;  // Write back to field
+
+        if (len2 == 1) {
+            assert len1 > 0;
+            dest -= len1;
+            cursor1 -= len1;
+            System.arraycopy(a, cursor1 + 1, a, dest + 1, len1);
+            a[dest] = tmp[cursor2];  // Move first elt of run2 to front of merge
+        } else if (len2 == 0) {
+            throw new IllegalArgumentException(
+                "Comparison method violates its general contract!");
+        } else {
+            assert len1 == 0;
+            assert len2 > 0;
+            System.arraycopy(tmp, 0, a, dest - (len2 - 1), len2);
+        }
+    }
+
+    /**
+     * Ensures that the external array tmp has at least the specified
+     * number of elements, increasing its size if necessary.  The size
+     * increases exponentially to ensure amortized linear time complexity.
+     *
+     * @param minCapacity the minimum required capacity of the tmp array
+     * @return tmp, whether or not it grew
+     */
+    private T[] ensureCapacity(int minCapacity) {
+        if (tmp.length < minCapacity) {
+            // Compute smallest power of 2 > minCapacity
+            int newSize = minCapacity;
+            newSize |= newSize >> 1;
+            newSize |= newSize >> 2;
+            newSize |= newSize >> 4;
+            newSize |= newSize >> 8;
+            newSize |= newSize >> 16;
+            newSize++;
+
+            if (newSize < 0) // Not bloody likely!
+                newSize = minCapacity;
+            else
+                newSize = Math.min(newSize, a.length >>> 1);
+
+            @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+            T[] newArray = (T[]) new Object[newSize];
+            tmp = newArray;
+        }
+        return tmp;
+    }
+
+    /**
+     * Checks that fromIndex and toIndex are in range, and throws an
+     * appropriate exception if they aren't.
+     *
+     * @param arrayLen the length of the array
+     * @param fromIndex the index of the first element of the range
+     * @param toIndex the index after the last element of the range
+     * @throws IllegalArgumentException if fromIndex > toIndex
+     * @throws ArrayIndexOutOfBoundsException if fromIndex < 0
+     *         or toIndex > arrayLen
+     */
+    private static void rangeCheck(int arrayLen, int fromIndex, int toIndex) {
+        if (fromIndex > toIndex)
+            throw new IllegalArgumentException("fromIndex(" + fromIndex +
+                       ") > toIndex(" + toIndex+")");
+        if (fromIndex < 0)
+            throw new ArrayIndexOutOfBoundsException(fromIndex);
+        if (toIndex > arrayLen)
+            throw new ArrayIndexOutOfBoundsException(toIndex);
+    }
+}
diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java b/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
index fafbcc01704..5e31adea247 100644
--- a/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
+++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
@@ -34,9 +34,13 @@
  */
 
 package java.util.concurrent;
-import java.util.*;
-import java.util.concurrent.atomic.*;
 
+import java.util.AbstractQueue;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Queue;
 
 /**
  * An unbounded thread-safe {@linkplain Queue queue} based on linked nodes.
@@ -47,9 +51,9 @@ import java.util.concurrent.atomic.*;
  * queue the shortest time. New elements
  * are inserted at the tail of the queue, and the queue retrieval
  * operations obtain elements at the head of the queue.
- * A <tt>ConcurrentLinkedQueue</tt> is an appropriate choice when
+ * A {@code ConcurrentLinkedQueue} is an appropriate choice when
  * many threads will share access to a common collection.
- * This queue does not permit <tt>null</tt> elements.
+ * This queue does not permit {@code null} elements.
  *
  * <p>This implementation employs an efficient &quot;wait-free&quot;
  * algorithm based on one described in <a
@@ -57,7 +61,7 @@ import java.util.concurrent.atomic.*;
  * Fast, and Practical Non-Blocking and Blocking Concurrent Queue
  * Algorithms</a> by Maged M. Michael and Michael L. Scott.
  *
- * <p>Beware that, unlike in most collections, the <tt>size</tt> method
+ * <p>Beware that, unlike in most collections, the {@code size} method
  * is <em>NOT</em> a constant-time operation. Because of the
  * asynchronous nature of these queues, determining the current number
  * of elements requires a traversal of the elements.
@@ -87,51 +91,102 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
     private static final long serialVersionUID = 196745693267521676L;
 
     /*
-     * This is a straight adaptation of Michael & Scott algorithm.
-     * For explanation, read the paper.  The only (minor) algorithmic
-     * difference is that this version supports lazy deletion of
-     * internal nodes (method remove(Object)) -- remove CAS'es item
-     * fields to null. The normal queue operations unlink but then
-     * pass over nodes with null item fields. Similarly, iteration
-     * methods ignore those with nulls.
+     * This is a modification of the Michael & Scott algorithm,
+     * adapted for a garbage-collected environment, with support for
+     * interior node deletion (to support remove(Object)).  For
+     * explanation, read the paper.
      *
-     * Also note that like most non-blocking algorithms in this
-     * package, this implementation relies on the fact that in garbage
+     * Note that like most non-blocking algorithms in this package,
+     * this implementation relies on the fact that in garbage
      * collected systems, there is no possibility of ABA problems due
      * to recycled nodes, so there is no need to use "counted
      * pointers" or related techniques seen in versions used in
      * non-GC'ed settings.
+     *
+     * The fundamental invariants are:
+     * - There is exactly one (last) Node with a null next reference,
+     *   which is CASed when enqueueing.  This last Node can be
+     *   reached in O(1) time from tail, but tail is merely an
+     *   optimization - it can always be reached in O(N) time from
+     *   head as well.
+     * - The elements contained in the queue are the non-null items in
+     *   Nodes that are reachable from head.  CASing the item
+     *   reference of a Node to null atomically removes it from the
+     *   queue.  Reachability of all elements from head must remain
+     *   true even in the case of concurrent modifications that cause
+     *   head to advance.  A dequeued Node may remain in use
+     *   indefinitely due to creation of an Iterator or simply a
+     *   poll() that has lost its time slice.
+     *
+     * The above might appear to imply that all Nodes are GC-reachable
+     * from a predecessor dequeued Node.  That would cause two problems:
+     * - allow a rogue Iterator to cause unbounded memory retention
+     * - cause cross-generational linking of old Nodes to new Nodes if
+     *   a Node was tenured while live, which generational GCs have a
+     *   hard time dealing with, causing repeated major collections.
+     * However, only non-deleted Nodes need to be reachable from
+     * dequeued Nodes, and reachability does not necessarily have to
+     * be of the kind understood by the GC.  We use the trick of
+     * linking a Node that has just been dequeued to itself.  Such a
+     * self-link implicitly means to advance to head.
+     *
+     * Both head and tail are permitted to lag.  In fact, failing to
+     * update them every time one could is a significant optimization
+     * (fewer CASes). This is controlled by local "hops" variables
+     * that only trigger helping-CASes after experiencing multiple
+     * lags.
+     *
+     * Since head and tail are updated concurrently and independently,
+     * it is possible for tail to lag behind head (why not)?
+     *
+     * CASing a Node's item reference to null atomically removes the
+     * element from the queue.  Iterators skip over Nodes with null
+     * items.  Prior implementations of this class had a race between
+     * poll() and remove(Object) where the same element would appear
+     * to be successfully removed by two concurrent operations.  The
+     * method remove(Object) also lazily unlinks deleted Nodes, but
+     * this is merely an optimization.
+     *
+     * When constructing a Node (before enqueuing it) we avoid paying
+     * for a volatile write to item by using lazySet instead of a
+     * normal write.  This allows the cost of enqueue to be
+     * "one-and-a-half" CASes.
+     *
+     * Both head and tail may or may not point to a Node with a
+     * non-null item.  If the queue is empty, all items must of course
+     * be null.  Upon creation, both head and tail refer to a dummy
+     * Node with null item.  Both head and tail are only updated using
+     * CAS, so they never regress, although again this is merely an
+     * optimization.
      */
 
     private static class Node<E> {
         private volatile E item;
         private volatile Node<E> next;
 
-        private static final
-            AtomicReferenceFieldUpdater<Node, Node>
-            nextUpdater =
-            AtomicReferenceFieldUpdater.newUpdater
-            (Node.class, Node.class, "next");
-        private static final
-            AtomicReferenceFieldUpdater<Node, Object>
-            itemUpdater =
-            AtomicReferenceFieldUpdater.newUpdater
-            (Node.class, Object.class, "item");
-
-        Node(E x) { item = x; }
-
-        Node(E x, Node<E> n) { item = x; next = n; }
+        Node(E item) {
+            // Piggyback on imminent casNext()
+            lazySetItem(item);
+        }
 
         E getItem() {
             return item;
         }
 
         boolean casItem(E cmp, E val) {
-            return itemUpdater.compareAndSet(this, cmp, val);
+            return UNSAFE.compareAndSwapObject(this, itemOffset, cmp, val);
         }
 
         void setItem(E val) {
-            itemUpdater.set(this, val);
+            item = val;
+        }
+
+        void lazySetItem(E val) {
+            UNSAFE.putOrderedObject(this, itemOffset, val);
+        }
+
+        void lazySetNext(Node<E> val) {
+            UNSAFE.putOrderedObject(this, nextOffset, val);
         }
 
         Node<E> getNext() {
@@ -139,52 +194,55 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
         }
 
         boolean casNext(Node<E> cmp, Node<E> val) {
-            return nextUpdater.compareAndSet(this, cmp, val);
+            return UNSAFE.compareAndSwapObject(this, nextOffset, cmp, val);
         }
 
-        void setNext(Node<E> val) {
-            nextUpdater.set(this, val);
-        }
+        // Unsafe mechanics
 
+        private static final sun.misc.Unsafe UNSAFE =
+            sun.misc.Unsafe.getUnsafe();
+        private static final long nextOffset =
+            objectFieldOffset(UNSAFE, "next", Node.class);
+        private static final long itemOffset =
+            objectFieldOffset(UNSAFE, "item", Node.class);
     }
 
-    private static final
-        AtomicReferenceFieldUpdater<ConcurrentLinkedQueue, Node>
-        tailUpdater =
-        AtomicReferenceFieldUpdater.newUpdater
-        (ConcurrentLinkedQueue.class, Node.class, "tail");
-    private static final
-        AtomicReferenceFieldUpdater<ConcurrentLinkedQueue, Node>
-        headUpdater =
-        AtomicReferenceFieldUpdater.newUpdater
-        (ConcurrentLinkedQueue.class,  Node.class, "head");
-
-    private boolean casTail(Node<E> cmp, Node<E> val) {
-        return tailUpdater.compareAndSet(this, cmp, val);
-    }
-
-    private boolean casHead(Node<E> cmp, Node<E> val) {
-        return headUpdater.compareAndSet(this, cmp, val);
-    }
-
-
     /**
-     * Pointer to header node, initialized to a dummy node.  The first
-     * actual node is at head.getNext().
+     * A node from which the first live (non-deleted) node (if any)
+     * can be reached in O(1) time.
+     * Invariants:
+     * - all live nodes are reachable from head via succ()
+     * - head != null
+     * - (tmp = head).next != tmp || tmp != head
+     * Non-invariants:
+     * - head.item may or may not be null.
+     * - it is permitted for tail to lag behind head, that is, for tail
+     *   to not be reachable from head!
      */
-    private transient volatile Node<E> head = new Node<E>(null, null);
+    private transient volatile Node<E> head = new Node<E>(null);
 
-    /** Pointer to last node on list **/
+    /**
+     * A node from which the last node on list (that is, the unique
+     * node with node.next == null) can be reached in O(1) time.
+     * Invariants:
+     * - the last node is always reachable from tail via succ()
+     * - tail != null
+     * Non-invariants:
+     * - tail.item may or may not be null.
+     * - it is permitted for tail to lag behind head, that is, for tail
+     *   to not be reachable from head!
+     * - tail.next may or may not be self-pointing to tail.
+     */
     private transient volatile Node<E> tail = head;
 
 
     /**
-     * Creates a <tt>ConcurrentLinkedQueue</tt> that is initially empty.
+     * Creates a {@code ConcurrentLinkedQueue} that is initially empty.
      */
     public ConcurrentLinkedQueue() {}
 
     /**
-     * Creates a <tt>ConcurrentLinkedQueue</tt>
+     * Creates a {@code ConcurrentLinkedQueue}
      * initially containing the elements of the given collection,
      * added in traversal order of the collection's iterator.
      * @param c the collection of elements to initially contain
@@ -201,115 +259,143 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
     /**
      * Inserts the specified element at the tail of this queue.
      *
-     * @return <tt>true</tt> (as specified by {@link Collection#add})
+     * @return {@code true} (as specified by {@link Collection#add})
      * @throws NullPointerException if the specified element is null
      */
     public boolean add(E e) {
         return offer(e);
     }
 
+    /**
+     * We don't bother to update head or tail pointers if fewer than
+     * HOPS links from "true" location.  We assume that volatile
+     * writes are significantly more expensive than volatile reads.
+     */
+    private static final int HOPS = 1;
+
+    /**
+     * Try to CAS head to p. If successful, repoint old head to itself
+     * as sentinel for succ(), below.
+     */
+    final void updateHead(Node<E> h, Node<E> p) {
+        if (h != p && casHead(h, p))
+            h.lazySetNext(h);
+    }
+
+    /**
+     * Returns the successor of p, or the head node if p.next has been
+     * linked to self, which will only be true if traversing with a
+     * stale pointer that is now off the list.
+     */
+    final Node<E> succ(Node<E> p) {
+        Node<E> next = p.getNext();
+        return (p == next) ? head : next;
+    }
+
     /**
      * Inserts the specified element at the tail of this queue.
      *
-     * @return <tt>true</tt> (as specified by {@link Queue#offer})
+     * @return {@code true} (as specified by {@link Queue#offer})
      * @throws NullPointerException if the specified element is null
      */
     public boolean offer(E e) {
         if (e == null) throw new NullPointerException();
-        Node<E> n = new Node<E>(e, null);
+        Node<E> n = new Node<E>(e);
+        retry:
         for (;;) {
             Node<E> t = tail;
-            Node<E> s = t.getNext();
-            if (t == tail) {
-                if (s == null) {
-                    if (t.casNext(s, n)) {
-                        casTail(t, n);
-                        return true;
-                    }
+            Node<E> p = t;
+            for (int hops = 0; ; hops++) {
+                Node<E> next = succ(p);
+                if (next != null) {
+                    if (hops > HOPS && t != tail)
+                        continue retry;
+                    p = next;
+                } else if (p.casNext(null, n)) {
+                    if (hops >= HOPS)
+                        casTail(t, n);  // Failure is OK.
+                    return true;
                 } else {
-                    casTail(t, s);
+                    p = succ(p);
                 }
             }
         }
     }
 
     public E poll() {
-        for (;;) {
-            Node<E> h = head;
-            Node<E> t = tail;
-            Node<E> first = h.getNext();
-            if (h == head) {
-                if (h == t) {
-                    if (first == null)
-                        return null;
-                    else
-                        casTail(t, first);
-                } else if (casHead(h, first)) {
-                    E item = first.getItem();
-                    if (item != null) {
-                        first.setItem(null);
-                        return item;
-                    }
-                    // else skip over deleted item, continue loop,
+        Node<E> h = head;
+        Node<E> p = h;
+        for (int hops = 0; ; hops++) {
+            E item = p.getItem();
+
+            if (item != null && p.casItem(item, null)) {
+                if (hops >= HOPS) {
+                    Node<E> q = p.getNext();
+                    updateHead(h, (q != null) ? q : p);
                 }
+                return item;
             }
+            Node<E> next = succ(p);
+            if (next == null) {
+                updateHead(h, p);
+                break;
+            }
+            p = next;
         }
+        return null;
     }
 
-    public E peek() { // same as poll except don't remove item
+    public E peek() {
+        Node<E> h = head;
+        Node<E> p = h;
+        E item;
         for (;;) {
-            Node<E> h = head;
-            Node<E> t = tail;
-            Node<E> first = h.getNext();
-            if (h == head) {
-                if (h == t) {
-                    if (first == null)
-                        return null;
-                    else
-                        casTail(t, first);
-                } else {
-                    E item = first.getItem();
-                    if (item != null)
-                        return item;
-                    else // remove deleted node and continue
-                        casHead(h, first);
-                }
+            item = p.getItem();
+            if (item != null)
+                break;
+            Node<E> next = succ(p);
+            if (next == null) {
+                break;
             }
+            p = next;
         }
+        updateHead(h, p);
+        return item;
     }
 
     /**
-     * Returns the first actual (non-header) node on list.  This is yet
-     * another variant of poll/peek; here returning out the first
-     * node, not element (so we cannot collapse with peek() without
-     * introducing race.)
+     * Returns the first live (non-deleted) node on list, or null if none.
+     * This is yet another variant of poll/peek; here returning the
+     * first node, not element.  We could make peek() a wrapper around
+     * first(), but that would cost an extra volatile read of item,
+     * and the need to add a retry loop to deal with the possibility
+     * of losing a race to a concurrent poll().
      */
     Node<E> first() {
+        Node<E> h = head;
+        Node<E> p = h;
+        Node<E> result;
         for (;;) {
-            Node<E> h = head;
-            Node<E> t = tail;
-            Node<E> first = h.getNext();
-            if (h == head) {
-                if (h == t) {
-                    if (first == null)
-                        return null;
-                    else
-                        casTail(t, first);
-                } else {
-                    if (first.getItem() != null)
-                        return first;
-                    else // remove deleted node and continue
-                        casHead(h, first);
-                }
+            E item = p.getItem();
+            if (item != null) {
+                result = p;
+                break;
             }
+            Node<E> next = succ(p);
+            if (next == null) {
+                result = null;
+                break;
+            }
+            p = next;
         }
+        updateHead(h, p);
+        return result;
     }
 
-
     /**
-     * Returns <tt>true</tt> if this queue contains no elements.
+     * Returns {@code true} if this queue contains no elements.
      *
-     * @return <tt>true</tt> if this queue contains no elements
+     * @return {@code true} if this queue contains no elements
      */
     public boolean isEmpty() {
         return first() == null;
@@ -317,8 +403,8 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
 
     /**
      * Returns the number of elements in this queue.  If this queue
-     * contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
-     * <tt>Integer.MAX_VALUE</tt>.
+     * contains more than {@code Integer.MAX_VALUE} elements, returns
+     * {@code Integer.MAX_VALUE}.
      *
      * <p>Beware that, unlike in most collections, this method is
      * <em>NOT</em> a constant-time operation. Because of the
@@ -329,7 +415,7 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
      */
     public int size() {
         int count = 0;
-        for (Node<E> p = first(); p != null; p = p.getNext()) {
+        for (Node<E> p = first(); p != null; p = succ(p)) {
             if (p.getItem() != null) {
                 // Collections.size() spec says to max out
                 if (++count == Integer.MAX_VALUE)
@@ -340,16 +426,16 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
     }
 
     /**
-     * Returns <tt>true</tt> if this queue contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this queue contains
-     * at least one element <tt>e</tt> such that <tt>o.equals(e)</tt>.
+     * Returns {@code true} if this queue contains the specified element.
+     * More formally, returns {@code true} if and only if this queue contains
+     * at least one element {@code e} such that {@code o.equals(e)}.
      *
      * @param o object to be checked for containment in this queue
-     * @return <tt>true</tt> if this queue contains the specified element
+     * @return {@code true} if this queue contains the specified element
      */
     public boolean contains(Object o) {
         if (o == null) return false;
-        for (Node<E> p = first(); p != null; p = p.getNext()) {
+        for (Node<E> p = first(); p != null; p = succ(p)) {
             E item = p.getItem();
             if (item != null &&
                 o.equals(item))
@@ -360,23 +446,29 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
 
     /**
      * Removes a single instance of the specified element from this queue,
-     * if it is present.  More formally, removes an element <tt>e</tt> such
-     * that <tt>o.equals(e)</tt>, if this queue contains one or more such
+     * if it is present.  More formally, removes an element {@code e} such
+     * that {@code o.equals(e)}, if this queue contains one or more such
      * elements.
-     * Returns <tt>true</tt> if this queue contained the specified element
+     * Returns {@code true} if this queue contained the specified element
      * (or equivalently, if this queue changed as a result of the call).
      *
      * @param o element to be removed from this queue, if present
-     * @return <tt>true</tt> if this queue changed as a result of the call
+     * @return {@code true} if this queue changed as a result of the call
      */
     public boolean remove(Object o) {
         if (o == null) return false;
-        for (Node<E> p = first(); p != null; p = p.getNext()) {
+        Node<E> pred = null;
+        for (Node<E> p = first(); p != null; p = succ(p)) {
             E item = p.getItem();
             if (item != null &&
                 o.equals(item) &&
-                p.casItem(item, null))
+                p.casItem(item, null)) {
+                Node<E> next = succ(p);
+                if (pred != null && next != null)
+                    pred.casNext(p, next);
                 return true;
+            }
+            pred = p;
         }
         return false;
     }
@@ -397,7 +489,7 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
     public Object[] toArray() {
         // Use ArrayList to deal with resizing.
         ArrayList<E> al = new ArrayList<E>();
-        for (Node<E> p = first(); p != null; p = p.getNext()) {
+        for (Node<E> p = first(); p != null; p = succ(p)) {
             E item = p.getItem();
             if (item != null)
                 al.add(item);
@@ -415,22 +507,22 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
      * <p>If this queue fits in the specified array with room to spare
      * (i.e., the array has more elements than this queue), the element in
      * the array immediately following the end of the queue is set to
-     * <tt>null</tt>.
+     * {@code null}.
      *
      * <p>Like the {@link #toArray()} method, this method acts as bridge between
      * array-based and collection-based APIs.  Further, this method allows
      * precise control over the runtime type of the output array, and may,
      * under certain circumstances, be used to save allocation costs.
      *
-     * <p>Suppose <tt>x</tt> is a queue known to contain only strings.
+     * <p>Suppose {@code x} is a queue known to contain only strings.
      * The following code can be used to dump the queue into a newly
-     * allocated array of <tt>String</tt>:
+     * allocated array of {@code String}:
      *
      * <pre>
      *     String[] y = x.toArray(new String[0]);</pre>
      *
-     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
-     * <tt>toArray()</tt>.
+     * Note that {@code toArray(new Object[0])} is identical in function to
+     * {@code toArray()}.
      *
      * @param a the array into which the elements of the queue are to
      *          be stored, if it is big enough; otherwise, a new array of the
@@ -441,11 +533,12 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
      *         this queue
      * @throws NullPointerException if the specified array is null
      */
+    @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] a) {
         // try to use sent-in array
         int k = 0;
         Node<E> p;
-        for (p = first(); p != null && k < a.length; p = p.getNext()) {
+        for (p = first(); p != null && k < a.length; p = succ(p)) {
             E item = p.getItem();
             if (item != null)
                 a[k++] = (T)item;
@@ -458,7 +551,7 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
 
         // If won't fit, use ArrayList version
         ArrayList<E> al = new ArrayList<E>();
-        for (Node<E> q = first(); q != null; q = q.getNext()) {
+        for (Node<E> q = first(); q != null; q = succ(q)) {
             E item = q.getItem();
             if (item != null)
                 al.add(item);
@@ -469,7 +562,8 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
     /**
      * Returns an iterator over the elements in this queue in proper sequence.
      * The returned iterator is a "weakly consistent" iterator that
-     * will never throw {@link ConcurrentModificationException},
+     * will never throw {@link java.util.ConcurrentModificationException
+     * ConcurrentModificationException},
      * and guarantees to traverse elements as they existed upon
      * construction of the iterator, and may (but is not guaranteed to)
      * reflect any modifications subsequent to construction.
@@ -511,7 +605,15 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
             lastRet = nextNode;
             E x = nextItem;
 
-            Node<E> p = (nextNode == null)? first() : nextNode.getNext();
+            Node<E> pred, p;
+            if (nextNode == null) {
+                p = first();
+                pred = null;
+            } else {
+                pred = nextNode;
+                p = succ(nextNode);
+            }
+
             for (;;) {
                 if (p == null) {
                     nextNode = null;
@@ -523,8 +625,13 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
                     nextNode = p;
                     nextItem = item;
                     return x;
-                } else // skip over nulls
-                    p = p.getNext();
+                } else {
+                    // skip over nulls
+                    Node<E> next = succ(p);
+                    if (pred != null && next != null)
+                        pred.casNext(p, next);
+                    p = next;
+                }
             }
         }
 
@@ -549,7 +656,7 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
     /**
      * Save the state to a stream (that is, serialize it).
      *
-     * @serialData All of the elements (each an <tt>E</tt>) in
+     * @serialData All of the elements (each an {@code E}) in
      * the proper order, followed by a null
      * @param s the stream
      */
@@ -560,7 +667,7 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
         s.defaultWriteObject();
 
         // Write out all elements in the proper order.
-        for (Node<E> p = first(); p != null; p = p.getNext()) {
+        for (Node<E> p = first(); p != null; p = succ(p)) {
             Object item = p.getItem();
             if (item != null)
                 s.writeObject(item);
@@ -579,10 +686,11 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
         throws java.io.IOException, ClassNotFoundException {
         // Read in capacity, and any hidden stuff
         s.defaultReadObject();
-        head = new Node<E>(null, null);
+        head = new Node<E>(null);
         tail = head;
         // Read in all elements and place in queue
         for (;;) {
+            @SuppressWarnings("unchecked")
             E item = (E)s.readObject();
             if (item == null)
                 break;
@@ -591,4 +699,35 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
         }
     }
 
+    // Unsafe mechanics
+
+    private static final sun.misc.Unsafe UNSAFE = sun.misc.Unsafe.getUnsafe();
+    private static final long headOffset =
+        objectFieldOffset(UNSAFE, "head", ConcurrentLinkedQueue.class);
+    private static final long tailOffset =
+        objectFieldOffset(UNSAFE, "tail", ConcurrentLinkedQueue.class);
+
+    private boolean casTail(Node<E> cmp, Node<E> val) {
+        return UNSAFE.compareAndSwapObject(this, tailOffset, cmp, val);
+    }
+
+    private boolean casHead(Node<E> cmp, Node<E> val) {
+        return UNSAFE.compareAndSwapObject(this, headOffset, cmp, val);
+    }
+
+    private void lazySetHead(Node<E> val) {
+        UNSAFE.putOrderedObject(this, headOffset, val);
+    }
+
+    static long objectFieldOffset(sun.misc.Unsafe UNSAFE,
+                                  String field, Class<?> klazz) {
+        try {
+            return UNSAFE.objectFieldOffset(klazz.getDeclaredField(field));
+        } catch (NoSuchFieldException e) {
+            // Convert Exception to corresponding Error
+            NoSuchFieldError error = new NoSuchFieldError(field);
+            error.initCause(e);
+            throw error;
+        }
+    }
 }
diff --git a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
index 48fc8717a42..dd34d0dc6b7 100644
--- a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
+++ b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
@@ -34,8 +34,13 @@
  */
 
 package java.util.concurrent;
-import java.util.*;
-import java.util.concurrent.locks.*;
+
+import java.util.AbstractQueue;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * An optionally-bounded {@linkplain BlockingDeque blocking deque} based on
@@ -73,6 +78,20 @@ public class LinkedBlockingDeque<E>
     /*
      * Implemented as a simple doubly-linked list protected by a
      * single lock and using conditions to manage blocking.
+     *
+     * To implement weakly consistent iterators, it appears we need to
+     * keep all Nodes GC-reachable from a predecessor dequeued Node.
+     * That would cause two problems:
+     * - allow a rogue Iterator to cause unbounded memory retention
+     * - cause cross-generational linking of old Nodes to new Nodes if
+     *   a Node was tenured while live, which generational GCs have a
+     *   hard time dealing with, causing repeated major collections.
+     * However, only non-deleted Nodes need to be reachable from
+     * dequeued Nodes, and reachability does not necessarily have to
+     * be of the kind understood by the GC.  We use the trick of
+     * linking a Node that has just been dequeued to itself.  Such a
+     * self-link implicitly means to jump to "first" (for next links)
+     * or "last" (for prev links).
      */
 
     /*
@@ -86,9 +105,27 @@ public class LinkedBlockingDeque<E>
 
     /** Doubly-linked list node class */
     static final class Node<E> {
+        /**
+         * The item, or null if this node has been removed.
+         */
         E item;
+
+        /**
+         * One of:
+         * - the real predecessor Node
+         * - this Node, meaning the predecessor is tail
+         * - null, meaning there is no predecessor
+         */
         Node<E> prev;
+
+        /**
+         * One of:
+         * - the real successor Node
+         * - this Node, meaning the successor is head
+         * - null, meaning there is no successor
+         */
         Node<E> next;
+
         Node(E x, Node<E> p, Node<E> n) {
             item = x;
             prev = p;
@@ -96,23 +133,37 @@ public class LinkedBlockingDeque<E>
         }
     }
 
-    /** Pointer to first node */
-    private transient Node<E> first;
-    /** Pointer to last node */
-    private transient Node<E> last;
+    /**
+     * Pointer to first node.
+     * Invariant: (first == null && last == null) ||
+     *            (first.prev == null && first.item != null)
+     */
+    transient Node<E> first;
+
+    /**
+     * Pointer to last node.
+     * Invariant: (first == null && last == null) ||
+     *            (last.next == null && last.item != null)
+     */
+    transient Node<E> last;
+
     /** Number of items in the deque */
     private transient int count;
+
     /** Maximum number of items in the deque */
     private final int capacity;
+
     /** Main lock guarding all access */
-    private final ReentrantLock lock = new ReentrantLock();
+    final ReentrantLock lock = new ReentrantLock();
+
     /** Condition for waiting takes */
     private final Condition notEmpty = lock.newCondition();
+
     /** Condition for waiting puts */
     private final Condition notFull = lock.newCondition();
 
     /**
-     * Creates a <tt>LinkedBlockingDeque</tt> with a capacity of
+     * Creates a {@code LinkedBlockingDeque} with a capacity of
      * {@link Integer#MAX_VALUE}.
      */
     public LinkedBlockingDeque() {
@@ -120,10 +171,10 @@ public class LinkedBlockingDeque<E>
     }
 
     /**
-     * Creates a <tt>LinkedBlockingDeque</tt> with the given (fixed) capacity.
+     * Creates a {@code LinkedBlockingDeque} with the given (fixed) capacity.
      *
      * @param capacity the capacity of this deque
-     * @throws IllegalArgumentException if <tt>capacity</tt> is less than 1
+     * @throws IllegalArgumentException if {@code capacity} is less than 1
      */
     public LinkedBlockingDeque(int capacity) {
         if (capacity <= 0) throw new IllegalArgumentException();
@@ -131,7 +182,7 @@ public class LinkedBlockingDeque<E>
     }
 
     /**
-     * Creates a <tt>LinkedBlockingDeque</tt> with a capacity of
+     * Creates a {@code LinkedBlockingDeque} with a capacity of
      * {@link Integer#MAX_VALUE}, initially containing the elements of
      * the given collection, added in traversal order of the
      * collection's iterator.
@@ -142,8 +193,18 @@ public class LinkedBlockingDeque<E>
      */
     public LinkedBlockingDeque(Collection<? extends E> c) {
         this(Integer.MAX_VALUE);
-        for (E e : c)
-            add(e);
+        final ReentrantLock lock = this.lock;
+        lock.lock(); // Never contended, but necessary for visibility
+        try {
+            for (E e : c) {
+                if (e == null)
+                    throw new NullPointerException();
+                if (!linkLast(e))
+                    throw new IllegalStateException("Deque full");
+            }
+        } finally {
+            lock.unlock();
+        }
     }
 
 
@@ -153,9 +214,9 @@ public class LinkedBlockingDeque<E>
      * Links e as first element, or returns false if full.
      */
     private boolean linkFirst(E e) {
+        // assert lock.isHeldByCurrentThread();
         if (count >= capacity)
             return false;
-        ++count;
         Node<E> f = first;
         Node<E> x = new Node<E>(e, null, f);
         first = x;
@@ -163,6 +224,7 @@ public class LinkedBlockingDeque<E>
             last = x;
         else
             f.prev = x;
+        ++count;
         notEmpty.signal();
         return true;
     }
@@ -171,9 +233,9 @@ public class LinkedBlockingDeque<E>
      * Links e as last element, or returns false if full.
      */
     private boolean linkLast(E e) {
+        // assert lock.isHeldByCurrentThread();
         if (count >= capacity)
             return false;
-        ++count;
         Node<E> l = last;
         Node<E> x = new Node<E>(e, l, null);
         last = x;
@@ -181,6 +243,7 @@ public class LinkedBlockingDeque<E>
             first = x;
         else
             l.next = x;
+        ++count;
         notEmpty.signal();
         return true;
     }
@@ -189,10 +252,14 @@ public class LinkedBlockingDeque<E>
      * Removes and returns first element, or null if empty.
      */
     private E unlinkFirst() {
+        // assert lock.isHeldByCurrentThread();
         Node<E> f = first;
         if (f == null)
             return null;
         Node<E> n = f.next;
+        E item = f.item;
+        f.item = null;
+        f.next = f; // help GC
         first = n;
         if (n == null)
             last = null;
@@ -200,17 +267,21 @@ public class LinkedBlockingDeque<E>
             n.prev = null;
         --count;
         notFull.signal();
-        return f.item;
+        return item;
     }
 
     /**
      * Removes and returns last element, or null if empty.
      */
     private E unlinkLast() {
+        // assert lock.isHeldByCurrentThread();
         Node<E> l = last;
         if (l == null)
             return null;
         Node<E> p = l.prev;
+        E item = l.item;
+        l.item = null;
+        l.prev = l; // help GC
         last = p;
         if (p == null)
             first = null;
@@ -218,31 +289,29 @@ public class LinkedBlockingDeque<E>
             p.next = null;
         --count;
         notFull.signal();
-        return l.item;
+        return item;
     }
 
     /**
-     * Unlink e
+     * Unlinks x.
      */
-    private void unlink(Node<E> x) {
+    void unlink(Node<E> x) {
+        // assert lock.isHeldByCurrentThread();
         Node<E> p = x.prev;
         Node<E> n = x.next;
         if (p == null) {
-            if (n == null)
-                first = last = null;
-            else {
-                n.prev = null;
-                first = n;
-            }
+            unlinkFirst();
         } else if (n == null) {
-            p.next = null;
-            last = p;
+            unlinkLast();
         } else {
             p.next = n;
             n.prev = p;
+            x.item = null;
+            // Don't mess with x's links.  They may still be in use by
+            // an iterator.
+            --count;
+            notFull.signal();
         }
-        --count;
-        notFull.signalAll();
     }
 
     // BlockingDeque methods
@@ -270,6 +339,7 @@ public class LinkedBlockingDeque<E>
      */
     public boolean offerFirst(E e) {
         if (e == null) throw new NullPointerException();
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return linkFirst(e);
@@ -283,6 +353,7 @@ public class LinkedBlockingDeque<E>
      */
     public boolean offerLast(E e) {
         if (e == null) throw new NullPointerException();
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return linkLast(e);
@@ -297,6 +368,7 @@ public class LinkedBlockingDeque<E>
      */
     public void putFirst(E e) throws InterruptedException {
         if (e == null) throw new NullPointerException();
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             while (!linkFirst(e))
@@ -312,6 +384,7 @@ public class LinkedBlockingDeque<E>
      */
     public void putLast(E e) throws InterruptedException {
         if (e == null) throw new NullPointerException();
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             while (!linkLast(e))
@@ -329,15 +402,15 @@ public class LinkedBlockingDeque<E>
         throws InterruptedException {
         if (e == null) throw new NullPointerException();
         long nanos = unit.toNanos(timeout);
+        final ReentrantLock lock = this.lock;
         lock.lockInterruptibly();
         try {
-            for (;;) {
-                if (linkFirst(e))
-                    return true;
+            while (!linkFirst(e)) {
                 if (nanos <= 0)
                     return false;
                 nanos = notFull.awaitNanos(nanos);
             }
+            return true;
         } finally {
             lock.unlock();
         }
@@ -351,15 +424,15 @@ public class LinkedBlockingDeque<E>
         throws InterruptedException {
         if (e == null) throw new NullPointerException();
         long nanos = unit.toNanos(timeout);
+        final ReentrantLock lock = this.lock;
         lock.lockInterruptibly();
         try {
-            for (;;) {
-                if (linkLast(e))
-                    return true;
+            while (!linkLast(e)) {
                 if (nanos <= 0)
                     return false;
                 nanos = notFull.awaitNanos(nanos);
             }
+            return true;
         } finally {
             lock.unlock();
         }
@@ -384,6 +457,7 @@ public class LinkedBlockingDeque<E>
     }
 
     public E pollFirst() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return unlinkFirst();
@@ -393,6 +467,7 @@ public class LinkedBlockingDeque<E>
     }
 
     public E pollLast() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return unlinkLast();
@@ -402,6 +477,7 @@ public class LinkedBlockingDeque<E>
     }
 
     public E takeFirst() throws InterruptedException {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             E x;
@@ -414,6 +490,7 @@ public class LinkedBlockingDeque<E>
     }
 
     public E takeLast() throws InterruptedException {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             E x;
@@ -428,16 +505,16 @@ public class LinkedBlockingDeque<E>
     public E pollFirst(long timeout, TimeUnit unit)
         throws InterruptedException {
         long nanos = unit.toNanos(timeout);
+        final ReentrantLock lock = this.lock;
         lock.lockInterruptibly();
         try {
-            for (;;) {
-                E x = unlinkFirst();
-                if (x != null)
-                    return x;
+            E x;
+            while ( (x = unlinkFirst()) == null) {
                 if (nanos <= 0)
                     return null;
                 nanos = notEmpty.awaitNanos(nanos);
             }
+            return x;
         } finally {
             lock.unlock();
         }
@@ -446,16 +523,16 @@ public class LinkedBlockingDeque<E>
     public E pollLast(long timeout, TimeUnit unit)
         throws InterruptedException {
         long nanos = unit.toNanos(timeout);
+        final ReentrantLock lock = this.lock;
         lock.lockInterruptibly();
         try {
-            for (;;) {
-                E x = unlinkLast();
-                if (x != null)
-                    return x;
+            E x;
+            while ( (x = unlinkLast()) == null) {
                 if (nanos <= 0)
                     return null;
                 nanos = notEmpty.awaitNanos(nanos);
             }
+            return x;
         } finally {
             lock.unlock();
         }
@@ -480,6 +557,7 @@ public class LinkedBlockingDeque<E>
     }
 
     public E peekFirst() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return (first == null) ? null : first.item;
@@ -489,6 +567,7 @@ public class LinkedBlockingDeque<E>
     }
 
     public E peekLast() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return (last == null) ? null : last.item;
@@ -499,6 +578,7 @@ public class LinkedBlockingDeque<E>
 
     public boolean removeFirstOccurrence(Object o) {
         if (o == null) return false;
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             for (Node<E> p = first; p != null; p = p.next) {
@@ -515,6 +595,7 @@ public class LinkedBlockingDeque<E>
 
     public boolean removeLastOccurrence(Object o) {
         if (o == null) return false;
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             for (Node<E> p = last; p != null; p = p.prev) {
@@ -619,14 +700,15 @@ public class LinkedBlockingDeque<E>
      * Returns the number of additional elements that this deque can ideally
      * (in the absence of memory or resource constraints) accept without
      * blocking. This is always equal to the initial capacity of this deque
-     * less the current <tt>size</tt> of this deque.
+     * less the current {@code size} of this deque.
      *
      * <p>Note that you <em>cannot</em> always tell if an attempt to insert
-     * an element will succeed by inspecting <tt>remainingCapacity</tt>
+     * an element will succeed by inspecting {@code remainingCapacity}
      * because it may be the case that another thread is about to
      * insert or remove an element.
      */
     public int remainingCapacity() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return capacity - count;
@@ -642,22 +724,7 @@ public class LinkedBlockingDeque<E>
      * @throws IllegalArgumentException      {@inheritDoc}
      */
     public int drainTo(Collection<? super E> c) {
-        if (c == null)
-            throw new NullPointerException();
-        if (c == this)
-            throw new IllegalArgumentException();
-        lock.lock();
-        try {
-            for (Node<E> p = first; p != null; p = p.next)
-                c.add(p.item);
-            int n = count;
-            count = 0;
-            first = last = null;
-            notFull.signalAll();
-            return n;
-        } finally {
-            lock.unlock();
-        }
+        return drainTo(c, Integer.MAX_VALUE);
     }
 
     /**
@@ -671,19 +738,14 @@ public class LinkedBlockingDeque<E>
             throw new NullPointerException();
         if (c == this)
             throw new IllegalArgumentException();
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
-            int n = 0;
-            while (n < maxElements && first != null) {
-                c.add(first.item);
-                first.prev = null;
-                first = first.next;
-                --count;
-                ++n;
+            int n = Math.min(maxElements, count);
+            for (int i = 0; i < n; i++) {
+                c.add(first.item);   // In this order, in case add() throws.
+                unlinkFirst();
             }
-            if (first == null)
-                last = null;
-            notFull.signalAll();
             return n;
         } finally {
             lock.unlock();
@@ -712,16 +774,16 @@ public class LinkedBlockingDeque<E>
     /**
      * Removes the first occurrence of the specified element from this deque.
      * If the deque does not contain the element, it is unchanged.
-     * More formally, removes the first element <tt>e</tt> such that
-     * <tt>o.equals(e)</tt> (if such an element exists).
-     * Returns <tt>true</tt> if this deque contained the specified element
+     * More formally, removes the first element {@code e} such that
+     * {@code o.equals(e)} (if such an element exists).
+     * Returns {@code true} if this deque contained the specified element
      * (or equivalently, if this deque changed as a result of the call).
      *
      * <p>This method is equivalent to
      * {@link #removeFirstOccurrence(Object) removeFirstOccurrence}.
      *
      * @param o element to be removed from this deque, if present
-     * @return <tt>true</tt> if this deque changed as a result of the call
+     * @return {@code true} if this deque changed as a result of the call
      */
     public boolean remove(Object o) {
         return removeFirstOccurrence(o);
@@ -733,6 +795,7 @@ public class LinkedBlockingDeque<E>
      * @return the number of elements in this deque
      */
     public int size() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return count;
@@ -742,15 +805,16 @@ public class LinkedBlockingDeque<E>
     }
 
     /**
-     * Returns <tt>true</tt> if this deque contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this deque contains
-     * at least one element <tt>e</tt> such that <tt>o.equals(e)</tt>.
+     * Returns {@code true} if this deque contains the specified element.
+     * More formally, returns {@code true} if and only if this deque contains
+     * at least one element {@code e} such that {@code o.equals(e)}.
      *
      * @param o object to be checked for containment in this deque
-     * @return <tt>true</tt> if this deque contains the specified element
+     * @return {@code true} if this deque contains the specified element
      */
     public boolean contains(Object o) {
         if (o == null) return false;
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             for (Node<E> p = first; p != null; p = p.next)
@@ -762,24 +826,46 @@ public class LinkedBlockingDeque<E>
         }
     }
 
-    /**
-     * Variant of removeFirstOccurrence needed by iterator.remove.
-     * Searches for the node, not its contents.
+    /*
+     * TODO: Add support for more efficient bulk operations.
+     *
+     * We don't want to acquire the lock for every iteration, but we
+     * also want other threads a chance to interact with the
+     * collection, especially when count is close to capacity.
      */
-    boolean removeNode(Node<E> e) {
-        lock.lock();
-        try {
-            for (Node<E> p = first; p != null; p = p.next) {
-                if (p == e) {
-                    unlink(p);
-                    return true;
-                }
-            }
-            return false;
-        } finally {
-            lock.unlock();
-        }
-    }
+
+//     /**
+//      * Adds all of the elements in the specified collection to this
+//      * queue.  Attempts to addAll of a queue to itself result in
+//      * {@code IllegalArgumentException}. Further, the behavior of
+//      * this operation is undefined if the specified collection is
+//      * modified while the operation is in progress.
+//      *
+//      * @param c collection containing elements to be added to this queue
+//      * @return {@code true} if this queue changed as a result of the call
+//      * @throws ClassCastException            {@inheritDoc}
+//      * @throws NullPointerException          {@inheritDoc}
+//      * @throws IllegalArgumentException      {@inheritDoc}
+//      * @throws IllegalStateException         {@inheritDoc}
+//      * @see #add(Object)
+//      */
+//     public boolean addAll(Collection<? extends E> c) {
+//         if (c == null)
+//             throw new NullPointerException();
+//         if (c == this)
+//             throw new IllegalArgumentException();
+//         final ReentrantLock lock = this.lock;
+//         lock.lock();
+//         try {
+//             boolean modified = false;
+//             for (E e : c)
+//                 if (linkLast(e))
+//                     modified = true;
+//             return modified;
+//         } finally {
+//             lock.unlock();
+//         }
+//     }
 
     /**
      * Returns an array containing all of the elements in this deque, in
@@ -794,7 +880,9 @@ public class LinkedBlockingDeque<E>
      *
      * @return an array containing all of the elements in this deque
      */
+    @SuppressWarnings("unchecked")
     public Object[] toArray() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             Object[] a = new Object[count];
@@ -817,22 +905,22 @@ public class LinkedBlockingDeque<E>
      * <p>If this deque fits in the specified array with room to spare
      * (i.e., the array has more elements than this deque), the element in
      * the array immediately following the end of the deque is set to
-     * <tt>null</tt>.
+     * {@code null}.
      *
      * <p>Like the {@link #toArray()} method, this method acts as bridge between
      * array-based and collection-based APIs.  Further, this method allows
      * precise control over the runtime type of the output array, and may,
      * under certain circumstances, be used to save allocation costs.
      *
-     * <p>Suppose <tt>x</tt> is a deque known to contain only strings.
+     * <p>Suppose {@code x} is a deque known to contain only strings.
      * The following code can be used to dump the deque into a newly
-     * allocated array of <tt>String</tt>:
+     * allocated array of {@code String}:
      *
      * <pre>
      *     String[] y = x.toArray(new String[0]);</pre>
      *
-     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
-     * <tt>toArray()</tt>.
+     * Note that {@code toArray(new Object[0])} is identical in function to
+     * {@code toArray()}.
      *
      * @param a the array into which the elements of the deque are to
      *          be stored, if it is big enough; otherwise, a new array of the
@@ -843,14 +931,14 @@ public class LinkedBlockingDeque<E>
      *         this deque
      * @throws NullPointerException if the specified array is null
      */
+    @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] a) {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             if (a.length < count)
-                a = (T[])java.lang.reflect.Array.newInstance(
-                    a.getClass().getComponentType(),
-                    count
-                    );
+                a = (T[])java.lang.reflect.Array.newInstance
+                    (a.getClass().getComponentType(), count);
 
             int k = 0;
             for (Node<E> p = first; p != null; p = p.next)
@@ -864,6 +952,7 @@ public class LinkedBlockingDeque<E>
     }
 
     public String toString() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             return super.toString();
@@ -877,8 +966,16 @@ public class LinkedBlockingDeque<E>
      * The deque will be empty after this call returns.
      */
     public void clear() {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
+            for (Node<E> f = first; f != null; ) {
+                f.item = null;
+                Node<E> n = f.next;
+                f.prev = null;
+                f.next = null;
+                f = n;
+            }
             first = last = null;
             count = 0;
             notFull.signalAll();
@@ -890,8 +987,9 @@ public class LinkedBlockingDeque<E>
     /**
      * Returns an iterator over the elements in this deque in proper sequence.
      * The elements will be returned in order from first (head) to last (tail).
-     * The returned <tt>Iterator</tt> is a "weakly consistent" iterator that
-     * will never throw {@link ConcurrentModificationException},
+     * The returned {@code Iterator} is a "weakly consistent" iterator that
+     * will never throw {@link java.util.ConcurrentModificationException
+     * ConcurrentModificationException},
      * and guarantees to traverse elements as they existed upon
      * construction of the iterator, and may (but is not guaranteed to)
      * reflect any modifications subsequent to construction.
@@ -906,8 +1004,9 @@ public class LinkedBlockingDeque<E>
      * Returns an iterator over the elements in this deque in reverse
      * sequential order.  The elements will be returned in order from
      * last (tail) to first (head).
-     * The returned <tt>Iterator</tt> is a "weakly consistent" iterator that
-     * will never throw {@link ConcurrentModificationException},
+     * The returned {@code Iterator} is a "weakly consistent" iterator that
+     * will never throw {@link java.util.ConcurrentModificationException
+     * ConcurrentModificationException},
      * and guarantees to traverse elements as they existed upon
      * construction of the iterator, and may (but is not guaranteed to)
      * reflect any modifications subsequent to construction.
@@ -921,7 +1020,7 @@ public class LinkedBlockingDeque<E>
      */
     private abstract class AbstractItr implements Iterator<E> {
         /**
-         * The next node to return in next
+         * The next node to return in next()
          */
          Node<E> next;
 
@@ -939,15 +1038,44 @@ public class LinkedBlockingDeque<E>
          */
         private Node<E> lastRet;
 
+        abstract Node<E> firstNode();
+        abstract Node<E> nextNode(Node<E> n);
+
         AbstractItr() {
-            advance(); // set to initial position
+            // set to initial position
+            final ReentrantLock lock = LinkedBlockingDeque.this.lock;
+            lock.lock();
+            try {
+                next = firstNode();
+                nextItem = (next == null) ? null : next.item;
+            } finally {
+                lock.unlock();
+            }
         }
 
         /**
-         * Advances next, or if not yet initialized, sets to first node.
-         * Implemented to move forward vs backward in the two subclasses.
+         * Advances next.
          */
-        abstract void advance();
+        void advance() {
+            final ReentrantLock lock = LinkedBlockingDeque.this.lock;
+            lock.lock();
+            try {
+                // assert next != null;
+                Node<E> s = nextNode(next);
+                if (s == next) {
+                    next = firstNode();
+                } else {
+                    // Skip over removed nodes.
+                    // May be necessary if multiple interior Nodes are removed.
+                    while (s != null && s.item == null)
+                        s = nextNode(s);
+                    next = s;
+                }
+                nextItem = (next == null) ? null : next.item;
+            } finally {
+                lock.unlock();
+            }
+        }
 
         public boolean hasNext() {
             return next != null;
@@ -967,52 +1095,39 @@ public class LinkedBlockingDeque<E>
             if (n == null)
                 throw new IllegalStateException();
             lastRet = null;
-            // Note: removeNode rescans looking for this node to make
-            // sure it was not already removed. Otherwise, trying to
-            // re-remove could corrupt list.
-            removeNode(n);
+            final ReentrantLock lock = LinkedBlockingDeque.this.lock;
+            lock.lock();
+            try {
+                if (n.item != null)
+                    unlink(n);
+            } finally {
+                lock.unlock();
+            }
         }
     }
 
     /** Forward iterator */
     private class Itr extends AbstractItr {
-        void advance() {
-            final ReentrantLock lock = LinkedBlockingDeque.this.lock;
-            lock.lock();
-            try {
-                next = (next == null)? first : next.next;
-                nextItem = (next == null)? null : next.item;
-            } finally {
-                lock.unlock();
-            }
-        }
+        Node<E> firstNode() { return first; }
+        Node<E> nextNode(Node<E> n) { return n.next; }
     }
 
-    /**
-     * Descending iterator for LinkedBlockingDeque
-     */
+    /** Descending iterator */
     private class DescendingItr extends AbstractItr {
-        void advance() {
-            final ReentrantLock lock = LinkedBlockingDeque.this.lock;
-            lock.lock();
-            try {
-                next = (next == null)? last : next.prev;
-                nextItem = (next == null)? null : next.item;
-            } finally {
-                lock.unlock();
-            }
-        }
+        Node<E> firstNode() { return last; }
+        Node<E> nextNode(Node<E> n) { return n.prev; }
     }
 
     /**
      * Save the state of this deque to a stream (that is, serialize it).
      *
      * @serialData The capacity (int), followed by elements (each an
-     * <tt>Object</tt>) in the proper order, followed by a null
+     * {@code Object}) in the proper order, followed by a null
      * @param s the stream
      */
     private void writeObject(java.io.ObjectOutputStream s)
         throws java.io.IOException {
+        final ReentrantLock lock = this.lock;
         lock.lock();
         try {
             // Write out capacity and any hidden stuff
@@ -1040,6 +1155,7 @@ public class LinkedBlockingDeque<E>
         last = null;
         // Read in all elements and place in queue
         for (;;) {
+            @SuppressWarnings("unchecked")
             E item = (E)s.readObject();
             if (item == null)
                 break;
diff --git a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
index dc56a034665..dc946786f83 100644
--- a/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
+++ b/jdk/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
@@ -34,9 +34,14 @@
  */
 
 package java.util.concurrent;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-import java.util.*;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.AbstractQueue;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
 
 /**
  * An optionally-bounded {@linkplain BlockingQueue blocking queue} based on
@@ -86,15 +91,43 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      * items have been entered since the signal. And symmetrically for
      * takes signalling puts. Operations such as remove(Object) and
      * iterators acquire both locks.
+     *
+     * Visibility between writers and readers is provided as follows:
+     *
+     * Whenever an element is enqueued, the putLock is acquired and
+     * count updated.  A subsequent reader guarantees visibility to the
+     * enqueued Node by either acquiring the putLock (via fullyLock)
+     * or by acquiring the takeLock, and then reading n = count.get();
+     * this gives visibility to the first n items.
+     *
+     * To implement weakly consistent iterators, it appears we need to
+     * keep all Nodes GC-reachable from a predecessor dequeued Node.
+     * That would cause two problems:
+     * - allow a rogue Iterator to cause unbounded memory retention
+     * - cause cross-generational linking of old Nodes to new Nodes if
+     *   a Node was tenured while live, which generational GCs have a
+     *   hard time dealing with, causing repeated major collections.
+     * However, only non-deleted Nodes need to be reachable from
+     * dequeued Nodes, and reachability does not necessarily have to
+     * be of the kind understood by the GC.  We use the trick of
+     * linking a Node that has just been dequeued to itself.  Such a
+     * self-link implicitly means to advance to head.next.
      */
 
     /**
      * Linked list node class
      */
     static class Node<E> {
-        /** The item, volatile to ensure barrier separating write and read */
-        volatile E item;
+        E item;
+
+        /**
+         * One of:
+         * - the real successor Node
+         * - this Node, meaning the successor is head.next
+         * - null, meaning there is no successor (this is the last node)
+         */
         Node<E> next;
+
         Node(E x) { item = x; }
     }
 
@@ -104,10 +137,16 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
     /** Current number of elements */
     private final AtomicInteger count = new AtomicInteger(0);
 
-    /** Head of linked list */
+    /**
+     * Head of linked list.
+     * Invariant: head.item == null
+     */
     private transient Node<E> head;
 
-    /** Tail of linked list */
+    /**
+     * Tail of linked list.
+     * Invariant: last.next == null
+     */
     private transient Node<E> last;
 
     /** Lock held by take, poll, etc */
@@ -151,18 +190,26 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
 
     /**
      * Creates a node and links it at end of queue.
+     *
      * @param x the item
      */
-    private void insert(E x) {
+    private void enqueue(E x) {
+        // assert putLock.isHeldByCurrentThread();
+        // assert last.next == null;
         last = last.next = new Node<E>(x);
     }
 
     /**
-     * Removes a node from head of queue,
+     * Removes a node from head of queue.
+     *
      * @return the node
      */
-    private E extract() {
-        Node<E> first = head.next;
+    private E dequeue() {
+        // assert takeLock.isHeldByCurrentThread();
+        // assert head.item == null;
+        Node<E> h = head;
+        Node<E> first = h.next;
+        h.next = h; // help GC
         head = first;
         E x = first.item;
         first.item = null;
@@ -172,7 +219,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
     /**
      * Lock to prevent both puts and takes.
      */
-    private void fullyLock() {
+    void fullyLock() {
         putLock.lock();
         takeLock.lock();
     }
@@ -180,14 +227,21 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
     /**
      * Unlock to allow both puts and takes.
      */
-    private void fullyUnlock() {
+    void fullyUnlock() {
         takeLock.unlock();
         putLock.unlock();
     }
 
+//     /**
+//      * Tells whether both locks are held by current thread.
+//      */
+//     boolean isFullyLocked() {
+//         return (putLock.isHeldByCurrentThread() &&
+//                 takeLock.isHeldByCurrentThread());
+//     }
 
     /**
-     * Creates a <tt>LinkedBlockingQueue</tt> with a capacity of
+     * Creates a {@code LinkedBlockingQueue} with a capacity of
      * {@link Integer#MAX_VALUE}.
      */
     public LinkedBlockingQueue() {
@@ -195,10 +249,10 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
     }
 
     /**
-     * Creates a <tt>LinkedBlockingQueue</tt> with the given (fixed) capacity.
+     * Creates a {@code LinkedBlockingQueue} with the given (fixed) capacity.
      *
      * @param capacity the capacity of this queue
-     * @throws IllegalArgumentException if <tt>capacity</tt> is not greater
+     * @throws IllegalArgumentException if {@code capacity} is not greater
      *         than zero
      */
     public LinkedBlockingQueue(int capacity) {
@@ -208,7 +262,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
     }
 
     /**
-     * Creates a <tt>LinkedBlockingQueue</tt> with a capacity of
+     * Creates a {@code LinkedBlockingQueue} with a capacity of
      * {@link Integer#MAX_VALUE}, initially containing the elements of the
      * given collection,
      * added in traversal order of the collection's iterator.
@@ -219,8 +273,22 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      */
     public LinkedBlockingQueue(Collection<? extends E> c) {
         this(Integer.MAX_VALUE);
-        for (E e : c)
-            add(e);
+        final ReentrantLock putLock = this.putLock;
+        putLock.lock(); // Never contended, but necessary for visibility
+        try {
+            int n = 0;
+            for (E e : c) {
+                if (e == null)
+                    throw new NullPointerException();
+                if (n == capacity)
+                    throw new IllegalStateException("Queue full");
+                enqueue(e);
+                ++n;
+            }
+            count.set(n);
+        } finally {
+            putLock.unlock();
+        }
     }
 
 
@@ -241,10 +309,10 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      * Returns the number of additional elements that this queue can ideally
      * (in the absence of memory or resource constraints) accept without
      * blocking. This is always equal to the initial capacity of this queue
-     * less the current <tt>size</tt> of this queue.
+     * less the current {@code size} of this queue.
      *
      * <p>Note that you <em>cannot</em> always tell if an attempt to insert
-     * an element will succeed by inspecting <tt>remainingCapacity</tt>
+     * an element will succeed by inspecting {@code remainingCapacity}
      * because it may be the case that another thread is about to
      * insert or remove an element.
      */
@@ -261,8 +329,8 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      */
     public void put(E e) throws InterruptedException {
         if (e == null) throw new NullPointerException();
-        // Note: convention in all put/take/etc is to preset
-        // local var holding count  negative to indicate failure unless set.
+        // Note: convention in all put/take/etc is to preset local var
+        // holding count negative to indicate failure unless set.
         int c = -1;
         final ReentrantLock putLock = this.putLock;
         final AtomicInteger count = this.count;
@@ -273,18 +341,13 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
              * not protected by lock. This works because count can
              * only decrease at this point (all other puts are shut
              * out by lock), and we (or some other waiting put) are
-             * signalled if it ever changes from
-             * capacity. Similarly for all other uses of count in
-             * other wait guards.
+             * signalled if it ever changes from capacity. Similarly
+             * for all other uses of count in other wait guards.
              */
-            try {
-                while (count.get() == capacity)
-                    notFull.await();
-            } catch (InterruptedException ie) {
-                notFull.signal(); // propagate to a non-interrupted thread
-                throw ie;
+            while (count.get() == capacity) {
+                notFull.await();
             }
-            insert(e);
+            enqueue(e);
             c = count.getAndIncrement();
             if (c + 1 < capacity)
                 notFull.signal();
@@ -299,7 +362,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      * Inserts the specified element at the tail of this queue, waiting if
      * necessary up to the specified wait time for space to become available.
      *
-     * @return <tt>true</tt> if successful, or <tt>false</tt> if
+     * @return {@code true} if successful, or {@code false} if
      *         the specified waiting time elapses before space is available.
      * @throws InterruptedException {@inheritDoc}
      * @throws NullPointerException {@inheritDoc}
@@ -314,23 +377,15 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
         final AtomicInteger count = this.count;
         putLock.lockInterruptibly();
         try {
-            for (;;) {
-                if (count.get() < capacity) {
-                    insert(e);
-                    c = count.getAndIncrement();
-                    if (c + 1 < capacity)
-                        notFull.signal();
-                    break;
-                }
+            while (count.get() == capacity) {
                 if (nanos <= 0)
                     return false;
-                try {
-                    nanos = notFull.awaitNanos(nanos);
-                } catch (InterruptedException ie) {
-                    notFull.signal(); // propagate to a non-interrupted thread
-                    throw ie;
-                }
+                nanos = notFull.awaitNanos(nanos);
             }
+            enqueue(e);
+            c = count.getAndIncrement();
+            if (c + 1 < capacity)
+                notFull.signal();
         } finally {
             putLock.unlock();
         }
@@ -342,7 +397,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
     /**
      * Inserts the specified element at the tail of this queue if it is
      * possible to do so immediately without exceeding the queue's capacity,
-     * returning <tt>true</tt> upon success and <tt>false</tt> if this queue
+     * returning {@code true} upon success and {@code false} if this queue
      * is full.
      * When using a capacity-restricted queue, this method is generally
      * preferable to method {@link BlockingQueue#add add}, which can fail to
@@ -360,7 +415,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
         putLock.lock();
         try {
             if (count.get() < capacity) {
-                insert(e);
+                enqueue(e);
                 c = count.getAndIncrement();
                 if (c + 1 < capacity)
                     notFull.signal();
@@ -381,15 +436,10 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
         final ReentrantLock takeLock = this.takeLock;
         takeLock.lockInterruptibly();
         try {
-            try {
-                while (count.get() == 0)
-                    notEmpty.await();
-            } catch (InterruptedException ie) {
-                notEmpty.signal(); // propagate to a non-interrupted thread
-                throw ie;
+            while (count.get() == 0) {
+                notEmpty.await();
             }
-
-            x = extract();
+            x = dequeue();
             c = count.getAndDecrement();
             if (c > 1)
                 notEmpty.signal();
@@ -409,23 +459,15 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
         final ReentrantLock takeLock = this.takeLock;
         takeLock.lockInterruptibly();
         try {
-            for (;;) {
-                if (count.get() > 0) {
-                    x = extract();
-                    c = count.getAndDecrement();
-                    if (c > 1)
-                        notEmpty.signal();
-                    break;
-                }
+            while (count.get() == 0) {
                 if (nanos <= 0)
                     return null;
-                try {
-                    nanos = notEmpty.awaitNanos(nanos);
-                } catch (InterruptedException ie) {
-                    notEmpty.signal(); // propagate to a non-interrupted thread
-                    throw ie;
-                }
+                nanos = notEmpty.awaitNanos(nanos);
             }
+            x = dequeue();
+            c = count.getAndDecrement();
+            if (c > 1)
+                notEmpty.signal();
         } finally {
             takeLock.unlock();
         }
@@ -444,7 +486,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
         takeLock.lock();
         try {
             if (count.get() > 0) {
-                x = extract();
+                x = dequeue();
                 c = count.getAndDecrement();
                 if (c > 1)
                     notEmpty.signal();
@@ -457,7 +499,6 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
         return x;
     }
 
-
     public E peek() {
         if (count.get() == 0)
             return null;
@@ -474,44 +515,48 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
         }
     }
 
+    /**
+     * Unlinks interior Node p with predecessor trail.
+     */
+    void unlink(Node<E> p, Node<E> trail) {
+        // assert isFullyLocked();
+        // p.next is not changed, to allow iterators that are
+        // traversing p to maintain their weak-consistency guarantee.
+        p.item = null;
+        trail.next = p.next;
+        if (last == p)
+            last = trail;
+        if (count.getAndDecrement() == capacity)
+            notFull.signal();
+    }
+
     /**
      * Removes a single instance of the specified element from this queue,
-     * if it is present.  More formally, removes an element <tt>e</tt> such
-     * that <tt>o.equals(e)</tt>, if this queue contains one or more such
+     * if it is present.  More formally, removes an element {@code e} such
+     * that {@code o.equals(e)}, if this queue contains one or more such
      * elements.
-     * Returns <tt>true</tt> if this queue contained the specified element
+     * Returns {@code true} if this queue contained the specified element
      * (or equivalently, if this queue changed as a result of the call).
      *
      * @param o element to be removed from this queue, if present
-     * @return <tt>true</tt> if this queue changed as a result of the call
+     * @return {@code true} if this queue changed as a result of the call
      */
     public boolean remove(Object o) {
         if (o == null) return false;
-        boolean removed = false;
         fullyLock();
         try {
-            Node<E> trail = head;
-            Node<E> p = head.next;
-            while (p != null) {
+            for (Node<E> trail = head, p = trail.next;
+                 p != null;
+                 trail = p, p = p.next) {
                 if (o.equals(p.item)) {
-                    removed = true;
-                    break;
+                    unlink(p, trail);
+                    return true;
                 }
-                trail = p;
-                p = p.next;
-            }
-            if (removed) {
-                p.item = null;
-                trail.next = p.next;
-                if (last == p)
-                    last = trail;
-                if (count.getAndDecrement() == capacity)
-                    notFull.signalAll();
             }
+            return false;
         } finally {
             fullyUnlock();
         }
-        return removed;
     }
 
     /**
@@ -551,22 +596,22 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      * <p>If this queue fits in the specified array with room to spare
      * (i.e., the array has more elements than this queue), the element in
      * the array immediately following the end of the queue is set to
-     * <tt>null</tt>.
+     * {@code null}.
      *
      * <p>Like the {@link #toArray()} method, this method acts as bridge between
      * array-based and collection-based APIs.  Further, this method allows
      * precise control over the runtime type of the output array, and may,
      * under certain circumstances, be used to save allocation costs.
      *
-     * <p>Suppose <tt>x</tt> is a queue known to contain only strings.
+     * <p>Suppose {@code x} is a queue known to contain only strings.
      * The following code can be used to dump the queue into a newly
-     * allocated array of <tt>String</tt>:
+     * allocated array of {@code String}:
      *
      * <pre>
      *     String[] y = x.toArray(new String[0]);</pre>
      *
-     * Note that <tt>toArray(new Object[0])</tt> is identical in function to
-     * <tt>toArray()</tt>.
+     * Note that {@code toArray(new Object[0])} is identical in function to
+     * {@code toArray()}.
      *
      * @param a the array into which the elements of the queue are to
      *          be stored, if it is big enough; otherwise, a new array of the
@@ -577,6 +622,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      *         this queue
      * @throws NullPointerException if the specified array is null
      */
+    @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] a) {
         fullyLock();
         try {
@@ -586,7 +632,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
                     (a.getClass().getComponentType(), size);
 
             int k = 0;
-            for (Node p = head.next; p != null; p = p.next)
+            for (Node<E> p = head.next; p != null; p = p.next)
                 a[k++] = (T)p.item;
             if (a.length > k)
                 a[k] = null;
@@ -612,11 +658,14 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
     public void clear() {
         fullyLock();
         try {
-            head.next = null;
-            assert head.item == null;
-            last = head;
+            for (Node<E> p, h = head; (p = h.next) != null; h = p) {
+                h.next = h;
+                p.item = null;
+            }
+            head = last;
+            // assert head.item == null && head.next == null;
             if (count.getAndSet(0) == capacity)
-                notFull.signalAll();
+                notFull.signal();
         } finally {
             fullyUnlock();
         }
@@ -629,30 +678,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      * @throws IllegalArgumentException      {@inheritDoc}
      */
     public int drainTo(Collection<? super E> c) {
-        if (c == null)
-            throw new NullPointerException();
-        if (c == this)
-            throw new IllegalArgumentException();
-        Node<E> first;
-        fullyLock();
-        try {
-            first = head.next;
-            head.next = null;
-            assert head.item == null;
-            last = head;
-            if (count.getAndSet(0) == capacity)
-                notFull.signalAll();
-        } finally {
-            fullyUnlock();
-        }
-        // Transfer the elements outside of locks
-        int n = 0;
-        for (Node<E> p = first; p != null; p = p.next) {
-            c.add(p.item);
-            p.item = null;
-            ++n;
-        }
-        return n;
+        return drainTo(c, Integer.MAX_VALUE);
     }
 
     /**
@@ -666,34 +692,44 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
             throw new NullPointerException();
         if (c == this)
             throw new IllegalArgumentException();
-        fullyLock();
+        boolean signalNotFull = false;
+        final ReentrantLock takeLock = this.takeLock;
+        takeLock.lock();
         try {
-            int n = 0;
-            Node<E> p = head.next;
-            while (p != null && n < maxElements) {
-                c.add(p.item);
-                p.item = null;
-                p = p.next;
-                ++n;
+            int n = Math.min(maxElements, count.get());
+            // count.get provides visibility to first n Nodes
+            Node<E> h = head;
+            int i = 0;
+            try {
+                while (i < n) {
+                    Node<E> p = h.next;
+                    c.add(p.item);
+                    p.item = null;
+                    h.next = h;
+                    h = p;
+                    ++i;
+                }
+                return n;
+            } finally {
+                // Restore invariants even if c.add() threw
+                if (i > 0) {
+                    // assert h.item == null;
+                    head = h;
+                    signalNotFull = (count.getAndAdd(-i) == capacity);
+                }
             }
-            if (n != 0) {
-                head.next = p;
-                assert head.item == null;
-                if (p == null)
-                    last = head;
-                if (count.getAndAdd(-n) == capacity)
-                    notFull.signalAll();
-            }
-            return n;
         } finally {
-            fullyUnlock();
+            takeLock.unlock();
+            if (signalNotFull)
+                signalNotFull();
         }
     }
 
     /**
      * Returns an iterator over the elements in this queue in proper sequence.
-     * The returned <tt>Iterator</tt> is a "weakly consistent" iterator that
-     * will never throw {@link ConcurrentModificationException},
+     * The returned {@code Iterator} is a "weakly consistent" iterator that
+     * will never throw {@link java.util.ConcurrentModificationException
+     * ConcurrentModificationException},
      * and guarantees to traverse elements as they existed upon
      * construction of the iterator, and may (but is not guaranteed to)
      * reflect any modifications subsequent to construction.
@@ -706,7 +742,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
 
     private class Itr implements Iterator<E> {
         /*
-         * Basic weak-consistent iterator.  At all times hold the next
+         * Basic weakly-consistent iterator.  At all times hold the next
          * item to hand out so that if hasNext() reports true, we will
          * still have it to return even if lost race with a take etc.
          */
@@ -715,17 +751,13 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
         private E currentElement;
 
         Itr() {
-            final ReentrantLock putLock = LinkedBlockingQueue.this.putLock;
-            final ReentrantLock takeLock = LinkedBlockingQueue.this.takeLock;
-            putLock.lock();
-            takeLock.lock();
+            fullyLock();
             try {
                 current = head.next;
                 if (current != null)
                     currentElement = current.item;
             } finally {
-                takeLock.unlock();
-                putLock.unlock();
+                fullyUnlock();
             }
         }
 
@@ -733,54 +765,56 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
             return current != null;
         }
 
+        /**
+         * Returns the next live successor of p, or null if no such.
+         *
+         * Unlike other traversal methods, iterators need to handle both:
+         * - dequeued nodes (p.next == p)
+         * - (possibly multiple) interior removed nodes (p.item == null)
+         */
+        private Node<E> nextNode(Node<E> p) {
+            for (;;) {
+                Node<E> s = p.next;
+                if (s == p)
+                    return head.next;
+                if (s == null || s.item != null)
+                    return s;
+                p = s;
+            }
+        }
+
         public E next() {
-            final ReentrantLock putLock = LinkedBlockingQueue.this.putLock;
-            final ReentrantLock takeLock = LinkedBlockingQueue.this.takeLock;
-            putLock.lock();
-            takeLock.lock();
+            fullyLock();
             try {
                 if (current == null)
                     throw new NoSuchElementException();
                 E x = currentElement;
                 lastRet = current;
-                current = current.next;
-                if (current != null)
-                    currentElement = current.item;
+                current = nextNode(current);
+                currentElement = (current == null) ? null : current.item;
                 return x;
             } finally {
-                takeLock.unlock();
-                putLock.unlock();
+                fullyUnlock();
             }
         }
 
         public void remove() {
             if (lastRet == null)
                 throw new IllegalStateException();
-            final ReentrantLock putLock = LinkedBlockingQueue.this.putLock;
-            final ReentrantLock takeLock = LinkedBlockingQueue.this.takeLock;
-            putLock.lock();
-            takeLock.lock();
+            fullyLock();
             try {
                 Node<E> node = lastRet;
                 lastRet = null;
-                Node<E> trail = head;
-                Node<E> p = head.next;
-                while (p != null && p != node) {
-                    trail = p;
-                    p = p.next;
-                }
-                if (p == node) {
-                    p.item = null;
-                    trail.next = p.next;
-                    if (last == p)
-                        last = trail;
-                    int c = count.getAndDecrement();
-                    if (c == capacity)
-                        notFull.signalAll();
+                for (Node<E> trail = head, p = trail.next;
+                     p != null;
+                     trail = p, p = p.next) {
+                    if (p == node) {
+                        unlink(p, trail);
+                        break;
+                    }
                 }
             } finally {
-                takeLock.unlock();
-                putLock.unlock();
+                fullyUnlock();
             }
         }
     }
@@ -789,7 +823,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
      * Save the state to a stream (that is, serialize it).
      *
      * @serialData The capacity is emitted (int), followed by all of
-     * its elements (each an <tt>Object</tt>) in the proper order,
+     * its elements (each an {@code Object}) in the proper order,
      * followed by a null
      * @param s the stream
      */
@@ -815,6 +849,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
     /**
      * Reconstitute this queue instance from a stream (that is,
      * deserialize it).
+     *
      * @param s the stream
      */
     private void readObject(java.io.ObjectInputStream s)
@@ -827,6 +862,7 @@ public class LinkedBlockingQueue<E> extends AbstractQueue<E>
 
         // Read in all elements and place in queue
         for (;;) {
+            @SuppressWarnings("unchecked")
             E item = (E)s.readObject();
             if (item == null)
                 break;
diff --git a/jdk/src/share/classes/java/util/logging/LogManager.java b/jdk/src/share/classes/java/util/logging/LogManager.java
index fc8f080eb71..e6412565a87 100644
--- a/jdk/src/share/classes/java/util/logging/LogManager.java
+++ b/jdk/src/share/classes/java/util/logging/LogManager.java
@@ -338,7 +338,7 @@ public class LogManager {
     // already been created with the given name it is returned.
     // Otherwise a new logger instance is created and registered
     // in the LogManager global namespace.
-    synchronized Logger demandLogger(String name) {
+    Logger demandLogger(String name) {
         Logger result = getLogger(name);
         if (result == null) {
             result = new Logger(name, null);
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java b/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java
index b5f23e199fa..ec27c756bde 100644
--- a/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java
+++ b/jdk/src/share/classes/javax/accessibility/AccessibleResourceBundle.java
@@ -44,15 +44,11 @@ public class AccessibleResourceBundle extends ListResourceBundle {
      * localized display strings.
      */
     public Object[][] getContents() {
-        return contents;
-    }
+        // The table holding the mapping between the programmatic keys
+        // and the display strings for the en_US locale.
+        return new Object[][] {
 
-    /**
-     * The table holding the mapping between the programmatic keys
-     * and the display strings for the en_US locale.
-     */
-    static final Object[][] contents = {
-    // LOCALIZE THIS
+        // LOCALIZE THIS
         // Role names
 //        { "application","application" },
 //        { "border","border" },
@@ -151,5 +147,6 @@ public class AccessibleResourceBundle extends ListResourceBundle {
         { "vertical","vertical" },
         { "horizontal","horizontal" }
     // END OF MATERIAL TO LOCALIZE
-    };
+        };
+    }
 }
diff --git a/jdk/src/share/classes/javax/crypto/JarVerifier.java b/jdk/src/share/classes/javax/crypto/JarVerifier.java
index 376761012dc..03f80839f90 100644
--- a/jdk/src/share/classes/javax/crypto/JarVerifier.java
+++ b/jdk/src/share/classes/javax/crypto/JarVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2007-2009 Sun Microsystems, Inc.  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
@@ -28,9 +28,7 @@ package javax.crypto;
 import java.io.*;
 import java.net.*;
 import java.security.*;
-import java.util.*;
 import java.util.jar.*;
-import javax.crypto.CryptoPolicyParser.ParsingException;
 
 /**
  * This class verifies JAR files (and any supporting JAR files), and
@@ -134,17 +132,6 @@ final class JarVerifier {
         }
     }
 
-    /**
-     * Verify that the provided JarEntry was indeed signed by the
-     * framework signing certificate.
-     *
-     * @param je the URL of the jar entry to be checked.
-     * @throws Exception if the jar entry was not signed by
-     *          the proper certificate
-     */
-    static void verifyFrameworkSigned(URL je) throws Exception {
-    }
-
     /**
      * Verify that the provided certs include the
      * framework signing certificate.
diff --git a/jdk/src/share/classes/javax/crypto/JceSecurity.java b/jdk/src/share/classes/javax/crypto/JceSecurity.java
index 11b124ac00a..b204f384337 100644
--- a/jdk/src/share/classes/javax/crypto/JceSecurity.java
+++ b/jdk/src/share/classes/javax/crypto/JceSecurity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -25,7 +25,6 @@
 
 package javax.crypto;
 
-import java.lang.ref.*;
 import java.util.*;
 import java.util.jar.*;
 import java.io.*;
@@ -256,11 +255,6 @@ final class JceSecurity {
                                 ("Cannot locate policy or framework files!");
         }
 
-        // Enforce the signer restraint, i.e. signer of JCE framework
-        // jar should also be the signer of the two jurisdiction policy
-        // jar files.
-        JarVerifier.verifyFrameworkSigned(jceCipherURL);
-
         // Read jurisdiction policies.
         CryptoPermissions defaultExport = new CryptoPermissions();
         CryptoPermissions exemptExport = new CryptoPermissions();
diff --git a/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java b/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java
index ec3acf2e9db..e11057f2a48 100644
--- a/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java
+++ b/jdk/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java
@@ -78,7 +78,7 @@ public class BMPImageWriteParam extends ImageWriteParam {
         super(locale);
 
         // Set compression types ("BI_RGB" denotes uncompressed).
-        compressionTypes = BMPConstants.compressionTypeNames;
+        compressionTypes = BMPConstants.compressionTypeNames.clone();
 
         // Set compression flag.
         canWriteCompressed = true;
diff --git a/jdk/src/share/classes/javax/imageio/spi/ImageReaderSpi.java b/jdk/src/share/classes/javax/imageio/spi/ImageReaderSpi.java
index 4f0b7fa6ac5..0de66188ba8 100644
--- a/jdk/src/share/classes/javax/imageio/spi/ImageReaderSpi.java
+++ b/jdk/src/share/classes/javax/imageio/spi/ImageReaderSpi.java
@@ -77,7 +77,10 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi {
      * A single-element array, initially containing
      * <code>ImageInputStream.class</code>, to be returned from
      * <code>getInputTypes</code>.
+     * @deprecated Instead of using this field, directly create
+     * the equivalent array <code>{ ImageInputStream.class }<code>.
      */
+    @Deprecated
     public static final Class[] STANDARD_INPUT_TYPE =
         { ImageInputStream.class };
 
@@ -227,7 +230,11 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi {
             throw new IllegalArgumentException
                 ("inputTypes.length == 0!");
         }
-        this.inputTypes = (Class[])inputTypes.clone();
+
+        this.inputTypes = (inputTypes == STANDARD_INPUT_TYPE) ?
+            new Class<?>[] { ImageInputStream.class } :
+            inputTypes.clone();
+
         // If length == 0, leave it null
         if (writerSpiNames != null && writerSpiNames.length > 0) {
             this.writerSpiNames = (String[])writerSpiNames.clone();
diff --git a/jdk/src/share/classes/javax/imageio/spi/ImageWriterSpi.java b/jdk/src/share/classes/javax/imageio/spi/ImageWriterSpi.java
index 324c5cd3d05..f3ff947a4f4 100644
--- a/jdk/src/share/classes/javax/imageio/spi/ImageWriterSpi.java
+++ b/jdk/src/share/classes/javax/imageio/spi/ImageWriterSpi.java
@@ -77,9 +77,12 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi {
 
     /**
      * A single-element array, initially containing
-     * <code>ImageInputStream.class</code>, to be returned from
-     * <code>getInputTypes</code>.
+     * <code>ImageOutputStream.class</code>, to be returned from
+     * <code>getOutputTypes</code>.
+     * @deprecated Instead of using this field, directly create
+     * the equivalent array <code>{ ImageOutputStream.class }<code>.
      */
+    @Deprecated
     public static final Class[] STANDARD_OUTPUT_TYPE =
         { ImageOutputStream.class };
 
@@ -228,7 +231,11 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi {
             throw new IllegalArgumentException
                 ("outputTypes.length == 0!");
         }
-        this.outputTypes = (Class[])outputTypes.clone();
+
+        this.outputTypes = (outputTypes == STANDARD_OUTPUT_TYPE) ?
+            new Class<?>[] { ImageOutputStream.class } :
+            outputTypes.clone();
+
         // If length == 0, leave it null
         if (readerSpiNames != null && readerSpiNames.length > 0) {
             this.readerSpiNames = (String[])readerSpiNames.clone();
diff --git a/jdk/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java b/jdk/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
index ad03d65c04d..1bff7746344 100644
--- a/jdk/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
+++ b/jdk/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java
@@ -62,6 +62,10 @@ public class FileCacheImageInputStream extends ImageInputStreamImpl {
     /** The DisposerRecord that closes the underlying cache. */
     private final DisposerRecord disposerRecord;
 
+    /** The CloseAction that closes the stream in
+     *  the StreamCloser's shutdown hook                     */
+    private final StreamCloser.CloseAction closeAction;
+
     /**
      * Constructs a <code>FileCacheImageInputStream</code> that will read
      * from a given <code>InputStream</code>.
@@ -96,7 +100,9 @@ public class FileCacheImageInputStream extends ImageInputStreamImpl {
         this.cacheFile =
             File.createTempFile("imageio", ".tmp", cacheDir);
         this.cache = new RandomAccessFile(cacheFile, "rw");
-        StreamCloser.addToQueue(this);
+
+        this.closeAction = StreamCloser.createCloseAction(this);
+        StreamCloser.addToQueue(closeAction);
 
         disposerRecord = new StreamDisposerRecord(cacheFile, cache);
         if (getClass() == FileCacheImageInputStream.class) {
@@ -242,7 +248,7 @@ public class FileCacheImageInputStream extends ImageInputStreamImpl {
         stream = null;
         cache = null;
         cacheFile = null;
-        StreamCloser.removeFromQueue(this);
+        StreamCloser.removeFromQueue(closeAction);
     }
 
     /**
diff --git a/jdk/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java b/jdk/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
index f6387125499..f079e8e81fa 100644
--- a/jdk/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
+++ b/jdk/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java
@@ -48,6 +48,10 @@ public class FileCacheImageOutputStream extends ImageOutputStreamImpl {
     // Pos after last (rightmost) byte written
     private long maxStreamPos = 0L;
 
+    /** The CloseAction that closes the stream in
+     *  the StreamCloser's shutdown hook                     */
+    private final StreamCloser.CloseAction closeAction;
+
     /**
      * Constructs a <code>FileCacheImageOutputStream</code> that will write
      * to a given <code>outputStream</code>.
@@ -82,7 +86,9 @@ public class FileCacheImageOutputStream extends ImageOutputStreamImpl {
         this.cacheFile =
             File.createTempFile("imageio", ".tmp", cacheDir);
         this.cache = new RandomAccessFile(cacheFile, "rw");
-        StreamCloser.addToQueue(this);
+
+        this.closeAction = StreamCloser.createCloseAction(this);
+        StreamCloser.addToQueue(closeAction);
     }
 
     public int read() throws IOException {
@@ -227,7 +233,7 @@ public class FileCacheImageOutputStream extends ImageOutputStreamImpl {
         cacheFile = null;
         stream.flush();
         stream = null;
-        StreamCloser.removeFromQueue(this);
+        StreamCloser.removeFromQueue(closeAction);
     }
 
     public void flushBefore(long pos) throws IOException {
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
index 3ad03ef58ae..f2f86e1bf72 100644
--- a/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
@@ -690,7 +690,7 @@ public class OpenMBeanAttributeInfoSupport
     private static <T> T convertFromString(String s, OpenType<T> openType) {
         Class<T> c;
         try {
-            c = cast(Class.forName(openType.getClassName()));
+            c = cast(Class.forName(openType.safeGetClassName()));
         } catch (ClassNotFoundException e) {
             throw new NoClassDefFoundError(e.toString());  // can't happen
         }
@@ -711,7 +711,7 @@ public class OpenMBeanAttributeInfoSupport
             } catch (Exception e) {
                 final String msg =
                     "Could not convert \"" + s + "\" using method: " + valueOf;
-                throw new IllegalArgumentException(msg);
+                throw new IllegalArgumentException(msg, e);
             }
         }
 
@@ -728,7 +728,7 @@ public class OpenMBeanAttributeInfoSupport
             } catch (Exception e) {
                 final String msg =
                     "Could not convert \"" + s + "\" using constructor: " + con;
-                throw new IllegalArgumentException(msg);
+                throw new IllegalArgumentException(msg, e);
             }
         }
 
@@ -757,7 +757,7 @@ public class OpenMBeanAttributeInfoSupport
             stringArrayClass =
                 Class.forName(squareBrackets + "Ljava.lang.String;");
             targetArrayClass =
-                Class.forName(squareBrackets + "L" + baseType.getClassName() +
+                Class.forName(squareBrackets + "L" + baseType.safeGetClassName() +
                               ";");
         } catch (ClassNotFoundException e) {
             throw new NoClassDefFoundError(e.toString());  // can't happen
diff --git a/jdk/src/share/classes/javax/management/openmbean/OpenType.java b/jdk/src/share/classes/javax/management/openmbean/OpenType.java
index 3f74c3cda60..b6d40d008c7 100644
--- a/jdk/src/share/classes/javax/management/openmbean/OpenType.java
+++ b/jdk/src/share/classes/javax/management/openmbean/OpenType.java
@@ -304,7 +304,12 @@ public abstract class OpenType<T> implements Serializable {
      * @return the class name.
      */
     public String getClassName() {
+        return className;
+    }
 
+    // A version of getClassName() that can only be called from within this
+    // package and that cannot be overridden.
+    String safeGetClassName() {
         return className;
     }
 
diff --git a/jdk/src/share/classes/javax/swing/JEditorPane.java b/jdk/src/share/classes/javax/swing/JEditorPane.java
index 21528752fd5..4dfbf92488e 100644
--- a/jdk/src/share/classes/javax/swing/JEditorPane.java
+++ b/jdk/src/share/classes/javax/swing/JEditorPane.java
@@ -24,6 +24,8 @@
  */
 package javax.swing;
 
+import sun.swing.SwingUtilities2;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.lang.reflect.*;
@@ -1123,6 +1125,7 @@ public class JEditorPane extends JTextComponent {
      * @param content  the content to replace the selection with.  This
      *   value can be <code>null</code>
      */
+    @Override
     public void replaceSelection(String content) {
         if (! isEditable()) {
             UIManager.getLookAndFeel().provideErrorFeedback(JEditorPane.this);
@@ -1133,6 +1136,7 @@ public class JEditorPane extends JTextComponent {
             try {
                 Document doc = getDocument();
                 Caret caret = getCaret();
+                boolean composedTextSaved = saveComposedText(caret.getDot());
                 int p0 = Math.min(caret.getDot(), caret.getMark());
                 int p1 = Math.max(caret.getDot(), caret.getMark());
                 if (doc instanceof AbstractDocument) {
@@ -1148,6 +1152,9 @@ public class JEditorPane extends JTextComponent {
                                          getInputAttributes());
                     }
                 }
+                if (composedTextSaved) {
+                    restoreComposedText();
+                }
             } catch (BadLocationException e) {
                 UIManager.getLookAndFeel().provideErrorFeedback(JEditorPane.this);
             }
@@ -1323,8 +1330,8 @@ public class JEditorPane extends JTextComponent {
      */
     public Dimension getPreferredSize() {
         Dimension d = super.getPreferredSize();
-        if (getParent() instanceof JViewport) {
-            JViewport port = (JViewport)getParent();
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
             TextUI ui = getUI();
             int prefWidth = d.width;
             int prefHeight = d.height;
@@ -1445,8 +1452,8 @@ public class JEditorPane extends JTextComponent {
      * match its own, false otherwise
      */
     public boolean getScrollableTracksViewportWidth() {
-        if (getParent() instanceof JViewport) {
-            JViewport port = (JViewport)getParent();
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
             TextUI ui = getUI();
             int w = port.getWidth();
             Dimension min = ui.getMinimumSize(this);
@@ -1467,8 +1474,8 @@ public class JEditorPane extends JTextComponent {
      *          false otherwise
      */
     public boolean getScrollableTracksViewportHeight() {
-        if (getParent() instanceof JViewport) {
-            JViewport port = (JViewport)getParent();
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
             TextUI ui = getUI();
             int h = port.getHeight();
             Dimension min = ui.getMinimumSize(this);
diff --git a/jdk/src/share/classes/javax/swing/JFileChooser.java b/jdk/src/share/classes/javax/swing/JFileChooser.java
index 82c85fe9faa..8ba9c7c42af 100644
--- a/jdk/src/share/classes/javax/swing/JFileChooser.java
+++ b/jdk/src/share/classes/javax/swing/JFileChooser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -739,6 +739,11 @@ public class JFileChooser extends JComponent implements Accessible {
 
         dialog.show();
         firePropertyChange("JFileChooserDialogIsClosingProperty", dialog, null);
+
+        // Remove all components from dialog. The MetalFileChooserUI.installUI() method (and other LAFs)
+        // registers AWT listener for dialogs and produces memory leaks. It happens when
+        // installUI invoked after the showDialog method.
+        dialog.getContentPane().removeAll();
         dialog.dispose();
         dialog = null;
         return returnValue;
diff --git a/jdk/src/share/classes/javax/swing/JInternalFrame.java b/jdk/src/share/classes/javax/swing/JInternalFrame.java
index 837ffe49e4f..3079a26ebdc 100644
--- a/jdk/src/share/classes/javax/swing/JInternalFrame.java
+++ b/jdk/src/share/classes/javax/swing/JInternalFrame.java
@@ -26,13 +26,10 @@
 package javax.swing;
 
 import java.awt.*;
-import java.awt.event.*;
 
 import java.beans.PropertyVetoException;
 import java.beans.PropertyChangeEvent;
-import java.util.EventListener;
 
-import javax.swing.border.Border;
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
 import javax.swing.plaf.*;
@@ -40,7 +37,6 @@ import javax.swing.plaf.*;
 import javax.accessibility.*;
 
 import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
 import java.io.IOException;
 import java.lang.StringBuilder;
 import java.beans.PropertyChangeListener;
@@ -1459,19 +1455,22 @@ public class JInternalFrame extends JComponent implements
             SwingUtilities2.compositeRequestFocus(getDesktopIcon());
         }
         else {
-            // FocusPropertyChangeListener will eventually update
-            // lastFocusOwner. As focus requests are asynchronous
-            // lastFocusOwner may be accessed before it has been correctly
-            // updated. To avoid any problems, lastFocusOwner is immediately
-            // set, assuming the request will succeed.
-            lastFocusOwner = getMostRecentFocusOwner();
-            if (lastFocusOwner == null) {
-                // Make sure focus is restored somewhere, so that
-                // we don't leave a focused component in another frame while
-                // this frame is selected.
-                lastFocusOwner = getContentPane();
+            Component component = KeyboardFocusManager.getCurrentKeyboardFocusManager().getPermanentFocusOwner();
+            if ((component == null) || !SwingUtilities.isDescendingFrom(component, this)) {
+                // FocusPropertyChangeListener will eventually update
+                // lastFocusOwner. As focus requests are asynchronous
+                // lastFocusOwner may be accessed before it has been correctly
+                // updated. To avoid any problems, lastFocusOwner is immediately
+                // set, assuming the request will succeed.
+                setLastFocusOwner(getMostRecentFocusOwner());
+                if (lastFocusOwner == null) {
+                    // Make sure focus is restored somewhere, so that
+                    // we don't leave a focused component in another frame while
+                    // this frame is selected.
+                    setLastFocusOwner(getContentPane());
+                }
+                lastFocusOwner.requestFocus();
             }
-            lastFocusOwner.requestFocus();
         }
     }
 
diff --git a/jdk/src/share/classes/javax/swing/JLayer.java b/jdk/src/share/classes/javax/swing/JLayer.java
new file mode 100644
index 00000000000..1ce679bc02d
--- /dev/null
+++ b/jdk/src/share/classes/javax/swing/JLayer.java
@@ -0,0 +1,807 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing;
+
+import javax.swing.plaf.LayerUI;
+import java.awt.*;
+import java.awt.event.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * {@code JLayer} is a universal decorator for Swing components
+ * which enables you to implement various advanced painting effects as well as
+ * receive notifications of all {@code AWTEvent}s generated within its borders.
+ * <p/>
+ * {@code JLayer} delegates the handling of painting and input events to a
+ * {@link javax.swing.plaf.LayerUI} object, which performs the actual decoration.
+ * <p/>
+ * The custom painting implemented in the {@code LayerUI} and events notification
+ * work for the JLayer itself and all its subcomponents.
+ * This combination enables you to enrich existing components
+ * by adding new advanced functionality such as temporary locking of a hierarchy,
+ * data tips for compound components, enhanced mouse scrolling etc and so on.
+ * <p/>
+ * {@code JLayer} is a good solution if you only need to do custom painting
+ * over compound component or catch input events from its subcomponents.
+ * <pre>
+ *         // create a component to be decorated with the layer
+ *        JPanel panel = new JPanel();
+ *        panel.add(new JButton("JButton"));
+ *        // This custom layerUI will fill the layer with translucent green
+ *        // and print out all mouseMotion events generated within its borders
+ *        LayerUI&lt;JPanel&gt; layerUI = new LayerUI&lt;JPanel&gt;() {
+ *            public void paint(Graphics g, JCompo  nent c) {
+ *                // paint the layer as is
+ *                super.paint(g, c);
+ *                // fill it with the translucent green
+ *                g.setColor(new Color(0, 128, 0, 128));
+ *                g.fillRect(0, 0, c.getWidth(), c.getHeight());
+ *            }
+ *            // overridden method which catches MouseMotion events
+ *            public void eventDispatched(AWTEvent e, JLayer&lt;JPanel&gt; l) {
+ *                System.out.println("AWTEvent detected: " + e);
+ *            }
+ *        };
+ *        // create the layer for the panel using our custom layerUI
+ *        JLayer&lt;JPanel&gt; layer = new JLayer&lt;JPanel&gt;(panel, layerUI);
+ *        // work with the layer as with any other Swing component
+ *        frame.add(layer);
+ * </pre>
+ *
+ * <b>Note:</b> {@code JLayer} doesn't support the following methods:
+ * <ul>
+ * <li>{@link Container#add(java.awt.Component)}</li>
+ * <li>{@link Container#add(String, java.awt.Component)}</li>
+ * <li>{@link Container#add(java.awt.Component, int)}</li>
+ * <li>{@link Container#add(java.awt.Component, Object)}</li>
+ * <li>{@link Container#add(java.awt.Component, Object, int)}</li>
+ * </ul>
+ * using any of of them will cause {@code UnsupportedOperationException} to be thrown,
+ * to add a component to {@code JLayer}
+ * use {@link #setView(Component)} or {@link #setGlassPane(JPanel)}.
+ *
+ * @param <V> the type of {@code JLayer}'s view component
+ *
+ * @see #JLayer(Component)
+ * @see #setView(Component)
+ * @see #getView()
+ * @see javax.swing.plaf.LayerUI
+ * @see #JLayer(Component, LayerUI)
+ * @see #setUI(javax.swing.plaf.LayerUI)
+ * @see #getUI()
+ * @since 1.7
+ *
+ * @author Alexander Potochkin
+ */
+public final class JLayer<V extends Component>
+        extends JComponent
+        implements Scrollable, PropertyChangeListener {
+    private V view;
+    // this field is necessary because JComponent.ui is transient
+    // when layerUI is serializable
+    private LayerUI<? super V> layerUI;
+    private JPanel glassPane;
+    private boolean isPainting;
+    private static final DefaultLayerLayout sharedLayoutInstance =
+            new DefaultLayerLayout();
+    private long eventMask;
+
+    private static final LayerEventController eventController =
+            new LayerEventController();
+
+    private static final long ACCEPTED_EVENTS =
+            AWTEvent.COMPONENT_EVENT_MASK |
+                    AWTEvent.CONTAINER_EVENT_MASK |
+                    AWTEvent.FOCUS_EVENT_MASK |
+                    AWTEvent.KEY_EVENT_MASK |
+                    AWTEvent.MOUSE_WHEEL_EVENT_MASK |
+                    AWTEvent.MOUSE_MOTION_EVENT_MASK |
+                    AWTEvent.MOUSE_EVENT_MASK |
+                    AWTEvent.INPUT_METHOD_EVENT_MASK |
+                    AWTEvent.HIERARCHY_EVENT_MASK |
+                    AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK;
+
+    /**
+     * Creates a new {@code JLayer} object with a {@code null} view component
+     * and {@code null} {@link javax.swing.plaf.LayerUI}.
+     *
+     * @see #setView
+     * @see #setUI
+     */
+    public JLayer() {
+        this(null);
+    }
+
+    /**
+     * Creates a new {@code JLayer} object
+     * with {@code null} {@link javax.swing.plaf.LayerUI}.
+     *
+     * @param view the component to be decorated by this {@code JLayer}
+     *
+     * @see #setUI
+     */
+    public JLayer(V view) {
+        this(view, null);
+    }
+
+    /**
+     * Creates a new {@code JLayer} object with the specified view component
+     * and {@link javax.swing.plaf.LayerUI} object.
+     *
+     * @param view the component to be decorated
+     * @param ui the {@link javax.swing.plaf.LayerUI} delegate
+     * to be used by this {@code JLayer}
+     */
+    public JLayer(V view, LayerUI<V> ui) {
+        setLayout(sharedLayoutInstance);
+        setGlassPane(createGlassPane());
+        setView(view);
+        setUI(ui);
+    }
+
+    /**
+     * Returns the {@code JLayer}'s view component or {@code null}.
+     * <br/>This is a bound property.
+     *
+     * @return the {@code JLayer}'s view component
+     *         or {@code null} if none exists
+     *
+     * @see #setView(Component)
+     */
+    public V getView() {
+        return view;
+    }
+
+    /**
+     * Sets the {@code JLayer}'s view component, which can be {@code null}.
+     * <br/>This is a bound property.
+     *
+     * @param view the view component for this {@code JLayer}
+     *
+     * @see #getView()
+     */
+    public void setView(V view) {
+        Component oldView = getView();
+        if (oldView != null) {
+            super.remove(oldView);
+        }
+        if (view != null) {
+            super.addImpl(view, null, getComponentCount());
+        }
+        this.view = view;
+        firePropertyChange("view", oldView, view);
+        revalidate();
+        repaint();
+    }
+
+    /**
+     * Sets the {@link javax.swing.plaf.LayerUI} which will perform painting
+     * and receive input events for this {@code JLayer}.
+     *
+     * @param ui the {@link javax.swing.plaf.LayerUI} for this {@code JLayer}
+     */
+    public void setUI(LayerUI<? super V> ui) {
+        this.layerUI = ui;
+        super.setUI(ui);
+    }
+
+    /**
+     * Returns the {@link javax.swing.plaf.LayerUI} for this {@code JLayer}.
+     *
+     * @return the {@code LayerUI} for this {@code JLayer}
+     */
+    public LayerUI<? super V> getUI() {
+        return layerUI;
+    }
+
+    /**
+     * Returns the {@code JLayer}'s glassPane component or {@code null}.
+     * <br/>This is a bound property.
+     *
+     * @return the {@code JLayer}'s glassPane component
+     *         or {@code null} if none exists
+     *
+     * @see #setGlassPane(JPanel)
+     */
+    public JPanel getGlassPane() {
+        return glassPane;
+    }
+
+    /**
+     * Sets the {@code JLayer}'s glassPane component, which can be {@code null}.
+     * <br/>This is a bound property.
+     *
+     * @param glassPane the glassPane component of this {@code JLayer}
+     *
+     * @see #getGlassPane()
+     */
+    public void setGlassPane(JPanel glassPane) {
+        Component oldGlassPane = getGlassPane();
+        if (oldGlassPane != null) {
+            super.remove(oldGlassPane);
+        }
+        if (glassPane != null) {
+            super.addImpl(glassPane, null, 0);
+        }
+        this.glassPane = glassPane;
+        firePropertyChange("glassPane", oldGlassPane, glassPane);
+        revalidate();
+        repaint();
+    }
+
+    /**
+     * Called by the constructor methods to create a default {@code glassPane}.
+     * By default this method creates a new JPanel with visibility set to true
+     * and opacity set to false.
+     *
+     * @return the default {@code glassPane}
+     */
+    public JPanel createGlassPane() {
+        return new DefaultLayerGlassPane();
+    }
+
+    /**
+     * This method is not supported by {@code JLayer}
+     * and always throws {@code UnsupportedOperationException}
+     *
+     * @throws UnsupportedOperationException this method is not supported
+     *
+     * @see #setView(Component)
+     * @see #setGlassPane(JPanel)
+     */
+    protected void addImpl(Component comp, Object constraints, int index) {
+        throw new UnsupportedOperationException(
+                "Adding components to JLayer is not supported, " +
+                        "use setView() or setGlassPane() instead");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void remove(Component comp) {
+        if (comp == getView()) {
+            setView(null);
+        } else if (comp == getGlassPane()) {
+            setGlassPane(null);
+        } else {
+            super.remove(comp);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void removeAll() {
+        setView(null);
+        setGlassPane(null);
+    }
+
+    /**
+     * Delegates all painting to the {@link javax.swing.plaf.LayerUI} object.
+     *
+     * @param g the {@code Graphics} to render to
+     */
+    public void paint(Graphics g) {
+        if (!isPainting) {
+            isPainting = true;
+            super.paintComponent(g);
+            isPainting = false;
+        } else {
+            super.paint(g);
+        }
+    }
+
+    /**
+     * This method is empty, because all painting is done by
+     * {@link #paint(Graphics)} and
+     * {@link javax.swing.plaf.LayerUI#update(Graphics, JComponent)} methods
+     */
+    protected void paintComponent(Graphics g) {
+    }
+
+    /**
+     * To enable the correct painting of the {@code glassPane} and view component,
+     * the {@code JLayer} overrides the default implementation of
+     * this method to return {@code false} when the {@code glassPane} is visible.
+     *
+     * @return false if {@code JLayer}'s {@code glassPane} is visible
+     */
+    public boolean isOptimizedDrawingEnabled() {
+        return glassPane == null || !glassPane.isVisible();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void propertyChange(PropertyChangeEvent evt) {
+        if (getUI() != null) {
+            getUI().applyPropertyChange(evt, this);
+        }
+    }
+
+    /**
+     * Sets the bitmask of event types to receive by this {@code JLayer}.
+     * Here is the list of the supported event types:
+     * <ul>
+     * <li>AWTEvent.COMPONENT_EVENT_MASK</li>
+     * <li>AWTEvent.CONTAINER_EVENT_MASK</li>
+     * <li>AWTEvent.FOCUS_EVENT_MASK</li>
+     * <li>AWTEvent.KEY_EVENT_MASK</li>
+     * <li>AWTEvent.MOUSE_WHEEL_EVENT_MASK</li>
+     * <li>AWTEvent.MOUSE_MOTION_EVENT_MASK</li>
+     * <li>AWTEvent.MOUSE_EVENT_MASK</li>
+     * <li>AWTEvent.INPUT_METHOD_EVENT_MASK</li>
+     * <li>AWTEvent.HIERARCHY_EVENT_MASK</li>
+     * <li>AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK</li>
+     * </ul>
+     * <p/>
+     * If {@code LayerUI} is installed,
+     * {@link javax.swing.plaf.LayerUI#eventDispatched(AWTEvent, JLayer)} method
+     * will only receive events that match the event mask.
+     * <p/>
+     * The following example shows how to correclty use this method
+     * in the {@code LayerUI} implementations:
+     * <pre>
+     *    public void installUI(JComponent c) {
+     *       super.installUI(c);
+     *       JLayer l = (JLayer) c;
+     *       // this LayerUI will receive only key and focus events
+     *       l.setLayerEventMask(AWTEvent.KEY_EVENT_MASK | AWTEvent.FOCUS_EVENT_MASK);
+     *    }
+     *
+     *    public void uninstallUI(JComponent c) {
+     *       super.uninstallUI(c);
+     *       JLayer l = (JLayer) c;
+     *       // JLayer must be returned to its initial state
+     *       l.setLayerEventMask(0);
+     *    }
+     * </pre>
+     *
+     * By default {@code JLayer} receives no events.
+     *
+     * @param layerEventMask the bitmask of event types to receive
+     *
+     * @throws IllegalArgumentException if the {@code layerEventMask} parameter
+     * contains unsupported event types
+     * @see #getLayerEventMask()
+     */
+    public void setLayerEventMask(long layerEventMask) {
+        if (layerEventMask != (layerEventMask & ACCEPTED_EVENTS)) {
+            throw new IllegalArgumentException(
+                    "The event bitmask contains unsupported event types");
+        }
+        long oldEventMask = getLayerEventMask();
+        this.eventMask = layerEventMask;
+        firePropertyChange("layerEventMask", oldEventMask, layerEventMask);
+        if (layerEventMask != oldEventMask) {
+            disableEvents(oldEventMask);
+            enableEvents(eventMask);
+            if (isDisplayable()) {
+                eventController.updateAWTEventListener(
+                        oldEventMask, layerEventMask);
+            }
+        }
+    }
+
+    /**
+     * Returns the bitmap of event mask to receive by this {@code JLayer}
+     * and its {@code LayerUI}.
+     * <p/>
+     * It means that {@link javax.swing.plaf.LayerUI#eventDispatched(AWTEvent, JLayer)} method
+     * will only receive events that match the event mask.
+     * <p/>
+     * By default {@code JLayer} receives no events.
+     *
+     * @return the bitmask of event types to receive for this {@code JLayer}
+     */
+    public long getLayerEventMask() {
+        return eventMask;
+    }
+
+    /**
+     * Delegates its functionality to the {@link javax.swing.plaf.LayerUI#updateUI(JLayer)} method,
+     * if {@code LayerUI} is set.
+     */
+    public void updateUI() {
+        if (getUI() != null) {
+            getUI().updateUI(this);
+        }
+    }
+
+    /**
+     * Returns the preferred size of the viewport for a view component.
+     * <p/>
+     * If the ui delegate of this layer is not {@code null}, this method delegates its
+     * implementation to the {@code LayerUI.getPreferredScrollableViewportSize(JLayer)}
+     *
+     * @return the preferred size of the viewport for a view component
+     *
+     * @see Scrollable
+     * @see LayerUI#getPreferredScrollableViewportSize(JLayer)
+     */
+    public Dimension getPreferredScrollableViewportSize() {
+        if (getUI() != null) {
+            return getUI().getPreferredScrollableViewportSize(this);
+        }
+        return getPreferredSize();
+    }
+
+    /**
+     * Returns a scroll increment, which is required for components
+     * that display logical rows or columns in order to completely expose
+     * one block of rows or columns, depending on the value of orientation.
+     * <p/>
+     * If the ui delegate of this layer is not {@code null}, this method delegates its
+     * implementation to the {@code LayerUI.getScrollableBlockIncrement(JLayer,Rectangle,int,int)}
+     *
+     * @return the "block" increment for scrolling in the specified direction
+     *
+     * @see Scrollable
+     * @see LayerUI#getScrollableBlockIncrement(JLayer, Rectangle, int, int)
+     */
+    public int getScrollableBlockIncrement(Rectangle visibleRect,
+                                           int orientation, int direction) {
+        if (getUI() != null) {
+            return getUI().getScrollableBlockIncrement(this, visibleRect,
+                    orientation, direction);
+        }
+        return (orientation == SwingConstants.VERTICAL) ? visibleRect.height :
+                visibleRect.width;
+    }
+
+    /**
+     * Returns {@code false} to indicate that the height of the viewport does not
+     * determine the height of the layer, unless the preferred height
+     * of the layer is smaller than the height of the viewport.
+     * <p/>
+     * If the ui delegate of this layer is not null, this method delegates its
+     * implementation to the {@code LayerUI.getScrollableTracksViewportHeight(JLayer)}
+     *
+     * @return whether the layer should track the height of the viewport
+     *
+     * @see Scrollable
+     * @see LayerUI#getScrollableTracksViewportHeight(JLayer)
+     */
+    public boolean getScrollableTracksViewportHeight() {
+        if (getUI() != null) {
+            return getUI().getScrollableTracksViewportHeight(this);
+        }
+        return false;
+    }
+
+    /**
+     * Returns {@code false} to indicate that the width of the viewport does not
+     * determine the width of the layer, unless the preferred width
+     * of the layer is smaller than the width of the viewport.
+     * <p/>
+     * If the ui delegate of this layer is not null, this method delegates its
+     * implementation to the {@code LayerUI.getScrollableTracksViewportWidth(JLayer)}
+     *
+     * @return whether the layer should track the width of the viewport
+     *
+     * @see Scrollable
+     * @see LayerUI#getScrollableTracksViewportWidth(JLayer)
+     */
+    public boolean getScrollableTracksViewportWidth() {
+        if (getUI() != null) {
+            return getUI().getScrollableTracksViewportWidth(this);
+        }
+        return false;
+    }
+
+    /**
+     * Returns a scroll increment, which is required for components
+     * that display logical rows or columns in order to completely expose
+     * one new row or column, depending on the value of orientation.
+     * Ideally, components should handle a partially exposed row or column
+     * by returning the distance required to completely expose the item.
+     * <p/>
+     * Scrolling containers, like {@code JScrollPane}, will use this method
+     * each time the user requests a unit scroll.
+     * <p/>
+     * If the ui delegate of this layer is not {@code null}, this method delegates its
+     * implementation to the {@code LayerUI.getScrollableUnitIncrement(JLayer,Rectangle,int,int)}
+     *
+     * @return The "unit" increment for scrolling in the specified direction.
+     *         This value should always be positive.
+     *
+     * @see Scrollable
+     * @see LayerUI#getScrollableUnitIncrement(JLayer, Rectangle, int, int)
+     */
+    public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation,
+                                          int direction) {
+        if (getUI() != null) {
+            return getUI().getScrollableUnitIncrement(
+                    this, visibleRect, orientation, direction);
+        }
+        return 1;
+    }
+
+    private void readObject(ObjectInputStream s)
+            throws IOException, ClassNotFoundException {
+        s.defaultReadObject();
+        if (layerUI != null) {
+            setUI(layerUI);
+        }
+        if (eventMask != 0) {
+            eventController.updateAWTEventListener(0, eventMask);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void addNotify() {
+        super.addNotify();
+        eventController.updateAWTEventListener(0, eventMask);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void removeNotify() {
+        super.removeNotify();
+        eventController.updateAWTEventListener(eventMask, 0);
+    }
+
+    /**
+     * static AWTEventListener to be shared with all AbstractLayerUIs
+     */
+    private static class LayerEventController implements AWTEventListener {
+        private ArrayList<Long> layerMaskList =
+                new ArrayList<Long>();
+
+        private long currentEventMask;
+
+        @SuppressWarnings("unchecked")
+        public void eventDispatched(AWTEvent event) {
+            Object source = event.getSource();
+            if (source instanceof Component) {
+                Component component = (Component) source;
+                while (component != null) {
+                    if (component instanceof JLayer) {
+                        JLayer l = (JLayer) component;
+                        LayerUI ui = l.getUI();
+                        if (ui != null &&
+                                isEventEnabled(l.getLayerEventMask(),
+                                        event.getID())) {
+                            ui.eventDispatched(event, l);
+                        }
+                    }
+                    component = component.getParent();
+                }
+            }
+        }
+
+        private void updateAWTEventListener(long oldEventMask, long newEventMask) {
+            if (oldEventMask != 0) {
+                layerMaskList.remove(oldEventMask);
+            }
+            if (newEventMask != 0) {
+                layerMaskList.add(newEventMask);
+            }
+            long combinedMask = 0;
+            for (Long mask : layerMaskList) {
+                combinedMask |= mask;
+            }
+            if (combinedMask == 0) {
+                removeAWTEventListener();
+            } else if (getCurrentEventMask() != combinedMask) {
+                removeAWTEventListener();
+                addAWTEventListener(combinedMask);
+            }
+            currentEventMask = combinedMask;
+        }
+
+        private long getCurrentEventMask() {
+            return currentEventMask;
+        }
+
+        private void addAWTEventListener(final long eventMask) {
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                public Void run() {
+                    Toolkit.getDefaultToolkit().
+                            addAWTEventListener(LayerEventController.this, eventMask);
+                    return null;
+                }
+            });
+
+        }
+
+        private void removeAWTEventListener() {
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                public Void run() {
+                    Toolkit.getDefaultToolkit().
+                            removeAWTEventListener(LayerEventController.this);
+                    return null;
+                }
+            });
+        }
+
+        private boolean isEventEnabled(long eventMask, int id) {
+            return (((eventMask & AWTEvent.COMPONENT_EVENT_MASK) != 0 &&
+                    id >= ComponentEvent.COMPONENT_FIRST &&
+                    id <= ComponentEvent.COMPONENT_LAST)
+                    || ((eventMask & AWTEvent.CONTAINER_EVENT_MASK) != 0 &&
+                    id >= ContainerEvent.CONTAINER_FIRST &&
+                    id <= ContainerEvent.CONTAINER_LAST)
+                    || ((eventMask & AWTEvent.FOCUS_EVENT_MASK) != 0 &&
+                    id >= FocusEvent.FOCUS_FIRST &&
+                    id <= FocusEvent.FOCUS_LAST)
+                    || ((eventMask & AWTEvent.KEY_EVENT_MASK) != 0 &&
+                    id >= KeyEvent.KEY_FIRST &&
+                    id <= KeyEvent.KEY_LAST)
+                    || ((eventMask & AWTEvent.MOUSE_WHEEL_EVENT_MASK) != 0 &&
+                    id == MouseEvent.MOUSE_WHEEL)
+                    || ((eventMask & AWTEvent.MOUSE_MOTION_EVENT_MASK) != 0 &&
+                    (id == MouseEvent.MOUSE_MOVED ||
+                            id == MouseEvent.MOUSE_DRAGGED))
+                    || ((eventMask & AWTEvent.MOUSE_EVENT_MASK) != 0 &&
+                    id != MouseEvent.MOUSE_MOVED &&
+                    id != MouseEvent.MOUSE_DRAGGED &&
+                    id != MouseEvent.MOUSE_WHEEL &&
+                    id >= MouseEvent.MOUSE_FIRST &&
+                    id <= MouseEvent.MOUSE_LAST)
+                    || ((eventMask & AWTEvent.INPUT_METHOD_EVENT_MASK) != 0 &&
+                    id >= InputMethodEvent.INPUT_METHOD_FIRST &&
+                    id <= InputMethodEvent.INPUT_METHOD_LAST)
+                    || ((eventMask & AWTEvent.HIERARCHY_EVENT_MASK) != 0 &&
+                    id == HierarchyEvent.HIERARCHY_CHANGED)
+                    || ((eventMask & AWTEvent.HIERARCHY_BOUNDS_EVENT_MASK) != 0 &&
+                    (id == HierarchyEvent.ANCESTOR_MOVED ||
+                            id == HierarchyEvent.ANCESTOR_RESIZED)));
+        }
+    }
+
+    /**
+     * The default glassPane for the {@link javax.swing.JLayer}.
+     * It is a subclass of {@code JPanel} which is non opaque by default.
+     */
+    private static class DefaultLayerGlassPane extends JPanel {
+        /**
+         * Creates a new {@link DefaultLayerGlassPane}
+         */
+        public DefaultLayerGlassPane() {
+            setOpaque(false);
+        }
+
+        /**
+         * First, implementatation of this method iterates through
+         * glassPane's child components and returns {@code true}
+         * if any of them is visible and contains passed x,y point.
+         * After that it checks if no mouseListeners is attached to this component
+         * and no mouse cursor is set, then it returns {@code false},
+         * otherwise calls the super implementation of this method.
+         *
+         * @param x the <i>x</i> coordinate of the point
+         * @param y the <i>y</i> coordinate of the point
+         * @return true if this component logically contains x,y
+         */
+        public boolean contains(int x, int y) {
+            for (int i = 0; i < getComponentCount(); i++) {
+                Component c = getComponent(i);
+                Point point = SwingUtilities.convertPoint(this, new Point(x, y), c);
+                if(c.isVisible() && c.contains(point)){
+                    return true;
+                }
+            }
+            if (getMouseListeners().length == 0
+                    && getMouseMotionListeners().length == 0
+                    && getMouseWheelListeners().length == 0
+                    && !isCursorSet()) {
+                return false;
+            }
+            return super.contains(x, y);
+        }
+    }
+
+    /**
+     * The default layout manager for the {@link javax.swing.JLayer}.<br/>
+     * It places the glassPane on top of the view component
+     * and makes it the same size as {@code JLayer},
+     * it also makes the view component the same size but minus layer's insets<br/>
+     */
+    private static class DefaultLayerLayout implements LayoutManager, Serializable {
+        /**
+         * {@inheritDoc}
+         */
+        public void layoutContainer(Container parent) {
+            JLayer layer = (JLayer) parent;
+            Component view = layer.getView();
+            Component glassPane = layer.getGlassPane();
+            if (view != null) {
+                Insets insets = layer.getInsets();
+                view.setLocation(insets.left, insets.top);
+                view.setSize(layer.getWidth() - insets.left - insets.right,
+                        layer.getHeight() - insets.top - insets.bottom);
+            }
+            if (glassPane != null) {
+                glassPane.setLocation(0, 0);
+                glassPane.setSize(layer.getWidth(), layer.getHeight());
+            }
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public Dimension minimumLayoutSize(Container parent) {
+            JLayer layer = (JLayer) parent;
+            Insets insets = layer.getInsets();
+            Dimension ret = new Dimension(insets.left + insets.right,
+                    insets.top + insets.bottom);
+            Component view = layer.getView();
+            if (view != null) {
+                Dimension size = view.getMinimumSize();
+                ret.width += size.width;
+                ret.height += size.height;
+            }
+            if (ret.width == 0 || ret.height == 0) {
+                ret.width = ret.height = 4;
+            }
+            return ret;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public Dimension preferredLayoutSize(Container parent) {
+            JLayer layer = (JLayer) parent;
+            Insets insets = layer.getInsets();
+            Dimension ret = new Dimension(insets.left + insets.right,
+                    insets.top + insets.bottom);
+            Component view = layer.getView();
+            if (view != null) {
+                Dimension size = view.getPreferredSize();
+                if (size.width > 0 && size.height > 0) {
+                    ret.width += size.width;
+                    ret.height += size.height;
+                }
+            }
+            return ret;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public void addLayoutComponent(String name, Component comp) {
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        public void removeLayoutComponent(Component comp) {
+        }
+    }
+}
diff --git a/jdk/src/share/classes/javax/swing/JList.java b/jdk/src/share/classes/javax/swing/JList.java
index 772c7554056..796ac11ba6c 100644
--- a/jdk/src/share/classes/javax/swing/JList.java
+++ b/jdk/src/share/classes/javax/swing/JList.java
@@ -2722,8 +2722,9 @@ public class JList extends JComponent implements Scrollable, Accessible
                                       getVisibleRowCount() <= 0) {
             return true;
         }
-        if (getParent() instanceof JViewport) {
-            return (getParent().getWidth() > getPreferredSize().width);
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            return port.getWidth() > getPreferredSize().width;
         }
         return false;
     }
@@ -2747,8 +2748,9 @@ public class JList extends JComponent implements Scrollable, Accessible
                      getVisibleRowCount() <= 0) {
             return true;
         }
-        if (getParent() instanceof JViewport) {
-            return (getParent().getHeight() > getPreferredSize().height);
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            return port.getHeight() > getPreferredSize().height;
         }
         return false;
     }
diff --git a/jdk/src/share/classes/javax/swing/JTable.java b/jdk/src/share/classes/javax/swing/JTable.java
index dc9adebc4d4..521f17ab8a5 100644
--- a/jdk/src/share/classes/javax/swing/JTable.java
+++ b/jdk/src/share/classes/javax/swing/JTable.java
@@ -718,9 +718,9 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * @see #addNotify
      */
     protected void configureEnclosingScrollPane() {
-        Container p = getParent();
-        if (p instanceof JViewport) {
-            Container gp = p.getParent();
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            Container gp = port.getParent();
             if (gp instanceof JScrollPane) {
                 JScrollPane scrollPane = (JScrollPane)gp;
                 // Make certain we are the viewPort's view and not, for
@@ -750,9 +750,9 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * from configureEnclosingScrollPane() and updateUI() in a safe manor.
      */
     private void configureEnclosingScrollPaneUI() {
-        Container p = getParent();
-        if (p instanceof JViewport) {
-            Container gp = p.getParent();
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            Container gp = port.getParent();
             if (gp instanceof JScrollPane) {
                 JScrollPane scrollPane = (JScrollPane)gp;
                 // Make certain we are the viewPort's view and not, for
@@ -819,9 +819,9 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * @since 1.3
      */
     protected void unconfigureEnclosingScrollPane() {
-        Container p = getParent();
-        if (p instanceof JViewport) {
-            Container gp = p.getParent();
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            Container gp = port.getParent();
             if (gp instanceof JScrollPane) {
                 JScrollPane scrollPane = (JScrollPane)gp;
                 // Make certain we are the viewPort's view and not, for
@@ -5215,9 +5215,10 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
      * @see #getFillsViewportHeight
      */
     public boolean getScrollableTracksViewportHeight() {
+        JViewport port = SwingUtilities2.getViewport(this);
         return getFillsViewportHeight()
-               && getParent() instanceof JViewport
-               && (getParent().getHeight() > getPreferredSize().height);
+               && port != null
+               && port.getHeight() > getPreferredSize().height;
     }
 
     /**
diff --git a/jdk/src/share/classes/javax/swing/JTextField.java b/jdk/src/share/classes/javax/swing/JTextField.java
index c104f36ec98..de408914d22 100644
--- a/jdk/src/share/classes/javax/swing/JTextField.java
+++ b/jdk/src/share/classes/javax/swing/JTextField.java
@@ -24,6 +24,8 @@
  */
 package javax.swing;
 
+import sun.swing.SwingUtilities2;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
@@ -288,11 +290,7 @@ public class JTextField extends JTextComponent implements SwingConstants {
      * @see JComponent#isValidateRoot
      */
     public boolean isValidateRoot() {
-        Component parent = getParent();
-        if (parent instanceof JViewport) {
-            return false;
-        }
-        return true;
+        return SwingUtilities2.getViewport(this) == null;
     }
 
 
diff --git a/jdk/src/share/classes/javax/swing/JTextPane.java b/jdk/src/share/classes/javax/swing/JTextPane.java
index efb339bd59f..7f113ddd59c 100644
--- a/jdk/src/share/classes/javax/swing/JTextPane.java
+++ b/jdk/src/share/classes/javax/swing/JTextPane.java
@@ -170,6 +170,7 @@ public class JTextPane extends JEditorPane {
      *
      * @param content  the content to replace the selection with
      */
+    @Override
     public void replaceSelection(String content) {
         replaceSelection(content, true);
     }
@@ -183,6 +184,7 @@ public class JTextPane extends JEditorPane {
         if (doc != null) {
             try {
                 Caret caret = getCaret();
+                boolean composedTextSaved = saveComposedText(caret.getDot());
                 int p0 = Math.min(caret.getDot(), caret.getMark());
                 int p1 = Math.max(caret.getDot(), caret.getMark());
                 AttributeSet attr = getInputAttributes().copyAttributes();
@@ -197,6 +199,9 @@ public class JTextPane extends JEditorPane {
                         doc.insertString(p0, content, attr);
                     }
                 }
+                if (composedTextSaved) {
+                    restoreComposedText();
+                }
             } catch (BadLocationException e) {
                 UIManager.getLookAndFeel().provideErrorFeedback(JTextPane.this);
             }
diff --git a/jdk/src/share/classes/javax/swing/JTree.java b/jdk/src/share/classes/javax/swing/JTree.java
index 639dd45e8f9..1b200f78591 100644
--- a/jdk/src/share/classes/javax/swing/JTree.java
+++ b/jdk/src/share/classes/javax/swing/JTree.java
@@ -3498,8 +3498,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
      * @see Scrollable#getScrollableTracksViewportWidth
      */
     public boolean getScrollableTracksViewportWidth() {
-        if (getParent() instanceof JViewport) {
-            return getParent().getWidth() > getPreferredSize().width;
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            return port.getWidth() > getPreferredSize().width;
         }
         return false;
     }
@@ -3514,8 +3515,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
      * @see Scrollable#getScrollableTracksViewportHeight
      */
     public boolean getScrollableTracksViewportHeight() {
-        if (getParent() instanceof JViewport) {
-            return getParent().getHeight() > getPreferredSize().height;
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            return port.getHeight() > getPreferredSize().height;
         }
         return false;
     }
diff --git a/jdk/src/share/classes/javax/swing/SwingUtilities.java b/jdk/src/share/classes/javax/swing/SwingUtilities.java
index 21a75ce1d97..d7a26a0dd72 100644
--- a/jdk/src/share/classes/javax/swing/SwingUtilities.java
+++ b/jdk/src/share/classes/javax/swing/SwingUtilities.java
@@ -999,24 +999,20 @@ public class SwingUtilities implements SwingConstants
                 textR.height = (int) v.getPreferredSpan(View.Y_AXIS);
             } else {
                 textR.width = SwingUtilities2.stringWidth(c, fm, text);
-
-                // Take into account the left and right side bearings.
-                // This gives more space than it is actually needed,
-                // but there are two reasons:
-                // 1. If we set the width to the actual bounds,
-                //    all callers would have to account for the bearings
-                //    themselves. NOTE: all pref size calculations don't do it.
-                // 2. You can do a drawString at the returned location
-                //    and the text won't be clipped.
                 lsb = SwingUtilities2.getLeftSideBearing(c, fm, text);
                 if (lsb < 0) {
+                    // If lsb is negative, add it to the width and later
+                    // adjust the x location. This gives more space than is
+                    // actually needed.
+                    // This is done like this for two reasons:
+                    // 1. If we set the width to the actual bounds all
+                    //    callers would have to account for negative lsb
+                    //    (pref size calculations ONLY look at width of
+                    //    textR)
+                    // 2. You can do a drawString at the returned location
+                    //    and the text won't be clipped.
                     textR.width -= lsb;
                 }
-                rsb = SwingUtilities2.getRightSideBearing(c, fm, text);
-                if (rsb > 0) {
-                    textR.width += rsb;
-                }
-
                 if (textR.width > availTextWidth) {
                     text = SwingUtilities2.clipString(c, fm, text,
                                                       availTextWidth);
diff --git a/jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java b/jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java
index c2ff7bb8df8..9f969796bdd 100644
--- a/jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java
+++ b/jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java
@@ -37,6 +37,8 @@ import java.util.Vector;
 import java.lang.ref.WeakReference;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 import sun.awt.shell.*;
 
@@ -718,8 +720,13 @@ class WindowsFileSystemView extends FileSystemView {
         return isFileSystemRoot(dir);
     }
 
-    public boolean isFloppyDrive(File dir) {
-        String path = dir.getAbsolutePath();
+    public boolean isFloppyDrive(final File dir) {
+        String path = AccessController.doPrivileged(new PrivilegedAction<String>() {
+            public String run() {
+                return dir.getAbsolutePath();
+            }
+        });
+
         return (path != null && (path.equals("A:\\") || path.equals("B:\\")));
     }
 
diff --git a/jdk/src/share/classes/javax/swing/plaf/LayerUI.java b/jdk/src/share/classes/javax/swing/plaf/LayerUI.java
new file mode 100644
index 00000000000..cf64687421a
--- /dev/null
+++ b/jdk/src/share/classes/javax/swing/plaf/LayerUI.java
@@ -0,0 +1,396 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package javax.swing.plaf;
+
+import javax.accessibility.Accessible;
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+import java.awt.*;
+import java.awt.event.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyChangeListener;
+import java.io.Serializable;
+
+/**
+ * The base class for all {@link javax.swing.JLayer}'s UI delegates.
+ * <p/>
+ * {@link #paint(java.awt.Graphics, javax.swing.JComponent)} method performes the
+ * painting of the {@code JLayer}
+ * and {@link #eventDispatched(AWTEvent, JLayer)} method is notified
+ * about any {@code AWTEvent}s which have been generated by a {@code JLayer}
+ * or any of its subcomponents.
+ * <p/>
+ * The {@code LayerUI} differs from the UI delegates of the other components,
+ * because it is LookAndFeel independent and is not updated by default when
+ * the system LookAndFeel is changed.
+ * <p/>
+ * The subclasses of {@code LayerUI} can either be stateless and shareable
+ * by multiple {@code JLayer}s or not shareable.
+ *
+ * @param <V> one of the super types of {@code JLayer}'s view component
+ *
+ * @see JLayer#setUI(LayerUI)
+ * @see JLayer#setView(Component)
+ * @see JLayer#getView()
+ * @since 1.7
+ *
+ * @author Alexander Potochkin
+ */
+public class LayerUI<V extends Component>
+        extends ComponentUI implements Serializable {
+
+    private final PropertyChangeSupport propertyChangeSupport =
+            new PropertyChangeSupport(this);
+
+    /**
+     * Paints the specified component.
+     * Subclasses should override this method and use
+     * the specified {@code Graphics} object to
+     * render the content of the component.
+     *
+     * @param g the {@code Graphics} context in which to paint;
+     * @param c the component being painted;
+     * it can be safely cast to the {@code JLayer<V>}
+     */
+    @Override
+    public void paint(Graphics g, JComponent c) {
+        c.paint(g);
+    }
+
+    /**
+     * Dispatches {@code AWTEvent}s for {@code JLayer}
+     * and <b>all it subcomponents</b> to this {@code LayerUI} instance.
+     * <p>
+     * To enable the {@code AWTEvent} of the particular type,
+     * you call {@link javax.swing.JLayer#setLayerEventMask}
+     * in {@link #installUI(javax.swing.JComponent)}
+     * and set the layer event mask to {@code 0}
+     * in {@link #uninstallUI(javax.swing.JComponent)} after that
+     *
+     * @param e the event to be dispatched
+     * @param l the layer this LayerUI is set to
+     *
+     * @see JLayer#setLayerEventMask(long)
+     * @see javax.swing.JLayer#getLayerEventMask()
+     */
+    public void eventDispatched(AWTEvent e, JLayer<? extends V> l){
+    }
+
+    /**
+     * Invoked when {@link javax.swing.JLayer#updateUI()} is called
+     * by the {@code JLayer} this {@code LayerUI} is set to.
+     *
+     * @param l the {@code JLayer} which UI is updated
+     */
+    public void updateUI(JLayer<? extends V> l){
+    }
+
+    /**
+     * Configures the {@code JLayer} this {@code LayerUI} is set to.
+     * The default implementation registers the {@code LayerUI}
+     * as a property change listener for the passed {@code JLayer} component.
+     *
+     * @param c the {@code JLayer} component where this UI delegate is being installed
+     */
+    public void installUI(JComponent c) {
+        addPropertyChangeListener((JLayer) c);
+    }
+
+    /**
+     * Reverses the configuration which was previously set
+     * in the {@link #installUI(JComponent)} method.
+     * The default implementation unregisters the property change listener
+     * for the passed JLayer component.
+     *
+     * @param c the component from which this UI delegate is being removed.
+     */
+    public void uninstallUI(JComponent c) {
+        removePropertyChangeListener((JLayer) c);
+    }
+
+    /**
+     * Adds a PropertyChangeListener to the listener list. The listener is
+     * registered for all bound properties of this class.
+     * <p/>
+     * If {@code listener} is {@code null},
+     * no exception is thrown and no action is performed.
+     *
+     * @param listener the property change listener to be added
+     * @see #removePropertyChangeListener
+     * @see #getPropertyChangeListeners
+     * @see #addPropertyChangeListener(String, java.beans.PropertyChangeListener)
+     */
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        propertyChangeSupport.addPropertyChangeListener(listener);
+    }
+
+    /**
+     * Removes a PropertyChangeListener from the listener list. This method
+     * should be used to remove PropertyChangeListeners that were registered
+     * for all bound properties of this class.
+     * <p/>
+     * If {@code listener} is {@code null},
+     * no exception is thrown and no action is performed.
+     *
+     * @param listener the PropertyChangeListener to be removed
+     * @see #addPropertyChangeListener
+     * @see #getPropertyChangeListeners
+     * @see #removePropertyChangeListener(String, PropertyChangeListener)
+     */
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        propertyChangeSupport.removePropertyChangeListener(listener);
+    }
+
+    /**
+     * Returns an array of all the property change listeners
+     * registered on this component.
+     *
+     * @return all of this ui's {@code PropertyChangeListener}s
+     *         or an empty array if no property change
+     *         listeners are currently registered
+     * @see #addPropertyChangeListener
+     * @see #removePropertyChangeListener
+     * @see #getPropertyChangeListeners(String)
+     */
+    public PropertyChangeListener[] getPropertyChangeListeners() {
+        return propertyChangeSupport.getPropertyChangeListeners();
+    }
+
+    /**
+     * Adds a PropertyChangeListener to the listener list for a specific
+     * property.
+     * <p/>
+     * If {@code propertyName} or {@code listener} is {@code null},
+     * no exception is thrown and no action is taken.
+     *
+     * @param propertyName one of the property names listed above
+     * @param listener     the property change listener to be added
+     * @see #removePropertyChangeListener(String, PropertyChangeListener)
+     * @see #getPropertyChangeListeners(String)
+     * @see #addPropertyChangeListener(String, PropertyChangeListener)
+     */
+    public void addPropertyChangeListener(String propertyName,
+                                          PropertyChangeListener listener) {
+        propertyChangeSupport.addPropertyChangeListener(propertyName, listener);
+    }
+
+    /**
+     * Removes a {@code PropertyChangeListener} from the listener
+     * list for a specific property. This method should be used to remove
+     * {@code PropertyChangeListener}s
+     * that were registered for a specific bound property.
+     * <p/>
+     * If {@code propertyName} or {@code listener} is {@code null},
+     * no exception is thrown and no action is taken.
+     *
+     * @param propertyName a valid property name
+     * @param listener     the PropertyChangeListener to be removed
+     * @see #addPropertyChangeListener(String, PropertyChangeListener)
+     * @see #getPropertyChangeListeners(String)
+     * @see #removePropertyChangeListener(PropertyChangeListener)
+     */
+    public void removePropertyChangeListener(String propertyName,
+                                             PropertyChangeListener listener) {
+        propertyChangeSupport.removePropertyChangeListener(propertyName, listener);
+    }
+
+    /**
+     * Returns an array of all the listeners which have been associated
+     * with the named property.
+     *
+     * @param propertyName  The name of the property being listened to
+     * @return all of the {@code PropertyChangeListener}s associated with
+     *         the named property; if no such listeners have been added or
+     *         if {@code propertyName} is {@code null}, an empty
+     *         array is returned
+     * @see #addPropertyChangeListener(String, PropertyChangeListener)
+     * @see #removePropertyChangeListener(String, PropertyChangeListener)
+     * @see #getPropertyChangeListeners
+     */
+    public PropertyChangeListener[] getPropertyChangeListeners(String propertyName) {
+        return propertyChangeSupport.getPropertyChangeListeners(propertyName);
+    }
+
+    /**
+     * Support for reporting bound property changes for Object properties.
+     * This method can be called when a bound property has changed and it will
+     * send the appropriate PropertyChangeEvent to any registered
+     * PropertyChangeListeners.
+     *
+     * @param propertyName the property whose value has changed
+     * @param oldValue     the property's previous value
+     * @param newValue     the property's new value
+     */
+    protected void firePropertyChange(String propertyName,
+                                      Object oldValue, Object newValue) {
+        propertyChangeSupport.firePropertyChange(propertyName, oldValue, newValue);
+    }
+
+    /**
+     * Notifies the {@code LayerUI} when any of its property are changed
+     * and enables updating every {@code JLayer} this {@code LayerUI} instance is set to.
+     *
+     * @param evt the PropertyChangeEvent generated by this {@code LayerUI}
+     * @param l the {@code JLayer} this LayerUI is set to
+     */
+    public void applyPropertyChange(PropertyChangeEvent evt, JLayer<? extends V> l) {
+    }
+
+    /**
+     * Returns the preferred size of the viewport for a view component.
+     *
+     * @param l the {@code JLayer} component where this UI delegate is being installed
+     * @return the preferred size of the viewport for a view component
+     * @see Scrollable#getPreferredScrollableViewportSize()
+     */
+    public Dimension getPreferredScrollableViewportSize(JLayer<? extends V> l) {
+        if (l.getView() instanceof Scrollable) {
+            return ((Scrollable)l.getView()).getPreferredScrollableViewportSize();
+        }
+        return l.getPreferredSize();
+    }
+
+    /**
+     * Returns a scroll increment, which is required for components
+     * that display logical rows or columns in order to completely expose
+     * one block of rows or columns, depending on the value of orientation.
+     *
+     * @param l the {@code JLayer} component where this UI delegate is being installed
+     * @param visibleRect The view area visible within the viewport
+     * @param orientation Either SwingConstants.VERTICAL or SwingConstants.HORIZONTAL.
+     * @param direction Less than zero to scroll up/left, greater than zero for down/right.
+     * @return the "block" increment for scrolling in the specified direction
+     * @see Scrollable#getScrollableBlockIncrement(Rectangle, int, int)
+     */
+     public int getScrollableBlockIncrement(JLayer<? extends V> l,
+                                           Rectangle visibleRect,
+                                           int orientation, int direction) {
+        if (l.getView() instanceof Scrollable) {
+            return ((Scrollable)l.getView()).getScrollableBlockIncrement(
+                    visibleRect,orientation, direction);
+        }
+        return (orientation == SwingConstants.VERTICAL) ? visibleRect.height :
+            visibleRect.width;
+    }
+
+    /**
+     * Returns {@code false} to indicate that the height of the viewport does not
+     * determine the height of the layer, unless the preferred height
+     * of the layer is smaller than the height of the viewport.
+     *
+     * @param l the {@code JLayer} component where this UI delegate is being installed
+     * @return whether the layer should track the height of the viewport
+     * @see Scrollable#getScrollableTracksViewportHeight()
+     */
+    public boolean getScrollableTracksViewportHeight(JLayer<? extends V> l) {
+        if (l.getView() instanceof Scrollable) {
+            return ((Scrollable)l.getView()).getScrollableTracksViewportHeight();
+        }
+        return false;
+    }
+
+    /**
+     * Returns {@code false} to indicate that the width of the viewport does not
+     * determine the width of the layer, unless the preferred width
+     * of the layer is smaller than the width of the viewport.
+     *
+     * @param l the {@code JLayer} component where this UI delegate is being installed
+     * @return whether the layer should track the width of the viewport
+     * @see Scrollable
+     * @see LayerUI#getScrollableTracksViewportWidth(JLayer)
+     */
+    public boolean getScrollableTracksViewportWidth(JLayer<? extends V> l) {
+        if (l.getView() instanceof Scrollable) {
+            return ((Scrollable)l.getView()).getScrollableTracksViewportWidth();
+        }
+        return false;
+    }
+
+    /**
+     * Returns a scroll increment, which is required for components
+     * that display logical rows or columns in order to completely expose
+     * one new row or column, depending on the value of orientation.
+     * Ideally, components should handle a partially exposed row or column
+     * by returning the distance required to completely expose the item.
+     * <p>
+     * Scrolling containers, like JScrollPane, will use this method
+     * each time the user requests a unit scroll.
+     *
+     * @param l the {@code JLayer} component where this UI delegate is being installed
+     * @param visibleRect The view area visible within the viewport
+     * @param orientation Either SwingConstants.VERTICAL or SwingConstants.HORIZONTAL.
+     * @param direction Less than zero to scroll up/left, greater than zero for down/right.
+     * @return The "unit" increment for scrolling in the specified direction.
+     *         This value should always be positive.
+     * @see Scrollable#getScrollableUnitIncrement(Rectangle, int, int)
+     */
+    public int getScrollableUnitIncrement(JLayer<? extends V> l,
+                                          Rectangle visibleRect,
+                                          int orientation, int direction) {
+        if (l.getView() instanceof Scrollable) {
+            return ((Scrollable)l.getView()).getScrollableUnitIncrement(
+                    visibleRect, orientation, direction);
+        }
+        return 1;
+    }
+
+    /**
+     * If the {@code JLayer}'s view component is not {@code null},
+     * this calls the view's {@code getBaseline()} method.
+     * Otherwise, the default implementation is called.
+     *
+     * @param c {@code JLayer} to return baseline resize behavior for
+     * @param width the width to get the baseline for
+     * @param height the height to get the baseline for
+     * @return baseline or a value &lt; 0 indicating there is no reasonable
+     *                  baseline
+     */
+    public int getBaseline(JComponent c, int width, int height) {
+        JLayer l = (JLayer) c;
+        if (l.getView() != null) {
+            return l.getView().getBaseline(width, height);
+        }
+        return super.getBaseline(c, width, height);
+     }
+
+    /**
+     * If the {@code JLayer}'s view component is not {@code null},
+     * this calls the view's {@code getBaselineResizeBehavior()} method.
+     * Otherwise, the default implementation is called.
+     *
+     * @param c {@code JLayer} to return baseline resize behavior for
+     * @return an enum indicating how the baseline changes as the component
+     *         size changes
+     */
+    public Component.BaselineResizeBehavior getBaselineResizeBehavior(JComponent c) {
+        JLayer l = (JLayer) c;
+        if (l.getView() != null) {
+            return l.getView().getBaselineResizeBehavior();
+        }
+        return super.getBaselineResizeBehavior(c);
+    }
+}
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
index 5ebb6289440..888b95aa021 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -32,9 +32,6 @@ import javax.swing.event.*;
 import javax.swing.border.*;
 import javax.swing.plaf.*;
 import java.beans.*;
-import java.util.EventListener;
-import java.io.Serializable;
-
 
 /**
  * Basic L&F for a minimized window on a desktop.
@@ -47,7 +44,6 @@ public class BasicDesktopIconUI extends DesktopIconUI {
 
     protected JInternalFrame.JDesktopIcon desktopIcon;
     protected JInternalFrame frame;
-    private DesktopIconMover desktopIconMover;
 
     /**
      * The title pane component used in the desktop icon.
@@ -128,21 +124,12 @@ public class BasicDesktopIconUI extends DesktopIconUI {
         mouseInputListener = createMouseInputListener();
         desktopIcon.addMouseMotionListener(mouseInputListener);
         desktopIcon.addMouseListener(mouseInputListener);
-         getDesktopIconMover().installListeners();
     }
 
     protected void uninstallListeners() {
         desktopIcon.removeMouseMotionListener(mouseInputListener);
         desktopIcon.removeMouseListener(mouseInputListener);
         mouseInputListener = null;
-         getDesktopIconMover().uninstallListeners();
-    }
-
-    private DesktopIconMover getDesktopIconMover() {
-        if (desktopIconMover == null) {
-            desktopIconMover = new DesktopIconMover(desktopIcon);
-        }
-        return desktopIconMover;
     }
 
     protected void installDefaults() {
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
index 74f24b6eb7e..1e5d80f8ea2 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -232,6 +232,10 @@ public class BasicDirectoryModel extends AbstractListModel implements PropertyCh
         public void run0() {
             FileSystemView fileSystem = filechooser.getFileSystemView();
 
+            if (isInterrupted()) {
+                return;
+            }
+
             File[] list = fileSystem.getFiles(currentDirectory, filechooser.isFileHidingEnabled());
 
             if (isInterrupted()) {
@@ -268,8 +272,8 @@ public class BasicDirectoryModel extends AbstractListModel implements PropertyCh
 
             // To avoid loads of synchronizations with Invoker and improve performance we
             // execute the whole block on the COM thread
-            DoChangeContents doChangeContents = ShellFolder.getInvoker().invoke(new Callable<DoChangeContents>() {
-                public DoChangeContents call() throws Exception {
+            DoChangeContents doChangeContents = ShellFolder.invoke(new Callable<DoChangeContents>() {
+                public DoChangeContents call() {
                     int newSize = newFileCache.size();
                     int oldSize = fileCache.size();
 
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
index 383930533a2..551ab00d602 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java
@@ -27,16 +27,10 @@ package javax.swing.plaf.basic;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.peer.LightweightPeer;
-
 import javax.swing.*;
-import javax.swing.border.*;
 import javax.swing.plaf.*;
 import javax.swing.event.*;
-
 import java.beans.*;
-import java.io.Serializable;
-
 import sun.swing.DefaultLookup;
 import sun.swing.UIAction;
 
@@ -55,6 +49,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
     protected MouseInputAdapter          borderListener;
     protected PropertyChangeListener     propertyChangeListener;
     protected LayoutManager              internalFrameLayout;
+    protected ComponentListener          componentListener;
     protected MouseInputListener         glassPaneDispatcher;
     private InternalFrameListener        internalFrameListener;
 
@@ -66,9 +61,9 @@ public class BasicInternalFrameUI extends InternalFrameUI
     protected BasicInternalFrameTitlePane titlePane; // access needs this
 
     private static DesktopManager sharedDesktopManager;
+    private boolean componentListenerAdded = false;
 
     private Rectangle parentBounds;
-    private DesktopIconMover desktopIconMover;
 
     private boolean dragging = false;
     private boolean resizing = false;
@@ -209,17 +204,14 @@ public class BasicInternalFrameUI extends InternalFrameUI
             frame.getGlassPane().addMouseListener(glassPaneDispatcher);
             frame.getGlassPane().addMouseMotionListener(glassPaneDispatcher);
         }
+        componentListener =  createComponentListener();
         if (frame.getParent() != null) {
           parentBounds = frame.getParent().getBounds();
         }
-        getDesktopIconMover().installListeners();
-    }
-
-    private DesktopIconMover getDesktopIconMover() {
-        if (desktopIconMover == null) {
-            desktopIconMover = new DesktopIconMover(frame);
+        if ((frame.getParent() != null) && !componentListenerAdded) {
+            frame.getParent().addComponentListener(componentListener);
+            componentListenerAdded = true;
         }
-        return desktopIconMover;
     }
 
     // Provide a FocusListener to listen for a WINDOW_LOST_FOCUS event,
@@ -290,7 +282,11 @@ public class BasicInternalFrameUI extends InternalFrameUI
      * @since 1.3
      */
     protected void uninstallListeners() {
-      getDesktopIconMover().uninstallListeners();
+        if ((frame.getParent() != null) && componentListenerAdded) {
+            frame.getParent().removeComponentListener(componentListener);
+            componentListenerAdded = false;
+        }
+        componentListener = null;
       if (glassPaneDispatcher != null) {
           frame.getGlassPane().removeMouseListener(glassPaneDispatcher);
           frame.getGlassPane().removeMouseMotionListener(glassPaneDispatcher);
@@ -1228,6 +1224,15 @@ public class BasicInternalFrameUI extends InternalFrameUI
                 }
             }
 
+            // Relocate the icon base on the new parent bounds.
+            if (icon != null) {
+                Rectangle iconBounds = icon.getBounds();
+                int y = iconBounds.y +
+                        (parentNewBounds.height - parentBounds.height);
+                icon.setBounds(iconBounds.x, y,
+                        iconBounds.width, iconBounds.height);
+            }
+
             // Update the new parent bounds for next resize.
             if (!parentBounds.equals(parentNewBounds)) {
                 parentBounds = parentNewBounds;
@@ -1399,6 +1404,9 @@ public class BasicInternalFrameUI extends InternalFrameUI
                     // Cancel a resize in progress if the internal frame
                     // gets a setClosed(true) or dispose().
                     cancelResize();
+                    if ((frame.getParent() != null) && componentListenerAdded) {
+                        frame.getParent().removeComponentListener(componentListener);
+                    }
                     closeFrame(f);
                 }
             } else if (JInternalFrame.IS_MAXIMUM_PROPERTY == prop) {
@@ -1431,6 +1439,10 @@ public class BasicInternalFrameUI extends InternalFrameUI
                 } else {
                     parentBounds = null;
                 }
+                if ((frame.getParent() != null) && !componentListenerAdded) {
+                    f.getParent().addComponentListener(componentListener);
+                    componentListenerAdded = true;
+                }
             } else if (JInternalFrame.TITLE_PROPERTY == prop ||
                     prop == "closable" || prop == "iconable" ||
                     prop == "maximizable") {
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
index af5eaa5df9f..ec33129c346 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -37,17 +37,12 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
 
 import java.awt.Component;
-import java.awt.Container;
-import java.awt.LayoutManager;
 import java.awt.Rectangle;
 import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Insets;
 import java.awt.Graphics;
 import java.awt.event.*;
-import java.io.Serializable;
-import java.awt.Toolkit;
-import java.awt.ComponentOrientation;
 
 /**
  * A default L&F implementation of ScrollPaneUI.
@@ -63,6 +58,7 @@ public class BasicScrollPaneUI
     protected ChangeListener viewportChangeListener;
     protected PropertyChangeListener spPropertyChangeListener;
     private MouseWheelListener mouseScrollListener;
+    private int oldExtent = Integer.MIN_VALUE;
 
     /**
      * PropertyChangeListener installed on the vertical scrollbar.
@@ -327,9 +323,13 @@ public class BasicScrollPaneUI
                             * leave it until someone claims.
                             */
                             value = Math.max(0, Math.min(max - extent, max - extent - viewPosition.x));
+                            if (oldExtent > extent) {
+                                value -= oldExtent - extent;
+                            }
                         }
                     }
                 }
+                oldExtent = extent;
                 hsb.setValues(value, extent, 0, max);
             }
 
@@ -1020,7 +1020,7 @@ public class BasicScrollPaneUI
 
             if (viewport != null) {
                 if (e.getSource() == viewport) {
-                    viewportStateChanged(e);
+                    syncScrollPaneWithViewport();
                 }
                 else {
                     JScrollBar hsb = scrollpane.getHorizontalScrollBar();
@@ -1077,11 +1077,6 @@ public class BasicScrollPaneUI
             viewport.setViewPosition(p);
         }
 
-        private void viewportStateChanged(ChangeEvent e) {
-            syncScrollPaneWithViewport();
-        }
-
-
         //
         // PropertyChangeListener: This is installed on both the JScrollPane
         // and the horizontal/vertical scrollbars.
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
index 97e2f60f52b..02bb547d318 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
@@ -1507,7 +1507,8 @@ public class BasicSliderUI extends SliderUI{
                     propertyName == "paintTicks" ||
                     propertyName == "paintTrack" ||
                     propertyName == "font" ||
-                    propertyName == "paintLabels") {
+                    propertyName == "paintLabels" ||
+                    propertyName == "Slider.paintThumbArrowShape") {
                 checkedLabelBaselines = false;
                 calculateGeometry();
                 slider.repaint();
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java b/jdk/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java
deleted file mode 100644
index deff4f27a5f..00000000000
--- a/jdk/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright 1997-2008 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package javax.swing.plaf.basic;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-
-/**
- * DesktopIconMover is intended to move desktop icon
- * when parent window is resized.
- */
-class DesktopIconMover implements ComponentListener, PropertyChangeListener {
-    private Component parent;
-    private JInternalFrame frame; // if not null, DesktopIconMover(frame)
-                                  // constructor was used
-    private JInternalFrame.JDesktopIcon icon;
-    private Rectangle parentBounds;
-    private boolean componentListenerAdded = false;
-
-    public DesktopIconMover(JInternalFrame frame) {
-        if (frame == null) {
-            throw new NullPointerException("Frame cannot be null");
-        }
-        this.frame = frame;
-        this.icon = frame.getDesktopIcon();
-        if (icon == null) {
-            throw new NullPointerException(
-                    "frame.getDesktopIcon() cannot be null");
-        }
-        this.parent = frame.getParent();
-        if (this.parent != null) {
-            parentBounds = this.parent.getBounds();
-        }
-    }
-
-    public DesktopIconMover(JInternalFrame.JDesktopIcon icon) {
-        if (icon == null) {
-            throw new NullPointerException("Icon cannot be null");
-        }
-        this.icon = icon;
-        this.parent = icon.getParent();
-        if (this.parent != null) {
-            parentBounds = this.parent.getBounds();
-        }
-    }
-
-    public void installListeners() {
-        if (frame != null) {
-            frame.addPropertyChangeListener(this);
-        } else {
-            icon.addPropertyChangeListener(this);
-        }
-        addComponentListener();
-    }
-
-    public void uninstallListeners() {
-        if (frame != null) {
-            frame.removePropertyChangeListener(this);
-        } else {
-            icon.removePropertyChangeListener(this);
-        }
-        removeComponentListener();
-    }
-
-    public void propertyChange(PropertyChangeEvent evt) {
-        String propName = evt.getPropertyName();
-        if ("ancestor".equals(propName)) {
-            Component newAncestor = (Component) evt.getNewValue();
-
-            // Remove component listener if parent is changing
-            Component probablyNewParent = getCurrentParent();
-            if ((probablyNewParent != null) &&
-                    (!probablyNewParent.equals(parent))) {
-                removeComponentListener();
-                parent = probablyNewParent;
-            }
-
-            if (newAncestor == null) {
-                removeComponentListener();
-            } else {
-                addComponentListener();
-            }
-
-            // Update parentBounds
-            if (parent != null) {
-                parentBounds = parent.getBounds();
-            } else {
-                parentBounds = null;
-            }
-        } else if (JInternalFrame.IS_CLOSED_PROPERTY.equals(propName)) {
-            removeComponentListener();
-        }
-    }
-
-    private void addComponentListener() {
-        if (!componentListenerAdded && (parent != null)) {
-            parent.addComponentListener(this);
-            componentListenerAdded = true;
-        }
-    }
-
-    private void removeComponentListener() {
-        if ((parent != null) && componentListenerAdded) {
-            parent.removeComponentListener(this);
-            componentListenerAdded = false;
-        }
-    }
-
-    private Component getCurrentParent() {
-        if (frame != null) {
-            return frame.getParent();
-        } else {
-            return icon.getParent();
-        }
-    }
-
-    public void componentResized(ComponentEvent e) {
-        if ((parent == null) || (parentBounds == null)) {
-            return;
-        }
-
-        Rectangle parentNewBounds = parent.getBounds();
-        if ((parentNewBounds == null) || parentNewBounds.equals(parentBounds)) {
-            return;
-        }
-
-        // Move desktop icon only in up-down direction
-        int newIconY = icon.getLocation().y +
-                (parentNewBounds.height - parentBounds.height);
-        icon.setLocation(icon.getLocation().x, newIconY);
-
-        parentBounds = parentNewBounds;
-    }
-
-    public void componentMoved(ComponentEvent e) {
-    }
-
-    public void componentShown(ComponentEvent e) {
-    }
-
-    public void componentHidden(ComponentEvent e) {
-    }
-}
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java b/jdk/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java
index 8893782d951..831221d57f9 100644
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2001-2009 Sun Microsystems, Inc.  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
@@ -25,8 +25,6 @@
 package javax.swing.plaf.metal;
 
 import java.awt.*;
-import java.beans.*;
-import javax.swing.*;
 
 /**
  * DesktopProperty that only uses font height in configuring font. This
@@ -60,7 +58,7 @@ class MetalFontDesktopProperty extends com.sun.java.swing.plaf.windows.DesktopPr
      * @param type MetalTheme font type.
      */
     MetalFontDesktopProperty(int type) {
-        this(propertyMapping[type], Toolkit.getDefaultToolkit(), type);
+        this(propertyMapping[type], type);
     }
 
     /**
@@ -72,8 +70,8 @@ class MetalFontDesktopProperty extends com.sun.java.swing.plaf.windows.DesktopPr
      * @param type Type of font being used, corresponds to MetalTheme font
      *        type.
      */
-    MetalFontDesktopProperty(String key, Toolkit kit, int type) {
-        super(key, null, kit);
+    MetalFontDesktopProperty(String key, int type) {
+        super(key, null);
         this.type = type;
     }
 
diff --git a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
index 07432841961..76eb24df040 100644
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1998-2009 Sun Microsystems, Inc.  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
@@ -1541,10 +1541,8 @@ public class MetalLookAndFeel extends BasicLookAndFeel
         table.putDefaults(defaults);
 
         if (isWindows() && useSystemFonts() && theme.isSystemTheme()) {
-            Toolkit kit = Toolkit.getDefaultToolkit();
             Object messageFont = new MetalFontDesktopProperty(
-                              "win.messagebox.font.height", kit, MetalTheme.
-                              CONTROL_TEXT_FONT);
+                "win.messagebox.font.height", MetalTheme.CONTROL_TEXT_FONT);
 
             defaults = new Object[] {
                 "OptionPane.messageFont", messageFont,
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java b/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
index bf29e15221d..f5762f0f0ef 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java
@@ -227,10 +227,10 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
      *
      * @param x an encoded x value (0...1, or 1...2, or 2...3)
      * @return the decoded x value
+     * @throws IllegalArgumentException
+     *      if {@code x < 0} or {@code x > 3}
      */
     protected final float decodeX(float x) {
-        if (ctx.canvasSize == null) return x;
-
         if (x >= 0 && x <= 1) {
             return x * leftWidth;
         } else if (x > 1 && x < 2) {
@@ -238,7 +238,7 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
         } else if (x >= 2 && x <= 3) {
             return ((x-2) * rightWidth) + leftWidth + centerWidth;
         } else {
-            throw new AssertionError("Invalid x");
+            throw new IllegalArgumentException("Invalid x");
         }
     }
 
@@ -248,10 +248,10 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
      *
      * @param y an encoded y value (0...1, or 1...2, or 2...3)
      * @return the decoded y value
+     * @throws IllegalArgumentException
+     *      if {@code y < 0} or {@code y > 3}
      */
     protected final float decodeY(float y) {
-        if (ctx.canvasSize == null) return y;
-
         if (y >= 0 && y <= 1) {
             return y * topHeight;
         } else if (y > 1 && y < 2) {
@@ -259,7 +259,7 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
         } else if (y >= 2 && y <= 3) {
             return ((y-2) * bottomHeight) + topHeight + centerHeight;
         } else {
-            throw new AssertionError("Invalid y");
+            throw new IllegalArgumentException("Invalid y");
         }
     }
 
@@ -271,10 +271,10 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
      * @param x an encoded x value of the bezier control point (0...1, or 1...2, or 2...3)
      * @param dx the offset distance to the anchor from the control point x
      * @return the decoded x location of the control point
+     * @throws IllegalArgumentException
+     *      if {@code x < 0} or {@code x > 3}
      */
     protected final float decodeAnchorX(float x, float dx) {
-        if (ctx.canvasSize == null) return x + dx;
-
         if (x >= 0 && x <= 1) {
             return decodeX(x) + (dx * leftScale);
         } else if (x > 1 && x < 2) {
@@ -282,7 +282,7 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
         } else if (x >= 2 && x <= 3) {
             return decodeX(x) + (dx * rightScale);
         } else {
-            throw new AssertionError("Invalid x");
+            throw new IllegalArgumentException("Invalid x");
         }
     }
 
@@ -294,10 +294,10 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
      * @param y an encoded y value of the bezier control point (0...1, or 1...2, or 2...3)
      * @param dy the offset distance to the anchor from the control point y
      * @return the decoded y position of the control point
+     * @throws IllegalArgumentException
+     *      if {@code y < 0} or {@code y > 3}
      */
     protected final float decodeAnchorY(float y, float dy) {
-        if (ctx.canvasSize == null) return y + dy;
-
         if (y >= 0 && y <= 1) {
             return decodeY(y) + (dy * topScale);
         } else if (y > 1 && y < 2) {
@@ -305,7 +305,7 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
         } else if (y >= 2 && y <= 3) {
             return decodeY(y) + (dy * bottomScale);
         } else {
-            throw new AssertionError("Invalid y");
+            throw new IllegalArgumentException("Invalid y");
         }
     }
 
@@ -363,6 +363,15 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
      * @param midpoints
      * @param colors
      * @return a valid LinearGradientPaint. This method never returns null.
+     * @throws NullPointerException
+     *      if {@code midpoints} array is null,
+     *      or {@code colors} array is null,
+     * @throws IllegalArgumentException
+     *      if start and end points are the same points,
+     *      or {@code midpoints.length != colors.length},
+     *      or {@code colors} is less than 2 in size,
+     *      or a {@code midpoints} value is less than 0.0 or greater than 1.0,
+     *      or the {@code midpoints} are not provided in strictly increasing order
      */
     protected final LinearGradientPaint decodeGradient(float x1, float y1, float x2, float y2, float[] midpoints, Color[] colors) {
         if (x1 == x2 && y1 == y2) {
@@ -384,6 +393,15 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
      * @param midpoints
      * @param colors
      * @return a valid RadialGradientPaint. This method never returns null.
+     * @throws NullPointerException
+     *      if {@code midpoints} array is null,
+     *      or {@code colors} array is null
+     * @throws IllegalArgumentException
+     *      if {@code r} is non-positive,
+     *      or {@code midpoints.length != colors.length},
+     *      or {@code colors} is less than 2 in size,
+     *      or a {@code midpoints} value is less than 0.0 or greater than 1.0,
+     *      or the {@code midpoints} are not provided in strictly increasing order
      */
     protected final RadialGradientPaint decodeRadialGradient(float x, float y, float r, float[] midpoints, Color[] colors) {
         if (r == 0f) {
@@ -537,10 +555,10 @@ public abstract class AbstractRegionPainter implements Painter<JComponent> {
             this.maxVerticalScaleFactor = maxV;
 
             if (canvasSize != null) {
-                a = insets.left;
-                b = canvasSize.width - insets.right;
-                c = insets.top;
-                d = canvasSize.height - insets.bottom;
+                a = stretchingInsets.left;
+                b = canvasSize.width - stretchingInsets.right;
+                c = stretchingInsets.top;
+                d = canvasSize.height - stretchingInsets.bottom;
                 this.canvasSize = canvasSize;
                 this.inverted = inverted;
                 if (inverted) {
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/Defaults.template b/jdk/src/share/classes/javax/swing/plaf/nimbus/Defaults.template
index d9253ae591b..caff0b212a0 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/Defaults.template
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/Defaults.template
@@ -101,14 +101,7 @@ final class ${LAF_NAME}Defaults {
      */
     private FontUIResource defaultFont;
 
-    /**
-     * Map of lists of derived colors keyed by the DerivedColorKeys
-     */
-    private Map<DerivedColorKey, DerivedColor> derivedColorsMap =
-            new HashMap<DerivedColorKey, DerivedColor>();
-
-    /** Tempory key used for fetching from the derivedColorsMap */
-    private final DerivedColorKey tmpDCKey = new DerivedColorKey();
+    private ColorTree colorTree = new ColorTree();
 
     /** Listener for changes to user defaults table */
     private DefaultsListener defaultsListener = new DefaultsListener();
@@ -117,14 +110,14 @@ final class ${LAF_NAME}Defaults {
     void initialize() {
         // add listener for derived colors
         UIManager.addPropertyChangeListener(defaultsListener);
-        UIManager.getDefaults().addPropertyChangeListener(defaultsListener);
+        UIManager.getDefaults().addPropertyChangeListener(colorTree);
     }
 
     /** Called by UIManager when this look and feel is uninstalled. */
     void uninitialize() {
         // remove listener for derived colors
-        UIManager.getDefaults().removePropertyChangeListener(defaultsListener);
         UIManager.removePropertyChangeListener(defaultsListener);
+        UIManager.getDefaults().removePropertyChangeListener(colorTree);
     }
 
     /**
@@ -663,22 +656,23 @@ ${UI_DEFAULT_INIT}
         }
     }
 
-    /**
-     * Get a derived color, derived colors are shared instances and will be
-     * updated when its parent UIDefault color changes.
-     *
-     * @param uiDefaultParentName The parent UIDefault key
-     * @param hOffset The hue offset
-     * @param sOffset The saturation offset
-     * @param bOffset The brightness offset
-     * @param aOffset The alpha offset
-     * @return The stored derived color
-     */
-    public DerivedColor getDerivedColor(String uiDefaultParentName,
-                                        float hOffset, float sOffset,
-                                        float bOffset, int aOffset){
-        return getDerivedColor(uiDefaultParentName, hOffset, sOffset,
-                               bOffset, aOffset, true);
+    private void addColor(UIDefaults d, String uin, int r, int g, int b, int a) {
+        Color color = new ColorUIResource(new Color(r, g, b, a));
+        colorTree.addColor(uin, color);
+        d.put(uin, color);
+    }
+
+    private void addColor(UIDefaults d, String uin, String parentUin,
+            float hOffset, float sOffset, float bOffset, int aOffset) {
+        addColor(d, uin, parentUin, hOffset, sOffset, bOffset, aOffset, true);
+    }
+
+    private void addColor(UIDefaults d, String uin, String parentUin,
+            float hOffset, float sOffset, float bOffset,
+            int aOffset, boolean uiResource) {
+        Color color = getDerivedColor(uin, parentUin,
+                hOffset, sOffset, bOffset, aOffset, uiResource);
+        d.put(uin, color);
     }
 
     /**
@@ -694,89 +688,110 @@ ${UI_DEFAULT_INIT}
      *        false if it should not be a UIResource
      * @return The stored derived color
      */
-    public DerivedColor getDerivedColor(String uiDefaultParentName,
+    public DerivedColor getDerivedColor(String parentUin,
                                         float hOffset, float sOffset,
                                         float bOffset, int aOffset,
                                         boolean uiResource){
-        tmpDCKey.set(uiDefaultParentName, hOffset, sOffset, bOffset, aOffset,
-            uiResource);
-        DerivedColor color = derivedColorsMap.get(tmpDCKey);
-        if (color == null){
-            if (uiResource) {
-                color = new DerivedColor.UIResource(uiDefaultParentName,
-                        hOffset, sOffset, bOffset, aOffset);
-            } else {
-                color = new DerivedColor(uiDefaultParentName, hOffset, sOffset,
-                    bOffset, aOffset);
-            }
-            // calculate the initial value
-            color.rederiveColor();
-            // add the listener so that if the color changes we'll propogate it
-            color.addPropertyChangeListener(defaultsListener);
-            // add to the derived colors table
-            derivedColorsMap.put(new DerivedColorKey(uiDefaultParentName,
-                    hOffset, sOffset, bOffset, aOffset, uiResource),color);
-        }
-        return color;
+        return getDerivedColor(null, parentUin,
+                hOffset, sOffset, bOffset, aOffset, uiResource);
     }
 
-    /**
-     * Key class for derived colors
-     */
-    private class DerivedColorKey {
-        private String uiDefaultParentName;
-        private float hOffset, sOffset, bOffset;
-        private int aOffset;
-        private boolean uiResource;
-
-        DerivedColorKey(){}
-
-        DerivedColorKey(String uiDefaultParentName, float hOffset,
-                        float sOffset, float bOffset, int aOffset,
-                        boolean uiResource) {
-            set(uiDefaultParentName, hOffset, sOffset, bOffset, aOffset, uiResource);
+    private DerivedColor getDerivedColor(String uin, String parentUin,
+                                        float hOffset, float sOffset,
+                                        float bOffset, int aOffset,
+                                        boolean uiResource) {
+        DerivedColor color;
+        if (uiResource) {
+            color = new DerivedColor.UIResource(parentUin,
+                    hOffset, sOffset, bOffset, aOffset);
+        } else {
+            color = new DerivedColor(parentUin, hOffset, sOffset,
+                bOffset, aOffset);
         }
 
-        void set (String uiDefaultParentName, float hOffset,
-                        float sOffset, float bOffset, int aOffset,
-                        boolean uiResource) {
-            this.uiDefaultParentName = uiDefaultParentName;
-            this.hOffset = hOffset;
-            this.sOffset = sOffset;
-            this.bOffset = bOffset;
-            this.aOffset = aOffset;
-            this.uiResource = uiResource;
+        if (derivedColors.containsKey(color)) {
+            return derivedColors.get(color);
+        } else {
+            derivedColors.put(color, color);
+            color.rederiveColor(); /// move to ARP.decodeColor() ?
+            colorTree.addColor(uin, color);
+            return color;
+        }
+    }
+
+    private Map<DerivedColor, DerivedColor> derivedColors =
+            new HashMap<DerivedColor, DerivedColor>();
+
+    private class ColorTree implements PropertyChangeListener {
+        private Node root = new Node(null, null);
+        private Map<String, Node> nodes = new HashMap<String, Node>();
+
+        public Color getColor(String uin) {
+            return nodes.get(uin).color;
+        }
+
+        public void addColor(String uin, Color color) {
+            Node parent = getParentNode(color);
+            Node node = new Node(color, parent);
+            parent.children.add(node);
+            if (uin != null) {
+                nodes.put(uin, node);
+            }
+        }
+
+        private Node getParentNode(Color color) {
+            Node parent = root;
+            if (color instanceof DerivedColor) {
+                String parentUin = ((DerivedColor)color).getUiDefaultParentName();
+                Node p = nodes.get(parentUin);
+                if (p != null) {
+                    parent = p;
+                }
+            }
+            return parent;
+        }
+
+        public void update() {
+            root.update();
         }
 
         @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof DerivedColorKey)) return false;
-            DerivedColorKey that = (DerivedColorKey) o;
-            if (aOffset != that.aOffset) return false;
-            if (Float.compare(that.bOffset, bOffset) != 0) return false;
-            if (Float.compare(that.hOffset, hOffset) != 0) return false;
-            if (Float.compare(that.sOffset, sOffset) != 0) return false;
-            if (uiDefaultParentName != null ?
-                !uiDefaultParentName.equals(that.uiDefaultParentName) :
-                that.uiDefaultParentName != null) return false;
-            if (this.uiResource != that.uiResource) return false;
-            return true;
+        public void propertyChange(PropertyChangeEvent ev) {
+            String name = ev.getPropertyName();
+            Node node = nodes.get(name);
+            if (node != null) {
+                // this is a registered color
+                node.parent.children.remove(node);
+                Color color = (Color) ev.getNewValue();
+                Node parent = getParentNode(color);
+                node.set(color, parent);
+                parent.children.add(node);
+                node.update();
+            }
         }
 
-        @Override
-        public int hashCode() {
-            int result = super.hashCode();
-            result = 31 * result + uiDefaultParentName.hashCode();
-            result = 31 * result + hOffset != +0.0f ?
-                    Float.floatToIntBits(hOffset) : 0;
-            result = 31 * result + sOffset != +0.0f ?
-                    Float.floatToIntBits(sOffset) : 0;
-            result = 31 * result + bOffset != +0.0f ?
-                    Float.floatToIntBits(bOffset) : 0;
-            result = 31 * result + aOffset;
-            result = 31 * result + (uiResource ? 1 : 0);
-            return result;
+        class Node {
+            Color color;
+            Node parent;
+            List<Node> children = new LinkedList<Node>();
+
+            Node(Color color, Node parent) {
+                set(color, parent);
+            }
+
+            public void set(Color color, Node parent) {
+                this.color = color;
+                this.parent = parent;
+            }
+
+            public void update() {
+                if (color instanceof DerivedColor) {
+                    ((DerivedColor)color).rederiveColor();
+                }
+                for (Node child: children) {
+                    child.update();
+                }
+            }
         }
     }
 
@@ -786,49 +801,12 @@ ${UI_DEFAULT_INIT}
     private class DefaultsListener implements PropertyChangeListener {
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
-            Object src = evt.getSource();
-            String key = evt.getPropertyName();
-            if (key.equals("lookAndFeel")){
+            if ("lookAndFeel".equals(evt.getPropertyName())) {
                 // LAF has been installed, this is the first point at which we
                 // can access our defaults table via UIManager so before now
                 // all derived colors will be incorrect.
                 // First we need to update
-                for (DerivedColor color : derivedColorsMap.values()) {
-                    color.rederiveColor();
-                }
-            } else if (src instanceof DerivedColor && key.equals("rgb")) {
-                // derived color that is in UIManager defaults has changed
-                // update all its dependent colors. Don't worry about doing
-                // this recursively since calling rederiveColor will cause
-                // another PCE to be fired, ending up here and essentially
-                // recursing
-                DerivedColor parentColor = (DerivedColor)src;
-                String parentKey = null;
-                Set<Map.Entry<Object,Object>> entries =
-                        UIManager.getDefaults().entrySet();
-                
-                for (Map.Entry entry : entries) {
-                    Object value = entry.getValue();
-                    if (value == parentColor) {
-                        parentKey = entry.getKey().toString();
-                    }
-                }
-                
-                if (parentKey == null) {
-                    //couldn't find the DerivedColor in the UIDefaults map,
-                    //so we just bail.
-                    return;
-                }
-                
-                for (Map.Entry entry : entries) {
-                    Object value = entry.getValue();
-                    if (value instanceof DerivedColor) {
-                        DerivedColor color = (DerivedColor)entry.getValue();
-                        if (parentKey.equals(color.getUiDefaultParentName())) {
-                            color.rederiveColor();
-                        }
-                    }
-                }
+                colorTree.update();
             }
         }
     }
@@ -875,4 +853,3 @@ ${UI_DEFAULT_INIT}
         }
     }
 }
-
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java b/jdk/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
index 20b7b1aacec..56bac5f4fb6 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
@@ -39,8 +39,6 @@ import java.beans.PropertyChangeListener;
  * @author Jasper Potts
  */
 class DerivedColor extends Color {
-    private final PropertyChangeSupport changeSupport =
-            new PropertyChangeSupport(this);
     private final String uiDefaultParentName;
     private final float hOffset, sOffset, bOffset;
     private final int aOffset;
@@ -79,7 +77,6 @@ class DerivedColor extends Color {
      * Recalculate the derived color from the UIManager parent color and offsets
      */
     public void rederiveColor() {
-        int old = argbValue;
         Color src = UIManager.getColor(uiDefaultParentName);
         if (src != null) {
             float[] tmp = Color.RGBtoHSB(src.getRed(), src.getGreen(), src.getBlue(), null);
@@ -97,7 +94,6 @@ class DerivedColor extends Color {
             int alpha = clamp(aOffset);
             argbValue = (Color.HSBtoRGB(tmp[0], tmp[1], tmp[2]) & 0xFFFFFF) | (alpha << 24);
         }
-        changeSupport.firePropertyChange("rgb", old, argbValue);
     }
 
     /**
@@ -141,35 +137,6 @@ class DerivedColor extends Color {
         return result;
     }
 
-     /**
-     * Add a PropertyChangeListener to the listener list.
-     * The listener is registered for all properties.
-     * The same listener object may be added more than once, and will be called
-     * as many times as it is added.
-     * If <code>listener</code> is null, no exception is thrown and no action
-     * is taken.
-     *
-     * @param listener  The PropertyChangeListener to be added
-     */
-    public void addPropertyChangeListener(PropertyChangeListener listener) {
-        changeSupport.addPropertyChangeListener(listener);
-    }
-
-    /**
-     * Remove a PropertyChangeListener from the listener list.
-     * This removes a PropertyChangeListener that was registered
-     * for all properties.
-     * If <code>listener</code> was added more than once to the same event
-     * source, it will be notified one less time after being removed.
-     * If <code>listener</code> is null, or was never added, no exception is
-     * thrown and no action is taken.
-     *
-     * @param listener  The PropertyChangeListener to be removed
-     */
-    public void removePropertyChangeListener(PropertyChangeListener listener) {
-        changeSupport.removePropertyChangeListener(listener);
-    }
-
     private float clamp(float value) {
         if (value < 0) {
             value = 0;
@@ -211,5 +178,15 @@ class DerivedColor extends Color {
                    float bOffset, int aOffset) {
             super(uiDefaultParentName, hOffset, sOffset, bOffset, aOffset);
         }
+
+        @Override
+        public boolean equals(Object o) {
+            return (o instanceof UIResource) && super.equals(o);
+        }
+
+        @Override
+        public int hashCode() {
+            return super.hashCode() + 7;
+        }
     }
 }
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
index 921ca0ea74c..f96a03c9045 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java
@@ -84,6 +84,8 @@ class NimbusIcon extends SynthIcon {
                         translatex = 1;
                     }
                 }
+            } else if (c instanceof JMenu) {
+                flip = ! c.getComponentOrientation().isLeftToRight();
             }
             if (g instanceof Graphics2D){
                 Graphics2D gfx = (Graphics2D)g;
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
index 8c5d121b7e1..3f100bc811b 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
@@ -40,6 +40,9 @@ import java.awt.Container;
 import java.awt.Graphics2D;
 import java.awt.LayoutManager;
 import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.*;
 import javax.swing.GrayFilter;
 import javax.swing.Icon;
 import javax.swing.JToolBar;
@@ -87,6 +90,8 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
      */
     private UIDefaults uiDefaults;
 
+    private DefaultsListener defaultsListener = new DefaultsListener();
+
     /**
      * Create a new NimbusLookAndFeel.
      */
@@ -115,8 +120,7 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
         defaults.uninitialize();
         // clear all cached images to free memory
         ImageCache.getInstance().flush();
-        // remove the listeners and things installed by NimbusStyle
-        NimbusStyle.uninitialize();
+        UIManager.getDefaults().removePropertyChangeListener(defaultsListener);
     }
 
     /**
@@ -515,4 +519,62 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
             return obj;
         }
     }
+
+    private Map<String, Map<String, Object>> compiledDefaults = null;
+    private boolean defaultListenerAdded = false;
+
+    static String parsePrefix(String key) {
+        if (key == null) {
+            return null;
+        }
+        boolean inquotes = false;
+        for (int i = 0; i < key.length(); i++) {
+            char c = key.charAt(i);
+            if (c == '"') {
+                inquotes = !inquotes;
+            } else if ((c == '[' || c == '.') && !inquotes) {
+                return key.substring(0, i);
+            }
+        }
+        return null;
+    }
+
+    Map<String, Object> getDefaultsForPrefix(String prefix) {
+        if (compiledDefaults == null) {
+            compiledDefaults = new HashMap<String, Map<String, Object>>();
+            for (Map.Entry<Object, Object> entry: UIManager.getDefaults().entrySet()) {
+                if (entry.getKey() instanceof String) {
+                    addDefault((String) entry.getKey(), entry.getValue());
+                }
+            }
+            if (! defaultListenerAdded) {
+                UIManager.getDefaults().addPropertyChangeListener(defaultsListener);
+                defaultListenerAdded = true;
+            }
+        }
+        return compiledDefaults.get(prefix);
+    }
+
+    private void addDefault(String key, Object value) {
+        String prefix = parsePrefix(key);
+        if (prefix != null) {
+            Map<String, Object> keys = compiledDefaults.get(prefix);
+            if (keys == null) {
+                keys = new HashMap<String, Object>();
+                compiledDefaults.put(prefix, keys);
+            }
+            keys.put(key, value);
+        }
+    }
+
+    private class DefaultsListener implements PropertyChangeListener {
+        @Override public void propertyChange(PropertyChangeEvent ev) {
+            String key = ev.getPropertyName();
+            if ("UIDefaults".equals(key)) {
+                compiledDefaults = null;
+            } else {
+                addDefault(key, ev.getNewValue());
+            }
+        }
+    }
 }
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
index 04efc91cf01..a8f8b3fc5b6 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java
@@ -26,7 +26,6 @@ package javax.swing.plaf.nimbus;
 
 import javax.swing.Painter;
 
-import java.beans.PropertyChangeEvent;
 import javax.swing.JComponent;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
@@ -39,16 +38,13 @@ import javax.swing.plaf.synth.SynthStyle;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Insets;
-import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import sun.awt.AppContext;
 
 /**
  * <p>A SynthStyle implementation used by Nimbus. Each Region that has been
@@ -232,42 +228,6 @@ public final class NimbusStyle extends SynthStyle {
         super.installDefaults(ctx);
     }
 
-    static String parsePrefix(String key) {
-       if (key == null) return null;
-       boolean inquotes = false;
-       for (int i=0; i<key.length(); i++) {
-           char c = key.charAt(i);
-           if (c == '"') {
-               inquotes = !inquotes;
-           } else if ((c == '[' || c == '.') && !inquotes) {
-               return key.substring(0, i);
-           }
-       }
-       return null;
-    }
-
-    /**
-     * Called by NimbusLookAndFeel when the look and feel is being uninstalled.
-     * Performs general cleanup of any app-context specific data.
-     */
-    static void uninitialize() {
-        // get the appcontext that we've stored data in
-        AppContext ctx = AppContext.getAppContext();
-
-        // get the pcl stored in app context
-        PropertyChangeListener pcl = (PropertyChangeListener)
-                ctx.get("NimbusStyle.defaults.pcl");
-
-        // if the pcl exists, uninstall it from the UIDefaults tables
-        if (pcl != null) {
-            UIManager.getDefaults().removePropertyChangeListener(pcl);
-            UIManager.getLookAndFeelDefaults().removePropertyChangeListener(pcl);
-        }
-
-        // clear out the compiled defaults
-        ctx.put("NimbusStyle.defaults", null);
-    }
-
     /**
      * Pulls data out of UIDefaults, if it has not done so already, and sets
      * up the internal state.
@@ -283,66 +243,9 @@ public final class NimbusStyle extends SynthStyle {
         // any Nimbus.Overrides)
         values = new Values();
 
-        // the profiler revealed that a great deal of CPU time and useless
-        // garbage was being produced by this method and the init method. One
-        // culprit was the creation and reparsing of the entire UIDefaults
-        // map on each call to this method where "values" was null. It turns
-        // out this was happening a lot.
-        // To remove this bottleneck, we store the compiled TreeMaps of defaults
-        // in the appContext for reuse. It is nulled whenever the UIDefaults
-        // changes and recomputed when necessary.
-        final AppContext ctx = AppContext.getAppContext();
-
-        // fetch the defaults from the app context. If null, then create and
-        // store the compiled defaults
-        Map<String, TreeMap<String, Object>> compiledDefaults =
-                (Map<String, TreeMap<String, Object>>)
-                    ctx.get("NimbusStyle.defaults");
-
-        if (compiledDefaults == null) {
-            // the entire UIDefaults tables are parsed and compiled into
-            // this map of maps. The key of the compiledDefaults is the
-            // prefix for each style, while the value is a map of
-            // keys->values for that prefix.
-            compiledDefaults = new HashMap<String, TreeMap<String, Object>>();
-
-            // get all the defaults from UIManager.getDefaults() and put them
-            // into the compiledDefaults
-            compileDefaults(compiledDefaults, UIManager.getDefaults());
-
-            // This second statement pulls defaults from the laf defaults
-            UIDefaults lafDefaults = UIManager.getLookAndFeelDefaults();
-            compileDefaults(compiledDefaults, lafDefaults);
-
-            // if it has not already been done, add a listener to both
-            // UIManager.getDefaults() and UIManager.getLookAndFeelDefaults().
-            PropertyChangeListener pcl = (PropertyChangeListener)
-                    ctx.get("NimbusStyle.defaults.pcl");
-
-            // if pcl is null, then it has not yet been registered with
-            // the UIManager defaults for this app context
-            if (pcl == null) {
-                // create a PCL which will simply clear out the compiled
-                // defaults from the app context, causing it to be recomputed
-                // on subsequent passes
-                pcl = new DefaultsListener();
-                // add the PCL to both defaults tables that we pay attention
-                // to, so that if the UIDefaults are updated, then the
-                // precompiled defaults will be cleared from the app context
-                // and recomputed on subsequent passes
-                UIManager.getDefaults().addPropertyChangeListener(pcl);
-                UIManager.getLookAndFeelDefaults().addPropertyChangeListener(pcl);
-                // save the PCL to the app context as a marker indicating
-                // that the PCL has been registered so we don't end up adding
-                // more than one listener to the UIDefaults tables.
-                ctx.put("NimbusStyle.defaults.pcl", pcl);
-            }
-
-            // store the defaults for reuse
-            ctx.put("NimbusStyle.defaults", compiledDefaults);
-        }
-
-        TreeMap<String, Object> defaults = compiledDefaults.get(prefix);
+        Map<String, Object> defaults =
+                ((NimbusLookAndFeel) UIManager.getLookAndFeel()).
+                        getDefaultsForPrefix(prefix);
 
         // inspect the client properties for the key "Nimbus.Overrides". If the
         // value is an instance of UIDefaults, then these defaults are used
@@ -371,52 +274,6 @@ public final class NimbusStyle extends SynthStyle {
             }
         }
 
-        // Now that I've accumulated all the defaults pertaining to this
-        // style, call init which will read these defaults and configure
-        // the default "values".
-        init(values, defaults);
-    }
-
-    /**
-     * Iterates over all the keys in the specified UIDefaults and compiles
-     * those keys into the comiledDefaults data structure. It relies on
-     * parsing the "prefix" out of the key. If the key is not a String or is
-     * null then it is ignored. In all other cases a prefix is parsed out
-     * (even if that prefix is the empty String or is a "fake" prefix. That
-     * is, suppose you had a key Foo~~MySpecial.KeyThing~~. In this case this
-     * is not a Nimbus formatted key, but we don't care, we treat it as if it
-     * is. This doesn't pose any harm, it will simply never be used).
-     *
-     * @param compiledDefaults
-     * @param d
-     */
-    private void compileDefaults(
-            Map<String, TreeMap<String,Object>> compiledDefaults,
-            UIDefaults d) {
-        for (Object obj : new HashSet(d.keySet())) {
-            if (obj instanceof String) {
-                String key = (String)obj;
-                String kp = parsePrefix(key);
-                if (kp == null) continue;
-                TreeMap<String,Object> map = compiledDefaults.get(kp);
-                if (map == null) {
-                    map = new TreeMap<String,Object>();
-                    compiledDefaults.put(kp, map);
-                }
-                map.put(key, d.get(key));
-            }
-        }
-    }
-
-    /**
-     * Initializes the given <code>Values</code> object with the defaults
-     * contained in the given TreeMap.
-     *
-     * @param v The Values object to be initialized
-     * @param myDefaults a map of UIDefaults to use in initializing the Values.
-     *        This map must contain only keys associated with this Style.
-     */
-    private void init(Values v, TreeMap<String, Object> myDefaults) {
         //a list of the different types of states used by this style. This
         //list may contain only "standard" states (those defined by Synth),
         //or it may contain custom states, or it may contain only "standard"
@@ -433,7 +290,7 @@ public final class NimbusStyle extends SynthStyle {
         //"values" stateTypes to be a non-null array.
         //Otherwise, let the "values" stateTypes be null to indicate that
         //there are no custom states or custom state ordering
-        String statesString = (String)myDefaults.get(prefix + ".States");
+        String statesString = (String)defaults.get(prefix + ".States");
         if (statesString != null) {
             String s[] = statesString.split(",");
             for (int i=0; i<s.length; i++) {
@@ -442,7 +299,7 @@ public final class NimbusStyle extends SynthStyle {
                     //this is a non-standard state name, so look for the
                     //custom state associated with it
                     String stateName = prefix + "." + s[i];
-                    State customState = (State)myDefaults.get(stateName);
+                    State customState = (State)defaults.get(stateName);
                     if (customState != null) {
                         states.add(customState);
                     }
@@ -455,7 +312,7 @@ public final class NimbusStyle extends SynthStyle {
             //to be non-null. Otherwise, leave it null (meaning, use the
             //standard synth states).
             if (states.size() > 0) {
-                v.stateTypes = states.toArray(new State[states.size()]);
+                values.stateTypes = states.toArray(new State[states.size()]);
             }
 
             //assign codes for each of the state types
@@ -490,7 +347,7 @@ public final class NimbusStyle extends SynthStyle {
         }
 
         //Now iterate over all the keys in the defaults table
-        for (String key : myDefaults.keySet()) {
+        for (String key : defaults.keySet()) {
             //The key is something like JButton.Enabled.backgroundPainter,
             //or JButton.States, or JButton.background.
             //Remove the "JButton." portion of the key
@@ -528,11 +385,11 @@ public final class NimbusStyle extends SynthStyle {
                 //otherwise, assume it is a property and install it on the
                 //values object
                 if ("contentMargins".equals(property)) {
-                    v.contentMargins = (Insets)myDefaults.get(key);
+                    values.contentMargins = (Insets)defaults.get(key);
                 } else if ("States".equals(property)) {
                     //ignore
                 } else {
-                    v.defaults.put(property, myDefaults.get(key));
+                    values.defaults.put(property, defaults.get(key));
                 }
             } else {
                 //it is possible that the developer has a malformed UIDefaults
@@ -582,13 +439,13 @@ public final class NimbusStyle extends SynthStyle {
                 //so put it in the UIDefaults associated with that runtime
                 //state
                 if ("backgroundPainter".equals(property)) {
-                    rs.backgroundPainter = (Painter)myDefaults.get(key);
+                    rs.backgroundPainter = getPainter(defaults, key);
                 } else if ("foregroundPainter".equals(property)) {
-                    rs.foregroundPainter = (Painter) myDefaults.get(key);
+                    rs.foregroundPainter = getPainter(defaults, key);
                 } else if ("borderPainter".equals(property)) {
-                    rs.borderPainter = (Painter) myDefaults.get(key);
+                    rs.borderPainter = getPainter(defaults, key);
                 } else {
-                    rs.defaults.put(property, myDefaults.get(key));
+                    rs.defaults.put(property, defaults.get(key));
                 }
             }
         }
@@ -598,7 +455,15 @@ public final class NimbusStyle extends SynthStyle {
         Collections.sort(runtimeStates, STATE_COMPARATOR);
 
         //finally, set the array of runtime states on the values object
-        v.states = runtimeStates.toArray(new RuntimeState[runtimeStates.size()]);
+        values.states = runtimeStates.toArray(new RuntimeState[runtimeStates.size()]);
+    }
+
+    private Painter getPainter(Map<String, Object> defaults, String key) {
+        Object p = defaults.get(key);
+        if (p instanceof UIDefaults.LazyValue) {
+            p = ((UIDefaults.LazyValue)p).createValue(UIManager.getDefaults());
+        }
+        return (p instanceof Painter ? (Painter)p : null);
     }
 
     /**
@@ -1245,15 +1110,4 @@ public final class NimbusStyle extends SynthStyle {
             return hash;
         }
     }
-
-    /**
-     * This listener is used to listen to the UIDefaults tables and clear out
-     * the cached-precompiled map of defaults in that case.
-     */
-    private static final class DefaultsListener implements PropertyChangeListener {
-        @Override
-        public void propertyChange(PropertyChangeEvent evt) {
-            AppContext.getAppContext().put("NimbusStyle.defaults", null);
-        }
-    }
 }
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/Region.java b/jdk/src/share/classes/javax/swing/plaf/synth/Region.java
index c7de782ba59..1ecd999896d 100644
--- a/jdk/src/share/classes/javax/swing/plaf/synth/Region.java
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/Region.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  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
@@ -24,8 +24,13 @@
  */
 package javax.swing.plaf.synth;
 
-import javax.swing.*;
-import java.util.*;
+import sun.awt.AppContext;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import javax.swing.JComponent;
+import javax.swing.UIDefaults;
 
 /**
  * A distinct rendering area of a Swing component.  A component may
@@ -67,8 +72,8 @@ import java.util.*;
  * @author Scott Violet
  */
 public class Region {
-    private static final Map<String, Region> uiToRegionMap = new HashMap<String, Region>();
-    private static final Map<Region, String> lowerCaseNameMap = new HashMap<Region, String>();
+    private static final Object UI_TO_REGION_MAP_KEY = new Object();
+    private static final Object LOWER_CASE_NAME_MAP_KEY = new Object();
 
     /**
      * ArrowButton's are special types of buttons that also render a
@@ -77,396 +82,433 @@ public class Region {
      * To bind a style to this <code>Region</code> use the name
      * <code>ArrowButton</code>.
      */
-    public static final Region ARROW_BUTTON = new Region("ArrowButton",
-                                                         "ArrowButtonUI");
+    public static final Region ARROW_BUTTON = new Region("ArrowButton", false);
 
     /**
      * Button region. To bind a style to this <code>Region</code> use the name
      * <code>Button</code>.
      */
-    public static final Region BUTTON = new Region("Button",
-                                                   "ButtonUI");
+    public static final Region BUTTON = new Region("Button", false);
 
     /**
      * CheckBox region. To bind a style to this <code>Region</code> use the name
      * <code>CheckBox</code>.
      */
-    public static final Region CHECK_BOX = new Region("CheckBox",
-                                                   "CheckBoxUI");
+    public static final Region CHECK_BOX = new Region("CheckBox", false);
 
     /**
      * CheckBoxMenuItem region. To bind a style to this <code>Region</code> use
      * the name <code>CheckBoxMenuItem</code>.
      */
-    public static final Region CHECK_BOX_MENU_ITEM = new Region(
-                                     "CheckBoxMenuItem", "CheckBoxMenuItemUI");
+    public static final Region CHECK_BOX_MENU_ITEM = new Region("CheckBoxMenuItem", false);
 
     /**
      * ColorChooser region. To bind a style to this <code>Region</code> use
      * the name <code>ColorChooser</code>.
      */
-    public static final Region COLOR_CHOOSER = new Region(
-                                     "ColorChooser", "ColorChooserUI");
+    public static final Region COLOR_CHOOSER = new Region("ColorChooser", false);
 
     /**
      * ComboBox region. To bind a style to this <code>Region</code> use
      * the name <code>ComboBox</code>.
      */
-    public static final Region COMBO_BOX = new Region(
-                                     "ComboBox", "ComboBoxUI");
+    public static final Region COMBO_BOX = new Region("ComboBox", false);
 
     /**
      * DesktopPane region. To bind a style to this <code>Region</code> use
      * the name <code>DesktopPane</code>.
      */
-    public static final Region DESKTOP_PANE = new Region("DesktopPane",
-                                                         "DesktopPaneUI");
+    public static final Region DESKTOP_PANE = new Region("DesktopPane", false);
+
     /**
      * DesktopIcon region. To bind a style to this <code>Region</code> use
      * the name <code>DesktopIcon</code>.
      */
-    public static final Region DESKTOP_ICON = new Region("DesktopIcon",
-                                                         "DesktopIconUI");
+    public static final Region DESKTOP_ICON = new Region("DesktopIcon", false);
 
     /**
      * EditorPane region. To bind a style to this <code>Region</code> use
      * the name <code>EditorPane</code>.
      */
-    public static final Region EDITOR_PANE = new Region("EditorPane",
-                                                        "EditorPaneUI");
+    public static final Region EDITOR_PANE = new Region("EditorPane", false);
 
     /**
      * FileChooser region. To bind a style to this <code>Region</code> use
      * the name <code>FileChooser</code>.
      */
-    public static final Region FILE_CHOOSER = new Region("FileChooser",
-                                                         "FileChooserUI");
+    public static final Region FILE_CHOOSER = new Region("FileChooser", false);
 
     /**
      * FormattedTextField region. To bind a style to this <code>Region</code> use
      * the name <code>FormattedTextField</code>.
      */
-    public static final Region FORMATTED_TEXT_FIELD = new Region(
-                            "FormattedTextField", "FormattedTextFieldUI");
+    public static final Region FORMATTED_TEXT_FIELD = new Region("FormattedTextField", false);
 
     /**
      * InternalFrame region. To bind a style to this <code>Region</code> use
      * the name <code>InternalFrame</code>.
      */
-    public static final Region INTERNAL_FRAME = new Region("InternalFrame",
-                                                           "InternalFrameUI");
+    public static final Region INTERNAL_FRAME = new Region("InternalFrame", false);
+
     /**
      * TitlePane of an InternalFrame. The TitlePane typically
      * shows a menu, title, widgets to manipulate the internal frame.
      * To bind a style to this <code>Region</code> use the name
      * <code>InternalFrameTitlePane</code>.
      */
-    public static final Region INTERNAL_FRAME_TITLE_PANE =
-                         new Region("InternalFrameTitlePane",
-                                    "InternalFrameTitlePaneUI");
+    public static final Region INTERNAL_FRAME_TITLE_PANE = new Region("InternalFrameTitlePane", false);
 
     /**
      * Label region. To bind a style to this <code>Region</code> use the name
      * <code>Label</code>.
      */
-    public static final Region LABEL = new Region("Label", "LabelUI");
+    public static final Region LABEL = new Region("Label", false);
 
     /**
      * List region. To bind a style to this <code>Region</code> use the name
      * <code>List</code>.
      */
-    public static final Region LIST = new Region("List", "ListUI");
+    public static final Region LIST = new Region("List", false);
 
     /**
      * Menu region. To bind a style to this <code>Region</code> use the name
      * <code>Menu</code>.
      */
-    public static final Region MENU = new Region("Menu", "MenuUI");
+    public static final Region MENU = new Region("Menu", false);
 
     /**
      * MenuBar region. To bind a style to this <code>Region</code> use the name
      * <code>MenuBar</code>.
      */
-    public static final Region MENU_BAR = new Region("MenuBar", "MenuBarUI");
+    public static final Region MENU_BAR = new Region("MenuBar", false);
 
     /**
      * MenuItem region. To bind a style to this <code>Region</code> use the name
      * <code>MenuItem</code>.
      */
-    public static final Region MENU_ITEM = new Region("MenuItem","MenuItemUI");
+    public static final Region MENU_ITEM = new Region("MenuItem", false);
 
     /**
      * Accelerator region of a MenuItem. To bind a style to this
      * <code>Region</code> use the name <code>MenuItemAccelerator</code>.
      */
-    public static final Region MENU_ITEM_ACCELERATOR = new Region(
-                                         "MenuItemAccelerator");
+    public static final Region MENU_ITEM_ACCELERATOR = new Region("MenuItemAccelerator", true);
 
     /**
      * OptionPane region. To bind a style to this <code>Region</code> use
      * the name <code>OptionPane</code>.
      */
-    public static final Region OPTION_PANE = new Region("OptionPane",
-                                                        "OptionPaneUI");
+    public static final Region OPTION_PANE = new Region("OptionPane", false);
 
     /**
      * Panel region. To bind a style to this <code>Region</code> use the name
      * <code>Panel</code>.
      */
-    public static final Region PANEL = new Region("Panel", "PanelUI");
+    public static final Region PANEL = new Region("Panel", false);
 
     /**
      * PasswordField region. To bind a style to this <code>Region</code> use
      * the name <code>PasswordField</code>.
      */
-    public static final Region PASSWORD_FIELD = new Region("PasswordField",
-                                                           "PasswordFieldUI");
+    public static final Region PASSWORD_FIELD = new Region("PasswordField", false);
 
     /**
      * PopupMenu region. To bind a style to this <code>Region</code> use
      * the name <code>PopupMenu</code>.
      */
-    public static final Region POPUP_MENU = new Region("PopupMenu",
-                                                       "PopupMenuUI");
+    public static final Region POPUP_MENU = new Region("PopupMenu", false);
 
     /**
      * PopupMenuSeparator region. To bind a style to this <code>Region</code>
      * use the name <code>PopupMenuSeparator</code>.
      */
-    public static final Region POPUP_MENU_SEPARATOR = new Region(
-                           "PopupMenuSeparator", "PopupMenuSeparatorUI");
+    public static final Region POPUP_MENU_SEPARATOR = new Region("PopupMenuSeparator", false);
 
     /**
      * ProgressBar region. To bind a style to this <code>Region</code>
      * use the name <code>ProgressBar</code>.
      */
-    public static final Region PROGRESS_BAR = new Region("ProgressBar",
-                                                         "ProgressBarUI");
+    public static final Region PROGRESS_BAR = new Region("ProgressBar", false);
 
     /**
      * RadioButton region. To bind a style to this <code>Region</code>
      * use the name <code>RadioButton</code>.
      */
-    public static final Region RADIO_BUTTON = new Region(
-                               "RadioButton", "RadioButtonUI");
+    public static final Region RADIO_BUTTON = new Region("RadioButton", false);
 
     /**
      * RegionButtonMenuItem region. To bind a style to this <code>Region</code>
      * use the name <code>RadioButtonMenuItem</code>.
      */
-    public static final Region RADIO_BUTTON_MENU_ITEM = new Region(
-                               "RadioButtonMenuItem", "RadioButtonMenuItemUI");
+    public static final Region RADIO_BUTTON_MENU_ITEM = new Region("RadioButtonMenuItem", false);
 
     /**
      * RootPane region. To bind a style to this <code>Region</code> use
      * the name <code>RootPane</code>.
      */
-    public static final Region ROOT_PANE = new Region("RootPane",
-                                                      "RootPaneUI");
+    public static final Region ROOT_PANE = new Region("RootPane", false);
 
     /**
      * ScrollBar region. To bind a style to this <code>Region</code> use
      * the name <code>ScrollBar</code>.
      */
-    public static final Region SCROLL_BAR = new Region("ScrollBar",
-                                                       "ScrollBarUI");
+    public static final Region SCROLL_BAR = new Region("ScrollBar", false);
+
     /**
      * Track of the ScrollBar. To bind a style to this <code>Region</code> use
      * the name <code>ScrollBarTrack</code>.
      */
-    public static final Region SCROLL_BAR_TRACK = new Region("ScrollBarTrack");
+    public static final Region SCROLL_BAR_TRACK = new Region("ScrollBarTrack", true);
+
     /**
      * Thumb of the ScrollBar. The thumb is the region of the ScrollBar
      * that gives a graphical depiction of what percentage of the View is
      * currently visible. To bind a style to this <code>Region</code> use
      * the name <code>ScrollBarThumb</code>.
      */
-    public static final Region SCROLL_BAR_THUMB = new Region("ScrollBarThumb");
+    public static final Region SCROLL_BAR_THUMB = new Region("ScrollBarThumb", true);
 
     /**
      * ScrollPane region. To bind a style to this <code>Region</code> use
      * the name <code>ScrollPane</code>.
      */
-    public static final Region SCROLL_PANE = new Region("ScrollPane",
-                                                        "ScrollPaneUI");
+    public static final Region SCROLL_PANE = new Region("ScrollPane", false);
 
     /**
      * Separator region. To bind a style to this <code>Region</code> use
      * the name <code>Separator</code>.
      */
-    public static final Region SEPARATOR = new Region("Separator",
-                                                      "SeparatorUI");
+    public static final Region SEPARATOR = new Region("Separator", false);
 
     /**
      * Slider region. To bind a style to this <code>Region</code> use
      * the name <code>Slider</code>.
      */
-    public static final Region SLIDER = new Region("Slider", "SliderUI");
+    public static final Region SLIDER = new Region("Slider", false);
+
     /**
      * Track of the Slider. To bind a style to this <code>Region</code> use
      * the name <code>SliderTrack</code>.
      */
-    public static final Region SLIDER_TRACK = new Region("SliderTrack");
+    public static final Region SLIDER_TRACK = new Region("SliderTrack", true);
+
     /**
      * Thumb of the Slider. The thumb of the Slider identifies the current
      * value. To bind a style to this <code>Region</code> use the name
      * <code>SliderThumb</code>.
      */
-    public static final Region SLIDER_THUMB = new Region("SliderThumb");
+    public static final Region SLIDER_THUMB = new Region("SliderThumb", true);
 
     /**
      * Spinner region. To bind a style to this <code>Region</code> use the name
      * <code>Spinner</code>.
      */
-    public static final Region SPINNER = new Region("Spinner", "SpinnerUI");
+    public static final Region SPINNER = new Region("Spinner", false);
 
     /**
      * SplitPane region. To bind a style to this <code>Region</code> use the name
      * <code>SplitPane</code>.
      */
-    public static final Region SPLIT_PANE = new Region("SplitPane",
-                                                      "SplitPaneUI");
+    public static final Region SPLIT_PANE = new Region("SplitPane", false);
 
     /**
      * Divider of the SplitPane. To bind a style to this <code>Region</code>
      * use the name <code>SplitPaneDivider</code>.
      */
-    public static final Region SPLIT_PANE_DIVIDER = new Region(
-                                        "SplitPaneDivider");
+    public static final Region SPLIT_PANE_DIVIDER = new Region("SplitPaneDivider", true);
 
     /**
      * TabbedPane region. To bind a style to this <code>Region</code> use
      * the name <code>TabbedPane</code>.
      */
-    public static final Region TABBED_PANE = new Region("TabbedPane",
-                                                        "TabbedPaneUI");
+    public static final Region TABBED_PANE = new Region("TabbedPane", false);
+
     /**
      * Region of a TabbedPane for one tab. To bind a style to this
      * <code>Region</code> use the name <code>TabbedPaneTab</code>.
      */
-    public static final Region TABBED_PANE_TAB = new Region("TabbedPaneTab");
+    public static final Region TABBED_PANE_TAB = new Region("TabbedPaneTab", true);
+
     /**
      * Region of a TabbedPane containing the tabs. To bind a style to this
      * <code>Region</code> use the name <code>TabbedPaneTabArea</code>.
      */
-    public static final Region TABBED_PANE_TAB_AREA =
-                                 new Region("TabbedPaneTabArea");
+    public static final Region TABBED_PANE_TAB_AREA = new Region("TabbedPaneTabArea", true);
+
     /**
      * Region of a TabbedPane containing the content. To bind a style to this
      * <code>Region</code> use the name <code>TabbedPaneContent</code>.
      */
-    public static final Region TABBED_PANE_CONTENT =
-                                 new Region("TabbedPaneContent");
+    public static final Region TABBED_PANE_CONTENT = new Region("TabbedPaneContent", true);
 
     /**
      * Table region. To bind a style to this <code>Region</code> use
      * the name <code>Table</code>.
      */
-    public static final Region TABLE = new Region("Table", "TableUI");
+    public static final Region TABLE = new Region("Table", false);
 
     /**
      * TableHeader region. To bind a style to this <code>Region</code> use
      * the name <code>TableHeader</code>.
      */
-    public static final Region TABLE_HEADER = new Region("TableHeader",
-                                                         "TableHeaderUI");
+    public static final Region TABLE_HEADER = new Region("TableHeader", false);
+
     /**
      * TextArea region. To bind a style to this <code>Region</code> use
      * the name <code>TextArea</code>.
      */
-    public static final Region TEXT_AREA = new Region("TextArea",
-                                                      "TextAreaUI");
+    public static final Region TEXT_AREA = new Region("TextArea", false);
 
     /**
      * TextField region. To bind a style to this <code>Region</code> use
      * the name <code>TextField</code>.
      */
-    public static final Region TEXT_FIELD = new Region("TextField",
-                                                       "TextFieldUI");
+    public static final Region TEXT_FIELD = new Region("TextField", false);
 
     /**
      * TextPane region. To bind a style to this <code>Region</code> use
      * the name <code>TextPane</code>.
      */
-    public static final Region TEXT_PANE = new Region("TextPane",
-                                                      "TextPaneUI");
+    public static final Region TEXT_PANE = new Region("TextPane", false);
 
     /**
      * ToggleButton region. To bind a style to this <code>Region</code> use
      * the name <code>ToggleButton</code>.
      */
-    public static final Region TOGGLE_BUTTON = new Region("ToggleButton",
-                                                          "ToggleButtonUI");
+    public static final Region TOGGLE_BUTTON = new Region("ToggleButton", false);
 
     /**
      * ToolBar region. To bind a style to this <code>Region</code> use
      * the name <code>ToolBar</code>.
      */
-    public static final Region TOOL_BAR = new Region("ToolBar", "ToolBarUI");
+    public static final Region TOOL_BAR = new Region("ToolBar", false);
+
     /**
      * Region of the ToolBar containing the content. To bind a style to this
      * <code>Region</code> use the name <code>ToolBarContent</code>.
      */
-    public static final Region TOOL_BAR_CONTENT = new Region("ToolBarContent");
+    public static final Region TOOL_BAR_CONTENT = new Region("ToolBarContent", true);
+
     /**
      * Region for the Window containing the ToolBar. To bind a style to this
      * <code>Region</code> use the name <code>ToolBarDragWindow</code>.
      */
-    public static final Region TOOL_BAR_DRAG_WINDOW = new Region(
-                                        "ToolBarDragWindow", null, false);
+    public static final Region TOOL_BAR_DRAG_WINDOW = new Region("ToolBarDragWindow", false);
 
     /**
      * ToolTip region. To bind a style to this <code>Region</code> use
      * the name <code>ToolTip</code>.
      */
-    public static final Region TOOL_TIP = new Region("ToolTip", "ToolTipUI");
+    public static final Region TOOL_TIP = new Region("ToolTip", false);
 
     /**
      * ToolBar separator region. To bind a style to this <code>Region</code> use
      * the name <code>ToolBarSeparator</code>.
      */
-    public static final Region TOOL_BAR_SEPARATOR = new Region(
-                          "ToolBarSeparator", "ToolBarSeparatorUI");
+    public static final Region TOOL_BAR_SEPARATOR = new Region("ToolBarSeparator", false);
 
     /**
      * Tree region. To bind a style to this <code>Region</code> use the name
      * <code>Tree</code>.
      */
-    public static final Region TREE = new Region("Tree", "TreeUI");
+    public static final Region TREE = new Region("Tree", false);
+
     /**
      * Region of the Tree for one cell. To bind a style to this
      * <code>Region</code> use the name <code>TreeCell</code>.
      */
-    public static final Region TREE_CELL = new Region("TreeCell");
+    public static final Region TREE_CELL = new Region("TreeCell", true);
 
     /**
      * Viewport region. To bind a style to this <code>Region</code> use
      * the name <code>Viewport</code>.
      */
-    public static final Region VIEWPORT = new Region("Viewport", "ViewportUI");
+    public static final Region VIEWPORT = new Region("Viewport", false);
 
+    private static Map<String, Region> getUItoRegionMap() {
+        AppContext context = AppContext.getAppContext();
+        Map<String, Region> map = (Map<String, Region>) context.get(UI_TO_REGION_MAP_KEY);
+        if (map == null) {
+            map = new HashMap<String, Region>();
+            map.put("ArrowButtonUI", ARROW_BUTTON);
+            map.put("ButtonUI", BUTTON);
+            map.put("CheckBoxUI", CHECK_BOX);
+            map.put("CheckBoxMenuItemUI", CHECK_BOX_MENU_ITEM);
+            map.put("ColorChooserUI", COLOR_CHOOSER);
+            map.put("ComboBoxUI", COMBO_BOX);
+            map.put("DesktopPaneUI", DESKTOP_PANE);
+            map.put("DesktopIconUI", DESKTOP_ICON);
+            map.put("EditorPaneUI", EDITOR_PANE);
+            map.put("FileChooserUI", FILE_CHOOSER);
+            map.put("FormattedTextFieldUI", FORMATTED_TEXT_FIELD);
+            map.put("InternalFrameUI", INTERNAL_FRAME);
+            map.put("InternalFrameTitlePaneUI", INTERNAL_FRAME_TITLE_PANE);
+            map.put("LabelUI", LABEL);
+            map.put("ListUI", LIST);
+            map.put("MenuUI", MENU);
+            map.put("MenuBarUI", MENU_BAR);
+            map.put("MenuItemUI", MENU_ITEM);
+            map.put("OptionPaneUI", OPTION_PANE);
+            map.put("PanelUI", PANEL);
+            map.put("PasswordFieldUI", PASSWORD_FIELD);
+            map.put("PopupMenuUI", POPUP_MENU);
+            map.put("PopupMenuSeparatorUI", POPUP_MENU_SEPARATOR);
+            map.put("ProgressBarUI", PROGRESS_BAR);
+            map.put("RadioButtonUI", RADIO_BUTTON);
+            map.put("RadioButtonMenuItemUI", RADIO_BUTTON_MENU_ITEM);
+            map.put("RootPaneUI", ROOT_PANE);
+            map.put("ScrollBarUI", SCROLL_BAR);
+            map.put("ScrollPaneUI", SCROLL_PANE);
+            map.put("SeparatorUI", SEPARATOR);
+            map.put("SliderUI", SLIDER);
+            map.put("SpinnerUI", SPINNER);
+            map.put("SplitPaneUI", SPLIT_PANE);
+            map.put("TabbedPaneUI", TABBED_PANE);
+            map.put("TableUI", TABLE);
+            map.put("TableHeaderUI", TABLE_HEADER);
+            map.put("TextAreaUI", TEXT_AREA);
+            map.put("TextFieldUI", TEXT_FIELD);
+            map.put("TextPaneUI", TEXT_PANE);
+            map.put("ToggleButtonUI", TOGGLE_BUTTON);
+            map.put("ToolBarUI", TOOL_BAR);
+            map.put("ToolTipUI", TOOL_TIP);
+            map.put("ToolBarSeparatorUI", TOOL_BAR_SEPARATOR);
+            map.put("TreeUI", TREE);
+            map.put("ViewportUI", VIEWPORT);
+            context.put(UI_TO_REGION_MAP_KEY, map);
+        }
+        return map;
+    }
 
-    private String name;
-    private boolean subregion;
-
+    private static Map<Region, String> getLowerCaseNameMap() {
+        AppContext context = AppContext.getAppContext();
+        Map<Region, String> map = (Map<Region, String>) context.get(LOWER_CASE_NAME_MAP_KEY);
+        if (map == null) {
+            map = new HashMap<Region, String>();
+            context.put(LOWER_CASE_NAME_MAP_KEY, map);
+        }
+        return map;
+    }
 
     static Region getRegion(JComponent c) {
-        return uiToRegionMap.get(c.getUIClassID());
+        return getUItoRegionMap().get(c.getUIClassID());
     }
 
     static void registerUIs(UIDefaults table) {
-        for (String key : uiToRegionMap.keySet()) {
+        for (Object key : getUItoRegionMap().keySet()) {
             table.put(key, "javax.swing.plaf.synth.SynthLookAndFeel");
         }
     }
 
+    private final String name;
+    private final boolean subregion;
 
-    Region(String name) {
-        this(name, null, true);
-    }
-
-    Region(String name, String ui) {
-        this(name, ui, false);
+    private Region(String name, boolean subregion) {
+        if (name == null) {
+            throw new NullPointerException("You must specify a non-null name");
+        }
+        this.name = name;
+        this.subregion = subregion;
     }
 
     /**
@@ -481,14 +523,10 @@ public class Region {
      * @param subregion Whether or not this is a subregion.
      */
     protected Region(String name, String ui, boolean subregion) {
-        if (name == null) {
-            throw new NullPointerException("You must specify a non-null name");
-        }
-        this.name = name;
+        this(name, subregion);
         if (ui != null) {
-            uiToRegionMap.put(ui, this);
+            getUItoRegionMap().put(ui, this);
         }
-        this.subregion = subregion;
     }
 
     /**
@@ -514,16 +552,17 @@ public class Region {
 
     /**
      * Returns the name, in lowercase.
+     *
+     * @return lower case representation of the name of the Region
      */
     String getLowerCaseName() {
-        synchronized(lowerCaseNameMap) {
-            String lowerCaseName = lowerCaseNameMap.get(this);
-            if (lowerCaseName == null) {
-                lowerCaseName = getName().toLowerCase();
-                lowerCaseNameMap.put(this, lowerCaseName);
-            }
-            return lowerCaseName;
+        Map<Region, String> lowerCaseNameMap = getLowerCaseNameMap();
+        String lowerCaseName = lowerCaseNameMap.get(this);
+        if (lowerCaseName == null) {
+            lowerCaseName = name.toLowerCase(Locale.ENGLISH);
+            lowerCaseNameMap.put(this, lowerCaseName);
         }
+        return lowerCaseName;
     }
 
     /**
@@ -531,6 +570,7 @@ public class Region {
      *
      * @return name of the Region.
      */
+    @Override
     public String toString() {
         return name;
     }
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
index 4ca139a709d..4dd5ddc29e2 100644
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java
@@ -195,7 +195,7 @@ class SynthMenuItemLayoutHelper extends MenuItemLayoutHelper {
                     getHorizontalAlignment(), getVerticalAlignment(),
                     getHorizontalTextPosition(), getVerticalTextPosition(),
                     getViewRect(), iconRect, textRect, getGap());
-            textRect.width += getLeftTextExtraWidth() + getRightTextExtraWidth();
+            textRect.width += getLeftTextExtraWidth();
             Rectangle labelRect = iconRect.union(textRect);
             getLabelSize().setHeight(labelRect.height);
             getLabelSize().setWidth(labelRect.width);
diff --git a/jdk/src/share/classes/javax/swing/text/GlyphView.java b/jdk/src/share/classes/javax/swing/text/GlyphView.java
index 364fd69e8ee..64db8cd6cd1 100644
--- a/jdk/src/share/classes/javax/swing/text/GlyphView.java
+++ b/jdk/src/share/classes/javax/swing/text/GlyphView.java
@@ -540,30 +540,7 @@ public class GlyphView extends View implements TabableView, Cloneable {
      */
     @Override
     public float getMinimumSpan(int axis) {
-        switch (axis) {
-        case View.X_AXIS:
-            if (minimumSpan < 0) {
-                minimumSpan = 0;
-                int p0 = getStartOffset();
-                int p1 = getEndOffset();
-                while (p1 > p0) {
-                    int breakSpot = getBreakSpot(p0, p1);
-                    if (breakSpot == BreakIterator.DONE) {
-                        // the rest of the view is non-breakable
-                        breakSpot = p0;
-                    }
-                    minimumSpan = Math.max(minimumSpan,
-                            getPartialSpan(breakSpot, p1));
-                    // Note: getBreakSpot returns the *last* breakspot
-                    p1 = breakSpot - 1;
-                }
-            }
-            return minimumSpan;
-        case View.Y_AXIS:
-            return super.getMinimumSpan(axis);
-        default:
-            throw new IllegalArgumentException("Invalid axis: " + axis);
-        }
+        return super.getMinimumSpan(axis);
     }
 
     /**
@@ -719,8 +696,9 @@ public class GlyphView extends View implements TabableView, Cloneable {
             checkPainter();
             int p0 = getStartOffset();
             int p1 = painter.getBoundedPosition(this, p0, pos, len);
-            return ((p1 > p0) && (getBreakSpot(p0, p1) != BreakIterator.DONE)) ?
-                    View.ExcellentBreakWeight : View.BadBreakWeight;
+            return p1 == p0 ? View.BadBreakWeight :
+                   getBreakSpot(p0, p1) != BreakIterator.DONE ?
+                            View.ExcellentBreakWeight : View.GoodBreakWeight;
         }
         return super.getBreakWeight(axis, pos, len);
     }
diff --git a/jdk/src/share/classes/javax/swing/text/JTextComponent.java b/jdk/src/share/classes/javax/swing/text/JTextComponent.java
index fc24214a844..371afda48b0 100644
--- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java
+++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java
@@ -2069,8 +2069,9 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      *   width to match its own
      */
     public boolean getScrollableTracksViewportWidth() {
-        if (getParent() instanceof JViewport) {
-            return (getParent().getWidth() > getPreferredSize().width);
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            return port.getWidth() > getPreferredSize().width;
         }
         return false;
     }
@@ -2089,8 +2090,9 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
      *   to match its own
      */
     public boolean getScrollableTracksViewportHeight() {
-        if (getParent() instanceof JViewport) {
-            return (getParent().getHeight() > getPreferredSize().height);
+        JViewport port = SwingUtilities2.getViewport(this);
+        if (port != null) {
+            return (port.getHeight() > getPreferredSize().height);
         }
         return false;
     }
@@ -4813,7 +4815,18 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
                 new AttributedString(text, composedIndex, text.getEndIndex()));
     }
 
-    private boolean saveComposedText(int pos) {
+    /**
+     * Saves composed text around the specified position.
+     *
+     * The composed text (if any) around the specified position is saved
+     * in a backing store and removed from the document.
+     *
+     * @param pos  document position to identify the composed text location
+     * @return  {@code true} if the composed text exists and is saved,
+     *          {@code false} otherwise
+     * @see #restoreComposedText
+     */
+    protected boolean saveComposedText(int pos) {
         if (composedTextExists()) {
             int start = composedTextStart.getOffset();
             int len = composedTextEnd.getOffset() -
@@ -4828,7 +4841,15 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
         return false;
     }
 
-    private void restoreComposedText() {
+    /**
+     * Restores composed text previously saved by {@code saveComposedText}.
+     *
+     * The saved composed text is inserted back into the document. This method
+     * should be invoked only if {@code saveComposedText} returns {@code true}.
+     *
+     * @see #saveComposedText
+     */
+    protected void restoreComposedText() {
         Document doc = getDocument();
         try {
             doc.insertString(caret.getDot(),
diff --git a/jdk/src/share/classes/javax/swing/text/LayoutQueue.java b/jdk/src/share/classes/javax/swing/text/LayoutQueue.java
index 38fd665c40e..f1d73ffc0d8 100644
--- a/jdk/src/share/classes/javax/swing/text/LayoutQueue.java
+++ b/jdk/src/share/classes/javax/swing/text/LayoutQueue.java
@@ -25,6 +25,7 @@
 package javax.swing.text;
 
 import java.util.Vector;
+import sun.awt.AppContext;
 
 /**
  * A queue of text layout tasks.
@@ -35,10 +36,10 @@ import java.util.Vector;
  */
 public class LayoutQueue {
 
-    Vector<Runnable> tasks;
-    Thread worker;
+    private static final Object DEFAULT_QUEUE = new Object();
 
-    static LayoutQueue defaultQueue;
+    private Vector<Runnable> tasks;
+    private Thread worker;
 
     /**
      * Construct a layout queue.
@@ -51,10 +52,15 @@ public class LayoutQueue {
      * Fetch the default layout queue.
      */
     public static LayoutQueue getDefaultQueue() {
-        if (defaultQueue == null) {
-            defaultQueue = new LayoutQueue();
+        AppContext ac = AppContext.getAppContext();
+        synchronized (DEFAULT_QUEUE) {
+            LayoutQueue defaultQueue = (LayoutQueue) ac.get(DEFAULT_QUEUE);
+            if (defaultQueue == null) {
+                defaultQueue = new LayoutQueue();
+                ac.put(DEFAULT_QUEUE, defaultQueue);
+            }
+            return defaultQueue;
         }
-        return defaultQueue;
     }
 
     /**
@@ -63,7 +69,9 @@ public class LayoutQueue {
      * @param q the new queue.
      */
     public static void setDefaultQueue(LayoutQueue q) {
-        defaultQueue = q;
+        synchronized (DEFAULT_QUEUE) {
+            AppContext.getAppContext().put(DEFAULT_QUEUE, q);
+        }
     }
 
     /**
diff --git a/jdk/src/share/classes/javax/swing/text/ParagraphView.java b/jdk/src/share/classes/javax/swing/text/ParagraphView.java
index c7f6bb09c3e..1c9ae08c05f 100644
--- a/jdk/src/share/classes/javax/swing/text/ParagraphView.java
+++ b/jdk/src/share/classes/javax/swing/text/ParagraphView.java
@@ -174,23 +174,6 @@ public class ParagraphView extends FlowView implements TabExpander {
         return layoutPool.getView(index);
     }
 
-    /**
-     * Adjusts the given row if possible to fit within the
-     * layout span.  By default this will try to find the
-     * highest break weight possible nearest the end of
-     * the row.  If a forced break is encountered, the
-     * break will be positioned there.
-     * <p>
-     * This is meant for internal usage, and should not be used directly.
-     *
-     * @param r the row to adjust to the current layout
-     *          span
-     * @param desiredSpan the current layout span >= 0
-     * @param x the location r starts at
-     */
-    protected void adjustRow(Row r, int desiredSpan, int x) {
-    }
-
     /**
      * Returns the next visual position for the cursor, in
      * either the east or west direction.
@@ -733,40 +716,12 @@ public class ParagraphView extends FlowView implements TabExpander {
      * @param axis  the minor axis
      * @param r     the input {@code SizeRequirements} object
      * @return      the new or adjusted {@code SizeRequirements} object
-     * @throw IllegalArgumentException  if the {@code axis} parameter is invalid
+     * @throws IllegalArgumentException  if the {@code axis} parameter is invalid
      */
     @Override
     protected SizeRequirements calculateMinorAxisRequirements(int axis,
                                                         SizeRequirements r) {
-        r = super.calculateMinorAxisRequirements(axis, r);
-
-        float min = 0;
-        float glue = 0;
-        int n = getLayoutViewCount();
-        for (int i = 0; i < n; i++) {
-            View v = getLayoutView(i);
-            float span = v.getMinimumSpan(axis);
-            if (v.getBreakWeight(axis, 0, v.getMaximumSpan(axis))
-                                                        > View.BadBreakWeight) {
-                // find the longest non-breakable fragments at the view edges
-                int p0 = v.getStartOffset();
-                int p1 = v.getEndOffset();
-                float start = findEdgeSpan(v, axis, p0, p0, p1);
-                float end = findEdgeSpan(v, axis, p1, p0, p1);
-                glue += start;
-                min = Math.max(min, Math.max(span, glue));
-                glue = end;
-            } else {
-                // non-breakable view
-                glue += span;
-                min = Math.max(min, glue);
-            }
-        }
-        r.minimum = Math.max(r.minimum, (int) min);
-        r.preferred = Math.max(r.minimum,  r.preferred);
-        r.maximum = Math.max(r.preferred, r.maximum);
-
-        return r;
+        return super.calculateMinorAxisRequirements(axis, r);
     }
 
     /**
diff --git a/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java b/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java
index fb7aede7374..b845419ad78 100644
--- a/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java
+++ b/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java
@@ -327,13 +327,45 @@ public class WrappedPlainView extends BoxView implements TabExpander {
     /**
      * Return reasonable default values for the view dimensions.  The standard
      * text terminal size 80x24 is pretty suitable for the wrapped plain view.
+     *
+     * The size should not be larger than the component housing the view's
+     * container.
      */
     private float getDefaultSpan(int axis) {
+         Container host = getContainer();
+         Component parent = null;
+
+         if (host != null) {
+            parent = host.getParent();
+         }
+
          switch (axis) {
             case View.X_AXIS:
-                return 80 * metrics.getWidths()['M'];
+               int defaultWidth = 80 * metrics.getWidths()['M'];
+               int parentWidth = 0;
+
+               if (parent != null) {
+                  parentWidth = parent.getWidth();
+               }
+
+               if (defaultWidth > parentWidth) {
+                 return parentWidth;
+               }
+               return defaultWidth;
+
             case View.Y_AXIS:
-                return 24 * metrics.getHeight();
+               int defaultHeight = 24 * metrics.getHeight();
+               int parentHeight = 0;
+
+               if (parent != null) {
+                  parentHeight = parent.getHeight();
+               }
+
+               if (defaultHeight > parentHeight) {
+                 return parentHeight;
+               }
+               return defaultHeight;
+
             default:
                 throw new IllegalArgumentException("Invalid axis: " + axis);
         }
diff --git a/jdk/src/share/classes/javax/swing/text/html/ParagraphView.java b/jdk/src/share/classes/javax/swing/text/html/ParagraphView.java
index 6d6006b0a6f..981690a1103 100644
--- a/jdk/src/share/classes/javax/swing/text/html/ParagraphView.java
+++ b/jdk/src/share/classes/javax/swing/text/html/ParagraphView.java
@@ -150,7 +150,7 @@ public class ParagraphView extends javax.swing.text.ParagraphView {
      * @param axis  the minor axis
      * @param r     the input {@code SizeRequirements} object
      * @return      the new or adjusted {@code SizeRequirements} object
-     * @throw IllegalArgumentException  if the {@code axis} parameter is invalid
+     * @throws IllegalArgumentException  if the {@code axis} parameter is invalid
      */
     protected SizeRequirements calculateMinorAxisRequirements(
                                                 int axis, SizeRequirements r) {
diff --git a/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
index 2eb24e84616..0225fac4a03 100644
--- a/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/jdk/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -1067,10 +1067,13 @@ public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeS
     }
 
     /**
-      * Notifies listeners of a change in path. changePaths should contain
-      * instances of PathPlaceHolder.
-      */
-    protected void notifyPathChange(Vector<PathPlaceHolder> changedPaths,
+     * Notifies listeners of a change in path. changePaths should contain
+     * instances of PathPlaceHolder.
+     *
+     * @deprecated As of JDK version 1.7
+     */
+    @Deprecated
+    protected void notifyPathChange(Vector changedPaths,
                                     TreePath oldLeadSelection) {
         int                    cPathCount = changedPaths.size();
         boolean[]              newness = new boolean[cPathCount];
@@ -1078,7 +1081,7 @@ public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeS
         PathPlaceHolder        placeholder;
 
         for(int counter = 0; counter < cPathCount; counter++) {
-            placeholder = changedPaths.elementAt(counter);
+            placeholder = (PathPlaceHolder) changedPaths.elementAt(counter);
             newness[counter] = placeholder.isNew;
             paths[counter] = placeholder.path;
         }
diff --git a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
index 5a9000c898c..482283b616e 100644
--- a/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
+++ b/jdk/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
@@ -19,7 +19,7 @@
  *
  */
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
  */
 /*
  * $Id: DOMHMACSignatureMethod.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
@@ -58,6 +58,7 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
         Logger.getLogger("org.jcp.xml.dsig.internal.dom");
     private Mac hmac;
     private int outputLength;
+    private boolean outputLengthSet;
 
     /**
      * Creates a <code>DOMHMACSignatureMethod</code> with the specified params
@@ -87,6 +88,7 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
                     ("params must be of type HMACParameterSpec");
             }
             outputLength = ((HMACParameterSpec) params).getOutputLength();
+            outputLengthSet = true;
             if (log.isLoggable(Level.FINE)) {
                 log.log(Level.FINE,
                     "Setting outputLength from HMACParameterSpec to: "
@@ -101,6 +103,7 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
         throws MarshalException {
         outputLength = new Integer
             (paramsElem.getFirstChild().getNodeValue()).intValue();
+        outputLengthSet = true;
         if (log.isLoggable(Level.FINE)) {
             log.log(Level.FINE, "unmarshalled outputLength: " + outputLength);
         }
@@ -135,23 +138,13 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
                 throw new XMLSignatureException(nsae);
             }
         }
-        if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, "outputLength = " + outputLength);
+        if (outputLengthSet && outputLength < getDigestLength()) {
+            throw new XMLSignatureException
+                ("HMACOutputLength must not be less than " + getDigestLength());
         }
         hmac.init((SecretKey) key);
         si.canonicalize(context, new MacOutputStream(hmac));
         byte[] result = hmac.doFinal();
-        if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, "resultLength = " + result.length);
-        }
-        if (outputLength != -1) {
-            int byteLength = outputLength/8;
-            if (result.length > byteLength) {
-                byte[] truncated = new byte[byteLength];
-                System.arraycopy(result, 0, truncated, 0, byteLength);
-                result = truncated;
-            }
-        }
 
         return MessageDigest.isEqual(sig, result);
     }
@@ -171,18 +164,13 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
                 throw new XMLSignatureException(nsae);
             }
         }
+        if (outputLengthSet && outputLength < getDigestLength()) {
+            throw new XMLSignatureException
+                ("HMACOutputLength must not be less than " + getDigestLength());
+        }
         hmac.init((SecretKey) key);
         si.canonicalize(context, new MacOutputStream(hmac));
-        byte[] result = hmac.doFinal();
-        if (outputLength != -1) {
-            int byteLength = outputLength/8;
-            if (result.length > byteLength) {
-                byte[] truncated = new byte[byteLength];
-                System.arraycopy(result, 0, truncated, 0, byteLength);
-                result = truncated;
-            }
-        }
-        return result;
+        return hmac.doFinal();
     }
 
     boolean paramsEqual(AlgorithmParameterSpec spec) {
@@ -197,6 +185,11 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
         return (outputLength == ospec.getOutputLength());
     }
 
+    /**
+     * Returns the output length of the hash/digest.
+     */
+    abstract int getDigestLength();
+
     static final class SHA1 extends DOMHMACSignatureMethod {
         SHA1(AlgorithmParameterSpec params)
             throws InvalidAlgorithmParameterException {
@@ -211,6 +204,9 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
         String getSignatureAlgorithm() {
             return "HmacSHA1";
         }
+        int getDigestLength() {
+            return 160;
+        }
     }
 
     static final class SHA256 extends DOMHMACSignatureMethod {
@@ -227,6 +223,9 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
         String getSignatureAlgorithm() {
             return "HmacSHA256";
         }
+        int getDigestLength() {
+            return 256;
+        }
     }
 
     static final class SHA384 extends DOMHMACSignatureMethod {
@@ -243,6 +242,9 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
         String getSignatureAlgorithm() {
             return "HmacSHA384";
         }
+        int getDigestLength() {
+            return 384;
+        }
     }
 
     static final class SHA512 extends DOMHMACSignatureMethod {
@@ -259,5 +261,8 @@ public abstract class DOMHMACSignatureMethod extends DOMSignatureMethod {
         String getSignatureAlgorithm() {
             return "HmacSHA512";
         }
+        int getDigestLength() {
+            return 512;
+        }
     }
 }
diff --git a/jdk/src/share/classes/sun/awt/shell/ShellFolder.java b/jdk/src/share/classes/sun/awt/shell/ShellFolder.java
index d38fd98e030..cf3c7893384 100644
--- a/jdk/src/share/classes/sun/awt/shell/ShellFolder.java
+++ b/jdk/src/share/classes/sun/awt/shell/ShellFolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -289,8 +289,8 @@ public abstract class ShellFolder extends File {
 
         // To avoid loads of synchronizations with Invoker and improve performance we
         // synchronize the whole code of the sort method once
-        getInvoker().invoke(new Callable<Void>() {
-            public Void call() throws Exception {
+        invoke(new Callable<Void>() {
+            public Void call() {
                 // Check that we can use the ShellFolder.sortChildren() method:
                 //   1. All files have the same non-null parent
                 //   2. All files is ShellFolders
@@ -330,8 +330,8 @@ public abstract class ShellFolder extends File {
     public void sortChildren(final List<? extends File> files) {
         // To avoid loads of synchronizations with Invoker and improve performance we
         // synchronize the whole code of the sort method once
-        getInvoker().invoke(new Callable<Void>() {
-            public Void call() throws Exception {
+        invoke(new Callable<Void>() {
+            public Void call() {
                 Collections.sort(files, FILE_COMPARATOR);
 
                 return null;
@@ -501,18 +501,62 @@ public abstract class ShellFolder extends File {
         return invoker;
     }
 
+    /**
+     * Invokes the {@code task} which doesn't throw checked exceptions
+     * from its {@code call} method. If invokation is interrupted then Thread.currentThread().isInterrupted() will
+     * be set and result will be {@code null}
+     */
+    public static <T> T invoke(Callable<T> task) {
+        try {
+            return invoke(task, RuntimeException.class);
+        } catch (InterruptedException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Invokes the {@code task} which throws checked exceptions from its {@code call} method.
+     * If invokation is interrupted then Thread.currentThread().isInterrupted() will
+     * be set and InterruptedException will be thrown as well.
+     */
+    public static <T, E extends Throwable> T invoke(Callable<T> task, Class<E> exceptionClass)
+            throws InterruptedException, E {
+        try {
+            return getInvoker().invoke(task);
+        } catch (Exception e) {
+            if (e instanceof RuntimeException) {
+                // Rethrow unchecked exceptions
+                throw (RuntimeException) e;
+            }
+
+            if (e instanceof InterruptedException) {
+                // Set isInterrupted flag for current thread
+                Thread.currentThread().interrupt();
+
+                // Rethrow InterruptedException
+                throw (InterruptedException) e;
+            }
+
+            if (exceptionClass.isInstance(e)) {
+                throw exceptionClass.cast(e);
+            }
+
+            throw new RuntimeException("Unexpected error", e);
+        }
+    }
+
     /**
      * Interface allowing to invoke tasks in different environments on different platforms.
      */
     public static interface Invoker {
         /**
-         * Invokes a callable task. If the {@code task} throws a checked exception,
-         * it will be wrapped into a {@link RuntimeException}
+         * Invokes a callable task.
          *
          * @param task a task to invoke
+         * @throws Exception {@code InterruptedException} or an exception that was thrown from the {@code task}
          * @return the result of {@code task}'s invokation
          */
-        <T> T invoke(Callable<T> task);
+        <T> T invoke(Callable<T> task) throws Exception;
     }
 
     /**
diff --git a/jdk/src/share/classes/sun/awt/shell/ShellFolderManager.java b/jdk/src/share/classes/sun/awt/shell/ShellFolderManager.java
index dc8901f7bc5..fe00063ffbb 100644
--- a/jdk/src/share/classes/sun/awt/shell/ShellFolderManager.java
+++ b/jdk/src/share/classes/sun/awt/shell/ShellFolderManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -108,12 +108,8 @@ class ShellFolderManager {
     }
 
     private static class DirectInvoker implements ShellFolder.Invoker {
-        public <T> T invoke(Callable<T> task) {
-            try {
-                return task.call();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
+        public <T> T invoke(Callable<T> task) throws Exception {
+            return task.call();
         }
     }
 }
diff --git a/jdk/src/share/classes/sun/dyn/FilterGeneric.java b/jdk/src/share/classes/sun/dyn/FilterGeneric.java
index a99eb26c9ee..a746ad21b95 100644
--- a/jdk/src/share/classes/sun/dyn/FilterGeneric.java
+++ b/jdk/src/share/classes/sun/dyn/FilterGeneric.java
@@ -16,7 +16,7 @@
  *
  * 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 Sf, tifth Floor, Boston, MA 02110-1301 USA.
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
diff --git a/jdk/src/share/classes/sun/io/CharToByteDBCS_ASCII.java b/jdk/src/share/classes/sun/io/CharToByteDBCS_ASCII.java
index f1c9f38ff4b..f928b27b85a 100644
--- a/jdk/src/share/classes/sun/io/CharToByteDBCS_ASCII.java
+++ b/jdk/src/share/classes/sun/io/CharToByteDBCS_ASCII.java
@@ -91,7 +91,7 @@ public abstract class CharToByteDBCS_ASCII extends CharToByteConverter
             }
 
             // Is this a high surrogate?
-            if (Surrogate.isHigh(inputChar)) {
+            if (Character.isHighSurrogate(inputChar)) {
                 // Is this the last character of the input?
                 if (charOff + inputSize >= inEnd) {
                     highHalfZoneCode = inputChar;
@@ -101,7 +101,7 @@ public abstract class CharToByteDBCS_ASCII extends CharToByteConverter
 
                 // Is there a low surrogate following?
                 inputChar = input[charOff + inputSize];
-                if (Surrogate.isLow(inputChar)) {
+                if (Character.isLowSurrogate(inputChar)) {
                     // We have a valid surrogate pair.  Too bad we don't do
                     // surrogates.  Is substitution enabled?
                     if (subMode) {
@@ -125,7 +125,7 @@ public abstract class CharToByteDBCS_ASCII extends CharToByteConverter
                  }
             }
             // Is this an unaccompanied low surrogate?
-            else if (Surrogate.isLow(inputChar)) {
+            else if (Character.isLowSurrogate(inputChar)) {
                 badInputLength = 1;
                 throw new MalformedInputException();
             } else {
diff --git a/jdk/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java b/jdk/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java
index a8d958e1d67..11e4a9ed73f 100644
--- a/jdk/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java
+++ b/jdk/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java
@@ -108,7 +108,7 @@ public abstract class CharToByteDBCS_EBCDIC extends CharToByteConverter
            }
 
            // Is this a high surrogate?
-           if (Surrogate.isHigh(inputChar)) {
+           if (Character.isHighSurrogate(inputChar)) {
               // Is this the last character of the input?
               if (charOff + inputSize >= inEnd) {
                  highHalfZoneCode = inputChar;
@@ -118,7 +118,7 @@ public abstract class CharToByteDBCS_EBCDIC extends CharToByteConverter
 
               // Is there a low surrogate following?
               inputChar = input[charOff + inputSize];
-              if (Surrogate.isLow(inputChar)) {
+              if (Character.isLowSurrogate(inputChar)) {
                  // We have a valid surrogate pair.  Too bad we don't do
                  // surrogates.  Is substitution enabled?
                  if (subMode) {
@@ -142,7 +142,7 @@ public abstract class CharToByteDBCS_EBCDIC extends CharToByteConverter
               }
            }
            // Is this an unaccompanied low surrogate?
-           else if (Surrogate.isLow(inputChar)) {
+           else if (Character.isLowSurrogate(inputChar)) {
                badInputLength = 1;
                throw new MalformedInputException();
            } else {
diff --git a/jdk/src/share/classes/sun/misc/URLClassPath.java b/jdk/src/share/classes/sun/misc/URLClassPath.java
index d9b1035ba6d..5c60e2fe81d 100644
--- a/jdk/src/share/classes/sun/misc/URLClassPath.java
+++ b/jdk/src/share/classes/sun/misc/URLClassPath.java
@@ -51,6 +51,7 @@ import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 import java.security.cert.Certificate;
 import sun.misc.FileURLMapper;
+import sun.net.util.URLUtil;
 
 /**
  * This class is used to maintain a search path of URLs for loading classes
@@ -80,7 +81,7 @@ public class URLClassPath {
     ArrayList<Loader> loaders = new ArrayList<Loader>();
 
     /* Map of each URL opened to its corresponding Loader */
-    HashMap<URL, Loader> lmap = new HashMap<URL, Loader>();
+    HashMap<String, Loader> lmap = new HashMap<String, Loader>();
 
     /* The jar protocol handler to use when creating new URLs */
     private URLStreamHandler jarHandler;
@@ -317,7 +318,8 @@ public class URLClassPath {
             // Skip this URL if it already has a Loader. (Loader
             // may be null in the case where URL has not been opened
             // but is referenced by a JAR index.)
-            if (lmap.containsKey(url)) {
+            String urlNoFragString = URLUtil.urlNoFragString(url);
+            if (lmap.containsKey(urlNoFragString)) {
                 continue;
             }
             // Otherwise, create a new Loader for the URL.
@@ -336,7 +338,7 @@ public class URLClassPath {
             }
             // Finally, add the Loader to the search path.
             loaders.add(loader);
-            lmap.put(url, loader);
+            lmap.put(urlNoFragString, loader);
         }
         return loaders.get(index);
     }
@@ -576,7 +578,7 @@ public class URLClassPath {
         private JarIndex index;
         private MetaIndex metaIndex;
         private URLStreamHandler handler;
-        private HashMap<URL, Loader> lmap;
+        private HashMap<String, Loader> lmap;
         private boolean closed = false;
 
         /*
@@ -584,7 +586,7 @@ public class URLClassPath {
          * a JAR file.
          */
         JarLoader(URL url, URLStreamHandler jarHandler,
-                  HashMap<URL, Loader> loaderMap)
+                  HashMap<String, Loader> loaderMap)
             throws IOException
         {
             super(new URL("jar", "", -1, url + "!/", jarHandler));
@@ -663,8 +665,9 @@ public class URLClassPath {
                                         try {
                                             URL jarURL = new URL(csu, jarfiles[i]);
                                             // If a non-null loader already exists, leave it alone.
-                                            if (!lmap.containsKey(jarURL)) {
-                                                lmap.put(jarURL, null);
+                                            String urlNoFragString = URLUtil.urlNoFragString(jarURL);
+                                            if (!lmap.containsKey(urlNoFragString)) {
+                                                lmap.put(urlNoFragString, null);
                                             }
                                         } catch (MalformedURLException e) {
                                             continue;
@@ -806,7 +809,7 @@ public class URLClassPath {
             if (index == null)
                 return null;
 
-            HashSet<URL> visited = new HashSet<URL>();
+            HashSet<String> visited = new HashSet<String>();
             return getResource(name, check, visited);
         }
 
@@ -818,7 +821,7 @@ public class URLClassPath {
          * non-existent resource
          */
         Resource getResource(final String name, boolean check,
-                             Set<URL> visited) {
+                             Set<String> visited) {
 
             Resource res;
             Object[] jarFiles;
@@ -843,7 +846,8 @@ public class URLClassPath {
 
                     try{
                         url = new URL(csu, jarName);
-                        if ((newLoader = (JarLoader)lmap.get(url)) == null) {
+                        String urlNoFragString = URLUtil.urlNoFragString(url);
+                        if ((newLoader = (JarLoader)lmap.get(urlNoFragString)) == null) {
                             /* no loader has been set up for this jar file
                              * before
                              */
@@ -867,7 +871,7 @@ public class URLClassPath {
                             }
 
                             /* put it in the global hashtable */
-                            lmap.put(url, newLoader);
+                            lmap.put(urlNoFragString, newLoader);
                         }
                     } catch (java.security.PrivilegedActionException pae) {
                         continue;
@@ -879,7 +883,7 @@ public class URLClassPath {
                     /* Note that the addition of the url to the list of visited
                      * jars incorporates a check for presence in the hashmap
                      */
-                    boolean visitedURL = !visited.add(url);
+                    boolean visitedURL = !visited.add(URLUtil.urlNoFragString(url));
                     if (!visitedURL) {
                         try {
                             newLoader.ensureOpen();
diff --git a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java b/jdk/src/share/classes/sun/net/ApplicationProxy.java
similarity index 71%
rename from jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java
rename to jdk/src/share/classes/sun/net/ApplicationProxy.java
index 6d4740b8b2b..2c84e3649e3 100644
--- a/jdk/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java
+++ b/jdk/src/share/classes/sun/net/ApplicationProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  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
@@ -22,22 +22,22 @@
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
  */
-package org.jdesktop.synthdesigner.synthmodel;
+
+package sun.net;
+
+import java.net.Proxy;
+import java.net.SocketAddress;
 
 /**
- * CustomUIDefault
- *
- * @author  Richard Bair
- * @author  Jasper Potts
+ * Proxy wrapper class so that we can determine application set
+ * proxies by type.
  */
-public class CustomUIDefault<T> extends UIDefault<T> {
-    private static int counter = -1;
-
-    public CustomUIDefault() {
-        super("Unnamed" + (++counter == 0 ? "" : counter), null);
+public final class ApplicationProxy extends Proxy {
+    private ApplicationProxy(Proxy proxy) {
+        super(proxy.type(), proxy.address());
     }
 
-    public void setName(String id) {
-        super.setName(id);
+    public static ApplicationProxy create(Proxy proxy) {
+        return new ApplicationProxy(proxy);
     }
 }
diff --git a/jdk/src/share/classes/sun/net/util/URLUtil.java b/jdk/src/share/classes/sun/net/util/URLUtil.java
new file mode 100644
index 00000000000..047df3ebe9a
--- /dev/null
+++ b/jdk/src/share/classes/sun/net/util/URLUtil.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.net.util;
+
+import java.net.URL;
+
+/**
+ * URL Utility class.
+ */
+public class URLUtil {
+    /**
+     * Returns a string form of the url suitable for use as a key in HashMap/Sets.
+     *
+     * The string form should be behave in the same manner as the URL when
+     * compared for equality in a HashMap/Set, except that no nameservice
+     * lookup is done on the hostname (only string comparison), and the fragment
+     * is not considered.
+     *
+     * @see java.net.URLStreamHandler.sameFile(java.net.URL)
+     */
+    public static String urlNoFragString(URL url) {
+        StringBuilder strForm = new StringBuilder();
+
+        String protocol = url.getProtocol();
+        if (protocol != null) {
+            /* protocol is compared case-insensitive, so convert to lowercase */
+            protocol = protocol.toLowerCase();
+            strForm.append(protocol);
+            strForm.append("://");
+        }
+
+        String host = url.getHost();
+        if (host != null) {
+            /* host is compared case-insensitive, so convert to lowercase */
+            host = host.toLowerCase();
+            strForm.append(host);
+
+            int port = url.getPort();
+            if (port == -1) {
+                /* if no port is specificed then use the protocols
+                 * default, if there is one */
+                port = url.getDefaultPort();
+            }
+            if (port != -1) {
+                strForm.append(":").append(port);
+            }
+        }
+
+        String file = url.getFile();
+        if (file != null) {
+            strForm.append(file);
+        }
+
+        return strForm.toString();
+    }
+}
+
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index accd8295503..d56602c5068 100644
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -578,12 +578,20 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
         responses = new MessageHeader();
         this.handler = handler;
         instProxy = p;
-        cookieHandler = java.security.AccessController.doPrivileged(
-            new java.security.PrivilegedAction<CookieHandler>() {
+        if (instProxy instanceof sun.net.ApplicationProxy) {
+            /* Application set Proxies should not have access to cookies
+             * in a secure environment unless explicitly allowed. */
+            try {
+                cookieHandler = CookieHandler.getDefault();
+            } catch (SecurityException se) { /* swallow exception */ }
+        } else {
+            cookieHandler = java.security.AccessController.doPrivileged(
+                new java.security.PrivilegedAction<CookieHandler>() {
                 public CookieHandler run() {
-                return CookieHandler.getDefault();
-            }
-        });
+                    return CookieHandler.getDefault();
+                }
+            });
+        }
         cacheHandler = java.security.AccessController.doPrivileged(
             new java.security.PrivilegedAction<ResponseCache>() {
                 public ResponseCache run() {
diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java b/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
index 14e33ffe9d1..5bfc94e36c5 100644
--- a/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java
@@ -32,8 +32,8 @@ import java.io.IOException;
 import java.io.FileDescriptor;
 import java.util.Queue;
 import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.security.PrivilegedAction;
 import java.security.AccessController;
 import java.security.AccessControlContext;
@@ -65,11 +65,8 @@ abstract class AsynchronousChannelGroupImpl
     private final Queue<Runnable> taskQueue;
 
     // group shutdown
-    // shutdownLock is RW lock so as to allow for concurrent queuing of tasks
-    // when using a fixed thread pool.
-    private final ReadWriteLock shutdownLock = new ReentrantReadWriteLock();
+    private final AtomicBoolean shutdown = new AtomicBoolean();
     private final Object shutdownNowLock = new Object();
-    private volatile boolean shutdown;
     private volatile boolean terminateInitiated;
 
     AsynchronousChannelGroupImpl(AsynchronousChannelProvider provider,
@@ -214,7 +211,7 @@ abstract class AsynchronousChannelGroupImpl
 
     @Override
     public final boolean isShutdown() {
-        return shutdown;
+        return shutdown.get();
     }
 
     @Override
@@ -260,17 +257,10 @@ abstract class AsynchronousChannelGroupImpl
 
     @Override
     public final void shutdown() {
-        shutdownLock.writeLock().lock();
-        try {
-            if (shutdown) {
-                // already shutdown
-                return;
-            }
-            shutdown = true;
-        } finally {
-            shutdownLock.writeLock().unlock();
+        if (shutdown.getAndSet(true)) {
+            // already shutdown
+            return;
         }
-
         // if there are channels in the group then shutdown will continue
         // when the last channel is closed
         if (!isEmpty()) {
@@ -289,12 +279,7 @@ abstract class AsynchronousChannelGroupImpl
 
     @Override
     public final void shutdownNow() throws IOException {
-        shutdownLock.writeLock().lock();
-        try {
-            shutdown = true;
-        } finally {
-            shutdownLock.writeLock().unlock();
-        }
+        shutdown.set(true);
         synchronized (shutdownNowLock) {
             if (!terminateInitiated) {
                 terminateInitiated = true;
@@ -305,6 +290,18 @@ abstract class AsynchronousChannelGroupImpl
         }
     }
 
+    /**
+     * For use by AsynchronousFileChannel to release resources without shutting
+     * down the thread pool.
+     */
+    final void detachFromThreadPool() {
+        if (shutdown.getAndSet(true))
+            throw new AssertionError("Already shutdown");
+        if (!isEmpty())
+            throw new AssertionError("Group not empty");
+        shutdownHandlerTasks();
+    }
+
     @Override
     public final boolean awaitTermination(long timeout, TimeUnit unit)
         throws InterruptedException
diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
index 180238d8413..8757b999c9d 100644
--- a/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java
@@ -25,8 +25,10 @@
 
 package sun.nio.ch;
 
+import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 import java.util.concurrent.locks.*;
 import java.io.FileDescriptor;
 import java.io.IOException;
@@ -101,6 +103,33 @@ abstract class AsynchronousFileChannelImpl
 
     // -- file locking --
 
+    abstract <A> Future<FileLock> implLock(long position,
+                                           long size,
+                                           boolean shared,
+                                           A attachment,
+                                           CompletionHandler<FileLock,? super A> handler);
+
+    @Override
+    public final Future<FileLock> lock(long position,
+                                       long size,
+                                       boolean shared)
+
+    {
+        return implLock(position, size, shared, null, null);
+    }
+
+    @Override
+    public final <A> void lock(long position,
+                               long size,
+                               boolean shared,
+                               A attachment,
+                               CompletionHandler<FileLock,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implLock(position, size, shared, attachment, handler);
+    }
+
     private volatile FileLockTable fileLockTable;
 
     final void ensureFileLockTableInitialized() throws IOException {
@@ -175,4 +204,50 @@ abstract class AsynchronousFileChannelImpl
             end();
         }
     }
+
+
+    // -- reading and writing --
+
+    abstract <A> Future<Integer> implRead(ByteBuffer dst,
+                                         long position,
+                                         A attachment,
+                                         CompletionHandler<Integer,? super A> handler);
+
+    @Override
+    public final Future<Integer> read(ByteBuffer dst, long position) {
+        return implRead(dst, position, null, null);
+    }
+
+    @Override
+    public final <A> void read(ByteBuffer dst,
+                               long position,
+                               A attachment,
+                               CompletionHandler<Integer,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implRead(dst, position, attachment, handler);
+    }
+
+    abstract <A> Future<Integer> implWrite(ByteBuffer src,
+                                           long position,
+                                           A attachment,
+                                           CompletionHandler<Integer,? super A> handler);
+
+
+    @Override
+    public final Future<Integer> write(ByteBuffer src, long position) {
+        return implWrite(src, position, null, null);
+    }
+
+    @Override
+    public final <A> void write(ByteBuffer src,
+                                long position,
+                                A attachment,
+                                CompletionHandler<Integer,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implWrite(src, position, attachment, handler);
+    }
 }
diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
index 49231930159..47bf820d6be 100644
--- a/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java
@@ -35,6 +35,7 @@ import java.io.IOException;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.Collections;
+import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import sun.net.NetHooks;
@@ -108,6 +109,29 @@ abstract class AsynchronousServerSocketChannelImpl
         implClose();
     }
 
+    /**
+     * Invoked by accept to accept connection
+     */
+    abstract Future<AsynchronousSocketChannel>
+        implAccept(Object attachment,
+                   CompletionHandler<AsynchronousSocketChannel,Object> handler);
+
+
+    @Override
+    public final Future<AsynchronousSocketChannel> accept() {
+        return implAccept(null, null);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public final <A> void accept(A attachment,
+                                 CompletionHandler<AsynchronousSocketChannel,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implAccept(attachment, (CompletionHandler<AsynchronousSocketChannel,Object>)handler);
+    }
+
     final boolean isAcceptKilled() {
         return acceptKilled;
     }
diff --git a/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
index 84b81a0c8b0..d378320716e 100644
--- a/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java
@@ -183,29 +183,54 @@ abstract class AsynchronousSocketChannelImpl
         killWriting();
     }
 
+    /**
+     * Invoked by connect to initiate the connect operation.
+     */
+    abstract <A> Future<Void> implConnect(SocketAddress remote,
+                                          A attachment,
+                                          CompletionHandler<Void,? super A> handler);
+
+    @Override
+    public final Future<Void> connect(SocketAddress remote) {
+        return implConnect(remote, null, null);
+    }
+
+    @Override
+    public final <A> void connect(SocketAddress remote,
+                                  A attachment,
+                                  CompletionHandler<Void,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implConnect(remote, attachment, handler);
+    }
+
     /**
      * Invoked by read to initiate the I/O operation.
      */
-    abstract <V extends Number,A> Future<V> readImpl(ByteBuffer[] dsts,
-                                                     boolean isScatteringRead,
+    abstract <V extends Number,A> Future<V> implRead(boolean isScatteringRead,
+                                                     ByteBuffer dst,
+                                                     ByteBuffer[] dsts,
                                                      long timeout,
                                                      TimeUnit unit,
                                                      A attachment,
                                                      CompletionHandler<V,? super A> handler);
 
     @SuppressWarnings("unchecked")
-    private <V extends Number,A> Future<V> read(ByteBuffer[] dsts,
-                                                boolean isScatteringRead,
+    private <V extends Number,A> Future<V> read(boolean isScatteringRead,
+                                                ByteBuffer dst,
+                                                ByteBuffer[] dsts,
                                                 long timeout,
                                                 TimeUnit unit,
-                                                A attachment,
+                                                A att,
                                                 CompletionHandler<V,? super A> handler)
     {
         if (!isOpen()) {
-            CompletedFuture<V,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            Throwable e = new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withFailure(e);
+            Invoker.invoke(this, handler, att, null, e);
+            return null;
         }
 
         if (remoteAddress == null)
@@ -213,13 +238,13 @@ abstract class AsynchronousSocketChannelImpl
         if (timeout < 0L)
             throw new IllegalArgumentException("Negative timeout");
 
-        boolean hasSpaceToRead = isScatteringRead || dsts[0].hasRemaining();
+        boolean hasSpaceToRead = isScatteringRead || dst.hasRemaining();
         boolean shutdown = false;
 
         // check and update state
         synchronized (readLock) {
             if (readKilled)
-                throw new RuntimeException("Reading not allowed due to timeout or cancellation");
+                throw new IllegalStateException("Reading not allowed due to timeout or cancellation");
             if (reading)
                 throw new ReadPendingException();
             if (readShutdown) {
@@ -234,44 +259,53 @@ abstract class AsynchronousSocketChannelImpl
         // immediately complete with -1 if shutdown for read
         // immediately complete with 0 if no space remaining
         if (shutdown || !hasSpaceToRead) {
-            CompletedFuture<V,A> result;
+            Number result;
             if (isScatteringRead) {
-                Long value = (shutdown) ? Long.valueOf(-1L) : Long.valueOf(0L);
-                result = (CompletedFuture<V,A>)CompletedFuture.withResult(this, value, attachment);
+                result = (shutdown) ? Long.valueOf(-1L) : Long.valueOf(0L);
             } else {
-                int value = (shutdown) ? -1 : 0;
-                result = (CompletedFuture<V,A>)CompletedFuture.withResult(this, value, attachment);
+                result = (shutdown) ? -1 : 0;
             }
-            Invoker.invoke(handler, result);
-            return result;
+            if (handler == null)
+                return CompletedFuture.withResult((V)result);
+            Invoker.invoke(this, handler, att, (V)result, null);
+            return null;
         }
 
-        return readImpl(dsts, isScatteringRead, timeout, unit, attachment, handler);
+        return implRead(isScatteringRead, dst, dsts, timeout, unit, att, handler);
     }
 
     @Override
-    public final <A> Future<Integer> read(ByteBuffer dst,
-                                          long timeout,
-                                          TimeUnit unit,
-                                          A attachment,
-                                          CompletionHandler<Integer,? super A> handler)
-    {
+    public final Future<Integer> read(ByteBuffer dst) {
         if (dst.isReadOnly())
             throw new IllegalArgumentException("Read-only buffer");
-        ByteBuffer[] bufs = new ByteBuffer[1];
-        bufs[0] = dst;
-        return read(bufs, false, timeout, unit, attachment, handler);
+        return read(false, dst, null, 0L, TimeUnit.MILLISECONDS, null, null);
     }
 
     @Override
-    public final <A> Future<Long> read(ByteBuffer[] dsts,
-                                       int offset,
-                                       int length,
-                                       long timeout,
-                                       TimeUnit unit,
-                                       A attachment,
-                                       CompletionHandler<Long,? super A> handler)
+    public final <A> void read(ByteBuffer dst,
+                               long timeout,
+                               TimeUnit unit,
+                               A attachment,
+                               CompletionHandler<Integer,? super A> handler)
     {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        if (dst.isReadOnly())
+            throw new IllegalArgumentException("Read-only buffer");
+        read(false, dst, null, timeout, unit, attachment, handler);
+    }
+
+    @Override
+    public final <A> void read(ByteBuffer[] dsts,
+                               int offset,
+                               int length,
+                               long timeout,
+                               TimeUnit unit,
+                               A attachment,
+                               CompletionHandler<Long,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
         if ((offset < 0) || (length < 0) || (offset > dsts.length - length))
             throw new IndexOutOfBoundsException();
         ByteBuffer[] bufs = Util.subsequence(dsts, offset, length);
@@ -279,39 +313,41 @@ abstract class AsynchronousSocketChannelImpl
             if (bufs[i].isReadOnly())
                 throw new IllegalArgumentException("Read-only buffer");
         }
-        return read(bufs, true, timeout, unit, attachment, handler);
+        read(true, null, bufs, timeout, unit, attachment, handler);
     }
 
     /**
      * Invoked by write to initiate the I/O operation.
      */
-    abstract <V extends Number,A> Future<V> writeImpl(ByteBuffer[] srcs,
-                                                      boolean isGatheringWrite,
+    abstract <V extends Number,A> Future<V> implWrite(boolean isGatheringWrite,
+                                                      ByteBuffer src,
+                                                      ByteBuffer[] srcs,
                                                       long timeout,
                                                       TimeUnit unit,
                                                       A attachment,
                                                       CompletionHandler<V,? super A> handler);
 
     @SuppressWarnings("unchecked")
-    private <V extends Number,A> Future<V> write(ByteBuffer[] srcs,
-                                                 boolean isGatheringWrite,
+    private <V extends Number,A> Future<V> write(boolean isGatheringWrite,
+                                                 ByteBuffer src,
+                                                 ByteBuffer[] srcs,
                                                  long timeout,
                                                  TimeUnit unit,
-                                                 A attachment,
+                                                 A att,
                                                  CompletionHandler<V,? super A> handler)
     {
-        boolean hasDataToWrite = isGatheringWrite || srcs[0].hasRemaining();
+        boolean hasDataToWrite = isGatheringWrite || src.hasRemaining();
 
         boolean closed = false;
         if (isOpen()) {
             if (remoteAddress == null)
                 throw new NotYetConnectedException();
-            if (timeout < 0L)
+             if (timeout < 0L)
                 throw new IllegalArgumentException("Negative timeout");
             // check and update state
             synchronized (writeLock) {
                 if (writeKilled)
-                    throw new RuntimeException("Writing not allowed due to timeout or cancellation");
+                    throw new IllegalStateException("Writing not allowed due to timeout or cancellation");
                 if (writing)
                     throw new WritePendingException();
                 if (writeShutdown) {
@@ -327,52 +363,57 @@ abstract class AsynchronousSocketChannelImpl
 
         // channel is closed or shutdown for write
         if (closed) {
-            CompletedFuture<V,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            Throwable e = new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withFailure(e);
+            Invoker.invoke(this, handler, att, null, e);
+            return null;
         }
 
         // nothing to write so complete immediately
         if (!hasDataToWrite) {
-            CompletedFuture<V,A> result;
-            if (isGatheringWrite) {
-                result = (CompletedFuture<V,A>)CompletedFuture.withResult(this, 0L, attachment);
-            } else {
-                result = (CompletedFuture<V,A>)CompletedFuture.withResult(this, 0, attachment);
-            }
-            Invoker.invoke(handler, result);
-            return result;
+            Number result = (isGatheringWrite) ? (Number)0L : (Number)0;
+            if (handler == null)
+                return CompletedFuture.withResult((V)result);
+            Invoker.invoke(this, handler, att, (V)result, null);
+            return null;
         }
 
-        return writeImpl(srcs, isGatheringWrite, timeout, unit, attachment, handler);
+        return implWrite(isGatheringWrite, src, srcs, timeout, unit, att, handler);
     }
 
     @Override
-    public final <A> Future<Integer> write(ByteBuffer src,
-                                           long timeout,
-                                           TimeUnit unit,
-                                           A attachment,
-                                           CompletionHandler<Integer,? super A> handler)
-    {
-        ByteBuffer[] bufs = new ByteBuffer[1];
-        bufs[0] = src;
-        return write(bufs, false, timeout, unit, attachment, handler);
+    public final Future<Integer> write(ByteBuffer src) {
+        return write(false, src, null, 0L, TimeUnit.MILLISECONDS, null, null);
     }
 
     @Override
-    public final <A> Future<Long> write(ByteBuffer[] srcs,
-                                        int offset,
-                                        int length,
-                                        long timeout,
-                                        TimeUnit unit,
-                                        A attachment,
-                                        CompletionHandler<Long,? super A> handler)
+    public final <A> void write(ByteBuffer src,
+                                long timeout,
+                                TimeUnit unit,
+                                A attachment,
+                                CompletionHandler<Integer,? super A> handler)
     {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        write(false, src, null, timeout, unit, attachment, handler);
+    }
+
+    @Override
+    public final <A> void  write(ByteBuffer[] srcs,
+                                 int offset,
+                                 int length,
+                                 long timeout,
+                                 TimeUnit unit,
+                                 A attachment,
+                                 CompletionHandler<Long,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
         if ((offset < 0) || (length < 0) || (offset > srcs.length - length))
             throw new IndexOutOfBoundsException();
         srcs = Util.subsequence(srcs, offset, length);
-        return write(srcs, true, timeout, unit, attachment, handler);
+        write(true, null, srcs, timeout, unit, attachment, handler);
     }
 
     @Override
@@ -461,7 +502,6 @@ abstract class AsynchronousSocketChannelImpl
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public final SocketAddress getRemoteAddress() throws IOException {
         if (!isOpen())
             throw new ClosedChannelException();
diff --git a/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java b/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java
index 221b9f8f5f7..c3152db6097 100644
--- a/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java
+++ b/jdk/src/share/classes/sun/nio/ch/CompletedFuture.java
@@ -25,7 +25,7 @@
 
 package sun.nio.ch;
 
-import java.nio.channels.AsynchronousChannel;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ExecutionException;
 import java.io.IOException;
@@ -35,39 +35,35 @@ import java.io.IOException;
  * completed.
  */
 
-final class CompletedFuture<V,A>
-    extends AbstractFuture<V,A>
-{
+final class CompletedFuture<V> implements Future<V> {
     private final V result;
     private final Throwable exc;
 
-    private CompletedFuture(AsynchronousChannel channel,
-                            V result,
-                            Throwable exc,
-                            A attachment)
-    {
-        super(channel, attachment);
+    private CompletedFuture(V result, Throwable exc) {
         this.result = result;
         this.exc = exc;
     }
 
     @SuppressWarnings("unchecked")
-    static <V,A> CompletedFuture<V,A> withResult(AsynchronousChannel channel,
-                                                 V result,
-                                                 A attachment)
-    {
-        return new CompletedFuture<V,A>(channel, result, null, attachment);
+    static <V> CompletedFuture<V> withResult(V result) {
+        return new CompletedFuture<V>(result, null);
     }
 
     @SuppressWarnings("unchecked")
-    static <V,A> CompletedFuture<V,A> withFailure(AsynchronousChannel channel,
-                                                  Throwable exc,
-                                                  A attachment)
-    {
+    static <V> CompletedFuture<V> withFailure(Throwable exc) {
         // exception must be IOException or SecurityException
         if (!(exc instanceof IOException) && !(exc instanceof SecurityException))
             exc = new IOException(exc);
-        return new CompletedFuture(channel, null, exc, attachment);
+        return new CompletedFuture(null, exc);
+    }
+
+    @SuppressWarnings("unchecked")
+    static <V> CompletedFuture<V> withResult(V result, Throwable exc) {
+        if (exc == null) {
+            return withResult(result);
+        } else {
+            return withFailure(exc);
+        }
     }
 
     @Override
@@ -100,14 +96,4 @@ final class CompletedFuture<V,A>
     public boolean cancel(boolean mayInterruptIfRunning) {
         return false;
     }
-
-    @Override
-    Throwable exception() {
-        return exc;
-    }
-
-    @Override
-    V value() {
-        return result;
-    }
 }
diff --git a/jdk/src/share/classes/sun/nio/ch/Invoker.java b/jdk/src/share/classes/sun/nio/ch/Invoker.java
index 182f7989a46..c4fcfb98041 100644
--- a/jdk/src/share/classes/sun/nio/ch/Invoker.java
+++ b/jdk/src/share/classes/sun/nio/ch/Invoker.java
@@ -117,33 +117,32 @@ class Invoker {
      * Invoke handler without checking the thread identity or number of handlers
      * on the thread stack.
      */
-    @SuppressWarnings("unchecked")
     static <V,A> void invokeUnchecked(CompletionHandler<V,? super A> handler,
-                                      AbstractFuture<V,A> result)
+                                      A attachment,
+                                      V value,
+                                      Throwable exc)
     {
-        if (handler != null && !result.isCancelled()) {
-            Throwable exc = result.exception();
-            if (exc == null) {
-                handler.completed(result.value(), result.attachment());
-            } else {
-                handler.failed(exc, result.attachment());
-            }
-
-            // clear interrupt
-            Thread.interrupted();
+        if (exc == null) {
+            handler.completed(value, attachment);
+        } else {
+            handler.failed(exc, attachment);
         }
+
+        // clear interrupt
+        Thread.interrupted();
     }
 
-
     /**
-     * Invoke handler after incrementing the invoke count.
+     * Invoke handler assuming thread identity already checked
      */
     static <V,A> void invokeDirect(GroupAndInvokeCount myGroupAndInvokeCount,
                                    CompletionHandler<V,? super A> handler,
-                                   AbstractFuture<V,A> result)
+                                   A attachment,
+                                   V result,
+                                   Throwable exc)
     {
         myGroupAndInvokeCount.incrementInvokeCount();
-        invokeUnchecked(handler, result);
+        Invoker.invokeUnchecked(handler, attachment, result, exc);
     }
 
     /**
@@ -151,64 +150,64 @@ class Invoker {
      * thread pool then the handler is invoked directly, otherwise it is
      * invoked indirectly.
      */
-    static <V,A> void invoke(CompletionHandler<V,? super A> handler,
-                             AbstractFuture<V,A> result)
+    static <V,A> void invoke(AsynchronousChannel channel,
+                             CompletionHandler<V,? super A> handler,
+                             A attachment,
+                             V result,
+                             Throwable exc)
     {
-        if (handler != null) {
-            boolean invokeDirect = false;
-            boolean identityOkay = false;
-            GroupAndInvokeCount thisGroupAndInvokeCount = myGroupAndInvokeCount.get();
-            if (thisGroupAndInvokeCount != null) {
-                AsynchronousChannel channel = result.channel();
-                if ((thisGroupAndInvokeCount.group() == ((Groupable)channel).group()))
-                    identityOkay = true;
-                if (identityOkay &&
-                    (thisGroupAndInvokeCount.invokeCount() < maxHandlerInvokeCount))
-                {
-                    // group match
-                    invokeDirect = true;
-                }
+        boolean invokeDirect = false;
+        boolean identityOkay = false;
+        GroupAndInvokeCount thisGroupAndInvokeCount = myGroupAndInvokeCount.get();
+        if (thisGroupAndInvokeCount != null) {
+            if ((thisGroupAndInvokeCount.group() == ((Groupable)channel).group()))
+                identityOkay = true;
+            if (identityOkay &&
+                (thisGroupAndInvokeCount.invokeCount() < maxHandlerInvokeCount))
+            {
+                // group match
+                invokeDirect = true;
             }
-            if (invokeDirect) {
-                thisGroupAndInvokeCount.incrementInvokeCount();
-                invokeUnchecked(handler, result);
-            } else {
-                try {
-                    invokeIndirectly(handler, result);
-                } catch (RejectedExecutionException ree) {
-                    // channel group shutdown; fallback to invoking directly
-                    // if the current thread has the right identity.
-                    if (identityOkay) {
-                        invokeUnchecked(handler, result);
-                    } else {
-                        throw new ShutdownChannelGroupException();
-                    }
+        }
+        if (invokeDirect) {
+            invokeDirect(thisGroupAndInvokeCount, handler, attachment, result, exc);
+        } else {
+            try {
+                invokeIndirectly(channel, handler, attachment, result, exc);
+            } catch (RejectedExecutionException ree) {
+                // channel group shutdown; fallback to invoking directly
+                // if the current thread has the right identity.
+                if (identityOkay) {
+                    invokeDirect(thisGroupAndInvokeCount,
+                                 handler, attachment, result, exc);
+                } else {
+                    throw new ShutdownChannelGroupException();
                 }
             }
         }
     }
 
     /**
-     * Invokes the handler "indirectly" in the channel group's thread pool.
+     * Invokes the handler indirectly via the channel group's thread pool.
      */
-    static <V,A> void invokeIndirectly(final CompletionHandler<V,? super A> handler,
-                                       final AbstractFuture<V,A> result)
+    static <V,A> void invokeIndirectly(AsynchronousChannel channel,
+                                       final CompletionHandler<V,? super A> handler,
+                                       final A attachment,
+                                       final V result,
+                                       final Throwable exc)
     {
-        if (handler != null) {
-            AsynchronousChannel channel = result.channel();
-            try {
-                ((Groupable)channel).group().executeOnPooledThread(new Runnable() {
-                    public void run() {
-                        GroupAndInvokeCount thisGroupAndInvokeCount =
-                            myGroupAndInvokeCount.get();
-                        if (thisGroupAndInvokeCount != null)
-                            thisGroupAndInvokeCount.setInvokeCount(1);
-                        invokeUnchecked(handler, result);
-                    }
-                });
-            } catch (RejectedExecutionException ree) {
-                throw new ShutdownChannelGroupException();
-            }
+        try {
+            ((Groupable)channel).group().executeOnPooledThread(new Runnable() {
+                public void run() {
+                    GroupAndInvokeCount thisGroupAndInvokeCount =
+                        myGroupAndInvokeCount.get();
+                    if (thisGroupAndInvokeCount != null)
+                        thisGroupAndInvokeCount.setInvokeCount(1);
+                    invokeUnchecked(handler, attachment, result, exc);
+                }
+            });
+        } catch (RejectedExecutionException ree) {
+            throw new ShutdownChannelGroupException();
         }
     }
 
@@ -216,19 +215,19 @@ class Invoker {
      * Invokes the handler "indirectly" in the given Executor
      */
     static <V,A> void invokeIndirectly(final CompletionHandler<V,? super A> handler,
-                                       final AbstractFuture<V,A> result,
+                                       final A attachment,
+                                       final V value,
+                                       final Throwable exc,
                                        Executor executor)
     {
-        if (handler != null) {
-            try {
-                executor.execute(new Runnable() {
-                    public void run() {
-                        invokeUnchecked(handler, result);
-                    }
-                });
-            } catch (RejectedExecutionException ree) {
-                throw new ShutdownChannelGroupException();
-            }
+         try {
+            executor.execute(new Runnable() {
+                public void run() {
+                    invokeUnchecked(handler, attachment, value, exc);
+                }
+            });
+        } catch (RejectedExecutionException ree) {
+            throw new ShutdownChannelGroupException();
         }
     }
 
@@ -258,4 +257,52 @@ class Invoker {
             throw new ShutdownChannelGroupException();
         }
     }
+
+    /**
+     * Invoke handler with completed result. This method does not check the
+     * thread identity or the number of handlers on the thread stack.
+     */
+    static <V,A> void invokeUnchecked(PendingFuture<V,A> future) {
+        assert future.isDone();
+        CompletionHandler<V,? super A> handler = future.handler();
+        if (handler != null) {
+            invokeUnchecked(handler,
+                            future.attachment(),
+                            future.value(),
+                            future.exception());
+        }
+    }
+
+    /**
+     * Invoke handler with completed result. If the current thread is in the
+     * channel group's thread pool then the handler is invoked directly,
+     * otherwise it is invoked indirectly.
+     */
+    static <V,A> void invoke(PendingFuture<V,A> future) {
+        assert future.isDone();
+        CompletionHandler<V,? super A> handler = future.handler();
+        if (handler != null) {
+            invoke(future.channel(),
+                   handler,
+                   future.attachment(),
+                   future.value(),
+                   future.exception());
+        }
+    }
+
+    /**
+     * Invoke handler with completed result. The handler is invoked indirectly,
+     * via the channel group's thread pool.
+     */
+    static <V,A> void invokeIndirectly(PendingFuture<V,A> future) {
+        assert future.isDone();
+        CompletionHandler<V,? super A> handler = future.handler();
+        if (handler != null) {
+            invokeIndirectly(future.channel(),
+                             handler,
+                             future.attachment(),
+                             future.value(),
+                             future.exception());
+        }
+    }
 }
diff --git a/jdk/src/share/classes/sun/nio/ch/PendingFuture.java b/jdk/src/share/classes/sun/nio/ch/PendingFuture.java
index d88cf233a82..3b1899a62da 100644
--- a/jdk/src/share/classes/sun/nio/ch/PendingFuture.java
+++ b/jdk/src/share/classes/sun/nio/ch/PendingFuture.java
@@ -34,13 +34,13 @@ import java.io.IOException;
  * attachment of an additional arbitrary context object and a timer task.
  */
 
-final class PendingFuture<V,A>
-    extends AbstractFuture<V,A>
-{
+final class PendingFuture<V,A> implements Future<V> {
     private static final CancellationException CANCELLED =
         new CancellationException();
 
+    private final AsynchronousChannel channel;
     private final CompletionHandler<V,? super A> handler;
+    private final A attachment;
 
     // true if result (or exception) is available
     private volatile boolean haveResult;
@@ -56,14 +56,14 @@ final class PendingFuture<V,A>
     // optional context object
     private volatile Object context;
 
-
     PendingFuture(AsynchronousChannel channel,
                   CompletionHandler<V,? super A> handler,
                   A attachment,
                   Object context)
     {
-        super(channel, attachment);
+        this.channel = channel;
         this.handler = handler;
+        this.attachment = attachment;
         this.context = context;
     }
 
@@ -71,14 +71,31 @@ final class PendingFuture<V,A>
                   CompletionHandler<V,? super A> handler,
                   A attachment)
     {
-        super(channel, attachment);
+        this.channel = channel;
         this.handler = handler;
+        this.attachment = attachment;
+    }
+
+    PendingFuture(AsynchronousChannel channel) {
+        this(channel, null, null);
+    }
+
+    PendingFuture(AsynchronousChannel channel, Object context) {
+        this(channel, null, null, context);
+    }
+
+    AsynchronousChannel channel() {
+        return channel;
     }
 
     CompletionHandler<V,? super A> handler() {
         return handler;
     }
 
+    A attachment() {
+        return attachment;
+    }
+
     void setContext(Object context) {
         this.context = context;
     }
@@ -113,36 +130,45 @@ final class PendingFuture<V,A>
     /**
      * Sets the result, or a no-op if the result or exception is already set.
      */
-    boolean setResult(V res) {
+    void setResult(V res) {
         synchronized (this) {
             if (haveResult)
-                return false;
+                return;
             result = res;
             haveResult = true;
             if (timeoutTask != null)
                 timeoutTask.cancel(false);
             if (latch != null)
                 latch.countDown();
-            return true;
         }
     }
 
     /**
      * Sets the result, or a no-op if the result or exception is already set.
      */
-    boolean setFailure(Throwable x) {
+    void setFailure(Throwable x) {
         if (!(x instanceof IOException) && !(x instanceof SecurityException))
             x = new IOException(x);
         synchronized (this) {
             if (haveResult)
-                return false;
+                return;
             exc = x;
             haveResult = true;
             if (timeoutTask != null)
                 timeoutTask.cancel(false);
             if (latch != null)
                 latch.countDown();
-            return true;
+        }
+    }
+
+    /**
+     * Sets the result
+     */
+    void setResult(V res, Throwable x) {
+        if (x == null) {
+            setResult(res);
+        } else {
+            setFailure(x);
         }
     }
 
@@ -178,12 +204,10 @@ final class PendingFuture<V,A>
         return result;
     }
 
-    @Override
     Throwable exception() {
         return (exc != CANCELLED) ? exc : null;
     }
 
-    @Override
     V value() {
         return result;
     }
@@ -204,33 +228,6 @@ final class PendingFuture<V,A>
             if (haveResult)
                 return false;    // already completed
 
-            // A shutdown of the channel group will close all channels and
-            // shutdown the executor. To ensure that the completion handler
-            // is executed we queue the task while holding the lock.
-            if (handler != null) {
-                prepareForWait();
-                Runnable cancelTask = new Runnable() {
-                    public void run() {
-                        while (!haveResult) {
-                            try {
-                                latch.await();
-                            } catch (InterruptedException ignore) { }
-                        }
-                        handler.cancelled(attachment());
-                    }
-                };
-                AsynchronousChannel ch = channel();
-                if (ch instanceof Groupable) {
-                    ((Groupable)ch).group().executeOnPooledThread(cancelTask);
-                } else {
-                    if (ch instanceof AsynchronousFileChannelImpl) {
-                        ((AsynchronousFileChannelImpl)ch).executor().execute(cancelTask);
-                    } else {
-                        throw new AssertionError("Should not get here");
-                    }
-                }
-            }
-
             // notify channel
             if (channel() instanceof Cancellable)
                 ((Cancellable)channel()).onCancel(this);
@@ -249,7 +246,7 @@ final class PendingFuture<V,A>
             } catch (IOException ignore) { }
         }
 
-        // release waiters (this also releases the invoker)
+        // release waiters
         if (latch != null)
             latch.countDown();
         return true;
diff --git a/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
index 47c3b2abd29..e504da338a2 100644
--- a/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
@@ -317,51 +317,71 @@ class SimpleAsynchronousDatagramChannelImpl
         return new WrappedMembershipKey(this, key);
     }
 
-    @Override
-    public <A> Future<Integer> send(ByteBuffer src,
-                                    SocketAddress target,
-                                    long timeout,
-                                    TimeUnit unit,
-                                    A attachment,
-                                    CompletionHandler<Integer,? super A> handler)
+    private <A> Future<Integer> implSend(ByteBuffer src,
+                                         SocketAddress target,
+                                         A attachment,
+                                         CompletionHandler<Integer,? super A> handler)
     {
-        if (timeout < 0L)
-            throw new IllegalArgumentException("Negative timeout");
-        if (unit == null)
-            throw new NullPointerException();
-
-        CompletedFuture<Integer,A> result;
+        int n = 0;
+        Throwable exc = null;
         try {
-            int n = dc.send(src, target);
-            result = CompletedFuture.withResult(this, n, attachment);
+            n = dc.send(src, target);
         } catch (IOException ioe) {
-            result = CompletedFuture.withFailure(this, ioe, attachment);
+            exc = ioe;
         }
-        Invoker.invoke(handler, result);
-        return result;
+        if (handler == null)
+            return CompletedFuture.withResult(n, exc);
+        Invoker.invoke(this, handler, attachment, n, exc);
+        return null;
     }
 
     @Override
-    public <A> Future<Integer> write(ByteBuffer src,
-                                     long timeout,
-                                     TimeUnit unit,
-                                     A attachment,
-                                     CompletionHandler<Integer,? super A> handler)
-    {
-        if (timeout < 0L)
-            throw new IllegalArgumentException("Negative timeout");
-        if (unit == null)
-            throw new NullPointerException();
+    public Future<Integer> send(ByteBuffer src, SocketAddress target) {
+        return implSend(src, target, null, null);
+    }
 
-        CompletedFuture<Integer,A> result;
+    @Override
+    public <A> void send(ByteBuffer src,
+                         SocketAddress target,
+                         A attachment,
+                         CompletionHandler<Integer,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implSend(src, target, attachment, handler);
+    }
+
+    private <A> Future<Integer> implWrite(ByteBuffer src,
+                                          A attachment,
+                                          CompletionHandler<Integer,? super A> handler)
+    {
+        int n = 0;
+        Throwable exc = null;
         try {
-            int n = dc.write(src);
-            result = CompletedFuture.withResult(this, n, attachment);
+            n = dc.write(src);
         } catch (IOException ioe) {
-            result = CompletedFuture.withFailure(this, ioe, attachment);
+            exc = ioe;
         }
-        Invoker.invoke(handler, result);
-        return result;
+        if (handler == null)
+            return CompletedFuture.withResult(n, exc);
+        Invoker.invoke(this, handler, attachment, n, exc);
+        return null;
+
+    }
+
+    @Override
+    public Future<Integer> write(ByteBuffer src) {
+        return implWrite(src, null, null);
+    }
+
+    @Override
+    public <A> void write(ByteBuffer src,
+                          A attachment,
+                          CompletionHandler<Integer,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implWrite(src, attachment, handler);
     }
 
     /**
@@ -390,12 +410,11 @@ class SimpleAsynchronousDatagramChannelImpl
         }
     }
 
-    @Override
-    public <A> Future<SocketAddress> receive(final ByteBuffer dst,
-                                             final long timeout,
-                                             final TimeUnit unit,
-                                             A attachment,
-                                             final CompletionHandler<SocketAddress,? super A> handler)
+    private <A> Future<SocketAddress> implReceive(final ByteBuffer dst,
+                                                  final long timeout,
+                                                  final TimeUnit unit,
+                                                  A attachment,
+                                                  final CompletionHandler<SocketAddress,? super A> handler)
     {
         if (dst.isReadOnly())
             throw new IllegalArgumentException("Read-only buffer");
@@ -406,10 +425,11 @@ class SimpleAsynchronousDatagramChannelImpl
 
         // complete immediately if channel closed
         if (!isOpen()) {
-            CompletedFuture<SocketAddress,A> result = CompletedFuture.withFailure(this,
-                new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            Throwable exc = new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withFailure(exc);
+            Invoker.invoke(this, handler, attachment, null, exc);
+            return null;
         }
 
         final AccessControlContext acc = (System.getSecurityManager() == null) ?
@@ -471,7 +491,7 @@ class SimpleAsynchronousDatagramChannelImpl
                         x = new AsynchronousCloseException();
                     result.setFailure(x);
                 }
-                Invoker.invokeUnchecked(handler, result);
+                Invoker.invokeUnchecked(result);
             }
         };
         try {
@@ -483,11 +503,27 @@ class SimpleAsynchronousDatagramChannelImpl
     }
 
     @Override
-    public <A> Future<Integer> read(final ByteBuffer dst,
-                                    final long timeout,
-                                    final TimeUnit unit,
-                                    A attachment,
-                                    final CompletionHandler<Integer,? super A> handler)
+    public Future<SocketAddress> receive(ByteBuffer dst) {
+        return implReceive(dst, 0L, TimeUnit.MILLISECONDS, null, null);
+    }
+
+    @Override
+    public <A> void receive(ByteBuffer dst,
+                            long timeout,
+                            TimeUnit unit,
+                            A attachment,
+                            CompletionHandler<SocketAddress,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implReceive(dst, timeout, unit, attachment, handler);
+    }
+
+    private <A> Future<Integer> implRead(final ByteBuffer dst,
+                                         final long timeout,
+                                         final TimeUnit unit,
+                                         A attachment,
+                                         final CompletionHandler<Integer,? super A> handler)
     {
         if (dst.isReadOnly())
             throw new IllegalArgumentException("Read-only buffer");
@@ -495,18 +531,20 @@ class SimpleAsynchronousDatagramChannelImpl
             throw new IllegalArgumentException("Negative timeout");
         if (unit == null)
             throw new NullPointerException();
-        // another thread may disconnect before read is initiated
-        if (!dc.isConnected())
-            throw new NotYetConnectedException();
 
         // complete immediately if channel closed
         if (!isOpen()) {
-            CompletedFuture<Integer,A> result = CompletedFuture.withFailure(this,
-                new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            Throwable exc = new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withFailure(exc);
+            Invoker.invoke(this, handler, attachment, null, exc);
+            return null;
         }
 
+        // another thread may disconnect before read is initiated
+        if (!dc.isConnected())
+            throw new NotYetConnectedException();
+
         final PendingFuture<Integer,A> result =
             new PendingFuture<Integer,A>(this, handler, attachment);
         Runnable task = new Runnable() {
@@ -563,7 +601,7 @@ class SimpleAsynchronousDatagramChannelImpl
                         x = new AsynchronousCloseException();
                     result.setFailure(x);
                 }
-                Invoker.invokeUnchecked(handler, result);
+                Invoker.invokeUnchecked(result);
             }
         };
         try {
@@ -574,6 +612,23 @@ class SimpleAsynchronousDatagramChannelImpl
         return result;
     }
 
+    @Override
+    public Future<Integer> read(ByteBuffer dst) {
+        return implRead(dst, 0L, TimeUnit.MILLISECONDS, null, null);
+    }
+
+    @Override
+    public <A> void read(ByteBuffer dst,
+                            long timeout,
+                            TimeUnit unit,
+                            A attachment,
+                            CompletionHandler<Integer,? super A> handler)
+    {
+        if (handler == null)
+            throw new NullPointerException("'handler' is null");
+        implRead(dst, timeout, unit, attachment, handler);
+    }
+
     @Override
     public  AsynchronousDatagramChannel bind(SocketAddress local)
         throws IOException
diff --git a/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
index fb82f330be4..ef9ff8fec41 100644
--- a/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
@@ -50,9 +50,6 @@ public class SimpleAsynchronousFileChannelImpl
     // Used to make native read and write calls
     private static final FileDispatcher nd = new FileDispatcherImpl();
 
-    // indicates if the associated thread pool is the default thread pool
-    private final boolean isDefaultExecutor;
-
     // Thread-safe set of IDs of native threads, for signalling
     private final NativeThreadSet threads = new NativeThreadSet(2);
 
@@ -60,11 +57,9 @@ public class SimpleAsynchronousFileChannelImpl
     SimpleAsynchronousFileChannelImpl(FileDescriptor fdObj,
                                       boolean reading,
                                       boolean writing,
-                                      ExecutorService executor,
-                                      boolean isDefaultexecutor)
+                                      ExecutorService executor)
     {
         super(fdObj, reading, writing, executor);
-        this.isDefaultExecutor = isDefaultexecutor;
     }
 
     public static AsynchronousFileChannel open(FileDescriptor fdo,
@@ -73,17 +68,9 @@ public class SimpleAsynchronousFileChannelImpl
                                                ThreadPool pool)
     {
         // Executor is either default or based on pool parameters
-        ExecutorService executor;
-        boolean isDefaultexecutor;
-        if (pool == null) {
-            executor = DefaultExecutorHolder.defaultExecutor;
-            isDefaultexecutor = true;
-        } else {
-            executor = pool.executor();
-            isDefaultexecutor = false;
-        }
-        return new SimpleAsynchronousFileChannelImpl(fdo,
-            reading, writing, executor, isDefaultexecutor);
+        ExecutorService executor = (pool == null) ?
+            DefaultExecutorHolder.defaultExecutor : pool.executor();
+        return new SimpleAsynchronousFileChannelImpl(fdo, reading, writing, executor);
     }
 
     @Override
@@ -114,16 +101,6 @@ public class SimpleAsynchronousFileChannelImpl
 
         // close file
         nd.close(fdObj);
-
-        // shutdown executor if specific to this channel
-        if (!isDefaultExecutor) {
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                public Void run() {
-                    executor.shutdown();
-                    return null;
-                }
-            });
-        }
     }
 
     @Override
@@ -194,11 +171,11 @@ public class SimpleAsynchronousFileChannelImpl
     }
 
     @Override
-    public <A> Future<FileLock> lock(final long position,
-                                     final long size,
-                                     final boolean shared,
-                                     A attachment,
-                                     final CompletionHandler<FileLock,? super A> handler)
+    <A> Future<FileLock> implLock(final long position,
+                                  final long size,
+                                  final boolean shared,
+                                  final A attachment,
+                                  final CompletionHandler<FileLock,? super A> handler)
     {
         if (shared && !reading)
             throw new NonReadableChannelException();
@@ -208,16 +185,19 @@ public class SimpleAsynchronousFileChannelImpl
         // add to lock table
         final FileLockImpl fli = addToFileLockTable(position, size, shared);
         if (fli == null) {
-            CompletedFuture<FileLock,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invokeIndirectly(handler, result, executor);
-            return result;
+            Throwable exc = new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withFailure(exc);
+            Invoker.invokeIndirectly(handler, attachment, null, exc, executor);
+            return null;
         }
 
-        final PendingFuture<FileLock,A> result =
-            new PendingFuture<FileLock,A>(this, handler, attachment);
+        final PendingFuture<FileLock,A> result = (handler == null) ?
+            new PendingFuture<FileLock,A>(this) : null;
         Runnable task = new Runnable() {
             public void run() {
+                Throwable exc = null;
+
                 int ti = threads.add();
                 try {
                     int n;
@@ -226,31 +206,36 @@ public class SimpleAsynchronousFileChannelImpl
                         do {
                             n = nd.lock(fdObj, true, position, size, shared);
                         } while ((n == FileDispatcher.INTERRUPTED) && isOpen());
-                        if (n == FileDispatcher.LOCKED && isOpen()) {
-                            result.setResult(fli);
-                        } else {
+                        if (n != FileDispatcher.LOCKED || !isOpen()) {
                             throw new AsynchronousCloseException();
                         }
                     } catch (IOException x) {
                         removeFromFileLockTable(fli);
                         if (!isOpen())
                             x = new AsynchronousCloseException();
-                        result.setFailure(x);
+                        exc = x;
                     } finally {
                         end();
                     }
                 } finally {
                     threads.remove(ti);
                 }
-                Invoker.invokeUnchecked(handler, result);
+                if (handler == null) {
+                    result.setResult(fli, exc);
+                } else {
+                    Invoker.invokeUnchecked(handler, attachment, fli, exc);
+                }
             }
         };
+        boolean executed = false;
         try {
             executor.execute(task);
-        } catch (RejectedExecutionException ree) {
-            // rollback
-            removeFromFileLockTable(fli);
-            throw new ShutdownChannelGroupException();
+            executed = true;
+        } finally {
+            if (!executed) {
+                // rollback
+                removeFromFileLockTable(fli);
+            }
         }
         return result;
     }
@@ -301,10 +286,10 @@ public class SimpleAsynchronousFileChannelImpl
     }
 
     @Override
-    public <A> Future<Integer> read(final ByteBuffer dst,
-                                    final long position,
-                                    A attachment,
-                                    final CompletionHandler<Integer,? super A> handler)
+    <A> Future<Integer> implRead(final ByteBuffer dst,
+                                 final long position,
+                                 final A attachment,
+                                 final CompletionHandler<Integer,? super A> handler)
     {
         if (position < 0)
             throw new IllegalArgumentException("Negative position");
@@ -315,55 +300,52 @@ public class SimpleAsynchronousFileChannelImpl
 
         // complete immediately if channel closed or no space remaining
         if (!isOpen() || (dst.remaining() == 0)) {
-            CompletedFuture<Integer,A> result;
-            if (isOpen()) {
-                result = CompletedFuture.withResult(this, 0, attachment);
-            } else {
-                result = CompletedFuture.withFailure(this,
-                    new ClosedChannelException(), attachment);
-            }
-            Invoker.invokeIndirectly(handler, result, executor);
-            return result;
+            Throwable exc = (isOpen()) ? null : new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withResult(0, exc);
+            Invoker.invokeIndirectly(handler, attachment, 0, exc, executor);
+            return null;
         }
 
-        final PendingFuture<Integer,A> result =
-            new PendingFuture<Integer,A>(this, handler, attachment);
+        final PendingFuture<Integer,A> result = (handler == null) ?
+            new PendingFuture<Integer,A>(this) : null;
         Runnable task = new Runnable() {
             public void run() {
+                int n = 0;
+                Throwable exc = null;
+
                 int ti = threads.add();
                 try {
                     begin();
-                    int n;
                     do {
                         n = IOUtil.read(fdObj, dst, position, nd, null);
                     } while ((n == IOStatus.INTERRUPTED) && isOpen());
                     if (n < 0 && !isOpen())
                         throw new AsynchronousCloseException();
-                    result.setResult(n);
                 } catch (IOException x) {
                     if (!isOpen())
                         x = new AsynchronousCloseException();
-                    result.setFailure(x);
+                    exc = x;
                 } finally {
                     end();
                     threads.remove(ti);
                 }
-                Invoker.invokeUnchecked(handler, result);
+                if (handler == null) {
+                    result.setResult(n, exc);
+                } else {
+                    Invoker.invokeUnchecked(handler, attachment, n, exc);
+                }
             }
         };
-        try {
-            executor.execute(task);
-        } catch (RejectedExecutionException ree) {
-            throw new ShutdownChannelGroupException();
-        }
+        executor.execute(task);
         return result;
     }
 
     @Override
-    public <A> Future<Integer> write(final ByteBuffer src,
-                                     final long position,
-                                     A attachment,
-                                     final CompletionHandler<Integer,? super A> handler)
+    <A> Future<Integer> implWrite(final ByteBuffer src,
+                                  final long position,
+                                  final A attachment,
+                                  final CompletionHandler<Integer,? super A> handler)
     {
         if (position < 0)
             throw new IllegalArgumentException("Negative position");
@@ -372,47 +354,44 @@ public class SimpleAsynchronousFileChannelImpl
 
         // complete immediately if channel is closed or no bytes remaining
         if (!isOpen() || (src.remaining() == 0)) {
-            CompletedFuture<Integer,A> result;
-            if (isOpen()) {
-                result = CompletedFuture.withResult(this, 0, attachment);
-            } else {
-                result = CompletedFuture.withFailure(this,
-                    new ClosedChannelException(), attachment);
-            }
-            Invoker.invokeIndirectly(handler, result, executor);
-            return result;
+            Throwable exc = (isOpen()) ? null : new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withResult(0, exc);
+            Invoker.invokeIndirectly(handler, attachment, 0, exc, executor);
+            return null;
         }
 
-        final PendingFuture<Integer,A> result =
-            new PendingFuture<Integer,A>(this, handler, attachment);
+        final PendingFuture<Integer,A> result = (handler == null) ?
+            new PendingFuture<Integer,A>(this) : null;
         Runnable task = new Runnable() {
             public void run() {
+                int n = 0;
+                Throwable exc = null;
+
                 int ti = threads.add();
                 try {
                     begin();
-                    int n;
                     do {
                         n = IOUtil.write(fdObj, src, position, nd, null);
                     } while ((n == IOStatus.INTERRUPTED) && isOpen());
                     if (n < 0 && !isOpen())
                         throw new AsynchronousCloseException();
-                    result.setResult(n);
                 } catch (IOException x) {
                     if (!isOpen())
                         x = new AsynchronousCloseException();
-                    result.setFailure(x);
+                    exc = x;
                 } finally {
                     end();
                     threads.remove(ti);
                 }
-                Invoker.invokeUnchecked(handler, result);
+                if (handler == null) {
+                    result.setResult(n, exc);
+                } else {
+                    Invoker.invokeUnchecked(handler, attachment, n, exc);
+                }
             }
         };
-        try {
-            executor.execute(task);
-        } catch (RejectedExecutionException ree) {
-            throw new ShutdownChannelGroupException();
-        }
+        executor.execute(task);
         return result;
     }
 }
diff --git a/jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java b/jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java
index b57cfb96fb9..34dee6235b8 100644
--- a/jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java
+++ b/jdk/src/share/classes/sun/nio/cs/ISO_8859_1.java
@@ -228,8 +228,8 @@ class ISO_8859_1
                     dst[dp++] = (byte)c;
                     continue;
                 }
-                if (Surrogate.isHigh(c) && sp < sl &&
-                    Surrogate.isLow(src[sp])) {
+                if (Character.isHighSurrogate(c) && sp < sl &&
+                    Character.isLowSurrogate(src[sp])) {
                     if (len > dst.length) {
                         sl++;
                         len--;
diff --git a/jdk/src/share/classes/sun/nio/cs/SingleByte.java b/jdk/src/share/classes/sun/nio/cs/SingleByte.java
index 9b0531eebd9..0ef6c1e0689 100644
--- a/jdk/src/share/classes/sun/nio/cs/SingleByte.java
+++ b/jdk/src/share/classes/sun/nio/cs/SingleByte.java
@@ -171,7 +171,7 @@ public class SingleByte
                 char c = sa[sp];
                 int b = encode(c);
                 if (b == UNMAPPABLE_ENCODING) {
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if (sgp == null)
                             sgp = new Surrogate.Parser();
                         if (sgp.parse(c, sa, sp, sl) < 0)
@@ -194,7 +194,7 @@ public class SingleByte
                     char c = src.get();
                     int b = encode(c);
                     if (b == UNMAPPABLE_ENCODING) {
-                        if (Surrogate.is(c)) {
+                        if (Character.isSurrogate(c)) {
                             if (sgp == null)
                                 sgp = new Surrogate.Parser();
                             if (sgp.parse(c, src) < 0)
@@ -243,8 +243,8 @@ public class SingleByte
                     dst[dp++] = (byte)b;
                     continue;
                 }
-                if (Surrogate.isHigh(c) && sp < sl &&
-                    Surrogate.isLow(src[sp])) {
+                if (Character.isHighSurrogate(c) && sp < sl &&
+                    Character.isLowSurrogate(src[sp])) {
                     if (len > dst.length) {
                         sl++;
                         len--;
diff --git a/jdk/src/share/classes/sun/nio/cs/SingleByteEncoder.java b/jdk/src/share/classes/sun/nio/cs/SingleByteEncoder.java
index 1d983e8e375..e26c898ee6a 100644
--- a/jdk/src/share/classes/sun/nio/cs/SingleByteEncoder.java
+++ b/jdk/src/share/classes/sun/nio/cs/SingleByteEncoder.java
@@ -84,7 +84,7 @@ public abstract class SingleByteEncoder
         try {
             while (sp < sl) {
                 char c = sa[sp];
-                if (Surrogate.is(c)) {
+                if (Character.isSurrogate(c)) {
                     if (sgp.parse(c, sa, sp, sl) < 0)
                         return sgp.error();
                     return sgp.unmappableResult();
@@ -117,7 +117,7 @@ public abstract class SingleByteEncoder
         try {
             while (src.hasRemaining()) {
                 char c = src.get();
-                if (Surrogate.is(c)) {
+                if (Character.isSurrogate(c)) {
                     if (sgp.parse(c, src) < 0)
                         return sgp.error();
                     return sgp.unmappableResult();
diff --git a/jdk/src/share/classes/sun/nio/cs/Surrogate.java b/jdk/src/share/classes/sun/nio/cs/Surrogate.java
index 369af3a96eb..4791255435b 100644
--- a/jdk/src/share/classes/sun/nio/cs/Surrogate.java
+++ b/jdk/src/share/classes/sun/nio/cs/Surrogate.java
@@ -30,7 +30,6 @@ import java.nio.charset.CoderResult;
 import java.nio.charset.MalformedInputException;
 import java.nio.charset.UnmappableCharacterException;
 
-
 /**
  * Utility class for dealing with surrogates.
  *
@@ -41,71 +40,80 @@ public class Surrogate {
 
     private Surrogate() { }
 
-    // UTF-16 surrogate-character ranges
-    //
-    public static final char MIN_HIGH = '\uD800';
-    public static final char MAX_HIGH = '\uDBFF';
-    public static final char MIN_LOW  = '\uDC00';
-    public static final char MAX_LOW  = '\uDFFF';
-    public static final char MIN = MIN_HIGH;
-    public static final char MAX = MAX_LOW;
-
-    // Range of UCS-4 values that need surrogates in UTF-16
-    //
-    public static final int UCS4_MIN = 0x10000;
-    public static final int UCS4_MAX = (1 << 20) + UCS4_MIN - 1;
+    // TODO: Deprecate/remove the following redundant definitions
+    public static final char MIN_HIGH = Character.MIN_HIGH_SURROGATE;
+    public static final char MAX_HIGH = Character.MAX_HIGH_SURROGATE;
+    public static final char MIN_LOW  = Character.MIN_LOW_SURROGATE;
+    public static final char MAX_LOW  = Character.MAX_LOW_SURROGATE;
+    public static final char MIN      = Character.MIN_SURROGATE;
+    public static final char MAX      = Character.MAX_SURROGATE;
+    public static final int UCS4_MIN  = Character.MIN_SUPPLEMENTARY_CODE_POINT;
+    public static final int UCS4_MAX  = Character.MAX_CODE_POINT;
 
     /**
-     * Tells whether or not the given UTF-16 value is a high surrogate.
+     * Tells whether or not the given value is in the high surrogate range.
+     * Use of {@link Character#isHighSurrogate} is generally preferred.
      */
     public static boolean isHigh(int c) {
         return (MIN_HIGH <= c) && (c <= MAX_HIGH);
     }
 
     /**
-     * Tells whether or not the given UTF-16 value is a low surrogate.
+     * Tells whether or not the given value is in the low surrogate range.
+     * Use of {@link Character#isLowSurrogate} is generally preferred.
      */
     public static boolean isLow(int c) {
         return (MIN_LOW <= c) && (c <= MAX_LOW);
     }
 
     /**
-     * Tells whether or not the given UTF-16 value is a surrogate character,
+     * Tells whether or not the given value is in the surrogate range.
+     * Use of {@link Character#isSurrogate} is generally preferred.
      */
     public static boolean is(int c) {
         return (MIN <= c) && (c <= MAX);
     }
 
+    /**
+     * Tells whether or not the given UCS-4 character is in the Basic
+     * Multilingual Plane, and can be represented using a single char.
+     */
+    public static boolean isBMP(int uc) {
+        return (int) (char) uc == uc;
+    }
+
     /**
      * Tells whether or not the given UCS-4 character must be represented as a
      * surrogate pair in UTF-16.
      */
     public static boolean neededFor(int uc) {
-        return (uc >= UCS4_MIN) && (uc <= UCS4_MAX);
+        return Character.isSupplementaryCodePoint(uc);
     }
 
     /**
-     * Returns the high UTF-16 surrogate for the given UCS-4 character.
+     * Returns the high UTF-16 surrogate for the given supplementary UCS-4 character.
      */
     public static char high(int uc) {
-        assert neededFor(uc);
-        return (char)(0xd800 | (((uc - UCS4_MIN) >> 10) & 0x3ff));
+        assert Character.isSupplementaryCodePoint(uc);
+        return (char)((uc >> 10)
+                      + (Character.MIN_HIGH_SURROGATE
+                         - (Character.MIN_SUPPLEMENTARY_CODE_POINT >> 10)));
     }
 
     /**
-     * Returns the low UTF-16 surrogate for the given UCS-4 character.
+     * Returns the low UTF-16 surrogate for the given supplementary UCS-4 character.
      */
     public static char low(int uc) {
-        assert neededFor(uc);
-        return (char)(0xdc00 | ((uc - UCS4_MIN) & 0x3ff));
+        assert Character.isSupplementaryCodePoint(uc);
+        return (char)((uc & 0x3ff) + Character.MIN_LOW_SURROGATE);
     }
 
     /**
      * Converts the given surrogate pair into a 32-bit UCS-4 character.
      */
     public static int toUCS4(char c, char d) {
-        assert isHigh(c) && isLow(d);
-        return (((c & 0x3ff) << 10) | (d & 0x3ff)) + 0x10000;
+        assert Character.isHighSurrogate(c) && Character.isLowSurrogate(d);
+        return Character.toCodePoint(c, d);
     }
 
     /**
@@ -178,14 +186,14 @@ public class Surrogate {
          *           object
          */
         public int parse(char c, CharBuffer in) {
-            if (Surrogate.isHigh(c)) {
+            if (Character.isHighSurrogate(c)) {
                 if (!in.hasRemaining()) {
                     error = CoderResult.UNDERFLOW;
                     return -1;
                 }
                 char d = in.get();
-                if (Surrogate.isLow(d)) {
-                    character = toUCS4(c, d);
+                if (Character.isLowSurrogate(d)) {
+                    character = Character.toCodePoint(c, d);
                     isPair = true;
                     error = null;
                     return character;
@@ -193,7 +201,7 @@ public class Surrogate {
                 error = CoderResult.malformedForLength(1);
                 return -1;
             }
-            if (Surrogate.isLow(c)) {
+            if (Character.isLowSurrogate(c)) {
                 error = CoderResult.malformedForLength(1);
                 return -1;
             }
@@ -220,14 +228,14 @@ public class Surrogate {
          */
         public int parse(char c, char[] ia, int ip, int il) {
             assert (ia[ip] == c);
-            if (Surrogate.isHigh(c)) {
+            if (Character.isHighSurrogate(c)) {
                 if (il - ip < 2) {
                     error = CoderResult.UNDERFLOW;
                     return -1;
                 }
                 char d = ia[ip + 1];
-                if (Surrogate.isLow(d)) {
-                    character = toUCS4(c, d);
+                if (Character.isLowSurrogate(d)) {
+                    character = Character.toCodePoint(c, d);
                     isPair = true;
                     error = null;
                     return character;
@@ -235,7 +243,7 @@ public class Surrogate {
                 error = CoderResult.malformedForLength(1);
                 return -1;
             }
-            if (Surrogate.isLow(c)) {
+            if (Character.isLowSurrogate(c)) {
                 error = CoderResult.malformedForLength(1);
                 return -1;
             }
@@ -282,7 +290,7 @@ public class Surrogate {
          *           error() will return a descriptive result object
          */
         public int generate(int uc, int len, CharBuffer dst) {
-            if (uc <= 0xffff) {
+            if (Surrogate.isBMP(uc)) {
                 if (Surrogate.is(uc)) {
                     error = CoderResult.malformedForLength(len);
                     return -1;
@@ -294,12 +302,7 @@ public class Surrogate {
                 dst.put((char)uc);
                 error = null;
                 return 1;
-            }
-            if (uc < Surrogate.UCS4_MIN) {
-                error = CoderResult.malformedForLength(len);
-                return -1;
-            }
-            if (uc <= Surrogate.UCS4_MAX) {
+            } else if (Character.isSupplementaryCodePoint(uc)) {
                 if (dst.remaining() < 2) {
                     error = CoderResult.OVERFLOW;
                     return -1;
@@ -308,9 +311,10 @@ public class Surrogate {
                 dst.put(Surrogate.low(uc));
                 error = null;
                 return 2;
+            } else {
+                error = CoderResult.unmappableForLength(len);
+                return -1;
             }
-            error = CoderResult.unmappableForLength(len);
-            return -1;
         }
 
         /**
@@ -330,7 +334,7 @@ public class Surrogate {
          *           error() will return a descriptive result object
          */
         public int generate(int uc, int len, char[] da, int dp, int dl) {
-            if (uc <= 0xffff) {
+            if (Surrogate.isBMP(uc)) {
                 if (Surrogate.is(uc)) {
                     error = CoderResult.malformedForLength(len);
                     return -1;
@@ -342,12 +346,7 @@ public class Surrogate {
                 da[dp] = (char)uc;
                 error = null;
                 return 1;
-            }
-            if (uc < Surrogate.UCS4_MIN) {
-                error = CoderResult.malformedForLength(len);
-                return -1;
-            }
-            if (uc <= Surrogate.UCS4_MAX) {
+            } else if (Character.isSupplementaryCodePoint(uc)) {
                 if (dl - dp < 2) {
                     error = CoderResult.OVERFLOW;
                     return -1;
@@ -356,11 +355,11 @@ public class Surrogate {
                 da[dp + 1] = Surrogate.low(uc);
                 error = null;
                 return 2;
+            } else {
+                error = CoderResult.unmappableForLength(len);
+                return -1;
             }
-            error = CoderResult.unmappableForLength(len);
-            return -1;
         }
-
     }
 
 }
diff --git a/jdk/src/share/classes/sun/nio/cs/US_ASCII.java b/jdk/src/share/classes/sun/nio/cs/US_ASCII.java
index fe454bbee3f..182c00b907d 100644
--- a/jdk/src/share/classes/sun/nio/cs/US_ASCII.java
+++ b/jdk/src/share/classes/sun/nio/cs/US_ASCII.java
@@ -247,8 +247,8 @@ public class US_ASCII
                     dst[dp++] = (byte)c;
                     continue;
                 }
-                if (Surrogate.isHigh(c) && sp < sl &&
-                    Surrogate.isLow(src[sp])) {
+                if (Character.isHighSurrogate(c) && sp < sl &&
+                    Character.isLowSurrogate(src[sp])) {
                     if (len > dst.length) {
                         sl++;
                         len--;
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java b/jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java
index 1229699d31f..6edfdfd7c52 100644
--- a/jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java
+++ b/jdk/src/share/classes/sun/nio/cs/UTF_32Coder.java
@@ -154,11 +154,11 @@ class UTF_32Coder {
             try {
                 while (src.hasRemaining()) {
                     char c = src.get();
-                    if (Surrogate.isHigh(c)) {
+                    if (Character.isHighSurrogate(c)) {
                         if (!src.hasRemaining())
                             return CoderResult.UNDERFLOW;
                         char low = src.get();
-                        if (Surrogate.isLow(low)) {
+                        if (Character.isLowSurrogate(low)) {
                             if (dst.remaining() < 4)
                                 return CoderResult.OVERFLOW;
                             mark += 2;
@@ -166,7 +166,7 @@ class UTF_32Coder {
                         } else {
                             return CoderResult.malformedForLength(1);
                         }
-                    } else if (Surrogate.isLow(c)) {
+                    } else if (Character.isLowSurrogate(c)) {
                         return CoderResult.malformedForLength(1);
                     } else {
                         if (dst.remaining() < 4)
diff --git a/jdk/src/share/classes/sun/nio/cs/UTF_8.java b/jdk/src/share/classes/sun/nio/cs/UTF_8.java
index 589e3679511..7b7da2da1c5 100644
--- a/jdk/src/share/classes/sun/nio/cs/UTF_8.java
+++ b/jdk/src/share/classes/sun/nio/cs/UTF_8.java
@@ -334,7 +334,7 @@ class UTF_8 extends Unicode
         }
 
         public boolean canEncode(char c) {
-            return !Surrogate.is(c);
+            return !Character.isSurrogate(c);
         }
 
         public boolean isLegalReplacement(byte[] repl) {
@@ -370,7 +370,7 @@ class UTF_8 extends Unicode
             while (dp < dlASCII && sa[sp] < '\u0080')
                 da[dp++] = (byte) sa[sp++];
             while (sp < sl) {
-                int c = sa[sp];
+                char c = sa[sp];
                 if (c < 0x80) {
                     // Have at most seven bits
                     if (dp >= dl)
@@ -382,11 +382,11 @@ class UTF_8 extends Unicode
                         return overflow(src, sp, dst, dp);
                     da[dp++] = (byte)(0xc0 | ((c >> 06)));
                     da[dp++] = (byte)(0x80 | (c & 0x3f));
-                } else if (Surrogate.is(c)) {
+                } else if (Character.isSurrogate(c)) {
                     // Have a surrogate pair
                     if (sgp == null)
                         sgp = new Surrogate.Parser();
-                    int uc = sgp.parse((char)c, sa, sp, sl);
+                    int uc = sgp.parse(c, sa, sp, sl);
                     if (uc < 0) {
                         updatePositions(src, sp, dst, dp);
                         return sgp.error();
@@ -417,7 +417,7 @@ class UTF_8 extends Unicode
         {
             int mark = src.position();
             while (src.hasRemaining()) {
-                int c = src.get();
+                char c = src.get();
                 if (c < 0x80) {
                     // Have at most seven bits
                     if (!dst.hasRemaining())
@@ -429,11 +429,11 @@ class UTF_8 extends Unicode
                         return overflow(src, mark);
                     dst.put((byte)(0xc0 | ((c >> 06))));
                     dst.put((byte)(0x80 | (c & 0x3f)));
-                } else if (Surrogate.is(c)) {
+                } else if (Character.isSurrogate(c)) {
                     // Have a surrogate pair
                     if (sgp == null)
                         sgp = new Surrogate.Parser();
-                    int uc = sgp.parse((char)c, src);
+                    int uc = sgp.parse(c, src);
                     if (uc < 0) {
                         src.position(mark);
                         return sgp.error();
diff --git a/jdk/src/share/classes/sun/nio/cs/UnicodeDecoder.java b/jdk/src/share/classes/sun/nio/cs/UnicodeDecoder.java
index 67afe2f897c..4e833a049b1 100644
--- a/jdk/src/share/classes/sun/nio/cs/UnicodeDecoder.java
+++ b/jdk/src/share/classes/sun/nio/cs/UnicodeDecoder.java
@@ -97,12 +97,12 @@ abstract class UnicodeDecoder extends CharsetDecoder {
                 }
 
                 // Surrogates
-                if (Surrogate.is(c)) {
-                    if (Surrogate.isHigh(c)) {
+                if (Character.isSurrogate(c)) {
+                    if (Character.isHighSurrogate(c)) {
                         if (src.remaining() < 2)
                             return CoderResult.UNDERFLOW;
                         char c2 = decode(src.get() & 0xff, src.get() & 0xff);
-                        if (!Surrogate.isLow(c2))
+                        if (!Character.isLowSurrogate(c2))
                             return CoderResult.malformedForLength(4);
                         if (dst.remaining() < 2)
                             return CoderResult.OVERFLOW;
diff --git a/jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java b/jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java
index c14bbbe772b..67a7f176db6 100644
--- a/jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java
+++ b/jdk/src/share/classes/sun/nio/cs/UnicodeEncoder.java
@@ -80,7 +80,7 @@ public abstract class UnicodeEncoder extends CharsetEncoder {
         try {
             while (src.hasRemaining()) {
                 char c = src.get();
-                if (!Surrogate.is(c)) {
+                if (!Character.isSurrogate(c)) {
                     if (dst.remaining() < 2)
                         return CoderResult.OVERFLOW;
                     mark++;
@@ -107,6 +107,6 @@ public abstract class UnicodeEncoder extends CharsetEncoder {
     }
 
     public boolean canEncode(char c) {
-        return ! Surrogate.is(c);
+        return ! Character.isSurrogate(c);
     }
 }
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java b/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java
index b7372ba20b7..04f1cb89746 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/DoubleByte.java
@@ -449,7 +449,7 @@ public class DoubleByte {
                     char c = sa[sp];
                     int bb = encodeChar(c);
                     if (bb == UNMAPPABLE_ENCODING) {
-                        if (Surrogate.is(c)) {
+                        if (Character.isSurrogate(c)) {
                             if (sgp().parse(c, sa, sp, sl) < 0)
                                 return sgp.error();
                             return sgp.unmappableResult();
@@ -484,7 +484,7 @@ public class DoubleByte {
                     char c = src.get();
                     int bb = encodeChar(c);
                     if (bb == UNMAPPABLE_ENCODING) {
-                        if (Surrogate.is(c)) {
+                        if (Character.isSurrogate(c)) {
                             if (sgp().parse(c, src) < 0)
                                 return sgp.error();
                             return sgp.unmappableResult();
@@ -659,7 +659,7 @@ public class DoubleByte {
                     char c = sa[sp];
                     int bb = encodeChar(c);
                     if (bb == UNMAPPABLE_ENCODING) {
-                        if (Surrogate.is(c)) {
+                        if (Character.isSurrogate(c)) {
                             if (sgp().parse(c, sa, sp, sl) < 0)
                                 return sgp.error();
                             return sgp.unmappableResult();
@@ -705,7 +705,7 @@ public class DoubleByte {
                     char c = src.get();
                     int bb = encodeChar(c);
                     if (bb == UNMAPPABLE_ENCODING) {
-                        if (Surrogate.is(c)) {
+                        if (Character.isSurrogate(c)) {
                             if (sgp().parse(c, src) < 0)
                                 return sgp.error();
                             return sgp.unmappableResult();
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java b/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java
index e548951da0e..d112c83c7b2 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java
@@ -95,7 +95,7 @@ public abstract class DoubleByteEncoder
         try {
             while (sp < sl) {
                 char c = sa[sp];
-                if (Surrogate.is(c)) {
+                if (Character.isSurrogate(c)) {
                     if (sgp.parse(c, sa, sp, sl) < 0)
                         return sgp.error();
                     if (sl - sp < 2)
@@ -153,7 +153,7 @@ public abstract class DoubleByteEncoder
         try {
             while (src.hasRemaining()) {
                 char c = src.get();
-                if (Surrogate.is(c)) {
+                if (Character.isSurrogate(c)) {
                     int surr;
                     if ((surr = sgp.parse(c, src)) < 0)
                         return sgp.error();
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java
index e29842eec06..0c13aa4b502 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP.java
@@ -318,7 +318,7 @@ public class EUC_JP
                     outputByte = tmpBuf;
                     char c = sa[sp];
 
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if (sgp.parse(c, sa, sp, sl) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
@@ -372,7 +372,7 @@ public class EUC_JP
                 while (src.hasRemaining()) {
                     outputByte = tmpBuf;
                     char c = src.get();
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if (sgp.parse(c, src) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java
index 1db75fa15f7..d39084d8f1f 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_LINUX.java
@@ -285,7 +285,7 @@ public class EUC_JP_LINUX
                 while (sp < sl) {
                     char c = sa[sp];
 
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if (sgp.parse(c, sa, sp, sl) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
@@ -327,7 +327,7 @@ public class EUC_JP_LINUX
             try {
                 while (src.hasRemaining()) {
                     char c = src.get();
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if (sgp.parse(c, src) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java b/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java
index 158407bd108..5830da0f042 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/EUC_TW.java
@@ -310,11 +310,11 @@ public class EUC_TW extends Charset implements HistoricallyNamedCharset
             int i = 0;
             while (i < cs.length()) {
                 char c = cs.charAt(i++);
-                if (Surrogate.isHigh(c)) {
+                if (Character.isHighSurrogate(c)) {
                     if (i == cs.length())
                         return false;
                     char low = cs.charAt(i++);
-                    if (!Surrogate.isLow(low) || toEUC(c, low, bb) == -1)
+                    if (!Character.isLowSurrogate(low) || toEUC(c, low, bb) == -1)
                         return false;
                 } else if (!canEncode(c)) {
                     return false;
@@ -361,14 +361,14 @@ public class EUC_TW extends Charset implements HistoricallyNamedCharset
                             // supplementary character encoding. given the use
                             // of supplementary characters is really rare, this
                             // is something worth doing.
-                            if (Surrogate.isHigh(c)) {
+                            if (Character.isHighSurrogate(c)) {
                                 if ((sp + 1) == sl)
                                     return CoderResult.UNDERFLOW;
-                                if (!Surrogate.isLow(sa[sp + 1]))
+                                if (!Character.isLowSurrogate(sa[sp + 1]))
                                     return CoderResult.malformedForLength(1);
                                 outSize = toEUC(c, sa[sp+1], bb);
                                     inSize = 2;
-                            } else if (Surrogate.isLow(c)) {
+                            } else if (Character.isLowSurrogate(c)) {
                                 return CoderResult.malformedForLength(1);
                             }
                         }
@@ -405,15 +405,15 @@ public class EUC_TW extends Charset implements HistoricallyNamedCharset
                     } else {
                         outSize = toEUC(c, bb);
                         if (outSize == -1) {
-                            if (Surrogate.isHigh(c)) {
+                            if (Character.isHighSurrogate(c)) {
                                 if (!src.hasRemaining())
                                     return CoderResult.UNDERFLOW;
                                 char c2 = src.get();
-                                if (!Surrogate.isLow(c2))
+                                if (!Character.isLowSurrogate(c2))
                                     return CoderResult.malformedForLength(1);
                                 outSize = toEUC(c, c2, bb);
                                 inSize = 2;
-                            } else if (Surrogate.isLow(c)) {
+                            } else if (Character.isLowSurrogate(c)) {
                                 return CoderResult.malformedForLength(1);
                             }
                         }
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java b/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java
index 53b66fa917e..76392bda2f1 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/GB18030.java
@@ -12586,7 +12586,7 @@ public class GB18030
         }
 
         public boolean canEncode(char c) {
-            return ! Surrogate.is(c);
+            return ! Character.isSurrogate(c);
         }
 
         private final Surrogate.Parser sgp = new Surrogate.Parser();
@@ -12625,7 +12625,7 @@ public class GB18030
                     int inputSize = 1;
                     char c = sa[sp];
 
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if ((condensedKey=sgp.parse(c, sa, sp, sl)) < 0)
                             return sgp.error();
                         // Surogate.toUCS4 looks like
@@ -12719,7 +12719,7 @@ public class GB18030
                 while (src.hasRemaining()) {
                     char c = src.get();
                     int inputSize = 1;
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if ((condensedKey = sgp.parse(c, src))<0)
                            return sgp.error();
                         condensedKey += 0x1e248;
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISCII91.java b/jdk/src/share/classes/sun/nio/cs/ext/ISCII91.java
index 284cfda330e..7087036467a 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/ISCII91.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/ISCII91.java
@@ -885,7 +885,7 @@ public class ISCII91 extends Charset implements HistoricallyNamedCharset
                         index = ((int)(inputChar) - 0x0900)*2;
                     }
 
-                    if (Surrogate.is(inputChar)) {
+                    if (Character.isSurrogate(inputChar)) {
                         if (sgp.parse(inputChar, sa, sp, sl) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
@@ -948,7 +948,7 @@ public class ISCII91 extends Charset implements HistoricallyNamedCharset
                         index = ((int)(inputChar) - 0x0900)*2;
                     }
 
-                    if (Surrogate.is(inputChar)) {
+                    if (Character.isSurrogate(inputChar)) {
                         if (sgp.parse(inputChar, src) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java b/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java
index 242a841d46f..8038d18f6a9 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/ISO2022.java
@@ -388,9 +388,9 @@ abstract class ISO2022
 
     protected static class Encoder extends CharsetEncoder {
         private final Surrogate.Parser sgp = new Surrogate.Parser();
-        private final byte SS2 = (byte)0x8e;
-        private final byte PLANE2 = (byte)0xA2;
-        private final byte PLANE3 = (byte)0xA3;
+        public static final byte SS2 = (byte)0x8e;
+        public static final byte PLANE2 = (byte)0xA2;
+        public static final byte PLANE3 = (byte)0xA3;
         private final byte MSB = (byte)0x80;
 
         protected final byte maximumDesignatorLength = 4;
@@ -515,7 +515,7 @@ abstract class ISO2022
             try {
                 while (sp < sl) {
                     char c = sa[sp];
-                    if (Surrogate.is(c)) {
+                    if (Character.isSurrogate(c)) {
                         if (sgp.parse(c, sa, sp, sl) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
@@ -576,7 +576,7 @@ abstract class ISO2022
             try {
                 while (src.hasRemaining()) {
                     char inputChar = src.get();
-                    if (Surrogate.is(inputChar)) {
+                    if (Character.isSurrogate(inputChar)) {
                         if (sgp.parse(inputChar, src) < 0)
                             return sgp.error();
                         return sgp.unmappableResult();
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java b/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
index e5b5d719515..72e11ff1a76 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java
@@ -76,6 +76,15 @@ public class ISO2022_CN_CNS extends ISO2022 implements HistoricallyNamedCharset
             } catch (Exception e) { }
         }
 
+        private byte[] bb = new byte[4];
+        public boolean canEncode(char c) {
+            int n = 0;
+            return (c <= '\u007f' ||
+                    (n = ((EUC_TW.Encoder)ISOEncoder).toEUC(c, bb)) == 2 ||
+                    (n == 4 && bb[0] == SS2 &&
+                     (bb[1] == PLANE2 || bb[1] == PLANE3)));
+        }
+
         /*
          * Since ISO2022-CN-CNS possesses a CharsetEncoder
          * without the corresponding CharsetDecoder half the
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java b/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java
index e92238e3714..69d2c9b413e 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java
@@ -637,7 +637,7 @@ public class ISO2022_JP
                             da[dp++] = (byte)(index >> 8);
                             da[dp++] = (byte)(index & 0xff);
                         } else {
-                            if (Surrogate.is(c) && sgp.parse(c, sa, sp, sl) < 0)
+                            if (Character.isSurrogate(c) && sgp.parse(c, sa, sp, sl) < 0)
                                 return sgp.error();
                             if (unmappableCharacterAction()
                                 == CodingErrorAction.REPLACE
@@ -655,7 +655,7 @@ public class ISO2022_JP
                                 }
                                 currentMode = replaceMode;
                             }
-                            if (Surrogate.is(c))
+                            if (Character.isSurrogate(c))
                                 return sgp.unmappableResult();
                             return CoderResult.unmappableForLength(1);
                         }
@@ -745,7 +745,7 @@ public class ISO2022_JP
                             dst.put((byte)(index >> 8));
                             dst.put((byte)(index & 0xff));
                         } else {
-                            if (Surrogate.is(c) && sgp.parse(c, src) < 0)
+                            if (Character.isSurrogate(c) && sgp.parse(c, src) < 0)
                                 return sgp.error();
                             if (unmappableCharacterAction() == CodingErrorAction.REPLACE
                                 && currentMode != replaceMode) {
@@ -762,7 +762,7 @@ public class ISO2022_JP
                                 }
                                 currentMode = replaceMode;
                             }
-                            if (Surrogate.is(c))
+                            if (Character.isSurrogate(c))
                                 return sgp.unmappableResult();
                             return CoderResult.unmappableForLength(1);
                         }
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java b/jdk/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
index 308087376c9..8ce14afbcd3 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java
@@ -114,7 +114,7 @@ public abstract class SimpleEUCEncoder
             while (sp < sl) {
                 boolean allZeroes = true;
                 char inputChar = sa[sp];
-                if (Surrogate.is(inputChar)) {
+                if (Character.isSurrogate(inputChar)) {
                     if (sgp.parse(inputChar, sa, sp, sl) < 0)
                         return sgp.error();
                     return sgp.unmappableResult();
@@ -194,7 +194,7 @@ public abstract class SimpleEUCEncoder
             while (src.hasRemaining()) {
                 char inputChar = src.get();
                 boolean allZeroes = true;
-                if (Surrogate.is(inputChar)) {
+                if (Character.isSurrogate(inputChar)) {
                     if (sgp.parse(inputChar, src) < 0)
                         return sgp.error();
                     return sgp.unmappableResult();
diff --git a/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java b/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
new file mode 100644
index 00000000000..8a61a7b1193
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/ec/ECDHKeyAgreement.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.security.ec;
+
+import java.security.*;
+import java.security.interfaces.*;
+import java.security.spec.*;
+
+import javax.crypto.*;
+import javax.crypto.spec.*;
+
+/**
+ * KeyAgreement implementation for ECDH.
+ *
+ * @since   1.7
+ */
+public final class ECDHKeyAgreement extends KeyAgreementSpi {
+
+    // flag indicating whether the native ECC implementation is present
+    private static boolean implementationPresent = true;
+    static {
+        try {
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("sunecc");
+                    return null;
+                }
+            });
+        } catch (UnsatisfiedLinkError e) {
+            implementationPresent = false;
+        }
+    }
+
+    // private key, if initialized
+    private ECPrivateKey privateKey;
+
+    // encoded public point, non-null between doPhase() & generateSecret() only
+    private byte[] publicValue;
+
+    // length of the secret to be derived
+    private int secretLen;
+
+    /**
+     * Constructs a new ECDHKeyAgreement.
+     *
+     * @exception ProviderException if the native ECC library is unavailable.
+     */
+    public ECDHKeyAgreement() {
+        if (!implementationPresent) {
+            throw new ProviderException("ECDH implementation is not available");
+        }
+    }
+
+    // see JCE spec
+    protected void engineInit(Key key, SecureRandom random)
+            throws InvalidKeyException {
+        if (!(key instanceof PrivateKey)) {
+            throw new InvalidKeyException
+                        ("Key must be instance of PrivateKey");
+        }
+        privateKey = (ECPrivateKey) ECKeyFactory.toECKey(key);
+        publicValue = null;
+    }
+
+    // see JCE spec
+    protected void engineInit(Key key, AlgorithmParameterSpec params,
+            SecureRandom random) throws InvalidKeyException,
+            InvalidAlgorithmParameterException {
+        if (params != null) {
+            throw new InvalidAlgorithmParameterException
+                        ("Parameters not supported");
+        }
+        engineInit(key, random);
+    }
+
+    // see JCE spec
+    protected Key engineDoPhase(Key key, boolean lastPhase)
+            throws InvalidKeyException, IllegalStateException {
+        if (privateKey == null) {
+            throw new IllegalStateException("Not initialized");
+        }
+        if (publicValue != null) {
+            throw new IllegalStateException("Phase already executed");
+        }
+        if (!lastPhase) {
+            throw new IllegalStateException
+                ("Only two party agreement supported, lastPhase must be true");
+        }
+        if (!(key instanceof ECPublicKey)) {
+            throw new InvalidKeyException
+                ("Key must be a PublicKey with algorithm EC");
+        }
+
+        ECPublicKey ecKey = (ECPublicKey)key;
+        ECParameterSpec params = ecKey.getParams();
+
+        if (ecKey instanceof ECPublicKeyImpl) {
+            publicValue = ((ECPublicKeyImpl)ecKey).getEncodedPublicValue();
+        } else { // instanceof ECPublicKey
+            publicValue =
+                ECParameters.encodePoint(ecKey.getW(), params.getCurve());
+        }
+        int keyLenBits = params.getCurve().getField().getFieldSize();
+        secretLen = (keyLenBits + 7) >> 3;
+
+        return null;
+    }
+
+    // see JCE spec
+    protected byte[] engineGenerateSecret() throws IllegalStateException {
+        if ((privateKey == null) || (publicValue == null)) {
+            throw new IllegalStateException("Not initialized correctly");
+        }
+
+        byte[] s = privateKey.getS().toByteArray();
+        byte[] encodedParams =
+            ECParameters.encodeParameters(privateKey.getParams()); // DER OID
+
+        try {
+
+            return deriveKey(s, publicValue, encodedParams);
+
+        } catch (GeneralSecurityException e) {
+            throw new ProviderException("Could not derive key", e);
+        }
+
+    }
+
+    // see JCE spec
+    protected int engineGenerateSecret(byte[] sharedSecret, int
+            offset) throws IllegalStateException, ShortBufferException {
+        if (offset + secretLen > sharedSecret.length) {
+            throw new ShortBufferException("Need " + secretLen
+                + " bytes, only " + (sharedSecret.length - offset) + " available");
+        }
+        byte[] secret = engineGenerateSecret();
+        System.arraycopy(secret, 0, sharedSecret, offset, secret.length);
+        return secret.length;
+    }
+
+    // see JCE spec
+    protected SecretKey engineGenerateSecret(String algorithm)
+            throws IllegalStateException, NoSuchAlgorithmException,
+            InvalidKeyException {
+        if (algorithm == null) {
+            throw new NoSuchAlgorithmException("Algorithm must not be null");
+        }
+        if (!(algorithm.equals("TlsPremasterSecret"))) {
+            throw new NoSuchAlgorithmException
+                ("Only supported for algorithm TlsPremasterSecret");
+        }
+        return new SecretKeySpec(engineGenerateSecret(), "TlsPremasterSecret");
+    }
+
+    /**
+     * Generates a secret key using the public and private keys.
+     *
+     * @param s the private key's S value.
+     * @param w the public key's W point (in uncompressed form).
+     * @param encodedParams the curve's DER encoded object identifier.
+     *
+     * @return byte[] the secret key.
+     */
+    private static native byte[] deriveKey(byte[] s, byte[] w,
+        byte[] encodedParams) throws GeneralSecurityException;
+}
diff --git a/jdk/src/share/classes/sun/security/ec/ECDSASignature.java b/jdk/src/share/classes/sun/security/ec/ECDSASignature.java
new file mode 100644
index 00000000000..b2bf8936c15
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/ec/ECDSASignature.java
@@ -0,0 +1,447 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.security.ec;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import java.security.*;
+import java.security.interfaces.*;
+import java.security.spec.*;
+
+import sun.security.jca.JCAUtil;
+import sun.security.util.*;
+import sun.security.x509.AlgorithmId;
+
+/**
+ * ECDSA signature implementation. This class currently supports the
+ * following algorithm names:
+ *
+ *   . "NONEwithECDSA"
+ *   . "SHA1withECDSA"
+ *   . "SHA256withECDSA"
+ *   . "SHA384withECDSA"
+ *   . "SHA512withECDSA"
+ *
+ * @since   1.7
+ */
+abstract class ECDSASignature extends SignatureSpi {
+
+    // flag indicating whether the native ECC implementation is present
+    private static boolean implementationPresent = true;
+    static {
+        try {
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("sunecc");
+                    return null;
+                }
+            });
+        } catch (UnsatisfiedLinkError e) {
+            implementationPresent = false;
+        }
+    }
+
+    // message digest implementation we use
+    private final MessageDigest messageDigest;
+
+    // supplied entropy
+    private SecureRandom random;
+
+    // flag indicating whether the digest has been reset
+    private boolean needsReset;
+
+    // private key, if initialized for signing
+    private ECPrivateKey privateKey;
+
+    // public key, if initialized for verifying
+    private ECPublicKey publicKey;
+
+    /**
+     * Constructs a new ECDSASignature. Used by Raw subclass.
+     *
+     * @exception ProviderException if the native ECC library is unavailable.
+     */
+    ECDSASignature() {
+        if (!implementationPresent) {
+            throw new
+                ProviderException("ECDSA implementation is not available");
+        }
+        messageDigest = null;
+    }
+
+    /**
+     * Constructs a new ECDSASignature. Used by subclasses.
+     *
+     * @exception ProviderException if the native ECC library is unavailable.
+     */
+    ECDSASignature(String digestName) {
+        if (!implementationPresent) {
+            throw new
+                ProviderException("ECDSA implementation is not available");
+        }
+
+        try {
+            messageDigest = MessageDigest.getInstance(digestName);
+        } catch (NoSuchAlgorithmException e) {
+            throw new ProviderException(e);
+        }
+        needsReset = false;
+    }
+
+    // Nested class for NONEwithECDSA signatures
+    public static final class Raw extends ECDSASignature {
+
+        // the longest supported digest is 512 bits (SHA-512)
+        private static final int RAW_ECDSA_MAX = 64;
+
+        private final byte[] precomputedDigest;
+        private int offset = 0;
+
+        public Raw() {
+            precomputedDigest = new byte[RAW_ECDSA_MAX];
+        }
+
+        // Stores the precomputed message digest value.
+        @Override
+        protected void engineUpdate(byte b) throws SignatureException {
+            if (offset >= precomputedDigest.length) {
+                offset = RAW_ECDSA_MAX + 1;
+                return;
+            }
+            precomputedDigest[offset++] = b;
+        }
+
+        // Stores the precomputed message digest value.
+        @Override
+        protected void engineUpdate(byte[] b, int off, int len)
+                throws SignatureException {
+            if (offset >= precomputedDigest.length) {
+                offset = RAW_ECDSA_MAX + 1;
+                return;
+            }
+            System.arraycopy(b, off, precomputedDigest, offset, len);
+            offset += len;
+        }
+
+        // Stores the precomputed message digest value.
+        @Override
+        protected void engineUpdate(ByteBuffer byteBuffer) {
+            int len = byteBuffer.remaining();
+            if (len <= 0) {
+                return;
+            }
+            if (offset + len >= precomputedDigest.length) {
+                offset = RAW_ECDSA_MAX + 1;
+                return;
+            }
+            byteBuffer.get(precomputedDigest, offset, len);
+            offset += len;
+        }
+
+        @Override
+        protected void resetDigest(){
+            offset = 0;
+        }
+
+        // Returns the precomputed message digest value.
+        @Override
+        protected byte[] getDigestValue() throws SignatureException {
+            if (offset > RAW_ECDSA_MAX) {
+                throw new SignatureException("Message digest is too long");
+
+            }
+            byte[] result = new byte[offset];
+            System.arraycopy(precomputedDigest, 0, result, 0, offset);
+            offset = 0;
+
+            return result;
+        }
+    }
+
+    // Nested class for SHA1withECDSA signatures
+    public static final class SHA1 extends ECDSASignature {
+        public SHA1() {
+            super("SHA1");
+        }
+    }
+
+    // Nested class for SHA256withECDSA signatures
+    public static final class SHA256 extends ECDSASignature {
+        public SHA256() {
+            super("SHA-256");
+        }
+    }
+
+    // Nested class for SHA384withECDSA signatures
+    public static final class SHA384 extends ECDSASignature {
+        public SHA384() {
+            super("SHA-384");
+        }
+    }
+
+    // Nested class for SHA512withECDSA signatures
+    public static final class SHA512 extends ECDSASignature {
+        public SHA512() {
+            super("SHA-512");
+        }
+    }
+
+    // initialize for verification. See JCA doc
+    @Override
+    protected void engineInitVerify(PublicKey publicKey)
+            throws InvalidKeyException {
+        this.publicKey = (ECPublicKey) ECKeyFactory.toECKey(publicKey);
+
+        // Should check that the supplied key is appropriate for signature
+        // algorithm (e.g. P-256 for SHA256withECDSA)
+        this.privateKey = null;
+        resetDigest();
+    }
+
+    // initialize for signing. See JCA doc
+    @Override
+    protected void engineInitSign(PrivateKey privateKey)
+            throws InvalidKeyException {
+        engineInitSign(privateKey, null);
+    }
+
+    // initialize for signing. See JCA doc
+    @Override
+    protected void engineInitSign(PrivateKey privateKey, SecureRandom random)
+            throws InvalidKeyException {
+        this.privateKey = (ECPrivateKey) ECKeyFactory.toECKey(privateKey);
+
+        // Should check that the supplied key is appropriate for signature
+        // algorithm (e.g. P-256 for SHA256withECDSA)
+        this.publicKey = null;
+        this.random = random;
+        resetDigest();
+    }
+
+    /**
+     * Resets the message digest if needed.
+     */
+    protected void resetDigest() {
+        if (needsReset) {
+            if (messageDigest != null) {
+                messageDigest.reset();
+            }
+            needsReset = false;
+        }
+    }
+
+    /**
+     * Returns the message digest value.
+     */
+    protected byte[] getDigestValue() throws SignatureException {
+        needsReset = false;
+        return messageDigest.digest();
+    }
+
+    // update the signature with the plaintext data. See JCA doc
+    @Override
+    protected void engineUpdate(byte b) throws SignatureException {
+        messageDigest.update(b);
+        needsReset = true;
+    }
+
+    // update the signature with the plaintext data. See JCA doc
+    @Override
+    protected void engineUpdate(byte[] b, int off, int len)
+            throws SignatureException {
+        messageDigest.update(b, off, len);
+        needsReset = true;
+    }
+
+    // update the signature with the plaintext data. See JCA doc
+    @Override
+    protected void engineUpdate(ByteBuffer byteBuffer) {
+        int len = byteBuffer.remaining();
+        if (len <= 0) {
+            return;
+        }
+
+        messageDigest.update(byteBuffer);
+        needsReset = true;
+    }
+
+    // sign the data and return the signature. See JCA doc
+    @Override
+    protected byte[] engineSign() throws SignatureException {
+        byte[] s = privateKey.getS().toByteArray();
+        ECParameterSpec params = privateKey.getParams();
+        byte[] encodedParams = ECParameters.encodeParameters(params); // DER OID
+        int keySize = params.getCurve().getField().getFieldSize();
+
+        // seed is twice the key size (in bytes)
+        byte[] seed = new byte[((keySize + 7) >> 3) * 2];
+        if (random == null) {
+            random = JCAUtil.getSecureRandom();
+        }
+        random.nextBytes(seed);
+
+        try {
+
+            return encodeSignature(
+                signDigest(getDigestValue(), s, encodedParams, seed));
+
+        } catch (GeneralSecurityException e) {
+            throw new SignatureException("Could not sign data", e);
+        }
+    }
+
+    // verify the data and return the result. See JCA doc
+    @Override
+    protected boolean engineVerify(byte[] signature) throws SignatureException {
+
+        byte[] w;
+        ECParameterSpec params = publicKey.getParams();
+        byte[] encodedParams = ECParameters.encodeParameters(params); // DER OID
+
+        if (publicKey instanceof ECPublicKeyImpl) {
+            w = ((ECPublicKeyImpl)publicKey).getEncodedPublicValue();
+        } else { // instanceof ECPublicKey
+            w = ECParameters.encodePoint(publicKey.getW(), params.getCurve());
+        }
+
+        try {
+
+            return verifySignedDigest(
+                decodeSignature(signature), getDigestValue(), w, encodedParams);
+
+        } catch (GeneralSecurityException e) {
+            throw new SignatureException("Could not verify signature", e);
+        }
+    }
+
+    // set parameter, not supported. See JCA doc
+    @Override
+    protected void engineSetParameter(String param, Object value)
+            throws InvalidParameterException {
+        throw new UnsupportedOperationException("setParameter() not supported");
+    }
+
+    // get parameter, not supported. See JCA doc
+    @Override
+    protected Object engineGetParameter(String param)
+            throws InvalidParameterException {
+        throw new UnsupportedOperationException("getParameter() not supported");
+    }
+
+    // Convert the concatenation of R and S into their DER encoding
+    private byte[] encodeSignature(byte[] signature) throws SignatureException {
+        try {
+
+            int n = signature.length >> 1;
+            byte[] bytes = new byte[n];
+            System.arraycopy(signature, 0, bytes, 0, n);
+            BigInteger r = new BigInteger(1, bytes);
+            System.arraycopy(signature, n, bytes, 0, n);
+            BigInteger s = new BigInteger(1, bytes);
+
+            DerOutputStream out = new DerOutputStream(signature.length + 10);
+            out.putInteger(r);
+            out.putInteger(s);
+            DerValue result =
+                new DerValue(DerValue.tag_Sequence, out.toByteArray());
+
+            return result.toByteArray();
+
+        } catch (Exception e) {
+            throw new SignatureException("Could not encode signature", e);
+        }
+    }
+
+    // Convert the DER encoding of R and S into a concatenation of R and S
+    private byte[] decodeSignature(byte[] signature) throws SignatureException {
+
+        try {
+            DerInputStream in = new DerInputStream(signature);
+            DerValue[] values = in.getSequence(2);
+            BigInteger r = values[0].getPositiveBigInteger();
+            BigInteger s = values[1].getPositiveBigInteger();
+            // trim leading zeroes
+            byte[] rBytes = trimZeroes(r.toByteArray());
+            byte[] sBytes = trimZeroes(s.toByteArray());
+            int k = Math.max(rBytes.length, sBytes.length);
+            // r and s each occupy half the array
+            byte[] result = new byte[k << 1];
+            System.arraycopy(rBytes, 0, result, k - rBytes.length,
+                rBytes.length);
+            System.arraycopy(sBytes, 0, result, result.length - sBytes.length,
+                sBytes.length);
+            return result;
+
+        } catch (Exception e) {
+            throw new SignatureException("Could not decode signature", e);
+        }
+    }
+
+    // trim leading (most significant) zeroes from the result
+    private static byte[] trimZeroes(byte[] b) {
+        int i = 0;
+        while ((i < b.length - 1) && (b[i] == 0)) {
+            i++;
+        }
+        if (i == 0) {
+            return b;
+        }
+        byte[] t = new byte[b.length - i];
+        System.arraycopy(b, i, t, 0, t.length);
+        return t;
+    }
+
+    /**
+     * Signs the digest using the private key.
+     *
+     * @param digest the digest to be signed.
+     * @param s the private key's S value.
+     * @param encodedParams the curve's DER encoded object identifier.
+     * @param seed the random seed.
+     *
+     * @return byte[] the signature.
+     */
+    private static native byte[] signDigest(byte[] digest, byte[] s,
+        byte[] encodedParams, byte[] seed) throws GeneralSecurityException;
+
+    /**
+     * Verifies the signed digest using the public key.
+     *
+     * @param signedDigest the signature to be verified. It is encoded
+     *        as a concatenation of the key's R and S values.
+     * @param digest the digest to be used.
+     * @param w the public key's W point (in uncompressed form).
+     * @param encodedParams the curve's DER encoded object identifier.
+     *
+     * @return boolean true if the signature is successfully verified.
+     */
+    private static native boolean verifySignedDigest(byte[] signature,
+        byte[] digest, byte[] w, byte[] encodedParams)
+            throws GeneralSecurityException;
+}
diff --git a/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java b/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
new file mode 100644
index 00000000000..af98de60b8b
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.security.ec;
+
+import java.math.BigInteger;
+import java.security.*;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.ECGenParameterSpec;
+import java.security.spec.ECParameterSpec;
+import java.security.spec.ECPoint;
+
+import sun.security.ec.NamedCurve;
+import sun.security.ec.ECParameters;
+import sun.security.ec.ECPrivateKeyImpl;
+import sun.security.ec.ECPublicKeyImpl;
+import sun.security.jca.JCAUtil;
+
+/**
+ * EC keypair generator.
+ * Standard algorithm, minimum key length is 112 bits, maximum is 571 bits.
+ *
+ * @since 1.7
+ */
+public final class ECKeyPairGenerator extends KeyPairGeneratorSpi {
+
+    // flag indicating whether the native ECC implementation is present
+    private static boolean implementationPresent = true;
+    static {
+        try {
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("sunecc");
+                    return null;
+                }
+            });
+        } catch (UnsatisfiedLinkError e) {
+            implementationPresent = false;
+        }
+    }
+    private static final int KEY_SIZE_MIN = 112; // min bits (see ecc_impl.h)
+    private static final int KEY_SIZE_MAX = 571; // max bits (see ecc_impl.h)
+    private static final int KEY_SIZE_DEFAULT = 256;
+
+    // used to seed the keypair generator
+    private SecureRandom random;
+
+    // size of the key to generate, KEY_SIZE_MIN <= keySize <= KEY_SIZE_MAX
+    private int keySize;
+
+    // parameters specified via init, if any
+    private AlgorithmParameterSpec params = null;
+
+    /**
+     * Constructs a new ECKeyPairGenerator.
+     *
+     * @exception ProviderException if the native ECC library is unavailable.
+     */
+    public ECKeyPairGenerator() {
+        if (!implementationPresent) {
+            throw new ProviderException("EC implementation is not available");
+        }
+        // initialize to default in case the app does not call initialize()
+        initialize(KEY_SIZE_DEFAULT, null);
+    }
+
+    // initialize the generator. See JCA doc
+    @Override
+    public void initialize(int keySize, SecureRandom random) {
+
+        checkKeySize(keySize);
+        this.params = NamedCurve.getECParameterSpec(keySize);
+        if (params == null) {
+            throw new InvalidParameterException(
+                "No EC parameters available for key size " + keySize + " bits");
+        }
+        this.random = random;
+    }
+
+    // second initialize method. See JCA doc
+    @Override
+    public void initialize(AlgorithmParameterSpec params, SecureRandom random)
+            throws InvalidAlgorithmParameterException {
+
+        if (params instanceof ECParameterSpec) {
+            this.params = ECParameters.getNamedCurve((ECParameterSpec)params);
+            if (this.params == null) {
+                throw new InvalidAlgorithmParameterException(
+                    "Unsupported curve: " + params);
+            }
+        } else if (params instanceof ECGenParameterSpec) {
+            String name = ((ECGenParameterSpec)params).getName();
+            this.params = NamedCurve.getECParameterSpec(name);
+            if (this.params == null) {
+                throw new InvalidAlgorithmParameterException(
+                    "Unknown curve name: " + name);
+            }
+        } else {
+            throw new InvalidAlgorithmParameterException(
+                "ECParameterSpec or ECGenParameterSpec required for EC");
+        }
+        this.keySize =
+            ((ECParameterSpec)this.params).getCurve().getField().getFieldSize();
+        this.random = random;
+    }
+
+    // generate the keypair. See JCA doc
+    @Override
+    public KeyPair generateKeyPair() {
+
+        byte[] encodedParams =
+            ECParameters.encodeParameters((ECParameterSpec)params);
+
+        // seed is twice the key size (in bytes)
+        byte[] seed = new byte[2 * ((keySize + 7) >> 3)];
+        if (random == null) {
+            random = JCAUtil.getSecureRandom();
+        }
+        random.nextBytes(seed);
+
+        long[] handles = generateECKeyPair(keySize, encodedParams, seed);
+
+        // The 'params' object supplied above is equivalent to the native one
+        // so there is no need to fetch it.
+
+        // handles[0] points to the native private key
+        BigInteger s = new BigInteger(1, getEncodedBytes(handles[0]));
+
+        try {
+            PrivateKey privateKey =
+                new ECPrivateKeyImpl(s, (ECParameterSpec)params);
+
+            // handles[1] points to the native public key
+            ECPoint w = ECParameters.decodePoint(getEncodedBytes(handles[1]),
+                ((ECParameterSpec)params).getCurve());
+            PublicKey publicKey =
+                new ECPublicKeyImpl(w, (ECParameterSpec)params);
+
+            return new KeyPair(publicKey, privateKey);
+
+        } catch (Exception e) {
+            throw new ProviderException(e);
+        }
+    }
+
+    private void checkKeySize(int keySize) throws InvalidParameterException {
+        if (keySize < KEY_SIZE_MIN) {
+            throw new InvalidParameterException
+                ("Key size must be at least " + KEY_SIZE_MIN + " bits");
+        }
+        if (keySize > KEY_SIZE_MAX) {
+            throw new InvalidParameterException
+                ("Key size must be at most " + KEY_SIZE_MAX + " bits");
+        }
+        this.keySize = keySize;
+    }
+
+    /*
+     * Generates the keypair and returns a 2-element array of handles.
+     * The first handle points to the private key, the second to the public key.
+     */
+    private static native long[] generateECKeyPair(int keySize,
+        byte[] encodedParams, byte[] seed);
+
+    /*
+     * Extracts the encoded key data using the supplied handle.
+     */
+    private static native byte[] getEncodedBytes(long handle);
+}
diff --git a/jdk/src/share/classes/sun/security/ec/SunEC.java b/jdk/src/share/classes/sun/security/ec/SunEC.java
new file mode 100644
index 00000000000..49223ca37b2
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/ec/SunEC.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.security.ec;
+
+import java.util.*;
+import java.security.*;
+import sun.security.action.PutAllAction;
+
+/**
+ * Provider class for the Elliptic Curve provider.
+ * Supports EC keypair and parameter generation, ECDSA signing and
+ * ECDH key agreement.
+ *
+ * IMPLEMENTATION NOTE:
+ * The Java classes in this provider access a native ECC implementation
+ * via JNI to a C++ wrapper class which in turn calls C functions.
+ * The Java classes are packaged into the signed sunec.jar in the JRE
+ * extensions directory and the C++ and C functions are packaged into
+ * libsunecc.so or sunecc.dll in the JRE native libraries directory.
+ *
+ * @since   1.7
+ */
+public final class SunEC extends Provider {
+
+    private static final long serialVersionUID = -2279741672933606418L;
+
+    public SunEC() {
+        super("SunEC", 1.7d, "Sun Elliptic Curve provider (EC, ECDSA, ECDH)");
+
+        // if there is no security manager installed, put directly into
+        // the provider. Otherwise, create a temporary map and use a
+        // doPrivileged() call at the end to transfer the contents
+        if (System.getSecurityManager() == null) {
+            SunECEntries.putEntries(this);
+        } else {
+            Map<Object, Object> map = new HashMap<Object, Object>();
+            SunECEntries.putEntries(map);
+            AccessController.doPrivileged(new PutAllAction(this, map));
+        }
+    }
+
+}
diff --git a/jdk/src/share/classes/sun/security/ec/SunECEntries.java b/jdk/src/share/classes/sun/security/ec/SunECEntries.java
new file mode 100644
index 00000000000..759d3007e85
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/ec/SunECEntries.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.security.ec;
+
+import java.util.Map;
+
+/**
+ * Defines the entries of the SunEC provider.
+ *
+ * @since 1.7
+ */
+final class SunECEntries {
+
+    private SunECEntries() {
+        // empty
+    }
+
+    static void putEntries(Map<Object, Object> map) {
+
+        /*
+         * Signature engines
+         */
+        map.put("Signature.NONEwithECDSA",
+            "sun.security.ec.ECDSASignature$Raw");
+        map.put("Signature.SHA1withECDSA",
+            "sun.security.ec.ECDSASignature$SHA1");
+        map.put("Signature.SHA256withECDSA",
+            "sun.security.ec.ECDSASignature$SHA256");
+        map.put("Signature.SHA384withECDSA",
+            "sun.security.ec.ECDSASignature$SHA384");
+        map.put("Signature.SHA512withECDSA",
+            "sun.security.ec.ECDSASignature$SHA512");
+
+        String ecKeyClasses = "java.security.interfaces.ECPublicKey" +
+                "|java.security.interfaces.ECPrivateKey";
+        map.put("Signature.NONEwithECDSA SupportedKeyClasses", ecKeyClasses);
+        map.put("Signature.SHA1withECDSA SupportedKeyClasses", ecKeyClasses);
+        map.put("Signature.SHA256withECDSA SupportedKeyClasses", ecKeyClasses);
+        map.put("Signature.SHA384withECDSA SupportedKeyClasses", ecKeyClasses);
+        map.put("Signature.SHA512withECDSA SupportedKeyClasses", ecKeyClasses);
+
+        /*
+         *  Key Pair Generator engine
+         */
+        map.put("KeyPairGenerator.EC", "sun.security.ec.ECKeyPairGenerator");
+        map.put("Alg.Alias.KeyPairGenerator.EllipticCurve", "EC");
+
+        /*
+         *  Key Factory engine
+         */
+        map.put("KeyFactory.EC", "sun.security.ec.ECKeyFactory");
+        map.put("Alg.Alias.KeyFactory.EllipticCurve", "EC");
+
+        /*
+         * Algorithm Parameter engine
+         */
+        map.put("AlgorithmParameters.EC", "sun.security.ec.ECParameters");
+        map.put("Alg.Alias.AlgorithmParameters.EllipticCurve", "EC");
+
+        /*
+         * Key Agreement engine
+         */
+        map.put("KeyAgreement.ECDH", "sun.security.ec.ECDHKeyAgreement");
+        map.put("KeyAgreement.ECDH SupportedKeyClasses", ecKeyClasses);
+
+        /*
+         * Key sizes
+         */
+        map.put("Signature.SHA1withECDSA KeySize", "256");
+        map.put("KeyPairGenerator.EC KeySize", "256");
+        map.put("AlgorithmParameterGenerator.ECDSA KeySize", "256");
+
+        /*
+         * Implementation type: software or hardware
+         */
+        map.put("Signature.NONEwithECDSA ImplementedIn", "Software");
+        map.put("Signature.SHA1withECDSA ImplementedIn", "Software");
+        map.put("Signature.SHA256withECDSA ImplementedIn", "Software");
+        map.put("Signature.SHA384withECDSA ImplementedIn", "Software");
+        map.put("Signature.SHA512withECDSA ImplementedIn", "Software");
+        map.put("KeyPairGenerator.EC ImplementedIn", "Software");
+        map.put("KeyFactory.EC ImplementedIn", "Software");
+        map.put("KeyAgreement.ECDH ImplementedIn", "Software");
+        map.put("AlgorithmParameters.EC ImplementedIn", "Software");
+    }
+}
diff --git a/jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java b/jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java
index 046f6478277..de703ef4ded 100644
--- a/jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java
+++ b/jdk/src/share/classes/sun/security/jgss/GSSContextImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -27,14 +27,13 @@ package sun.security.jgss;
 
 import org.ietf.jgss.*;
 import sun.security.jgss.spi.*;
-import sun.security.jgss.*;
 import sun.security.util.ObjectIdentifier;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-
+import com.sun.security.jgss.*;
 
 /**
  * This class represents the JGSS security context and its associated
@@ -88,7 +87,7 @@ import java.io.IOException;
  * per-message operations are returned in an instance of the MessageProp
  * class, which is used as an argument in these calls.</dl>
  */
-class GSSContextImpl implements GSSContext {
+class GSSContextImpl implements ExtendedGSSContext {
 
     private GSSManagerImpl gssManager = null;
 
@@ -630,4 +629,16 @@ class GSSContextImpl implements GSSContext {
         srcName = null;
         targName = null;
     }
+
+    @Override
+    public Object inquireSecContext(InquireType type) throws GSSException {
+        SecurityManager security = System.getSecurityManager();
+        if (security != null) {
+            security.checkPermission(new InquireSecContextPermission(type.toString()));
+        }
+        if (mechCtxt == null) {
+            throw new GSSException(GSSException.NO_CONTEXT);
+        }
+        return mechCtxt.inquireSecContext(type);
+    }
 }
diff --git a/jdk/src/share/classes/sun/security/jgss/SunProvider.java b/jdk/src/share/classes/sun/security/jgss/SunProvider.java
index 362bec5936d..26039b9db1d 100644
--- a/jdk/src/share/classes/sun/security/jgss/SunProvider.java
+++ b/jdk/src/share/classes/sun/security/jgss/SunProvider.java
@@ -62,7 +62,7 @@ public final class SunProvider extends Provider {
 
     public SunProvider() {
         /* We are the Sun JGSS provider */
-        super("SunJGSS", 1.0, INFO);
+        super("SunJGSS", 1.7d, INFO);
 
         AccessController.doPrivileged(
                         new java.security.PrivilegedAction<Void>() {
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java b/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
index 6706e8e4a4c..5f88068ccec 100644
--- a/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -25,12 +25,14 @@
 
 package sun.security.jgss.krb5;
 
+import com.sun.security.jgss.AuthorizationDataEntry;
 import org.ietf.jgss.*;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.IOException;
 import sun.security.krb5.*;
 import java.net.InetAddress;
+import sun.security.krb5.internal.AuthorizationData;
+import sun.security.krb5.internal.KerberosTime;
 
 class InitSecContextToken extends InitialToken {
 
@@ -59,6 +61,9 @@ class InitSecContextToken extends InitialToken {
 
         Checksum checksum = gssChecksum.getChecksum();
 
+        context.setTktFlags(serviceTicket.getFlags());
+        context.setAuthTime(
+                new KerberosTime(serviceTicket.getAuthTime()).toString());
         apReq = new KrbApReq(serviceTicket,
                              mutualRequired,
                              useSubkey,
@@ -143,6 +148,21 @@ class InitSecContextToken extends InitialToken {
             // Use the same sequence number as the peer
             // (Behaviour exhibited by the Windows SSPI server)
             context.resetMySequenceNumber(peerSeqNumber);
+        context.setAuthTime(
+                new KerberosTime(apReq.getCreds().getAuthTime()).toString());
+        context.setTktFlags(apReq.getCreds().getFlags());
+        AuthorizationData ad = apReq.getCreds().getAuthzData();
+        if (ad == null) {
+            context.setAuthzData(null);
+        } else {
+            AuthorizationDataEntry[] authzData =
+                    new AuthorizationDataEntry[ad.count()];
+            for (int i=0; i<ad.count(); i++) {
+                authzData[i] = new AuthorizationDataEntry(
+                        ad.item(i).adType, ad.item(i).adData);
+            }
+            context.setAuthzData(authzData);
+        }
     }
 
     public final KrbApReq getKrbApReq() {
diff --git a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
index f2ef7d59875..4fe1e80f5f9 100644
--- a/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
@@ -25,6 +25,7 @@
 
 package sun.security.jgss.krb5;
 
+import com.sun.security.jgss.InquireType;
 import org.ietf.jgss.*;
 import sun.misc.HexDumpEncoder;
 import sun.security.jgss.GSSUtil;
@@ -38,6 +39,7 @@ import java.io.IOException;
 import java.security.Provider;
 import java.security.AccessController;
 import java.security.AccessControlContext;
+import java.security.Key;
 import java.security.PrivilegedExceptionAction;
 import java.security.PrivilegedActionException;
 import javax.crypto.Cipher;
@@ -1283,4 +1285,81 @@ class Krb5Context implements GSSContextSpi {
         // Currently used by InitialToken only
         return caller;
     }
+
+    /**
+     * The session key returned by inquireSecContext(KRB5_INQ_SSPI_SESSION_KEY)
+     */
+    static class KerberosSessionKey implements Key {
+        private final EncryptionKey key;
+
+        KerberosSessionKey(EncryptionKey key) {
+            this.key = key;
+        }
+
+        @Override
+        public String getAlgorithm() {
+            return Integer.toString(key.getEType());
+        }
+
+        @Override
+        public String getFormat() {
+            return "RAW";
+        }
+
+        @Override
+        public byte[] getEncoded() {
+            return key.getBytes().clone();
+        }
+
+        @Override
+        public String toString() {
+            return "Kerberos session key: etype: " + key.getEType() + "\n" +
+                    new sun.misc.HexDumpEncoder().encodeBuffer(key.getBytes());
+        }
+    }
+
+    /**
+     * Return the mechanism-specific attribute associated with {@code type}.
+     */
+    public Object inquireSecContext(InquireType type)
+            throws GSSException {
+        if (!isEstablished()) {
+             throw new GSSException(GSSException.NO_CONTEXT, -1,
+                     "Security context not established.");
+        }
+        switch (type) {
+            case KRB5_GET_SESSION_KEY:
+                return new KerberosSessionKey(key);
+            case KRB5_GET_TKT_FLAGS:
+                return tktFlags.clone();
+            case KRB5_GET_AUTHZ_DATA:
+                if (isInitiator()) {
+                    throw new GSSException(GSSException.UNAVAILABLE, -1,
+                            "AuthzData not available on initiator side.");
+                } else {
+                    return (authzData==null)?null:authzData.clone();
+                }
+            case KRB5_GET_AUTHTIME:
+                return authTime;
+        }
+        throw new GSSException(GSSException.UNAVAILABLE, -1,
+                "Inquire type not supported.");
+    }
+
+    // Helpers for inquireSecContext
+    private boolean[] tktFlags;
+    private String authTime;
+    private com.sun.security.jgss.AuthorizationDataEntry[] authzData;
+
+    public void setTktFlags(boolean[] tktFlags) {
+        this.tktFlags = tktFlags;
+    }
+
+    public void setAuthTime(String authTime) {
+        this.authTime = authTime;
+    }
+
+    public void setAuthzData(com.sun.security.jgss.AuthorizationDataEntry[] authzData) {
+        this.authzData = authzData;
+    }
 }
diff --git a/jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java b/jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java
index b4ce37a4c0e..5bf359a1f8c 100644
--- a/jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java
+++ b/jdk/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Portions Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -46,6 +46,7 @@ import org.ietf.jgss.*;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.Provider;
+import com.sun.security.jgss.*;
 
 /**
  * This interface is implemented by a mechanism specific instance of a GSS
@@ -265,7 +266,6 @@ public interface GSSContextSpi {
      * @param msgPro on input it contains the requested qop and
      *    confidentiality state, on output, the applied values
      * @exception GSSException may be thrown
-     * @see MessageInfo
      * @see unwrap
      */
     public void wrap(InputStream is, OutputStream os, MessageProp msgProp)
@@ -315,7 +315,6 @@ public interface GSSContextSpi {
      * @param msgProp will contain the applied qop and confidentiality
      *    of the input token and any informatory status values
      * @exception GSSException may be thrown
-     * @see MessageInfo
      * @see wrap
      */
     public void unwrap(InputStream is, OutputStream os,
@@ -403,4 +402,15 @@ public interface GSSContextSpi {
      * @exception GSSException may be thrown
      */
     public void dispose() throws GSSException;
+
+    /**
+     * Return the mechanism-specific attribute associated with (@code type}.
+     *
+     * @param type the type of the attribute requested
+     * @return the attribute
+     * @throws GSSException see {@link ExtendedGSSContext#inquireSecContext}
+     * for details
+     */
+    public Object inquireSecContext(InquireType type)
+            throws GSSException;
 }
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
index a84e8a26001..a436092f1bb 100644
--- a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
+++ b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java
@@ -25,10 +25,10 @@
 
 package sun.security.jgss.spnego;
 
+import com.sun.security.jgss.ExtendedGSSContext;
+import com.sun.security.jgss.InquireType;
 import java.io.*;
 import java.security.Provider;
-import java.util.List;
-import java.util.ArrayList;
 import org.ietf.jgss.*;
 import sun.security.jgss.*;
 import sun.security.jgss.spi.*;
@@ -1185,4 +1185,22 @@ public class SpNegoContext implements GSSContextSpi {
                 return ("Unknown state " + state);
         }
     }
+
+    /**
+     * Retrieve attribute of the context for {@code type}.
+     */
+    public Object inquireSecContext(InquireType type)
+            throws GSSException {
+        if (mechContext == null) {
+            throw new GSSException(GSSException.NO_CONTEXT, -1,
+                    "Underlying mech not established.");
+        }
+        if (mechContext instanceof ExtendedGSSContext) {
+            return ((ExtendedGSSContext)mechContext).inquireSecContext(type);
+        } else {
+            throw new GSSException(GSSException.BAD_MECH, -1,
+                    "inquireSecContext not supported by underlying mech.");
+        }
+    }
+
 }
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java b/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java
index 63f37e47614..5b2a670b054 100644
--- a/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java
+++ b/jdk/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -36,6 +36,7 @@ import sun.security.util.ObjectIdentifier;
 import sun.security.jgss.spnego.NegTokenInit;
 import sun.security.jgss.spnego.NegTokenTarg;
 import javax.security.auth.kerberos.DelegationPermission;
+import com.sun.security.jgss.InquireType;
 import java.io.*;
 
 
@@ -615,4 +616,10 @@ class NativeGSSContext implements GSSContextSpi {
     protected void finalize() throws Throwable {
         dispose();
     }
+
+    public Object inquireSecContext(InquireType type)
+            throws GSSException {
+        throw new GSSException(GSSException.UNAVAILABLE, -1,
+                "Inquire type not supported.");
+    }
 }
diff --git a/jdk/src/share/classes/sun/security/krb5/Config.java b/jdk/src/share/classes/sun/security/krb5/Config.java
index 8adcba81f53..283e0d28cbf 100644
--- a/jdk/src/share/classes/sun/security/krb5/Config.java
+++ b/jdk/src/share/classes/sun/security/krb5/Config.java
@@ -70,7 +70,12 @@ public class Config {
     private static final int BASE16_1 = 16;
     private static final int BASE16_2 = 16 * 16;
     private static final int BASE16_3 = 16 * 16 * 16;
-    private String defaultRealm;   // default kdc realm.
+
+    /**
+     * Specified by system properties. Must be both null or non-null.
+     */
+    private final String defaultRealm;
+    private final String defaultKDC;
 
     // used for native interface
     private static native String getWindowsDirectory(boolean isSystem);
@@ -81,9 +86,8 @@ public class Config {
      * singleton) is returned.
      *
      * @exception KrbException if error occurs when constructing a Config
-     * instance. Possible causes would be configuration file not
-     * found, either of java.security.krb5.realm or java.security.krb5.kdc
-     * not specified, error reading configuration file.
+     * instance. Possible causes would be either of java.security.krb5.realm or
+     * java.security.krb5.kdc not specified, error reading configuration file.
      */
     public static synchronized Config getInstance() throws KrbException {
         if (singleton == null) {
@@ -98,9 +102,8 @@ public class Config {
      * the java.security.krb5.* system properties again.
      *
      * @exception KrbException if error occurs when constructing a Config
-     * instance. Possible causes would be configuration file not
-     * found, either of java.security.krb5.realm or java.security.krb5.kdc
-     * not specified, error reading configuration file.
+     * instance. Possible causes would be either of java.security.krb5.realm or
+     * java.security.krb5.kdc not specified, error reading configuration file.
      */
 
     public static synchronized void refresh() throws KrbException {
@@ -114,56 +117,37 @@ public class Config {
      */
     private Config() throws KrbException {
         /*
-         * If these two system properties are being specified by the user,
-         * we ignore configuration file. If either one system property is
-         * specified, we throw exception. If neither of them are specified,
-         * we load the information from configuration file.
+         * If either one system property is specified, we throw exception.
          */
-        String kdchost =
+        String tmp =
             java.security.AccessController.doPrivileged(
                 new sun.security.action.GetPropertyAction
                     ("java.security.krb5.kdc"));
+        if (tmp != null) {
+            // The user can specify a list of kdc hosts separated by ":"
+            defaultKDC = tmp.replace(':', ' ');
+        } else {
+            defaultKDC = null;
+        }
         defaultRealm =
             java.security.AccessController.doPrivileged(
                 new sun.security.action.GetPropertyAction
                     ("java.security.krb5.realm"));
-        if ((kdchost == null && defaultRealm != null) ||
-            (defaultRealm == null && kdchost != null)) {
+        if ((defaultKDC == null && defaultRealm != null) ||
+            (defaultRealm == null && defaultKDC != null)) {
             throw new KrbException
                 ("System property java.security.krb5.kdc and " +
                  "java.security.krb5.realm both must be set or " +
                  "neither must be set.");
         }
 
-        // Read the Kerberos configuration file
+        // Always read the Kerberos configuration file
         try {
             Vector<String> configFile;
             configFile = loadConfigFile();
             stanzaTable = parseStanzaTable(configFile);
         } catch (IOException ioe) {
-            // No krb5.conf, no problem. We'll use DNS etc.
-        }
-
-        if (kdchost != null) {
-            /*
-             * If configuration information is only specified by
-             * properties java.security.krb5.kdc and
-             * java.security.krb5.realm, we put both in the hashtable
-             * under [libdefaults].
-             */
-            if (stanzaTable == null) {
-                stanzaTable = new Hashtable<String,Object> ();
-            }
-            Hashtable<String,String> kdcs =
-                    (Hashtable<String,String>)stanzaTable.get("libdefaults");
-            if (kdcs == null) {
-                kdcs = new Hashtable<String,String> ();
-                stanzaTable.put("libdefaults", kdcs);
-            }
-            kdcs.put("default_realm", defaultRealm);
-            // The user can specify a list of kdc hosts separated by ":"
-            kdchost = kdchost.replace(':', ' ');
-            kdcs.put("kdc", kdchost);
+            // No krb5.conf, no problem. We'll use DNS or system property etc.
         }
     }
 
@@ -295,19 +279,6 @@ public class Config {
         String result = null;
         Hashtable subTable;
 
-        /*
-         * In the situation when kdc is specified by
-         * java.security.krb5.kdc, we get the kdc from [libdefaults] in
-         * hashtable.
-         */
-        if (name.equalsIgnoreCase("kdc") &&
-            (section.equalsIgnoreCase(getDefault("default_realm", "libdefaults"))) &&
-            (java.security.AccessController.doPrivileged(
-                new sun.security.action.
-                GetPropertyAction("java.security.krb5.kdc")) != null)) {
-            result = getDefault("kdc", "libdefaults");
-            return result;
-        }
         if (stanzaTable != null) {
             for (Enumeration e = stanzaTable.keys(); e.hasMoreElements(); ) {
                 stanzaName = (String)e.nextElement();
@@ -1035,13 +1006,13 @@ public class Config {
     /**
      * Resets the default kdc realm.
      * We do not need to synchronize these methods since assignments are atomic
+     *
+     * This method was useless. Kept here in case some class still calls it.
      */
     public void resetDefaultRealm(String realm) {
-        defaultRealm = realm;
         if (DEBUG) {
-            System.out.println(">>> Config reset default kdc " + defaultRealm);
+            System.out.println(">>> Config try resetting default kdc " + realm);
         }
-
     }
 
     /**
@@ -1098,6 +1069,9 @@ public class Config {
      * @return the default realm, always non null
      */
     public String getDefaultRealm() throws KrbException {
+        if (defaultRealm != null) {
+            return defaultRealm;
+        }
         Exception cause = null;
         String realm = getDefault("default_realm", "libdefaults");
         if ((realm == null) && useDNS_Realm()) {
@@ -1142,6 +1116,9 @@ public class Config {
         if (realm == null) {
             realm = getDefaultRealm();
         }
+        if (realm.equalsIgnoreCase(defaultRealm)) {
+            return defaultKDC;
+        }
         Exception cause = null;
         String kdcs = getDefault("kdc", realm);
         if ((kdcs == null) && useDNS_KDC()) {
@@ -1171,6 +1148,9 @@ public class Config {
             });
         }
         if (kdcs == null) {
+            if (defaultKDC != null) {
+                return defaultKDC;
+            }
             KrbException ke = new KrbException("Cannot locate KDC");
             if (cause != null) {
                 ke.initCause(cause);
diff --git a/jdk/src/share/classes/sun/security/krb5/Credentials.java b/jdk/src/share/classes/sun/security/krb5/Credentials.java
index 48293772b9d..3fde713fd3c 100644
--- a/jdk/src/share/classes/sun/security/krb5/Credentials.java
+++ b/jdk/src/share/classes/sun/security/krb5/Credentials.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Portions Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -63,12 +63,29 @@ public class Credentials {
     KerberosTime renewTill;
     HostAddresses cAddr;
     EncryptionKey serviceKey;
+    AuthorizationData authzData;
     private static boolean DEBUG = Krb5.DEBUG;
     private static CredentialsCache cache;
     static boolean alreadyLoaded = false;
     private static boolean alreadyTried = false;
     private static native Credentials acquireDefaultNativeCreds();
 
+    public Credentials(Ticket new_ticket,
+                       PrincipalName new_client,
+                       PrincipalName new_server,
+                       EncryptionKey new_key,
+                       TicketFlags new_flags,
+                       KerberosTime authTime,
+                       KerberosTime new_startTime,
+                       KerberosTime new_endTime,
+                       KerberosTime renewTill,
+                       HostAddresses cAddr,
+                       AuthorizationData authzData) {
+        this(new_ticket, new_client, new_server, new_key, new_flags,
+                authTime, new_startTime, new_endTime, renewTill, cAddr);
+        this.authzData = authzData;
+    }
+
     public Credentials(Ticket new_ticket,
                        PrincipalName new_client,
                        PrincipalName new_server,
@@ -213,6 +230,9 @@ public class Credentials {
         return flags;
     }
 
+    public AuthorizationData getAuthzData() {
+        return authzData;
+    }
     /**
      * Checks if the service ticket returned by the KDC has the OK-AS-DELEGATE
      * flag set
diff --git a/jdk/src/share/classes/sun/security/krb5/KrbApReq.java b/jdk/src/share/classes/sun/security/krb5/KrbApReq.java
index d274b1efbb0..696762b6cd0 100644
--- a/jdk/src/share/classes/sun/security/krb5/KrbApReq.java
+++ b/jdk/src/share/classes/sun/security/krb5/KrbApReq.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Portions Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -294,8 +294,6 @@ public class KrbApReq {
         apReqMessg.ticket.sname.setRealm(apReqMessg.ticket.realm);
         enc_ticketPart.cname.setRealm(enc_ticketPart.crealm);
 
-        Config.getInstance().resetDefaultRealm(apReqMessg.ticket.realm.toString());
-
         if (!authenticator.cname.equals(enc_ticketPart.cname))
             throw new KrbApErrException(Krb5.KRB_AP_ERR_BADMATCH);
 
@@ -358,12 +356,13 @@ public class KrbApReq {
                                 authenticator.cname,
                                 apReqMessg.ticket.sname,
                                 enc_ticketPart.key,
-                                null,
+                                enc_ticketPart.flags,
                                 enc_ticketPart.authtime,
                                 enc_ticketPart.starttime,
                                 enc_ticketPart.endtime,
                                 enc_ticketPart.renewTill,
-                                enc_ticketPart.caddr);
+                                enc_ticketPart.caddr,
+                                enc_ticketPart.authorizationData);
         if (DEBUG) {
             System.out.println(">>> KrbApReq: authenticate succeed.");
         }
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java b/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java
index 269edec71a1..13c89dec7d8 100644
--- a/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java
+++ b/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java
@@ -174,4 +174,12 @@ public class AuthorizationData implements Cloneable {
         }
         return retVal;
     }
+
+    public int count() {
+        return entry.length;
+    }
+
+    public AuthorizationDataEntry item(int i) {
+        return (AuthorizationDataEntry)entry[i].clone();
+    }
 }
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java b/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
index 4fd7b3bf4e6..388548b2eeb 100644
--- a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
+++ b/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Portions Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -41,6 +41,7 @@ import java.io.IOException;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.File;
+import java.util.Comparator;
 import java.util.StringTokenizer;
 
 /**
@@ -229,10 +230,11 @@ public class KeyTab implements KeyTabConstants {
     /**
      * Reads the service key from the keytab file.
      * @param service the PrincipalName of the requested service.
-     * @return the last service key in the keytab
+     * @return the last service key in the keytab with the highest kvno
      */
     public EncryptionKey readServiceKey(PrincipalName service) {
         KeyTabEntry entry = null;
+        EncryptionKey key = null;
         if (entries != null) {
             // Find latest entry for this service that has an etype
             // that has been configured for use
@@ -240,9 +242,12 @@ public class KeyTab implements KeyTabConstants {
                 entry = entries.elementAt(i);
                 if (entry.service.match(service)) {
                     if (EType.isSupported(entry.keyType)) {
-                        return new EncryptionKey(entry.keyblock,
+                        if (key == null ||
+                                entry.keyVersion > key.getKeyVersionNumber()) {
+                            key = new EncryptionKey(entry.keyblock,
                                              entry.keyType,
                                              new Integer(entry.keyVersion));
+                        }
                     } else if (DEBUG) {
                         System.out.println("Found unsupported keytype (" +
                             entry.keyType + ") for " + service);
@@ -250,12 +255,13 @@ public class KeyTab implements KeyTabConstants {
                 }
             }
         }
-        return null;
+        return key;
     }
 
     /**
      * Reads all keys for a service from the keytab file that have
-     * etypes that have been configured for use.
+     * etypes that have been configured for use. If there are multiple
+     * keys with same etype, the one with the highest kvno is returned.
      * @param service the PrincipalName of the requested service
      * @return an array containing all the service keys
      */
@@ -288,49 +294,39 @@ public class KeyTab implements KeyTabConstants {
         size = keys.size();
         if (size == 0)
             return null;
-        EncryptionKey[] retVal = new EncryptionKey[size];
+        EncryptionKey[] retVal = keys.toArray(new EncryptionKey[size]);
 
         // Sort keys according to default_tkt_enctypes
-        int pos = 0;
-        EncryptionKey k;
         if (DEBUG) {
             System.out.println("Ordering keys wrt default_tkt_enctypes list");
         }
-        int[] etypes = EType.getDefaults("default_tkt_enctypes");
-        if (etypes == null || etypes == EType.getBuiltInDefaults()) {
-            // Either no supported types specified in default_tkt_enctypes
-            // or no default_tkt_enctypes entry at all. For both cases,
-            // just return supported keys in the order retrieved
-            for (int i = 0; i < size; i++) {
-                retVal[pos++] = keys.get(i);
-            }
-        } else {
-            for (int j = 0; j < etypes.length && pos < size; j++) {
-                int target = etypes[j];
-                for (int i = 0; i < size && pos < size; i++) {
-                    k = keys.get(i);
-                    if (k != null && k.getEType() == target) {
-                        if (DEBUG) {
-                            System.out.println(pos + ": " + k);
+
+        final int[] etypes = EType.getDefaults("default_tkt_enctypes");
+
+        // Sort the keys, k1 is preferred than k2 if:
+        // 1. k1's etype appears earlier in etypes than k2's
+        // 2. If same, k1's KVNO is higher
+        Arrays.sort(retVal, new Comparator<EncryptionKey>() {
+            @Override
+            public int compare(EncryptionKey o1, EncryptionKey o2) {
+                if (etypes != null && etypes != EType.getBuiltInDefaults()) {
+                    int o1EType = o1.getEType();
+                    int o2EType = o2.getEType();
+                    if (o1EType != o2EType) {
+                        for (int i=0; i<etypes.length; i++) {
+                            if (etypes[i] == o1EType) {
+                                return -1;
+                            } else if (etypes[i] == o2EType) {
+                                return 1;
+                            }
                         }
-                        retVal[pos++] = k;
-                        keys.set(i, null);  // Cleared from consideration
                     }
                 }
+                return o2.getKeyVersionNumber().intValue()
+                        - o1.getKeyVersionNumber().intValue();
             }
-            // copy the rest
-            for (int i = 0; i < size && pos < size; i++) {
-                k = keys.get(i);
-                if (k != null) {
-                    retVal[pos++] = k;
-                }
-            }
-        }
-        if (pos != size) {
-            throw new RuntimeException(
-                "Internal Error: did not copy all keys;expecting " + size +
-                    "; got " + pos);
-        }
+        });
+
         return retVal;
     }
 
@@ -403,11 +399,11 @@ public class KeyTab implements KeyTabConstants {
     /**
      * Retrieves the key table entry with the specified service name.
      * @param service the service which may have an entry in the key table.
+     * @param keyType the etype to match, returns the 1st one if -1 provided
      * @return -1 if the entry is not found, else return the entry index
      * in the list.
      */
     private int retrieveEntry(PrincipalName service, int keyType) {
-        int found = -1;
         KeyTabEntry e;
         if (entries != null) {
             for (int i = 0; i < entries.size(); i++) {
@@ -418,7 +414,7 @@ public class KeyTab implements KeyTabConstants {
                 }
             }
         }
-        return found;
+        return -1;
     }
 
     /**
@@ -476,12 +472,29 @@ public class KeyTab implements KeyTabConstants {
     /**
      * Removes an entry from the key table.
      * @param service the service <code>PrincipalName</code>.
+     * @param etype the etype to match, first one if -1 provided
+     * @return 1 if removed successfully, 0 otherwise
      */
-    public void deleteEntry(PrincipalName service) {
-        int result = retrieveEntry(service, -1);
+    public int deleteEntry(PrincipalName service, int etype) {
+        int result = retrieveEntry(service, etype);
         if (result != -1) {
             entries.removeElementAt(result);
+            return 1;
         }
+        return 0;
+    }
+
+    /**
+     * Removes an entry from the key table.
+     * @param service the service <code>PrincipalName</code>.
+     * @return number of entries removed
+     */
+    public int deleteEntry(PrincipalName service) {
+        int count = 0;
+        while (deleteEntry(service, -1) > 0) {
+            count++;
+        }
+        return count;
     }
 
     /**
diff --git a/jdk/src/share/classes/sun/security/pkcs11/JarVerifier.java b/jdk/src/share/classes/sun/security/pkcs11/JarVerifier.java
deleted file mode 100644
index 092c5725dba..00000000000
--- a/jdk/src/share/classes/sun/security/pkcs11/JarVerifier.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package sun.security.pkcs11;
-
-// NOTE: this class is duplicated amongst SunJCE, SunPKCS11, and SunMSCAPI.
-// All files should be kept in sync.
-
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.net.URL;
-import java.net.JarURLConnection;
-import java.net.MalformedURLException;
-
-import java.security.*;
-import java.security.cert.*;
-import java.security.cert.Certificate;
-
-/**
- * This class verifies JAR files (and any supporting JAR files), and
- * determines whether they may be used in this implementation.
- *
- * The JCE in OpenJDK has an open cryptographic interface, meaning it
- * does not restrict which providers can be used.  Compliance with
- * United States export controls and with local law governing the
- * import/export of products incorporating the JCE in the OpenJDK is
- * the responsibility of the licensee.
- *
- * @since 1.7
- */
-final class JarVerifier {
-
-    private static final boolean debug = false;
-
-    /**
-     * Verify the JAR file is signed by an entity which has a certificate
-     * issued by a trusted CA.
-     *
-     * Note: this is a temporary method and will change soon to use the
-     * exception chaining mechanism, which can provide more details
-     * as to why the verification failed.
-     *
-     * @param c the class to be verified.
-     * @return true if verification is successful.
-     */
-    static boolean verify(final Class c) {
-        return true;
-    }
-}
diff --git a/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java b/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
index 6d0e045f2ee..674092e1617 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -390,24 +390,6 @@ public final class SunPKCS11 extends AuthProvider {
         return sb.toString();
     }
 
-    // set to true once self verification is complete
-    private static volatile boolean integrityVerified;
-
-    static void verifySelfIntegrity(Class c) {
-        if (integrityVerified) {
-            return;
-        }
-        doVerifySelfIntegrity(c);
-    }
-
-    private static synchronized void doVerifySelfIntegrity(Class c) {
-        integrityVerified = JarVerifier.verify(c);
-        if (integrityVerified == false) {
-            throw new ProviderException
-                ("The SunPKCS11 provider may have been tampered with.");
-        }
-    }
-
     public boolean equals(Object obj) {
         return this == obj;
     }
@@ -923,7 +905,6 @@ public final class SunPKCS11 extends AuthProvider {
             if (type == MD) {
                 return new P11Digest(token, algorithm, mechanism);
             } else if (type == CIP) {
-                verifySelfIntegrity(getClass());
                 if (algorithm.startsWith("RSA")) {
                     return new P11RSACipher(token, algorithm, mechanism);
                 } else {
@@ -932,12 +913,10 @@ public final class SunPKCS11 extends AuthProvider {
             } else if (type == SIG) {
                 return new P11Signature(token, algorithm, mechanism);
             } else if (type == MAC) {
-                verifySelfIntegrity(getClass());
                 return new P11Mac(token, algorithm, mechanism);
             } else if (type == KPG) {
                 return new P11KeyPairGenerator(token, algorithm, mechanism);
             } else if (type == KA) {
-                verifySelfIntegrity(getClass());
                 if (algorithm.equals("ECDH")) {
                     return new P11ECDHKeyAgreement(token, algorithm, mechanism);
                 } else {
@@ -946,11 +925,8 @@ public final class SunPKCS11 extends AuthProvider {
             } else if (type == KF) {
                 return token.getKeyFactory(algorithm);
             } else if (type == SKF) {
-                verifySelfIntegrity(getClass());
                 return new P11SecretKeyFactory(token, algorithm);
             } else if (type == KG) {
-                verifySelfIntegrity(getClass());
-
                 // reference equality
                 if (algorithm == "SunTlsRsaPremasterSecret") {
                     return new P11TlsRsaPremasterSecretGenerator(
diff --git a/jdk/src/share/classes/sun/security/provider/Sun.java b/jdk/src/share/classes/sun/security/provider/Sun.java
index 1cbf37c35ec..ec2687da99e 100644
--- a/jdk/src/share/classes/sun/security/provider/Sun.java
+++ b/jdk/src/share/classes/sun/security/provider/Sun.java
@@ -46,7 +46,7 @@ public final class Sun extends Provider {
 
     public Sun() {
         /* We are the SUN provider */
-        super("SUN", 1.6, INFO);
+        super("SUN", 1.7, INFO);
 
         // if there is no security manager installed, put directly into
         // the provider. Otherwise, create a temporary map and use a
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java b/jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java
index 38c5130d6d9..b45b20737fa 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/CertPathHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  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
@@ -25,9 +25,11 @@
 
 package sun.security.provider.certpath;
 
+import java.util.Date;
 import java.util.Set;
 
 import java.security.cert.X509CertSelector;
+import java.security.cert.X509CRLSelector;
 
 import sun.security.x509.GeneralNameInterface;
 
@@ -55,8 +57,14 @@ public abstract class CertPathHelper {
     protected abstract void implSetPathToNames(X509CertSelector sel,
             Set<GeneralNameInterface> names);
 
+    protected abstract void implSetDateAndTime(X509CRLSelector sel, Date date, long skew);
+
     static void setPathToNames(X509CertSelector sel,
             Set<GeneralNameInterface> names) {
         instance.implSetPathToNames(sel, names);
     }
+
+    static void setDateAndTime(X509CRLSelector sel, Date date, long skew) {
+        instance.implSetDateAndTime(sel, date, skew);
+    }
 }
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java b/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java
index 63ee343175d..b462dd5ba08 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2000-2009 Sun Microsystems, Inc.  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
@@ -81,6 +81,10 @@ class CrlRevocationChecker extends PKIXCertPathChecker {
     private static final boolean[] ALL_REASONS =
         {true, true, true, true, true, true, true, true, true};
 
+    // Maximum clock skew in milliseconds (15 minutes) allowed when checking
+    // validity of CRLs
+    private static final long MAX_CLOCK_SKEW = 900000;
+
     /**
      * Creates a <code>CrlRevocationChecker</code>.
      *
@@ -281,7 +285,7 @@ class CrlRevocationChecker extends PKIXCertPathChecker {
         try {
             X509CRLSelector sel = new X509CRLSelector();
             sel.setCertificateChecking(currCert);
-            sel.setDateAndTime(mCurrentTime);
+            CertPathHelper.setDateAndTime(sel, mCurrentTime, MAX_CLOCK_SKEW);
 
             for (CertStore mStore : mStores) {
                 for (java.security.cert.CRL crl : mStore.getCRLs(sel)) {
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java b/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
index 62cd4288ed0..cdadc45f66c 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
@@ -149,9 +149,9 @@ class OCSPResponse {
 
     private SingleResponse singleResponse;
 
-    // Maximum clock skew in milliseconds (10 minutes) allowed when checking
+    // Maximum clock skew in milliseconds (15 minutes) allowed when checking
     // validity of OCSP responses
-    private static final long MAX_CLOCK_SKEW = 600000;
+    private static final long MAX_CLOCK_SKEW = 900000;
 
     // an array of all of the CRLReasons (used in SingleResponse)
     private static CRLReason[] values = CRLReason.values();
diff --git a/jdk/src/share/classes/sun/security/smartcardio/SunPCSC.java b/jdk/src/share/classes/sun/security/smartcardio/SunPCSC.java
index 938614e54f9..fc76ce8118a 100644
--- a/jdk/src/share/classes/sun/security/smartcardio/SunPCSC.java
+++ b/jdk/src/share/classes/sun/security/smartcardio/SunPCSC.java
@@ -40,7 +40,7 @@ public final class SunPCSC extends Provider {
     private static final long serialVersionUID = 6168388284028876579L;
 
     public SunPCSC() {
-        super("SunPCSC", 1.6d, "Sun PC/SC provider");
+        super("SunPCSC", 1.7d, "Sun PC/SC provider");
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             public Void run() {
                 put("TerminalFactory.PC/SC", "sun.security.smartcardio.SunPCSC$Factory");
diff --git a/jdk/src/share/classes/sun/security/ssl/SunJSSE.java b/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
index a097ebb428b..0811fc0d83b 100644
--- a/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
+++ b/jdk/src/share/classes/sun/security/ssl/SunJSSE.java
@@ -103,7 +103,7 @@ public abstract class SunJSSE extends java.security.Provider {
 
     // standard constructor
     protected SunJSSE() {
-        super("SunJSSE", 1.6d, info);
+        super("SunJSSE", 1.7d, info);
         subclassCheck();
         if (Boolean.TRUE.equals(fips)) {
             throw new ProviderException
diff --git a/jdk/src/share/classes/sun/security/tools/JarSigner.java b/jdk/src/share/classes/sun/security/tools/JarSigner.java
index e7ca8bc7508..c62018c99b0 100644
--- a/jdk/src/share/classes/sun/security/tools/JarSigner.java
+++ b/jdk/src/share/classes/sun/security/tools/JarSigner.java
@@ -136,7 +136,7 @@ public class JarSigner {
     char[] keypass; // private key password
     String sigfile; // name of .SF file
     String sigalg; // name of signature algorithm
-    String digestalg = "SHA1"; // name of digest algorithm
+    String digestalg = "SHA-256"; // name of digest algorithm
     String signedjar; // output filename
     String tsaUrl; // location of the Timestamping Authority
     String tsaAlias; // alias for the Timestamping Authority's certificate
@@ -412,6 +412,16 @@ public class JarSigner {
         }
         storetype = KeyStoreUtil.niceStoreTypeName(storetype);
 
+        try {
+            if (signedjar != null && new File(signedjar).getCanonicalPath().equals(
+                    new File(jarfile).getCanonicalPath())) {
+                signedjar = null;
+            }
+        } catch (IOException ioe) {
+            // File system error?
+            // Just ignore it.
+        }
+
         if (P11KEYSTORE.equalsIgnoreCase(storetype) ||
                 KeyStoreUtil.isWindowsKeyStore(storetype)) {
             token = true;
@@ -1968,20 +1978,35 @@ public class JarSigner {
         String[] base64Digests = getDigests(ze, zf, digests, encoder);
 
         for (int i=0; i<digests.length; i++) {
-            String name = digests[i].getAlgorithm()+"-Digest";
-            String mfDigest = attrs.getValue(name);
-            if (mfDigest == null
-                && digests[i].getAlgorithm().equalsIgnoreCase("SHA")) {
-                // treat "SHA" and "SHA1" the same
-                mfDigest = attrs.getValue("SHA-Digest");
+            // The entry name to be written into attrs
+            String name = null;
+            try {
+                // Find if the digest already exists
+                AlgorithmId aid = AlgorithmId.get(digests[i].getAlgorithm());
+                for (Object key: attrs.keySet()) {
+                    if (key instanceof Attributes.Name) {
+                        String n = ((Attributes.Name)key).toString();
+                        if (n.toUpperCase(Locale.ENGLISH).endsWith("-DIGEST")) {
+                            String tmp = n.substring(0, n.length() - 7);
+                            if (AlgorithmId.get(tmp).equals(aid)) {
+                                name = n;
+                                break;
+                            }
+                        }
+                    }
+                }
+            } catch (NoSuchAlgorithmException nsae) {
+                // Ignored. Writing new digest entry.
             }
-            if (mfDigest == null) {
-                // compute digest and add it to list of attributes
+
+            if (name == null) {
+                name = digests[i].getAlgorithm()+"-Digest";
                 attrs.putValue(name, base64Digests[i]);
                 update=true;
             } else {
                 // compare digests, and replace the one in the manifest
                 // if they are different
+                String mfDigest = attrs.getValue(name);
                 if (!mfDigest.equalsIgnoreCase(base64Digests[i])) {
                     attrs.putValue(name, base64Digests[i]);
                     update=true;
@@ -2205,7 +2230,7 @@ class SignatureFile {
                 if (keyAlgorithm.equalsIgnoreCase("DSA"))
                     digestAlgorithm = "SHA1";
                 else if (keyAlgorithm.equalsIgnoreCase("RSA"))
-                    digestAlgorithm = "SHA1";
+                    digestAlgorithm = "SHA256";
                 else {
                     throw new RuntimeException("private key is not a DSA or "
                                                + "RSA key");
diff --git a/jdk/src/share/classes/sun/security/tools/KeyTool.java b/jdk/src/share/classes/sun/security/tools/KeyTool.java
index 9b4b16fa11d..8f9e86ee063 100644
--- a/jdk/src/share/classes/sun/security/tools/KeyTool.java
+++ b/jdk/src/share/classes/sun/security/tools/KeyTool.java
@@ -880,41 +880,41 @@ public final class KeyTool {
             // might not work properly, since -gencert is slow
             // and there's no data in the pipe at the beginning.
             ByteArrayOutputStream bout = new ByteArrayOutputStream();
-            byte[] b = new byte[4096];
-            while (true) {
-                int len = inStream.read(b);
-                if (len < 0) break;
-                bout.write(b, 0, len);
-            }
-            inStream = new ByteArrayInputStream(bout.toByteArray());
             try {
-                String importAlias = (alias!=null)?alias:keyAlias;
-                if (keyStore.entryInstanceOf(importAlias, KeyStore.PrivateKeyEntry.class)) {
-                    kssave = installReply(importAlias, inStream);
-                    if (kssave) {
-                        System.err.println(rb.getString
-                            ("Certificate reply was installed in keystore"));
-                    } else {
-                        System.err.println(rb.getString
-                            ("Certificate reply was not installed in keystore"));
-                    }
-                } else if (!keyStore.containsAlias(importAlias) ||
-                        keyStore.entryInstanceOf(importAlias,
-                            KeyStore.TrustedCertificateEntry.class)) {
-                    kssave = addTrustedCert(importAlias, inStream);
-                    if (kssave) {
-                        System.err.println(rb.getString
-                            ("Certificate was added to keystore"));
-                    } else {
-                        System.err.println(rb.getString
-                            ("Certificate was not added to keystore"));
-                    }
+                byte[] b = new byte[4096];
+                while (true) {
+                    int len = inStream.read(b);
+                    if (len < 0) break;
+                    bout.write(b, 0, len);
                 }
             } finally {
                 if (inStream != System.in) {
                     inStream.close();
                 }
             }
+            inStream = new ByteArrayInputStream(bout.toByteArray());
+            String importAlias = (alias!=null)?alias:keyAlias;
+            if (keyStore.entryInstanceOf(importAlias, KeyStore.PrivateKeyEntry.class)) {
+                kssave = installReply(importAlias, inStream);
+                if (kssave) {
+                    System.err.println(rb.getString
+                        ("Certificate reply was installed in keystore"));
+                } else {
+                    System.err.println(rb.getString
+                        ("Certificate reply was not installed in keystore"));
+                }
+            } else if (!keyStore.containsAlias(importAlias) ||
+                    keyStore.entryInstanceOf(importAlias,
+                        KeyStore.TrustedCertificateEntry.class)) {
+                kssave = addTrustedCert(importAlias, inStream);
+                if (kssave) {
+                    System.err.println(rb.getString
+                        ("Certificate was added to keystore"));
+                } else {
+                    System.err.println(rb.getString
+                        ("Certificate was not added to keystore"));
+                }
+            }
         } else if (command == IMPORTKEYSTORE) {
             doImportKeyStore();
             kssave = true;
@@ -1052,7 +1052,7 @@ public final class KeyTool {
         X509CertImpl signerCertImpl = new X509CertImpl(encoded);
         X509CertInfo signerCertInfo = (X509CertInfo)signerCertImpl.get(
                 X509CertImpl.NAME + "." + X509CertImpl.INFO);
-        X500Name owner = (X500Name)signerCertInfo.get(X509CertInfo.SUBJECT + "." +
+        X500Name issuer = (X500Name)signerCertInfo.get(X509CertInfo.SUBJECT + "." +
                                            CertificateSubjectName.DN_NAME);
 
         Date firstDate = getStartDate(startDate);
@@ -1068,7 +1068,7 @@ public final class KeyTool {
         Signature signature = Signature.getInstance(sigAlgName);
         signature.initSign(privateKey);
 
-        X500Signer signer = new X500Signer(signature, owner);
+        X500Signer signer = new X500Signer(signature, issuer);
 
         X509CertInfo info = new X509CertInfo();
         info.set(X509CertInfo.VALIDITY, interval);
@@ -1102,7 +1102,8 @@ public final class KeyTool {
         PKCS10 req = new PKCS10(rawReq);
 
         info.set(X509CertInfo.KEY, new CertificateX509Key(req.getSubjectPublicKeyInfo()));
-        info.set(X509CertInfo.SUBJECT, new CertificateSubjectName(req.getSubjectName()));
+        info.set(X509CertInfo.SUBJECT, new CertificateSubjectName(
+                dname==null?req.getSubjectName():new X500Name(dname)));
         CertificateExtensions reqex = null;
         Iterator<PKCS10Attribute> attrs = req.getAttributes().getAttributes().iterator();
         while (attrs.hasNext()) {
@@ -1160,8 +1161,9 @@ public final class KeyTool {
 
         Signature signature = Signature.getInstance(sigAlgName);
         signature.initSign(privKey);
-        X500Name subject =
-            new X500Name(((X509Certificate)cert).getSubjectDN().toString());
+        X500Name subject = dname == null?
+                new X500Name(((X509Certificate)cert).getSubjectDN().toString()):
+                new X500Name(dname);
         X500Signer signer = new X500Signer(signature, subject);
 
         // Sign the request and base-64 encode it
@@ -1316,7 +1318,7 @@ public final class KeyTool {
         if ("DSA".equalsIgnoreCase(keyAlgName)) {
             return "SHA1WithDSA";
         } else if ("RSA".equalsIgnoreCase(keyAlgName)) {
-            return "SHA1WithRSA";
+            return "SHA256WithRSA";
         } else if ("EC".equalsIgnoreCase(keyAlgName)) {
             return "SHA1withECDSA";
         } else {
@@ -1334,6 +1336,8 @@ public final class KeyTool {
         if (keysize == -1) {
             if ("EC".equalsIgnoreCase(keyAlgName)) {
                 keysize = 256;
+            } else if ("RSA".equalsIgnoreCase(keyAlgName)) {
+                keysize = 2048;
             } else {
                 keysize = 1024;
             }
@@ -2497,6 +2501,7 @@ public final class KeyTool {
                         cert.getNotAfter().toString(),
                         getCertFingerPrint("MD5", cert),
                         getCertFingerPrint("SHA1", cert),
+                        getCertFingerPrint("SHA-256", cert),
                         cert.getSigAlgName(),
                         cert.getVersion()
                         };
@@ -3428,7 +3433,7 @@ public final class KeyTool {
 
                 int colonpos = name.indexOf(':');
                 if (colonpos >= 0) {
-                    if (name.substring(colonpos+1).equalsIgnoreCase("critical")) {
+                    if (oneOf(name.substring(colonpos+1), "critical") == 0) {
                         isCritical = true;
                     }
                     name = name.substring(0, colonpos);
@@ -3688,6 +3693,8 @@ public final class KeyTool {
                 ("-certreq     [-v] [-protected]"));
         System.err.println(rb.getString
                 ("\t     [-alias <alias>] [-sigalg <sigalg>]"));
+        System.err.println(rb.getString
+                ("\t     [-dname <dname>]"));
         System.err.println(rb.getString
                 ("\t     [-file <csr_file>] [-keypass <keypass>]"));
         System.err.println(rb.getString
@@ -3770,6 +3777,8 @@ public final class KeyTool {
                 ("\t     [-infile <infile>] [-outfile <outfile>]"));
         System.err.println(rb.getString
                 ("\t     [-alias <alias>]"));
+        System.err.println(rb.getString
+                ("\t     [-dname <dname>]"));
         System.err.println(rb.getString
                 ("\t     [-sigalg <sigalg>]"));
         System.err.println(rb.getString
diff --git a/jdk/src/share/classes/sun/security/tools/PolicyTool.java b/jdk/src/share/classes/sun/security/tools/PolicyTool.java
index c2c6218bd35..ce54ba61ca9 100644
--- a/jdk/src/share/classes/sun/security/tools/PolicyTool.java
+++ b/jdk/src/share/classes/sun/security/tools/PolicyTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1997-2009 Sun Microsystems, Inc.  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
@@ -35,21 +35,16 @@ import java.net.MalformedURLException;
 import java.lang.reflect.*;
 import java.text.Collator;
 import java.text.MessageFormat;
-import sun.misc.BASE64Decoder;
-import sun.security.provider.PolicyParser.PermissionEntry;
 import sun.security.util.PropertyExpander;
 import sun.security.util.PropertyExpander.ExpandException;
 import java.awt.*;
 import java.awt.event.*;
 import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
 import java.security.cert.CertificateException;
 import java.security.*;
 import sun.security.provider.*;
 import sun.security.util.PolicyUtil;
 import javax.security.auth.x500.X500Principal;
-import java.util.HashSet;
 
 /**
  * PolicyTool may be used by users and administrators to configure the
@@ -1459,6 +1454,7 @@ class ToolDialog extends Dialog {
         PERM_ARRAY.add(new AWTPerm());
         PERM_ARRAY.add(new DelegationPerm());
         PERM_ARRAY.add(new FilePerm());
+        PERM_ARRAY.add(new InqSecContextPerm());
         PERM_ARRAY.add(new LogPerm());
         PERM_ARRAY.add(new MgmtPerm());
         PERM_ARRAY.add(new MBeanPerm());
@@ -3961,6 +3957,20 @@ class FilePerm extends Perm {
     }
 }
 
+class InqSecContextPerm extends Perm {
+    public InqSecContextPerm() {
+    super("InquireSecContextPermission",
+        "com.sun.security.jgss.InquireSecContextPermission",
+        new String[]    {
+                "KRB5_GET_SESSION_KEY",
+                "KRB5_GET_TKT_FLAGS",
+                "KRB5_GET_AUTHZ_DATA",
+                "KRB5_GET_AUTHTIME"
+                },
+        null);
+    }
+}
+
 class LogPerm extends Perm {
     public LogPerm() {
     super("LoggingPermission",
diff --git a/jdk/src/share/classes/sun/security/util/Password.java b/jdk/src/share/classes/sun/security/util/Password.java
index 5600ed60b17..9f767124d49 100644
--- a/jdk/src/share/classes/sun/security/util/Password.java
+++ b/jdk/src/share/classes/sun/security/util/Password.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -37,6 +37,14 @@ import java.util.Arrays;
 public class Password {
     /** Reads user password from given input stream. */
     public static char[] readPassword(InputStream in) throws IOException {
+        return readPassword(in, false);
+    }
+
+    /** Reads user password from given input stream.
+     * @param isEchoOn true if the password should be echoed on the screen
+     */
+    public static char[] readPassword(InputStream in, boolean isEchoOn)
+            throws IOException {
 
         char[] consoleEntered = null;
         byte[] consoleBytes = null;
@@ -44,7 +52,7 @@ public class Password {
         try {
             // Use the new java.io.Console class
             Console con = null;
-            if (in == System.in && ((con = System.console()) != null)) {
+            if (!isEchoOn && in == System.in && ((con = System.console()) != null)) {
                 consoleEntered = con.readPassword();
                 // readPassword returns "" if you just print ENTER,
                 // to be compatible with old Password class, change to null
diff --git a/jdk/src/share/classes/sun/security/util/Resources.java b/jdk/src/share/classes/sun/security/util/Resources.java
index c8c5e386de1..9b3931b68a1 100644
--- a/jdk/src/share/classes/sun/security/util/Resources.java
+++ b/jdk/src/share/classes/sun/security/util/Resources.java
@@ -215,7 +215,7 @@ public class Resources extends java.util.ListResourceBundle {
         {"\t(RETURN if same as for <otherAlias>)",
                 "\t(RETURN if same as for <{0}>)"},
         {"*PATTERN* printX509Cert",
-                "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t MD5:  {5}\n\t SHA1: {6}\n\t Signature algorithm name: {7}\n\t Version: {8}"},
+                "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t MD5:  {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t Signature algorithm name: {8}\n\t Version: {9}"},
         {"What is your first and last name?",
                 "What is your first and last name?"},
         {"What is the name of your organizational unit?",
@@ -301,6 +301,7 @@ public class Resources extends java.util.ListResourceBundle {
                 "-certreq     [-v] [-protected]"},
         {"\t     [-alias <alias>] [-sigalg <sigalg>]",
                 "\t     [-alias <alias>] [-sigalg <sigalg>]"},
+        {"\t     [-dname <dname>]", "\t     [-dname <dname>]"},
         {"\t     [-file <csr_file>] [-keypass <keypass>]",
                 "\t     [-file <csr_file>] [-keypass <keypass>]"},
         {"\t     [-keystore <keystore>] [-storepass <storepass>]",
diff --git a/jdk/src/share/classes/sun/security/x509/AlgorithmId.java b/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
index 7dea6a14bec..fb6104dbce9 100644
--- a/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
+++ b/jdk/src/share/classes/sun/security/x509/AlgorithmId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 1996-2009 Sun Microsystems, Inc.  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
@@ -531,6 +531,18 @@ public class AlgorithmId implements Serializable, DerEncoder {
                 || name.equalsIgnoreCase("ECDSA")) {
             return AlgorithmId.sha1WithECDSA_oid;
         }
+        if (name.equalsIgnoreCase("SHA224withECDSA")) {
+            return AlgorithmId.sha224WithECDSA_oid;
+        }
+        if (name.equalsIgnoreCase("SHA256withECDSA")) {
+            return AlgorithmId.sha256WithECDSA_oid;
+        }
+        if (name.equalsIgnoreCase("SHA384withECDSA")) {
+            return AlgorithmId.sha384WithECDSA_oid;
+        }
+        if (name.equalsIgnoreCase("SHA512withECDSA")) {
+            return AlgorithmId.sha512WithECDSA_oid;
+        }
 
         // See if any of the installed providers supply a mapping from
         // the given algorithm name to an OID string
diff --git a/jdk/src/share/classes/sun/swing/FilePane.java b/jdk/src/share/classes/sun/swing/FilePane.java
index eae3d5a0d60..4aa80522216 100644
--- a/jdk/src/share/classes/sun/swing/FilePane.java
+++ b/jdk/src/share/classes/sun/swing/FilePane.java
@@ -1,6 +1,5 @@
-
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -905,8 +904,8 @@ public class FilePane extends JPanel implements PropertyChangeListener {
 
         @Override
         public void sort() {
-            ShellFolder.getInvoker().invoke(new Callable<Void>() {
-                public Void call() throws Exception {
+            ShellFolder.invoke(new Callable<Void>() {
+                public Void call() {
                     DetailsTableRowSorter.super.sort();
                     return null;
                 }
diff --git a/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java b/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java
index 109d0c4022c..02ce9abe9b1 100644
--- a/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java
+++ b/jdk/src/share/classes/sun/swing/MenuItemLayoutHelper.java
@@ -84,7 +84,6 @@ public class MenuItemLayoutHelper {
     private int minTextOffset;
 
     private int leftTextExtraWidth;
-    private int rightTextExtraWidth;
 
     private Rectangle viewRect;
 
@@ -157,7 +156,6 @@ public class MenuItemLayoutHelper {
 
     private void calcExtraWidths() {
         leftTextExtraWidth = getLeftExtraWidth(text);
-        rightTextExtraWidth = getRightExtraWidth(text);
     }
 
     private int getLeftExtraWidth(String str) {
@@ -169,15 +167,6 @@ public class MenuItemLayoutHelper {
         }
     }
 
-    private int getRightExtraWidth(String str) {
-        int rsb = SwingUtilities2.getRightSideBearing(mi, fm, str);
-        if (rsb > 0) {
-            return rsb;
-        } else {
-            return 0;
-        }
-    }
-
     private void setOriginalWidths() {
         iconSize.origWidth = iconSize.width;
         textSize.origWidth = textSize.width;
@@ -313,7 +302,7 @@ public class MenuItemLayoutHelper {
                     verticalAlignment, horizontalAlignment,
                     verticalTextPosition, horizontalTextPosition,
                     viewRect, iconRect, textRect, gap);
-            textRect.width += leftTextExtraWidth + rightTextExtraWidth;
+            textRect.width += leftTextExtraWidth;
             Rectangle labelRect = iconRect.union(textRect);
             labelSize.height = labelRect.height;
             labelSize.width = labelRect.width;
@@ -718,10 +707,10 @@ public class MenuItemLayoutHelper {
     }
 
     private void alignRect(Rectangle rect, int alignment, int origWidth) {
-        if (alignment != SwingUtilities.LEFT) {
+        if (alignment == SwingConstants.RIGHT) {
             rect.x = rect.x + rect.width - origWidth;
-            rect.width = origWidth;
         }
+        rect.width = origWidth;
     }
 
     protected void layoutIconAndTextInLabelRect(LayoutResult lr) {
@@ -1121,10 +1110,6 @@ public class MenuItemLayoutHelper {
         return leftTextExtraWidth;
     }
 
-    public int getRightTextExtraWidth() {
-        return rightTextExtraWidth;
-    }
-
     /**
      * Returns false if the component is a JMenu and it is a top
      * level menu (on the menubar).
diff --git a/jdk/src/share/classes/sun/swing/SwingUtilities2.java b/jdk/src/share/classes/sun/swing/SwingUtilities2.java
index 121d338c95a..201cb43e3e4 100644
--- a/jdk/src/share/classes/sun/swing/SwingUtilities2.java
+++ b/jdk/src/share/classes/sun/swing/SwingUtilities2.java
@@ -27,7 +27,6 @@ package sun.swing;
 
 import java.security.*;
 import java.lang.reflect.*;
-import java.lang.ref.SoftReference;
 import java.awt.*;
 import static java.awt.RenderingHints.*;
 import java.awt.event.*;
@@ -78,17 +77,23 @@ public class SwingUtilities2 {
     public static final Object LAF_STATE_KEY =
             new StringBuffer("LookAndFeel State");
 
-    // Most of applications use 10 or less fonts simultaneously
-    private static final int STRONG_BEARING_CACHE_SIZE = 10;
-    // Strong cache for the left and right side bearings
-    // for STRONG_BEARING_CACHE_SIZE most recently used fonts.
-    private static BearingCacheEntry[] strongBearingCache =
-            new BearingCacheEntry[STRONG_BEARING_CACHE_SIZE];
-    // Next index to insert an entry into the strong bearing cache
-    private static int strongBearingCacheNextIndex = 0;
-    // Soft cache for the left and right side bearings
-    private static Set<SoftReference<BearingCacheEntry>> softBearingCache =
-            new HashSet<SoftReference<BearingCacheEntry>>();
+    // Maintain a cache of CACHE_SIZE fonts and the left side bearing
+     // of the characters falling into the range MIN_CHAR_INDEX to
+     // MAX_CHAR_INDEX. The values in fontCache are created as needed.
+     private static LSBCacheEntry[] fontCache;
+     // Windows defines 6 font desktop properties, we will therefore only
+     // cache the metrics for 6 fonts.
+     private static final int CACHE_SIZE = 6;
+     // nextIndex in fontCache to insert a font into.
+     private static int nextIndex;
+     // LSBCacheEntry used to search in fontCache to see if we already
+     // have an entry for a particular font
+     private static LSBCacheEntry searchKey;
+
+     // getLeftSideBearing will consult all characters that fall in the
+     // range MIN_CHAR_INDEX to MAX_CHAR_INDEX.
+     private static final int MIN_CHAR_INDEX = (int)'W';
+     private static final int MAX_CHAR_INDEX = (int)'W' + 1;
 
     public static final FontRenderContext DEFAULT_FRC =
         new FontRenderContext(null, false, false);
@@ -183,6 +188,10 @@ public class SwingUtilities2 {
     private static final Object charsBufferLock = new Object();
     private static char[] charsBuffer = new char[CHAR_BUFFER_SIZE];
 
+    static {
+        fontCache = new LSBCacheEntry[CACHE_SIZE];
+    }
+
     /**
      * checks whether TextLayout is required to handle characters.
      *
@@ -226,7 +235,9 @@ public class SwingUtilities2 {
 
     /**
      * Returns the left side bearing of the first character of string. The
-     * left side bearing is calculated from the passed in FontMetrics.
+     * left side bearing is calculated from the passed in
+     * FontMetrics.  If the passed in String is less than one
+     * character, this will throw a StringIndexOutOfBoundsException exception.
      *
      * @param c JComponent that will display the string
      * @param fm FontMetrics used to measure the String width
@@ -234,14 +245,11 @@ public class SwingUtilities2 {
      */
     public static int getLeftSideBearing(JComponent c, FontMetrics fm,
                                          String string) {
-        if ((string == null) || (string.length() == 0)) {
-            return 0;
-        }
         return getLeftSideBearing(c, fm, string.charAt(0));
     }
 
     /**
-     * Returns the left side bearing of the specified character. The
+     * Returns the left side bearing of the first character of string. The
      * left side bearing is calculated from the passed in FontMetrics.
      *
      * @param c JComponent that will display the string
@@ -250,105 +258,37 @@ public class SwingUtilities2 {
      */
     public static int getLeftSideBearing(JComponent c, FontMetrics fm,
                                          char firstChar) {
-        return getBearing(c, fm, firstChar, true);
-    }
+        int charIndex = (int) firstChar;
+        if (charIndex < MAX_CHAR_INDEX && charIndex >= MIN_CHAR_INDEX) {
+            byte[] lsbs = null;
 
-    /**
-     * Returns the right side bearing of the last character of string. The
-     * right side bearing is calculated from the passed in FontMetrics.
-     *
-     * @param c JComponent that will display the string
-     * @param fm FontMetrics used to measure the String width
-     * @param string String to get the right side bearing for.
-     */
-    public static int getRightSideBearing(JComponent c, FontMetrics fm,
-                                          String string) {
-        if ((string == null) || (string.length() == 0)) {
-            return 0;
-        }
-        return getRightSideBearing(c, fm, string.charAt(string.length() - 1));
-    }
-
-    /**
-     * Returns the right side bearing of the specified character. The
-     * right side bearing is calculated from the passed in FontMetrics.
-     *
-     * @param c JComponent that will display the string
-     * @param fm FontMetrics used to measure the String width
-     * @param lastChar Character to get the right side bearing for.
-     */
-    public static int getRightSideBearing(JComponent c, FontMetrics fm,
-                                         char lastChar) {
-        return getBearing(c, fm, lastChar, false);
-    }
-
-    /* Calculates the left and right side bearing for a character.
-     * Strongly caches bearings for STRONG_BEARING_CACHE_SIZE
-     * most recently used Fonts and softly caches as many as GC allows.
-     */
-    private static int getBearing(JComponent comp, FontMetrics fm, char c,
-                                  boolean isLeftBearing) {
-        if (fm == null) {
-            if (comp == null) {
-                return 0;
-            } else {
-                fm = comp.getFontMetrics(comp.getFont());
-            }
-        }
-        synchronized (SwingUtilities2.class) {
-            BearingCacheEntry entry = null;
-            BearingCacheEntry searchKey = new BearingCacheEntry(fm);
-            // See if we already have an entry in the strong cache
-            for (BearingCacheEntry cacheEntry : strongBearingCache) {
-                if (searchKey.equals(cacheEntry)) {
-                    entry = cacheEntry;
-                    break;
+            FontRenderContext frc = getFontRenderContext(c, fm);
+            Font font = fm.getFont();
+            synchronized (SwingUtilities2.class) {
+                LSBCacheEntry entry = null;
+                if (searchKey == null) {
+                    searchKey = new LSBCacheEntry(frc, font);
+                } else {
+                    searchKey.reset(frc, font);
                 }
-            }
-            // See if we already have an entry in the soft cache
-            if (entry == null) {
-                Iterator<SoftReference<BearingCacheEntry>> iter =
-                        softBearingCache.iterator();
-                while (iter.hasNext()) {
-                    BearingCacheEntry cacheEntry = iter.next().get();
-                    if (cacheEntry == null) {
-                        // Remove discarded soft reference from the cache
-                        iter.remove();
-                        continue;
-                    }
+                // See if we already have an entry for this pair
+                for (LSBCacheEntry cacheEntry : fontCache) {
                     if (searchKey.equals(cacheEntry)) {
                         entry = cacheEntry;
-                        putEntryInStrongCache(entry);
                         break;
                     }
                 }
+                if (entry == null) {
+                    // No entry for this pair, add it.
+                    entry = searchKey;
+                    fontCache[nextIndex] = searchKey;
+                    searchKey = null;
+                    nextIndex = (nextIndex + 1) % CACHE_SIZE;
+                }
+                return entry.getLeftSideBearing(firstChar);
             }
-            if (entry == null) {
-                // No entry, add it
-                entry = searchKey;
-                cacheEntry(entry);
-            }
-            return (isLeftBearing)
-                    ? entry.getLeftSideBearing(c)
-                    : entry.getRightSideBearing(c);
         }
-    }
-
-    private synchronized static void cacheEntry(BearingCacheEntry entry) {
-        // Move the oldest entry from the strong cache into the soft cache
-        BearingCacheEntry oldestEntry =
-                strongBearingCache[strongBearingCacheNextIndex];
-        if (oldestEntry != null) {
-            softBearingCache.add(new SoftReference<BearingCacheEntry>(oldestEntry));
-        }
-        // Put entry in the strong cache
-        putEntryInStrongCache(entry);
-    }
-
-    private synchronized static void putEntryInStrongCache(BearingCacheEntry entry) {
-        strongBearingCache[strongBearingCacheNextIndex] = entry;
-        strongBearingCacheNextIndex = (strongBearingCacheNextIndex + 1)
-                % STRONG_BEARING_CACHE_SIZE;
+        return 0;
     }
 
     /**
@@ -1063,99 +1003,72 @@ public class SwingUtilities2 {
     }
 
     /**
-     * BearingCacheEntry is used to cache left and right character bearings
-     * for a particular <code>Font</code> and <code>FontRenderContext</code>.
+     * LSBCacheEntry is used to cache the left side bearing (lsb) for
+     * a particular <code>Font</code> and <code>FontRenderContext</code>.
+     * This only caches characters that fall in the range
+     * <code>MIN_CHAR_INDEX</code> to <code>MAX_CHAR_INDEX</code>.
      */
-    private static class BearingCacheEntry {
-        private FontMetrics fontMetrics;
-        private Font font;
-        private FontRenderContext frc;
-        private Map<Character, Short> cache;
-        // Used for the creation of a GlyphVector
+    private static class LSBCacheEntry {
+        // Used to indicate a particular entry in lsb has not been set.
+        private static final byte UNSET = Byte.MAX_VALUE;
+        // Used in creating a GlyphVector to get the lsb
         private static final char[] oneChar = new char[1];
 
-        public BearingCacheEntry(FontMetrics fontMetrics) {
-            this.fontMetrics = fontMetrics;
-            this.font = fontMetrics.getFont();
-            this.frc = fontMetrics.getFontRenderContext();
-            this.cache = new HashMap<Character, Short>();
-            assert (font != null && frc != null);
+        private byte[] lsbCache;
+        private Font font;
+        private FontRenderContext frc;
+
+
+        public LSBCacheEntry(FontRenderContext frc, Font font) {
+            lsbCache = new byte[MAX_CHAR_INDEX - MIN_CHAR_INDEX];
+            reset(frc, font);
+
+        }
+
+        public void reset(FontRenderContext frc, Font font) {
+            this.font = font;
+            this.frc = frc;
+            for (int counter = lsbCache.length - 1; counter >= 0; counter--) {
+                lsbCache[counter] = UNSET;
+            }
         }
 
         public int getLeftSideBearing(char aChar) {
-            Short bearing = cache.get(aChar);
-            if (bearing == null) {
-                bearing = calcBearing(aChar);
-                cache.put(aChar, bearing);
+            int index = aChar - MIN_CHAR_INDEX;
+            assert (index >= 0 && index < (MAX_CHAR_INDEX - MIN_CHAR_INDEX));
+            byte lsb = lsbCache[index];
+            if (lsb == UNSET) {
+                oneChar[0] = aChar;
+                GlyphVector gv = font.createGlyphVector(frc, oneChar);
+                lsb = (byte) gv.getGlyphPixelBounds(0, frc, 0f, 0f).x;
+                if (lsb < 0) {
+                    /* HRGB/HBGR LCD glyph images will always have a pixel
+                     * on the left used in colour fringe reduction.
+                     * Text rendering positions this correctly but here
+                     * we are using the glyph image to adjust that position
+                     * so must account for it.
+                     */
+                    Object aaHint = frc.getAntiAliasingHint();
+                    if (aaHint == VALUE_TEXT_ANTIALIAS_LCD_HRGB ||
+                            aaHint == VALUE_TEXT_ANTIALIAS_LCD_HBGR) {
+                        lsb++;
+                    }
+                }
+                lsbCache[index] = lsb;
             }
-            return ((0xFF00 & bearing) >>> 8) - 127;
-        }
+            return lsb;
 
-        public int getRightSideBearing(char aChar) {
-            Short bearing = cache.get(aChar);
-            if (bearing == null) {
-                bearing = calcBearing(aChar);
-                cache.put(aChar, bearing);
-            }
-            return (0xFF & bearing) - 127;
-        }
 
-        /* Calculates left and right side bearings for a character.
-         * Makes an assumption that bearing is a value between -127 and +127.
-         * Stores LSB and RSB as single two-byte number (short):
-         * LSB is the high byte, RSB is the low byte.
-         */
-        private short calcBearing(char aChar) {
-            oneChar[0] = aChar;
-            GlyphVector gv = font.createGlyphVector(frc, oneChar);
-            Rectangle pixelBounds = gv.getGlyphPixelBounds(0, frc, 0f, 0f);
-
-            // Get bearings
-            int lsb = pixelBounds.x;
-            int rsb = pixelBounds.width - fontMetrics.charWidth(aChar);
-
-            /* HRGB/HBGR LCD glyph images will always have a pixel
-             * on the left and a pixel on the right
-             * used in colour fringe reduction.
-             * Text rendering positions this correctly but here
-             * we are using the glyph image to adjust that position
-             * so must account for it.
-             */
-            if (lsb < 0) {
-                 Object aaHint = frc.getAntiAliasingHint();
-                 if (aaHint == VALUE_TEXT_ANTIALIAS_LCD_HRGB ||
-                     aaHint == VALUE_TEXT_ANTIALIAS_LCD_HBGR) {
-                     lsb++;
-                 }
-            }
-            if (rsb > 0) {
-                 Object aaHint = frc.getAntiAliasingHint();
-                 if (aaHint == VALUE_TEXT_ANTIALIAS_LCD_HRGB ||
-                     aaHint == VALUE_TEXT_ANTIALIAS_LCD_HBGR) {
-                     rsb--;
-                 }
-            }
-
-            // Make sure that LSB and RSB are valid (see 6472972)
-            if (lsb < -127 || lsb > 127) {
-                lsb = 0;
-            }
-            if (rsb < -127 || rsb > 127) {
-                rsb = 0;
-            }
-
-            int bearing = ((lsb + 127) << 8) + (rsb + 127);
-            return (short)bearing;
         }
 
         public boolean equals(Object entry) {
             if (entry == this) {
                 return true;
             }
-            if (!(entry instanceof BearingCacheEntry)) {
+            if (!(entry instanceof LSBCacheEntry)) {
                 return false;
             }
-            BearingCacheEntry oEntry = (BearingCacheEntry)entry;
+            LSBCacheEntry oEntry = (LSBCacheEntry) entry;
             return (font.equals(oEntry.font) &&
                     frc.equals(oEntry.frc));
         }
@@ -1172,7 +1085,6 @@ public class SwingUtilities2 {
         }
     }
 
-
     /*
      * here goes the fix for 4856343 [Problem with applet interaction
      * with system selection clipboard]
@@ -1181,36 +1093,34 @@ public class SwingUtilities2 {
      * are to be performed
      */
 
-
     /**
-     * checks the security permissions for accessing system clipboard
-     *
-     * for untrusted context (see isTrustedContext) checks the
-     * permissions for the current event being handled
-     *
-     */
-    public static boolean canAccessSystemClipboard() {
-        boolean canAccess = false;
-        if (!GraphicsEnvironment.isHeadless()) {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm == null) {
-                canAccess = true;
-            } else {
-                try {
-                    sm.checkSystemClipboardAccess();
-                    canAccess = true;
-                } catch (SecurityException e) {
-                }
-                if (canAccess && ! isTrustedContext()) {
-                    canAccess = canCurrentEventAccessSystemClipboard(true);
-                }
-            }
-        }
-        return canAccess;
-    }
-
+    * checks the security permissions for accessing system clipboard
+    *
+    * for untrusted context (see isTrustedContext) checks the
+    * permissions for the current event being handled
+    *
+    */
+   public static boolean canAccessSystemClipboard() {
+       boolean canAccess = false;
+       if (!GraphicsEnvironment.isHeadless()) {
+           SecurityManager sm = System.getSecurityManager();
+           if (sm == null) {
+               canAccess = true;
+           } else {
+               try {
+                   sm.checkSystemClipboardAccess();
+                   canAccess = true;
+               } catch (SecurityException e) {
+               }
+               if (canAccess && ! isTrustedContext()) {
+                   canAccess = canCurrentEventAccessSystemClipboard(true);
+               }
+           }
+       }
+       return canAccess;
+   }
     /**
-     * Returns true if EventQueue.getCurrentEvent() has the permissions to
+    * Returns true if EventQueue.getCurrentEvent() has the permissions to
      * access the system clipboard
      */
     public static boolean canCurrentEventAccessSystemClipboard() {
@@ -1844,4 +1754,22 @@ public class SwingUtilities2 {
                                          boolean three) {
         return liesIn(rect, p, false, false, three);
     }
+
+    /**
+     * Returns the {@code JViewport} instance for the {@code component}
+     * or {@code null}.
+     *
+     * @return the {@code JViewport} instance for the {@code component}
+     * or {@code null}
+     * @throws NullPointerException if {@code component} is {@code null}
+     */
+    public static JViewport getViewport(Component component) {
+        do {
+            component = component.getParent();
+            if (component instanceof JViewport) {
+                return (JViewport) component;
+            }
+        } while(component instanceof JLayer);
+        return null;
+    }
 }
diff --git a/jdk/src/share/lib/security/java.security b/jdk/src/share/lib/security/java.security
index eadfe715b51..b975f25e1e5 100644
--- a/jdk/src/share/lib/security/java.security
+++ b/jdk/src/share/lib/security/java.security
@@ -45,12 +45,13 @@
 #
 security.provider.1=sun.security.provider.Sun
 security.provider.2=sun.security.rsa.SunRsaSign
-security.provider.3=com.sun.net.ssl.internal.ssl.Provider
-security.provider.4=com.sun.crypto.provider.SunJCE
-security.provider.5=sun.security.jgss.SunProvider
-security.provider.6=com.sun.security.sasl.Provider
-security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.8=sun.security.smartcardio.SunPCSC
+security.provider.3=sun.security.ec.SunEC
+security.provider.4=com.sun.net.ssl.internal.ssl.Provider
+security.provider.5=com.sun.crypto.provider.SunJCE
+security.provider.6=sun.security.jgss.SunProvider
+security.provider.7=com.sun.security.sasl.Provider
+security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+security.provider.9=sun.security.smartcardio.SunPCSC
 
 #
 # Select the source of seed data for SecureRandom. By default an
@@ -127,7 +128,7 @@ system.scope=sun.security.provider.IdentityDatabase
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.
+package.access=sun.,com.sun.imageio.
 
 #
 # List of comma-separated packages that start with or equal this string
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
index 58fbc9d15cd..1e447b7c24d 100644
--- a/jdk/src/share/lib/security/java.security-solaris
+++ b/jdk/src/share/lib/security/java.security-solaris
@@ -46,12 +46,13 @@
 security.provider.1=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/sunpkcs11-solaris.cfg
 security.provider.2=sun.security.provider.Sun
 security.provider.3=sun.security.rsa.SunRsaSign
-security.provider.4=com.sun.net.ssl.internal.ssl.Provider
-security.provider.5=com.sun.crypto.provider.SunJCE
-security.provider.6=sun.security.jgss.SunProvider
-security.provider.7=com.sun.security.sasl.Provider
-security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.9=sun.security.smartcardio.SunPCSC
+security.provider.4=sun.security.ec.SunEC
+security.provider.5=com.sun.net.ssl.internal.ssl.Provider
+security.provider.6=com.sun.crypto.provider.SunJCE
+security.provider.7=sun.security.jgss.SunProvider
+security.provider.8=com.sun.security.sasl.Provider
+security.provider.9=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+security.provider.10=sun.security.smartcardio.SunPCSC
 
 #
 # Select the source of seed data for SecureRandom. By default an
@@ -128,7 +129,7 @@ system.scope=sun.security.provider.IdentityDatabase
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.
+package.access=sun.,com.sun.imageio.
 
 #
 # List of comma-separated packages that start with or equal this string
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
index 25de17d5247..c94c76b7ffb 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/share/lib/security/java.security-windows
@@ -45,13 +45,14 @@
 #
 security.provider.1=sun.security.provider.Sun
 security.provider.2=sun.security.rsa.SunRsaSign
-security.provider.3=com.sun.net.ssl.internal.ssl.Provider
-security.provider.4=com.sun.crypto.provider.SunJCE
-security.provider.5=sun.security.jgss.SunProvider
-security.provider.6=com.sun.security.sasl.Provider
-security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
-security.provider.8=sun.security.smartcardio.SunPCSC
-security.provider.9=sun.security.mscapi.SunMSCAPI
+security.provider.3=sun.security.ec.SunEC
+security.provider.4=com.sun.net.ssl.internal.ssl.Provider
+security.provider.5=com.sun.crypto.provider.SunJCE
+security.provider.6=sun.security.jgss.SunProvider
+security.provider.7=com.sun.security.sasl.Provider
+security.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI
+security.provider.9=sun.security.smartcardio.SunPCSC
+security.provider.10=sun.security.mscapi.SunMSCAPI
 
 #
 # Select the source of seed data for SecureRandom. By default an
@@ -128,7 +129,7 @@ system.scope=sun.security.provider.IdentityDatabase
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.
+package.access=sun.,com.sun.imageio.
 
 #
 # List of comma-separated packages that start with or equal this string
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
index a6f4ca0c2c8..7ca65c5d61e 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
@@ -908,10 +908,12 @@ void cpool::init(unpacker* u_, int counts[NUM_COUNTS]) {
 
   // place a limit on future CP growth:
   int generous = 0;
-  generous += u->ic_count*3; // implicit name, outer, outer.utf8
-  generous += 40;  // WKUs, misc
-  generous += u->class_count;  // implicit SourceFile strings
-  maxentries = nentries + generous;
+  generous = add_size(generous, u->ic_count); // implicit name
+  generous = add_size(generous, u->ic_count); // outer
+  generous = add_size(generous, u->ic_count); // outer.utf8
+  generous = add_size(generous, 40); // WKUs, misc
+  generous = add_size(generous, u->class_count); // implicit SourceFile strings
+  maxentries = add_size(nentries, generous);
 
   // Note that this CP does not include "empty" entries
   // for longs and doubles.  Those are introduced when
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/README b/jdk/src/share/native/java/util/zip/zlib-1.1.3/README
deleted file mode 100644
index 97f28f42ffd..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/README
+++ /dev/null
@@ -1,151 +0,0 @@
-zlib 1.1.3 is a general purpose data compression library.  All the code
-is thread safe.  The data format used by the zlib library
-is described by RFCs (Request for Comments) 1950 to 1952 in the files 
-ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate
-format) and rfc1952.txt (gzip format). These documents are also available in
-other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact jloup@gzip.org). A usage
-example of the library is given in the file example.c which also tests that
-the library is working correctly. Another example is given in the file
-minigzip.c. The compression library itself is composed of all source files
-except example.c and minigzip.c.
-
-To compile all files and run the test program, follow the instructions
-given at the top of Makefile. In short "make test; make install"
-should work for most machines. For Unix: "configure; make test; make install"
-For MSDOS, use one of the special makefiles such as Makefile.msc.
-For VMS, use Make_vms.com or descrip.mms.
-
-Questions about zlib should be sent to <zlib@quest.jpl.nasa.gov>, or to
-Gilles Vollant <info@winimage.com> for the Windows DLL version.
-The zlib home page is http://www.cdrom.com/pub/infozip/zlib/
-The official zlib ftp site is ftp://ftp.cdrom.com/pub/infozip/zlib/
-Before reporting a problem, please check those sites to verify that
-you have the latest version of zlib; otherwise get the latest version and
-check whether the problem still exists or not.
-
-Mark Nelson <markn@tiny.com> wrote an article about zlib for the Jan. 1997
-issue of  Dr. Dobb's Journal; a copy of the article is available in
-http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm
-
-There are minor changes by Sun Microsystems in 1.1.3.f-jdk as compared with
-the official 1.1.3 version; see the file ChangeLog.
-
-The changes made in version 1.1.3 are documented in the file ChangeLog.
-The main changes since 1.1.2 are:
-
-- fix "an inflate input buffer bug that shows up on rare but persistent
-  occasions" (Mark)
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-- fix gzseek(..., SEEK_SET) in write mode
-- fix crc check after a gzeek (Frank Faubert)
-- fix miniunzip when the last entry in a zip file is itself a zip file
-  (J Lillge)
-- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-  See http://www.muppetlabs.com/~breadbox/software/assembly.html
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-- added a FAQ file
-
-plus many changes for portability.
-
-Unsupported third party contributions are provided in directory "contrib".
-
-A Java implementation of zlib is available in the Java Development Kit 1.1
-http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
-See the zlib home page http://www.cdrom.com/pub/infozip/zlib/ for details.
-
-A Perl interface to zlib written by Paul Marquess <pmarquess@bfsec.bt.co.uk>
-is in the CPAN (Comprehensive Perl Archive Network) sites, such as:
-ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib*
-
-A Python interface to zlib written by A.M. Kuchling <amk@magnet.com>
-is available in Python 1.5 and later versions, see
-http://www.python.org/doc/lib/module-zlib.html
-
-A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com>
-is availlable at http://www.westend.com/~kupries/doc/trf/man/man.html
-
-An experimental package to read and write files in .zip format,
-written on top of zlib by Gilles Vollant <info@winimage.com>, is
-available at http://www.winimage.com/zLibDll/unzip.html
-and also in the contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- To build a Windows DLL version, include in a DLL project zlib.def, zlib.rc
-  and all .c files except example.c and minigzip.c; compile with -DZLIB_DLL
-  The zlib DLL support was initially done by Alessandro Iacopetti and is
-  now maintained by Gilles Vollant <info@winimage.com>. Check the zlib DLL
-  home page at http://www.winimage.com/zLibDll
-
-  From Visual Basic, you can call the DLL functions which do not take
-  a structure as argument: compress, uncompress and all gz* functions.
-  See contrib/visual-basic.txt for more information, or get
-  http://www.tcfb.com/dowseware/cmp-z-it.zip
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization.
-  With -O, one libpng test fails. The test works in 32 bit mode (with
-  the -n32 compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1   
-  it works when compiled with cc.
-
-- on Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1
-  is necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works
-  with other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
-
-- For Turbo C the small model is supported only with reduced performance to
-  avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
-
-- For PalmOs, see http://www.cs.uit.no/~perm/PASTA/pilot/software.html
-  Per Harald Myrvang <perm@stud.cs.uit.no>
-
-
-Acknowledgments:
-
-  The deflate format used by zlib was defined by Phil Katz. The deflate
-  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
-  people who reported problems and suggested various improvements in zlib;
-  they are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
-  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.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not*
-receiving lengthy legal documents to sign. The sources are provided
-for free but without warranty of any kind.  The library has been
-entirely written by Jean-loup Gailly and Mark Adler; it does not
-include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include
-in the file ChangeLog history information documenting your changes.
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/doc/algorithm.doc b/jdk/src/share/native/java/util/zip/zlib-1.1.3/doc/algorithm.doc
deleted file mode 100644
index cdc830b5deb..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/doc/algorithm.doc
+++ /dev/null
@@ -1,213 +0,0 @@
-1. Compression algorithm (deflate)
-
-The deflation algorithm used by gzip (also zip and zlib) is a variation of
-LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in
-the input data.  The second occurrence of a string is replaced by a
-pointer to the previous string, in the form of a pair (distance,
-length).  Distances are limited to 32K bytes, and lengths are limited
-to 258 bytes. When a string does not occur anywhere in the previous
-32K bytes, it is emitted as a sequence of literal bytes.  (In this
-description, `string' must be taken as an arbitrary sequence of bytes,
-and is not restricted to printable characters.)
-
-Literals or match lengths are compressed with one Huffman tree, and
-match distances are compressed with another tree. The trees are stored
-in a compact form at the start of each block. The blocks can have any
-size (except that the compressed data for one block must fit in
-available memory). A block is terminated when deflate() determines that
-it would be useful to start another block with fresh trees. (This is
-somewhat similar to the behavior of LZW-based _compress_.)
-
-Duplicated strings are found using a hash table. All input strings of
-length 3 are inserted in the hash table. A hash index is computed for
-the next 3 bytes. If the hash chain for this index is not empty, all
-strings in the chain are compared with the current input string, and
-the longest match is selected.
-
-The hash chains are searched starting with the most recent strings, to
-favor small distances and thus take advantage of the Huffman encoding.
-The hash chains are singly linked. There are no deletions from the
-hash chains, the algorithm simply discards matches that are too old.
-
-To avoid a worst-case situation, very long hash chains are arbitrarily
-truncated at a certain length, determined by a runtime option (level
-parameter of deflateInit). So deflate() does not always find the longest
-possible match but generally finds a match which is long enough.
-
-deflate() also defers the selection of matches with a lazy evaluation
-mechanism. After a match of length N has been found, deflate() searches for
-a longer match at the next input byte. If a longer match is found, the
-previous match is truncated to a length of one (thus producing a single
-literal byte) and the process of lazy evaluation begins again. Otherwise,
-the original match is kept, and the next match search is attempted only N
-steps later.
-
-The lazy match evaluation is also subject to a runtime parameter. If
-the current match is long enough, deflate() reduces the search for a longer
-match, thus speeding up the whole process. If compression ratio is more
-important than speed, deflate() attempts a complete second search even if
-the first match is already long enough.
-
-The lazy match evaluation is not performed for the fastest compression
-modes (level parameter 1 to 3). For these fast modes, new strings
-are inserted in the hash table only when no match was found, or
-when the match is not too long. This degrades the compression ratio
-but saves time since there are both fewer insertions and fewer searches.
-
-
-2. Decompression algorithm (inflate)
-
-2.1 Introduction
-
-The real question is, given a Huffman tree, how to decode fast.  The most
-important realization is that shorter codes are much more common than
-longer codes, so pay attention to decoding the short codes fast, and let
-the long codes take longer to decode.
-
-inflate() sets up a first level table that covers some number of bits of
-input less than the length of longest code.  It gets that many bits from the
-stream, and looks it up in the table.  The table will tell if the next
-code is that many bits or less and how many, and if it is, it will tell
-the value, else it will point to the next level table for which inflate()
-grabs more bits and tries to decode a longer code.
-
-How many bits to make the first lookup is a tradeoff between the time it
-takes to decode and the time it takes to build the table.  If building the
-table took no time (and if you had infinite memory), then there would only
-be a first level table to cover all the way to the longest code.  However,
-building the table ends up taking a lot longer for more bits since short
-codes are replicated many times in such a table.  What inflate() does is
-simply to make the number of bits in the first table a variable, and set it
-for the maximum speed.
-
-inflate() sends new trees relatively often, so it is possibly set for a
-smaller first level table than an application that has only one tree for
-all the data.  For inflate, which has 286 possible codes for the
-literal/length tree, the size of the first table is nine bits.  Also the
-distance trees have 30 possible values, and the size of the first table is
-six bits.  Note that for each of those cases, the table ended up one bit
-longer than the ``average'' code length, i.e. the code length of an
-approximately flat code which would be a little more than eight bits for
-286 symbols and a little less than five bits for 30 symbols.  It would be
-interesting to see if optimizing the first level table for other
-applications gave values within a bit or two of the flat code size.
-
-
-2.2 More details on the inflate table lookup
-
-Ok, you want to know what this cleverly obfuscated inflate tree actually  
-looks like.  You are correct that it's not a Huffman tree.  It is simply a  
-lookup table for the first, let's say, nine bits of a Huffman symbol.  The  
-symbol could be as short as one bit or as long as 15 bits.  If a particular  
-symbol is shorter than nine bits, then that symbol's translation is duplicated
-in all those entries that start with that symbol's bits.  For example, if the  
-symbol is four bits, then it's duplicated 32 times in a nine-bit table.  If a  
-symbol is nine bits long, it appears in the table once.
-
-If the symbol is longer than nine bits, then that entry in the table points  
-to another similar table for the remaining bits.  Again, there are duplicated  
-entries as needed.  The idea is that most of the time the symbol will be short
-and there will only be one table look up.  (That's whole idea behind data  
-compression in the first place.)  For the less frequent long symbols, there  
-will be two lookups.  If you had a compression method with really long  
-symbols, you could have as many levels of lookups as is efficient.  For  
-inflate, two is enough.
-
-So a table entry either points to another table (in which case nine bits in  
-the above example are gobbled), or it contains the translation for the symbol  
-and the number of bits to gobble.  Then you start again with the next  
-ungobbled bit.
-
-You may wonder: why not just have one lookup table for how ever many bits the  
-longest symbol is?  The reason is that if you do that, you end up spending  
-more time filling in duplicate symbol entries than you do actually decoding.   
-At least for deflate's output that generates new trees every several 10's of  
-kbytes.  You can imagine that filling in a 2^15 entry table for a 15-bit code  
-would take too long if you're only decoding several thousand symbols.  At the  
-other extreme, you could make a new table for every bit in the code.  In fact,
-that's essentially a Huffman tree.  But then you spend two much time  
-traversing the tree while decoding, even for short symbols.
-
-So the number of bits for the first lookup table is a trade of the time to  
-fill out the table vs. the time spent looking at the second level and above of
-the table.
-
-Here is an example, scaled down:
-
-The code being decoded, with 10 symbols, from 1 to 6 bits long:
-
-A: 0
-B: 10
-C: 1100
-D: 11010
-E: 11011
-F: 11100
-G: 11101
-H: 11110
-I: 111110
-J: 111111
-
-Let's make the first table three bits long (eight entries):
-
-000: A,1
-001: A,1
-010: A,1
-011: A,1
-100: B,2
-101: B,2
-110: -> table X (gobble 3 bits)
-111: -> table Y (gobble 3 bits)
-
-Each entry is what the bits decode to and how many bits that is, i.e. how  
-many bits to gobble.  Or the entry points to another table, with the number of
-bits to gobble implicit in the size of the table.
-
-Table X is two bits long since the longest code starting with 110 is five bits
-long:
-
-00: C,1
-01: C,1
-10: D,2
-11: E,2
-
-Table Y is three bits long since the longest code starting with 111 is six  
-bits long:
-
-000: F,2
-001: F,2
-010: G,2
-011: G,2
-100: H,2
-101: H,2
-110: I,3
-111: J,3
-
-So what we have here are three tables with a total of 20 entries that had to  
-be constructed.  That's compared to 64 entries for a single table.  Or  
-compared to 16 entries for a Huffman tree (six two entry tables and one four  
-entry table).  Assuming that the code ideally represents the probability of  
-the symbols, it takes on the average 1.25 lookups per symbol.  That's compared
-to one lookup for the single table, or 1.66 lookups per symbol for the  
-Huffman tree.
-
-There, I think that gives you a picture of what's going on.  For inflate, the  
-meaning of a particular symbol is often more than just a letter.  It can be a  
-byte (a "literal"), or it can be either a length or a distance which  
-indicates a base value and a number of bits to fetch after the code that is  
-added to the base value.  Or it might be the special end-of-block code.  The  
-data structures created in inftrees.c try to encode all that information  
-compactly in the tables.
-
-
-Jean-loup Gailly        Mark Adler
-jloup@gzip.org          madler@alumni.caltech.edu
-
-
-References:
-
-[LZ77] Ziv J., Lempel A., ``A Universal Algorithm for Sequential Data
-Compression,'' IEEE Transactions on Information Theory, Vol. 23, No. 3,
-pp. 337-343.
-
-``DEFLATE Compressed Data Format Specification'' available in
-ftp://ds.internic.net/rfc/rfc1951.txt
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/example.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/example.c
deleted file mode 100644
index d547fb8f07a..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/example.c
+++ /dev/null
@@ -1,584 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include <stdio.h>
-#include "zlib.h"
-
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#else
-   extern void exit  OF((int));
-#endif
-
-#if defined(VMS) || defined(RISCOS)
-#  define TESTFILE "foo-gz"
-#else
-#  define TESTFILE "foo.gz"
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-const char hello[] = "hello, hello!";
-/* "hello world" would be more standard, but the repeated "hello"
- * stresses the compression code better, sorry...
- */
-
-const char dictionary[] = "hello";
-uLong dictId; /* Adler32 value of the dictionary */
-
-void test_compress      OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_gzio          OF((const char *out, const char *in,
-                            Byte *uncompr, int uncomprLen));
-void test_deflate       OF((Byte *compr, uLong comprLen));
-void test_inflate       OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_large_deflate OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_large_inflate OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_flush         OF((Byte *compr, uLong *comprLen));
-void test_sync          OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-void test_dict_deflate  OF((Byte *compr, uLong comprLen));
-void test_dict_inflate  OF((Byte *compr, uLong comprLen,
-                            Byte *uncompr, uLong uncomprLen));
-int  main               OF((int argc, char *argv[]));
-
-/* ===========================================================================
- * Test compress() and uncompress()
- */
-void test_compress(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    uLong len = strlen(hello)+1;
-
-    err = compress(compr, &comprLen, (const Bytef*)hello, len);
-    CHECK_ERR(err, "compress");
-
-    strcpy((char*)uncompr, "garbage");
-
-    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
-    CHECK_ERR(err, "uncompress");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad uncompress\n");
-        exit(1);
-    } else {
-        printf("uncompress(): %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Test read/write of .gz files
- */
-void test_gzio(out, in, uncompr, uncomprLen)
-    const char *out; /* compressed output file */
-    const char *in;  /* compressed input file */
-    Byte *uncompr;
-    int  uncomprLen;
-{
-    int err;
-    int len = strlen(hello)+1;
-    gzFile file;
-    z_off_t pos;
-
-    file = gzopen(out, "wb");
-    if (file == NULL) {
-        fprintf(stderr, "gzopen error\n");
-        exit(1);
-    }
-    gzputc(file, 'h');
-    if (gzputs(file, "ello") != 4) {
-        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
-        exit(1);
-    }
-    if (gzprintf(file, ", %s!", "hello") != 8) {
-        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
-        exit(1);
-    }
-    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
-    gzclose(file);
-
-    file = gzopen(in, "rb");
-    if (file == NULL) {
-        fprintf(stderr, "gzopen error\n");
-    }
-    strcpy((char*)uncompr, "garbage");
-
-    uncomprLen = gzread(file, uncompr, (unsigned)uncomprLen);
-    if (uncomprLen != len) {
-        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
-        exit(1);
-    }
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
-        exit(1);
-    } else {
-        printf("gzread(): %s\n", (char *)uncompr);
-    }
-
-    pos = gzseek(file, -8L, SEEK_CUR);
-    if (pos != 6 || gztell(file) != pos) {
-        fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
-                (long)pos, (long)gztell(file));
-        exit(1);
-    }
-
-    if (gzgetc(file) != ' ') {
-        fprintf(stderr, "gzgetc error\n");
-        exit(1);
-    }
-
-    gzgets(file, (char*)uncompr, uncomprLen);
-    uncomprLen = strlen((char*)uncompr);
-    if (uncomprLen != 6) { /* "hello!" */
-        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
-        exit(1);
-    }
-    if (strcmp((char*)uncompr, hello+7)) {
-        fprintf(stderr, "bad gzgets after gzseek\n");
-        exit(1);
-    } else {
-        printf("gzgets() after gzseek: %s\n", (char *)uncompr);
-    }
-
-    gzclose(file);
-}
-
-/* ===========================================================================
- * Test deflate() with small buffers
- */
-void test_deflate(compr, comprLen)
-    Byte *compr;
-    uLong comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-    int len = strlen(hello)+1;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (Bytef*)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != (uLong)len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = deflate(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = deflate(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with small buffers
- */
-void test_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 0;
-    d_stream.next_out = uncompr;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
-        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "inflate");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad inflate\n");
-        exit(1);
-    } else {
-        printf("inflate(): %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Test deflate() with large buffers and dynamic change of compression level
- */
-void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_BEST_SPEED);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    /* At this point, uncompr is still mostly zeroes, so it should compress
-     * very well:
-     */
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (uInt)uncomprLen;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-    if (c_stream.avail_in != 0) {
-        fprintf(stderr, "deflate not greedy\n");
-        exit(1);
-    }
-
-    /* Feed in already compressed data and switch to no compression: */
-    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-    c_stream.next_in = compr;
-    c_stream.avail_in = (uInt)comprLen/2;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    /* Switch back to compressing mode: */
-    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (uInt)uncomprLen;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate should report Z_STREAM_END\n");
-        exit(1);
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with large buffers
- */
-void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uInt)comprLen;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    for (;;) {
-        d_stream.next_out = uncompr;            /* discard the output */
-        d_stream.avail_out = (uInt)uncomprLen;
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "large inflate");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
-        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
-        exit(1);
-    } else {
-        printf("large_inflate(): OK\n");
-    }
-}
-
-/* ===========================================================================
- * Test deflate() with full flush
- */
-void test_flush(compr, comprLen)
-    Byte *compr;
-    uLong *comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-    int len = strlen(hello)+1;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (Bytef*)hello;
-    c_stream.next_out = compr;
-    c_stream.avail_in = 3;
-    c_stream.avail_out = (uInt)*comprLen;
-    err = deflate(&c_stream, Z_FULL_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    compr[3]++; /* force an error in first compressed block */
-    c_stream.avail_in = len - 3;
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        CHECK_ERR(err, "deflate");
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    *comprLen = c_stream.total_out;
-}
-
-/* ===========================================================================
- * Test inflateSync()
- */
-void test_sync(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 2; /* just read the zlib header */
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uInt)uncomprLen;
-
-    inflate(&d_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "inflate");
-
-    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
-    err = inflateSync(&d_stream);           /* but skip the damaged part */
-    CHECK_ERR(err, "inflateSync");
-
-    err = inflate(&d_stream, Z_FINISH);
-    if (err != Z_DATA_ERROR) {
-        fprintf(stderr, "inflate should report DATA_ERROR\n");
-        /* Because of incorrect adler32 */
-        exit(1);
-    }
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    printf("after inflateSync(): hel%s\n", (char *)uncompr);
-}
-
-/* ===========================================================================
- * Test deflate() with preset dictionary
- */
-void test_dict_deflate(compr, comprLen)
-    Byte *compr;
-    uLong comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    err = deflateSetDictionary(&c_stream,
-                               (const Bytef*)dictionary, sizeof(dictionary));
-    CHECK_ERR(err, "deflateSetDictionary");
-
-    dictId = c_stream.adler;
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    c_stream.next_in = (Bytef*)hello;
-    c_stream.avail_in = (uInt)strlen(hello)+1;
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate should report Z_STREAM_END\n");
-        exit(1);
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with a preset dictionary
- */
-void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uInt)comprLen;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uInt)uncomprLen;
-
-    for (;;) {
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        if (err == Z_NEED_DICT) {
-            if (d_stream.adler != dictId) {
-                fprintf(stderr, "unexpected dictionary");
-                exit(1);
-            }
-            err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
-                                       sizeof(dictionary));
-        }
-        CHECK_ERR(err, "inflate with dict");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad inflate with dict\n");
-        exit(1);
-    } else {
-        printf("inflate with dictionary: %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Usage:  example [output.gz  [input.gz]]
- */
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    Byte *compr, *uncompr;
-    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
-    uLong uncomprLen = comprLen;
-    static const char* myVersion = ZLIB_VERSION;
-
-    if (zlibVersion()[0] != myVersion[0]) {
-        fprintf(stderr, "incompatible zlib version\n");
-        exit(1);
-
-    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
-        fprintf(stderr, "warning: different zlib version\n");
-    }
-
-    compr    = (Byte*)calloc((uInt)comprLen, 1);
-    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
-    /* compr and uncompr are cleared to avoid reading uninitialized
-     * data and to ensure that uncompr compresses well.
-     */
-    if (compr == Z_NULL || uncompr == Z_NULL) {
-        printf("out of memory\n");
-        exit(1);
-    }
-    test_compress(compr, comprLen, uncompr, uncomprLen);
-
-    test_gzio((argc > 1 ? argv[1] : TESTFILE),
-              (argc > 2 ? argv[2] : TESTFILE),
-              uncompr, (int)uncomprLen);
-
-    test_deflate(compr, comprLen);
-    test_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
-    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_flush(compr, &comprLen);
-    test_sync(compr, comprLen, uncompr, uncomprLen);
-    comprLen = uncomprLen;
-
-    test_dict_deflate(compr, comprLen);
-    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    exit(0);
-    return 0; /* to avoid warning */
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infblock.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/infblock.c
deleted file mode 100644
index 6faac062f27..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infblock.c
+++ /dev/null
@@ -1,437 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- */
-
-/*
- * 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 and, per its terms, should not be removed:
- *
- * infblock.c -- interpret and process block types to last block
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "infblock.h"
-#include "inftrees.h"
-#include "infcodes.h"
-#include "infutil.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* Table for deflate from PKZIP's appnote.txt. */
-local const uInt border[] = { /* Order of the bit length code lengths */
-        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-/*
-   Notes beyond the 1.93a appnote.txt:
-
-   1. Distance pointers never point before the beginning of the output
-      stream.
-   2. Distance pointers can point back across blocks, up to 32k away.
-   3. There is an implied maximum of 7 bits for the bit length table and
-      15 bits for the actual data.
-   4. If only one code exists, then it is encoded using one bit.  (Zero
-      would be more efficient, but perhaps a little confusing.)  If two
-      codes exist, they are coded using one bit each (0 and 1).
-   5. There is no way of sending zero distance codes--a dummy must be
-      sent if there are none.  (History: a pre 2.0 version of PKZIP would
-      store blocks with no distance codes, but this was discovered to be
-      too harsh a criterion.)  Valid only for 1.93a.  2.04c does allow
-      zero distance codes, which is sent as one code of zero bits in
-      length.
-   6. There are up to 286 literal/length codes.  Code 256 represents the
-      end-of-block.  Note however that the static length tree defines
-      288 codes just to fill out the Huffman codes.  Codes 286 and 287
-      cannot be used though, since there is no length base or extra bits
-      defined for them.  Similarily, there are up to 30 distance codes.
-      However, static trees define 32 codes (all 5 bits) to fill out the
-      Huffman codes, but the last two had better not show up in the data.
-   7. Unzip can check dynamic Huffman blocks for complete code sets.
-      The exception is that a single code would not be complete (see #4).
-   8. The five bits following the block type is really the number of
-      literal codes sent minus 257.
-   9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
-      (1+6+6).  Therefore, to output three times the length, you output
-      three codes (1+1+1), whereas to output four times the same length,
-      you only need two codes (1+3).  Hmm.
-  10. In the tree reconstruction algorithm, Code = Code + Increment
-      only if BitLength(i) is not zero.  (Pretty obvious.)
-  11. Correction: 4 Bits: # of Bit Length codes - 4     (4 - 19)
-  12. Note: length code 284 can represent 227-258, but length code 285
-      really is 258.  The last length deserves its own, short code
-      since it gets used a lot in very redundant files.  The length
-      258 is special since 258 - 3 (the min match length) is 255.
-  13. The literal/length and distance code bit lengths are read as a
-      single stream of lengths.  It is possible (and advantageous) for
-      a repeat code (16, 17, or 18) to go across the boundary between
-      the two sets of lengths.
- */
-
-
-void inflate_blocks_reset(s, z, c)
-inflate_blocks_statef *s;
-z_streamp z;
-uLongf *c;
-{
-  if (c != Z_NULL)
-    *c = s->check;
-  if (s->mode == BTREE || s->mode == DTREE)
-    ZFREE(z, s->sub.trees.blens);
-  if (s->mode == CODES)
-    inflate_codes_free(s->sub.decode.codes, z);
-  s->mode = TYPE;
-  s->bitk = 0;
-  s->bitb = 0;
-  s->read = s->write = s->window;
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0);
-  Tracev((stderr, "inflate:   blocks reset\n"));
-}
-
-
-inflate_blocks_statef *inflate_blocks_new(z, c, w)
-z_streamp z;
-check_func c;
-uInt w;
-{
-  inflate_blocks_statef *s;
-
-  if ((s = (inflate_blocks_statef *)ZALLOC
-       (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
-    return s;
-  if ((s->hufts =
-       (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
-  {
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
-  {
-    ZFREE(z, s->hufts);
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  s->end = s->window + w;
-  s->checkfn = c;
-  s->mode = TYPE;
-  Tracev((stderr, "inflate:   blocks allocated\n"));
-  inflate_blocks_reset(s, z, Z_NULL);
-  return s;
-}
-
-
-int inflate_blocks(s, z, r)
-inflate_blocks_statef *s;
-z_streamp z;
-int r;
-{
-  uInt t;               /* temporary storage */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input based on current state */
-  while (1) switch (s->mode)
-  {
-    case TYPE:
-      NEEDBITS(3)
-      t = (uInt)b & 7;
-      s->last = t & 1;
-      switch (t >> 1)
-      {
-        case 0:                         /* stored */
-          Tracev((stderr, "inflate:     stored block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          t = k & 7;                    /* go to byte boundary */
-          DUMPBITS(t)
-          s->mode = LENS;               /* get length of stored block */
-          break;
-        case 1:                         /* fixed */
-          Tracev((stderr, "inflate:     fixed codes block%s\n",
-                 s->last ? " (last)" : ""));
-          {
-            uInt bl, bd;
-            inflate_huft *tl, *td;
-
-            inflate_trees_fixed(&bl, &bd, &tl, &td, z);
-            s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
-            if (s->sub.decode.codes == Z_NULL)
-            {
-              r = Z_MEM_ERROR;
-              LEAVE
-            }
-          }
-          DUMPBITS(3)
-          s->mode = CODES;
-          break;
-        case 2:                         /* dynamic */
-          Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          s->mode = TABLE;
-          break;
-        case 3:                         /* illegal */
-          DUMPBITS(3)
-          s->mode = BAD;
-          z->msg = (char*)"invalid block type";
-          r = Z_DATA_ERROR;
-          LEAVE
-      }
-      break;
-    case LENS:
-      NEEDBITS(32)
-      if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
-      {
-        s->mode = BAD;
-        z->msg = (char*)"invalid stored block lengths";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-      s->sub.left = (uInt)b & 0xffff;
-      b = k = 0;                      /* dump bits */
-      Tracev((stderr, "inflate:       stored length %u\n", s->sub.left));
-      s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
-      break;
-    case STORED:
-      if (n == 0)
-        LEAVE
-      NEEDOUT
-      t = s->sub.left;
-      if (t > n) t = n;
-      if (t > m) t = m;
-      zmemcpy(q, p, t);
-      p += t;  n -= t;
-      q += t;  m -= t;
-      if ((s->sub.left -= t) != 0)
-        break;
-      Tracev((stderr, "inflate:       stored end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      s->mode = s->last ? DRY : TYPE;
-      break;
-    case TABLE:
-      NEEDBITS(14)
-      s->sub.trees.table = t = (uInt)b & 0x3fff;
-#ifndef PKZIP_BUG_WORKAROUND
-      if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
-      {
-        s->mode = BAD;
-        z->msg = (char*)"too many length or distance symbols";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-#endif
-      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
-      if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
-      {
-        r = Z_MEM_ERROR;
-        LEAVE
-      }
-      DUMPBITS(14)
-      s->sub.trees.index = 0;
-      Tracev((stderr, "inflate:       table sizes ok\n"));
-      s->mode = BTREE;
-    case BTREE:
-      while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
-      {
-        NEEDBITS(3)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
-        DUMPBITS(3)
-      }
-      while (s->sub.trees.index < 19)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
-      s->sub.trees.bb = 7;
-      t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
-                             &s->sub.trees.tb, s->hufts, z);
-      if (t != Z_OK)
-      {
-
-        r = t;
-        if (r == Z_DATA_ERROR)
-        {
-          ZFREE(z, s->sub.trees.blens);
-          s->mode = BAD;
-        }
-        LEAVE
-      }
-      s->sub.trees.index = 0;
-      Tracev((stderr, "inflate:       bits tree ok\n"));
-      s->mode = DTREE;
-    case DTREE:
-      while (t = s->sub.trees.table,
-             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
-      {
-        inflate_huft *h;
-        uInt i, j, c;
-
-        t = s->sub.trees.bb;
-        NEEDBITS(t)
-        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
-        t = h->bits;
-        c = h->base;
-        if (c < 16)
-        {
-          DUMPBITS(t)
-          s->sub.trees.blens[s->sub.trees.index++] = c;
-        }
-        else /* c == 16..18 */
-        {
-          i = c == 18 ? 7 : c - 14;
-          j = c == 18 ? 11 : 3;
-          NEEDBITS(t + i)
-          DUMPBITS(t)
-          j += (uInt)b & inflate_mask[i];
-          DUMPBITS(i)
-          i = s->sub.trees.index;
-          t = s->sub.trees.table;
-          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
-              (c == 16 && i < 1))
-          {
-            ZFREE(z, s->sub.trees.blens);
-            s->mode = BAD;
-            z->msg = (char*)"invalid bit length repeat";
-            r = Z_DATA_ERROR;
-            LEAVE
-          }
-          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
-          do {
-            s->sub.trees.blens[i++] = c;
-          } while (--j);
-          s->sub.trees.index = i;
-        }
-      }
-      s->sub.trees.tb = Z_NULL;
-      {
-        uInt bl, bd;
-        inflate_huft *tl, *td;
-        inflate_codes_statef *c;
-
-        bl = 9;         /* must be <= 9 for lookahead assumptions */
-        bd = 6;         /* must be <= 9 for lookahead assumptions */
-        t = s->sub.trees.table;
-        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
-                                  s->sub.trees.blens, &bl, &bd, &tl, &td,
-                                  s->hufts, z);
-
-        if (t != Z_OK)
-        {
-          if (t == (uInt)Z_DATA_ERROR)
-          {
-              ZFREE(z, s->sub.trees.blens);
-              s->mode = BAD;
-          }
-          r = t;
-          LEAVE
-        }
-        Tracev((stderr, "inflate:       trees ok\n"));
-        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
-        {
-          r = Z_MEM_ERROR;
-          LEAVE
-        }
-        s->sub.decode.codes = c;
-      }
-      ZFREE(z, s->sub.trees.blens);
-      s->mode = CODES;
-    case CODES:
-      UPDATE
-      if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
-        return inflate_flush(s, z, r);
-      r = Z_OK;
-      inflate_codes_free(s->sub.decode.codes, z);
-      LOAD
-      Tracev((stderr, "inflate:       codes end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      if (!s->last)
-      {
-        s->mode = TYPE;
-        break;
-      }
-      s->mode = DRY;
-    case DRY:
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      s->mode = DONE;
-    case DONE:
-      r = Z_STREAM_END;
-      LEAVE
-    case BAD:
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-}
-
-
-int inflate_blocks_free(s, z)
-inflate_blocks_statef *s;
-z_streamp z;
-{
-  inflate_blocks_reset(s, z, Z_NULL);
-  ZFREE(z, s->window);
-  ZFREE(z, s->hufts);
-  ZFREE(z, s);
-  Tracev((stderr, "inflate:   blocks freed\n"));
-  return Z_OK;
-}
-
-
-void inflate_set_dictionary(s, d, n)
-inflate_blocks_statef *s;
-const Bytef *d;
-uInt  n;
-{
-  zmemcpy(s->window, d, n);
-  s->read = s->write = s->window + n;
-}
-
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH.
- * IN assertion: s != Z_NULL
- */
-int inflate_blocks_sync_point(s)
-inflate_blocks_statef *s;
-{
-  return s->mode == LENS;
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infblock.h b/jdk/src/share/native/java/util/zip/zlib-1.1.3/infblock.h
deleted file mode 100644
index aa34602dff0..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infblock.h
+++ /dev/null
@@ -1,69 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * infblock.h -- header to use infblock.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-struct inflate_blocks_state;
-typedef struct inflate_blocks_state FAR inflate_blocks_statef;
-
-extern inflate_blocks_statef * inflate_blocks_new OF((
-    z_streamp z,
-    check_func c,               /* check function */
-    uInt w));                   /* window size */
-
-extern int inflate_blocks OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));                      /* initial return code */
-
-extern void inflate_blocks_reset OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    uLongf *));                  /* check value on output */
-
-extern int inflate_blocks_free OF((
-    inflate_blocks_statef *,
-    z_streamp));
-
-extern void inflate_set_dictionary OF((
-    inflate_blocks_statef *s,
-    const Bytef *d,  /* dictionary */
-    uInt  n));       /* dictionary length */
-
-extern int inflate_blocks_sync_point OF((
-    inflate_blocks_statef *s));
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infcodes.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/infcodes.c
deleted file mode 100644
index ea561946304..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infcodes.c
+++ /dev/null
@@ -1,287 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "infblock.h"
-#include "infcodes.h"
-#include "infutil.h"
-#include "inffast.h"
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-typedef enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-      START,    /* x: set up for LEN */
-      LEN,      /* i: get length/literal/eob next */
-      LENEXT,   /* i: getting length extra (have base) */
-      DIST,     /* i: get distance next */
-      DISTEXT,  /* i: getting distance extra */
-      COPY,     /* o: copying bytes in window, waiting for space */
-      LIT,      /* o: got literal, waiting for output space */
-      WASH,     /* o: got eob, possibly still output waiting */
-      END,      /* x: got eob and all data flushed */
-      BADCODE}  /* x: got error */
-inflate_codes_mode;
-
-/* inflate codes private state */
-struct inflate_codes_state {
-
-  /* mode */
-  inflate_codes_mode mode;      /* current inflate_codes mode */
-
-  /* mode dependent information */
-  uInt len;
-  union {
-    struct {
-      inflate_huft *tree;       /* pointer into tree */
-      uInt need;                /* bits needed */
-    } code;             /* if LEN or DIST, where in tree */
-    uInt lit;           /* if LIT, literal */
-    struct {
-      uInt get;                 /* bits to get for extra */
-      uInt dist;                /* distance back to copy from */
-    } copy;             /* if EXT or COPY, where and how much */
-  } sub;                /* submode */
-
-  /* mode independent information */
-  Byte lbits;           /* ltree bits decoded per branch */
-  Byte dbits;           /* dtree bits decoder per branch */
-  inflate_huft *ltree;          /* literal/length/eob tree */
-  inflate_huft *dtree;          /* distance tree */
-
-};
-
-
-inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
-uInt bl, bd;
-inflate_huft *tl;
-inflate_huft *td; /* need separate declaration for Borland C++ */
-z_streamp z;
-{
-  inflate_codes_statef *c;
-
-  if ((c = (inflate_codes_statef *)
-       ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
-  {
-    c->mode = START;
-    c->lbits = (Byte)bl;
-    c->dbits = (Byte)bd;
-    c->ltree = tl;
-    c->dtree = td;
-    Tracev((stderr, "inflate:       codes new\n"));
-  }
-  return c;
-}
-
-
-int inflate_codes(s, z, r)
-inflate_blocks_statef *s;
-z_streamp z;
-int r;
-{
-  uInt j;               /* temporary storage */
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  Bytef *f;             /* pointer to copy strings from */
-  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input and output based on current state */
-  while (1) switch (c->mode)
-  {             /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-    case START:         /* x: set up for LEN */
-#ifndef SLOW
-      if (m >= 258 && n >= 10)
-      {
-        UPDATE
-        r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
-        LOAD
-        if (r != Z_OK)
-        {
-          c->mode = r == Z_STREAM_END ? WASH : BADCODE;
-          break;
-        }
-      }
-#endif /* !SLOW */
-      c->sub.code.need = c->lbits;
-      c->sub.code.tree = c->ltree;
-      c->mode = LEN;
-    case LEN:           /* i: get length/literal/eob next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e == 0)               /* literal */
-      {
-        c->sub.lit = t->base;
-        Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                 "inflate:         literal '%c'\n" :
-                 "inflate:         literal 0x%02x\n", t->base));
-        c->mode = LIT;
-        break;
-      }
-      if (e & 16)               /* length */
-      {
-        c->sub.copy.get = e & 15;
-        c->len = t->base;
-        c->mode = LENEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      if (e & 32)               /* end of block */
-      {
-        Tracevv((stderr, "inflate:         end of block\n"));
-        c->mode = WASH;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid literal/length code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case LENEXT:        /* i: getting length extra (have base) */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->len += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      c->sub.code.need = c->dbits;
-      c->sub.code.tree = c->dtree;
-      Tracevv((stderr, "inflate:         length %u\n", c->len));
-      c->mode = DIST;
-    case DIST:          /* i: get distance next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e & 16)               /* distance */
-      {
-        c->sub.copy.get = e & 15;
-        c->sub.copy.dist = t->base;
-        c->mode = DISTEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid distance code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case DISTEXT:       /* i: getting distance extra */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->sub.copy.dist += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
-      c->mode = COPY;
-    case COPY:          /* o: copying bytes in window, waiting for space */
-#ifndef __TURBOC__ /* Turbo C bug for following expression */
-      f = (uInt)(q - s->window) < c->sub.copy.dist ?
-          s->end - (c->sub.copy.dist - (q - s->window)) :
-          q - c->sub.copy.dist;
-#else
-      f = q - c->sub.copy.dist;
-      if ((uInt)(q - s->window) < c->sub.copy.dist)
-        f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
-#endif
-      while (c->len)
-      {
-        NEEDOUT
-        OUTBYTE(*f++)
-        if (f == s->end)
-          f = s->window;
-        c->len--;
-      }
-      c->mode = START;
-      break;
-    case LIT:           /* o: got literal, waiting for output space */
-      NEEDOUT
-      OUTBYTE(c->sub.lit)
-      c->mode = START;
-      break;
-    case WASH:          /* o: got eob, possibly more output */
-      if (k > 7)        /* return unused byte, if any */
-      {
-        Assert(k < 16, "inflate_codes grabbed too many bytes")
-        k -= 8;
-        n++;
-        p--;            /* can always return one */
-      }
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      c->mode = END;
-    case END:
-      r = Z_STREAM_END;
-      LEAVE
-    case BADCODE:       /* x: got error */
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-}
-
-
-void inflate_codes_free(c, z)
-inflate_codes_statef *c;
-z_streamp z;
-{
-  ZFREE(z, c);
-  Tracev((stderr, "inflate:       codes free\n"));
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infcodes.h b/jdk/src/share/native/java/util/zip/zlib-1.1.3/infcodes.h
deleted file mode 100644
index 5be6a1cc7e5..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infcodes.h
+++ /dev/null
@@ -1,56 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * infcodes.h -- header to use infcodes.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-struct inflate_codes_state;
-typedef struct inflate_codes_state FAR inflate_codes_statef;
-
-extern inflate_codes_statef *inflate_codes_new OF((
-    uInt, uInt,
-    inflate_huft *, inflate_huft *,
-    z_streamp ));
-
-extern int inflate_codes OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-extern void inflate_codes_free OF((
-    inflate_codes_statef *,
-    z_streamp ));
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inffast.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/inffast.c
deleted file mode 100644
index 2d4f835fd5f..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inffast.c
+++ /dev/null
@@ -1,200 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * inffast.c -- process literals and length/distance pairs fast
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "infblock.h"
-#include "infcodes.h"
-#include "infutil.h"
-#include "inffast.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* macros for bit input with no checking and for returning unused bytes */
-#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}
-
-/* Called with number of bytes left to write in window at least 258
-   (the maximum string length) and number of input bytes available
-   at least ten.  The ten bytes are six bytes for the longest length/
-   distance pair plus four bytes for overloading the bit buffer. */
-
-int inflate_fast(bl, bd, tl, td, s, z)
-uInt bl, bd;
-inflate_huft *tl;
-inflate_huft *td; /* need separate declaration for Borland C++ */
-inflate_blocks_statef *s;
-z_streamp z;
-{
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  uInt ml;              /* mask for literal/length tree */
-  uInt md;              /* mask for distance tree */
-  uInt c;               /* bytes to copy */
-  uInt d;               /* distance back to copy from */
-  Bytef *r;             /* copy source pointer */
-
-  /* load input, output, bit values */
-  LOAD
-
-  /* initialize masks */
-  ml = inflate_mask[bl];
-  md = inflate_mask[bd];
-
-  /* do until not enough input or output space for fast loop */
-  do {                          /* assume called with m >= 258 && n >= 10 */
-    /* get literal/length code */
-    GRABBITS(20)                /* max bits for literal/length code */
-    if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
-    {
-      DUMPBITS(t->bits)
-      Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                "inflate:         * literal '%c'\n" :
-                "inflate:         * literal 0x%02x\n", t->base));
-      *q++ = (Byte)t->base;
-      m--;
-      continue;
-    }
-    do {
-      DUMPBITS(t->bits)
-      if (e & 16)
-      {
-        /* get extra bits for length */
-        e &= 15;
-        c = t->base + ((uInt)b & inflate_mask[e]);
-        DUMPBITS(e)
-        Tracevv((stderr, "inflate:         * length %u\n", c));
-
-        /* decode distance base of block to copy */
-        GRABBITS(15);           /* max bits for distance code */
-        e = (t = td + ((uInt)b & md))->exop;
-        do {
-          DUMPBITS(t->bits)
-          if (e & 16)
-          {
-            /* get extra bits to add to distance base */
-            e &= 15;
-            GRABBITS(e)         /* get extra bits (up to 13) */
-            d = t->base + ((uInt)b & inflate_mask[e]);
-            DUMPBITS(e)
-            Tracevv((stderr, "inflate:         * distance %u\n", d));
-
-            /* do the copy */
-            m -= c;
-            if ((uInt)(q - s->window) >= d)     /* offset before dest */
-            {                                   /*  just copy */
-              r = q - d;
-              *q++ = *r++;  c--;        /* minimum count is three, */
-              *q++ = *r++;  c--;        /*  so unroll loop a little */
-            }
-            else                        /* else offset after destination */
-            {
-              e = d - (uInt)(q - s->window); /* bytes from offset to end */
-              r = s->end - e;           /* pointer to offset */
-              if (c > e)                /* if source crosses, */
-              {
-                c -= e;                 /* copy to end of window */
-                do {
-                  *q++ = *r++;
-                } while (--e);
-                r = s->window;          /* copy rest from start of window */
-              }
-            }
-            do {                        /* copy all or what's left */
-              *q++ = *r++;
-            } while (--c);
-            break;
-          }
-          else if ((e & 64) == 0)
-          {
-            t += t->base;
-            e = (t += ((uInt)b & inflate_mask[e]))->exop;
-          }
-          else
-          {
-            z->msg = (char*)"invalid distance code";
-            UNGRAB
-            UPDATE
-            return Z_DATA_ERROR;
-          }
-        } while (1);
-        break;
-      }
-      if ((e & 64) == 0)
-      {
-        t += t->base;
-        if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0)
-        {
-          DUMPBITS(t->bits)
-          Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                    "inflate:         * literal '%c'\n" :
-                    "inflate:         * literal 0x%02x\n", t->base));
-          *q++ = (Byte)t->base;
-          m--;
-          break;
-        }
-      }
-      else if (e & 32)
-      {
-        Tracevv((stderr, "inflate:         * end of block\n"));
-        UNGRAB
-        UPDATE
-        return Z_STREAM_END;
-      }
-      else
-      {
-        z->msg = (char*)"invalid literal/length code";
-        UNGRAB
-        UPDATE
-        return Z_DATA_ERROR;
-      }
-    } while (1);
-  } while (m >= 258 && n >= 10);
-
-  /* not enough input or output--restore pointers and return */
-  UNGRAB
-  UPDATE
-  return Z_OK;
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inffixed.h b/jdk/src/share/native/java/util/zip/zlib-1.1.3/inffixed.h
deleted file mode 100644
index 988cb3733d1..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inffixed.h
+++ /dev/null
@@ -1,175 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/* inffixed.h -- table for decoding fixed codes
- * Generated automatically by the maketree.c program
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-local uInt fixed_bl = 9;
-local uInt fixed_bd = 5;
-local inflate_huft fixed_tl[] = {
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220},
-    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188},
-    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252},
-    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254},
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221},
-    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189},
-    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253},
-    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
-  };
-local inflate_huft fixed_td[] = {
-    {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
-    {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
-    {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},
-    {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577},
-    {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145},
-    {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577},
-    {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289},
-    {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577}
-  };
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inflate.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/inflate.c
deleted file mode 100644
index 4b6e3449d82..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inflate.c
+++ /dev/null
@@ -1,403 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- */
-
-/*
- * 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 and, per its terms, should not be removed:
- *
- * inflate.c -- zlib interface to inflate modules
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "infblock.h"
-
-struct inflate_blocks_state {int dummy;}; /* for buggy compilers */
-
-typedef enum {
-      METHOD,   /* waiting for method byte */
-      FLAG,     /* waiting for flag byte */
-      DICT4,    /* four dictionary check bytes to go */
-      DICT3,    /* three dictionary check bytes to go */
-      DICT2,    /* two dictionary check bytes to go */
-      DICT1,    /* one dictionary check byte to go */
-      DICT0,    /* waiting for inflateSetDictionary */
-      BLOCKS,   /* decompressing blocks */
-      CHECK4,   /* four check bytes to go */
-      CHECK3,   /* three check bytes to go */
-      CHECK2,   /* two check bytes to go */
-      CHECK1,   /* one check byte to go */
-      DONE,     /* finished check, done */
-      BAD}      /* got an error--stay here */
-inflate_mode;
-
-/* inflate private state */
-struct internal_state {
-
-  /* mode */
-  inflate_mode  mode;   /* current inflate mode */
-
-  /* mode dependent information */
-  union {
-    uInt method;        /* if FLAGS, method byte */
-    struct {
-      uLong was;                /* computed check value */
-      uLong need;               /* stream check value */
-    } check;            /* if CHECK, check values to compare */
-    uInt marker;        /* if BAD, inflateSync's marker bytes count */
-  } sub;        /* submode */
-
-  /* mode independent information */
-  int  nowrap;          /* flag for no wrapper */
-  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
-  inflate_blocks_statef
-    *blocks;            /* current inflate_blocks state */
-
-};
-
-
-int ZEXPORT inflateReset(z)
-z_streamp z;
-{
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->total_in = z->total_out = 0;
-  z->msg = Z_NULL;
-  z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
-  inflate_blocks_reset(z->state->blocks, z, Z_NULL);
-  Tracev((stderr, "inflate: reset\n"));
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateEnd(z)
-z_streamp z;
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->blocks != Z_NULL)
-    inflate_blocks_free(z->state->blocks, z);
-  ZFREE(z, z->state);
-  z->state = Z_NULL;
-  Tracev((stderr, "inflate: end\n"));
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateInit2_(z, w, version, stream_size)
-z_streamp z;
-int w;
-const char *version;
-int stream_size;
-{
-  if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-      stream_size != sizeof(z_stream))
-      return Z_VERSION_ERROR;
-
-  /* initialize state */
-  if (z == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->msg = Z_NULL;
-  if (z->zalloc == Z_NULL)
-  {
-    z->zalloc = zcalloc;
-    z->opaque = (voidpf)0;
-  }
-  if (z->zfree == Z_NULL) z->zfree = zcfree;
-  if ((z->state = (struct internal_state FAR *)
-       ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
-    return Z_MEM_ERROR;
-  z->state->blocks = Z_NULL;
-
-  /* handle undocumented nowrap option (no zlib header or check) */
-  z->state->nowrap = 0;
-  if (w < 0)
-  {
-    w = - w;
-    z->state->nowrap = 1;
-  }
-
-  /* set window size */
-  if (w < 8 || w > 15)
-  {
-    inflateEnd(z);
-    return Z_STREAM_ERROR;
-  }
-  z->state->wbits = (uInt)w;
-
-  /* create inflate_blocks state */
-  if ((z->state->blocks =
-      inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w))
-      == Z_NULL)
-  {
-    inflateEnd(z);
-    return Z_MEM_ERROR;
-  }
-  Tracev((stderr, "inflate: allocated\n"));
-
-  /* reset state */
-  inflateReset(z);
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateInit_(z, version, stream_size)
-z_streamp z;
-const char *version;
-int stream_size;
-{
-  return inflateInit2_(z, DEF_WBITS, version, stream_size);
-}
-
-
-#define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
-#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
-
-int ZEXPORT inflate(z, f)
-z_streamp z;
-int f;
-{
-  int r;
-  uInt b;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
-    return Z_STREAM_ERROR;
-  f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
-  r = Z_BUF_ERROR;
-  while (1) switch (z->state->mode)
-  {
-    case METHOD:
-      NEEDBYTE
-      if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"unknown compression method";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"invalid window size";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      z->state->mode = FLAG;
-    case FLAG:
-      NEEDBYTE
-      b = NEXTBYTE;
-      if (((z->state->sub.method << 8) + b) % 31)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"incorrect header check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev((stderr, "inflate: zlib header ok\n"));
-      if (!(b & PRESET_DICT))
-      {
-        z->state->mode = BLOCKS;
-        break;
-      }
-      z->state->mode = DICT4;
-    case DICT4:
-      NEEDBYTE
-      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
-      z->state->mode = DICT3;
-    case DICT3:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
-      z->state->mode = DICT2;
-    case DICT2:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
-      z->state->mode = DICT1;
-    case DICT1:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE;
-      z->adler = z->state->sub.check.need;
-      z->state->mode = DICT0;
-      return Z_NEED_DICT;
-    case DICT0:
-      z->state->mode = BAD;
-      z->msg = (char*)"need dictionary";
-      z->state->sub.marker = 0;       /* can try inflateSync */
-      return Z_STREAM_ERROR;
-    case BLOCKS:
-      r = inflate_blocks(z->state->blocks, z, r);
-      if (r == Z_DATA_ERROR)
-      {
-        z->state->mode = BAD;
-        z->state->sub.marker = 0;       /* can try inflateSync */
-        break;
-      }
-      if (r == Z_OK)
-        r = f;
-      if (r != Z_STREAM_END)
-        return r;
-      r = f;
-      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
-
-      /* zlib.h inflate() doc states that z->adler contains a checksum
-         of all uncompressed output even when returning Z_STREAM_END. */
-      z->adler = z->state->sub.check.was;
-
-      if (z->state->nowrap)
-      {
-        z->state->mode = DONE;
-        break;
-      }
-      z->state->mode = CHECK4;
-    case CHECK4:
-      NEEDBYTE
-      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
-      z->state->mode = CHECK3;
-    case CHECK3:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
-      z->state->mode = CHECK2;
-    case CHECK2:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
-      z->state->mode = CHECK1;
-    case CHECK1:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE;
-
-      if (z->state->sub.check.was != z->state->sub.check.need)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"incorrect data check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev((stderr, "inflate: zlib check ok\n"));
-      z->state->mode = DONE;
-    case DONE:
-      return Z_STREAM_END;
-    case BAD:
-      return Z_DATA_ERROR;
-    default:
-      return Z_STREAM_ERROR;
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-}
-
-
-int ZEXPORT inflateSetDictionary(z, dictionary, dictLength)
-z_streamp z;
-const Bytef *dictionary;
-uInt  dictLength;
-{
-  uInt length = dictLength;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0)
-    return Z_STREAM_ERROR;
-
-  if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
-  z->adler = 1L;
-
-  if (length >= ((uInt)1<<z->state->wbits))
-  {
-    length = (1<<z->state->wbits)-1;
-    dictionary += dictLength - length;
-  }
-  inflate_set_dictionary(z->state->blocks, dictionary, length);
-  z->state->mode = BLOCKS;
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateSync(z)
-z_streamp z;
-{
-  uInt n;       /* number of bytes to look at */
-  Bytef *p;     /* pointer to bytes */
-  uInt m;       /* number of marker bytes found in a row */
-  uLong r, w;   /* temporaries to save total_in and total_out */
-
-  /* set up */
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->mode != BAD)
-  {
-    z->state->mode = BAD;
-    z->state->sub.marker = 0;
-  }
-  if ((n = z->avail_in) == 0)
-    return Z_BUF_ERROR;
-  p = z->next_in;
-  m = z->state->sub.marker;
-
-  /* search */
-  while (n && m < 4)
-  {
-    static const Byte mark[4] = {0, 0, 0xff, 0xff};
-    if (*p == mark[m])
-      m++;
-    else if (*p)
-      m = 0;
-    else
-      m = 4 - m;
-    p++, n--;
-  }
-
-  /* restore */
-  z->total_in += p - z->next_in;
-  z->next_in = p;
-  z->avail_in = n;
-  z->state->sub.marker = m;
-
-  /* return no joy or set up to restart on a new block */
-  if (m != 4)
-    return Z_DATA_ERROR;
-  r = z->total_in;  w = z->total_out;
-  inflateReset(z);
-  z->total_in = r;  z->total_out = w;
-  z->state->mode = BLOCKS;
-  return Z_OK;
-}
-
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
- * implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
- * but removes the length bytes of the resulting empty stored block. When
- * decompressing, PPP checks that at the end of input packet, inflate is
- * waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(z)
-z_streamp z;
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
-    return Z_STREAM_ERROR;
-  return inflate_blocks_sync_point(z->state->blocks);
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c
deleted file mode 100644
index cc26dfa084b..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c
+++ /dev/null
@@ -1,487 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- */
-
-/*
- * 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 and, per its terms, should not be removed:
- *
- * inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#if !defined(BUILDFIXED) && !defined(STDC)
-#  define BUILDFIXED   /* non ANSI compilers may not accept inffixed.h */
-#endif
-
-const char inflate_copyright[] =
-   " inflate 1.1.3.f-jdk Copyright 1995-1998 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-struct internal_state  {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-
-local int huft_build OF((
-    uIntf *,            /* code lengths in bits */
-    uInt,               /* number of codes */
-    uInt,               /* number of "simple" codes */
-    const uIntf *,      /* list of base values for non-simple codes */
-    const uIntf *,      /* list of extra bits for non-simple codes */
-    inflate_huft * FAR*,/* result: starting table */
-    uIntf *,            /* maximum lookup bits (returns actual) */
-    inflate_huft *,     /* space for trees */
-    uInt *,             /* hufts used in space */
-    uIntf * ));         /* space for values */
-
-/* Tables for deflate from PKZIP's appnote.txt. */
-local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
-        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, 0, 0};
-        /* see note #13 above about 258 */
-local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
-        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, 112, 112}; /* 112==invalid */
-local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
-        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};
-local const uInt cpdext[30] = { /* Extra bits for distance codes */
-        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};
-
-/*
-   Huffman code decoding is performed using a multi-level table lookup.
-   The fastest way to decode is to simply build a lookup table whose
-   size is determined by the longest code.  However, the time it takes
-   to build this table can also be a factor if the data being decoded
-   is not very long.  The most common codes are necessarily the
-   shortest codes, so those codes dominate the decoding time, and hence
-   the speed.  The idea is you can have a shorter table that decodes the
-   shorter, more probable codes, and then point to subsidiary tables for
-   the longer codes.  The time it costs to decode the longer codes is
-   then traded against the time it takes to make longer tables.
-
-   This results of this trade are in the variables lbits and dbits
-   below.  lbits is the number of bits the first level table for literal/
-   length codes can decode in one step, and dbits is the same thing for
-   the distance codes.  Subsequent tables are also less than or equal to
-   those sizes.  These values may be adjusted either when all of the
-   codes are shorter than that, in which case the longest code length in
-   bits is used, or when the shortest code is *longer* than the requested
-   table size, in which case the length of the shortest code in bits is
-   used.
-
-   There are two different values for the two tables, since they code a
-   different number of possibilities each.  The literal/length table
-   codes 286 possible values, or in a flat code, a little over eight
-   bits.  The distance table codes 30 possible values, or a little less
-   than five bits, flat.  The optimum values for speed end up being
-   about one bit more than those, so lbits is 8+1 and dbits is 5+1.
-   The optimum values may differ though from machine to machine, and
-   possibly even between compilers.  Your mileage may vary.
- */
-
-
-/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
-#define BMAX 15         /* maximum bit length of any code */
-
-local int huft_build(b, n, s, d, e, t, m, hp, hn, v)
-uIntf *b;               /* code lengths in bits (all assumed <= BMAX) */
-uInt n;                 /* number of codes (assumed <= 288) */
-uInt s;                 /* number of simple-valued codes (0..s-1) */
-const uIntf *d;         /* list of base values for non-simple codes */
-const uIntf *e;         /* list of extra bits for non-simple codes */
-inflate_huft * FAR *t;  /* result: starting table */
-uIntf *m;               /* maximum lookup bits, returns actual */
-inflate_huft *hp;       /* space for trees */
-uInt *hn;               /* hufts used in space */
-uIntf *v;               /* working area: values in order of bit length */
-/* Given a list of code lengths and a maximum table size, make a set of
-   tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
-   if the given code set is incomplete (the tables are still built in this
-   case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
-   lengths), or Z_MEM_ERROR if not enough memory. */
-{
-
-  uInt a;                       /* counter for codes of length k */
-  uInt c[BMAX+1];               /* bit length count table */
-  uInt f;                       /* i repeats in table every f entries */
-  int g;                        /* maximum code length */
-  int h;                        /* table level */
-  register uInt i;              /* counter, current code */
-  register uInt j;              /* counter */
-  register int k;               /* number of bits in current code */
-  int l;                        /* bits per table (returned in m) */
-  uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
-  register uIntf *p;            /* pointer into c[], b[], or v[] */
-  inflate_huft *q;              /* points to current table */
-  struct inflate_huft_s r;      /* table entry for structure assignment */
-  inflate_huft *u[BMAX];        /* table stack */
-  register int w;               /* bits before this table == (l * h) */
-  uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uIntf *xp;                    /* pointer into x */
-  int y;                        /* number of dummy codes added */
-  uInt z;                       /* number of entries in current table */
-
-
-  /* Generate counts for each bit length */
-  p = c;
-#define C0 *p++ = 0;
-#define C2 C0 C0 C0 C0
-#define C4 C2 C2 C2 C2
-  C4                            /* clear c[]--assume BMAX+1 is 16 */
-  p = b;  i = n;
-  do {
-    c[*p++]++;                  /* assume all entries <= BMAX */
-  } while (--i);
-  if (c[0] == n)                /* null input--all zero length codes */
-  {
-    *t = (inflate_huft *)Z_NULL;
-    *m = 0;
-    return Z_OK;
-  }
-
-
-  /* Find minimum and maximum length, bound *m by those */
-  l = *m;
-  for (j = 1; j <= BMAX; j++)
-    if (c[j])
-      break;
-  k = j;                        /* minimum code length */
-  if ((uInt)l < j)
-    l = j;
-  for (i = BMAX; i; i--)
-    if (c[i])
-      break;
-  g = i;                        /* maximum code length */
-  if ((uInt)l > i)
-    l = i;
-  *m = l;
-
-
-  /* Adjust last length count to fill out codes, if needed */
-  for (y = 1 << j; j < i; j++, y <<= 1)
-    if ((y -= c[j]) < 0)
-      return Z_DATA_ERROR;
-  if ((y -= c[i]) < 0)
-    return Z_DATA_ERROR;
-  c[i] += y;
-
-
-  /* Generate starting offsets into the value table for each length */
-  x[1] = j = 0;
-  p = c + 1;  xp = x + 2;
-  while (--i) {                 /* note that i == g from above */
-    *xp++ = (j += *p++);
-  }
-
-
-  /* Make a table of values in order of bit lengths */
-  p = b;  i = 0;
-  do {
-    if ((j = *p++) != 0)
-      v[x[j]++] = i;
-  } while (++i < n);
-  n = x[g];                     /* set n to length of v */
-
-
-  /* Generate the Huffman codes and for each, make the table entries */
-  x[0] = i = 0;                 /* first Huffman code is zero */
-  p = v;                        /* grab values in bit order */
-  h = -1;                       /* no tables yet--level -1 */
-  w = -l;                       /* bits decoded == (l * h) */
-  u[0] = (inflate_huft *)Z_NULL;        /* just to keep compilers happy */
-  q = (inflate_huft *)Z_NULL;   /* ditto */
-  z = 0;                        /* ditto */
-
-  /* go through the bit lengths (k already is bits in shortest code) */
-  for (; k <= g; k++)
-  {
-    a = c[k];
-    while (a--)
-    {
-      /* here i is the Huffman code of length k bits for value *p */
-      /* make tables up to required level */
-      while (k > w + l)
-      {
-        h++;
-        w += l;                 /* previous table always l bits */
-
-        /* compute minimum size table less than or equal to l bits */
-        z = g - w;
-        z = z > (uInt)l ? (uInt)l : z;  /* table size upper limit */
-        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
-        {                       /* too few codes for k-w bit table */
-          f -= a + 1;           /* deduct codes from patterns left */
-          xp = c + k;
-          if (j < z)
-            while (++j < z)     /* try smaller tables up to z bits */
-            {
-              if ((f <<= 1) <= *++xp)
-                break;          /* enough codes to use up j bits */
-              f -= *xp;         /* else deduct codes from patterns */
-            }
-        }
-        z = 1 << j;             /* table entries for j-bit table */
-
-        /* allocate new table */
-        if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
-          return Z_MEM_ERROR;   /* not enough memory */
-        u[h] = q = hp + *hn;
-        *hn += z;
-
-        /* connect to last table, if there is one */
-        if (h)
-        {
-          x[h] = i;             /* save pattern for backing up */
-          r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = (Byte)j;     /* bits in this table */
-          j = i >> (w - l);
-          r.base = (uInt)(q - u[h-1] - j);   /* offset to this table */
-          u[h-1][j] = r;        /* connect to last table */
-        }
-        else
-          *t = q;               /* first table is returned result */
-      }
-
-      /* set up table entry in r */
-      r.bits = (Byte)(k - w);
-      if (p >= v + n)
-        r.exop = 128 + 64;      /* out of values--invalid code */
-      else if (*p < s)
-      {
-        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
-        r.base = *p++;          /* simple code is just the value */
-      }
-      else
-      {
-        r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
-        r.base = d[*p++ - s];
-      }
-
-      /* fill code-like entries with r */
-      f = 1 << (k - w);
-      for (j = i >> w; j < z; j += f)
-        q[j] = r;
-
-      /* backwards increment the k-bit code i */
-      for (j = 1 << (k - 1); i & j; j >>= 1)
-        i ^= j;
-      i ^= j;
-
-      /* backup over finished tables */
-      mask = (1 << w) - 1;      /* needed on HP, cc -O bug */
-      while ((i & mask) != x[h])
-      {
-        h--;                    /* don't need to update q */
-        w -= l;
-        mask = (1 << w) - 1;
-      }
-    }
-  }
-
-
-  /* Return Z_BUF_ERROR if we were given an incomplete table */
-  return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
-}
-
-
-int inflate_trees_bits(c, bb, tb, hp, z)
-uIntf *c;               /* 19 code lengths */
-uIntf *bb;              /* bits tree desired/actual depth */
-inflate_huft * FAR *tb; /* bits tree result */
-inflate_huft *hp;       /* space for trees */
-z_streamp z;            /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uIntf *v;             /* work area for huft_build */
-
-  if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL,
-                 tb, bb, hp, &hn, v);
-  if (r == Z_DATA_ERROR)
-    z->msg = (char*)"oversubscribed dynamic bit lengths tree";
-  else if (r == Z_BUF_ERROR || *bb == 0)
-  {
-    z->msg = (char*)"incomplete dynamic bit lengths tree";
-    r = Z_DATA_ERROR;
-  }
-  ZFREE(z, v);
-  return r;
-}
-
-
-int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z)
-uInt nl;                /* number of literal/length codes */
-uInt nd;                /* number of distance codes */
-uIntf *c;               /* that many (total) code lengths */
-uIntf *bl;              /* literal desired/actual bit depth */
-uIntf *bd;              /* distance desired/actual bit depth */
-inflate_huft * FAR *tl; /* literal/length tree result */
-inflate_huft * FAR *td; /* distance tree result */
-inflate_huft *hp;       /* space for trees */
-z_streamp z;            /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uIntf *v;             /* work area for huft_build */
-
-  /* allocate work area */
-  if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-
-  /* build literal/length tree */
-  r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
-  if (r != Z_OK || *bl == 0)
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed literal/length tree";
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"incomplete literal/length tree";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-  }
-
-  /* build distance tree */
-  r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
-  if (r != Z_OK || (*bd == 0 && nl > 257))
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed distance tree";
-    else if (r == Z_BUF_ERROR) {
-#ifdef PKZIP_BUG_WORKAROUND
-      r = Z_OK;
-    }
-#else
-      z->msg = (char*)"incomplete distance tree";
-      r = Z_DATA_ERROR;
-    }
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"empty distance tree with lengths";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-#endif
-  }
-
-  /* done */
-  ZFREE(z, v);
-  return Z_OK;
-}
-
-
-/* build fixed tables only once--keep them here */
-#ifdef BUILDFIXED
-local int fixed_built = 0;
-#define FIXEDH 544      /* number of hufts used by fixed tables */
-local inflate_huft fixed_mem[FIXEDH];
-local uInt fixed_bl;
-local uInt fixed_bd;
-local inflate_huft *fixed_tl;
-local inflate_huft *fixed_td;
-#else
-#include "inffixed.h"
-#endif
-
-
-int inflate_trees_fixed(bl, bd, tl, td, z)
-uIntf *bl;               /* literal desired/actual bit depth */
-uIntf *bd;               /* distance desired/actual bit depth */
-inflate_huft * FAR *tl;  /* literal/length tree result */
-inflate_huft * FAR *td;  /* distance tree result */
-z_streamp z;             /* for memory allocation */
-{
-#ifdef BUILDFIXED
-  /* build fixed tables if not already */
-  if (!fixed_built)
-  {
-    int k;              /* temporary variable */
-    uInt f = 0;         /* number of hufts used in fixed_mem */
-    uIntf *c;           /* length list for huft_build */
-    uIntf *v;           /* work area for huft_build */
-
-    /* allocate memory */
-    if ((c = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-      return Z_MEM_ERROR;
-    if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    {
-      ZFREE(z, c);
-      return Z_MEM_ERROR;
-    }
-
-    /* literal table */
-    for (k = 0; k < 144; k++)
-      c[k] = 8;
-    for (; k < 256; k++)
-      c[k] = 9;
-    for (; k < 280; k++)
-      c[k] = 7;
-    for (; k < 288; k++)
-      c[k] = 8;
-    fixed_bl = 9;
-    huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl,
-               fixed_mem, &f, v);
-
-    /* distance table */
-    for (k = 0; k < 30; k++)
-      c[k] = 5;
-    fixed_bd = 5;
-    huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd,
-               fixed_mem, &f, v);
-
-    /* done */
-    ZFREE(z, v);
-    ZFREE(z, c);
-    fixed_built = 1;
-  }
-#endif
-  *bl = fixed_bl;
-  *bd = fixed_bd;
-  *tl = fixed_tl;
-  *td = fixed_td;
-  return Z_OK;
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h b/jdk/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h
deleted file mode 100644
index dc5aed36a72..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h
+++ /dev/null
@@ -1,88 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Huffman code lookup table entry--this entry is four bytes for machines
-   that have 16-bit pointers (e.g. PC's in the small or medium model). */
-
-typedef struct inflate_huft_s FAR inflate_huft;
-
-struct inflate_huft_s {
-  union {
-    struct {
-      Byte Exop;        /* number of extra bits or operation */
-      Byte Bits;        /* number of bits in this code or subcode */
-    } what;
-    uInt pad;           /* pad structure to a power of 2 (4 bytes for */
-  } word;               /*  16-bit, 8 bytes for 32-bit int's) */
-  uInt base;            /* literal, length base, distance base,
-                           or table offset */
-};
-
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 huft structures (850 for length/literals
-   and 154 for distances, the latter actually the result of an
-   exhaustive search).  The actual maximum is not known, but the
-   value below is more than safe. */
-#define MANY 1440
-
-extern int inflate_trees_bits OF((
-    uIntf *,                    /* 19 code lengths */
-    uIntf *,                    /* bits tree desired/actual depth */
-    inflate_huft * FAR *,       /* bits tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-extern int inflate_trees_dynamic OF((
-    uInt,                       /* number of literal/length codes */
-    uInt,                       /* number of distance codes */
-    uIntf *,                    /* that many (total) code lengths */
-    uIntf *,                    /* literal desired/actual bit depth */
-    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft * FAR *,       /* distance tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-extern int inflate_trees_fixed OF((
-    uIntf *,                    /* literal desired/actual bit depth */
-    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft * FAR *,       /* distance tree result */
-    z_streamp));                /* for memory allocation */
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infutil.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/infutil.c
deleted file mode 100644
index d7059ee67d3..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infutil.c
+++ /dev/null
@@ -1,117 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * inflate_util.c -- data and routines common to blocks and codes
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "infblock.h"
-#include "inftrees.h"
-#include "infcodes.h"
-#include "infutil.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* And'ing with mask[n] masks the lower n bits */
-uInt inflate_mask[17] = {
-    0x0000,
-    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
-};
-
-
-/* copy as much as possible from the sliding window to the output area */
-int inflate_flush(s, z, r)
-inflate_blocks_statef *s;
-z_streamp z;
-int r;
-{
-  uInt n;
-  Bytef *p;
-  Bytef *q;
-
-  /* local copies of source and destination pointers */
-  p = z->next_out;
-  q = s->read;
-
-  /* compute number of bytes to copy as far as end of window */
-  n = (uInt)((q <= s->write ? s->write : s->end) - q);
-  if (n > z->avail_out) n = z->avail_out;
-  if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-  /* update counters */
-  z->avail_out -= n;
-  z->total_out += n;
-
-  /* update check information */
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-  /* copy as far as end of window */
-  zmemcpy(p, q, n);
-  p += n;
-  q += n;
-
-  /* see if more to copy at beginning of window */
-  if (q == s->end)
-  {
-    /* wrap pointers */
-    q = s->window;
-    if (s->write == s->end)
-      s->write = s->window;
-
-    /* compute bytes to copy */
-    n = (uInt)(s->write - q);
-    if (n > z->avail_out) n = z->avail_out;
-    if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-    /* update counters */
-    z->avail_out -= n;
-    z->total_out += n;
-
-    /* update check information */
-    if (s->checkfn != Z_NULL)
-      z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-    /* copy */
-    zmemcpy(p, q, n);
-    p += n;
-    q += n;
-  }
-
-  /* update pointers */
-  z->next_out = p;
-  s->read = q;
-
-  /* done */
-  return r;
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infutil.h b/jdk/src/share/native/java/util/zip/zlib-1.1.3/infutil.h
deleted file mode 100644
index e5154d7f626..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/infutil.h
+++ /dev/null
@@ -1,128 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * infutil.h -- types and macros common to blocks and codes
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-#ifndef _INFUTIL_H
-#define _INFUTIL_H
-
-typedef enum {
-      TYPE,     /* get type bits (3, including end bit) */
-      LENS,     /* get lengths for stored */
-      STORED,   /* processing stored block */
-      TABLE,    /* get table lengths */
-      BTREE,    /* get bit lengths tree for a dynamic block */
-      DTREE,    /* get length, distance trees for a dynamic block */
-      CODES,    /* processing fixed or dynamic block */
-      DRY,      /* output remaining window bytes */
-      DONE,     /* finished last block, done */
-      BAD}      /* got a data error--stuck here */
-inflate_block_mode;
-
-/* inflate blocks semi-private state */
-struct inflate_blocks_state {
-
-  /* mode */
-  inflate_block_mode  mode;     /* current inflate_block mode */
-
-  /* mode dependent information */
-  union {
-    uInt left;          /* if STORED, bytes left to copy */
-    struct {
-      uInt table;               /* table lengths (14 bits) */
-      uInt index;               /* index into blens (or border) */
-      uIntf *blens;             /* bit lengths of codes */
-      uInt bb;                  /* bit length tree depth */
-      inflate_huft *tb;         /* bit length decoding tree */
-    } trees;            /* if DTREE, decoding info for trees */
-    struct {
-      inflate_codes_statef
-         *codes;
-    } decode;           /* if CODES, current state */
-  } sub;                /* submode */
-  uInt last;            /* true if this block is the last block */
-
-  /* mode independent information */
-  uInt bitk;            /* bits in bit buffer */
-  uLong bitb;           /* bit buffer */
-  inflate_huft *hufts;  /* single malloc for tree space */
-  Bytef *window;        /* sliding window */
-  Bytef *end;           /* one byte after sliding window */
-  Bytef *read;          /* window read pointer */
-  Bytef *write;         /* window write pointer */
-  check_func checkfn;   /* check function */
-  uLong check;          /* check on output */
-
-};
-
-
-/* defines for inflate input/output */
-/*   update pointers and return */
-#define UPDBITS {s->bitb=b;s->bitk=k;}
-#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;}
-#define UPDOUT {s->write=q;}
-#define UPDATE {UPDBITS UPDIN UPDOUT}
-#define LEAVE {UPDATE return inflate_flush(s,z,r);}
-/*   get bytes and bits */
-#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;}
-#define NEEDBYTE {if(n)r=Z_OK;else LEAVE}
-#define NEXTBYTE (n--,*p++)
-#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define DUMPBITS(j) {b>>=(j);k-=(j);}
-/*   output bytes */
-#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
-#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
-#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
-#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
-#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
-#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
-/*   load local pointers */
-#define LOAD {LOADIN LOADOUT}
-
-/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
-extern uInt inflate_mask[17];
-
-/* copy as much as possible from the sliding window to the output area */
-extern int inflate_flush OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-struct internal_state      {int dummy;}; /* for buggy compilers */
-
-#endif
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/minigzip.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/minigzip.c
deleted file mode 100644
index 39b3847e14a..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/minigzip.c
+++ /dev/null
@@ -1,348 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.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 and, per its terms, should not be removed:
- *
- * minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * minigzip is a minimal implementation of the gzip utility. This is
- * only an example of using zlib and isn't meant to replace the
- * full-featured gzip. No attempt is made to deal with file systems
- * limiting names to 14 or 8+3 characters, etc... Error checking is
- * very limited. So use minigzip only for testing; use gzip for the
- * real thing. On MSDOS, use only on file names without extension
- * or in pipe mode.
- */
-
-#include <stdio.h>
-#include "zlib.h"
-
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#else
-   extern void exit  OF((int));
-#endif
-
-#ifdef USE_MMAP
-#  include <sys/types.h>
-#  include <sys/mman.h>
-#  include <sys/stat.h>
-#endif
-
-#if defined(MSDOS) || defined(OS2) || defined(WIN32)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#ifdef VMS
-#  define unlink delete
-#  define GZ_SUFFIX "-gz"
-#endif
-#ifdef RISCOS
-#  define unlink remove
-#  define GZ_SUFFIX "-gz"
-#  define fileno(file) file->__file
-#endif
-#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#  include <unix.h> /* for fileno */
-#endif
-
-#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
-  extern int unlink OF((const char *));
-#endif
-
-#ifndef GZ_SUFFIX
-#  define GZ_SUFFIX ".gz"
-#endif
-#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
-
-#define BUFLEN      16384
-#define MAX_NAME_LEN 1024
-
-#ifdef MAXSEG_64K
-#  define local static
-   /* Needed for systems with limitation on stack size. */
-#else
-#  define local
-#endif
-
-char *prog;
-
-void error            OF((const char *msg));
-void gz_compress      OF((FILE   *in, gzFile out));
-#ifdef USE_MMAP
-int  gz_compress_mmap OF((FILE   *in, gzFile out));
-#endif
-void gz_uncompress    OF((gzFile in, FILE   *out));
-void file_compress    OF((char  *file, char *mode));
-void file_uncompress  OF((char  *file));
-int  main             OF((int argc, char *argv[]));
-
-/* ===========================================================================
- * Display error message and exit
- */
-void error(msg)
-    const char *msg;
-{
-    fprintf(stderr, "%s: %s\n", prog, msg);
-    exit(1);
-}
-
-/* ===========================================================================
- * Compress input to output then close both files.
- */
-
-void gz_compress(in, out)
-    FILE   *in;
-    gzFile out;
-{
-    local char buf[BUFLEN];
-    int len;
-    int err;
-
-#ifdef USE_MMAP
-    /* Try first compressing with mmap. If mmap fails (minigzip used in a
-     * pipe), use the normal fread loop.
-     */
-    if (gz_compress_mmap(in, out) == Z_OK) return;
-#endif
-    for (;;) {
-        len = fread(buf, 1, sizeof(buf), in);
-        if (ferror(in)) {
-            perror("fread");
-            exit(1);
-        }
-        if (len == 0) break;
-
-        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
-    }
-    fclose(in);
-    if (gzclose(out) != Z_OK) error("failed gzclose");
-}
-
-#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
-
-/* Try compressing the input file at once using mmap. Return Z_OK if
- * if success, Z_ERRNO otherwise.
- */
-int gz_compress_mmap(in, out)
-    FILE   *in;
-    gzFile out;
-{
-    int len;
-    int err;
-    int ifd = fileno(in);
-    caddr_t buf;    /* mmap'ed buffer for the entire input file */
-    off_t buf_len;  /* length of the input file */
-    struct stat sb;
-
-    /* Determine the size of the file, needed for mmap: */
-    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
-    buf_len = sb.st_size;
-    if (buf_len <= 0) return Z_ERRNO;
-
-    /* Now do the actual mmap: */
-    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
-    if (buf == (caddr_t)(-1)) return Z_ERRNO;
-
-    /* Compress the whole file at once: */
-    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
-
-    if (len != (int)buf_len) error(gzerror(out, &err));
-
-    munmap(buf, buf_len);
-    fclose(in);
-    if (gzclose(out) != Z_OK) error("failed gzclose");
-    return Z_OK;
-}
-#endif /* USE_MMAP */
-
-/* ===========================================================================
- * Uncompress input to output then close both files.
- */
-void gz_uncompress(in, out)
-    gzFile in;
-    FILE   *out;
-{
-    local char buf[BUFLEN];
-    int len;
-    int err;
-
-    for (;;) {
-        len = gzread(in, buf, sizeof(buf));
-        if (len < 0) error (gzerror(in, &err));
-        if (len == 0) break;
-
-        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
-            error("failed fwrite");
-        }
-    }
-    if (fclose(out)) error("failed fclose");
-
-    if (gzclose(in) != Z_OK) error("failed gzclose");
-}
-
-
-/* ===========================================================================
- * Compress the given file: create a corresponding .gz file and remove the
- * original.
- */
-void file_compress(file, mode)
-    char  *file;
-    char  *mode;
-{
-    local char outfile[MAX_NAME_LEN];
-    FILE  *in;
-    gzFile out;
-
-    strcpy(outfile, file);
-    strcat(outfile, GZ_SUFFIX);
-
-    in = fopen(file, "rb");
-    if (in == NULL) {
-        perror(file);
-        exit(1);
-    }
-    out = gzopen(outfile, mode);
-    if (out == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
-        exit(1);
-    }
-    gz_compress(in, out);
-
-    unlink(file);
-}
-
-
-/* ===========================================================================
- * Uncompress the given file and remove the original.
- */
-void file_uncompress(file)
-    char  *file;
-{
-    local char buf[MAX_NAME_LEN];
-    char *infile, *outfile;
-    FILE  *out;
-    gzFile in;
-    int len = strlen(file);
-
-    strcpy(buf, file);
-
-    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
-        infile = file;
-        outfile = buf;
-        outfile[len-3] = '\0';
-    } else {
-        outfile = file;
-        infile = buf;
-        strcat(infile, GZ_SUFFIX);
-    }
-    in = gzopen(infile, "rb");
-    if (in == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
-        exit(1);
-    }
-    out = fopen(outfile, "wb");
-    if (out == NULL) {
-        perror(file);
-        exit(1);
-    }
-
-    gz_uncompress(in, out);
-
-    unlink(infile);
-}
-
-
-/* ===========================================================================
- * Usage:  minigzip [-d] [-f] [-h] [-1 to -9] [files...]
- *   -d : decompress
- *   -f : compress with Z_FILTERED
- *   -h : compress with Z_HUFFMAN_ONLY
- *   -1 to -9 : compression level
- */
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    int uncompr = 0;
-    gzFile file;
-    char outmode[20];
-
-    strcpy(outmode, "wb6 ");
-
-    prog = argv[0];
-    argc--, argv++;
-
-    while (argc > 0) {
-      if (strcmp(*argv, "-d") == 0)
-        uncompr = 1;
-      else if (strcmp(*argv, "-f") == 0)
-        outmode[3] = 'f';
-      else if (strcmp(*argv, "-h") == 0)
-        outmode[3] = 'h';
-      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
-               (*argv)[2] == 0)
-        outmode[2] = (*argv)[1];
-      else
-        break;
-      argc--, argv++;
-    }
-    if (argc == 0) {
-        SET_BINARY_MODE(stdin);
-        SET_BINARY_MODE(stdout);
-        if (uncompr) {
-            file = gzdopen(fileno(stdin), "rb");
-            if (file == NULL) error("can't gzdopen stdin");
-            gz_uncompress(file, stdout);
-        } else {
-            file = gzdopen(fileno(stdout), outmode);
-            if (file == NULL) error("can't gzdopen stdout");
-            gz_compress(stdin, file);
-        }
-    } else {
-        do {
-            if (uncompr) {
-                file_uncompress(*argv);
-            } else {
-                file_compress(*argv, outmode);
-            }
-        } while (argv++, --argc);
-    }
-    exit(0);
-    return 0; /* to avoid warning */
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c
deleted file mode 100644
index c89b5283883..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c
+++ /dev/null
@@ -1,78 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- */
-
-/*
- * 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 and, per its terms, should not be removed:
- *
- * adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zlib.h"
-
-#define BASE 65521L /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    unsigned long s1 = adler & 0xffff;
-    unsigned long s2 = (adler >> 16) & 0xffff;
-    int k;
-
-    if (buf == Z_NULL) return 1L;
-
-    while (len > 0) {
-        k = len < NMAX ? len : NMAX;
-        len -= k;
-        while (k >= 16) {
-            DO16(buf);
-            buf += 16;
-            k -= 16;
-        }
-        if (k != 0) do {
-            s1 += *buf++;
-            s2 += s1;
-        } while (--k);
-        s1 %= BASE;
-        s2 %= BASE;
-    }
-    return (s2 << 16) | s1;
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h b/jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h
deleted file mode 100644
index bdcd0b33c1c..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zconf.h
+++ /dev/null
@@ -1,316 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- */
-
-/*
- * 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 and, per its terms, should not be removed:
- *
- * zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifndef _ZCONF_H
-#define _ZCONF_H
-
-/* for _LP64 */
-#include <sys/types.h>
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_  z_deflateInit_
-#  define deflate       z_deflate
-#  define deflateEnd    z_deflateEnd
-#  define inflateInit_  z_inflateInit_
-#  define inflate       z_inflate
-#  define inflateEnd    z_inflateEnd
-#  define deflateInit2_ z_deflateInit2_
-#  define deflateSetDictionary z_deflateSetDictionary
-#  define deflateCopy   z_deflateCopy
-#  define deflateReset  z_deflateReset
-#  define deflateParams z_deflateParams
-#  define inflateInit2_ z_inflateInit2_
-#  define inflateSetDictionary z_inflateSetDictionary
-#  define inflateSync   z_inflateSync
-#  define inflateSyncPoint z_inflateSyncPoint
-#  define inflateReset  z_inflateReset
-#  define compress      z_compress
-#  define compress2     z_compress2
-#  define uncompress    z_uncompress
-#  define adler32       z_adler32
-#  define crc32         z_crc32
-#  define get_crc_table z_get_crc_table
-
-#  define Byte          z_Byte
-#  define uInt          z_uInt
-#  define uLong         z_uLong
-#  define Bytef         z_Bytef
-#  define charf         z_charf
-#  define intf          z_intf
-#  define uIntf         z_uIntf
-#  define uLongf        z_uLongf
-#  define voidpf        z_voidpf
-#  define voidp         z_voidp
-#endif
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
-#  ifndef __32BIT__
-#    define __32BIT__
-#  endif
-#endif
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#if defined(MSDOS) && !defined(__32BIT__)
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
-#  define STDC
-#endif
-#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
-#  ifndef STDC
-#    define STDC
-#  endif
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Old Borland C incorrectly complains about missing returns: */
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
-#  define NEED_DUMMY_RETURN
-#endif
-
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
-   /* MSC small or medium model */
-#  define SMALL_MEDIUM
-#  ifdef _MSC_VER
-#    define FAR _far
-#  else
-#    define FAR far
-#  endif
-#endif
-#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
-#  ifndef __32BIT__
-#    define SMALL_MEDIUM
-#    define FAR _far
-#  endif
-#endif
-
-/* Compile with -DZLIB_DLL for Windows DLL support */
-#if defined(ZLIB_DLL)
-#  if defined(_WINDOWS) || defined(WINDOWS)
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-#    define ZEXPORT  WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA  WINAPIV
-#    else
-#      define ZEXPORTVA  FAR _cdecl _export
-#    endif
-#  endif
-#  if defined (__BORLANDC__)
-#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)
-#      include <windows.h>
-#      define ZEXPORT __declspec(dllexport) WINAPI
-#      define ZEXPORTRVA __declspec(dllexport) WINAPIV
-#    else
-#      if defined (_Windows) && defined (__DLL__)
-#        define ZEXPORT _export
-#        define ZEXPORTVA _export
-#      endif
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  if defined (ZLIB_DLL)
-#    define ZEXTERN extern __declspec(dllexport)
-#  else
-#    define ZEXTERN extern __declspec(dllimport)
-#  endif
-#endif
-
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-
-#ifndef FAR
-#   define FAR
-#endif
-
-#if !defined(MACOS) && !defined(TARGET_OS_MAC)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-#ifdef _LP64
-typedef unsigned int  uLong; /* 32 bits or more */
-#else
-typedef unsigned long  uLong; /* 32 bits or more */
-#endif
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void FAR *voidpf;
-   typedef void     *voidp;
-#else
-   typedef Byte FAR *voidpf;
-   typedef Byte     *voidp;
-#endif
-
-#ifdef HAVE_UNISTD_H
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  define z_off_t  off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define  z_off_t long
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(inflate_blocks,"INBL")
-#   pragma map(inflate_blocks_new,"INBLNE")
-#   pragma map(inflate_blocks_free,"INBLFR")
-#   pragma map(inflate_blocks_reset,"INBLRE")
-#   pragma map(inflate_codes_free,"INCOFR")
-#   pragma map(inflate_codes,"INCO")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_flush,"INFLU")
-#   pragma map(inflate_mask,"INMA")
-#   pragma map(inflate_set_dictionary,"INSEDI2")
-#   pragma map(inflate_copyright,"INCOPY")
-#   pragma map(inflate_trees_bits,"INTRBI")
-#   pragma map(inflate_trees_dynamic,"INTRDY")
-#   pragma map(inflate_trees_fixed,"INTRFI")
-#   pragma map(inflate_trees_free,"INTRFR")
-#endif
-
-#endif /* _ZCONF_H */
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zcrc32.c b/jdk/src/share/native/java/util/zip/zlib-1.1.3/zcrc32.c
deleted file mode 100644
index a8097f2157b..00000000000
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zcrc32.c
+++ /dev/null
@@ -1,192 +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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
- */
-
-/*
- * 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 and, per its terms, should not be removed:
- *
- * crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zlib.h"
-
-#define local static
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local int crc_table_empty = 1;
-local uLongf crc_table[256];
-local void make_crc_table OF((void));
-
-/*
-  Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The table is simply the CRC of all possible eight bit values.  This is all
-  the information needed to generate CRC's on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.
-*/
-local void make_crc_table()
-{
-  uLong c;
-  int n, k;
-  uLong poly;            /* polynomial exclusive-or pattern */
-  /* terms of polynomial defining this crc (except x^32): */
-  static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-  /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-  poly = 0UL;
-  for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
-    poly |= 1L << (31 - p[n]);
-
-  for (n = 0; n < 256; n++)
-  {
-    c = (uLong)n;
-    for (k = 0; k < 8; k++)
-      c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-    crc_table[n] = c;
-  }
-  crc_table_empty = 0;
-}
-#else
-/* ========================================================================
- * Table of CRC-32's of all single-byte values (made by make_crc_table)
- */
-local const uLongf crc_table[256] = {
-  0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-  0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-  0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-  0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-  0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-  0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-  0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-  0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-  0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-  0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-  0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-  0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-  0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-  0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-  0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-  0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-  0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-  0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-  0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-  0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-  0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-  0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-  0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-  0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-  0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-  0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-  0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-  0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-  0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-  0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-  0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-  0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-  0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-  0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-  0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-  0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-  0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-  0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-  0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-  0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-  0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-  0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-  0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-  0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-  0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-  0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-  0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-  0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-  0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-  0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-  0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-  0x2d02ef8dUL
-};
-#endif
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const uLongf * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-  if (crc_table_empty) make_crc_table();
-#endif
-  return (const uLongf *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
-#define DO2(buf)  DO1(buf); DO1(buf);
-#define DO4(buf)  DO2(buf); DO2(buf);
-#define DO8(buf)  DO4(buf); DO4(buf);
-
-/* ========================================================================= */
-uLong ZEXPORT crc32(crc, buf, len)
-    uLong crc;
-    const Bytef *buf;
-    uInt len;
-{
-    if (buf == Z_NULL) return 0UL;
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-      make_crc_table();
-#endif
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8)
-    {
-      DO8(buf);
-      len -= 8;
-    }
-    if (len) do {
-      DO1(buf);
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog b/jdk/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog
similarity index 54%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog
index 3f0ec04d1e2..7f6869d3235 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog
@@ -1,16 +1,390 @@
 
-		ChangeLog file for zlib
+                ChangeLog file for zlib
+
+Changes in 1.2.3 (18 July 2005)
+- Apply security vulnerability fixes to contrib/infback9 as well
+- Clean up some text files (carriage returns, trailing space)
+- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
+
+Changes in 1.2.2.4 (11 July 2005)
+- Add inflatePrime() function for starting inflation at bit boundary
+- Avoid some Visual C warnings in deflate.c
+- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
+  compile
+- Fix some spelling errors in comments [Betts]
+- Correct inflateInit2() error return documentation in zlib.h
+- Added zran.c example of compressed data random access to examples
+  directory, shows use of inflatePrime()
+- Fix cast for assignments to strm->state in inflate.c and infback.c
+- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
+- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
+- Add cast in trees.c t avoid a warning [Oberhumer]
+- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
+- Update make_vms.com [Zinser]
+- Initialize state->write in inflateReset() since copied in inflate_fast()
+- Be more strict on incomplete code sets in inflate_table() and increase
+  ENOUGH and MAXD -- this repairs a possible security vulnerability for
+  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
+  discovering the vulnerability and providing test cases.
+- Add ia64 support to configure for HP-UX [Smith]
+- Add error return to gzread() for format or i/o error [Levin]
+- Use malloc.h for OS/2 [Necasek]
+
+Changes in 1.2.2.3 (27 May 2005)
+- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
+- Typecast fread() return values in gzio.c [Vollant]
+- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
+- Fix crc check bug in gzread() after gzungetc() [Heiner]
+- Add the deflateTune() function to adjust internal compression parameters
+- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
+- Remove an incorrect assertion in examples/zpipe.c
+- Add C++ wrapper in infback9.h [Donais]
+- Fix bug in inflateCopy() when decoding fixed codes
+- Note in zlib.h how much deflateSetDictionary() actually uses
+- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
+- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
+- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
+- Add gzdirect() function to indicate transparent reads
+- Update contrib/minizip [Vollant]
+- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
+- Add casts in crc32.c to avoid warnings [Oberhumer]
+- Add contrib/masmx64 [Vollant]
+- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
+
+Changes in 1.2.2.2 (30 December 2004)
+- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
+  avoid implicit memcpy calls (portability for no-library compilation)
+- Increase sprintf() buffer size in gzdopen() to allow for large numbers
+- Add INFLATE_STRICT to check distances against zlib header
+- Improve WinCE errno handling and comments [Chang]
+- Remove comment about no gzip header processing in FAQ
+- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
+- Add updated make_vms.com [Coghlan], update README
+- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
+  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
+- Add FAQ entry and comments in deflate.c on uninitialized memory access
+- Add Solaris 9 make options in configure [Gilbert]
+- Allow strerror() usage in gzio.c for STDC
+- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
+- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
+- Use z_off_t for adler32_combine() and crc32_combine() lengths
+- Make adler32() much faster for small len
+- Use OS_CODE in deflate() default gzip header
+
+Changes in 1.2.2.1 (31 October 2004)
+- Allow inflateSetDictionary() call for raw inflate
+- Fix inflate header crc check bug for file names and comments
+- Add deflateSetHeader() and gz_header structure for custom gzip headers
+- Add inflateGetheader() to retrieve gzip headers
+- Add crc32_combine() and adler32_combine() functions
+- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
+- Use zstreamp consistently in zlib.h (inflate_back functions)
+- Remove GUNZIP condition from definition of inflate_mode in inflate.h
+  and in contrib/inflate86/inffast.S [Truta, Anderson]
+- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
+- Update projects/README.projects and projects/visualc6 [Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
+- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
+- Use a new algorithm for setting strm->data_type in trees.c [Truta]
+- Do not define an exit() prototype in zutil.c unless DEBUG defined
+- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
+- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
+- Fix Darwin build version identification [Peterson]
+
+Changes in 1.2.2 (3 October 2004)
+- Update zlib.h comments on gzip in-memory processing
+- Set adler to 1 in inflateReset() to support Java test suite [Walles]
+- Add contrib/dotzlib [Ravn]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update contrib/minizip [Vollant]
+- Move contrib/visual-basic.txt to old/ [Truta]
+- Fix assembler builds in projects/visualc6/ [Truta]
+
+Changes in 1.2.1.2 (9 September 2004)
+- Update INDEX file
+- Fix trees.c to update strm->data_type (no one ever noticed!)
+- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
+- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
+- Add limited multitasking protection to DYNAMIC_CRC_TABLE
+- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
+- Don't declare strerror() under VMS [Mozilla]
+- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
+- Update contrib/ada [Anisimkov]
+- Update contrib/minizip [Vollant]
+- Fix configure to not hardcode directories for Darwin [Peterson]
+- Fix gzio.c to not return error on empty files [Brown]
+- Fix indentation; update version in contrib/delphi/ZLib.pas and
+  contrib/pascal/zlibpas.pas [Truta]
+- Update mkasm.bat in contrib/masmx86 [Truta]
+- Update contrib/untgz [Truta]
+- Add projects/README.projects [Truta]
+- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
+- Remove an unnecessary assignment to curr in inftrees.c [Truta]
+- Add OS/2 to exe builds in configure [Poltorak]
+- Remove err dummy parameter in zlib.h [Kientzle]
+
+Changes in 1.2.1.1 (9 January 2004)
+- Update email address in README
+- Several FAQ updates
+- Fix a big fat bug in inftrees.c that prevented decoding valid
+  dynamic blocks with only literals and no distance codes --
+  Thanks to "Hot Emu" for the bug report and sample file
+- Add a note to puff.c on no distance codes case.
+
+Changes in 1.2.1 (17 November 2003)
+- Remove a tab in contrib/gzappend/gzappend.c
+- Update some interfaces in contrib for new zlib functions
+- Update zlib version number in some contrib entries
+- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
+- Support shared libraries on Hurd and KFreeBSD [Brown]
+- Fix error in NO_DIVIDE option of adler32.c
+
+Changes in 1.2.0.8 (4 November 2003)
+- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
+- Add experimental NO_DIVIDE #define in adler32.c
+    - Possibly faster on some processors (let me know if it is)
+- Correct Z_BLOCK to not return on first inflate call if no wrap
+- Fix strm->data_type on inflate() return to correctly indicate EOB
+- Add deflatePrime() function for appending in the middle of a byte
+- Add contrib/gzappend for an example of appending to a stream
+- Update win32/DLL_FAQ.txt [Truta]
+- Delete Turbo C comment in README [Truta]
+- Improve some indentation in zconf.h [Truta]
+- Fix infinite loop on bad input in configure script [Church]
+- Fix gzeof() for concatenated gzip files [Johnson]
+- Add example to contrib/visual-basic.txt [Michael B.]
+- Add -p to mkdir's in Makefile.in [vda]
+- Fix configure to properly detect presence or lack of printf functions
+- Add AS400 support [Monnerat]
+- Add a little Cygwin support [Wilson]
+
+Changes in 1.2.0.7 (21 September 2003)
+- Correct some debug formats in contrib/infback9
+- Cast a type in a debug statement in trees.c
+- Change search and replace delimiter in configure from % to # [Beebe]
+- Update contrib/untgz to 0.2 with various fixes [Truta]
+- Add build support for Amiga [Nikl]
+- Remove some directories in old that have been updated to 1.2
+- Add dylib building for Mac OS X in configure and Makefile.in
+- Remove old distribution stuff from Makefile
+- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
+- Update links in README
+
+Changes in 1.2.0.6 (13 September 2003)
+- Minor FAQ updates
+- Update contrib/minizip to 1.00 [Vollant]
+- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
+- Update POSTINC comment for 68060 [Nikl]
+- Add contrib/infback9 with deflate64 decoding (unsupported)
+- For MVS define NO_vsnprintf and undefine FAR [van Burik]
+- Add pragma for fdopen on MVS [van Burik]
+
+Changes in 1.2.0.5 (8 September 2003)
+- Add OF to inflateBackEnd() declaration in zlib.h
+- Remember start when using gzdopen in the middle of a file
+- Use internal off_t counters in gz* functions to properly handle seeks
+- Perform more rigorous check for distance-too-far in inffast.c
+- Add Z_BLOCK flush option to return from inflate at block boundary
+- Set strm->data_type on return from inflate
+    - Indicate bits unused, if at block boundary, and if in last block
+- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
+- Add condition so old NO_DEFLATE define still works for compatibility
+- FAQ update regarding the Windows DLL [Truta]
+- INDEX update: add qnx entry, remove aix entry [Truta]
+- Install zlib.3 into mandir [Wilson]
+- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
+- Adapt the zlib interface to the new DLL convention guidelines [Truta]
+- Introduce ZLIB_WINAPI macro to allow the export of functions using
+  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
+- Update msdos and win32 scripts and makefiles [Truta]
+- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
+- Add contrib/ada [Anisimkov]
+- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
+- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
+- Add contrib/masm686 [Truta]
+- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
+  [Truta, Vollant]
+- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
+- Remove contrib/delphi2; add a new contrib/delphi [Truta]
+- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
+  and fix some method prototypes [Truta]
+- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
+  [Truta]
+- Avoid the use of backslash (\) in contrib/minizip [Vollant]
+- Fix file time handling in contrib/untgz; update makefiles [Truta]
+- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
+  [Vollant]
+- Remove contrib/vstudio/vc15_16 [Vollant]
+- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
+- Update README.contrib [Truta]
+- Invert the assignment order of match_head and s->prev[...] in
+  INSERT_STRING [Truta]
+- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
+  [Truta]
+- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
+- Fix prototype of syncsearch in inflate.c [Truta]
+- Introduce ASMINF macro to be enabled when using an ASM implementation
+  of inflate_fast [Truta]
+- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
+- Modify test_gzio in example.c to take a single file name as a
+  parameter [Truta]
+- Exit the example.c program if gzopen fails [Truta]
+- Add type casts around strlen in example.c [Truta]
+- Remove casting to sizeof in minigzip.c; give a proper type
+  to the variable compared with SUFFIX_LEN [Truta]
+- Update definitions of STDC and STDC99 in zconf.h [Truta]
+- Synchronize zconf.h with the new Windows DLL interface [Truta]
+- Use SYS16BIT instead of __32BIT__ to distinguish between
+  16- and 32-bit platforms [Truta]
+- Use far memory allocators in small 16-bit memory models for
+  Turbo C [Truta]
+- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
+  zlibCompileFlags [Truta]
+- Cygwin has vsnprintf [Wilson]
+- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
+- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
+
+Changes in 1.2.0.4 (10 August 2003)
+- Minor FAQ updates
+- Be more strict when checking inflateInit2's windowBits parameter
+- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
+- Add gzip wrapper option to deflateInit2 using windowBits
+- Add updated QNX rule in configure and qnx directory [Bonnefoy]
+- Make inflate distance-too-far checks more rigorous
+- Clean up FAR usage in inflate
+- Add casting to sizeof() in gzio.c and minigzip.c
+
+Changes in 1.2.0.3 (19 July 2003)
+- Fix silly error in gzungetc() implementation [Vollant]
+- Update contrib/minizip and contrib/vstudio [Vollant]
+- Fix printf format in example.c
+- Correct cdecl support in zconf.in.h [Anisimkov]
+- Minor FAQ updates
+
+Changes in 1.2.0.2 (13 July 2003)
+- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
+- Attempt to avoid warnings in crc32.c for pointer-int conversion
+- Add AIX to configure, remove aix directory [Bakker]
+- Add some casts to minigzip.c
+- Improve checking after insecure sprintf() or vsprintf() calls
+- Remove #elif's from crc32.c
+- Change leave label to inf_leave in inflate.c and infback.c to avoid
+  library conflicts
+- Remove inflate gzip decoding by default--only enable gzip decoding by
+  special request for stricter backward compatibility
+- Add zlibCompileFlags() function to return compilation information
+- More typecasting in deflate.c to avoid warnings
+- Remove leading underscore from _Capital #defines [Truta]
+- Fix configure to link shared library when testing
+- Add some Windows CE target adjustments [Mai]
+- Remove #define ZLIB_DLL in zconf.h [Vollant]
+- Add zlib.3 [Rodgers]
+- Update RFC URL in deflate.c and algorithm.txt [Mai]
+- Add zlib_dll_FAQ.txt to contrib [Truta]
+- Add UL to some constants [Truta]
+- Update minizip and vstudio [Vollant]
+- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
+- Expand use of NO_DUMMY_DECL to avoid all dummy structures
+- Added iostream3 to contrib [Schwardt]
+- Replace rewind() with fseek() for WinCE [Truta]
+- Improve setting of zlib format compression level flags
+    - Report 0 for huffman and rle strategies and for level == 0 or 1
+    - Report 2 only for level == 6
+- Only deal with 64K limit when necessary at compile time [Truta]
+- Allow TOO_FAR check to be turned off at compile time [Truta]
+- Add gzclearerr() function [Souza]
+- Add gzungetc() function
+
+Changes in 1.2.0.1 (17 March 2003)
+- Add Z_RLE strategy for run-length encoding [Truta]
+    - When Z_RLE requested, restrict matches to distance one
+    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
+- Correct FASTEST compilation to allow level == 0
+- Clean up what gets compiled for FASTEST
+- Incorporate changes to zconf.in.h [Vollant]
+    - Refine detection of Turbo C need for dummy returns
+    - Refine ZLIB_DLL compilation
+    - Include additional header file on VMS for off_t typedef
+- Try to use _vsnprintf where it supplants vsprintf [Vollant]
+- Add some casts in inffast.c
+- Enchance comments in zlib.h on what happens if gzprintf() tries to
+  write more than 4095 bytes before compression
+- Remove unused state from inflateBackEnd()
+- Remove exit(0) from minigzip.c, example.c
+- Get rid of all those darn tabs
+- Add "check" target to Makefile.in that does the same thing as "test"
+- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
+- Update contrib/inflate86 [Anderson]
+- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
+- Add msdos and win32 directories with makefiles [Truta]
+- More additions and improvements to the FAQ
+
+Changes in 1.2.0 (9 March 2003)
+- New and improved inflate code
+    - About 20% faster
+    - Does not allocate 32K window unless and until needed
+    - Automatically detects and decompresses gzip streams
+    - Raw inflate no longer needs an extra dummy byte at end
+    - Added inflateBack functions using a callback interface--even faster
+      than inflate, useful for file utilities (gzip, zip)
+    - Added inflateCopy() function to record state for random access on
+      externally generated deflate streams (e.g. in gzip files)
+    - More readable code (I hope)
+- New and improved crc32()
+    - About 50% faster, thanks to suggestions from Rodney Brown
+- Add deflateBound() and compressBound() functions
+- Fix memory leak in deflateInit2()
+- Permit setting dictionary for raw deflate (for parallel deflate)
+- Fix const declaration for gzwrite()
+- Check for some malloc() failures in gzio.c
+- Fix bug in gzopen() on single-byte file 0x1f
+- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
+  and next buffer doesn't start with 0x8b
+- Fix uncompress() to return Z_DATA_ERROR on truncated input
+- Free memory at end of example.c
+- Remove MAX #define in trees.c (conflicted with some libraries)
+- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
+- Declare malloc() and free() in gzio.c if STDC not defined
+- Use malloc() instead of calloc() in zutil.c if int big enough
+- Define STDC for AIX
+- Add aix/ with approach for compiling shared library on AIX
+- Add HP-UX support for shared libraries in configure
+- Add OpenUNIX support for shared libraries in configure
+- Use $cc instead of gcc to build shared library
+- Make prefix directory if needed when installing
+- Correct Macintosh avoidance of typedef Byte in zconf.h
+- Correct Turbo C memory allocation when under Linux
+- Use libz.a instead of -lz in Makefile (assure use of compiled library)
+- Update configure to check for snprintf or vsnprintf functions and their
+  return value, warn during make if using an insecure function
+- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
+  is lost when library is used--resolution is to build new zconf.h
+- Documentation improvements (in zlib.h):
+    - Document raw deflate and inflate
+    - Update RFCs URL
+    - Point out that zlib and gzip formats are different
+    - Note that Z_BUF_ERROR is not fatal
+    - Document string limit for gzprintf() and possible buffer overflow
+    - Note requirement on avail_out when flushing
+    - Note permitted values of flush parameter of inflate()
+- Add some FAQs (and even answers) to the FAQ
+- Add contrib/inflate86/ for x86 faster inflate
+- Add contrib/blast/ for PKWare Data Compression Library decompression
+- Add contrib/puff/ simple inflate for deflate format description
+
+Changes in 1.1.4 (11 March 2002)
+- ZFREE was repeated on same allocation on some error conditions.
+  This creates a security problem described in
+  http://www.zlib.org/advisory-2002-03-11.txt
+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
+- Avoid accesses before window for invalid distances with inflate window
+  less than 32K.
+- force windowBits > 8 to avoid a bug in the encoder for a window size
+  of 256 bytes. (A complete fix will be available in 1.1.5).
 
-Changes in 1.1.3.f-jdk (23 Apr 2003) by Sun Microsystems
-- Backport security fixes from zlib 1.1.4
-- Minor tweaks for 64 bit architectures
-- Remove warnings on Linux
-- Fix minor typos in comments in zlib.h
-- adler32.c was renamed to zadler32.c
-- crc32.c was renamed to zcrc32.c, with signed longs made unsigned.
-- Fixed bug in calculation of checksum in inflate.c
-- GPL headers added
-	
 Changes in 1.1.3 (9 July 1998)
 - fix "an inflate input buffer bug that shows up on rare but persistent
   occasions" (Mark)
@@ -166,7 +540,7 @@ Changes in 1.0.7 (20 Jan 1998)
 Changes in 1.0.6 (19 Jan 1998)
 - add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
   gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
-- Fix a deflate bug occuring only with compression level 0 (thanks to
+- Fix a deflate bug occurring only with compression level 0 (thanks to
   Andy Buckler for finding this one).
 - In minigzip, pass transparently also the first byte for .Z files.
 - return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
@@ -184,13 +558,13 @@ Changes in 1.0.6 (19 Jan 1998)
 - added Makefile.nt (thanks to Stephen Williams)
 - added the unsupported "contrib" directory:
    contrib/asm386/ by Gilles Vollant <info@winimage.com>
-	386 asm code replacing longest_match().
+        386 asm code replacing longest_match().
    contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
         A C++ I/O streams interface to the zlib gz* functions
    contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
-	Another C++ I/O streams interface
+        Another C++ I/O streams interface
    contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
-	A very simple tar.gz file extractor using zlib
+        A very simple tar.gz file extractor using zlib
    contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
         How to use compress(), uncompress() and the gz* functions from VB.
 - pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
@@ -217,7 +591,7 @@ Changes in 1.0.6 (19 Jan 1998)
 - add NEED_DUMMY_RETURN for Borland
 - use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
 - allow compilation with CC
-- defined STDC for OS/2 (David Charlap)	
+- defined STDC for OS/2 (David Charlap)
 - limit external names to 8 chars for MVS (Thomas Lund)
 - in minigzip.c, use static buffers only for 16-bit systems
 - fix suffix check for "minigzip -d foo.gz"
@@ -242,7 +616,7 @@ Changes in 1.0.5 (3 Jan 98)
 - Eliminate memory leaks on error conditions in inflate
 - Removed some vestigial code in inflate
 - Update web address in README
-  
+
 Changes in 1.0.4 (24 Jul 96)
 - In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
   bit, so the decompressor could decompress all the correct data but went
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/README b/jdk/src/share/native/java/util/zip/zlib-1.2.3/README
new file mode 100644
index 00000000000..758cc50020d
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/README
@@ -0,0 +1,125 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.3 is a general purpose data compression library.  All the code is
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+and rfc1952.txt (gzip format). These documents are also available in other
+formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
+of the library is given in the file example.c which also tests that the library
+is working correctly. Another example is given in the file minigzip.c. The
+compression library itself is composed of all source files except example.c and
+minigzip.c.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile. In short "make test; make install" should work for most
+machines. For Unix: "./configure; make test; make install". For MSDOS, use one
+of the special makefiles such as Makefile.msc. For VMS, use make_vms.com.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version. The zlib home page is
+http://www.zlib.org or http://www.gzip.org/zlib/ Before reporting a problem,
+please check this site to verify that you have the latest version of zlib;
+otherwise get the latest version and check whether the problem still exists or
+not.
+
+PLEASE read the zlib FAQ http://www.gzip.org/zlib/zlib_faq.html before asking
+for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
+issue of  Dr. Dobb's Journal; a copy of the article is available in
+http://dogma.net/markn/articles/zlibtool/zlibtool.htm
+
+The changes made in version 1.2.3 are documented in the file ChangeLog.
+
+Unsupported third party contributions are provided in directory "contrib".
+
+A Java implementation of zlib is available in the Java Development Kit
+http://java.sun.com/j2se/1.4.2/docs/api/java/util/zip/package-summary.html
+See the zlib home page http://www.zlib.org for details.
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is in the
+CPAN (Comprehensive Perl Archive Network) sites
+http://www.cpan.org/modules/by-module/Compress/
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://www.python.org/doc/lib/module-zlib.html
+
+A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com> is
+availlable at http://www.oche.de/~akupries/soft/trf/trf_zip.html
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+- When building a shared, i.e. dynamic library on Mac OS X, the library must be
+  installed before testing (do "make install" before "make test"), since the
+  library location is specified in the library.
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz. The deflate
+  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
+  people who reported problems and suggested various improvements in zlib;
+  they are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2004 Jean-loup Gailly and Mark Adler
+
+  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.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not*
+receiving lengthy legal documents to sign. The sources are provided
+for free but without warranty of any kind.  The library has been
+entirely written by Jean-loup Gailly and Mark Adler; it does not
+include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include
+in the file ChangeLog history information documenting your changes. Please
+read the FAQ for more information on the distribution of modified source
+versions.
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/compress.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/compress.c
similarity index 87%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/compress.c
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/compress.c
index 8939a02f570..1407edf258a 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/compress.c
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/compress.c
@@ -22,17 +22,14 @@
  * 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 and, per its terms, should not be removed:
- *
- * compress.c -- compress a memory buffer
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
 #include "zlib.h"
 
 /* ===========================================================================
@@ -94,3 +91,13 @@ int ZEXPORT compress (dest, destLen, source, sourceLen)
 {
     return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }
+
+/* ===========================================================================
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
+ */
+uLong ZEXPORT compressBound (sourceLen)
+    uLong sourceLen;
+{
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
+}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/crc32.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/crc32.h
new file mode 100644
index 00000000000..e5d1805bd10
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/crc32.h
@@ -0,0 +1,465 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const unsigned long FAR crc_table[TBLS][256] =
+{
+  {
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+    0x2d02ef8dUL
+#ifdef BYFOUR
+  },
+  {
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
+    0x9324fd72UL
+  },
+  {
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
+    0xbe9834edUL
+  },
+  {
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
+    0xde0506f1UL
+  },
+  {
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
+    0x8def022dUL
+  },
+  {
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
+    0x72fd2493UL
+  },
+  {
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
+    0xed3498beUL
+  },
+  {
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
+    0xf10605deUL
+#endif
+  }
+};
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/deflate.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.c
similarity index 72%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/deflate.c
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.c
index 8bd71fcfca1..dcf42496cbe 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/deflate.c
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.c
@@ -20,18 +20,10 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * 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 and, per its terms, should not be removed:
- *
- * deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -69,7 +61,7 @@
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in ftp://ds.internic.net/rfc/rfc1951.txt
+ *      Available in http://www.ietf.org/rfc/rfc1951.txt
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
@@ -79,10 +71,12 @@
  *
  */
 
+/* @(#) $Id$ */
+
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.1.3.f-jdk Copyright 1995-1998 Jean-loup Gailly ";
+   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -106,17 +100,22 @@ typedef block_state (*compress_func) OF((deflate_state *s, int flush));
 local void fill_window    OF((deflate_state *s));
 local block_state deflate_stored OF((deflate_state *s, int flush));
 local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
 local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
 local void lm_init        OF((deflate_state *s));
 local void putShortMSB    OF((deflate_state *s, uInt b));
 local void flush_pending  OF((z_streamp strm));
 local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifndef FASTEST
 #ifdef ASMV
       void match_init OF((void)); /* asm code initialization */
       uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #else
 local uInt longest_match  OF((deflate_state *s, IPos cur_match));
 #endif
+#endif
+local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
 
 #ifdef DEBUG
 local  void check_match OF((deflate_state *s, IPos start, IPos match,
@@ -153,10 +152,16 @@ typedef struct config_s {
    compress_func func;
 } config;
 
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
 local const config configuration_table[10] = {
 /*      good lazy nice chain */
 /* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* maximum speed, no lazy matches */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
 /* 2 */ {4,    5, 16,    8, deflate_fast},
 /* 3 */ {4,    6, 32,   32, deflate_fast},
 
@@ -165,7 +170,8 @@ local const config configuration_table[10] = {
 /* 6 */ {8,   16, 128, 128, deflate_slow},
 /* 7 */ {8,   32, 128, 256, deflate_slow},
 /* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* maximum compression */
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
 
 /* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
  * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
@@ -175,7 +181,9 @@ local const config configuration_table[10] = {
 #define EQUAL 0
 /* result of memcmp for equal strings */
 
+#ifndef NO_DUMMY_DECL
 struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+#endif
 
 /* ===========================================================================
  * Update a hash value with the given input byte
@@ -204,7 +212,7 @@ struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 #else
 #define INSERT_STRING(s, str, match_head) \
    (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
     s->head[s->ins_h] = (Pos)(str))
 #endif
 
@@ -241,8 +249,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     int stream_size;
 {
     deflate_state *s;
-    int noheader = 0;
-    static const char* my_version = ZLIB_VERSION;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
 
     ushf *overlay;
     /* We overlay pending_buf and d_buf+l_buf. This works since the average
@@ -256,32 +264,41 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     if (strm == Z_NULL) return Z_STREAM_ERROR;
 
     strm->msg = Z_NULL;
-    if (strm->zalloc == Z_NULL) {
+    if (strm->zalloc == (alloc_func)0) {
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
     }
-    if (strm->zfree == Z_NULL) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
 
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
 #ifdef FASTEST
-    level = 1;
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
 #endif
 
-    if (windowBits < 0) { /* undocumented feature: suppress zlib header */
-        noheader = 1;
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
         windowBits = -windowBits;
     }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
     if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
         windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
+        strategy < 0 || strategy > Z_FIXED) {
         return Z_STREAM_ERROR;
     }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
     s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
     if (s == Z_NULL) return Z_MEM_ERROR;
     strm->state = (struct internal_state FAR *)s;
     s->strm = strm;
 
-    s->noheader = noheader;
+    s->wrap = wrap;
+    s->gzhead = Z_NULL;
     s->w_bits = windowBits;
     s->w_size = 1 << s->w_bits;
     s->w_mask = s->w_size - 1;
@@ -303,6 +320,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
         strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
         deflateEnd (strm);
         return Z_MEM_ERROR;
@@ -329,17 +347,18 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     IPos hash_head = 0;
 
     if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->status != INIT_STATE) return Z_STREAM_ERROR;
+        strm->state->wrap == 2 ||
+        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
+        return Z_STREAM_ERROR;
 
     s = strm->state;
-    strm->adler = adler32(strm->adler, dictionary, dictLength);
+    if (s->wrap)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
 
     if (length < MIN_MATCH) return Z_OK;
     if (length > MAX_DIST(s)) {
         length = MAX_DIST(s);
-#ifndef USE_DICT_HEAD
         dictionary += dictLength - length; /* use the tail of the dictionary */
-#endif
     }
     zmemcpy(s->window, dictionary, length);
     s->strstart = length;
@@ -365,7 +384,9 @@ int ZEXPORT deflateReset (strm)
     deflate_state *s;
 
     if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == Z_NULL || strm->zfree == Z_NULL) return Z_STREAM_ERROR;
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+        return Z_STREAM_ERROR;
+    }
 
     strm->total_in = strm->total_out = 0;
     strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
@@ -375,11 +396,15 @@ int ZEXPORT deflateReset (strm)
     s->pending = 0;
     s->pending_out = s->pending_buf;
 
-    if (s->noheader < 0) {
-        s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
     }
-    s->status = s->noheader ? BUSY_STATE : INIT_STATE;
-    strm->adler = 1;
+    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
     s->last_flush = Z_NO_FLUSH;
 
     _tr_init(s);
@@ -388,6 +413,29 @@ int ZEXPORT deflateReset (strm)
     return Z_OK;
 }
 
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader (strm, head)
+    z_streamp strm;
+    gz_headerp head;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
+    strm->state->gzhead = head;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime (strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    strm->state->bi_valid = bits;
+    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
+    return Z_OK;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflateParams(strm, level, strategy)
     z_streamp strm;
@@ -401,10 +449,12 @@ int ZEXPORT deflateParams(strm, level, strategy)
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
     s = strm->state;
 
-    if (level == Z_DEFAULT_COMPRESSION) {
-        level = 6;
-    }
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
         return Z_STREAM_ERROR;
     }
     func = configuration_table[s->level].func;
@@ -424,6 +474,66 @@ int ZEXPORT deflateParams(strm, level, strategy)
     return err;
 }
 
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+    z_streamp strm;
+    int good_length;
+    int max_lazy;
+    int nice_length;
+    int max_chain;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+    s->good_match = good_length;
+    s->max_lazy_match = max_lazy;
+    s->nice_match = nice_length;
+    s->max_chain_length = max_chain;
+    return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns
+ * a close to exact, as well as small, upper bound on the compressed size.
+ * They are coded as constants here for a reason--if the #define's are
+ * changed, then this function needs to be changed as well.  The return
+ * value for 15 and 8 only works for those exact settings.
+ *
+ * For any setting other than those defaults for windowBits and memLevel,
+ * the value returned is a conservative worst case for the maximum expansion
+ * resulting from using fixed blocks instead of stored blocks, which deflate
+ * can emit on compressed data for some combinations of the parameters.
+ *
+ * This function could be more sophisticated to provide closer upper bounds
+ * for every combination of windowBits and memLevel, as well as wrap.
+ * But even the conservative upper bound of about 14% expansion does not
+ * seem onerous for output buffer allocation.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong destLen;
+
+    /* conservative upper bound */
+    destLen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
+
+    /* if can't get parameters, return conservative bound */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return destLen;
+
+    /* if not default parameters, return conservative bound */
+    s = strm->state;
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return destLen;
+
+    /* default settings: return tight bound for that case */
+    return compressBound(sourceLen);
+}
+
 /* =========================================================================
  * Put a short in the pending buffer. The 16-bit value is put in MSB order.
  * IN assertion: the stream state is correct and there is enough room in
@@ -487,27 +597,185 @@ int ZEXPORT deflate (strm, flush)
     old_flush = s->last_flush;
     s->last_flush = flush;
 
-    /* Write the zlib header */
+    /* Write the header */
     if (s->status == INIT_STATE) {
-
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-        uInt level_flags = (s->level-1) >> 1;
-
-        if (level_flags > 3) level_flags = 3;
-        header |= (level_flags << 6);
-        if (s->strstart != 0) header |= PRESET_DICT;
-        header += 31 - (header % 31);
-
-        s->status = BUSY_STATE;
-        putShortMSB(s, header);
-
-        /* Save the adler32 of the preset dictionary: */
-        if (s->strstart != 0) {
-            putShortMSB(s, (uInt)(strm->adler >> 16));
-            putShortMSB(s, (uInt)(strm->adler & 0xffff));
+#ifdef GZIP
+        if (s->wrap == 2) {
+            strm->adler = crc32(0L, Z_NULL, 0);
+            put_byte(s, 31);
+            put_byte(s, 139);
+            put_byte(s, 8);
+            if (s->gzhead == NULL) {
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, OS_CODE);
+                s->status = BUSY_STATE;
+            }
+            else {
+                put_byte(s, (s->gzhead->text ? 1 : 0) +
+                            (s->gzhead->hcrc ? 2 : 0) +
+                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                            (s->gzhead->name == Z_NULL ? 0 : 8) +
+                            (s->gzhead->comment == Z_NULL ? 0 : 16)
+                        );
+                put_byte(s, (Byte)(s->gzhead->time & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, s->gzhead->os & 0xff);
+                if (s->gzhead->extra != NULL) {
+                    put_byte(s, s->gzhead->extra_len & 0xff);
+                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+                }
+                if (s->gzhead->hcrc)
+                    strm->adler = crc32(strm->adler, s->pending_buf,
+                                        s->pending);
+                s->gzindex = 0;
+                s->status = EXTRA_STATE;
+            }
+        }
+        else
+#endif
+        {
+            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+            uInt level_flags;
+
+            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+                level_flags = 0;
+            else if (s->level < 6)
+                level_flags = 1;
+            else if (s->level == 6)
+                level_flags = 2;
+            else
+                level_flags = 3;
+            header |= (level_flags << 6);
+            if (s->strstart != 0) header |= PRESET_DICT;
+            header += 31 - (header % 31);
+
+            s->status = BUSY_STATE;
+            putShortMSB(s, header);
+
+            /* Save the adler32 of the preset dictionary: */
+            if (s->strstart != 0) {
+                putShortMSB(s, (uInt)(strm->adler >> 16));
+                putShortMSB(s, (uInt)(strm->adler & 0xffff));
+            }
+            strm->adler = adler32(0L, Z_NULL, 0);
         }
-        strm->adler = 1L;
     }
+#ifdef GZIP
+    if (s->status == EXTRA_STATE) {
+        if (s->gzhead->extra != NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+
+            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size)
+                        break;
+                }
+                put_byte(s, s->gzhead->extra[s->gzindex]);
+                s->gzindex++;
+            }
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (s->gzindex == s->gzhead->extra_len) {
+                s->gzindex = 0;
+                s->status = NAME_STATE;
+            }
+        }
+        else
+            s->status = NAME_STATE;
+    }
+    if (s->status == NAME_STATE) {
+        if (s->gzhead->name != NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->name[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0) {
+                s->gzindex = 0;
+                s->status = COMMENT_STATE;
+            }
+        }
+        else
+            s->status = COMMENT_STATE;
+    }
+    if (s->status == COMMENT_STATE) {
+        if (s->gzhead->comment != NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->comment[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0)
+                s->status = HCRC_STATE;
+        }
+        else
+            s->status = HCRC_STATE;
+    }
+    if (s->status == HCRC_STATE) {
+        if (s->gzhead->hcrc) {
+            if (s->pending + 2 > s->pending_buf_size)
+                flush_pending(strm);
+            if (s->pending + 2 <= s->pending_buf_size) {
+                put_byte(s, (Byte)(strm->adler & 0xff));
+                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+                strm->adler = crc32(0L, Z_NULL, 0);
+                s->status = BUSY_STATE;
+            }
+        }
+        else
+            s->status = BUSY_STATE;
+    }
+#endif
 
     /* Flush as much pending output as possible */
     if (s->pending != 0) {
@@ -525,7 +793,7 @@ int ZEXPORT deflate (strm, flush)
 
     /* Make sure there is something to do and avoid duplicate consecutive
      * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUFF_ERROR.
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
      */
     } else if (strm->avail_in == 0 && flush <= old_flush &&
                flush != Z_FINISH) {
@@ -583,16 +851,31 @@ int ZEXPORT deflate (strm, flush)
     Assert(strm->avail_out > 0, "bug2");
 
     if (flush != Z_FINISH) return Z_OK;
-    if (s->noheader) return Z_STREAM_END;
+    if (s->wrap <= 0) return Z_STREAM_END;
 
-    /* Write the zlib trailer (adler32) */
-    putShortMSB(s, (uInt)(strm->adler >> 16));
-    putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
     flush_pending(strm);
     /* If avail_out is zero, the application will call deflate again
      * to flush the rest.
      */
-    s->noheader = -1; /* write the trailer only once! */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
     return s->pending != 0 ? Z_OK : Z_STREAM_END;
 }
 
@@ -605,7 +888,12 @@ int ZEXPORT deflateEnd (strm)
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
 
     status = strm->state->status;
-    if (status != INIT_STATE && status != BUSY_STATE &&
+    if (status != INIT_STATE &&
+        status != EXTRA_STATE &&
+        status != NAME_STATE &&
+        status != COMMENT_STATE &&
+        status != HCRC_STATE &&
+        status != BUSY_STATE &&
         status != FINISH_STATE) {
       return Z_STREAM_ERROR;
     }
@@ -645,12 +933,12 @@ int ZEXPORT deflateCopy (dest, source)
 
     ss = source->state;
 
-    *dest = *source;
+    zmemcpy(dest, source, sizeof(z_stream));
 
     ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
     if (ds == Z_NULL) return Z_MEM_ERROR;
     dest->state = (struct internal_state FAR *) ds;
-    *ds = *ss;
+    zmemcpy(ds, ss, sizeof(deflate_state));
     ds->strm = dest;
 
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
@@ -679,7 +967,7 @@ int ZEXPORT deflateCopy (dest, source)
     ds->bl_desc.dyn_tree = ds->bl_tree;
 
     return Z_OK;
-#endif
+#endif /* MAXSEG_64K */
 }
 
 /* ===========================================================================
@@ -701,9 +989,14 @@ local int read_buf(strm, buf, size)
 
     strm->avail_in  -= len;
 
-    if (!strm->state->noheader) {
+    if (strm->state->wrap == 1) {
         strm->adler = adler32(strm->adler, strm->next_in, len);
     }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, strm->next_in, len);
+    }
+#endif
     zmemcpy(buf, strm->next_in, len);
     strm->next_in  += len;
     strm->total_in += len;
@@ -734,11 +1027,14 @@ local void lm_init (s)
     s->match_length = s->prev_length = MIN_MATCH-1;
     s->match_available = 0;
     s->ins_h = 0;
+#ifndef FASTEST
 #ifdef ASMV
     match_init(); /* initialize the asm code */
 #endif
+#endif
 }
 
+#ifndef FASTEST
 /* ===========================================================================
  * Set match_start to the longest match starting at the given string and
  * return its length. Matches shorter or equal to prev_length are discarded,
@@ -752,7 +1048,6 @@ local void lm_init (s)
 /* For 80x86 and 680x0, an optimized version will be provided in match.asm or
  * match.S. The code will be functionally equivalent.
  */
-#ifndef FASTEST
 local uInt longest_match(s, cur_match)
     deflate_state *s;
     IPos cur_match;                             /* current match */
@@ -805,7 +1100,12 @@ local uInt longest_match(s, cur_match)
         match = s->window + cur_match;
 
         /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2:
+         * or if the match length is less than 2.  Note that the checks below
+         * for insufficient lookahead only occur occasionally for performance
+         * reasons.  Therefore uninitialized memory will be accessed, and
+         * conditional jumps will be made that depend on those values.
+         * However the length of the match is limited to the lookahead, so
+         * the output of deflate is not affected by the uninitialized values.
          */
 #if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
         /* This code assumes sizeof(unsigned short) == 2. Do not use
@@ -890,12 +1190,13 @@ local uInt longest_match(s, cur_match)
     if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
     return s->lookahead;
 }
+#endif /* ASMV */
+#endif /* FASTEST */
 
-#else /* FASTEST */
 /* ---------------------------------------------------------------------------
- * Optimized version for level == 1 only
+ * Optimized version for level == 1 or strategy == Z_RLE only
  */
-local uInt longest_match(s, cur_match)
+local uInt longest_match_fast(s, cur_match)
     deflate_state *s;
     IPos cur_match;                             /* current match */
 {
@@ -945,10 +1246,8 @@ local uInt longest_match(s, cur_match)
     if (len < MIN_MATCH) return MIN_MATCH - 1;
 
     s->match_start = cur_match;
-    return len <= s->lookahead ? len : s->lookahead;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
 }
-#endif /* FASTEST */
-#endif /* ASMV */
 
 #ifdef DEBUG
 /* ===========================================================================
@@ -976,7 +1275,7 @@ local void check_match(s, start, match, length)
 }
 #else
 #  define check_match(s, start, match, length)
-#endif
+#endif /* DEBUG */
 
 /* ===========================================================================
  * Fill the window when the lookahead becomes insufficient.
@@ -1000,19 +1299,22 @@ local void fill_window(s)
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
         /* Deal with !@#$% 64K limit: */
-        if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-            more = wsize;
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
 
-        } else if (more == (unsigned)(-1)) {
-            /* Very unlikely, but possible on 16 bit machine if strstart == 0
-             * and lookahead == 1 (input done one byte at time)
-             */
-            more--;
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
 
         /* 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.
          */
-        } else if (s->strstart >= wsize+MAX_DIST(s)) {
+        if (s->strstart >= wsize+MAX_DIST(s)) {
 
             zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
             s->match_start -= wsize;
@@ -1025,6 +1327,7 @@ local void fill_window(s)
                later. (Using level 0 permanently is not an optimal usage of
                zlib, so we don't care about this pathological case.)
              */
+            /* %%% avoid this when Z_RLE */
             n = s->hash_size;
             p = &s->head[n];
             do {
@@ -1202,10 +1505,19 @@ local block_state deflate_fast(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-            if (s->strategy != Z_HUFFMAN_ONLY) {
-                s->match_length = longest_match (s, hash_head);
+#ifdef FASTEST
+            if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||
+                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
+                s->match_length = longest_match_fast (s, hash_head);
             }
-            /* longest_match() sets match_start */
+#else
+            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
+                s->match_length = longest_match (s, hash_head);
+            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
+                s->match_length = longest_match_fast (s, hash_head);
+            }
+#endif
+            /* longest_match() or longest_match_fast() sets match_start */
         }
         if (s->match_length >= MIN_MATCH) {
             check_match(s, s->strstart, s->match_start, s->match_length);
@@ -1221,7 +1533,7 @@ local block_state deflate_fast(s, flush)
 #ifndef FASTEST
             if (s->match_length <= s->max_insert_length &&
                 s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in hash table */
+                s->match_length--; /* string at strstart already in table */
                 do {
                     s->strstart++;
                     INSERT_STRING(s, s->strstart, hash_head);
@@ -1257,6 +1569,7 @@ local block_state deflate_fast(s, flush)
     return flush == Z_FINISH ? finish_done : block_done;
 }
 
+#ifndef FASTEST
 /* ===========================================================================
  * Same as above, but achieves better compression. We use a lazy
  * evaluation for matches: a match is finally adopted only if there is
@@ -1302,14 +1615,19 @@ local block_state deflate_slow(s, flush)
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
-            if (s->strategy != Z_HUFFMAN_ONLY) {
+            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
                 s->match_length = longest_match (s, hash_head);
+            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
+                s->match_length = longest_match_fast (s, hash_head);
             }
-            /* longest_match() sets match_start */
+            /* longest_match() or longest_match_fast() sets match_start */
 
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED ||
-                 (s->match_length == MIN_MATCH &&
-                  s->strstart - s->match_start > TOO_FAR))) {
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
 
                 /* If prev_match is also MIN_MATCH, match_start is garbage
                  * but we will ignore the current match anyway.
@@ -1378,3 +1696,65 @@ local block_state deflate_slow(s, flush)
     FLUSH_BLOCK(s, flush == Z_FINISH);
     return flush == Z_FINISH ? finish_done : block_done;
 }
+#endif /* FASTEST */
+
+#if 0
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;         /* set if current block must be flushed */
+    uInt run;           /* length of run */
+    uInt max;           /* maximum length of run */
+    uInt prev;          /* byte at distance one to match */
+    Bytef *scan;        /* scan for end of run */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the longest encodable run.
+         */
+        if (s->lookahead < MAX_MATCH) {
+            fill_window(s);
+            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* See how many times the previous byte repeats */
+        run = 0;
+        if (s->strstart > 0) {      /* if there is a previous byte, that is */
+            max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;
+            scan = s->window + s->strstart - 1;
+            prev = *scan++;
+            do {
+                if (*scan++ != prev)
+                    break;
+            } while (++run < max);
+        }
+
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+        if (run >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, run);
+            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);
+            s->lookahead -= run;
+            s->strstart += run;
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    FLUSH_BLOCK(s, flush == Z_FINISH);
+    return flush == Z_FINISH ? finish_done : block_done;
+}
+#endif
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/deflate.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.h
similarity index 93%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/deflate.h
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.h
index 49dbe0f71dd..8e762943167 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/deflate.h
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/deflate.h
@@ -22,14 +22,8 @@
  * 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 and, per its terms, should not be removed:
- *
- * deflate.h -- internal compression state
- * Copyright (C) 1995-1998 Jean-loup Gailly
+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-2004 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -38,11 +32,21 @@
    subject to change. Applications should only use zlib.h.
  */
 
-#ifndef _DEFLATE_H
-#define _DEFLATE_H
+/* @(#) $Id$ */
+
+#ifndef DEFLATE_H
+#define DEFLATE_H
 
 #include "zutil.h"
 
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip encoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GZIP
+#endif
+
 /* ===========================================================================
  * Internal compression state.
  */
@@ -69,6 +73,10 @@
 /* All codes must not exceed MAX_BITS bits */
 
 #define INIT_STATE    42
+#define EXTRA_STATE   69
+#define NAME_STATE    73
+#define COMMENT_STATE 91
+#define HCRC_STATE   103
 #define BUSY_STATE   113
 #define FINISH_STATE 666
 /* Stream status */
@@ -113,9 +121,10 @@ typedef struct internal_state {
     Bytef *pending_buf;  /* output still pending */
     ulg   pending_buf_size; /* size of pending_buf */
     Bytef *pending_out;  /* next pending byte to output to the stream */
-    int   pending;       /* nb of bytes in the pending buffer */
-    int   noheader;      /* suppress zlib header and adler32 */
-    Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
+    uInt   pending;      /* nb of bytes in the pending buffer */
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    uInt   gzindex;      /* where in extra, name, or comment */
     Byte  method;        /* STORED (for zip only) or DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
@@ -343,4 +352,4 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
               flush = _tr_tally(s, distance, length)
 #endif
 
-#endif
+#endif /* DEFLATE_H */
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/gzio.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/gzio.c
similarity index 77%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/gzio.c
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/gzio.c
index 95bdb7d9122..aae1d1550a9 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/gzio.c
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/gzio.c
@@ -22,24 +22,26 @@
  * 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 and, per its terms, should not be removed:
- *
- * gzio.c -- IO on .gz files
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+/* gzio.c -- IO on .gz files
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
- * Compile this file with -DNO_DEFLATE to avoid the compression code.
+ * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
  */
 
+/* @(#) $Id$ */
+
 #include <stdio.h>
 
 #include "zutil.h"
 
+#ifdef NO_DEFLATE       /* for compatibility with old definition */
+#  define NO_GZCOMPRESS
+#endif
+
+#ifndef NO_DUMMY_DECL
 struct internal_state {int dummy;}; /* for buggy compilers */
+#endif
 
 #ifndef Z_BUFSIZE
 #  ifdef MAXSEG_64K
@@ -52,10 +54,20 @@ struct internal_state {int dummy;}; /* for buggy compilers */
 #  define Z_PRINTF_BUFSIZE 4096
 #endif
 
+#ifdef __MVS__
+#  pragma map (fdopen , "\174\174FDOPEN")
+   FILE *fdopen(int, const char *);
+#endif
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
 #define ALLOC(size) malloc(size)
 #define TRYFREE(p) {if (p) free(p);}
 
-static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
+static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
 
 /* gzip flag byte */
 #define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
@@ -77,7 +89,11 @@ typedef struct gz_stream {
     char     *path;   /* path name for debugging only */
     int      transparent; /* 1 if input file is not a .gz file */
     char     mode;    /* 'w' or 'r' */
-    long     startpos; /* start of compressed data in file (header skipped) */
+    z_off_t  start;   /* start of compressed data in file (header skipped) */
+    z_off_t  in;      /* bytes into deflate or inflate */
+    z_off_t  out;     /* bytes out of deflate or inflate */
+    int      back;    /* one character push-back */
+    int      last;    /* true if push-back is last character */
 } gz_stream;
 
 
@@ -93,7 +109,7 @@ local uLong  getLong      OF((gz_stream *s));
      Opens a gzip (.gz) file for reading or writing. The mode parameter
    is as in fopen ("rb" or "wb"). The file is given either by file descriptor
    or path name (if fd == -1).
-     gz_open return NULL if the file could not be opened or if there was
+     gz_open returns NULL if the file could not be opened or if there was
    insufficient memory to allocate the (de)compression state; errno
    can be checked to distinguish the two cases (if errno is zero, the
    zlib error is Z_MEM_ERROR).
@@ -125,6 +141,9 @@ local gzFile gz_open (path, mode, fd)
     s->file = NULL;
     s->z_err = Z_OK;
     s->z_eof = 0;
+    s->in = 0;
+    s->out = 0;
+    s->back = EOF;
     s->crc = crc32(0L, Z_NULL, 0);
     s->msg = NULL;
     s->transparent = 0;
@@ -145,6 +164,8 @@ local gzFile gz_open (path, mode, fd)
           strategy = Z_FILTERED;
         } else if (*p == 'h') {
           strategy = Z_HUFFMAN_ONLY;
+        } else if (*p == 'R') {
+          strategy = Z_RLE;
         } else {
             *m++ = *p; /* copy the mode */
         }
@@ -152,7 +173,7 @@ local gzFile gz_open (path, mode, fd)
     if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
 
     if (s->mode == 'w') {
-#ifdef NO_DEFLATE
+#ifdef NO_GZCOMPRESS
         err = Z_STREAM_ERROR;
 #else
         err = deflateInit2(&(s->stream), level,
@@ -191,15 +212,15 @@ local gzFile gz_open (path, mode, fd)
          */
         fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
              Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-        s->startpos = 10L;
+        s->start = 10L;
         /* We use 10L instead of ftell(s->file) to because ftell causes an
          * fflush on some systems. This version of the library doesn't use
-         * startpos anyway in write mode, so this initialization is not
+         * start anyway in write mode, so this initialization is not
          * necessary.
          */
     } else {
         check_header(s); /* skip the .gz header */
-        s->startpos = (ftell(s->file) - s->stream.avail_in);
+        s->start = ftell(s->file) - s->stream.avail_in;
     }
 
     return (gzFile)s;
@@ -223,7 +244,7 @@ gzFile ZEXPORT gzdopen (fd, mode)
     int fd;
     const char *mode;
 {
-    char name[20];
+    char name[46];      /* allow for up to 128-bit integers */
 
     if (fd < 0) return (gzFile)Z_NULL;
     sprintf(name, "<fd:%d>", fd); /* for debugging */
@@ -267,7 +288,7 @@ local int get_byte(s)
     if (s->z_eof) return EOF;
     if (s->stream.avail_in == 0) {
         errno = 0;
-        s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+        s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
         if (s->stream.avail_in == 0) {
             s->z_eof = 1;
             if (ferror(s->file)) s->z_err = Z_ERRNO;
@@ -296,19 +317,33 @@ local void check_header(s)
     uInt len;
     int c;
 
-    /* Check the gzip magic header */
-    for (len = 0; len < 2; len++) {
-        c = get_byte(s);
-        if (c != gz_magic[len]) {
-            if (len != 0) s->stream.avail_in++, s->stream.next_in--;
-            if (c != EOF) {
-                s->stream.avail_in++, s->stream.next_in--;
-                s->transparent = 1;
-            }
-            s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
+    /* Assure two bytes in the buffer so we can peek ahead -- handle case
+       where first byte of header is at the end of the buffer after the last
+       gzip segment */
+    len = s->stream.avail_in;
+    if (len < 2) {
+        if (len) s->inbuf[0] = s->stream.next_in[0];
+        errno = 0;
+        len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
+        if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
+        s->stream.avail_in += len;
+        s->stream.next_in = s->inbuf;
+        if (s->stream.avail_in < 2) {
+            s->transparent = s->stream.avail_in;
             return;
         }
     }
+
+    /* Peek ahead to check the gzip magic header */
+    if (s->stream.next_in[0] != gz_magic[0] ||
+        s->stream.next_in[1] != gz_magic[1]) {
+        s->transparent = 1;
+        return;
+    }
+    s->stream.avail_in -= 2;
+    s->stream.next_in += 2;
+
+    /* Check the rest of the gzip header */
     method = get_byte(s);
     flags = get_byte(s);
     if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
@@ -352,7 +387,7 @@ local int destroy (s)
 
     if (s->stream.state != NULL) {
         if (s->mode == 'w') {
-#ifdef NO_DEFLATE
+#ifdef NO_GZCOMPRESS
             err = Z_STREAM_ERROR;
 #else
             err = deflateEnd(&(s->stream));
@@ -398,6 +433,19 @@ int ZEXPORT gzread (file, buf, len)
     s->stream.next_out = (Bytef*)buf;
     s->stream.avail_out = len;
 
+    if (s->stream.avail_out && s->back != EOF) {
+        *next_out++ = s->back;
+        s->stream.next_out++;
+        s->stream.avail_out--;
+        s->back = EOF;
+        s->out++;
+        start++;
+        if (s->last) {
+            s->z_err = Z_STREAM_END;
+            return 1;
+        }
+    }
+
     while (s->stream.avail_out != 0) {
 
         if (s->transparent) {
@@ -413,19 +461,19 @@ int ZEXPORT gzread (file, buf, len)
                 s->stream.avail_in  -= n;
             }
             if (s->stream.avail_out > 0) {
-                s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,
-                                             s->file);
+                s->stream.avail_out -=
+                    (uInt)fread(next_out, 1, s->stream.avail_out, s->file);
             }
             len -= s->stream.avail_out;
-            s->stream.total_in  += (uLong)len;
-            s->stream.total_out += (uLong)len;
+            s->in  += len;
+            s->out += len;
             if (len == 0) s->z_eof = 1;
             return (int)len;
         }
         if (s->stream.avail_in == 0 && !s->z_eof) {
 
             errno = 0;
-            s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
+            s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
             if (s->stream.avail_in == 0) {
                 s->z_eof = 1;
                 if (ferror(s->file)) {
@@ -435,7 +483,11 @@ int ZEXPORT gzread (file, buf, len)
             }
             s->stream.next_in = s->inbuf;
         }
+        s->in += s->stream.avail_in;
+        s->out += s->stream.avail_out;
         s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
+        s->in -= s->stream.avail_in;
+        s->out -= s->stream.avail_out;
 
         if (s->z_err == Z_STREAM_END) {
             /* Check CRC and original size */
@@ -446,18 +498,13 @@ int ZEXPORT gzread (file, buf, len)
                 s->z_err = Z_DATA_ERROR;
             } else {
                 (void)getLong(s);
-                /* The uncompressed length returned by above getlong() may
-                 * be different from s->stream.total_out) in case of
-                 * concatenated .gz files. Check for such files:
+                /* The uncompressed length returned by above getlong() may be
+                 * different from s->out in case of concatenated .gz files.
+                 * Check for such files:
                  */
                 check_header(s);
                 if (s->z_err == Z_OK) {
-                    uLong total_in = s->stream.total_in;
-                    uLong total_out = s->stream.total_out;
-
                     inflateReset(&(s->stream));
-                    s->stream.total_in = total_in;
-                    s->stream.total_out = total_out;
                     s->crc = crc32(0L, Z_NULL, 0);
                 }
             }
@@ -466,6 +513,9 @@ int ZEXPORT gzread (file, buf, len)
     }
     s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
 
+    if (len == s->stream.avail_out &&
+        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
+        return -1;
     return (int)(len - s->stream.avail_out);
 }
 
@@ -483,6 +533,25 @@ int ZEXPORT gzgetc(file)
 }
 
 
+/* ===========================================================================
+      Push one byte back onto the stream.
+*/
+int ZEXPORT gzungetc(c, file)
+    int c;
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;
+    s->back = c;
+    s->out--;
+    s->last = (s->z_err == Z_STREAM_END);
+    if (s->last) s->z_err = Z_OK;
+    s->z_eof = 0;
+    return c;
+}
+
+
 /* ===========================================================================
       Reads bytes from the compressed file until len-1 characters are
    read, or a newline character is read and transferred to buf, or an
@@ -506,14 +575,14 @@ char * ZEXPORT gzgets(file, buf, len)
 }
 
 
-#ifndef NO_DEFLATE
+#ifndef NO_GZCOMPRESS
 /* ===========================================================================
      Writes the given number of uncompressed bytes into the compressed file.
    gzwrite returns the number of bytes actually written (0 in case of error).
 */
 int ZEXPORT gzwrite (file, buf, len)
     gzFile file;
-    const voidp buf;
+    voidpc buf;
     unsigned len;
 {
     gz_stream *s = (gz_stream*)file;
@@ -534,7 +603,11 @@ int ZEXPORT gzwrite (file, buf, len)
             }
             s->stream.avail_out = Z_BUFSIZE;
         }
+        s->in += s->stream.avail_in;
+        s->out += s->stream.avail_out;
         s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
+        s->in -= s->stream.avail_in;
+        s->out -= s->stream.avail_out;
         if (s->z_err != Z_OK) break;
     }
     s->crc = crc32(s->crc, (const Bytef *)buf, len);
@@ -542,6 +615,7 @@ int ZEXPORT gzwrite (file, buf, len)
     return (int)(len - s->stream.avail_in);
 }
 
+
 /* ===========================================================================
      Converts, formats, and writes the args to the compressed file under
    control of the format string, as in fprintf. gzprintf returns the number of
@@ -556,16 +630,30 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
     va_list va;
     int len;
 
+    buf[sizeof(buf) - 1] = 0;
     va_start(va, format);
-#ifdef HAS_vsnprintf
-    (void)vsnprintf(buf, sizeof(buf), format, va);
-#else
+#ifdef NO_vsnprintf
+#  ifdef HAS_vsprintf_void
     (void)vsprintf(buf, format, va);
-#endif
     va_end(va);
-    len = strlen(buf); /* some *sprintf don't return the nb of bytes written */
-    if (len <= 0) return 0;
-
+    for (len = 0; len < sizeof(buf); len++)
+        if (buf[len] == 0) break;
+#  else
+    len = vsprintf(buf, format, va);
+    va_end(va);
+#  endif
+#else
+#  ifdef HAS_vsnprintf_void
+    (void)vsnprintf(buf, sizeof(buf), format, va);
+    va_end(va);
+    len = strlen(buf);
+#  else
+    len = vsnprintf(buf, sizeof(buf), format, va);
+    va_end(va);
+#  endif
+#endif
+    if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)
+        return 0;
     return gzwrite(file, buf, (unsigned)len);
 }
 #else /* not ANSI C */
@@ -580,16 +668,29 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
     char buf[Z_PRINTF_BUFSIZE];
     int len;
 
-#ifdef HAS_snprintf
-    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#else
+    buf[sizeof(buf) - 1] = 0;
+#ifdef NO_snprintf
+#  ifdef HAS_sprintf_void
     sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    for (len = 0; len < sizeof(buf); len++)
+        if (buf[len] == 0) break;
+#  else
+    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
+                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#else
+#  ifdef HAS_snprintf_void
+    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
+             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = strlen(buf);
+#  else
+    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
+                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
 #endif
-    len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */
-    if (len <= 0) return 0;
-
+    if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
+        return 0;
     return gzwrite(file, buf, len);
 }
 #endif
@@ -649,7 +750,9 @@ local int do_flush (file, flush)
             s->stream.avail_out = Z_BUFSIZE;
         }
         if (done) break;
+        s->out += s->stream.avail_out;
         s->z_err = deflate(&(s->stream), flush);
+        s->out -= s->stream.avail_out;
 
         /* Ignore the second of two consecutive flushes: */
         if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
@@ -675,7 +778,7 @@ int ZEXPORT gzflush (file, flush)
     fflush(s->file);
     return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
 }
-#endif /* NO_DEFLATE */
+#endif /* NO_GZCOMPRESS */
 
 /* ===========================================================================
       Sets the starting position for the next gzread or gzwrite on the given
@@ -698,17 +801,18 @@ z_off_t ZEXPORT gzseek (file, offset, whence)
     }
 
     if (s->mode == 'w') {
-#ifdef NO_DEFLATE
+#ifdef NO_GZCOMPRESS
         return -1L;
 #else
         if (whence == SEEK_SET) {
-            offset -= s->stream.total_in;
+            offset -= s->in;
         }
         if (offset < 0) return -1L;
 
         /* At this point, offset is the number of zero bytes to write. */
         if (s->inbuf == Z_NULL) {
             s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
+            if (s->inbuf == Z_NULL) return -1L;
             zmemzero(s->inbuf, Z_BUFSIZE);
         }
         while (offset > 0)  {
@@ -720,30 +824,31 @@ z_off_t ZEXPORT gzseek (file, offset, whence)
 
             offset -= size;
         }
-        return (z_off_t)s->stream.total_in;
+        return s->in;
 #endif
     }
     /* Rest of function is for reading only */
 
     /* compute absolute position */
     if (whence == SEEK_CUR) {
-        offset += s->stream.total_out;
+        offset += s->out;
     }
     if (offset < 0) return -1L;
 
     if (s->transparent) {
         /* map to fseek */
+        s->back = EOF;
         s->stream.avail_in = 0;
         s->stream.next_in = s->inbuf;
         if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
 
-        s->stream.total_in = s->stream.total_out = (uLong)offset;
+        s->in = s->out = offset;
         return offset;
     }
 
     /* For a negative seek, rewind and use positive seek */
-    if ((uLong)offset >= s->stream.total_out) {
-        offset -= s->stream.total_out;
+    if (offset >= s->out) {
+        offset -= s->out;
     } else if (gzrewind(file) < 0) {
         return -1L;
     }
@@ -751,6 +856,13 @@ z_off_t ZEXPORT gzseek (file, offset, whence)
 
     if (offset != 0 && s->outbuf == Z_NULL) {
         s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+        if (s->outbuf == Z_NULL) return -1L;
+    }
+    if (offset && s->back != EOF) {
+        s->back = EOF;
+        s->out++;
+        offset--;
+        if (s->last) s->z_err = Z_STREAM_END;
     }
     while (offset > 0)  {
         int size = Z_BUFSIZE;
@@ -760,7 +872,7 @@ z_off_t ZEXPORT gzseek (file, offset, whence)
         if (size <= 0) return -1L;
         offset -= size;
     }
-    return (z_off_t)s->stream.total_out;
+    return s->out;
 }
 
 /* ===========================================================================
@@ -775,17 +887,14 @@ int ZEXPORT gzrewind (file)
 
     s->z_err = Z_OK;
     s->z_eof = 0;
+    s->back = EOF;
     s->stream.avail_in = 0;
     s->stream.next_in = s->inbuf;
     s->crc = crc32(0L, Z_NULL, 0);
-
-    if (s->startpos == 0) { /* not a compressed file */
-        rewind(s->file);
-        return 0;
-    }
-
-    (void) inflateReset(&s->stream);
-    return fseek(s->file, s->startpos, SEEK_SET);
+    if (!s->transparent) (void)inflateReset(&s->stream);
+    s->in = 0;
+    s->out = 0;
+    return fseek(s->file, s->start, SEEK_SET);
 }
 
 /* ===========================================================================
@@ -808,7 +917,25 @@ int ZEXPORT gzeof (file)
 {
     gz_stream *s = (gz_stream*)file;
 
-    return (s == NULL || s->mode != 'r') ? 0 : s->z_eof;
+    /* With concatenated compressed files that can have embedded
+     * crc trailers, z_eof is no longer the only/best indicator of EOF
+     * on a gz_stream. Handle end-of-stream error explicitly here.
+     */
+    if (s == NULL || s->mode != 'r') return 0;
+    if (s->z_eof) return 1;
+    return s->z_err == Z_STREAM_END;
+}
+
+/* ===========================================================================
+     Returns 1 if reading and doing so transparently, otherwise zero.
+*/
+int ZEXPORT gzdirect (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL || s->mode != 'r') return 0;
+    return s->transparent;
 }
 
 /* ===========================================================================
@@ -850,33 +977,38 @@ local uLong getLong (s)
 int ZEXPORT gzclose (file)
     gzFile file;
 {
-    int err;
     gz_stream *s = (gz_stream*)file;
 
     if (s == NULL) return Z_STREAM_ERROR;
 
     if (s->mode == 'w') {
-#ifdef NO_DEFLATE
+#ifdef NO_GZCOMPRESS
         return Z_STREAM_ERROR;
 #else
-        err = do_flush (file, Z_FINISH);
-        if (err != Z_OK) return destroy((gz_stream*)file);
+        if (do_flush (file, Z_FINISH) != Z_OK)
+            return destroy((gz_stream*)file);
 
         putLong (s->file, s->crc);
-        putLong (s->file, s->stream.total_in);
+        putLong (s->file, (uLong)(s->in & 0xffffffff));
 #endif
     }
     return destroy((gz_stream*)file);
 }
 
+#ifdef STDC
+#  define zstrerror(errnum) strerror(errnum)
+#else
+#  define zstrerror(errnum) ""
+#endif
+
 /* ===========================================================================
-     Returns the error message for the last error which occured on the
+     Returns the error message for the last error which occurred on the
    given compressed file. errnum is set to zlib error number. If an
-   error occured in the file system and not in the compression library,
+   error occurred in the file system and not in the compression library,
    errnum is set to Z_ERRNO and the application may consult errno
    to get the exact error code.
 */
-const char*  ZEXPORT gzerror (file, errnum)
+const char * ZEXPORT gzerror (file, errnum)
     gzFile file;
     int *errnum;
 {
@@ -890,14 +1022,29 @@ const char*  ZEXPORT gzerror (file, errnum)
     *errnum = s->z_err;
     if (*errnum == Z_OK) return (const char*)"";
 
-    m =  (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
+    m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
 
     if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
 
     TRYFREE(s->msg);
     s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
+    if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);
     strcpy(s->msg, s->path);
     strcat(s->msg, ": ");
     strcat(s->msg, m);
     return (const char*)s->msg;
 }
+
+/* ===========================================================================
+     Clear the error and end-of-file flags, and do the same for the real file.
+*/
+void ZEXPORT gzclearerr (file)
+    gzFile file;
+{
+    gz_stream *s = (gz_stream*)file;
+
+    if (s == NULL) return;
+    if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;
+    s->z_eof = 0;
+    clearerr(s->file);
+}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/infback.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/infback.c
new file mode 100644
index 00000000000..539f6c4d8ab
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/infback.c
@@ -0,0 +1,647 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* infback.c -- inflate using a call-back interface
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+   This code is largely copied from inflate.c.  Normally either infback.o or
+   inflate.o would be linked into an application--not both.  The interface
+   with inffast.c is retained so that optimized assembler-coded versions of
+   inflate_fast() can be used with either inflate.c or infback.c.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   windowBits is in the range 8..15, and window is a user-supplied
+   window and output buffer that is 2**windowBits bytes.
+ */
+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
+z_streamp strm;
+int windowBits;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL ||
+        windowBits < 8 || windowBits > 15)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->dmax = 32768U;
+    state->wbits = windowBits;
+    state->wsize = 1U << windowBits;
+    state->window = window;
+    state->write = 0;
+    state->whave = 0;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+/* Macros for inflateBack(): */
+
+/* Load returned state from inflate_fast() */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Set state from registers for inflate_fast() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = state->window; \
+            left = state->wsize; \
+            state->whave = left; \
+            if (out(out_desc, put, left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
+z_streamp strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code this;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    state->mode = TYPE;
+    state->last = 0;
+    state->whave = 0;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = state->window;
+    left = state->wsize;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (state->mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (state->last) {
+                BYTEBITS();
+                state->mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (state->length != 0) {
+                copy = state->length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    this = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (this.val < 16) {
+                    NEEDBITS(this.bits);
+                    DROPBITS(this.bits);
+                    state->lens[state->have++] = this.val;
+                }
+                else {
+                    if (this.val == 16) {
+                        NEEDBITS(this.bits + 2);
+                        DROPBITS(this.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (this.val == 17) {
+                        NEEDBITS(this.bits + 3);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(this.bits + 7);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* build code tables */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+
+        case LEN:
+            /* use inflate_fast() if we have enough input and output */
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                if (state->whave < state->wsize)
+                    state->whave = state->wsize - left;
+                inflate_fast(strm, state->wsize);
+                LOAD();
+                break;
+            }
+
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                this = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (this.op && (this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            state->length = (unsigned)this.val;
+
+            /* process literal */
+            if (this.op == 0) {
+                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", this.val));
+                ROOM();
+                *put++ = (unsigned char)(state->length);
+                left--;
+                state->mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (this.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            state->extra = (unsigned)(this.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+
+            /* get distance code */
+            for (;;) {
+                this = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)this.val;
+
+            /* get distance extra bits, if any */
+            state->extra = (unsigned)(this.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            if (state->offset > state->wsize - (state->whave < state->wsize ?
+                                                left : 0)) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = state->wsize - state->offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - state->offset;
+                    copy = left;
+                }
+                if (copy > state->length) copy = state->length;
+                state->length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (state->length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly -- write leftover output */
+            ret = Z_STREAM_END;
+            if (left < state->wsize) {
+                if (out(out_desc, state->window, state->wsize - left))
+                    ret = Z_BUF_ERROR;
+            }
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:                /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Return unused input */
+  inf_leave:
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBackEnd(strm)
+z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.c
new file mode 100644
index 00000000000..5dae7a2e590
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.c
@@ -0,0 +1,342 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* inffast.c -- fast decoding
+ * Copyright (C) 1995-2004 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifndef ASMINF
+
+/* Allow machine dependent optimization for post-increment or pre-increment.
+   Based on testing to date,
+   Pre-increment preferred for:
+   - PowerPC G3 (Adler)
+   - MIPS R5000 (Randers-Pehrson)
+   Post-increment preferred for:
+   - none
+   No measurable difference:
+   - Pentium III (Anderson)
+   - M68060 (Nikl)
+ */
+#ifdef POSTINC
+#  define OFF 0
+#  define PUP(a) *(a)++
+#else
+#  define OFF 1
+#  define PUP(a) *++(a)
+#endif
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *in;      /* local strm->next_in */
+    unsigned char FAR *last;    /* while in < last, enough input available */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned write;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code this;                  /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in - OFF;
+    last = in + (strm->avail_in - 5);
+    out = strm->next_out - OFF;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    write = state->write;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+        }
+        this = lcode[hold & lmask];
+      dolen:
+        op = (unsigned)(this.bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(this.op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", this.val));
+            PUP(out) = (unsigned char)(this.val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(this.val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+            }
+            this = dcode[hold & dmask];
+          dodist:
+            op = (unsigned)(this.bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(this.op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(this.val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(PUP(in)) << bits;
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+                    from = window - OFF;
+                    if (write == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (write < op) {      /* wrap around window */
+                        from += wsize + write - op;
+                        op -= write;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = window - OFF;
+                            if (write < len) {  /* some from start of window */
+                                op = write;
+                                len -= op;
+                                do {
+                                    PUP(out) = PUP(from);
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += write - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    while (len > 2) {
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    }
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    do {                        /* minimum length is three */
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    } while (len > 2);
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                this = dcode[this.val + (hold & ((1U << op) - 1))];
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            this = lcode[this.val + (hold & ((1U << op) - 1))];
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in + OFF;
+    strm->next_out = out + OFF;
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and write == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inffast.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.h
similarity index 74%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/inffast.h
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.h
index cdbc9110f73..17ef8cace9f 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/inffast.h
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffast.h
@@ -22,14 +22,8 @@
  * 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 and, per its terms, should not be removed:
- *
- * inffast.h -- header to use inffast.c
- * Copyright (C) 1995-1998 Mark Adler
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -38,10 +32,4 @@
    subject to change. Applications should only use zlib.h.
  */
 
-extern int inflate_fast OF((
-    uInt,
-    uInt,
-    inflate_huft *,
-    inflate_huft *,
-    inflate_blocks_statef *,
-    z_streamp ));
+void inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h
new file mode 100644
index 00000000000..a73b430e45a
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h
@@ -0,0 +1,118 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+    /* inffixed.h -- table for decoding fixed codes
+     * Generated automatically by makefixed().
+     */
+
+    /* WARNING: this file should *not* be used by applications. It
+       is part of the implementation of the compression library and
+       is subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+        {0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+        {22,5,193},{64,5,0}
+    };
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.c
new file mode 100644
index 00000000000..d20360114a8
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.c
@@ -0,0 +1,1392 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common write == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, unsigned out));
+#ifdef BUILDFIXED
+   void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+                              unsigned len));
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    strm->adler = 1;        /* to support ill-conceived Java test suite */
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->wsize = 0;
+    state->whave = 0;
+    state->write = 0;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += value << state->bits;
+    state->bits += bits;
+    return Z_OK;
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+    }
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    if (windowBits < 0) {
+        state->wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        state->wrap = (windowBits >> 4) + 1;
+#ifdef GUNZIP
+        if (windowBits < 48) windowBits &= 15;
+#endif
+    }
+    if (windowBits < 8 || windowBits > 15) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+        return Z_STREAM_ERROR;
+    }
+    state->wbits = (unsigned)windowBits;
+    state->window = Z_NULL;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed()
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
+               state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, out)
+z_streamp strm;
+unsigned out;
+{
+    struct inflate_state FAR *state;
+    unsigned copy, dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, 1U << state->wbits,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->write = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    copy = out - strm->avail_out;
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
+        state->write = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->write;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->write, strm->next_out - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, strm->next_out - copy, copy);
+            state->write = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->write += dist;
+            if (state->write == state->wsize) state->write = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Reverse the bytes in a 32-bit value */
+#define REVERSE(q) \
+    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+    struct inflate_state FAR *state;
+    unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code this;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            state->flags = 0;           /* expect zlib header */
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (len > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
+            if (state->flags & 0x0200) CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
+                if (state->flags & 0x0200) CRC2(state->check, hold);
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL) {
+                        len = state->head->extra_len - state->length;
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
+                    if (state->flags & 0x0200)
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                        state->head->name[state->length++] = len;
+                } while (len && copy < have);
+                if (state->flags & 0x0200)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
+                        state->head->comment[state->length++] = len;
+                } while (len && copy < have);
+                if (state->flags & 0x0200)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if (hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = REVERSE(hold);
+            INITBITS();
+            state->mode = DICT;
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+        case TYPE:
+            if (flush == Z_BLOCK) goto inf_leave;
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY;
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    this = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (this.val < 16) {
+                    NEEDBITS(this.bits);
+                    DROPBITS(this.bits);
+                    state->lens[state->have++] = this.val;
+                }
+                else {
+                    if (this.val == 16) {
+                        NEEDBITS(this.bits + 2);
+                        DROPBITS(this.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (this.val == 17) {
+                        NEEDBITS(this.bits + 3);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(this.bits + 7);
+                        DROPBITS(this.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* build code tables */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+        case LEN:
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                inflate_fast(strm, out);
+                LOAD();
+                break;
+            }
+            for (;;) {
+                this = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (this.op && (this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            state->length = (unsigned)this.val;
+            if ((int)(this.op) == 0) {
+                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", this.val));
+                state->mode = LIT;
+                break;
+            }
+            if (this.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(this.op) & 15;
+            state->mode = LENEXT;
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->mode = DIST;
+        case DIST:
+            for (;;) {
+                this = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(this.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((this.op & 0xf0) == 0) {
+                last = this;
+                for (;;) {
+                    this = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + this.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(this.bits);
+            if (this.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)this.val;
+            state->extra = (unsigned)(this.op) & 15;
+            state->mode = DISTEXT;
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            if (state->offset > state->whave + out - left) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->write) {
+                    copy -= state->write;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->write - copy);
+                if (copy > state->length) copy = state->length;
+            }
+            else {                              /* copy from output */
+                from = put - state->offset;
+                copy = state->length;
+            }
+            if (copy > left) copy = left;
+            left -= copy;
+            state->length -= copy;
+            do {
+                *put++ = *from++;
+            } while (--copy);
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if (out)
+                    strm->adler = state->check =
+                        UPDATE(state->check, put - out, out);
+                out = left;
+                if ((
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     REVERSE(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if (hold != (state->total & 0xffffffffUL)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+    RESTORE();
+    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
+        if (updatewindow(strm, out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if (state->wrap && out)
+        strm->adler = state->check =
+            UPDATE(state->check, strm->next_out - out, out);
+    strm->data_type = state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+    struct inflate_state FAR *state;
+    unsigned long id;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary id */
+    if (state->mode == DICT) {
+        id = adler32(0L, Z_NULL, 0);
+        id = adler32(id, dictionary, dictLength);
+        if (id != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window */
+    if (updatewindow(strm, strm->avail_out)) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    if (dictLength > state->wsize) {
+        zmemcpy(state->window, dictionary + dictLength - state->wsize,
+                state->wsize);
+        state->whave = state->wsize;
+    }
+    else {
+        zmemcpy(state->window + state->wsize - dictLength, dictionary,
+                dictLength);
+        state->whave = dictLength;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+unsigned char FAR *buf;
+unsigned len;
+{
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+    unsigned len;               /* number of bytes to look at or looked at */
+    long long in, out;          /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
+    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
+        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy(dest, source, sizeof(z_stream));
+    zmemcpy(copy, state, sizeof(struct inflate_state));
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.h
new file mode 100644
index 00000000000..b33312c8d71
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inflate.h
@@ -0,0 +1,139 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* inflate.h -- internal inflate state definition
+ * Copyright (C) 1995-2004 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip decoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GUNZIP
+#endif
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
+    HEAD,       /* i: waiting for magic header */
+    FLAGS,      /* i: waiting for method and flags (gzip) */
+    TIME,       /* i: waiting for modification time (gzip) */
+    OS,         /* i: waiting for extra flags and operating system (gzip) */
+    EXLEN,      /* i: waiting for extra length (gzip) */
+    EXTRA,      /* i: waiting for extra bytes (gzip) */
+    NAME,       /* i: waiting for end of file name (gzip) */
+    COMMENT,    /* i: waiting for end of comment (gzip) */
+    HCRC,       /* i: waiting for header crc (gzip) */
+    DICTID,     /* i: waiting for dictionary check value */
+    DICT,       /* waiting for inflateSetDictionary() call */
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        COPY,       /* i/o: waiting for input or output to copy stored block */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+        LENLENS,    /* i: waiting for code length code lengths */
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */
+            LEN,        /* i: waiting for length/lit code */
+            LENEXT,     /* i: waiting for length extra bits */
+            DIST,       /* i: waiting for distance code */
+            DISTEXT,    /* i: waiting for distance extra bits */
+            MATCH,      /* o: waiting for output space to copy string */
+            LIT,        /* o: waiting for output space to write literal */
+    CHECK,      /* i: waiting for 32-bit check value */
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD,        /* got a data error -- remain here until reset */
+    MEM,        /* got an inflate() memory error -- remain here until reset */
+    SYNC        /* looking for synchronization bytes to restart inflate() */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to the BAD or MEM mode -- not shown for clarity)
+
+    Process header:
+        HEAD -> (gzip) or (zlib)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
+        NAME -> COMMENT -> HCRC -> TYPE
+        (zlib) -> DICTID or TYPE
+        DICTID -> DICT -> TYPE
+    Read deflate blocks:
+            TYPE -> STORED or TABLE or LEN or CHECK
+            STORED -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN
+    Read deflate codes:
+                LEN -> LENEXT or LIT or TYPE
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
+                LIT -> LEN
+    Process trailer:
+        CHECK -> LENGTH -> DONE
+ */
+
+/* state maintained between inflate() calls.  Approximately 7K bytes. */
+struct inflate_state {
+    inflate_mode mode;          /* current inflate mode */
+    int last;                   /* true if processing last block */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int havedict;               /* true if dictionary provided */
+    int flags;                  /* gzip header method and flags (0 if zlib) */
+    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
+    unsigned long check;        /* protected copy of check value */
+    unsigned long total;        /* protected copy of output count */
+    gz_headerp head;            /* where to save gzip header information */
+        /* sliding window */
+    unsigned wbits;             /* log base 2 of requested window size */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned write;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* bit accumulator */
+    unsigned long hold;         /* input bit accumulator */
+    unsigned bits;              /* number of bits in "in" */
+        /* for string and stored block copying */
+    unsigned length;            /* literal or length of data to copy */
+    unsigned offset;            /* distance back to copy string from */
+        /* for table and code decoding */
+    unsigned extra;             /* extra bits needed */
+        /* fixed and dynamic code tables */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+};
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c
new file mode 100644
index 00000000000..20fd1b34347
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c
@@ -0,0 +1,353 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright[] =
+   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code this;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
+    int end;                    /* use base and extra for symbol > end */
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        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, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+        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, 0, 0};
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+        28, 28, 29, 29, 64, 64};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) {                     /* no symbols to code at all */
+        this.op = (unsigned char)64;    /* invalid code marker */
+        this.bits = (unsigned char)1;
+        this.val = (unsigned short)0;
+        *(*table)++ = this;             /* make a table to force an error */
+        *(*table)++ = this;
+        *bits = 1;
+        return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min <= MAXBITS; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || max != 1))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked when a LENS table is being made
+       against the space in *table, ENOUGH, minus the maximum space needed by
+       the worst case distance code, MAXD.  This should never happen, but the
+       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
+       This assumes that when type == LENS, bits == 9.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
+        end = 19;
+        break;
+    case LENS:
+        base = lbase;
+        base -= 257;
+        extra = lext;
+        extra -= 257;
+        end = 256;
+        break;
+    default:            /* DISTS */
+        base = dbase;
+        extra = dext;
+        end = -1;
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if (type == LENS && used >= ENOUGH - MAXD)
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        this.bits = (unsigned char)(len - drop);
+        if ((int)(work[sym]) < end) {
+            this.op = (unsigned char)0;
+            this.val = work[sym];
+        }
+        else if ((int)(work[sym]) > end) {
+            this.op = (unsigned char)(extra[work[sym]]);
+            this.val = base[work[sym]];
+        }
+        else {
+            this.op = (unsigned char)(32 + 64);         /* end of block */
+            this.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        min = fill;                 /* save offset to next table */
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = this;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += min;            /* here min is 1 << curr */
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if (type == LENS && used >= ENOUGH - MAXD)
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /*
+       Fill in rest of table for incomplete codes.  This loop is similar to the
+       loop above in incrementing huff for table indices.  It is assumed that
+       len is equal to curr + drop, so there is no loop needed to increment
+       through high index bits.  When the current sub-table is filled, the loop
+       drops back to the root table to fill in any remaining entries there.
+     */
+    this.op = (unsigned char)64;                /* invalid code marker */
+    this.bits = (unsigned char)(len - drop);
+    this.val = (unsigned short)0;
+    while (huff != 0) {
+        /* when done with sub-table, drop back to root table */
+        if (drop != 0 && (huff & mask) != low) {
+            drop = 0;
+            len = root;
+            next = *table;
+            this.bits = (unsigned char)len;
+        }
+
+        /* put invalid code marker in table */
+        next[huff >> drop] = this;
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h
new file mode 100644
index 00000000000..d3510730a42
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h
@@ -0,0 +1,79 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of dynamic tree.  The maximum found in a long but non-
+   exhaustive search was 1444 code structures (852 for length/literals
+   and 592 for distances, the latter actually the result of an
+   exhaustive search).  The true maximum is not known, but the value
+   below is more than safe. */
+#define ENOUGH 2048
+#define MAXD 592
+
+/* Type of code to build for inftable() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+extern int inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java
new file mode 100644
index 00000000000..068a0aaf881
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java
@@ -0,0 +1,16 @@
+(1)renamed
+   adler32.c -> zadler32.c
+   zcrc32c -> zcrc32.c
+
+(2)added _LP64 to make uLong a 32-bit int on 64-bit platform
+   zconf.h:
+   uLong -> 32-bit int
+
+(3)updated crc32.c/crc32()
+   unsigned long      -> uLong
+
+(4)updated zlib.h (to support > 4G zipfile):
+   total_in/out: uLong -> long long
+
+(5)updated upinflate.c/inflateSync()
+   unsigned long in, out; -->  long long in, out;
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff
new file mode 100644
index 00000000000..6bd57b97321
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff
@@ -0,0 +1,25 @@
+--- /home/sherman/TL/zlib-1.2.3_ORG/crc32.c	Sun Jun 12 16:56:07 2005
++++ zcrc32.c	Tue Aug 25 14:22:41 2009
+@@ -216,8 +216,8 @@
+ #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+ 
+ /* ========================================================================= */
+-unsigned long ZEXPORT crc32(crc, buf, len)
+-    unsigned long crc;
++uLong ZEXPORT crc32(crc, buf, len)
++    uLong crc;
+     const unsigned char FAR *buf;
+     unsigned len;
+ {
+@@ -234,9 +234,9 @@
+ 
+         endian = 1;
+         if (*((unsigned char *)(&endian)))
+-            return crc32_little(crc, buf, len);
++            return (uLong)crc32_little(crc, buf, len);
+         else
+-            return crc32_big(crc, buf, len);
++            return (uLong)crc32_big(crc, buf, len);
+     }
+ #endif /* BYFOUR */
+     crc = crc ^ 0xffffffffUL;
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff
new file mode 100644
index 00000000000..1280ac80b9c
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff
@@ -0,0 +1,11 @@
+--- /home/sherman/TL/zlib-1.2.3_ORG/inflate.c	Tue Jun 14 14:50:12 2005
++++ inflate.c	Tue Aug 25 14:22:09 2009
+@@ -1263,7 +1263,7 @@
+ z_streamp strm;
+ {
+     unsigned len;               /* number of bytes to look at or looked at */
+-    unsigned long in, out;      /* temporary to save total_in and total_out */
++    long long in, out;          /* temporary to save total_in and total_out */
+     unsigned char buf[4];       /* to restore bit buffer to byte string */
+     struct inflate_state FAR *state;
+ 
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zconf.h.diff b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zconf.h.diff
new file mode 100644
index 00000000000..04edcb2d203
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zconf.h.diff
@@ -0,0 +1,24 @@
+--- /home/sherman/TL/zlib-1.2.3_ORG/zconf.h	Fri May 27 23:40:35 2005
++++ zconf.h	Tue Aug 25 14:22:28 2009
+@@ -8,6 +8,9 @@
+ #ifndef ZCONF_H
+ #define ZCONF_H
+ 
++/* for _LP64 */
++#include <sys/types.h>
++
+ /*
+  * If you *really* need a unique prefix for all types and library functions,
+  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+@@ -261,7 +264,11 @@
+ typedef unsigned char  Byte;  /* 8 bits */
+ #endif
+ typedef unsigned int   uInt;  /* 16 bits or more */
++#ifdef _LP64
++typedef unsigned int  uLong;  /* 32 bits or more */
++#else
+ typedef unsigned long  uLong; /* 32 bits or more */
++#endif
+ 
+ #ifdef SMALL_MEDIUM
+    /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff
new file mode 100644
index 00000000000..043f4ed774d
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff
@@ -0,0 +1,25 @@
+--- /home/sherman/TL/zlib-1.2.3_ORG/zlib.h	Sun Jul 17 19:26:49 2005
++++ zlib.h	Tue Aug 25 14:22:50 2009
+@@ -82,11 +82,11 @@
+ typedef struct z_stream_s {
+     Bytef    *next_in;  /* next input byte */
+     uInt     avail_in;  /* number of bytes available at next_in */
+-    uLong    total_in;  /* total nb of input bytes read so far */
++    long long total_in; /* total nb of input bytes read so far */
+ 
+     Bytef    *next_out; /* next output byte should be put there */
+     uInt     avail_out; /* remaining free space at next_out */
+-    uLong    total_out; /* total nb of bytes output so far */
++    long long total_out;/* total nb of bytes output so far */
+ 
+     char     *msg;      /* last error message, NULL if no error */
+     struct internal_state FAR *state; /* not visible by applications */
+@@ -1348,7 +1348,7 @@
+ 
+ ZEXTERN const char   * ZEXPORT zError           OF((int));
+ ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
+-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
++ZEXTERN const unsigned long FAR * ZEXPORT get_crc_table    OF((void));
+ 
+ #ifdef __cplusplus
+ }
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/trees.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.c
similarity index 96%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/trees.c
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.c
index 8dc2967a510..016c7153260 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/trees.c
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.c
@@ -22,14 +22,8 @@
  * 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 and, per its terms, should not be removed:
- *
- * trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-1998 Jean-loup Gailly
+/* trees.c -- output deflated data using Huffman coding
+ * Copyright (C) 1995-2005 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -59,6 +53,8 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
+/* @(#) $Id$ */
+
 /* #define GEN_TREES_H */
 
 #include "deflate.h"
@@ -258,7 +254,6 @@ local void send_bits(s, value, length)
 #endif /* DEBUG */
 
 
-#define MAX(a,b) (a >= b ? a : b)
 /* the arguments must not have side effects */
 
 /* ===========================================================================
@@ -584,7 +579,7 @@ local void gen_bitlen(s, desc)
         while (n != 0) {
             m = s->heap[--h];
             if (m > max_code) continue;
-            if (tree[m].Len != (unsigned) bits) {
+            if ((unsigned) tree[m].Len != (unsigned) bits) {
                 Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
                 s->opt_len += ((long)bits - (long)tree[m].Len)
                               *(long)tree[m].Freq;
@@ -703,7 +698,8 @@ local void build_tree(s, desc)
 
         /* Create a new node father of n and m */
         tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch) (MAX(s->depth[n], s->depth[m]) + 1);
+        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
+                                s->depth[n] : s->depth[m]) + 1);
         tree[n].Dad = tree[m].Dad = (ush)node;
 #ifdef DUMP_BL_TREE
         if (tree == s->bl_tree) {
@@ -958,8 +954,9 @@ void _tr_flush_block(s, buf, stored_len, eof)
     /* Build the Huffman trees unless a stored block is forced */
     if (s->level > 0) {
 
-         /* Check if the file is ascii or binary */
-        if (s->data_type == Z_UNKNOWN) set_data_type(s);
+        /* Check if the file is binary or text */
+        if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)
+            set_data_type(s);
 
         /* Construct the literal and distance trees */
         build_tree(s, (tree_desc *)(&(s->l_desc)));
@@ -978,7 +975,7 @@ void _tr_flush_block(s, buf, stored_len, eof)
          */
         max_blindex = build_bl_tree(s);
 
-        /* Determine the best encoding. Compute first the block length in bytes*/
+        /* Determine the best encoding. Compute the block lengths in bytes. */
         opt_lenb = (s->opt_len+3+7)>>3;
         static_lenb = (s->static_len+3+7)>>3;
 
@@ -1010,7 +1007,7 @@ void _tr_flush_block(s, buf, stored_len, eof)
 #ifdef FORCE_STATIC
     } else if (static_lenb >= 0) { /* force static trees */
 #else
-    } else if (static_lenb == opt_lenb) {
+    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
 #endif
         send_bits(s, (STATIC_TREES<<1)+eof, 3);
         compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
@@ -1135,7 +1132,8 @@ local void compress_block(s, ltree, dtree)
         } /* literal or match pair ? */
 
         /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert(s->pending < s->lit_bufsize + 2*lx, "pendingBuf overflow");
+        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+               "pendingBuf overflow");
 
     } while (lx < s->last_lit);
 
@@ -1144,21 +1142,24 @@ local void compress_block(s, ltree, dtree)
 }
 
 /* ===========================================================================
- * Set the data type to ASCII or BINARY, using a crude approximation:
- * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise.
- * IN assertion: the fields freq of dyn_ltree are set and the total of all
- * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
+ * Set the data type to BINARY or TEXT, using a crude approximation:
+ * set it to Z_TEXT if all symbols are either printable characters (33 to 255)
+ * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.
+ * IN assertion: the fields Freq of dyn_ltree are set.
  */
 local void set_data_type(s)
     deflate_state *s;
 {
-    int n = 0;
-    unsigned ascii_freq = 0;
-    unsigned bin_freq = 0;
-    while (n < 7)        bin_freq += s->dyn_ltree[n++].Freq;
-    while (n < 128)    ascii_freq += s->dyn_ltree[n++].Freq;
-    while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq;
-    s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII);
+    int n;
+
+    for (n = 0; n < 9; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            break;
+    if (n == 9)
+        for (n = 14; n < 32; n++)
+            if (s->dyn_ltree[n].Freq != 0)
+                break;
+    s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;
 }
 
 /* ===========================================================================
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/trees.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.h
similarity index 99%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/trees.h
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.h
index 3e0e1760784..179cc859aaa 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/trees.h
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/trees.h
@@ -149,3 +149,4 @@ local const int base_dist[D_CODES] = {
    32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
  1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
 };
+
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/uncompr.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c
similarity index 87%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/uncompr.c
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c
index c0946927ca1..d3f67218110 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/uncompr.c
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c
@@ -22,17 +22,14 @@
  * 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 and, per its terms, should not be removed:
- *
- * uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+/* uncompr.c -- decompress a memory buffer
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
 #include "zlib.h"
 
 /* ===========================================================================
@@ -77,7 +74,9 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
     err = inflate(&stream, Z_FINISH);
     if (err != Z_STREAM_END) {
         inflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
+        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
+            return Z_DATA_ERROR;
+        return err;
     }
     *destLen = stream.total_out;
 
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c
new file mode 100644
index 00000000000..7312da208e6
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c
@@ -0,0 +1,173 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2004 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+#define BASE 65521UL    /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware */
+#ifdef NO_DIVIDE
+#  define MOD(a) \
+    do { \
+        if (a >= (BASE << 16)) a -= (BASE << 16); \
+        if (a >= (BASE << 15)) a -= (BASE << 15); \
+        if (a >= (BASE << 14)) a -= (BASE << 14); \
+        if (a >= (BASE << 13)) a -= (BASE << 13); \
+        if (a >= (BASE << 12)) a -= (BASE << 12); \
+        if (a >= (BASE << 11)) a -= (BASE << 11); \
+        if (a >= (BASE << 10)) a -= (BASE << 10); \
+        if (a >= (BASE << 9)) a -= (BASE << 9); \
+        if (a >= (BASE << 8)) a -= (BASE << 8); \
+        if (a >= (BASE << 7)) a -= (BASE << 7); \
+        if (a >= (BASE << 6)) a -= (BASE << 6); \
+        if (a >= (BASE << 5)) a -= (BASE << 5); \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD4(a) \
+    do { \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD4(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD4(sum2);             /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    rem = (unsigned)(len2 % BASE);
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 > BASE) sum1 -= BASE;
+    if (sum1 > BASE) sum1 -= BASE;
+    if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 > BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zconf.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zconf.h
new file mode 100644
index 00000000000..53dd821be1b
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zconf.h
@@ -0,0 +1,363 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/* for _LP64 */
+#include <sys/types.h>
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ */
+#ifdef Z_PREFIX
+#  define deflateInit_          z_deflateInit_
+#  define deflate               z_deflate
+#  define deflateEnd            z_deflateEnd
+#  define inflateInit_          z_inflateInit_
+#  define inflate               z_inflate
+#  define inflateEnd            z_inflateEnd
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateCopy           z_deflateCopy
+#  define deflateReset          z_deflateReset
+#  define deflateParams         z_deflateParams
+#  define deflateBound          z_deflateBound
+#  define deflatePrime          z_deflatePrime
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateCopy           z_inflateCopy
+#  define inflateReset          z_inflateReset
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define compress              z_compress
+#  define compress2             z_compress2
+#  define compressBound         z_compressBound
+#  define uncompress            z_uncompress
+#  define adler32               z_adler32
+#  define crc32                 z_crc32
+#  define get_crc_table         z_get_crc_table
+#  define zError                z_zError
+
+#  define alloc_func            z_alloc_func
+#  define free_func             z_free_func
+#  define in_func               z_in_func
+#  define out_func              z_out_func
+#  define Byte                  z_Byte
+#  define uInt                  z_uInt
+#  define uLong                 z_uLong
+#  define Bytef                 z_Bytef
+#  define charf                 z_charf
+#  define intf                  z_intf
+#  define uIntf                 z_uIntf
+#  define uLongf                z_uLongf
+#  define voidpf                z_voidpf
+#  define voidp                 z_voidp
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+#ifdef _LP64
+typedef unsigned int  uLong;  /* 32 bits or more */
+#else
+typedef unsigned long  uLong; /* 32 bits or more */
+#endif
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
+#  ifdef VMS
+#    include <unixio.h>   /* for off_t */
+#  endif
+#  define z_off_t off_t
+#endif
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if defined(__OS400__)
+#  define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+#  define NO_vsnprintf
+#  ifdef FAR
+#    undef FAR
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+#   pragma map(deflateInit_,"DEIN")
+#   pragma map(deflateInit2_,"DEIN2")
+#   pragma map(deflateEnd,"DEEND")
+#   pragma map(deflateBound,"DEBND")
+#   pragma map(inflateInit_,"ININ")
+#   pragma map(inflateInit2_,"ININ2")
+#   pragma map(inflateEnd,"INEND")
+#   pragma map(inflateSync,"INSY")
+#   pragma map(inflateSetDictionary,"INSEDI")
+#   pragma map(compressBound,"CMBND")
+#   pragma map(inflate_table,"INTABL")
+#   pragma map(inflate_fast,"INFA")
+#   pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c
new file mode 100644
index 00000000000..812988d3fc4
--- /dev/null
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c
@@ -0,0 +1,447 @@
+/*
+ * 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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2005 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
+ * tables for updating the shift register in one step with three exclusive-ors
+ * instead of four steps with four exclusive-ors.  This results in about a
+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ */
+
+/* @(#) $Id$ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for STDC and FAR definitions */
+
+#define local static
+
+/* Find a four-byte integer type for crc32_little() and crc32_big(). */
+#ifndef NOBYFOUR
+#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
+#    include <limits.h>
+#    define BYFOUR
+#    if (UINT_MAX == 0xffffffffUL)
+       typedef unsigned int u4;
+#    else
+#      if (ULONG_MAX == 0xffffffffUL)
+         typedef unsigned long u4;
+#      else
+#        if (USHRT_MAX == 0xffffffffUL)
+           typedef unsigned short u4;
+#        else
+#          undef BYFOUR     /* can't find a four-byte integer type! */
+#        endif
+#      endif
+#    endif
+#  endif /* STDC */
+#endif /* !NOBYFOUR */
+
+/* Definitions for doing the crc four data bytes at a time. */
+#ifdef BYFOUR
+#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
+                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
+   local unsigned long crc32_little OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+   local unsigned long crc32_big OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+#  define TBLS 8
+#else
+#  define TBLS 1
+#endif /* BYFOUR */
+
+/* Local functions for crc concatenation */
+local unsigned long gf2_matrix_times OF((unsigned long *mat,
+                                         unsigned long vec));
+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local volatile int crc_table_empty = 1;
+local unsigned long FAR crc_table[TBLS][256];
+local void make_crc_table OF((void));
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const unsigned long FAR *));
+#endif /* MAKECRCH */
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The first table is simply the CRC of all possible eight bit values.  This is
+  all the information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.  The remaining tables
+  allow for word-at-a-time CRC calculation for both big-endian and little-
+  endian machines, where a word is four bytes.
+*/
+local void make_crc_table()
+{
+    unsigned long c;
+    int n, k;
+    unsigned long poly;                 /* polynomial exclusive-or pattern */
+    /* terms of polynomial defining this crc (except x^32): */
+    static volatile int first = 1;      /* flag to limit concurrent making */
+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+    /* See if another task is already doing this (not thread-safe, but better
+       than nothing -- significantly reduces duration of vulnerability in
+       case the advice about DYNAMIC_CRC_TABLE is ignored) */
+    if (first) {
+        first = 0;
+
+        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
+        poly = 0UL;
+        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
+            poly |= 1UL << (31 - p[n]);
+
+        /* generate a crc for every 8-bit value */
+        for (n = 0; n < 256; n++) {
+            c = (unsigned long)n;
+            for (k = 0; k < 8; k++)
+                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+            crc_table[0][n] = c;
+        }
+
+#ifdef BYFOUR
+        /* generate crc for each value followed by one, two, and three zeros,
+           and then the byte reversal of those as well as the first table */
+        for (n = 0; n < 256; n++) {
+            c = crc_table[0][n];
+            crc_table[4][n] = REV(c);
+            for (k = 1; k < 4; k++) {
+                c = crc_table[0][c & 0xff] ^ (c >> 8);
+                crc_table[k][n] = c;
+                crc_table[k + 4][n] = REV(c);
+            }
+        }
+#endif /* BYFOUR */
+
+        crc_table_empty = 0;
+    }
+    else {      /* not first */
+        /* wait for the other guy to finish (not efficient, but rare) */
+        while (crc_table_empty)
+            ;
+    }
+
+#ifdef MAKECRCH
+    /* write out CRC tables to crc32.h */
+    {
+        FILE *out;
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
+        fprintf(out, "local const unsigned long FAR ");
+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
+        write_table(out, crc_table[0]);
+#  ifdef BYFOUR
+        fprintf(out, "#ifdef BYFOUR\n");
+        for (k = 1; k < 8; k++) {
+            fprintf(out, "  },\n  {\n");
+            write_table(out, crc_table[k]);
+        }
+        fprintf(out, "#endif\n");
+#  endif /* BYFOUR */
+        fprintf(out, "  }\n};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+local void write_table(out, table)
+    FILE *out;
+    const unsigned long FAR *table;
+{
+    int n;
+
+    for (n = 0; n < 256; n++)
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+}
+#endif /* MAKECRCH */
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const unsigned long FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const unsigned long FAR *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+
+/* ========================================================================= */
+uLong ZEXPORT crc32(crc, buf, len)
+    uLong crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    if (buf == Z_NULL) return 0UL;
+
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+
+#ifdef BYFOUR
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {
+        u4 endian;
+
+        endian = 1;
+        if (*((unsigned char *)(&endian)))
+            return (uLong)crc32_little(crc, buf, len);
+        else
+            return (uLong)crc32_big(crc, buf, len);
+    }
+#endif /* BYFOUR */
+    crc = crc ^ 0xffffffffUL;
+    while (len >= 8) {
+        DO8;
+        len -= 8;
+    }
+    if (len) do {
+        DO1;
+    } while (--len);
+    return crc ^ 0xffffffffUL;
+}
+
+#ifdef BYFOUR
+
+/* ========================================================================= */
+#define DOLIT4 c ^= *buf4++; \
+        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+
+/* ========================================================================= */
+local unsigned long crc32_little(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register u4 c;
+    register const u4 FAR *buf4;
+
+    c = (u4)crc;
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+        len--;
+    }
+
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    while (len >= 32) {
+        DOLIT32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOLIT4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)c;
+}
+
+/* ========================================================================= */
+#define DOBIG4 c ^= *++buf4; \
+        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
+            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+
+/* ========================================================================= */
+local unsigned long crc32_big(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register u4 c;
+    register const u4 FAR *buf4;
+
+    c = REV((u4)crc);
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+        len--;
+    }
+
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4--;
+    while (len >= 32) {
+        DOBIG32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOBIG4;
+        len -= 4;
+    }
+    buf4++;
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)(REV(c));
+}
+
+#endif /* BYFOUR */
+
+#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+
+/* ========================================================================= */
+local unsigned long gf2_matrix_times(mat, vec)
+    unsigned long *mat;
+    unsigned long vec;
+{
+    unsigned long sum;
+
+    sum = 0;
+    while (vec) {
+        if (vec & 1)
+            sum ^= *mat;
+        vec >>= 1;
+        mat++;
+    }
+    return sum;
+}
+
+/* ========================================================================= */
+local void gf2_matrix_square(square, mat)
+    unsigned long *square;
+    unsigned long *mat;
+{
+    int n;
+
+    for (n = 0; n < GF2_DIM; n++)
+        square[n] = gf2_matrix_times(mat, mat[n]);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    int n;
+    unsigned long row;
+    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
+    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
+
+    /* degenerate case */
+    if (len2 == 0)
+        return crc1;
+
+    /* put operator for one zero bit in odd */
+    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */
+    row = 1;
+    for (n = 1; n < GF2_DIM; n++) {
+        odd[n] = row;
+        row <<= 1;
+    }
+
+    /* put operator for two zero bits in even */
+    gf2_matrix_square(even, odd);
+
+    /* put operator for four zero bits in odd */
+    gf2_matrix_square(odd, even);
+
+    /* apply len2 zeros to crc1 (first square will put the operator for one
+       zero byte, eight zero bits, in even) */
+    do {
+        /* apply zeros operator for this bit of len2 */
+        gf2_matrix_square(even, odd);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(even, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+        if (len2 == 0)
+            break;
+
+        /* another iteration of the loop with odd and even swapped */
+        gf2_matrix_square(odd, even);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(odd, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+    } while (len2 != 0);
+
+    /* return combined crc */
+    crc1 ^= crc2;
+    return crc1;
+}
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zlib.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zlib.h
similarity index 54%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/zlib.h
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/zlib.h
index 00fdf06007d..b2896fdddaf 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zlib.h
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zlib.h
@@ -20,20 +20,12 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
-  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 and, per its terms, should not be removed:
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.3, July 18th, 2005
 
-  zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.3, July 9th, 1998
-
-  Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -56,18 +48,12 @@
 
 
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 
-/* This distribution of zlib 1.1.3.f-jdk contains changes by Sun Microsystems.
-   The changes, made on or before 23 Apr 2003, are are described in ChangeLog.
-
-   For help or issues with these changes, please contact: tl-dev@sun.com
-*/
-
-#ifndef _ZLIB_H
-#define _ZLIB_H
+#ifndef ZLIB_H
+#define ZLIB_H
 
 #include "zconf.h"
 
@@ -75,7 +61,8 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.1.3.f-jdk"
+#define ZLIB_VERSION "1.2.3"
+#define ZLIB_VERNUM 0x1230
 
 /*
      The 'zlib' compression library provides in-memory compression and
@@ -90,8 +77,21 @@ extern "C" {
   application must provide more input and/or consume the output
   (providing more output space) before each call.
 
+     The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
      The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio.
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+     This library can optionally read and write gzip streams in memory as well.
+
+     The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
 
      The library does not install any signal handler. The decoder checks
   the consistency of the compressed data, so the library should never
@@ -106,11 +106,11 @@ struct internal_state;
 typedef struct z_stream_s {
     Bytef    *next_in;  /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
-    long long total_in;  /* total nb of input bytes read so far */
+    long long total_in; /* total nb of input bytes read so far */
 
     Bytef    *next_out; /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
-    long long total_out; /* total nb of bytes output so far */
+    long long total_out;/* total nb of bytes output so far */
 
     char     *msg;      /* last error message, NULL if no error */
     struct internal_state FAR *state; /* not visible by applications */
@@ -119,13 +119,36 @@ typedef struct z_stream_s {
     free_func  zfree;   /* used to free the internal state */
     voidpf     opaque;  /* private data object passed to zalloc and zfree */
 
-    int     data_type;  /* best guess about the data type: ascii or binary */
+    int     data_type;  /* best guess about the data type: binary or text */
     uLong   adler;      /* adler32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 
 typedef z_stream FAR *z_streamp;
 
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
 /*
    The application must update next_in and avail_in when avail_in has
    dropped to zero. It must update next_out and avail_out when avail_out
@@ -165,7 +188,8 @@ typedef z_stream FAR *z_streamp;
 #define Z_SYNC_FLUSH    2
 #define Z_FULL_FLUSH    3
 #define Z_FINISH        4
-/* Allowed flush values; see deflate() below for details */
+#define Z_BLOCK         5
+/* Allowed flush values; see deflate() and inflate() below for details */
 
 #define Z_OK            0
 #define Z_STREAM_END    1
@@ -188,13 +212,16 @@ typedef z_stream FAR *z_streamp;
 
 #define Z_FILTERED            1
 #define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
 #define Z_DEFAULT_STRATEGY    0
 /* compression strategy; see deflateInit2() below for details */
 
 #define Z_BINARY   0
-#define Z_ASCII    1
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field */
+/* Possible values of the data_type field (though see inflate()) */
 
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@@ -266,6 +293,10 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   and with zero avail_out, it must be called again after making room in the
   output buffer because there might be more output pending.
 
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumualte before producing output, in order to
+  maximize compression.
+
     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
   flushed to the output buffer and the output is aligned on a byte boundary, so
   that the decompressor can get all input data available so far. (In particular
@@ -277,12 +308,14 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   Z_SYNC_FLUSH, and the compression state is reset so that decompression can
   restart from this point if previous compressed data has been damaged or if
   random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  the compression.
+  compression.
 
     If deflate returns with avail_out == 0, this function must be called again
   with the same value of the flush parameter and more output space (updated
   avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).
+  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
 
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there
@@ -294,14 +327,14 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 
     Z_FINISH can be used immediately after deflateInit if all the compression
   is to be done in a single step. In this case, avail_out must be at least
-  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
+  the value returned by deflateBound (see below). If deflate does not return
   Z_STREAM_END, then it must be called again as described above.
 
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
 
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
   binary. This field is only for information purposes and does not affect
   the compression algorithm in any manner.
 
@@ -310,7 +343,9 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
   if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).
+  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+  fatal, and deflate() can be called again with more input and more output
+  space to continue compressing.
 */
 
 
@@ -352,9 +387,9 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
 ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
 /*
     inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may
-  introduce some output latency (reading input without producing any output)
-  except when forced to flush.
+  buffer becomes empty or the output buffer becomes full. It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
 
   The detailed semantics are as follows. inflate performs one or both of the
   following actions:
@@ -378,11 +413,26 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   must be called again after making room in the output buffer because there
   might be more output pending.
 
-    If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
-  output as possible to the output buffer. The flushing behavior of inflate is
-  not specified for values of the flush parameter other than Z_SYNC_FLUSH
-  and Z_FINISH, but the current implementation actually flushes as much output
-  as possible anyway.
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
+  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
+  if and when it gets to the next deflate block boundary. When decoding the
+  zlib or gzip format, this will cause inflate() to return immediately after
+  the header and before the first block. When doing a raw inflate, inflate()
+  will go ahead and process the first block, and will return when it gets to
+  the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  Also to assist in this, on return inflate() will set strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64
+  if inflate() is currently decoding the last block in the deflate stream,
+  plus 128 if inflate() returned immediately after decoding an end-of-block
+  code or decoding the complete header up to just before the first byte of the
+  deflate stream. The end-of-block will not be indicated until all of the
+  uncompressed data from that block has been written to strm->next_out.  The
+  number of unused bits may in general be greater than seven, except when
+  bit 7 of data_type is set, in which case the number of unused bits will be
+  less than eight.
 
     inflate() should normally be called until it returns Z_STREAM_END or an
   error. However if all decompression is to be performed in a single step
@@ -392,29 +442,44 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   uncompressed data. (The size of the uncompressed data may have been saved
   by the compressor for this purpose.) The next operation on this stream must
   be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster routine
+  is never required, but can be used to inform inflate that a faster approach
   may be used for the single inflate() call.
 
-     If a preset dictionary is needed at this point (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the
-  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise
-  it sets strm->adler to the adler32 checksum of all output produced
-  so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
-  an error code as described below. At the end of the stream, inflate()
-  checks that its computed adler32 checksum is equal to that saved by the
-  compressor and returns Z_STREAM_END only if the checksum is correct.
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call. So the only effect of the flush parameter in this implementation
+  is on the return value of inflate(), as noted below, or when it returns early
+  because Z_BLOCK is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the adler32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below. At the end of the stream, inflate() checks that its computed adler32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically.  Any information
+  contained in the gzip header is not retained, so applications that need that
+  information should instead use raw inflate, see inflateInit2() below, or
+  inflateBack() and perform their own processing of the gzip header and
+  trailer.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect
-  adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
-  (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
-  enough memory, Z_BUF_ERROR if no progress is possible or if there was not
-  enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
-  case, the application may then call inflateSync to look for a good
-  compression block.
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing. If Z_DATA_ERROR is returned, the application may then
+  call inflateSync() to look for a good compression block if a partial recovery
+  of the data is desired.
 */
 
 
@@ -451,11 +516,22 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    this version of the library.
 
      The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
+   (the size of the history buffer). It should be in the range 8..15 for this
    version of the library. Larger values of this parameter result in better
    compression at the expense of memory usage. The default value is 15 if
    deflateInit is used instead.
 
+     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+   determines the window size. deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute an adler32 check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding. Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper. The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero),
+   no header crc, and the operating system will be set to 255 (unknown).  If a
+   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state. memLevel=1 uses minimum memory but
    is slow and reduces compression ratio; memLevel=9 uses maximum memory
@@ -464,14 +540,18 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
 
      The strategy parameter is used to tune the compression algorithm. Use the
    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match).  Filtered data consists mostly of small values with a
-   somewhat random distribution. In this case, the compression algorithm is
-   tuned to compress them better. The effect of Z_FILTERED is to force more
-   Huffman coding and less string matching; it is somewhat intermediate
-   between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
-   the compression ratio but not the correctness of the compressed output even
-   if it is not set appropriately.
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding). Filtered data consists mostly of small values with a somewhat
+   random distribution. In this case, the compression algorithm is tuned to
+   compress them better. The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
+   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
+   parameter only affects the compression ratio but not the correctness of the
+   compressed output even if it is not set appropriately.  Z_FIXED prevents the
+   use of dynamic Huffman codes, allowing for a simpler decoder for special
+   applications.
 
       deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
@@ -500,13 +580,16 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    deflateInit or deflateInit2, a part of the dictionary may in effect be
    discarded, for example if the dictionary is larger than the window size in
    deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front.
+   put at the end of the dictionary, not at the front. In addition, the
+   current implementation of deflate will use at most the window size minus
+   262 bytes of the provided dictionary.
 
-     Upon return of this function, strm->adler is set to the Adler32 value
+     Upon return of this function, strm->adler is set to the adler32 value
    of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The Adler32 value
+   which dictionary has been used by the compressor. (The adler32 value
    applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.)
+   actually used by the compressor.) If a raw deflate was requested, then the
+   adler32 value is not computed and strm->adler is not set.
 
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (such as NULL dictionary) or the stream state is
@@ -565,6 +648,72 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    if strm->avail_out was zero.
 */
 
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit()
+   or deflateInit2().  This would be used to allocate an output buffer
+   for deflation in a single pass, and so would be called before deflate().
+*/
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+  is that this function is used to start off the deflate output with the
+  bits leftover from a previous deflate stream when appending to it.  As such,
+  this function can only be used for raw deflate, and must be used before the
+  first deflate() call after a deflateInit2() or deflateReset().  bits must be
+  less than or equal to 16, and that many of the least significant bits of
+  value will be inserted in the output.
+
+      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+      If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
 /*
 ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
                                      int  windowBits));
@@ -576,16 +725,36 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
      The windowBits parameter is the base two logarithm of the maximum window
    size (the size of the history buffer).  It should be in the range 8..15 for
    this version of the library. The default value is 15 if inflateInit is used
-   instead. If a compressed stream with a larger window size is given as
-   input, inflate() will return with the error code Z_DATA_ERROR instead of
-   trying to allocate a larger window.
+   instead. windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used. If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
 
-      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-   memLevel). msg is set to null if there is no error message.  inflateInit2
-   does not perform any decompression apart from reading the zlib header if
-   present: this will be done by inflate(). (So next_in and avail_in may be
-   modified, but next_out and avail_out are unchanged.)
+     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+   determines the window size. inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream. This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values. If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is. Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding. Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
+   a crc32 instead of an adler32.
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
+   is set to null if there is no error message.  inflateInit2 does not perform
+   any decompression apart from reading the zlib header if present: this will
+   be done by inflate(). (So next_in and avail_in may be modified, but next_out
+   and avail_out are unchanged.)
 */
 
 ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
@@ -593,16 +762,19 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate
-   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the Adler32 value returned by this call of
-   inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
+   sequence. This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   can be determined from the adler32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called
+   immediately after inflateInit2() or inflateReset() and before any call of
+   inflate() to set the dictionary.  The application must insure that the
+   dictionary that was used for compression is provided.
 
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (such as NULL dictionary) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler32 value). inflateSetDictionary does not
+   expected one (incorrect adler32 value). inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
@@ -622,6 +794,22 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
   until success or end of the input data.
 */
 
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
@@ -632,6 +820,205 @@ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+  that this function is used to start inflating at a bit position in the
+  middle of a byte.  The provided bits will be used before any bytes are used
+  from next_in.  This function should only be used with raw inflate, and
+  should be used before the first inflate() call after inflateInit2() or
+  inflateReset().  bits must be less than or equal to 16, and that many of the
+  least significant bits of value will be inserted in the input.
+
+      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
+   force inflate() to return immediately after header processing is complete
+   and before any actual data is decompressed.
+
+      The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When
+   any of extra, name, or comment are not Z_NULL and the respective field is
+   not present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+      If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+   be allocated, or Z_VERSION_ERROR if the version of the library does not
+   match the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is more efficient than inflate() for
+   file i/o applications in that it avoids copying between the output and the
+   sliding window by simply making the window itself the output buffer.  This
+   function trusts the application to not change the output buffer passed by
+   the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free
+   the allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects
+   only the raw deflate stream to decompress.  This is different from the
+   normal behavior of inflate(), which expects either a zlib or gzip header and
+   trailer around the deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero--buf is ignored in that
+   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   should return zero on success, or non-zero on failure.  If out() returns
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format
+   error in the deflate stream (in which case strm->msg is set to indicate the
+   nature of the error), or Z_STREAM_ERROR if the stream was not properly
+   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
+   distinguished using strm->next_in which will be Z_NULL only if in() returned
+   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
+   out() returning non-zero.  (in() will always be called before out(), so
+   strm->next_in is assured to be defined if out() returns non-zero.)  Note
+   that inflateBack() cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
 
                         /* utility functions */
 
@@ -648,8 +1035,8 @@ ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
 /*
      Compresses the source buffer into the destination buffer.  sourceLen is
    the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
+   size of the destination buffer, which must be at least the value returned
+   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
    compressed buffer.
      This function can be used to compress a whole file at once if the
    input file is mmap'ed.
@@ -665,14 +1052,22 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
      Compresses the source buffer into the destination buffer. The level
    parameter has the same meaning as in deflateInit.  sourceLen is the byte
    length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed buffer.
 
      compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
 
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before
+   a compress() or compress2() call to allocate the destination buffer.
+*/
+
 ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
                                    const Bytef *source, uLong sourceLen));
 /*
@@ -688,7 +1083,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
 */
 
 
@@ -699,8 +1094,9 @@ ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
      Opens a gzip (.gz) file for reading or writing. The mode parameter
    is as in fopen ("rb" or "wb") but can also include a compression level
    ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h". (See the description
-   of deflateInit2 for more information about the strategy parameter.)
+   Huffman only compression as in "wb1h", or 'R' for run-length encoding
+   as in "wb1R". (See the description of deflateInit2 for more information
+   about the strategy parameter.)
 
      gzopen can be used to read a file which is not in gzip format; in this
    case gzread will directly read from the file without decompression.
@@ -740,7 +1136,7 @@ ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
    end of file, -1 for error). */
 
 ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   const voidp buf, unsigned len));
+                                   voidpc buf, unsigned len));
 /*
      Writes the given number of uncompressed bytes into the compressed file.
    gzwrite returns the number of uncompressed bytes actually written
@@ -751,7 +1147,13 @@ ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the args to the compressed file under
    control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
+   uncompressed bytes actually written (0 in case of error).  The number of
+   uncompressed bytes written is limited to 4095. The caller should assure that
+   this limit is not exceeded. If it is exceeded, then gzprintf() will return
+   return an error (0) with nothing written. In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
 */
 
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@@ -782,6 +1184,16 @@ ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
    or -1 in case of end of file or error.
 */
 
+ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+/*
+      Push one character back onto the stream to be read again later.
+   Only one character of push-back is allowed.  gzungetc() returns the
+   character pushed, or -1 on failure.  gzungetc() will fail if a
+   character has been pushed but not read yet, or if c is -1. The pushed
+   character will be discarded if the stream is repositioned with gzseek()
+   or gzrewind().
+*/
+
 ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
 /*
      Flushes all pending output into the compressed file. The parameter
@@ -832,6 +1244,12 @@ ZEXTERN int ZEXPORT gzeof OF((gzFile file));
    input stream, otherwise zero.
 */
 
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns 1 if file is being read directly without decompression, otherwise
+   zero.
+*/
+
 ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
 /*
      Flushes all pending output if necessary, closes the compressed file
@@ -848,6 +1266,13 @@ ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
    to get the exact error code.
 */
 
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears the error and end-of-file flags for file. This is analogous to the
+   clearerr() function in stdio. This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
                         /* checksum functions */
 
 /*
@@ -857,7 +1282,6 @@ ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
 */
 
 ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
    return the updated checksum. If buf is NULL, this function returns
@@ -873,12 +1297,21 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+/*
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+*/
+
 ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
-     Update a running crc with the bytes buf[0..len-1] and return the updated
-   crc. If buf is NULL, this function returns the required initial value
-   for the crc. Pre- and post-conditioning (one's complement) is performed
-   within this function so it shouldn't be done by the application.
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32. If buf is NULL, this function returns the required initial
+   value for the for the crc. Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
    Usage example:
 
      uLong crc = crc32(0L, Z_NULL, 0);
@@ -889,6 +1322,16 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+/*
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
 
                         /* various hacks, don't look :) */
 
@@ -905,6 +1348,10 @@ ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
                                       int stream_size));
 ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
                                       const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
 #define deflateInit(strm, level) \
         deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
 #define inflateInit(strm) \
@@ -914,18 +1361,21 @@ ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
                       (strategy),           ZLIB_VERSION, sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
         inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+        inflateBackInit_((strm), (windowBits), (window), \
+        ZLIB_VERSION, sizeof(z_stream))
 
 
-#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
     struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
 
-ZEXTERN const char   * ZEXPORT zError           OF((int err));
+ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+ZEXTERN const unsigned long FAR * ZEXPORT get_crc_table    OF((void));
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _ZLIB_H */
+#endif /* ZLIB_H */
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zutil.c b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.c
similarity index 70%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/zutil.c
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.c
index df38b31f022..2c1c33286f0 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zutil.c
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.c
@@ -22,26 +22,20 @@
  * 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 and, per its terms, should not be removed:
- *
- * zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+/* @(#) $Id$ */
+
 #include "zutil.h"
 
+#ifndef NO_DUMMY_DECL
 struct internal_state      {int dummy;}; /* for buggy compilers */
-
-#ifndef STDC
-extern void exit OF((int));
 #endif
 
-const char *z_errmsg[10] = {
+const char * const z_errmsg[10] = {
 "need dictionary",     /* Z_NEED_DICT       2  */
 "stream end",          /* Z_STREAM_END      1  */
 "",                    /* Z_OK              0  */
@@ -59,6 +53,89 @@ const char * ZEXPORT zlibVersion()
     return ZLIB_VERSION;
 }
 
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch (sizeof(uInt)) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch (sizeof(uLong)) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch (sizeof(voidpf)) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch (sizeof(z_off_t)) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
+#ifdef DEBUG
+    flags += 1 << 8;
+#endif
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1L << 20;
+#endif
+#ifdef FASTEST
+    flags += 1L << 21;
+#endif
+#ifdef STDC
+#  ifdef NO_vsnprintf
+        flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+        flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+        flags += 1L << 26;
+#    endif
+#  endif
+#else
+        flags += 1L << 24;
+#  ifdef NO_snprintf
+        flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+        flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+        flags += 1L << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
 #ifdef DEBUG
 
 #  ifndef verbose
@@ -83,6 +160,13 @@ const char * ZEXPORT zError(err)
     return ERR_MSG(err);
 }
 
+#if defined(_WIN32_WCE)
+    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+     * errno.  We define it as a global variable to simplify porting.
+     * Its value is always 0 and should not be used.
+     */
+    int errno = 0;
+#endif
 
 #ifndef HAVE_MEMCPY
 
@@ -121,11 +205,12 @@ void zmemzero(dest, len)
 }
 #endif
 
+
+#ifdef SYS16BIT
+
 #ifdef __TURBOC__
-#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__)
-/* Small and medium model in Turbo C are for now limited to near allocation
- * with reduced MAX_WBITS and MAX_MEM_LEVEL
- */
+/* Turbo C in 16-bit mode */
+
 #  define MY_ZCALLOC
 
 /* Turbo C malloc() does not allow dynamic allocation of 64K bytes
@@ -197,11 +282,11 @@ void  zcfree (voidpf opaque, voidpf ptr)
     ptr = opaque; /* just to make some compilers happy */
     Assert(0, "zcfree: ptr not found");
 }
-#endif
+
 #endif /* __TURBOC__ */
 
 
-#if defined(M_I86) && !defined(__32BIT__)
+#ifdef M_I86
 /* Microsoft C in 16-bit mode */
 
 #  define MY_ZCALLOC
@@ -223,12 +308,15 @@ void  zcfree (voidpf opaque, voidpf ptr)
     _hfree(ptr);
 }
 
-#endif /* MSC */
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
 
 
 #ifndef MY_ZCALLOC /* Any system without a special alloc function */
 
 #ifndef STDC
+extern voidp  malloc OF((uInt size));
 extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
@@ -239,7 +327,8 @@ voidpf zcalloc (opaque, items, size)
     unsigned size;
 {
     if (opaque) items += size - size; /* make compiler happy */
-    return (voidpf)calloc(items, size);
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
 }
 
 void  zcfree (opaque, ptr)
diff --git a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zutil.h b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h
similarity index 74%
rename from jdk/src/share/native/java/util/zip/zlib-1.1.3/zutil.h
rename to jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h
index 76de8bd4ee4..55e8f36db6e 100644
--- a/jdk/src/share/native/java/util/zip/zlib-1.1.3/zutil.h
+++ b/jdk/src/share/native/java/util/zip/zlib-1.2.3/zutil.h
@@ -20,18 +20,10 @@
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
- *
- * THIS FILE WAS MODIFIED BY SUN MICROSYSTEMS, INC.
  */
 
-/*
- * 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 and, per its terms, should not be removed:
- *
- * zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -40,20 +32,35 @@
    subject to change. Applications should only use zlib.h.
  */
 
-#ifndef _Z_UTIL_H
-#define _Z_UTIL_H
+/* @(#) $Id$ */
 
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#define ZLIB_INTERNAL
 #include "zlib.h"
 
 #ifdef STDC
-#  include <stddef.h>
+#  ifndef _WIN32_WCE
+#    include <stddef.h>
+#  endif
 #  include <string.h>
 #  include <stdlib.h>
 #endif
 #ifdef NO_ERRNO_H
+#   ifdef _WIN32_WCE
+      /* The Microsoft C Run-Time Library for Windows CE doesn't have
+       * errno.  We define it as a global variable to simplify porting.
+       * Its value is always 0 and should not be used.  We rename it to
+       * avoid conflict with other libraries that use the same workaround.
+       */
+#     define errno z_errno
+#   endif
     extern int errno;
 #else
-#   include <errno.h>
+#  ifndef _WIN32_WCE
+#    include <errno.h>
+#  endif
 #endif
 
 #ifndef local
@@ -66,15 +73,8 @@ typedef uch FAR uchf;
 typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
-#ifdef NEVER
-#ifndef _LP64
-typedef unsigned long  ulg;
-#else
-typedef unsigned int  ulg;
-#endif
-#endif
 
-extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
+extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
@@ -110,7 +110,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 
         /* target dependencies */
 
-#ifdef MSDOS
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
 #  if defined(__TURBOC__) || defined(__BORLANDC__)
 #    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
@@ -118,19 +118,15 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
        void _Cdecl farfree( void *block );
        void *_Cdecl farmalloc( unsigned long nbytes );
 #    else
-#     include <alloc.h>
+#      include <alloc.h>
 #    endif
 #  else /* MSC or DJGPP */
 #    include <malloc.h>
 #  endif
 #endif
 
-#ifdef OS2
-#  define OS_CODE  0x06
-#endif
-
-#ifdef WIN32 /* Window 95 & Windows NT */
-#  define OS_CODE  0x0b
+#ifdef AMIGA
+#  define OS_CODE  0x01
 #endif
 
 #if defined(VAXC) || defined(VMS)
@@ -139,14 +135,17 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
      fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
 #endif
 
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
 #if defined(ATARI) || defined(atarist)
 #  define OS_CODE  0x05
 #endif
 
+#ifdef OS2
+#  define OS_CODE  0x06
+#  ifdef M_I86
+     #include <malloc.h>
+#  endif
+#endif
+
 #if defined(MACOS) || defined(TARGET_OS_MAC)
 #  define OS_CODE  0x07
 #  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
@@ -158,24 +157,37 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0F
-#endif
-
 #ifdef TOPS20
 #  define OS_CODE  0x0a
 #endif
 
+#ifdef WIN32
+#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
+#    define OS_CODE  0x0b
+#  endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+#  define OS_CODE  0x0f
+#endif
+
 #if defined(_BEOS_) || defined(RISCOS)
 #  define fdopen(fd,mode) NULL /* No fdopen() */
 #endif
 
 #if (defined(_MSC_VER) && (_MSC_VER > 600))
-#  define fdopen(fd,type)  _fdopen(fd,type)
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#    ifndef _PTRDIFF_T_DEFINED
+       typedef int ptrdiff_t;
+#      define _PTRDIFF_T_DEFINED
+#    endif
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
 #endif
 
-
-        /* Common defaults */
+        /* common defaults */
 
 #ifndef OS_CODE
 #  define OS_CODE  0x03  /* assume Unix */
@@ -187,11 +199,37 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 
          /* functions */
 
-#ifdef HAVE_STRERROR
-   extern char *strerror OF((int));
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+        but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      define vsnprintf _vsnprintf
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#endif
+#ifdef VMS
+#  define NO_vsnprintf
 #endif
 
 #if defined(pyr)
@@ -244,8 +282,6 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 
-typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
-                                       uInt len));
 voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
 void   zcfree  OF((voidpf opaque, voidpf ptr));
 
@@ -254,4 +290,4 @@ void   zcfree  OF((voidpf opaque, voidpf ptr));
 #define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
-#endif /* _Z_UTIL_H */
+#endif /* ZUTIL_H */
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
index 09d38fcb422..5d250e9e4b3 100644
--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
@@ -139,21 +139,45 @@ SplashDecodeJpeg(Splash * splash, struct jpeg_decompress_struct *cinfo)
 
     splash->width = cinfo->output_width;
     splash->height = cinfo->output_height;
+
+    if (!SAFE_TO_ALLOC(splash->imageFormat.depthBytes, splash->width)) {
+        return 0;
+    }
     stride = splash->width * splash->imageFormat.depthBytes;
 
+    if (!SAFE_TO_ALLOC(stride, splash->height)) {
+        return 0;
+    }
+    if (!SAFE_TO_ALLOC(cinfo->output_width, cinfo->output_components)) {
+        return 0;
+    }
+
     splash->frameCount = 1;
     splash->frames = (SplashImage *) malloc(sizeof(SplashImage) *
         splash->frameCount);
+    if (splash->frames == NULL) {
+        return 0;
+    }
     memset(splash->frames, 0, sizeof(SplashImage) *
         splash->frameCount);
+
     splash->loopCount = 1;
-    splash->frames[0].bitmapBits = malloc(stride * splash->height);
     splash->frames[0].delay = 0;
+    splash->frames[0].bitmapBits = malloc(stride * splash->height);
+    if (splash->frames[0].bitmapBits == NULL) {
+        free(splash->frames);
+        return 0;
+    }
 
     rowStride = cinfo->output_width * cinfo->output_components;
 
     buffer = (*cinfo->mem->alloc_sarray)
         ((j_common_ptr) cinfo, JPOOL_IMAGE, rowStride, 1);
+    if (buffer == NULL) {
+        free(splash->frames[0].bitmapBits);
+        free(splash->frames);
+        return 0;
+    }
 
     initFormat(&srcFormat, 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000);
     srcFormat.byteOrder = BYTE_ORDER_LSBFIRST;
diff --git a/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp b/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
new file mode 100644
index 00000000000..fb227e82cac
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
@@ -0,0 +1,418 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+#include <jni.h>
+#include "ecc_impl.h"
+
+#define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
+#define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
+        "java/security/InvalidAlgorithmParameterException"
+#define INVALID_PARAMETER_EXCEPTION \
+        "java/security/InvalidParameterException"
+#define KEY_EXCEPTION   "java/security/KeyException"
+
+extern "C" {
+
+/*
+ * Throws an arbitrary Java exception.
+ */
+void ThrowException(JNIEnv *env, char *exceptionName)
+{
+    jclass exceptionClazz = env->FindClass(exceptionName);
+    env->ThrowNew(exceptionClazz, NULL);
+}
+
+/*
+ * Deep free of the ECParams struct
+ */
+void FreeECParams(ECParams *ecparams, jboolean freeStruct)
+{
+    // Use B_FALSE to free the SECItem->data element, but not the SECItem itself
+    // Use B_TRUE to free both
+
+    SECITEM_FreeItem(&ecparams->fieldID.u.prime, B_FALSE);
+    SECITEM_FreeItem(&ecparams->curve.a, B_FALSE);
+    SECITEM_FreeItem(&ecparams->curve.b, B_FALSE);
+    SECITEM_FreeItem(&ecparams->curve.seed, B_FALSE);
+    SECITEM_FreeItem(&ecparams->base, B_FALSE);
+    SECITEM_FreeItem(&ecparams->order, B_FALSE);
+    SECITEM_FreeItem(&ecparams->DEREncoding, B_FALSE);
+    SECITEM_FreeItem(&ecparams->curveOID, B_FALSE);
+    if (freeStruct)
+        free(ecparams);
+}
+
+/*
+ * Class:     sun_security_ec_ECKeyPairGenerator
+ * Method:    generateECKeyPair
+ * Signature: (I[B[B)[J
+ */
+JNIEXPORT jlongArray
+JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair
+  (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed)
+{
+    ECPrivateKey *privKey;      /* contains both public and private values */
+    ECParams *ecparams = NULL;
+    SECKEYECParams params_item;
+    jint jSeedLength;
+    jbyte* pSeedBuffer = NULL;
+    jlongArray result = NULL;
+    jlong* resultElements = NULL;
+
+    // Initialize the ECParams struct
+    params_item.len = env->GetArrayLength(encodedParams);
+    params_item.data =
+        (unsigned char *) env->GetByteArrayElements(encodedParams, 0);
+
+    // Fill a new ECParams using the supplied OID
+    if (EC_DecodeParams(&params_item, &ecparams, 0) != SECSuccess) {
+        /* bad curve OID */
+        ThrowException(env, INVALID_ALGORITHM_PARAMETER_EXCEPTION);
+        goto cleanup;
+    }
+
+    // Copy seed from Java to native buffer
+    jSeedLength = env->GetArrayLength(seed);
+    pSeedBuffer = new jbyte[jSeedLength];
+    env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+
+    // Generate the new keypair (using the supplied seed)
+    if (EC_NewKey(ecparams, &privKey, (unsigned char *) pSeedBuffer,
+        jSeedLength, 0) != SECSuccess) {
+        ThrowException(env, KEY_EXCEPTION);
+        goto cleanup;
+    }
+
+    jboolean isCopy;
+    result = env->NewLongArray(2);
+    resultElements = env->GetLongArrayElements(result, &isCopy);
+
+    resultElements[0] = (jlong) &(privKey->privateValue); // private big integer
+    resultElements[1] = (jlong) &(privKey->publicValue); // encoded ec point
+
+    // If the array is a copy then we must write back our changes
+    if (isCopy == JNI_TRUE) {
+        env->ReleaseLongArrayElements(result, resultElements, 0);
+    }
+
+cleanup:
+    {
+        if (params_item.data)
+            env->ReleaseByteArrayElements(encodedParams,
+                (jbyte *) params_item.data, JNI_ABORT);
+
+        if (ecparams)
+            FreeECParams(ecparams, true);
+
+        if (privKey) {
+            FreeECParams(&privKey->ecParams, false);
+            SECITEM_FreeItem(&privKey->version, B_FALSE);
+            // Don't free privKey->privateValue and privKey->publicValue
+        }
+
+        if (pSeedBuffer)
+            delete [] pSeedBuffer;
+    }
+
+    return result;
+}
+
+/*
+ * Class:     sun_security_ec_ECKeyPairGenerator
+ * Method:    getEncodedBytes
+ * Signature: (J)[B
+ */
+JNIEXPORT jbyteArray
+JNICALL Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes
+  (JNIEnv *env, jclass clazz, jlong hSECItem)
+{
+    SECItem *s = (SECItem *)hSECItem;
+    jbyteArray jEncodedBytes = env->NewByteArray(s->len);
+
+    // Copy bytes from a native SECItem buffer to Java byte array
+    env->SetByteArrayRegion(jEncodedBytes, 0, s->len, (jbyte *)s->data);
+
+    // Use B_FALSE to free only the SECItem->data
+    SECITEM_FreeItem(s, B_FALSE);
+
+    return jEncodedBytes;
+}
+
+/*
+ * Class:     sun_security_ec_ECDSASignature
+ * Method:    signDigest
+ * Signature: ([B[B[B[B)[B
+ */
+JNIEXPORT jbyteArray
+JNICALL Java_sun_security_ec_ECDSASignature_signDigest
+  (JNIEnv *env, jclass clazz, jbyteArray digest, jbyteArray privateKey, jbyteArray encodedParams, jbyteArray seed)
+{
+    jbyte* pDigestBuffer = NULL;
+    jint jDigestLength = env->GetArrayLength(digest);
+    jbyteArray jSignedDigest = NULL;
+
+    SECItem signature_item;
+    jbyte* pSignedDigestBuffer = NULL;
+    jbyteArray temp;
+
+    jint jSeedLength = env->GetArrayLength(seed);
+    jbyte* pSeedBuffer = NULL;
+
+    // Copy digest from Java to native buffer
+    pDigestBuffer = new jbyte[jDigestLength];
+    env->GetByteArrayRegion(digest, 0, jDigestLength, pDigestBuffer);
+    SECItem digest_item;
+    digest_item.data = (unsigned char *) pDigestBuffer;
+    digest_item.len = jDigestLength;
+
+    ECPrivateKey privKey;
+
+    // Initialize the ECParams struct
+    ECParams *ecparams = NULL;
+    SECKEYECParams params_item;
+    params_item.len = env->GetArrayLength(encodedParams);
+    params_item.data =
+        (unsigned char *) env->GetByteArrayElements(encodedParams, 0);
+
+    // Fill a new ECParams using the supplied OID
+    if (EC_DecodeParams(&params_item, &ecparams, 0) != SECSuccess) {
+        /* bad curve OID */
+        ThrowException(env, INVALID_ALGORITHM_PARAMETER_EXCEPTION);
+        goto cleanup;
+    }
+
+    // Extract private key data
+    privKey.ecParams = *ecparams; // struct assignment
+    privKey.privateValue.len = env->GetArrayLength(privateKey);
+    privKey.privateValue.data =
+        (unsigned char *) env->GetByteArrayElements(privateKey, 0);
+
+    // Prepare a buffer for the signature (twice the key length)
+    pSignedDigestBuffer = new jbyte[ecparams->order.len * 2];
+    signature_item.data = (unsigned char *) pSignedDigestBuffer;
+    signature_item.len = ecparams->order.len * 2;
+
+    // Copy seed from Java to native buffer
+    pSeedBuffer = new jbyte[jSeedLength];
+    env->GetByteArrayRegion(seed, 0, jSeedLength, pSeedBuffer);
+
+    // Sign the digest (using the supplied seed)
+    if (ECDSA_SignDigest(&privKey, &signature_item, &digest_item,
+        (unsigned char *) pSeedBuffer, jSeedLength, 0) != SECSuccess) {
+        ThrowException(env, KEY_EXCEPTION);
+        goto cleanup;
+    }
+
+    // Create new byte array
+    temp = env->NewByteArray(signature_item.len);
+
+    // Copy data from native buffer
+    env->SetByteArrayRegion(temp, 0, signature_item.len, pSignedDigestBuffer);
+    jSignedDigest = temp;
+
+cleanup:
+    {
+        if (params_item.data)
+            env->ReleaseByteArrayElements(encodedParams,
+                (jbyte *) params_item.data, JNI_ABORT);
+
+        if (pDigestBuffer)
+            delete [] pDigestBuffer;
+
+        if (pSignedDigestBuffer)
+            delete [] pSignedDigestBuffer;
+
+        if (pSeedBuffer)
+            delete [] pSeedBuffer;
+
+        if (ecparams)
+            FreeECParams(ecparams, true);
+    }
+
+    return jSignedDigest;
+}
+
+/*
+ * Class:     sun_security_ec_ECDSASignature
+ * Method:    verifySignedDigest
+ * Signature: ([B[B[B[B)Z
+ */
+JNIEXPORT jboolean
+JNICALL Java_sun_security_ec_ECDSASignature_verifySignedDigest
+  (JNIEnv *env, jclass clazz, jbyteArray signedDigest, jbyteArray digest, jbyteArray publicKey, jbyteArray encodedParams)
+{
+    jboolean isValid = false;
+
+    // Copy signedDigest from Java to native buffer
+    jbyte* pSignedDigestBuffer = NULL;
+    jint jSignedDigestLength = env->GetArrayLength(signedDigest);
+    pSignedDigestBuffer = new jbyte[jSignedDigestLength];
+    env->GetByteArrayRegion(signedDigest, 0, jSignedDigestLength,
+        pSignedDigestBuffer);
+    SECItem signature_item;
+    signature_item.data = (unsigned char *) pSignedDigestBuffer;
+    signature_item.len = jSignedDigestLength;
+
+    // Copy digest from Java to native buffer
+    jbyte* pDigestBuffer = NULL;
+    jint jDigestLength = env->GetArrayLength(digest);
+    pDigestBuffer = new jbyte[jDigestLength];
+    env->GetByteArrayRegion(digest, 0, jDigestLength, pDigestBuffer);
+    SECItem digest_item;
+    digest_item.data = (unsigned char *) pDigestBuffer;
+    digest_item.len = jDigestLength;
+
+    // Extract public key data
+    ECPublicKey pubKey;
+    pubKey.publicValue.data = NULL;
+    ECParams *ecparams = NULL;
+    SECKEYECParams params_item;
+
+    // Initialize the ECParams struct
+    params_item.len = env->GetArrayLength(encodedParams);
+    params_item.data =
+        (unsigned char *) env->GetByteArrayElements(encodedParams, 0);
+
+    // Fill a new ECParams using the supplied OID
+    if (EC_DecodeParams(&params_item, &ecparams, 0) != SECSuccess) {
+        /* bad curve OID */
+        ThrowException(env, INVALID_ALGORITHM_PARAMETER_EXCEPTION);
+        goto cleanup;
+    }
+    pubKey.ecParams = *ecparams; // struct assignment
+    pubKey.publicValue.len = env->GetArrayLength(publicKey);
+    pubKey.publicValue.data =
+        (unsigned char *) env->GetByteArrayElements(publicKey, 0);
+
+    if (ECDSA_VerifyDigest(&pubKey, &signature_item, &digest_item, 0)
+            != SECSuccess) {
+        goto cleanup;
+    }
+
+    isValid = true;
+
+cleanup:
+    {
+        if (params_item.data)
+            env->ReleaseByteArrayElements(encodedParams,
+                (jbyte *) params_item.data, JNI_ABORT);
+
+        if (pubKey.publicValue.data)
+            env->ReleaseByteArrayElements(publicKey,
+                (jbyte *) pubKey.publicValue.data, JNI_ABORT);
+
+        if (ecparams)
+            FreeECParams(ecparams, true);
+
+        if (pSignedDigestBuffer)
+            delete [] pSignedDigestBuffer;
+
+        if (pDigestBuffer)
+            delete [] pDigestBuffer;
+    }
+
+    return isValid;
+}
+
+/*
+ * Class:     sun_security_ec_ECDHKeyAgreement
+ * Method:    deriveKey
+ * Signature: ([B[B[B)[B
+ */
+JNIEXPORT jbyteArray
+JNICALL Java_sun_security_ec_ECDHKeyAgreement_deriveKey
+  (JNIEnv *env, jclass clazz, jbyteArray privateKey, jbyteArray publicKey, jbyteArray encodedParams)
+{
+    jbyteArray jSecret = NULL;
+
+    // Extract private key value
+    SECItem privateValue_item;
+    privateValue_item.len = env->GetArrayLength(privateKey);
+    privateValue_item.data =
+            (unsigned char *) env->GetByteArrayElements(privateKey, 0);
+
+    // Extract public key value
+    SECItem publicValue_item;
+    publicValue_item.len = env->GetArrayLength(publicKey);
+    publicValue_item.data =
+        (unsigned char *) env->GetByteArrayElements(publicKey, 0);
+
+    // Initialize the ECParams struct
+    ECParams *ecparams = NULL;
+    SECKEYECParams params_item;
+    params_item.len = env->GetArrayLength(encodedParams);
+    params_item.data =
+        (unsigned char *) env->GetByteArrayElements(encodedParams, 0);
+
+    // Fill a new ECParams using the supplied OID
+    if (EC_DecodeParams(&params_item, &ecparams, 0) != SECSuccess) {
+        /* bad curve OID */
+        ThrowException(env, INVALID_ALGORITHM_PARAMETER_EXCEPTION);
+        goto cleanup;
+    }
+
+    // Prepare a buffer for the secret
+    SECItem secret_item;
+    secret_item.data = NULL;
+    secret_item.len = ecparams->order.len * 2;
+
+    if (ECDH_Derive(&publicValue_item, ecparams, &privateValue_item, B_FALSE,
+        &secret_item, 0) != SECSuccess) {
+        ThrowException(env, ILLEGAL_STATE_EXCEPTION);
+        goto cleanup;
+    }
+
+    // Create new byte array
+    jSecret = env->NewByteArray(secret_item.len);
+
+    // Copy bytes from the SECItem buffer to a Java byte array
+    env->SetByteArrayRegion(jSecret, 0, secret_item.len,
+        (jbyte *)secret_item.data);
+
+    // Free the SECItem data buffer
+    SECITEM_FreeItem(&secret_item, B_FALSE);
+
+cleanup:
+    {
+        if (privateValue_item.data)
+            env->ReleaseByteArrayElements(privateKey,
+                (jbyte *) privateValue_item.data, JNI_ABORT);
+
+        if (publicValue_item.data)
+            env->ReleaseByteArrayElements(publicKey,
+                (jbyte *) publicValue_item.data, JNI_ABORT);
+
+        if (params_item.data)
+            env->ReleaseByteArrayElements(encodedParams,
+                (jbyte *) params_item.data, JNI_ABORT);
+
+        if (ecparams)
+            FreeECParams(ecparams, true);
+    }
+
+    return jSecret;
+}
+
+} /* extern "C" */
diff --git a/jdk/src/share/native/sun/security/ec/ec.c b/jdk/src/share/native/sun/security/ec/ec.c
new file mode 100644
index 00000000000..0eda7da753b
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec.c
@@ -0,0 +1,1099 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Elliptic Curve Cryptography library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dr Vipul Gupta <vipul.gupta@sun.com> and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "mplogic.h"
+#include "ec.h"
+#include "ecl.h"
+
+#include <sys/types.h>
+#ifndef _KERNEL
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef _WIN32
+#include <strings.h>
+#endif /* _WIN32 */
+
+#endif
+#include "ecl-exp.h"
+#include "mpi.h"
+#include "ecc_impl.h"
+
+#ifdef _KERNEL
+#define PORT_ZFree(p, l)                bzero((p), (l)); kmem_free((p), (l))
+#else
+#ifndef _WIN32
+#define PORT_ZFree(p, l)                bzero((p), (l)); free((p))
+#else
+#define PORT_ZFree(p, l)                memset((p), 0, (l)); free((p))
+#endif /* _WIN32 */
+#endif
+
+/*
+ * Returns true if pointP is the point at infinity, false otherwise
+ */
+PRBool
+ec_point_at_infinity(SECItem *pointP)
+{
+    unsigned int i;
+
+    for (i = 1; i < pointP->len; i++) {
+        if (pointP->data[i] != 0x00) return PR_FALSE;
+    }
+
+    return PR_TRUE;
+}
+
+/*
+ * Computes scalar point multiplication pointQ = k1 * G + k2 * pointP for
+ * the curve whose parameters are encoded in params with base point G.
+ */
+SECStatus
+ec_points_mul(const ECParams *params, const mp_int *k1, const mp_int *k2,
+             const SECItem *pointP, SECItem *pointQ, int kmflag)
+{
+    mp_int Px, Py, Qx, Qy;
+    mp_int Gx, Gy, order, irreducible, a, b;
+#if 0 /* currently don't support non-named curves */
+    unsigned int irr_arr[5];
+#endif
+    ECGroup *group = NULL;
+    SECStatus rv = SECFailure;
+    mp_err err = MP_OKAY;
+    int len;
+
+#if EC_DEBUG
+    int i;
+    char mpstr[256];
+
+    printf("ec_points_mul: params [len=%d]:", params->DEREncoding.len);
+    for (i = 0; i < params->DEREncoding.len; i++)
+            printf("%02x:", params->DEREncoding.data[i]);
+    printf("\n");
+
+        if (k1 != NULL) {
+                mp_tohex(k1, mpstr);
+                printf("ec_points_mul: scalar k1: %s\n", mpstr);
+                mp_todecimal(k1, mpstr);
+                printf("ec_points_mul: scalar k1: %s (dec)\n", mpstr);
+        }
+
+        if (k2 != NULL) {
+                mp_tohex(k2, mpstr);
+                printf("ec_points_mul: scalar k2: %s\n", mpstr);
+                mp_todecimal(k2, mpstr);
+                printf("ec_points_mul: scalar k2: %s (dec)\n", mpstr);
+        }
+
+        if (pointP != NULL) {
+                printf("ec_points_mul: pointP [len=%d]:", pointP->len);
+                for (i = 0; i < pointP->len; i++)
+                        printf("%02x:", pointP->data[i]);
+                printf("\n");
+        }
+#endif
+
+        /* NOTE: We only support uncompressed points for now */
+        len = (params->fieldID.size + 7) >> 3;
+        if (pointP != NULL) {
+                if ((pointP->data[0] != EC_POINT_FORM_UNCOMPRESSED) ||
+                        (pointP->len != (2 * len + 1))) {
+                        return SECFailure;
+                };
+        }
+
+        MP_DIGITS(&Px) = 0;
+        MP_DIGITS(&Py) = 0;
+        MP_DIGITS(&Qx) = 0;
+        MP_DIGITS(&Qy) = 0;
+        MP_DIGITS(&Gx) = 0;
+        MP_DIGITS(&Gy) = 0;
+        MP_DIGITS(&order) = 0;
+        MP_DIGITS(&irreducible) = 0;
+        MP_DIGITS(&a) = 0;
+        MP_DIGITS(&b) = 0;
+        CHECK_MPI_OK( mp_init(&Px, kmflag) );
+        CHECK_MPI_OK( mp_init(&Py, kmflag) );
+        CHECK_MPI_OK( mp_init(&Qx, kmflag) );
+        CHECK_MPI_OK( mp_init(&Qy, kmflag) );
+        CHECK_MPI_OK( mp_init(&Gx, kmflag) );
+        CHECK_MPI_OK( mp_init(&Gy, kmflag) );
+        CHECK_MPI_OK( mp_init(&order, kmflag) );
+        CHECK_MPI_OK( mp_init(&irreducible, kmflag) );
+        CHECK_MPI_OK( mp_init(&a, kmflag) );
+        CHECK_MPI_OK( mp_init(&b, kmflag) );
+
+        if ((k2 != NULL) && (pointP != NULL)) {
+                /* Initialize Px and Py */
+                CHECK_MPI_OK( mp_read_unsigned_octets(&Px, pointP->data + 1, (mp_size) len) );
+                CHECK_MPI_OK( mp_read_unsigned_octets(&Py, pointP->data + 1 + len, (mp_size) len) );
+        }
+
+        /* construct from named params, if possible */
+        if (params->name != ECCurve_noName) {
+                group = ECGroup_fromName(params->name, kmflag);
+        }
+
+#if 0 /* currently don't support non-named curves */
+        if (group == NULL) {
+                /* Set up mp_ints containing the curve coefficients */
+                CHECK_MPI_OK( mp_read_unsigned_octets(&Gx, params->base.data + 1,
+                                                                                  (mp_size) len) );
+                CHECK_MPI_OK( mp_read_unsigned_octets(&Gy, params->base.data + 1 + len,
+                                                                                  (mp_size) len) );
+                SECITEM_TO_MPINT( params->order, &order );
+                SECITEM_TO_MPINT( params->curve.a, &a );
+                SECITEM_TO_MPINT( params->curve.b, &b );
+                if (params->fieldID.type == ec_field_GFp) {
+                        SECITEM_TO_MPINT( params->fieldID.u.prime, &irreducible );
+                        group = ECGroup_consGFp(&irreducible, &a, &b, &Gx, &Gy, &order, params->cofactor);
+                } else {
+                        SECITEM_TO_MPINT( params->fieldID.u.poly, &irreducible );
+                        irr_arr[0] = params->fieldID.size;
+                        irr_arr[1] = params->fieldID.k1;
+                        irr_arr[2] = params->fieldID.k2;
+                        irr_arr[3] = params->fieldID.k3;
+                        irr_arr[4] = 0;
+                        group = ECGroup_consGF2m(&irreducible, irr_arr, &a, &b, &Gx, &Gy, &order, params->cofactor);
+                }
+        }
+#endif
+        if (group == NULL)
+                goto cleanup;
+
+        if ((k2 != NULL) && (pointP != NULL)) {
+                CHECK_MPI_OK( ECPoints_mul(group, k1, k2, &Px, &Py, &Qx, &Qy) );
+        } else {
+                CHECK_MPI_OK( ECPoints_mul(group, k1, NULL, NULL, NULL, &Qx, &Qy) );
+    }
+
+    /* Construct the SECItem representation of point Q */
+    pointQ->data[0] = EC_POINT_FORM_UNCOMPRESSED;
+    CHECK_MPI_OK( mp_to_fixlen_octets(&Qx, pointQ->data + 1,
+                                      (mp_size) len) );
+    CHECK_MPI_OK( mp_to_fixlen_octets(&Qy, pointQ->data + 1 + len,
+                                      (mp_size) len) );
+
+    rv = SECSuccess;
+
+#if EC_DEBUG
+    printf("ec_points_mul: pointQ [len=%d]:", pointQ->len);
+    for (i = 0; i < pointQ->len; i++)
+            printf("%02x:", pointQ->data[i]);
+    printf("\n");
+#endif
+
+cleanup:
+    ECGroup_free(group);
+    mp_clear(&Px);
+    mp_clear(&Py);
+    mp_clear(&Qx);
+    mp_clear(&Qy);
+    mp_clear(&Gx);
+    mp_clear(&Gy);
+    mp_clear(&order);
+    mp_clear(&irreducible);
+    mp_clear(&a);
+    mp_clear(&b);
+    if (err) {
+        MP_TO_SEC_ERROR(err);
+        rv = SECFailure;
+    }
+
+    return rv;
+}
+
+/* Generates a new EC key pair. The private key is a supplied
+ * value and the public key is the result of performing a scalar
+ * point multiplication of that value with the curve's base point.
+ */
+SECStatus
+ec_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
+    const unsigned char *privKeyBytes, int privKeyLen, int kmflag)
+{
+    SECStatus rv = SECFailure;
+    PRArenaPool *arena;
+    ECPrivateKey *key;
+    mp_int k;
+    mp_err err = MP_OKAY;
+    int len;
+
+#if EC_DEBUG
+    printf("ec_NewKey called\n");
+#endif
+
+#ifndef _WIN32
+int printf();
+#endif /* _WIN32 */
+
+    if (!ecParams || !privKey || !privKeyBytes || (privKeyLen < 0)) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    /* Initialize an arena for the EC key. */
+    if (!(arena = PORT_NewArena(NSS_FREEBL_DEFAULT_CHUNKSIZE)))
+        return SECFailure;
+
+    key = (ECPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(ECPrivateKey),
+        kmflag);
+    if (!key) {
+        PORT_FreeArena(arena, PR_TRUE);
+        return SECFailure;
+    }
+
+    /* Set the version number (SEC 1 section C.4 says it should be 1) */
+    SECITEM_AllocItem(arena, &key->version, 1, kmflag);
+    key->version.data[0] = 1;
+
+    /* Copy all of the fields from the ECParams argument to the
+     * ECParams structure within the private key.
+     */
+    key->ecParams.arena = arena;
+    key->ecParams.type = ecParams->type;
+    key->ecParams.fieldID.size = ecParams->fieldID.size;
+    key->ecParams.fieldID.type = ecParams->fieldID.type;
+    if (ecParams->fieldID.type == ec_field_GFp) {
+        CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.fieldID.u.prime,
+            &ecParams->fieldID.u.prime, kmflag));
+    } else {
+        CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.fieldID.u.poly,
+            &ecParams->fieldID.u.poly, kmflag));
+    }
+    key->ecParams.fieldID.k1 = ecParams->fieldID.k1;
+    key->ecParams.fieldID.k2 = ecParams->fieldID.k2;
+    key->ecParams.fieldID.k3 = ecParams->fieldID.k3;
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.curve.a,
+        &ecParams->curve.a, kmflag));
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.curve.b,
+        &ecParams->curve.b, kmflag));
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.curve.seed,
+        &ecParams->curve.seed, kmflag));
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.base,
+        &ecParams->base, kmflag));
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.order,
+        &ecParams->order, kmflag));
+    key->ecParams.cofactor = ecParams->cofactor;
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.DEREncoding,
+        &ecParams->DEREncoding, kmflag));
+    key->ecParams.name = ecParams->name;
+    CHECK_SEC_OK(SECITEM_CopyItem(arena, &key->ecParams.curveOID,
+        &ecParams->curveOID, kmflag));
+
+    len = (ecParams->fieldID.size + 7) >> 3;
+    SECITEM_AllocItem(arena, &key->publicValue, 2*len + 1, kmflag);
+    len = ecParams->order.len;
+    SECITEM_AllocItem(arena, &key->privateValue, len, kmflag);
+
+    /* Copy private key */
+    if (privKeyLen >= len) {
+        memcpy(key->privateValue.data, privKeyBytes, len);
+    } else {
+        memset(key->privateValue.data, 0, (len - privKeyLen));
+        memcpy(key->privateValue.data + (len - privKeyLen), privKeyBytes, privKeyLen);
+    }
+
+    /* Compute corresponding public key */
+    MP_DIGITS(&k) = 0;
+    CHECK_MPI_OK( mp_init(&k, kmflag) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&k, key->privateValue.data,
+        (mp_size) len) );
+
+    rv = ec_points_mul(ecParams, &k, NULL, NULL, &(key->publicValue), kmflag);
+    if (rv != SECSuccess) goto cleanup;
+    *privKey = key;
+
+cleanup:
+    mp_clear(&k);
+    if (rv)
+        PORT_FreeArena(arena, PR_TRUE);
+
+#if EC_DEBUG
+    printf("ec_NewKey returning %s\n",
+        (rv == SECSuccess) ? "success" : "failure");
+#endif
+
+    return rv;
+
+}
+
+/* Generates a new EC key pair. The private key is a supplied
+ * random value (in seed) and the public key is the result of
+ * performing a scalar point multiplication of that value with
+ * the curve's base point.
+ */
+SECStatus
+EC_NewKeyFromSeed(ECParams *ecParams, ECPrivateKey **privKey,
+    const unsigned char *seed, int seedlen, int kmflag)
+{
+    SECStatus rv = SECFailure;
+    rv = ec_NewKey(ecParams, privKey, seed, seedlen, kmflag);
+    return rv;
+}
+
+/* Generate a random private key using the algorithm A.4.1 of ANSI X9.62,
+ * modified a la FIPS 186-2 Change Notice 1 to eliminate the bias in the
+ * random number generator.
+ *
+ * Parameters
+ * - order: a buffer that holds the curve's group order
+ * - len: the length in octets of the order buffer
+ * - random: a buffer of 2 * len random bytes
+ * - randomlen: the length in octets of the random buffer
+ *
+ * Return Value
+ * Returns a buffer of len octets that holds the private key. The caller
+ * is responsible for freeing the buffer with PORT_ZFree.
+ */
+static unsigned char *
+ec_GenerateRandomPrivateKey(const unsigned char *order, int len,
+    const unsigned char *random, int randomlen, int kmflag)
+{
+    SECStatus rv = SECSuccess;
+    mp_err err;
+    unsigned char *privKeyBytes = NULL;
+    mp_int privKeyVal, order_1, one;
+
+    MP_DIGITS(&privKeyVal) = 0;
+    MP_DIGITS(&order_1) = 0;
+    MP_DIGITS(&one) = 0;
+    CHECK_MPI_OK( mp_init(&privKeyVal, kmflag) );
+    CHECK_MPI_OK( mp_init(&order_1, kmflag) );
+    CHECK_MPI_OK( mp_init(&one, kmflag) );
+
+    /*
+     * Reduces the 2*len buffer of random bytes modulo the group order.
+     */
+    if ((privKeyBytes = PORT_Alloc(2*len, kmflag)) == NULL) goto cleanup;
+    if (randomlen != 2 * len) {
+        randomlen = 2 * len;
+    }
+    /* No need to generate - random bytes are now supplied */
+    /* CHECK_SEC_OK( RNG_GenerateGlobalRandomBytes(privKeyBytes, 2*len) );*/
+    memcpy(privKeyBytes, random, randomlen);
+
+    CHECK_MPI_OK( mp_read_unsigned_octets(&privKeyVal, privKeyBytes, 2*len) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&order_1, order, len) );
+    CHECK_MPI_OK( mp_set_int(&one, 1) );
+    CHECK_MPI_OK( mp_sub(&order_1, &one, &order_1) );
+    CHECK_MPI_OK( mp_mod(&privKeyVal, &order_1, &privKeyVal) );
+    CHECK_MPI_OK( mp_add(&privKeyVal, &one, &privKeyVal) );
+    CHECK_MPI_OK( mp_to_fixlen_octets(&privKeyVal, privKeyBytes, len) );
+    memset(privKeyBytes+len, 0, len);
+cleanup:
+    mp_clear(&privKeyVal);
+    mp_clear(&order_1);
+    mp_clear(&one);
+    if (err < MP_OKAY) {
+        MP_TO_SEC_ERROR(err);
+        rv = SECFailure;
+    }
+    if (rv != SECSuccess && privKeyBytes) {
+#ifdef _KERNEL
+        kmem_free(privKeyBytes, 2*len);
+#else
+        free(privKeyBytes);
+#endif
+        privKeyBytes = NULL;
+    }
+    return privKeyBytes;
+}
+
+/* Generates a new EC key pair. The private key is a random value and
+ * the public key is the result of performing a scalar point multiplication
+ * of that value with the curve's base point.
+ */
+SECStatus
+EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey,
+    const unsigned char* random, int randomlen, int kmflag)
+{
+    SECStatus rv = SECFailure;
+    int len;
+    unsigned char *privKeyBytes = NULL;
+
+    if (!ecParams) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    len = ecParams->order.len;
+    privKeyBytes = ec_GenerateRandomPrivateKey(ecParams->order.data, len,
+        random, randomlen, kmflag);
+    if (privKeyBytes == NULL) goto cleanup;
+    /* generate public key */
+    CHECK_SEC_OK( ec_NewKey(ecParams, privKey, privKeyBytes, len, kmflag) );
+
+cleanup:
+    if (privKeyBytes) {
+        PORT_ZFree(privKeyBytes, len * 2);
+    }
+#if EC_DEBUG
+    printf("EC_NewKey returning %s\n",
+        (rv == SECSuccess) ? "success" : "failure");
+#endif
+
+    return rv;
+}
+
+/* Validates an EC public key as described in Section 5.2.2 of
+ * X9.62. The ECDH primitive when used without the cofactor does
+ * not address small subgroup attacks, which may occur when the
+ * public key is not valid. These attacks can be prevented by
+ * validating the public key before using ECDH.
+ */
+SECStatus
+EC_ValidatePublicKey(ECParams *ecParams, SECItem *publicValue, int kmflag)
+{
+    mp_int Px, Py;
+    ECGroup *group = NULL;
+    SECStatus rv = SECFailure;
+    mp_err err = MP_OKAY;
+    int len;
+
+    if (!ecParams || !publicValue) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    /* NOTE: We only support uncompressed points for now */
+    len = (ecParams->fieldID.size + 7) >> 3;
+    if (publicValue->data[0] != EC_POINT_FORM_UNCOMPRESSED) {
+        PORT_SetError(SEC_ERROR_UNSUPPORTED_EC_POINT_FORM);
+        return SECFailure;
+    } else if (publicValue->len != (2 * len + 1)) {
+        PORT_SetError(SEC_ERROR_BAD_KEY);
+        return SECFailure;
+    }
+
+    MP_DIGITS(&Px) = 0;
+    MP_DIGITS(&Py) = 0;
+    CHECK_MPI_OK( mp_init(&Px, kmflag) );
+    CHECK_MPI_OK( mp_init(&Py, kmflag) );
+
+    /* Initialize Px and Py */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&Px, publicValue->data + 1, (mp_size) len) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&Py, publicValue->data + 1 + len, (mp_size) len) );
+
+    /* construct from named params */
+    group = ECGroup_fromName(ecParams->name, kmflag);
+    if (group == NULL) {
+        /*
+         * ECGroup_fromName fails if ecParams->name is not a valid
+         * ECCurveName value, or if we run out of memory, or perhaps
+         * for other reasons.  Unfortunately if ecParams->name is a
+         * valid ECCurveName value, we don't know what the right error
+         * code should be because ECGroup_fromName doesn't return an
+         * error code to the caller.  Set err to MP_UNDEF because
+         * that's what ECGroup_fromName uses internally.
+         */
+        if ((ecParams->name <= ECCurve_noName) ||
+            (ecParams->name >= ECCurve_pastLastCurve)) {
+            err = MP_BADARG;
+        } else {
+            err = MP_UNDEF;
+        }
+        goto cleanup;
+    }
+
+    /* validate public point */
+    if ((err = ECPoint_validate(group, &Px, &Py)) < MP_YES) {
+        if (err == MP_NO) {
+            PORT_SetError(SEC_ERROR_BAD_KEY);
+            rv = SECFailure;
+            err = MP_OKAY;  /* don't change the error code */
+        }
+        goto cleanup;
+    }
+
+    rv = SECSuccess;
+
+cleanup:
+    ECGroup_free(group);
+    mp_clear(&Px);
+    mp_clear(&Py);
+    if (err) {
+        MP_TO_SEC_ERROR(err);
+        rv = SECFailure;
+    }
+    return rv;
+}
+
+/*
+** Performs an ECDH key derivation by computing the scalar point
+** multiplication of privateValue and publicValue (with or without the
+** cofactor) and returns the x-coordinate of the resulting elliptic
+** curve point in derived secret.  If successful, derivedSecret->data
+** is set to the address of the newly allocated buffer containing the
+** derived secret, and derivedSecret->len is the size of the secret
+** produced. It is the caller's responsibility to free the allocated
+** buffer containing the derived secret.
+*/
+SECStatus
+ECDH_Derive(SECItem  *publicValue,
+            ECParams *ecParams,
+            SECItem  *privateValue,
+            PRBool    withCofactor,
+            SECItem  *derivedSecret,
+            int kmflag)
+{
+    SECStatus rv = SECFailure;
+    unsigned int len = 0;
+    SECItem pointQ = {siBuffer, NULL, 0};
+    mp_int k; /* to hold the private value */
+    mp_int cofactor;
+    mp_err err = MP_OKAY;
+#if EC_DEBUG
+    int i;
+#endif
+
+    if (!publicValue || !ecParams || !privateValue ||
+        !derivedSecret) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    memset(derivedSecret, 0, sizeof *derivedSecret);
+    len = (ecParams->fieldID.size + 7) >> 3;
+    pointQ.len = 2*len + 1;
+    if ((pointQ.data = PORT_Alloc(2*len + 1, kmflag)) == NULL) goto cleanup;
+
+    MP_DIGITS(&k) = 0;
+    CHECK_MPI_OK( mp_init(&k, kmflag) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&k, privateValue->data,
+                                          (mp_size) privateValue->len) );
+
+    if (withCofactor && (ecParams->cofactor != 1)) {
+            /* multiply k with the cofactor */
+            MP_DIGITS(&cofactor) = 0;
+            CHECK_MPI_OK( mp_init(&cofactor, kmflag) );
+            mp_set(&cofactor, ecParams->cofactor);
+            CHECK_MPI_OK( mp_mul(&k, &cofactor, &k) );
+    }
+
+    /* Multiply our private key and peer's public point */
+    if ((ec_points_mul(ecParams, NULL, &k, publicValue, &pointQ, kmflag) != SECSuccess) ||
+        ec_point_at_infinity(&pointQ))
+        goto cleanup;
+
+    /* Allocate memory for the derived secret and copy
+     * the x co-ordinate of pointQ into it.
+     */
+    SECITEM_AllocItem(NULL, derivedSecret, len, kmflag);
+    memcpy(derivedSecret->data, pointQ.data + 1, len);
+
+    rv = SECSuccess;
+
+#if EC_DEBUG
+    printf("derived_secret:\n");
+    for (i = 0; i < derivedSecret->len; i++)
+        printf("%02x:", derivedSecret->data[i]);
+    printf("\n");
+#endif
+
+cleanup:
+    mp_clear(&k);
+
+    if (pointQ.data) {
+        PORT_ZFree(pointQ.data, 2*len + 1);
+    }
+
+    return rv;
+}
+
+/* Computes the ECDSA signature (a concatenation of two values r and s)
+ * on the digest using the given key and the random value kb (used in
+ * computing s).
+ */
+SECStatus
+ECDSA_SignDigestWithSeed(ECPrivateKey *key, SECItem *signature,
+    const SECItem *digest, const unsigned char *kb, const int kblen, int kmflag)
+{
+    SECStatus rv = SECFailure;
+    mp_int x1;
+    mp_int d, k;     /* private key, random integer */
+    mp_int r, s;     /* tuple (r, s) is the signature */
+    mp_int n;
+    mp_err err = MP_OKAY;
+    ECParams *ecParams = NULL;
+    SECItem kGpoint = { siBuffer, NULL, 0};
+    int flen = 0;    /* length in bytes of the field size */
+    unsigned olen;   /* length in bytes of the base point order */
+
+#if EC_DEBUG
+    char mpstr[256];
+#endif
+
+    /* Initialize MPI integers. */
+    /* must happen before the first potential call to cleanup */
+    MP_DIGITS(&x1) = 0;
+    MP_DIGITS(&d) = 0;
+    MP_DIGITS(&k) = 0;
+    MP_DIGITS(&r) = 0;
+    MP_DIGITS(&s) = 0;
+    MP_DIGITS(&n) = 0;
+
+    /* Check args */
+    if (!key || !signature || !digest || !kb || (kblen < 0)) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        goto cleanup;
+    }
+
+    ecParams = &(key->ecParams);
+    flen = (ecParams->fieldID.size + 7) >> 3;
+    olen = ecParams->order.len;
+    if (signature->data == NULL) {
+        /* a call to get the signature length only */
+        goto finish;
+    }
+    if (signature->len < 2*olen) {
+        PORT_SetError(SEC_ERROR_OUTPUT_LEN);
+        rv = SECBufferTooSmall;
+        goto cleanup;
+    }
+
+
+    CHECK_MPI_OK( mp_init(&x1, kmflag) );
+    CHECK_MPI_OK( mp_init(&d, kmflag) );
+    CHECK_MPI_OK( mp_init(&k, kmflag) );
+    CHECK_MPI_OK( mp_init(&r, kmflag) );
+    CHECK_MPI_OK( mp_init(&s, kmflag) );
+    CHECK_MPI_OK( mp_init(&n, kmflag) );
+
+    SECITEM_TO_MPINT( ecParams->order, &n );
+    SECITEM_TO_MPINT( key->privateValue, &d );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&k, kb, kblen) );
+    /* Make sure k is in the interval [1, n-1] */
+    if ((mp_cmp_z(&k) <= 0) || (mp_cmp(&k, &n) >= 0)) {
+#if EC_DEBUG
+        printf("k is outside [1, n-1]\n");
+        mp_tohex(&k, mpstr);
+        printf("k : %s \n", mpstr);
+        mp_tohex(&n, mpstr);
+        printf("n : %s \n", mpstr);
+#endif
+        PORT_SetError(SEC_ERROR_NEED_RANDOM);
+        goto cleanup;
+    }
+
+    /*
+    ** ANSI X9.62, Section 5.3.2, Step 2
+    **
+    ** Compute kG
+    */
+    kGpoint.len = 2*flen + 1;
+    kGpoint.data = PORT_Alloc(2*flen + 1, kmflag);
+    if ((kGpoint.data == NULL) ||
+        (ec_points_mul(ecParams, &k, NULL, NULL, &kGpoint, kmflag)
+            != SECSuccess))
+        goto cleanup;
+
+    /*
+    ** ANSI X9.62, Section 5.3.3, Step 1
+    **
+    ** Extract the x co-ordinate of kG into x1
+    */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&x1, kGpoint.data + 1,
+                                          (mp_size) flen) );
+
+    /*
+    ** ANSI X9.62, Section 5.3.3, Step 2
+    **
+    ** r = x1 mod n  NOTE: n is the order of the curve
+    */
+    CHECK_MPI_OK( mp_mod(&x1, &n, &r) );
+
+    /*
+    ** ANSI X9.62, Section 5.3.3, Step 3
+    **
+    ** verify r != 0
+    */
+    if (mp_cmp_z(&r) == 0) {
+        PORT_SetError(SEC_ERROR_NEED_RANDOM);
+        goto cleanup;
+    }
+
+    /*
+    ** ANSI X9.62, Section 5.3.3, Step 4
+    **
+    ** s = (k**-1 * (HASH(M) + d*r)) mod n
+    */
+    SECITEM_TO_MPINT(*digest, &s);        /* s = HASH(M)     */
+
+    /* In the definition of EC signing, digests are truncated
+     * to the length of n in bits.
+     * (see SEC 1 "Elliptic Curve Digit Signature Algorithm" section 4.1.*/
+    if (digest->len*8 > ecParams->fieldID.size) {
+        mpl_rsh(&s,&s,digest->len*8 - ecParams->fieldID.size);
+    }
+
+#if EC_DEBUG
+    mp_todecimal(&n, mpstr);
+    printf("n : %s (dec)\n", mpstr);
+    mp_todecimal(&d, mpstr);
+    printf("d : %s (dec)\n", mpstr);
+    mp_tohex(&x1, mpstr);
+    printf("x1: %s\n", mpstr);
+    mp_todecimal(&s, mpstr);
+    printf("digest: %s (decimal)\n", mpstr);
+    mp_todecimal(&r, mpstr);
+    printf("r : %s (dec)\n", mpstr);
+    mp_tohex(&r, mpstr);
+    printf("r : %s\n", mpstr);
+#endif
+
+    CHECK_MPI_OK( mp_invmod(&k, &n, &k) );      /* k = k**-1 mod n */
+    CHECK_MPI_OK( mp_mulmod(&d, &r, &n, &d) );  /* d = d * r mod n */
+    CHECK_MPI_OK( mp_addmod(&s, &d, &n, &s) );  /* s = s + d mod n */
+    CHECK_MPI_OK( mp_mulmod(&s, &k, &n, &s) );  /* s = s * k mod n */
+
+#if EC_DEBUG
+    mp_todecimal(&s, mpstr);
+    printf("s : %s (dec)\n", mpstr);
+    mp_tohex(&s, mpstr);
+    printf("s : %s\n", mpstr);
+#endif
+
+    /*
+    ** ANSI X9.62, Section 5.3.3, Step 5
+    **
+    ** verify s != 0
+    */
+    if (mp_cmp_z(&s) == 0) {
+        PORT_SetError(SEC_ERROR_NEED_RANDOM);
+        goto cleanup;
+    }
+
+   /*
+    **
+    ** Signature is tuple (r, s)
+    */
+    CHECK_MPI_OK( mp_to_fixlen_octets(&r, signature->data, olen) );
+    CHECK_MPI_OK( mp_to_fixlen_octets(&s, signature->data + olen, olen) );
+finish:
+    signature->len = 2*olen;
+
+    rv = SECSuccess;
+    err = MP_OKAY;
+cleanup:
+    mp_clear(&x1);
+    mp_clear(&d);
+    mp_clear(&k);
+    mp_clear(&r);
+    mp_clear(&s);
+    mp_clear(&n);
+
+    if (kGpoint.data) {
+        PORT_ZFree(kGpoint.data, 2*flen + 1);
+    }
+
+    if (err) {
+        MP_TO_SEC_ERROR(err);
+        rv = SECFailure;
+    }
+
+#if EC_DEBUG
+    printf("ECDSA signing with seed %s\n",
+        (rv == SECSuccess) ? "succeeded" : "failed");
+#endif
+
+   return rv;
+}
+
+/*
+** Computes the ECDSA signature on the digest using the given key
+** and a random seed.
+*/
+SECStatus
+ECDSA_SignDigest(ECPrivateKey *key, SECItem *signature, const SECItem *digest,
+    const unsigned char* random, int randomLen, int kmflag)
+{
+    SECStatus rv = SECFailure;
+    int len;
+    unsigned char *kBytes= NULL;
+
+    if (!key) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return SECFailure;
+    }
+
+    /* Generate random value k */
+    len = key->ecParams.order.len;
+    kBytes = ec_GenerateRandomPrivateKey(key->ecParams.order.data, len,
+        random, randomLen, kmflag);
+    if (kBytes == NULL) goto cleanup;
+
+    /* Generate ECDSA signature with the specified k value */
+    rv = ECDSA_SignDigestWithSeed(key, signature, digest, kBytes, len, kmflag);
+
+cleanup:
+    if (kBytes) {
+        PORT_ZFree(kBytes, len * 2);
+    }
+
+#if EC_DEBUG
+    printf("ECDSA signing %s\n",
+        (rv == SECSuccess) ? "succeeded" : "failed");
+#endif
+
+    return rv;
+}
+
+/*
+** Checks the signature on the given digest using the key provided.
+*/
+SECStatus
+ECDSA_VerifyDigest(ECPublicKey *key, const SECItem *signature,
+                 const SECItem *digest, int kmflag)
+{
+    SECStatus rv = SECFailure;
+    mp_int r_, s_;           /* tuple (r', s') is received signature) */
+    mp_int c, u1, u2, v;     /* intermediate values used in verification */
+    mp_int x1;
+    mp_int n;
+    mp_err err = MP_OKAY;
+    ECParams *ecParams = NULL;
+    SECItem pointC = { siBuffer, NULL, 0 };
+    int slen;       /* length in bytes of a half signature (r or s) */
+    int flen;       /* length in bytes of the field size */
+    unsigned olen;  /* length in bytes of the base point order */
+
+#if EC_DEBUG
+    char mpstr[256];
+    printf("ECDSA verification called\n");
+#endif
+
+    /* Initialize MPI integers. */
+    /* must happen before the first potential call to cleanup */
+    MP_DIGITS(&r_) = 0;
+    MP_DIGITS(&s_) = 0;
+    MP_DIGITS(&c) = 0;
+    MP_DIGITS(&u1) = 0;
+    MP_DIGITS(&u2) = 0;
+    MP_DIGITS(&x1) = 0;
+    MP_DIGITS(&v)  = 0;
+    MP_DIGITS(&n)  = 0;
+
+    /* Check args */
+    if (!key || !signature || !digest) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        goto cleanup;
+    }
+
+    ecParams = &(key->ecParams);
+    flen = (ecParams->fieldID.size + 7) >> 3;
+    olen = ecParams->order.len;
+    if (signature->len == 0 || signature->len%2 != 0 ||
+        signature->len > 2*olen) {
+        PORT_SetError(SEC_ERROR_INPUT_LEN);
+        goto cleanup;
+    }
+    slen = signature->len/2;
+
+    SECITEM_AllocItem(NULL, &pointC, 2*flen + 1, kmflag);
+    if (pointC.data == NULL)
+        goto cleanup;
+
+    CHECK_MPI_OK( mp_init(&r_, kmflag) );
+    CHECK_MPI_OK( mp_init(&s_, kmflag) );
+    CHECK_MPI_OK( mp_init(&c, kmflag)  );
+    CHECK_MPI_OK( mp_init(&u1, kmflag) );
+    CHECK_MPI_OK( mp_init(&u2, kmflag) );
+    CHECK_MPI_OK( mp_init(&x1, kmflag)  );
+    CHECK_MPI_OK( mp_init(&v, kmflag)  );
+    CHECK_MPI_OK( mp_init(&n, kmflag)  );
+
+    /*
+    ** Convert received signature (r', s') into MPI integers.
+    */
+    CHECK_MPI_OK( mp_read_unsigned_octets(&r_, signature->data, slen) );
+    CHECK_MPI_OK( mp_read_unsigned_octets(&s_, signature->data + slen, slen) );
+
+    /*
+    ** ANSI X9.62, Section 5.4.2, Steps 1 and 2
+    **
+    ** Verify that 0 < r' < n and 0 < s' < n
+    */
+    SECITEM_TO_MPINT(ecParams->order, &n);
+    if (mp_cmp_z(&r_) <= 0 || mp_cmp_z(&s_) <= 0 ||
+        mp_cmp(&r_, &n) >= 0 || mp_cmp(&s_, &n) >= 0) {
+        PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+        goto cleanup; /* will return rv == SECFailure */
+    }
+
+    /*
+    ** ANSI X9.62, Section 5.4.2, Step 3
+    **
+    ** c = (s')**-1 mod n
+    */
+    CHECK_MPI_OK( mp_invmod(&s_, &n, &c) );      /* c = (s')**-1 mod n */
+
+    /*
+    ** ANSI X9.62, Section 5.4.2, Step 4
+    **
+    ** u1 = ((HASH(M')) * c) mod n
+    */
+    SECITEM_TO_MPINT(*digest, &u1);                  /* u1 = HASH(M)     */
+
+    /* In the definition of EC signing, digests are truncated
+     * to the length of n in bits.
+     * (see SEC 1 "Elliptic Curve Digit Signature Algorithm" section 4.1.*/
+    if (digest->len*8 > ecParams->fieldID.size) {  /* u1 = HASH(M')     */
+        mpl_rsh(&u1,&u1,digest->len*8- ecParams->fieldID.size);
+    }
+
+#if EC_DEBUG
+    mp_todecimal(&r_, mpstr);
+    printf("r_: %s (dec)\n", mpstr);
+    mp_todecimal(&s_, mpstr);
+    printf("s_: %s (dec)\n", mpstr);
+    mp_todecimal(&c, mpstr);
+    printf("c : %s (dec)\n", mpstr);
+    mp_todecimal(&u1, mpstr);
+    printf("digest: %s (dec)\n", mpstr);
+#endif
+
+    CHECK_MPI_OK( mp_mulmod(&u1, &c, &n, &u1) );  /* u1 = u1 * c mod n */
+
+    /*
+    ** ANSI X9.62, Section 5.4.2, Step 4
+    **
+    ** u2 = ((r') * c) mod n
+    */
+    CHECK_MPI_OK( mp_mulmod(&r_, &c, &n, &u2) );
+
+    /*
+    ** ANSI X9.62, Section 5.4.3, Step 1
+    **
+    ** Compute u1*G + u2*Q
+    ** Here, A = u1.G     B = u2.Q    and   C = A + B
+    ** If the result, C, is the point at infinity, reject the signature
+    */
+    if (ec_points_mul(ecParams, &u1, &u2, &key->publicValue, &pointC, kmflag)
+        != SECSuccess) {
+        rv = SECFailure;
+        goto cleanup;
+    }
+    if (ec_point_at_infinity(&pointC)) {
+        PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+        rv = SECFailure;
+        goto cleanup;
+    }
+
+    CHECK_MPI_OK( mp_read_unsigned_octets(&x1, pointC.data + 1, flen) );
+
+    /*
+    ** ANSI X9.62, Section 5.4.4, Step 2
+    **
+    ** v = x1 mod n
+    */
+    CHECK_MPI_OK( mp_mod(&x1, &n, &v) );
+
+#if EC_DEBUG
+    mp_todecimal(&r_, mpstr);
+    printf("r_: %s (dec)\n", mpstr);
+    mp_todecimal(&v, mpstr);
+    printf("v : %s (dec)\n", mpstr);
+#endif
+
+    /*
+    ** ANSI X9.62, Section 5.4.4, Step 3
+    **
+    ** Verification:  v == r'
+    */
+    if (mp_cmp(&v, &r_)) {
+        PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
+        rv = SECFailure; /* Signature failed to verify. */
+    } else {
+        rv = SECSuccess; /* Signature verified. */
+    }
+
+#if EC_DEBUG
+    mp_todecimal(&u1, mpstr);
+    printf("u1: %s (dec)\n", mpstr);
+    mp_todecimal(&u2, mpstr);
+    printf("u2: %s (dec)\n", mpstr);
+    mp_tohex(&x1, mpstr);
+    printf("x1: %s\n", mpstr);
+    mp_todecimal(&v, mpstr);
+    printf("v : %s (dec)\n", mpstr);
+#endif
+
+cleanup:
+    mp_clear(&r_);
+    mp_clear(&s_);
+    mp_clear(&c);
+    mp_clear(&u1);
+    mp_clear(&u2);
+    mp_clear(&x1);
+    mp_clear(&v);
+    mp_clear(&n);
+
+    if (pointC.data) SECITEM_FreeItem(&pointC, PR_FALSE);
+    if (err) {
+        MP_TO_SEC_ERROR(err);
+        rv = SECFailure;
+    }
+
+#if EC_DEBUG
+    printf("ECDSA verification %s\n",
+        (rv == SECSuccess) ? "succeeded" : "failed");
+#endif
+
+    return rv;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ec.h b/jdk/src/share/native/sun/security/ec/ec.h
new file mode 100644
index 00000000000..d472670913b
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec.h
@@ -0,0 +1,72 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Elliptic Curve Cryptography library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef __ec_h_
+#define __ec_h_
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#define EC_DEBUG                          0
+#define EC_POINT_FORM_COMPRESSED_Y0    0x02
+#define EC_POINT_FORM_COMPRESSED_Y1    0x03
+#define EC_POINT_FORM_UNCOMPRESSED     0x04
+#define EC_POINT_FORM_HYBRID_Y0        0x06
+#define EC_POINT_FORM_HYBRID_Y1        0x07
+
+#define ANSI_X962_CURVE_OID_TOTAL_LEN    10
+#define SECG_CURVE_OID_TOTAL_LEN          7
+
+#endif /* __ec_h_ */
diff --git a/jdk/src/share/native/sun/security/ec/ec2.h b/jdk/src/share/native/sun/security/ec/ec2.h
new file mode 100644
index 00000000000..c1b2d7965e5
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec2.h
@@ -0,0 +1,146 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for binary polynomial field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _EC2_H
+#define _EC2_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecl-priv.h"
+
+/* Checks if point P(px, py) is at infinity.  Uses affine coordinates. */
+mp_err ec_GF2m_pt_is_inf_aff(const mp_int *px, const mp_int *py);
+
+/* Sets P(px, py) to be the point at infinity.  Uses affine coordinates. */
+mp_err ec_GF2m_pt_set_inf_aff(mp_int *px, mp_int *py);
+
+/* Computes R = P + Q where R is (rx, ry), P is (px, py) and Q is (qx,
+ * qy). Uses affine coordinates. */
+mp_err ec_GF2m_pt_add_aff(const mp_int *px, const mp_int *py,
+                                                  const mp_int *qx, const mp_int *qy, mp_int *rx,
+                                                  mp_int *ry, const ECGroup *group);
+
+/* Computes R = P - Q.  Uses affine coordinates. */
+mp_err ec_GF2m_pt_sub_aff(const mp_int *px, const mp_int *py,
+                                                  const mp_int *qx, const mp_int *qy, mp_int *rx,
+                                                  mp_int *ry, const ECGroup *group);
+
+/* Computes R = 2P.  Uses affine coordinates. */
+mp_err ec_GF2m_pt_dbl_aff(const mp_int *px, const mp_int *py, mp_int *rx,
+                                                  mp_int *ry, const ECGroup *group);
+
+/* Validates a point on a GF2m curve. */
+mp_err ec_GF2m_validate_point(const mp_int *px, const mp_int *py, const ECGroup *group);
+
+/* by default, this routine is unused and thus doesn't need to be compiled */
+#ifdef ECL_ENABLE_GF2M_PT_MUL_AFF
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the irreducible that
+ * determines the field GF2m.  Uses affine coordinates. */
+mp_err ec_GF2m_pt_mul_aff(const mp_int *n, const mp_int *px,
+                                                  const mp_int *py, mp_int *rx, mp_int *ry,
+                                                  const ECGroup *group);
+#endif
+
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the irreducible that
+ * determines the field GF2m.  Uses Montgomery projective coordinates. */
+mp_err ec_GF2m_pt_mul_mont(const mp_int *n, const mp_int *px,
+                                                   const mp_int *py, mp_int *rx, mp_int *ry,
+                                                   const ECGroup *group);
+
+#ifdef ECL_ENABLE_GF2M_PROJ
+/* Converts a point P(px, py) from affine coordinates to projective
+ * coordinates R(rx, ry, rz). */
+mp_err ec_GF2m_pt_aff2proj(const mp_int *px, const mp_int *py, mp_int *rx,
+                                                   mp_int *ry, mp_int *rz, const ECGroup *group);
+
+/* Converts a point P(px, py, pz) from projective coordinates to affine
+ * coordinates R(rx, ry). */
+mp_err ec_GF2m_pt_proj2aff(const mp_int *px, const mp_int *py,
+                                                   const mp_int *pz, mp_int *rx, mp_int *ry,
+                                                   const ECGroup *group);
+
+/* Checks if point P(px, py, pz) is at infinity.  Uses projective
+ * coordinates. */
+mp_err ec_GF2m_pt_is_inf_proj(const mp_int *px, const mp_int *py,
+                                                          const mp_int *pz);
+
+/* Sets P(px, py, pz) to be the point at infinity.  Uses projective
+ * coordinates. */
+mp_err ec_GF2m_pt_set_inf_proj(mp_int *px, mp_int *py, mp_int *pz);
+
+/* Computes R = P + Q where R is (rx, ry, rz), P is (px, py, pz) and Q is
+ * (qx, qy, qz).  Uses projective coordinates. */
+mp_err ec_GF2m_pt_add_proj(const mp_int *px, const mp_int *py,
+                                                   const mp_int *pz, const mp_int *qx,
+                                                   const mp_int *qy, mp_int *rx, mp_int *ry,
+                                                   mp_int *rz, const ECGroup *group);
+
+/* Computes R = 2P.  Uses projective coordinates. */
+mp_err ec_GF2m_pt_dbl_proj(const mp_int *px, const mp_int *py,
+                                                   const mp_int *pz, mp_int *rx, mp_int *ry,
+                                                   mp_int *rz, const ECGroup *group);
+
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the prime that
+ * determines the field GF2m.  Uses projective coordinates. */
+mp_err ec_GF2m_pt_mul_proj(const mp_int *n, const mp_int *px,
+                                                   const mp_int *py, mp_int *rx, mp_int *ry,
+                                                   const ECGroup *group);
+#endif
+
+#endif /* _EC2_H */
diff --git a/jdk/src/share/native/sun/security/ec/ec2_163.c b/jdk/src/share/native/sun/security/ec/ec2_163.c
new file mode 100644
index 00000000000..ecdb5121063
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec2_163.c
@@ -0,0 +1,281 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for binary polynomial field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang-Shantz <sheueling.chang@sun.com>,
+ *   Stephen Fung <fungstep@hotmail.com>, and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ec2.h"
+#include "mp_gf2m.h"
+#include "mp_gf2m-priv.h"
+#include "mpi.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Fast reduction for polynomials over a 163-bit curve. Assumes reduction
+ * polynomial with terms {163, 7, 6, 3, 0}. */
+mp_err
+ec_GF2m_163_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit *u, z;
+
+        if (a != r) {
+                MP_CHECKOK(mp_copy(a, r));
+        }
+#ifdef ECL_SIXTY_FOUR_BIT
+        if (MP_USED(r) < 6) {
+                MP_CHECKOK(s_mp_pad(r, 6));
+        }
+        u = MP_DIGITS(r);
+        MP_USED(r) = 6;
+
+        /* u[5] only has 6 significant bits */
+        z = u[5];
+        u[2] ^= (z << 36) ^ (z << 35) ^ (z << 32) ^ (z << 29);
+        z = u[4];
+        u[2] ^= (z >> 28) ^ (z >> 29) ^ (z >> 32) ^ (z >> 35);
+        u[1] ^= (z << 36) ^ (z << 35) ^ (z << 32) ^ (z << 29);
+        z = u[3];
+        u[1] ^= (z >> 28) ^ (z >> 29) ^ (z >> 32) ^ (z >> 35);
+        u[0] ^= (z << 36) ^ (z << 35) ^ (z << 32) ^ (z << 29);
+        z = u[2] >> 35;                         /* z only has 29 significant bits */
+        u[0] ^= (z << 7) ^ (z << 6) ^ (z << 3) ^ z;
+        /* clear bits above 163 */
+        u[5] = u[4] = u[3] = 0;
+        u[2] ^= z << 35;
+#else
+        if (MP_USED(r) < 11) {
+                MP_CHECKOK(s_mp_pad(r, 11));
+        }
+        u = MP_DIGITS(r);
+        MP_USED(r) = 11;
+
+        /* u[11] only has 6 significant bits */
+        z = u[10];
+        u[5] ^= (z << 4) ^ (z << 3) ^ z ^ (z >> 3);
+        u[4] ^= (z << 29);
+        z = u[9];
+        u[5] ^= (z >> 28) ^ (z >> 29);
+        u[4] ^= (z << 4) ^ (z << 3) ^ z ^ (z >> 3);
+        u[3] ^= (z << 29);
+        z = u[8];
+        u[4] ^= (z >> 28) ^ (z >> 29);
+        u[3] ^= (z << 4) ^ (z << 3) ^ z ^ (z >> 3);
+        u[2] ^= (z << 29);
+        z = u[7];
+        u[3] ^= (z >> 28) ^ (z >> 29);
+        u[2] ^= (z << 4) ^ (z << 3) ^ z ^ (z >> 3);
+        u[1] ^= (z << 29);
+        z = u[6];
+        u[2] ^= (z >> 28) ^ (z >> 29);
+        u[1] ^= (z << 4) ^ (z << 3) ^ z ^ (z >> 3);
+        u[0] ^= (z << 29);
+        z = u[5] >> 3;                          /* z only has 29 significant bits */
+        u[1] ^= (z >> 25) ^ (z >> 26);
+        u[0] ^= (z << 7) ^ (z << 6) ^ (z << 3) ^ z;
+        /* clear bits above 163 */
+        u[11] = u[10] = u[9] = u[8] = u[7] = u[6] = 0;
+        u[5] ^= z << 3;
+#endif
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* Fast squaring for polynomials over a 163-bit curve. Assumes reduction
+ * polynomial with terms {163, 7, 6, 3, 0}. */
+mp_err
+ec_GF2m_163_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit *u, *v;
+
+        v = MP_DIGITS(a);
+
+#ifdef ECL_SIXTY_FOUR_BIT
+        if (MP_USED(a) < 3) {
+                return mp_bsqrmod(a, meth->irr_arr, r);
+        }
+        if (MP_USED(r) < 6) {
+                MP_CHECKOK(s_mp_pad(r, 6));
+        }
+        MP_USED(r) = 6;
+#else
+        if (MP_USED(a) < 6) {
+                return mp_bsqrmod(a, meth->irr_arr, r);
+        }
+        if (MP_USED(r) < 12) {
+                MP_CHECKOK(s_mp_pad(r, 12));
+        }
+        MP_USED(r) = 12;
+#endif
+        u = MP_DIGITS(r);
+
+#ifdef ECL_THIRTY_TWO_BIT
+        u[11] = gf2m_SQR1(v[5]);
+        u[10] = gf2m_SQR0(v[5]);
+        u[9] = gf2m_SQR1(v[4]);
+        u[8] = gf2m_SQR0(v[4]);
+        u[7] = gf2m_SQR1(v[3]);
+        u[6] = gf2m_SQR0(v[3]);
+#endif
+        u[5] = gf2m_SQR1(v[2]);
+        u[4] = gf2m_SQR0(v[2]);
+        u[3] = gf2m_SQR1(v[1]);
+        u[2] = gf2m_SQR0(v[1]);
+        u[1] = gf2m_SQR1(v[0]);
+        u[0] = gf2m_SQR0(v[0]);
+        return ec_GF2m_163_mod(r, r, meth);
+
+  CLEANUP:
+        return res;
+}
+
+/* Fast multiplication for polynomials over a 163-bit curve. Assumes
+ * reduction polynomial with terms {163, 7, 6, 3, 0}. */
+mp_err
+ec_GF2m_163_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit a2 = 0, a1 = 0, a0, b2 = 0, b1 = 0, b0;
+
+#ifdef ECL_THIRTY_TWO_BIT
+        mp_digit a5 = 0, a4 = 0, a3 = 0, b5 = 0, b4 = 0, b3 = 0;
+        mp_digit rm[6];
+#endif
+
+        if (a == b) {
+                return ec_GF2m_163_sqr(a, r, meth);
+        } else {
+                switch (MP_USED(a)) {
+#ifdef ECL_THIRTY_TWO_BIT
+                case 6:
+                        a5 = MP_DIGIT(a, 5);
+                case 5:
+                        a4 = MP_DIGIT(a, 4);
+                case 4:
+                        a3 = MP_DIGIT(a, 3);
+#endif
+                case 3:
+                        a2 = MP_DIGIT(a, 2);
+                case 2:
+                        a1 = MP_DIGIT(a, 1);
+                default:
+                        a0 = MP_DIGIT(a, 0);
+                }
+                switch (MP_USED(b)) {
+#ifdef ECL_THIRTY_TWO_BIT
+                case 6:
+                        b5 = MP_DIGIT(b, 5);
+                case 5:
+                        b4 = MP_DIGIT(b, 4);
+                case 4:
+                        b3 = MP_DIGIT(b, 3);
+#endif
+                case 3:
+                        b2 = MP_DIGIT(b, 2);
+                case 2:
+                        b1 = MP_DIGIT(b, 1);
+                default:
+                        b0 = MP_DIGIT(b, 0);
+                }
+#ifdef ECL_SIXTY_FOUR_BIT
+                MP_CHECKOK(s_mp_pad(r, 6));
+                s_bmul_3x3(MP_DIGITS(r), a2, a1, a0, b2, b1, b0);
+                MP_USED(r) = 6;
+                s_mp_clamp(r);
+#else
+                MP_CHECKOK(s_mp_pad(r, 12));
+                s_bmul_3x3(MP_DIGITS(r) + 6, a5, a4, a3, b5, b4, b3);
+                s_bmul_3x3(MP_DIGITS(r), a2, a1, a0, b2, b1, b0);
+                s_bmul_3x3(rm, a5 ^ a2, a4 ^ a1, a3 ^ a0, b5 ^ b2, b4 ^ b1,
+                                   b3 ^ b0);
+                rm[5] ^= MP_DIGIT(r, 5) ^ MP_DIGIT(r, 11);
+                rm[4] ^= MP_DIGIT(r, 4) ^ MP_DIGIT(r, 10);
+                rm[3] ^= MP_DIGIT(r, 3) ^ MP_DIGIT(r, 9);
+                rm[2] ^= MP_DIGIT(r, 2) ^ MP_DIGIT(r, 8);
+                rm[1] ^= MP_DIGIT(r, 1) ^ MP_DIGIT(r, 7);
+                rm[0] ^= MP_DIGIT(r, 0) ^ MP_DIGIT(r, 6);
+                MP_DIGIT(r, 8) ^= rm[5];
+                MP_DIGIT(r, 7) ^= rm[4];
+                MP_DIGIT(r, 6) ^= rm[3];
+                MP_DIGIT(r, 5) ^= rm[2];
+                MP_DIGIT(r, 4) ^= rm[1];
+                MP_DIGIT(r, 3) ^= rm[0];
+                MP_USED(r) = 12;
+                s_mp_clamp(r);
+#endif
+                return ec_GF2m_163_mod(r, r, meth);
+        }
+
+  CLEANUP:
+        return res;
+}
+
+/* Wire in fast field arithmetic for 163-bit curves. */
+mp_err
+ec_group_set_gf2m163(ECGroup *group, ECCurveName name)
+{
+        group->meth->field_mod = &ec_GF2m_163_mod;
+        group->meth->field_mul = &ec_GF2m_163_mul;
+        group->meth->field_sqr = &ec_GF2m_163_sqr;
+        return MP_OKAY;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ec2_193.c b/jdk/src/share/native/sun/security/ec/ec2_193.c
new file mode 100644
index 00000000000..f6187d35612
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec2_193.c
@@ -0,0 +1,298 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for binary polynomial field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang-Shantz <sheueling.chang@sun.com>,
+ *   Stephen Fung <fungstep@hotmail.com>, and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ec2.h"
+#include "mp_gf2m.h"
+#include "mp_gf2m-priv.h"
+#include "mpi.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Fast reduction for polynomials over a 193-bit curve. Assumes reduction
+ * polynomial with terms {193, 15, 0}. */
+mp_err
+ec_GF2m_193_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit *u, z;
+
+        if (a != r) {
+                MP_CHECKOK(mp_copy(a, r));
+        }
+#ifdef ECL_SIXTY_FOUR_BIT
+        if (MP_USED(r) < 7) {
+                MP_CHECKOK(s_mp_pad(r, 7));
+        }
+        u = MP_DIGITS(r);
+        MP_USED(r) = 7;
+
+        /* u[6] only has 2 significant bits */
+        z = u[6];
+        u[3] ^= (z << 14) ^ (z >> 1);
+        u[2] ^= (z << 63);
+        z = u[5];
+        u[3] ^= (z >> 50);
+        u[2] ^= (z << 14) ^ (z >> 1);
+        u[1] ^= (z << 63);
+        z = u[4];
+        u[2] ^= (z >> 50);
+        u[1] ^= (z << 14) ^ (z >> 1);
+        u[0] ^= (z << 63);
+        z = u[3] >> 1;                          /* z only has 63 significant bits */
+        u[1] ^= (z >> 49);
+        u[0] ^= (z << 15) ^ z;
+        /* clear bits above 193 */
+        u[6] = u[5] = u[4] = 0;
+        u[3] ^= z << 1;
+#else
+        if (MP_USED(r) < 13) {
+                MP_CHECKOK(s_mp_pad(r, 13));
+        }
+        u = MP_DIGITS(r);
+        MP_USED(r) = 13;
+
+        /* u[12] only has 2 significant bits */
+        z = u[12];
+        u[6] ^= (z << 14) ^ (z >> 1);
+        u[5] ^= (z << 31);
+        z = u[11];
+        u[6] ^= (z >> 18);
+        u[5] ^= (z << 14) ^ (z >> 1);
+        u[4] ^= (z << 31);
+        z = u[10];
+        u[5] ^= (z >> 18);
+        u[4] ^= (z << 14) ^ (z >> 1);
+        u[3] ^= (z << 31);
+        z = u[9];
+        u[4] ^= (z >> 18);
+        u[3] ^= (z << 14) ^ (z >> 1);
+        u[2] ^= (z << 31);
+        z = u[8];
+        u[3] ^= (z >> 18);
+        u[2] ^= (z << 14) ^ (z >> 1);
+        u[1] ^= (z << 31);
+        z = u[7];
+        u[2] ^= (z >> 18);
+        u[1] ^= (z << 14) ^ (z >> 1);
+        u[0] ^= (z << 31);
+        z = u[6] >> 1;                          /* z only has 31 significant bits */
+        u[1] ^= (z >> 17);
+        u[0] ^= (z << 15) ^ z;
+        /* clear bits above 193 */
+        u[12] = u[11] = u[10] = u[9] = u[8] = u[7] = 0;
+        u[6] ^= z << 1;
+#endif
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* Fast squaring for polynomials over a 193-bit curve. Assumes reduction
+ * polynomial with terms {193, 15, 0}. */
+mp_err
+ec_GF2m_193_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit *u, *v;
+
+        v = MP_DIGITS(a);
+
+#ifdef ECL_SIXTY_FOUR_BIT
+        if (MP_USED(a) < 4) {
+                return mp_bsqrmod(a, meth->irr_arr, r);
+        }
+        if (MP_USED(r) < 7) {
+                MP_CHECKOK(s_mp_pad(r, 7));
+        }
+        MP_USED(r) = 7;
+#else
+        if (MP_USED(a) < 7) {
+                return mp_bsqrmod(a, meth->irr_arr, r);
+        }
+        if (MP_USED(r) < 13) {
+                MP_CHECKOK(s_mp_pad(r, 13));
+        }
+        MP_USED(r) = 13;
+#endif
+        u = MP_DIGITS(r);
+
+#ifdef ECL_THIRTY_TWO_BIT
+        u[12] = gf2m_SQR0(v[6]);
+        u[11] = gf2m_SQR1(v[5]);
+        u[10] = gf2m_SQR0(v[5]);
+        u[9] = gf2m_SQR1(v[4]);
+        u[8] = gf2m_SQR0(v[4]);
+        u[7] = gf2m_SQR1(v[3]);
+#endif
+        u[6] = gf2m_SQR0(v[3]);
+        u[5] = gf2m_SQR1(v[2]);
+        u[4] = gf2m_SQR0(v[2]);
+        u[3] = gf2m_SQR1(v[1]);
+        u[2] = gf2m_SQR0(v[1]);
+        u[1] = gf2m_SQR1(v[0]);
+        u[0] = gf2m_SQR0(v[0]);
+        return ec_GF2m_193_mod(r, r, meth);
+
+  CLEANUP:
+        return res;
+}
+
+/* Fast multiplication for polynomials over a 193-bit curve. Assumes
+ * reduction polynomial with terms {193, 15, 0}. */
+mp_err
+ec_GF2m_193_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit a3 = 0, a2 = 0, a1 = 0, a0, b3 = 0, b2 = 0, b1 = 0, b0;
+
+#ifdef ECL_THIRTY_TWO_BIT
+        mp_digit a6 = 0, a5 = 0, a4 = 0, b6 = 0, b5 = 0, b4 = 0;
+        mp_digit rm[8];
+#endif
+
+        if (a == b) {
+                return ec_GF2m_193_sqr(a, r, meth);
+        } else {
+                switch (MP_USED(a)) {
+#ifdef ECL_THIRTY_TWO_BIT
+                case 7:
+                        a6 = MP_DIGIT(a, 6);
+                case 6:
+                        a5 = MP_DIGIT(a, 5);
+                case 5:
+                        a4 = MP_DIGIT(a, 4);
+#endif
+                case 4:
+                        a3 = MP_DIGIT(a, 3);
+                case 3:
+                        a2 = MP_DIGIT(a, 2);
+                case 2:
+                        a1 = MP_DIGIT(a, 1);
+                default:
+                        a0 = MP_DIGIT(a, 0);
+                }
+                switch (MP_USED(b)) {
+#ifdef ECL_THIRTY_TWO_BIT
+                case 7:
+                        b6 = MP_DIGIT(b, 6);
+                case 6:
+                        b5 = MP_DIGIT(b, 5);
+                case 5:
+                        b4 = MP_DIGIT(b, 4);
+#endif
+                case 4:
+                        b3 = MP_DIGIT(b, 3);
+                case 3:
+                        b2 = MP_DIGIT(b, 2);
+                case 2:
+                        b1 = MP_DIGIT(b, 1);
+                default:
+                        b0 = MP_DIGIT(b, 0);
+                }
+#ifdef ECL_SIXTY_FOUR_BIT
+                MP_CHECKOK(s_mp_pad(r, 8));
+                s_bmul_4x4(MP_DIGITS(r), a3, a2, a1, a0, b3, b2, b1, b0);
+                MP_USED(r) = 8;
+                s_mp_clamp(r);
+#else
+                MP_CHECKOK(s_mp_pad(r, 14));
+                s_bmul_3x3(MP_DIGITS(r) + 8, a6, a5, a4, b6, b5, b4);
+                s_bmul_4x4(MP_DIGITS(r), a3, a2, a1, a0, b3, b2, b1, b0);
+                s_bmul_4x4(rm, a3, a6 ^ a2, a5 ^ a1, a4 ^ a0, b3, b6 ^ b2, b5 ^ b1,
+                                   b4 ^ b0);
+                rm[7] ^= MP_DIGIT(r, 7);
+                rm[6] ^= MP_DIGIT(r, 6);
+                rm[5] ^= MP_DIGIT(r, 5) ^ MP_DIGIT(r, 13);
+                rm[4] ^= MP_DIGIT(r, 4) ^ MP_DIGIT(r, 12);
+                rm[3] ^= MP_DIGIT(r, 3) ^ MP_DIGIT(r, 11);
+                rm[2] ^= MP_DIGIT(r, 2) ^ MP_DIGIT(r, 10);
+                rm[1] ^= MP_DIGIT(r, 1) ^ MP_DIGIT(r, 9);
+                rm[0] ^= MP_DIGIT(r, 0) ^ MP_DIGIT(r, 8);
+                MP_DIGIT(r, 11) ^= rm[7];
+                MP_DIGIT(r, 10) ^= rm[6];
+                MP_DIGIT(r, 9) ^= rm[5];
+                MP_DIGIT(r, 8) ^= rm[4];
+                MP_DIGIT(r, 7) ^= rm[3];
+                MP_DIGIT(r, 6) ^= rm[2];
+                MP_DIGIT(r, 5) ^= rm[1];
+                MP_DIGIT(r, 4) ^= rm[0];
+                MP_USED(r) = 14;
+                s_mp_clamp(r);
+#endif
+                return ec_GF2m_193_mod(r, r, meth);
+        }
+
+  CLEANUP:
+        return res;
+}
+
+/* Wire in fast field arithmetic for 193-bit curves. */
+mp_err
+ec_group_set_gf2m193(ECGroup *group, ECCurveName name)
+{
+        group->meth->field_mod = &ec_GF2m_193_mod;
+        group->meth->field_mul = &ec_GF2m_193_mul;
+        group->meth->field_sqr = &ec_GF2m_193_sqr;
+        return MP_OKAY;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ec2_233.c b/jdk/src/share/native/sun/security/ec/ec2_233.c
new file mode 100644
index 00000000000..2b29c46ea76
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec2_233.c
@@ -0,0 +1,321 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for binary polynomial field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang-Shantz <sheueling.chang@sun.com>,
+ *   Stephen Fung <fungstep@hotmail.com>, and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ec2.h"
+#include "mp_gf2m.h"
+#include "mp_gf2m-priv.h"
+#include "mpi.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Fast reduction for polynomials over a 233-bit curve. Assumes reduction
+ * polynomial with terms {233, 74, 0}. */
+mp_err
+ec_GF2m_233_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit *u, z;
+
+        if (a != r) {
+                MP_CHECKOK(mp_copy(a, r));
+        }
+#ifdef ECL_SIXTY_FOUR_BIT
+        if (MP_USED(r) < 8) {
+                MP_CHECKOK(s_mp_pad(r, 8));
+        }
+        u = MP_DIGITS(r);
+        MP_USED(r) = 8;
+
+        /* u[7] only has 18 significant bits */
+        z = u[7];
+        u[4] ^= (z << 33) ^ (z >> 41);
+        u[3] ^= (z << 23);
+        z = u[6];
+        u[4] ^= (z >> 31);
+        u[3] ^= (z << 33) ^ (z >> 41);
+        u[2] ^= (z << 23);
+        z = u[5];
+        u[3] ^= (z >> 31);
+        u[2] ^= (z << 33) ^ (z >> 41);
+        u[1] ^= (z << 23);
+        z = u[4];
+        u[2] ^= (z >> 31);
+        u[1] ^= (z << 33) ^ (z >> 41);
+        u[0] ^= (z << 23);
+        z = u[3] >> 41;                         /* z only has 23 significant bits */
+        u[1] ^= (z << 10);
+        u[0] ^= z;
+        /* clear bits above 233 */
+        u[7] = u[6] = u[5] = u[4] = 0;
+        u[3] ^= z << 41;
+#else
+        if (MP_USED(r) < 15) {
+                MP_CHECKOK(s_mp_pad(r, 15));
+        }
+        u = MP_DIGITS(r);
+        MP_USED(r) = 15;
+
+        /* u[14] only has 18 significant bits */
+        z = u[14];
+        u[9] ^= (z << 1);
+        u[7] ^= (z >> 9);
+        u[6] ^= (z << 23);
+        z = u[13];
+        u[9] ^= (z >> 31);
+        u[8] ^= (z << 1);
+        u[6] ^= (z >> 9);
+        u[5] ^= (z << 23);
+        z = u[12];
+        u[8] ^= (z >> 31);
+        u[7] ^= (z << 1);
+        u[5] ^= (z >> 9);
+        u[4] ^= (z << 23);
+        z = u[11];
+        u[7] ^= (z >> 31);
+        u[6] ^= (z << 1);
+        u[4] ^= (z >> 9);
+        u[3] ^= (z << 23);
+        z = u[10];
+        u[6] ^= (z >> 31);
+        u[5] ^= (z << 1);
+        u[3] ^= (z >> 9);
+        u[2] ^= (z << 23);
+        z = u[9];
+        u[5] ^= (z >> 31);
+        u[4] ^= (z << 1);
+        u[2] ^= (z >> 9);
+        u[1] ^= (z << 23);
+        z = u[8];
+        u[4] ^= (z >> 31);
+        u[3] ^= (z << 1);
+        u[1] ^= (z >> 9);
+        u[0] ^= (z << 23);
+        z = u[7] >> 9;                          /* z only has 23 significant bits */
+        u[3] ^= (z >> 22);
+        u[2] ^= (z << 10);
+        u[0] ^= z;
+        /* clear bits above 233 */
+        u[14] = u[13] = u[12] = u[11] = u[10] = u[9] = u[8] = 0;
+        u[7] ^= z << 9;
+#endif
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* Fast squaring for polynomials over a 233-bit curve. Assumes reduction
+ * polynomial with terms {233, 74, 0}. */
+mp_err
+ec_GF2m_233_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit *u, *v;
+
+        v = MP_DIGITS(a);
+
+#ifdef ECL_SIXTY_FOUR_BIT
+        if (MP_USED(a) < 4) {
+                return mp_bsqrmod(a, meth->irr_arr, r);
+        }
+        if (MP_USED(r) < 8) {
+                MP_CHECKOK(s_mp_pad(r, 8));
+        }
+        MP_USED(r) = 8;
+#else
+        if (MP_USED(a) < 8) {
+                return mp_bsqrmod(a, meth->irr_arr, r);
+        }
+        if (MP_USED(r) < 15) {
+                MP_CHECKOK(s_mp_pad(r, 15));
+        }
+        MP_USED(r) = 15;
+#endif
+        u = MP_DIGITS(r);
+
+#ifdef ECL_THIRTY_TWO_BIT
+        u[14] = gf2m_SQR0(v[7]);
+        u[13] = gf2m_SQR1(v[6]);
+        u[12] = gf2m_SQR0(v[6]);
+        u[11] = gf2m_SQR1(v[5]);
+        u[10] = gf2m_SQR0(v[5]);
+        u[9] = gf2m_SQR1(v[4]);
+        u[8] = gf2m_SQR0(v[4]);
+#endif
+        u[7] = gf2m_SQR1(v[3]);
+        u[6] = gf2m_SQR0(v[3]);
+        u[5] = gf2m_SQR1(v[2]);
+        u[4] = gf2m_SQR0(v[2]);
+        u[3] = gf2m_SQR1(v[1]);
+        u[2] = gf2m_SQR0(v[1]);
+        u[1] = gf2m_SQR1(v[0]);
+        u[0] = gf2m_SQR0(v[0]);
+        return ec_GF2m_233_mod(r, r, meth);
+
+  CLEANUP:
+        return res;
+}
+
+/* Fast multiplication for polynomials over a 233-bit curve. Assumes
+ * reduction polynomial with terms {233, 74, 0}. */
+mp_err
+ec_GF2m_233_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit a3 = 0, a2 = 0, a1 = 0, a0, b3 = 0, b2 = 0, b1 = 0, b0;
+
+#ifdef ECL_THIRTY_TWO_BIT
+        mp_digit a7 = 0, a6 = 0, a5 = 0, a4 = 0, b7 = 0, b6 = 0, b5 = 0, b4 =
+                0;
+        mp_digit rm[8];
+#endif
+
+        if (a == b) {
+                return ec_GF2m_233_sqr(a, r, meth);
+        } else {
+                switch (MP_USED(a)) {
+#ifdef ECL_THIRTY_TWO_BIT
+                case 8:
+                        a7 = MP_DIGIT(a, 7);
+                case 7:
+                        a6 = MP_DIGIT(a, 6);
+                case 6:
+                        a5 = MP_DIGIT(a, 5);
+                case 5:
+                        a4 = MP_DIGIT(a, 4);
+#endif
+                case 4:
+                        a3 = MP_DIGIT(a, 3);
+                case 3:
+                        a2 = MP_DIGIT(a, 2);
+                case 2:
+                        a1 = MP_DIGIT(a, 1);
+                default:
+                        a0 = MP_DIGIT(a, 0);
+                }
+                switch (MP_USED(b)) {
+#ifdef ECL_THIRTY_TWO_BIT
+                case 8:
+                        b7 = MP_DIGIT(b, 7);
+                case 7:
+                        b6 = MP_DIGIT(b, 6);
+                case 6:
+                        b5 = MP_DIGIT(b, 5);
+                case 5:
+                        b4 = MP_DIGIT(b, 4);
+#endif
+                case 4:
+                        b3 = MP_DIGIT(b, 3);
+                case 3:
+                        b2 = MP_DIGIT(b, 2);
+                case 2:
+                        b1 = MP_DIGIT(b, 1);
+                default:
+                        b0 = MP_DIGIT(b, 0);
+                }
+#ifdef ECL_SIXTY_FOUR_BIT
+                MP_CHECKOK(s_mp_pad(r, 8));
+                s_bmul_4x4(MP_DIGITS(r), a3, a2, a1, a0, b3, b2, b1, b0);
+                MP_USED(r) = 8;
+                s_mp_clamp(r);
+#else
+                MP_CHECKOK(s_mp_pad(r, 16));
+                s_bmul_4x4(MP_DIGITS(r) + 8, a7, a6, a5, a4, b7, b6, b5, b4);
+                s_bmul_4x4(MP_DIGITS(r), a3, a2, a1, a0, b3, b2, b1, b0);
+                s_bmul_4x4(rm, a7 ^ a3, a6 ^ a2, a5 ^ a1, a4 ^ a0, b7 ^ b3,
+                                   b6 ^ b2, b5 ^ b1, b4 ^ b0);
+                rm[7] ^= MP_DIGIT(r, 7) ^ MP_DIGIT(r, 15);
+                rm[6] ^= MP_DIGIT(r, 6) ^ MP_DIGIT(r, 14);
+                rm[5] ^= MP_DIGIT(r, 5) ^ MP_DIGIT(r, 13);
+                rm[4] ^= MP_DIGIT(r, 4) ^ MP_DIGIT(r, 12);
+                rm[3] ^= MP_DIGIT(r, 3) ^ MP_DIGIT(r, 11);
+                rm[2] ^= MP_DIGIT(r, 2) ^ MP_DIGIT(r, 10);
+                rm[1] ^= MP_DIGIT(r, 1) ^ MP_DIGIT(r, 9);
+                rm[0] ^= MP_DIGIT(r, 0) ^ MP_DIGIT(r, 8);
+                MP_DIGIT(r, 11) ^= rm[7];
+                MP_DIGIT(r, 10) ^= rm[6];
+                MP_DIGIT(r, 9) ^= rm[5];
+                MP_DIGIT(r, 8) ^= rm[4];
+                MP_DIGIT(r, 7) ^= rm[3];
+                MP_DIGIT(r, 6) ^= rm[2];
+                MP_DIGIT(r, 5) ^= rm[1];
+                MP_DIGIT(r, 4) ^= rm[0];
+                MP_USED(r) = 16;
+                s_mp_clamp(r);
+#endif
+                return ec_GF2m_233_mod(r, r, meth);
+        }
+
+  CLEANUP:
+        return res;
+}
+
+/* Wire in fast field arithmetic for 233-bit curves. */
+mp_err
+ec_group_set_gf2m233(ECGroup *group, ECCurveName name)
+{
+        group->meth->field_mod = &ec_GF2m_233_mod;
+        group->meth->field_mul = &ec_GF2m_233_mul;
+        group->meth->field_sqr = &ec_GF2m_233_sqr;
+        return MP_OKAY;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ec2_aff.c b/jdk/src/share/native/sun/security/ec/ec2_aff.c
new file mode 100644
index 00000000000..bb52cbc97f9
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec2_aff.c
@@ -0,0 +1,368 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for binary polynomial field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ec2.h"
+#include "mplogic.h"
+#include "mp_gf2m.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Checks if point P(px, py) is at infinity.  Uses affine coordinates. */
+mp_err
+ec_GF2m_pt_is_inf_aff(const mp_int *px, const mp_int *py)
+{
+
+        if ((mp_cmp_z(px) == 0) && (mp_cmp_z(py) == 0)) {
+                return MP_YES;
+        } else {
+                return MP_NO;
+        }
+
+}
+
+/* Sets P(px, py) to be the point at infinity.  Uses affine coordinates. */
+mp_err
+ec_GF2m_pt_set_inf_aff(mp_int *px, mp_int *py)
+{
+        mp_zero(px);
+        mp_zero(py);
+        return MP_OKAY;
+}
+
+/* Computes R = P + Q based on IEEE P1363 A.10.2. Elliptic curve points P,
+ * Q, and R can all be identical. Uses affine coordinates. */
+mp_err
+ec_GF2m_pt_add_aff(const mp_int *px, const mp_int *py, const mp_int *qx,
+                                   const mp_int *qy, mp_int *rx, mp_int *ry,
+                                   const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int lambda, tempx, tempy;
+
+        MP_DIGITS(&lambda) = 0;
+        MP_DIGITS(&tempx) = 0;
+        MP_DIGITS(&tempy) = 0;
+        MP_CHECKOK(mp_init(&lambda, FLAG(px)));
+        MP_CHECKOK(mp_init(&tempx, FLAG(px)));
+        MP_CHECKOK(mp_init(&tempy, FLAG(px)));
+        /* if P = inf, then R = Q */
+        if (ec_GF2m_pt_is_inf_aff(px, py) == 0) {
+                MP_CHECKOK(mp_copy(qx, rx));
+                MP_CHECKOK(mp_copy(qy, ry));
+                res = MP_OKAY;
+                goto CLEANUP;
+        }
+        /* if Q = inf, then R = P */
+        if (ec_GF2m_pt_is_inf_aff(qx, qy) == 0) {
+                MP_CHECKOK(mp_copy(px, rx));
+                MP_CHECKOK(mp_copy(py, ry));
+                res = MP_OKAY;
+                goto CLEANUP;
+        }
+        /* if px != qx, then lambda = (py+qy) / (px+qx), tempx = a + lambda^2
+         * + lambda + px + qx */
+        if (mp_cmp(px, qx) != 0) {
+                MP_CHECKOK(group->meth->field_add(py, qy, &tempy, group->meth));
+                MP_CHECKOK(group->meth->field_add(px, qx, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_div(&tempy, &tempx, &lambda, group->meth));
+                MP_CHECKOK(group->meth->field_sqr(&lambda, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&tempx, &lambda, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&tempx, &group->curvea, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&tempx, px, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&tempx, qx, &tempx, group->meth));
+        } else {
+                /* if py != qy or qx = 0, then R = inf */
+                if (((mp_cmp(py, qy) != 0)) || (mp_cmp_z(qx) == 0)) {
+                        mp_zero(rx);
+                        mp_zero(ry);
+                        res = MP_OKAY;
+                        goto CLEANUP;
+                }
+                /* lambda = qx + qy / qx */
+                MP_CHECKOK(group->meth->field_div(qy, qx, &lambda, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&lambda, qx, &lambda, group->meth));
+                /* tempx = a + lambda^2 + lambda */
+                MP_CHECKOK(group->meth->field_sqr(&lambda, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&tempx, &lambda, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&tempx, &group->curvea, &tempx, group->meth));
+        }
+        /* ry = (qx + tempx) * lambda + tempx + qy */
+        MP_CHECKOK(group->meth->field_add(qx, &tempx, &tempy, group->meth));
+        MP_CHECKOK(group->meth->
+                           field_mul(&tempy, &lambda, &tempy, group->meth));
+        MP_CHECKOK(group->meth->
+                           field_add(&tempy, &tempx, &tempy, group->meth));
+        MP_CHECKOK(group->meth->field_add(&tempy, qy, ry, group->meth));
+        /* rx = tempx */
+        MP_CHECKOK(mp_copy(&tempx, rx));
+
+  CLEANUP:
+        mp_clear(&lambda);
+        mp_clear(&tempx);
+        mp_clear(&tempy);
+        return res;
+}
+
+/* Computes R = P - Q. Elliptic curve points P, Q, and R can all be
+ * identical. Uses affine coordinates. */
+mp_err
+ec_GF2m_pt_sub_aff(const mp_int *px, const mp_int *py, const mp_int *qx,
+                                   const mp_int *qy, mp_int *rx, mp_int *ry,
+                                   const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int nqy;
+
+        MP_DIGITS(&nqy) = 0;
+        MP_CHECKOK(mp_init(&nqy, FLAG(px)));
+        /* nqy = qx+qy */
+        MP_CHECKOK(group->meth->field_add(qx, qy, &nqy, group->meth));
+        MP_CHECKOK(group->point_add(px, py, qx, &nqy, rx, ry, group));
+  CLEANUP:
+        mp_clear(&nqy);
+        return res;
+}
+
+/* Computes R = 2P. Elliptic curve points P and R can be identical. Uses
+ * affine coordinates. */
+mp_err
+ec_GF2m_pt_dbl_aff(const mp_int *px, const mp_int *py, mp_int *rx,
+                                   mp_int *ry, const ECGroup *group)
+{
+        return group->point_add(px, py, px, py, rx, ry, group);
+}
+
+/* by default, this routine is unused and thus doesn't need to be compiled */
+#ifdef ECL_ENABLE_GF2M_PT_MUL_AFF
+/* Computes R = nP based on IEEE P1363 A.10.3. Elliptic curve points P and
+ * R can be identical. Uses affine coordinates. */
+mp_err
+ec_GF2m_pt_mul_aff(const mp_int *n, const mp_int *px, const mp_int *py,
+                                   mp_int *rx, mp_int *ry, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int k, k3, qx, qy, sx, sy;
+        int b1, b3, i, l;
+
+        MP_DIGITS(&k) = 0;
+        MP_DIGITS(&k3) = 0;
+        MP_DIGITS(&qx) = 0;
+        MP_DIGITS(&qy) = 0;
+        MP_DIGITS(&sx) = 0;
+        MP_DIGITS(&sy) = 0;
+        MP_CHECKOK(mp_init(&k));
+        MP_CHECKOK(mp_init(&k3));
+        MP_CHECKOK(mp_init(&qx));
+        MP_CHECKOK(mp_init(&qy));
+        MP_CHECKOK(mp_init(&sx));
+        MP_CHECKOK(mp_init(&sy));
+
+        /* if n = 0 then r = inf */
+        if (mp_cmp_z(n) == 0) {
+                mp_zero(rx);
+                mp_zero(ry);
+                res = MP_OKAY;
+                goto CLEANUP;
+        }
+        /* Q = P, k = n */
+        MP_CHECKOK(mp_copy(px, &qx));
+        MP_CHECKOK(mp_copy(py, &qy));
+        MP_CHECKOK(mp_copy(n, &k));
+        /* if n < 0 then Q = -Q, k = -k */
+        if (mp_cmp_z(n) < 0) {
+                MP_CHECKOK(group->meth->field_add(&qx, &qy, &qy, group->meth));
+                MP_CHECKOK(mp_neg(&k, &k));
+        }
+#ifdef ECL_DEBUG                                /* basic double and add method */
+        l = mpl_significant_bits(&k) - 1;
+        MP_CHECKOK(mp_copy(&qx, &sx));
+        MP_CHECKOK(mp_copy(&qy, &sy));
+        for (i = l - 1; i >= 0; i--) {
+                /* S = 2S */
+                MP_CHECKOK(group->point_dbl(&sx, &sy, &sx, &sy, group));
+                /* if k_i = 1, then S = S + Q */
+                if (mpl_get_bit(&k, i) != 0) {
+                        MP_CHECKOK(group->
+                                           point_add(&sx, &sy, &qx, &qy, &sx, &sy, group));
+                }
+        }
+#else                                                   /* double and add/subtract method from
+                                                                 * standard */
+        /* k3 = 3 * k */
+        MP_CHECKOK(mp_set_int(&k3, 3));
+        MP_CHECKOK(mp_mul(&k, &k3, &k3));
+        /* S = Q */
+        MP_CHECKOK(mp_copy(&qx, &sx));
+        MP_CHECKOK(mp_copy(&qy, &sy));
+        /* l = index of high order bit in binary representation of 3*k */
+        l = mpl_significant_bits(&k3) - 1;
+        /* for i = l-1 downto 1 */
+        for (i = l - 1; i >= 1; i--) {
+                /* S = 2S */
+                MP_CHECKOK(group->point_dbl(&sx, &sy, &sx, &sy, group));
+                b3 = MP_GET_BIT(&k3, i);
+                b1 = MP_GET_BIT(&k, i);
+                /* if k3_i = 1 and k_i = 0, then S = S + Q */
+                if ((b3 == 1) && (b1 == 0)) {
+                        MP_CHECKOK(group->
+                                           point_add(&sx, &sy, &qx, &qy, &sx, &sy, group));
+                        /* if k3_i = 0 and k_i = 1, then S = S - Q */
+                } else if ((b3 == 0) && (b1 == 1)) {
+                        MP_CHECKOK(group->
+                                           point_sub(&sx, &sy, &qx, &qy, &sx, &sy, group));
+                }
+        }
+#endif
+        /* output S */
+        MP_CHECKOK(mp_copy(&sx, rx));
+        MP_CHECKOK(mp_copy(&sy, ry));
+
+  CLEANUP:
+        mp_clear(&k);
+        mp_clear(&k3);
+        mp_clear(&qx);
+        mp_clear(&qy);
+        mp_clear(&sx);
+        mp_clear(&sy);
+        return res;
+}
+#endif
+
+/* Validates a point on a GF2m curve. */
+mp_err
+ec_GF2m_validate_point(const mp_int *px, const mp_int *py, const ECGroup *group)
+{
+        mp_err res = MP_NO;
+        mp_int accl, accr, tmp, pxt, pyt;
+
+        MP_DIGITS(&accl) = 0;
+        MP_DIGITS(&accr) = 0;
+        MP_DIGITS(&tmp) = 0;
+        MP_DIGITS(&pxt) = 0;
+        MP_DIGITS(&pyt) = 0;
+        MP_CHECKOK(mp_init(&accl, FLAG(px)));
+        MP_CHECKOK(mp_init(&accr, FLAG(px)));
+        MP_CHECKOK(mp_init(&tmp, FLAG(px)));
+        MP_CHECKOK(mp_init(&pxt, FLAG(px)));
+        MP_CHECKOK(mp_init(&pyt, FLAG(px)));
+
+    /* 1: Verify that publicValue is not the point at infinity */
+        if (ec_GF2m_pt_is_inf_aff(px, py) == MP_YES) {
+                res = MP_NO;
+                goto CLEANUP;
+        }
+    /* 2: Verify that the coordinates of publicValue are elements
+     *    of the field.
+     */
+        if ((MP_SIGN(px) == MP_NEG) || (mp_cmp(px, &group->meth->irr) >= 0) ||
+                (MP_SIGN(py) == MP_NEG) || (mp_cmp(py, &group->meth->irr) >= 0)) {
+                res = MP_NO;
+                goto CLEANUP;
+        }
+    /* 3: Verify that publicValue is on the curve. */
+        if (group->meth->field_enc) {
+                group->meth->field_enc(px, &pxt, group->meth);
+                group->meth->field_enc(py, &pyt, group->meth);
+        } else {
+                mp_copy(px, &pxt);
+                mp_copy(py, &pyt);
+        }
+        /* left-hand side: y^2 + x*y  */
+        MP_CHECKOK( group->meth->field_sqr(&pyt, &accl, group->meth) );
+        MP_CHECKOK( group->meth->field_mul(&pxt, &pyt, &tmp, group->meth) );
+        MP_CHECKOK( group->meth->field_add(&accl, &tmp, &accl, group->meth) );
+        /* right-hand side: x^3 + a*x^2 + b */
+        MP_CHECKOK( group->meth->field_sqr(&pxt, &tmp, group->meth) );
+        MP_CHECKOK( group->meth->field_mul(&pxt, &tmp, &accr, group->meth) );
+        MP_CHECKOK( group->meth->field_mul(&group->curvea, &tmp, &tmp, group->meth) );
+        MP_CHECKOK( group->meth->field_add(&tmp, &accr, &accr, group->meth) );
+        MP_CHECKOK( group->meth->field_add(&accr, &group->curveb, &accr, group->meth) );
+        /* check LHS - RHS == 0 */
+        MP_CHECKOK( group->meth->field_add(&accl, &accr, &accr, group->meth) );
+        if (mp_cmp_z(&accr) != 0) {
+                res = MP_NO;
+                goto CLEANUP;
+        }
+    /* 4: Verify that the order of the curve times the publicValue
+     *    is the point at infinity.
+     */
+        MP_CHECKOK( ECPoint_mul(group, &group->order, px, py, &pxt, &pyt) );
+        if (ec_GF2m_pt_is_inf_aff(&pxt, &pyt) != MP_YES) {
+                res = MP_NO;
+                goto CLEANUP;
+        }
+
+        res = MP_YES;
+
+CLEANUP:
+        mp_clear(&accl);
+        mp_clear(&accr);
+        mp_clear(&tmp);
+        mp_clear(&pxt);
+        mp_clear(&pyt);
+        return res;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ec2_mont.c b/jdk/src/share/native/sun/security/ec/ec2_mont.c
new file mode 100644
index 00000000000..5cef20f5303
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec2_mont.c
@@ -0,0 +1,296 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for binary polynomial field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang-Shantz <sheueling.chang@sun.com>,
+ *   Stephen Fung <fungstep@hotmail.com>, and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ec2.h"
+#include "mplogic.h"
+#include "mp_gf2m.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Compute the x-coordinate x/z for the point 2*(x/z) in Montgomery
+ * projective coordinates. Uses algorithm Mdouble in appendix of Lopez, J.
+ * and Dahab, R.  "Fast multiplication on elliptic curves over GF(2^m)
+ * without precomputation". modified to not require precomputation of
+ * c=b^{2^{m-1}}. */
+static mp_err
+gf2m_Mdouble(mp_int *x, mp_int *z, const ECGroup *group, int kmflag)
+{
+        mp_err res = MP_OKAY;
+        mp_int t1;
+
+        MP_DIGITS(&t1) = 0;
+        MP_CHECKOK(mp_init(&t1, kmflag));
+
+        MP_CHECKOK(group->meth->field_sqr(x, x, group->meth));
+        MP_CHECKOK(group->meth->field_sqr(z, &t1, group->meth));
+        MP_CHECKOK(group->meth->field_mul(x, &t1, z, group->meth));
+        MP_CHECKOK(group->meth->field_sqr(x, x, group->meth));
+        MP_CHECKOK(group->meth->field_sqr(&t1, &t1, group->meth));
+        MP_CHECKOK(group->meth->
+                           field_mul(&group->curveb, &t1, &t1, group->meth));
+        MP_CHECKOK(group->meth->field_add(x, &t1, x, group->meth));
+
+  CLEANUP:
+        mp_clear(&t1);
+        return res;
+}
+
+/* Compute the x-coordinate x1/z1 for the point (x1/z1)+(x2/x2) in
+ * Montgomery projective coordinates. Uses algorithm Madd in appendix of
+ * Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over
+ * GF(2^m) without precomputation". */
+static mp_err
+gf2m_Madd(const mp_int *x, mp_int *x1, mp_int *z1, mp_int *x2, mp_int *z2,
+                  const ECGroup *group, int kmflag)
+{
+        mp_err res = MP_OKAY;
+        mp_int t1, t2;
+
+        MP_DIGITS(&t1) = 0;
+        MP_DIGITS(&t2) = 0;
+        MP_CHECKOK(mp_init(&t1, kmflag));
+        MP_CHECKOK(mp_init(&t2, kmflag));
+
+        MP_CHECKOK(mp_copy(x, &t1));
+        MP_CHECKOK(group->meth->field_mul(x1, z2, x1, group->meth));
+        MP_CHECKOK(group->meth->field_mul(z1, x2, z1, group->meth));
+        MP_CHECKOK(group->meth->field_mul(x1, z1, &t2, group->meth));
+        MP_CHECKOK(group->meth->field_add(z1, x1, z1, group->meth));
+        MP_CHECKOK(group->meth->field_sqr(z1, z1, group->meth));
+        MP_CHECKOK(group->meth->field_mul(z1, &t1, x1, group->meth));
+        MP_CHECKOK(group->meth->field_add(x1, &t2, x1, group->meth));
+
+  CLEANUP:
+        mp_clear(&t1);
+        mp_clear(&t2);
+        return res;
+}
+
+/* Compute the x, y affine coordinates from the point (x1, z1) (x2, z2)
+ * using Montgomery point multiplication algorithm Mxy() in appendix of
+ * Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over
+ * GF(2^m) without precomputation". Returns: 0 on error 1 if return value
+ * should be the point at infinity 2 otherwise */
+static int
+gf2m_Mxy(const mp_int *x, const mp_int *y, mp_int *x1, mp_int *z1,
+                 mp_int *x2, mp_int *z2, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        int ret = 0;
+        mp_int t3, t4, t5;
+
+        MP_DIGITS(&t3) = 0;
+        MP_DIGITS(&t4) = 0;
+        MP_DIGITS(&t5) = 0;
+        MP_CHECKOK(mp_init(&t3, FLAG(x2)));
+        MP_CHECKOK(mp_init(&t4, FLAG(x2)));
+        MP_CHECKOK(mp_init(&t5, FLAG(x2)));
+
+        if (mp_cmp_z(z1) == 0) {
+                mp_zero(x2);
+                mp_zero(z2);
+                ret = 1;
+                goto CLEANUP;
+        }
+
+        if (mp_cmp_z(z2) == 0) {
+                MP_CHECKOK(mp_copy(x, x2));
+                MP_CHECKOK(group->meth->field_add(x, y, z2, group->meth));
+                ret = 2;
+                goto CLEANUP;
+        }
+
+        MP_CHECKOK(mp_set_int(&t5, 1));
+        if (group->meth->field_enc) {
+                MP_CHECKOK(group->meth->field_enc(&t5, &t5, group->meth));
+        }
+
+        MP_CHECKOK(group->meth->field_mul(z1, z2, &t3, group->meth));
+
+        MP_CHECKOK(group->meth->field_mul(z1, x, z1, group->meth));
+        MP_CHECKOK(group->meth->field_add(z1, x1, z1, group->meth));
+        MP_CHECKOK(group->meth->field_mul(z2, x, z2, group->meth));
+        MP_CHECKOK(group->meth->field_mul(z2, x1, x1, group->meth));
+        MP_CHECKOK(group->meth->field_add(z2, x2, z2, group->meth));
+
+        MP_CHECKOK(group->meth->field_mul(z2, z1, z2, group->meth));
+        MP_CHECKOK(group->meth->field_sqr(x, &t4, group->meth));
+        MP_CHECKOK(group->meth->field_add(&t4, y, &t4, group->meth));
+        MP_CHECKOK(group->meth->field_mul(&t4, &t3, &t4, group->meth));
+        MP_CHECKOK(group->meth->field_add(&t4, z2, &t4, group->meth));
+
+        MP_CHECKOK(group->meth->field_mul(&t3, x, &t3, group->meth));
+        MP_CHECKOK(group->meth->field_div(&t5, &t3, &t3, group->meth));
+        MP_CHECKOK(group->meth->field_mul(&t3, &t4, &t4, group->meth));
+        MP_CHECKOK(group->meth->field_mul(x1, &t3, x2, group->meth));
+        MP_CHECKOK(group->meth->field_add(x2, x, z2, group->meth));
+
+        MP_CHECKOK(group->meth->field_mul(z2, &t4, z2, group->meth));
+        MP_CHECKOK(group->meth->field_add(z2, y, z2, group->meth));
+
+        ret = 2;
+
+  CLEANUP:
+        mp_clear(&t3);
+        mp_clear(&t4);
+        mp_clear(&t5);
+        if (res == MP_OKAY) {
+                return ret;
+        } else {
+                return 0;
+        }
+}
+
+/* Computes R = nP based on algorithm 2P of Lopex, J. and Dahab, R.  "Fast
+ * multiplication on elliptic curves over GF(2^m) without
+ * precomputation". Elliptic curve points P and R can be identical. Uses
+ * Montgomery projective coordinates. */
+mp_err
+ec_GF2m_pt_mul_mont(const mp_int *n, const mp_int *px, const mp_int *py,
+                                        mp_int *rx, mp_int *ry, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int x1, x2, z1, z2;
+        int i, j;
+        mp_digit top_bit, mask;
+
+        MP_DIGITS(&x1) = 0;
+        MP_DIGITS(&x2) = 0;
+        MP_DIGITS(&z1) = 0;
+        MP_DIGITS(&z2) = 0;
+        MP_CHECKOK(mp_init(&x1, FLAG(n)));
+        MP_CHECKOK(mp_init(&x2, FLAG(n)));
+        MP_CHECKOK(mp_init(&z1, FLAG(n)));
+        MP_CHECKOK(mp_init(&z2, FLAG(n)));
+
+        /* if result should be point at infinity */
+        if ((mp_cmp_z(n) == 0) || (ec_GF2m_pt_is_inf_aff(px, py) == MP_YES)) {
+                MP_CHECKOK(ec_GF2m_pt_set_inf_aff(rx, ry));
+                goto CLEANUP;
+        }
+
+        MP_CHECKOK(mp_copy(px, &x1));   /* x1 = px */
+        MP_CHECKOK(mp_set_int(&z1, 1)); /* z1 = 1 */
+        MP_CHECKOK(group->meth->field_sqr(&x1, &z2, group->meth));      /* z2 =
+                                                                                                                                 * x1^2 =
+                                                                                                                                 * px^2 */
+        MP_CHECKOK(group->meth->field_sqr(&z2, &x2, group->meth));
+        MP_CHECKOK(group->meth->field_add(&x2, &group->curveb, &x2, group->meth));      /* x2
+                                                                                                                                                                 * =
+                                                                                                                                                                 * px^4
+                                                                                                                                                                 * +
+                                                                                                                                                                 * b
+                                                                                                                                                                 */
+
+        /* find top-most bit and go one past it */
+        i = MP_USED(n) - 1;
+        j = MP_DIGIT_BIT - 1;
+        top_bit = 1;
+        top_bit <<= MP_DIGIT_BIT - 1;
+        mask = top_bit;
+        while (!(MP_DIGITS(n)[i] & mask)) {
+                mask >>= 1;
+                j--;
+        }
+        mask >>= 1;
+        j--;
+
+        /* if top most bit was at word break, go to next word */
+        if (!mask) {
+                i--;
+                j = MP_DIGIT_BIT - 1;
+                mask = top_bit;
+        }
+
+        for (; i >= 0; i--) {
+                for (; j >= 0; j--) {
+                        if (MP_DIGITS(n)[i] & mask) {
+                                MP_CHECKOK(gf2m_Madd(px, &x1, &z1, &x2, &z2, group, FLAG(n)));
+                                MP_CHECKOK(gf2m_Mdouble(&x2, &z2, group, FLAG(n)));
+                        } else {
+                                MP_CHECKOK(gf2m_Madd(px, &x2, &z2, &x1, &z1, group, FLAG(n)));
+                                MP_CHECKOK(gf2m_Mdouble(&x1, &z1, group, FLAG(n)));
+                        }
+                        mask >>= 1;
+                }
+                j = MP_DIGIT_BIT - 1;
+                mask = top_bit;
+        }
+
+        /* convert out of "projective" coordinates */
+        i = gf2m_Mxy(px, py, &x1, &z1, &x2, &z2, group);
+        if (i == 0) {
+                res = MP_BADARG;
+                goto CLEANUP;
+        } else if (i == 1) {
+                MP_CHECKOK(ec_GF2m_pt_set_inf_aff(rx, ry));
+        } else {
+                MP_CHECKOK(mp_copy(&x2, rx));
+                MP_CHECKOK(mp_copy(&z2, ry));
+        }
+
+  CLEANUP:
+        mp_clear(&x1);
+        mp_clear(&x2);
+        mp_clear(&z1);
+        mp_clear(&z2);
+        return res;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ec_naf.c b/jdk/src/share/native/sun/security/ec/ec_naf.c
new file mode 100644
index 00000000000..1d110904d29
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ec_naf.c
@@ -0,0 +1,123 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stephen Fung <fungstep@hotmail.com>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecl-priv.h"
+
+/* Returns 2^e as an integer. This is meant to be used for small powers of
+ * two. */
+int
+ec_twoTo(int e)
+{
+        int a = 1;
+        int i;
+
+        for (i = 0; i < e; i++) {
+                a *= 2;
+        }
+        return a;
+}
+
+/* Computes the windowed non-adjacent-form (NAF) of a scalar. Out should
+ * be an array of signed char's to output to, bitsize should be the number
+ * of bits of out, in is the original scalar, and w is the window size.
+ * NAF is discussed in the paper: D. Hankerson, J. Hernandez and A.
+ * Menezes, "Software implementation of elliptic curve cryptography over
+ * binary fields", Proc. CHES 2000. */
+mp_err
+ec_compute_wNAF(signed char *out, int bitsize, const mp_int *in, int w)
+{
+        mp_int k;
+        mp_err res = MP_OKAY;
+        int i, twowm1, mask;
+
+        twowm1 = ec_twoTo(w - 1);
+        mask = 2 * twowm1 - 1;
+
+        MP_DIGITS(&k) = 0;
+        MP_CHECKOK(mp_init_copy(&k, in));
+
+        i = 0;
+        /* Compute wNAF form */
+        while (mp_cmp_z(&k) > 0) {
+                if (mp_isodd(&k)) {
+                        out[i] = MP_DIGIT(&k, 0) & mask;
+                        if (out[i] >= twowm1)
+                                out[i] -= 2 * twowm1;
+
+                        /* Subtract off out[i].  Note mp_sub_d only works with
+                         * unsigned digits */
+                        if (out[i] >= 0) {
+                                mp_sub_d(&k, out[i], &k);
+                        } else {
+                                mp_add_d(&k, -(out[i]), &k);
+                        }
+                } else {
+                        out[i] = 0;
+                }
+                mp_div_2(&k, &k);
+                i++;
+        }
+        /* Zero out the remaining elements of the out array. */
+        for (; i < bitsize + 1; i++) {
+                out[i] = 0;
+        }
+  CLEANUP:
+        mp_clear(&k);
+        return res;
+
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecc_impl.h b/jdk/src/share/native/sun/security/ec/ecc_impl.h
new file mode 100644
index 00000000000..702ab1daeb7
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecc_impl.h
@@ -0,0 +1,278 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dr Vipul Gupta <vipul.gupta@sun.com> and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ECC_IMPL_H
+#define _ECC_IMPL_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+#include "ecl-exp.h"
+
+/*
+ * Multi-platform definitions
+ */
+#ifdef __linux__
+#define B_FALSE FALSE
+#define B_TRUE TRUE
+typedef unsigned char uint8_t;
+typedef unsigned long ulong_t;
+typedef enum { B_FALSE, B_TRUE } boolean_t;
+#endif /* __linux__ */
+
+#ifdef _WIN32
+typedef unsigned char uint8_t;
+typedef unsigned long ulong_t;
+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+#endif /* _WIN32 */
+
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif  /* _KERNEL */
+
+#define EC_MAX_DIGEST_LEN 1024  /* max digest that can be signed */
+#define EC_MAX_POINT_LEN 145    /* max len of DER encoded Q */
+#define EC_MAX_VALUE_LEN 72     /* max len of ANSI X9.62 private value d */
+#define EC_MAX_SIG_LEN 144      /* max signature len for supported curves */
+#define EC_MIN_KEY_LEN  112     /* min key length in bits */
+#define EC_MAX_KEY_LEN  571     /* max key length in bits */
+#define EC_MAX_OID_LEN 10       /* max length of OID buffer */
+
+/*
+ * Various structures and definitions from NSS are here.
+ */
+
+#ifdef _KERNEL
+#define PORT_ArenaAlloc(a, n, f)        kmem_alloc((n), (f))
+#define PORT_ArenaZAlloc(a, n, f)       kmem_zalloc((n), (f))
+#define PORT_ArenaGrow(a, b, c, d)      NULL
+#define PORT_ZAlloc(n, f)               kmem_zalloc((n), (f))
+#define PORT_Alloc(n, f)                kmem_alloc((n), (f))
+#else
+#define PORT_ArenaAlloc(a, n, f)        malloc((n))
+#define PORT_ArenaZAlloc(a, n, f)       calloc(1, (n))
+#define PORT_ArenaGrow(a, b, c, d)      NULL
+#define PORT_ZAlloc(n, f)               calloc(1, (n))
+#define PORT_Alloc(n, f)                malloc((n))
+#endif
+
+#define PORT_NewArena(b)                (char *)12345
+#define PORT_ArenaMark(a)               NULL
+#define PORT_ArenaUnmark(a, b)
+#define PORT_ArenaRelease(a, m)
+#define PORT_FreeArena(a, b)
+#define PORT_Strlen(s)                  strlen((s))
+#define PORT_SetError(e)
+
+#define PRBool                          boolean_t
+#define PR_TRUE                         B_TRUE
+#define PR_FALSE                        B_FALSE
+
+#ifdef _KERNEL
+#define PORT_Assert                     ASSERT
+#define PORT_Memcpy(t, f, l)            bcopy((f), (t), (l))
+#else
+#define PORT_Assert                     assert
+#define PORT_Memcpy(t, f, l)            memcpy((t), (f), (l))
+#endif
+
+#define CHECK_OK(func) if (func == NULL) goto cleanup
+#define CHECK_SEC_OK(func) if (SECSuccess != (rv = func)) goto cleanup
+
+typedef enum {
+        siBuffer = 0,
+        siClearDataBuffer = 1,
+        siCipherDataBuffer = 2,
+        siDERCertBuffer = 3,
+        siEncodedCertBuffer = 4,
+        siDERNameBuffer = 5,
+        siEncodedNameBuffer = 6,
+        siAsciiNameString = 7,
+        siAsciiString = 8,
+        siDEROID = 9,
+        siUnsignedInteger = 10,
+        siUTCTime = 11,
+        siGeneralizedTime = 12
+} SECItemType;
+
+typedef struct SECItemStr SECItem;
+
+struct SECItemStr {
+        SECItemType type;
+        unsigned char *data;
+        unsigned int len;
+};
+
+typedef SECItem SECKEYECParams;
+
+typedef enum { ec_params_explicit,
+               ec_params_named
+} ECParamsType;
+
+typedef enum { ec_field_GFp = 1,
+               ec_field_GF2m
+} ECFieldType;
+
+struct ECFieldIDStr {
+    int         size;   /* field size in bits */
+    ECFieldType type;
+    union {
+        SECItem  prime; /* prime p for (GFp) */
+        SECItem  poly;  /* irreducible binary polynomial for (GF2m) */
+    } u;
+    int         k1;     /* first coefficient of pentanomial or
+                         * the only coefficient of trinomial
+                         */
+    int         k2;     /* two remaining coefficients of pentanomial */
+    int         k3;
+};
+typedef struct ECFieldIDStr ECFieldID;
+
+struct ECCurveStr {
+        SECItem a;      /* contains octet stream encoding of
+                         * field element (X9.62 section 4.3.3)
+                         */
+        SECItem b;
+        SECItem seed;
+};
+typedef struct ECCurveStr ECCurve;
+
+typedef void PRArenaPool;
+
+struct ECParamsStr {
+    PRArenaPool * arena;
+    ECParamsType  type;
+    ECFieldID     fieldID;
+    ECCurve       curve;
+    SECItem       base;
+    SECItem       order;
+    int           cofactor;
+    SECItem       DEREncoding;
+    ECCurveName   name;
+    SECItem       curveOID;
+};
+typedef struct ECParamsStr ECParams;
+
+struct ECPublicKeyStr {
+    ECParams ecParams;
+    SECItem publicValue;   /* elliptic curve point encoded as
+                            * octet stream.
+                            */
+};
+typedef struct ECPublicKeyStr ECPublicKey;
+
+struct ECPrivateKeyStr {
+    ECParams ecParams;
+    SECItem publicValue;   /* encoded ec point */
+    SECItem privateValue;  /* private big integer */
+    SECItem version;       /* As per SEC 1, Appendix C, Section C.4 */
+};
+typedef struct ECPrivateKeyStr ECPrivateKey;
+
+typedef enum _SECStatus {
+        SECBufferTooSmall = -3,
+        SECWouldBlock = -2,
+        SECFailure = -1,
+        SECSuccess = 0
+} SECStatus;
+
+#ifdef _KERNEL
+#define RNG_GenerateGlobalRandomBytes(p,l) ecc_knzero_random_generator((p), (l))
+#else
+/*
+ This function is no longer required because the random bytes are now
+ supplied by the caller. Force a failure.
+VR
+#define RNG_GenerateGlobalRandomBytes(p,l) SECFailure
+*/
+#define RNG_GenerateGlobalRandomBytes(p,l) SECSuccess
+#endif
+#define CHECK_MPI_OK(func) if (MP_OKAY > (err = func)) goto cleanup
+#define MP_TO_SEC_ERROR(err)
+
+#define SECITEM_TO_MPINT(it, mp)                                        \
+        CHECK_MPI_OK(mp_read_unsigned_octets((mp), (it).data, (it).len))
+
+extern int ecc_knzero_random_generator(uint8_t *, size_t);
+extern ulong_t soft_nzero_random_generator(uint8_t *, ulong_t);
+
+extern SECStatus EC_DecodeParams(const SECItem *, ECParams **, int);
+extern SECItem * SECITEM_AllocItem(PRArenaPool *, SECItem *, unsigned int, int);
+extern SECStatus SECITEM_CopyItem(PRArenaPool *, SECItem *, const SECItem *,
+    int);
+extern void SECITEM_FreeItem(SECItem *, boolean_t);
+extern SECStatus EC_NewKey(ECParams *ecParams, ECPrivateKey **privKey, const unsigned char* random, int randomlen, int);
+extern SECStatus EC_NewKeyFromSeed(ECParams *ecParams, ECPrivateKey **privKey,
+    const unsigned char *seed, int seedlen, int kmflag);
+extern SECStatus ECDSA_SignDigest(ECPrivateKey *, SECItem *, const SECItem *,
+    const unsigned char* randon, int randomlen, int);
+extern SECStatus ECDSA_SignDigestWithSeed(ECPrivateKey *, SECItem *,
+    const SECItem *, const unsigned char *seed, int seedlen, int kmflag);
+extern SECStatus ECDSA_VerifyDigest(ECPublicKey *, const SECItem *,
+    const SECItem *, int);
+extern SECStatus ECDH_Derive(SECItem *, ECParams *, SECItem *, boolean_t,
+    SECItem *, int);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* _ECC_IMPL_H */
diff --git a/jdk/src/share/native/sun/security/ec/ecdecode.c b/jdk/src/share/native/sun/security/ec/ecdecode.c
new file mode 100644
index 00000000000..d610f3b1b5a
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecdecode.c
@@ -0,0 +1,632 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Elliptic Curve Cryptography library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dr Vipul Gupta <vipul.gupta@sun.com> and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include <sys/types.h>
+
+#ifndef _WIN32
+#ifndef __linux__
+#include <sys/systm.h>
+#endif /* __linux__ */
+#include <sys/param.h>
+#endif /* _WIN32 */
+
+#ifdef _KERNEL
+#include <sys/kmem.h>
+#else
+#include <string.h>
+#endif
+#include "ec.h"
+#include "ecl-curve.h"
+#include "ecc_impl.h"
+
+#define MAX_ECKEY_LEN           72
+#define SEC_ASN1_OBJECT_ID      0x06
+
+/*
+ * Initializes a SECItem from a hexadecimal string
+ *
+ * Warning: This function ignores leading 00's, so any leading 00's
+ * in the hexadecimal string must be optional.
+ */
+static SECItem *
+hexString2SECItem(PRArenaPool *arena, SECItem *item, const char *str,
+    int kmflag)
+{
+    int i = 0;
+    int byteval = 0;
+    int tmp = strlen(str);
+
+    if ((tmp % 2) != 0) return NULL;
+
+    /* skip leading 00's unless the hex string is "00" */
+    while ((tmp > 2) && (str[0] == '0') && (str[1] == '0')) {
+        str += 2;
+        tmp -= 2;
+    }
+
+    item->data = (unsigned char *) PORT_ArenaAlloc(arena, tmp/2, kmflag);
+    if (item->data == NULL) return NULL;
+    item->len = tmp/2;
+
+    while (str[i]) {
+        if ((str[i] >= '0') && (str[i] <= '9'))
+            tmp = str[i] - '0';
+        else if ((str[i] >= 'a') && (str[i] <= 'f'))
+            tmp = str[i] - 'a' + 10;
+        else if ((str[i] >= 'A') && (str[i] <= 'F'))
+            tmp = str[i] - 'A' + 10;
+        else
+            return NULL;
+
+        byteval = byteval * 16 + tmp;
+        if ((i % 2) != 0) {
+            item->data[i/2] = byteval;
+            byteval = 0;
+        }
+        i++;
+    }
+
+    return item;
+}
+
+static SECStatus
+gf_populate_params(ECCurveName name, ECFieldType field_type, ECParams *params,
+    int kmflag)
+{
+    SECStatus rv = SECFailure;
+    const ECCurveParams *curveParams;
+    /* 2 ['0'+'4'] + MAX_ECKEY_LEN * 2 [x,y] * 2 [hex string] + 1 ['\0'] */
+    char genenc[3 + 2 * 2 * MAX_ECKEY_LEN];
+
+    if ((name < ECCurve_noName) || (name > ECCurve_pastLastCurve)) goto cleanup;
+    params->name = name;
+    curveParams = ecCurve_map[params->name];
+    CHECK_OK(curveParams);
+    params->fieldID.size = curveParams->size;
+    params->fieldID.type = field_type;
+    if (field_type == ec_field_GFp) {
+        CHECK_OK(hexString2SECItem(NULL, &params->fieldID.u.prime,
+            curveParams->irr, kmflag));
+    } else {
+        CHECK_OK(hexString2SECItem(NULL, &params->fieldID.u.poly,
+            curveParams->irr, kmflag));
+    }
+    CHECK_OK(hexString2SECItem(NULL, &params->curve.a,
+        curveParams->curvea, kmflag));
+    CHECK_OK(hexString2SECItem(NULL, &params->curve.b,
+        curveParams->curveb, kmflag));
+    genenc[0] = '0';
+    genenc[1] = '4';
+    genenc[2] = '\0';
+    strcat(genenc, curveParams->genx);
+    strcat(genenc, curveParams->geny);
+    CHECK_OK(hexString2SECItem(NULL, &params->base, genenc, kmflag));
+    CHECK_OK(hexString2SECItem(NULL, &params->order,
+        curveParams->order, kmflag));
+    params->cofactor = curveParams->cofactor;
+
+    rv = SECSuccess;
+
+cleanup:
+    return rv;
+}
+
+ECCurveName SECOID_FindOIDTag(const SECItem *);
+
+SECStatus
+EC_FillParams(PRArenaPool *arena, const SECItem *encodedParams,
+    ECParams *params, int kmflag)
+{
+    SECStatus rv = SECFailure;
+    ECCurveName tag;
+    SECItem oid = { siBuffer, NULL, 0};
+
+#if EC_DEBUG
+    int i;
+
+    printf("Encoded params in EC_DecodeParams: ");
+    for (i = 0; i < encodedParams->len; i++) {
+            printf("%02x:", encodedParams->data[i]);
+    }
+    printf("\n");
+#endif
+
+    if ((encodedParams->len != ANSI_X962_CURVE_OID_TOTAL_LEN) &&
+        (encodedParams->len != SECG_CURVE_OID_TOTAL_LEN)) {
+            PORT_SetError(SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
+            return SECFailure;
+    };
+
+    oid.len = encodedParams->len - 2;
+    oid.data = encodedParams->data + 2;
+    if ((encodedParams->data[0] != SEC_ASN1_OBJECT_ID) ||
+        ((tag = SECOID_FindOIDTag(&oid)) == ECCurve_noName)) {
+            PORT_SetError(SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
+            return SECFailure;
+    }
+
+    params->arena = arena;
+    params->cofactor = 0;
+    params->type = ec_params_named;
+    params->name = ECCurve_noName;
+
+    /* For named curves, fill out curveOID */
+    params->curveOID.len = oid.len;
+    params->curveOID.data = (unsigned char *) PORT_ArenaAlloc(NULL, oid.len,
+        kmflag);
+    if (params->curveOID.data == NULL) goto cleanup;
+    memcpy(params->curveOID.data, oid.data, oid.len);
+
+#if EC_DEBUG
+#ifndef SECOID_FindOIDTagDescription
+    printf("Curve: %s\n", ecCurve_map[tag]->text);
+#else
+    printf("Curve: %s\n", SECOID_FindOIDTagDescription(tag));
+#endif
+#endif
+
+    switch (tag) {
+
+    /* Binary curves */
+
+    case ECCurve_X9_62_CHAR2_PNB163V1:
+        /* Populate params for c2pnb163v1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_PNB163V1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_PNB163V2:
+        /* Populate params for c2pnb163v2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_PNB163V2, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_PNB163V3:
+        /* Populate params for c2pnb163v3 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_PNB163V3, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_PNB176V1:
+        /* Populate params for c2pnb176v1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_PNB176V1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_TNB191V1:
+        /* Populate params for c2tnb191v1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_TNB191V1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_TNB191V2:
+        /* Populate params for c2tnb191v2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_TNB191V2, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_TNB191V3:
+        /* Populate params for c2tnb191v3 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_TNB191V3, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_PNB208W1:
+        /* Populate params for c2pnb208w1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_PNB208W1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_TNB239V1:
+        /* Populate params for c2tnb239v1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_TNB239V1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_TNB239V2:
+        /* Populate params for c2tnb239v2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_TNB239V2, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_TNB239V3:
+        /* Populate params for c2tnb239v3 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_TNB239V3, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_PNB272W1:
+        /* Populate params for c2pnb272w1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_PNB272W1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_PNB304W1:
+        /* Populate params for c2pnb304w1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_PNB304W1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_TNB359V1:
+        /* Populate params for c2tnb359v1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_TNB359V1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_PNB368W1:
+        /* Populate params for c2pnb368w1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_PNB368W1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_CHAR2_TNB431R1:
+        /* Populate params for c2tnb431r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_CHAR2_TNB431R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_113R1:
+        /* Populate params for sect113r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_113R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_113R2:
+        /* Populate params for sect113r2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_113R2, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_131R1:
+        /* Populate params for sect131r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_131R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_131R2:
+        /* Populate params for sect131r2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_131R2, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_163K1:
+        /* Populate params for sect163k1
+         * (the NIST K-163 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_163K1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_163R1:
+        /* Populate params for sect163r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_163R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_163R2:
+        /* Populate params for sect163r2
+         * (the NIST B-163 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_163R2, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_193R1:
+        /* Populate params for sect193r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_193R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_193R2:
+        /* Populate params for sect193r2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_193R2, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_233K1:
+        /* Populate params for sect233k1
+         * (the NIST K-233 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_233K1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_233R1:
+        /* Populate params for sect233r1
+         * (the NIST B-233 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_233R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_239K1:
+        /* Populate params for sect239k1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_239K1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_283K1:
+        /* Populate params for sect283k1
+         * (the NIST K-283 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_283K1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_283R1:
+        /* Populate params for sect283r1
+         * (the NIST B-283 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_283R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_409K1:
+        /* Populate params for sect409k1
+         * (the NIST K-409 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_409K1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_409R1:
+        /* Populate params for sect409r1
+         * (the NIST B-409 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_409R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_571K1:
+        /* Populate params for sect571k1
+         * (the NIST K-571 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_571K1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_CHAR2_571R1:
+        /* Populate params for sect571r1
+         * (the NIST B-571 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_CHAR2_571R1, ec_field_GF2m,
+            params, kmflag) );
+        break;
+
+    /* Prime curves */
+
+    case ECCurve_X9_62_PRIME_192V1:
+        /* Populate params for prime192v1 aka secp192r1
+         * (the NIST P-192 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_PRIME_192V1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_PRIME_192V2:
+        /* Populate params for prime192v2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_PRIME_192V2, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_PRIME_192V3:
+        /* Populate params for prime192v3 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_PRIME_192V3, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_PRIME_239V1:
+        /* Populate params for prime239v1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_PRIME_239V1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_PRIME_239V2:
+        /* Populate params for prime239v2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_PRIME_239V2, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_PRIME_239V3:
+        /* Populate params for prime239v3 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_PRIME_239V3, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_X9_62_PRIME_256V1:
+        /* Populate params for prime256v1 aka secp256r1
+         * (the NIST P-256 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_X9_62_PRIME_256V1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_112R1:
+        /* Populate params for secp112r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_112R1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_112R2:
+        /* Populate params for secp112r2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_112R2, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_128R1:
+        /* Populate params for secp128r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_128R1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_128R2:
+        /* Populate params for secp128r2 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_128R2, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_160K1:
+        /* Populate params for secp160k1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_160K1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_160R1:
+        /* Populate params for secp160r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_160R1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_160R2:
+        /* Populate params for secp160r1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_160R2, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_192K1:
+        /* Populate params for secp192k1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_192K1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_224K1:
+        /* Populate params for secp224k1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_224K1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_224R1:
+        /* Populate params for secp224r1
+         * (the NIST P-224 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_224R1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_256K1:
+        /* Populate params for secp256k1 */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_256K1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_384R1:
+        /* Populate params for secp384r1
+         * (the NIST P-384 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_384R1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    case ECCurve_SECG_PRIME_521R1:
+        /* Populate params for secp521r1
+         * (the NIST P-521 curve)
+         */
+        CHECK_SEC_OK( gf_populate_params(ECCurve_SECG_PRIME_521R1, ec_field_GFp,
+            params, kmflag) );
+        break;
+
+    default:
+        break;
+    };
+
+cleanup:
+    if (!params->cofactor) {
+        PORT_SetError(SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE);
+#if EC_DEBUG
+        printf("Unrecognized curve, returning NULL params\n");
+#endif
+    }
+
+    return rv;
+}
+
+SECStatus
+EC_DecodeParams(const SECItem *encodedParams, ECParams **ecparams, int kmflag)
+{
+    PRArenaPool *arena;
+    ECParams *params;
+    SECStatus rv = SECFailure;
+
+    /* Initialize an arena for the ECParams structure */
+    if (!(arena = PORT_NewArena(NSS_FREEBL_DEFAULT_CHUNKSIZE)))
+        return SECFailure;
+
+    params = (ECParams *)PORT_ArenaZAlloc(NULL, sizeof(ECParams), kmflag);
+    if (!params) {
+        PORT_FreeArena(NULL, B_TRUE);
+        return SECFailure;
+    }
+
+    /* Copy the encoded params */
+    SECITEM_AllocItem(arena, &(params->DEREncoding), encodedParams->len,
+        kmflag);
+    memcpy(params->DEREncoding.data, encodedParams->data, encodedParams->len);
+
+    /* Fill out the rest of the ECParams structure based on
+     * the encoded params
+     */
+    rv = EC_FillParams(NULL, encodedParams, params, kmflag);
+    if (rv == SECFailure) {
+        PORT_FreeArena(NULL, B_TRUE);
+        return SECFailure;
+    } else {
+        *ecparams = params;;
+        return SECSuccess;
+    }
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecl-curve.h b/jdk/src/share/native/sun/security/ec/ecl-curve.h
new file mode 100644
index 00000000000..bb7f9a7d466
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecl-curve.h
@@ -0,0 +1,710 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ECL_CURVE_H
+#define _ECL_CURVE_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecl-exp.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* NIST prime curves */
+static const ECCurveParams ecCurve_NIST_P192 = {
+        "NIST-P192", ECField_GFp, 192,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+        "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
+        "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
+        "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
+        "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831", 1
+};
+
+static const ECCurveParams ecCurve_NIST_P224 = {
+        "NIST-P224", ECField_GFp, 224,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+        "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+        "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+        "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", 1
+};
+
+static const ECCurveParams ecCurve_NIST_P256 = {
+        "NIST-P256", ECField_GFp, 256,
+        "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
+        "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
+        "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B",
+        "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296",
+        "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5",
+        "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551", 1
+};
+
+static const ECCurveParams ecCurve_NIST_P384 = {
+        "NIST-P384", ECField_GFp, 384,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC",
+        "B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF",
+        "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7",
+        "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973",
+        1
+};
+
+static const ECCurveParams ecCurve_NIST_P521 = {
+        "NIST-P521", ECField_GFp, 521,
+        "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+        "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC",
+        "0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00",
+        "00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66",
+        "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650",
+        "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",
+        1
+};
+
+/* NIST binary curves */
+static const ECCurveParams ecCurve_NIST_K163 = {
+        "NIST-K163", ECField_GF2m, 163,
+        "0800000000000000000000000000000000000000C9",
+        "000000000000000000000000000000000000000001",
+        "000000000000000000000000000000000000000001",
+        "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
+        "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
+        "04000000000000000000020108A2E0CC0D99F8A5EF", 2
+};
+
+static const ECCurveParams ecCurve_NIST_B163 = {
+        "NIST-B163", ECField_GF2m, 163,
+        "0800000000000000000000000000000000000000C9",
+        "000000000000000000000000000000000000000001",
+        "020A601907B8C953CA1481EB10512F78744A3205FD",
+        "03F0EBA16286A2D57EA0991168D4994637E8343E36",
+        "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
+        "040000000000000000000292FE77E70C12A4234C33", 2
+};
+
+static const ECCurveParams ecCurve_NIST_K233 = {
+        "NIST-K233", ECField_GF2m, 233,
+        "020000000000000000000000000000000000000004000000000000000001",
+        "000000000000000000000000000000000000000000000000000000000000",
+        "000000000000000000000000000000000000000000000000000000000001",
+        "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
+        "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
+        "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", 4
+};
+
+static const ECCurveParams ecCurve_NIST_B233 = {
+        "NIST-B233", ECField_GF2m, 233,
+        "020000000000000000000000000000000000000004000000000000000001",
+        "000000000000000000000000000000000000000000000000000000000001",
+        "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
+        "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
+        "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
+        "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", 2
+};
+
+static const ECCurveParams ecCurve_NIST_K283 = {
+        "NIST-K283", ECField_GF2m, 283,
+        "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+        "000000000000000000000000000000000000000000000000000000000000000000000000",
+        "000000000000000000000000000000000000000000000000000000000000000000000001",
+        "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
+        "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
+        "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61", 4
+};
+
+static const ECCurveParams ecCurve_NIST_B283 = {
+        "NIST-B283", ECField_GF2m, 283,
+        "0800000000000000000000000000000000000000000000000000000000000000000010A1",
+        "000000000000000000000000000000000000000000000000000000000000000000000001",
+        "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
+        "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
+        "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
+        "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307", 2
+};
+
+static const ECCurveParams ecCurve_NIST_K409 = {
+        "NIST-K409", ECField_GF2m, 409,
+        "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+        "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+        "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
+        "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
+        "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF", 4
+};
+
+static const ECCurveParams ecCurve_NIST_B409 = {
+        "NIST-B409", ECField_GF2m, 409,
+        "02000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000001",
+        "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+        "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
+        "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
+        "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
+        "010000000000000000000000000000000000000000000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173", 2
+};
+
+static const ECCurveParams ecCurve_NIST_K571 = {
+        "NIST-K571", ECField_GF2m, 571,
+        "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+        "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
+        "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
+        "020000000000000000000000000000000000000000000000000000000000000000000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001", 4
+};
+
+static const ECCurveParams ecCurve_NIST_B571 = {
+        "NIST-B571", ECField_GF2m, 571,
+        "080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000425",
+        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
+        "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
+        "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
+        "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
+        "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47", 2
+};
+
+/* ANSI X9.62 prime curves */
+static const ECCurveParams ecCurve_X9_62_PRIME_192V2 = {
+        "X9.62 P-192V2", ECField_GFp, 192,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+        "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
+        "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
+        "6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15",
+        "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31", 1
+};
+
+static const ECCurveParams ecCurve_X9_62_PRIME_192V3 = {
+        "X9.62 P-192V3", ECField_GFp, 192,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+        "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
+        "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
+        "38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0",
+        "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13", 1
+};
+
+static const ECCurveParams ecCurve_X9_62_PRIME_239V1 = {
+        "X9.62 P-239V1", ECField_GFp, 239,
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+        "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
+        "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
+        "7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B", 1
+};
+
+static const ECCurveParams ecCurve_X9_62_PRIME_239V2 = {
+        "X9.62 P-239V2", ECField_GFp, 239,
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+        "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
+        "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
+        "5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA",
+        "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063", 1
+};
+
+static const ECCurveParams ecCurve_X9_62_PRIME_239V3 = {
+        "X9.62 P-239V3", ECField_GFp, 239,
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+        "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
+        "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
+        "1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551", 1
+};
+
+/* ANSI X9.62 binary curves */
+static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V1 = {
+        "X9.62 C2-PNB163V1", ECField_GF2m, 163,
+        "080000000000000000000000000000000000000107",
+        "072546B5435234A422E0789675F432C89435DE5242",
+        "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
+        "07AF69989546103D79329FCC3D74880F33BBE803CB",
+        "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
+        "0400000000000000000001E60FC8821CC74DAEAFC1", 2
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V2 = {
+        "X9.62 C2-PNB163V2", ECField_GF2m, 163,
+        "080000000000000000000000000000000000000107",
+        "0108B39E77C4B108BED981ED0E890E117C511CF072",
+        "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
+        "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
+        "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
+        "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", 2
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_PNB163V3 = {
+        "X9.62 C2-PNB163V3", ECField_GF2m, 163,
+        "080000000000000000000000000000000000000107",
+        "07A526C63D3E25A256A007699F5447E32AE456B50E",
+        "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
+        "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
+        "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
+        "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", 2
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_PNB176V1 = {
+        "X9.62 C2-PNB176V1", ECField_GF2m, 176,
+        "0100000000000000000000000000000000080000000007",
+        "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
+        "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
+        "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
+        "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
+        "00010092537397ECA4F6145799D62B0A19CE06FE26AD", 0xFF6E
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V1 = {
+        "X9.62 C2-TNB191V1", ECField_GF2m, 191,
+        "800000000000000000000000000000000000000000000201",
+        "2866537B676752636A68F56554E12640276B649EF7526267",
+        "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
+        "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
+        "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
+        "40000000000000000000000004A20E90C39067C893BBB9A5", 2
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V2 = {
+        "X9.62 C2-TNB191V2", ECField_GF2m, 191,
+        "800000000000000000000000000000000000000000000201",
+        "401028774D7777C7B7666D1366EA432071274F89FF01E718",
+        "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
+        "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
+        "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
+        "20000000000000000000000050508CB89F652824E06B8173", 4
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_TNB191V3 = {
+        "X9.62 C2-TNB191V3", ECField_GF2m, 191,
+        "800000000000000000000000000000000000000000000201",
+        "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
+        "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
+        "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
+        "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
+        "155555555555555555555555610C0B196812BFB6288A3EA3", 6
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_PNB208W1 = {
+        "X9.62 C2-PNB208W1", ECField_GF2m, 208,
+        "010000000000000000000000000000000800000000000000000007",
+        "0000000000000000000000000000000000000000000000000000",
+        "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
+        "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
+        "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
+        "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", 0xFE48
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V1 = {
+        "X9.62 C2-TNB239V1", ECField_GF2m, 239,
+        "800000000000000000000000000000000000000000000000001000000001",
+        "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
+        "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
+        "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
+        "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
+        "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", 4
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V2 = {
+        "X9.62 C2-TNB239V2", ECField_GF2m, 239,
+        "800000000000000000000000000000000000000000000000001000000001",
+        "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
+        "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
+        "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
+        "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
+        "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", 6
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_TNB239V3 = {
+        "X9.62 C2-TNB239V3", ECField_GF2m, 239,
+        "800000000000000000000000000000000000000000000000001000000001",
+        "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
+        "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
+        "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
+        "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
+        "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", 0xA
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_PNB272W1 = {
+        "X9.62 C2-PNB272W1", ECField_GF2m, 272,
+        "010000000000000000000000000000000000000000000000000000010000000000000B",
+        "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
+        "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
+        "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
+        "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
+        "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
+        0xFF06
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_PNB304W1 = {
+        "X9.62 C2-PNB304W1", ECField_GF2m, 304,
+        "010000000000000000000000000000000000000000000000000000000000000000000000000807",
+        "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681",
+        "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE",
+        "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614",
+        "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1B92C03B",
+        "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D", 0xFE2E
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_TNB359V1 = {
+        "X9.62 C2-TNB359V1", ECField_GF2m, 359,
+        "800000000000000000000000000000000000000000000000000000000000000000000000100000000000000001",
+        "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557",
+        "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988",
+        "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097",
+        "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E4AE2DE211305A407104BD",
+        "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B", 0x4C
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_PNB368W1 = {
+        "X9.62 C2-PNB368W1", ECField_GF2m, 368,
+        "0100000000000000000000000000000000000000000000000000000000000000000000002000000000000000000007",
+        "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D",
+        "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A",
+        "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F",
+        "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855ADAA81E2A0750B80FDA2310",
+        "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967", 0xFF70
+};
+
+static const ECCurveParams ecCurve_X9_62_CHAR2_TNB431R1 = {
+        "X9.62 C2-TNB431R1", ECField_GF2m, 431,
+        "800000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000001",
+        "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F",
+        "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618",
+        "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
+        "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
+        "0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91", 0x2760
+};
+
+/* SEC2 prime curves */
+static const ECCurveParams ecCurve_SECG_PRIME_112R1 = {
+        "SECP-112R1", ECField_GFp, 112,
+        "DB7C2ABF62E35E668076BEAD208B",
+        "DB7C2ABF62E35E668076BEAD2088",
+        "659EF8BA043916EEDE8911702B22",
+        "09487239995A5EE76B55F9C2F098",
+        "A89CE5AF8724C0A23E0E0FF77500",
+        "DB7C2ABF62E35E7628DFAC6561C5", 1
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_112R2 = {
+        "SECP-112R2", ECField_GFp, 112,
+        "DB7C2ABF62E35E668076BEAD208B",
+        "6127C24C05F38A0AAAF65C0EF02C",
+        "51DEF1815DB5ED74FCC34C85D709",
+        "4BA30AB5E892B4E1649DD0928643",
+        "adcd46f5882e3747def36e956e97",
+        "36DF0AAFD8B8D7597CA10520D04B", 4
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_128R1 = {
+        "SECP-128R1", ECField_GFp, 128,
+        "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+        "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
+        "E87579C11079F43DD824993C2CEE5ED3",
+        "161FF7528B899B2D0C28607CA52C5B86",
+        "CF5AC8395BAFEB13C02DA292DDED7A83",
+        "FFFFFFFE0000000075A30D1B9038A115", 1
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_128R2 = {
+        "SECP-128R2", ECField_GFp, 128,
+        "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+        "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
+        "5EEEFCA380D02919DC2C6558BB6D8A5D",
+        "7B6AA5D85E572983E6FB32A7CDEBC140",
+        "27B6916A894D3AEE7106FE805FC34B44",
+        "3FFFFFFF7FFFFFFFBE0024720613B5A3", 4
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_160K1 = {
+        "SECP-160K1", ECField_GFp, 160,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+        "0000000000000000000000000000000000000000",
+        "0000000000000000000000000000000000000007",
+        "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
+        "938CF935318FDCED6BC28286531733C3F03C4FEE",
+        "0100000000000000000001B8FA16DFAB9ACA16B6B3", 1
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_160R1 = {
+        "SECP-160R1", ECField_GFp, 160,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
+        "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
+        "4A96B5688EF573284664698968C38BB913CBFC82",
+        "23A628553168947D59DCC912042351377AC5FB32",
+        "0100000000000000000001F4C8F927AED3CA752257", 1
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_160R2 = {
+        "SECP-160R2", ECField_GFp, 160,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
+        "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
+        "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
+        "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
+        "0100000000000000000000351EE786A818F3A1A16B", 1
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_192K1 = {
+        "SECP-192K1", ECField_GFp, 192,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
+        "000000000000000000000000000000000000000000000000",
+        "000000000000000000000000000000000000000000000003",
+        "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
+        "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
+        "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D", 1
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_224K1 = {
+        "SECP-224K1", ECField_GFp, 224,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
+        "00000000000000000000000000000000000000000000000000000000",
+        "00000000000000000000000000000000000000000000000000000005",
+        "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
+        "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
+        "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7", 1
+};
+
+static const ECCurveParams ecCurve_SECG_PRIME_256K1 = {
+        "SECP-256K1", ECField_GFp, 256,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
+        "0000000000000000000000000000000000000000000000000000000000000000",
+        "0000000000000000000000000000000000000000000000000000000000000007",
+        "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
+        "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141", 1
+};
+
+/* SEC2 binary curves */
+static const ECCurveParams ecCurve_SECG_CHAR2_113R1 = {
+        "SECT-113R1", ECField_GF2m, 113,
+        "020000000000000000000000000201",
+        "003088250CA6E7C7FE649CE85820F7",
+        "00E8BEE4D3E2260744188BE0E9C723",
+        "009D73616F35F4AB1407D73562C10F",
+        "00A52830277958EE84D1315ED31886",
+        "0100000000000000D9CCEC8A39E56F", 2
+};
+
+static const ECCurveParams ecCurve_SECG_CHAR2_113R2 = {
+        "SECT-113R2", ECField_GF2m, 113,
+        "020000000000000000000000000201",
+        "00689918DBEC7E5A0DD6DFC0AA55C7",
+        "0095E9A9EC9B297BD4BF36E059184F",
+        "01A57A6A7B26CA5EF52FCDB8164797",
+        "00B3ADC94ED1FE674C06E695BABA1D",
+        "010000000000000108789B2496AF93", 2
+};
+
+static const ECCurveParams ecCurve_SECG_CHAR2_131R1 = {
+        "SECT-131R1", ECField_GF2m, 131,
+        "080000000000000000000000000000010D",
+        "07A11B09A76B562144418FF3FF8C2570B8",
+        "0217C05610884B63B9C6C7291678F9D341",
+        "0081BAF91FDF9833C40F9C181343638399",
+        "078C6E7EA38C001F73C8134B1B4EF9E150",
+        "0400000000000000023123953A9464B54D", 2
+};
+
+static const ECCurveParams ecCurve_SECG_CHAR2_131R2 = {
+        "SECT-131R2", ECField_GF2m, 131,
+        "080000000000000000000000000000010D",
+        "03E5A88919D7CAFCBF415F07C2176573B2",
+        "04B8266A46C55657AC734CE38F018F2192",
+        "0356DCD8F2F95031AD652D23951BB366A8",
+        "0648F06D867940A5366D9E265DE9EB240F",
+        "0400000000000000016954A233049BA98F", 2
+};
+
+static const ECCurveParams ecCurve_SECG_CHAR2_163R1 = {
+        "SECT-163R1", ECField_GF2m, 163,
+        "0800000000000000000000000000000000000000C9",
+        "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
+        "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
+        "0369979697AB43897789566789567F787A7876A654",
+        "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
+        "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", 2
+};
+
+static const ECCurveParams ecCurve_SECG_CHAR2_193R1 = {
+        "SECT-193R1", ECField_GF2m, 193,
+        "02000000000000000000000000000000000000000000008001",
+        "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
+        "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
+        "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
+        "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
+        "01000000000000000000000000C7F34A778F443ACC920EBA49", 2
+};
+
+static const ECCurveParams ecCurve_SECG_CHAR2_193R2 = {
+        "SECT-193R2", ECField_GF2m, 193,
+        "02000000000000000000000000000000000000000000008001",
+        "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
+        "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
+        "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
+        "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
+        "010000000000000000000000015AAB561B005413CCD4EE99D5", 2
+};
+
+static const ECCurveParams ecCurve_SECG_CHAR2_239K1 = {
+        "SECT-239K1", ECField_GF2m, 239,
+        "800000000000000000004000000000000000000000000000000000000001",
+        "000000000000000000000000000000000000000000000000000000000000",
+        "000000000000000000000000000000000000000000000000000000000001",
+        "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
+        "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
+        "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", 4
+};
+
+/* WTLS curves */
+static const ECCurveParams ecCurve_WTLS_1 = {
+        "WTLS-1", ECField_GF2m, 113,
+        "020000000000000000000000000201",
+        "000000000000000000000000000001",
+        "000000000000000000000000000001",
+        "01667979A40BA497E5D5C270780617",
+        "00F44B4AF1ECC2630E08785CEBCC15",
+        "00FFFFFFFFFFFFFFFDBF91AF6DEA73", 2
+};
+
+static const ECCurveParams ecCurve_WTLS_8 = {
+        "WTLS-8", ECField_GFp, 112,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFDE7",
+        "0000000000000000000000000000",
+        "0000000000000000000000000003",
+        "0000000000000000000000000001",
+        "0000000000000000000000000002",
+        "0100000000000001ECEA551AD837E9", 1
+};
+
+static const ECCurveParams ecCurve_WTLS_9 = {
+        "WTLS-9", ECField_GFp, 160,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F",
+        "0000000000000000000000000000000000000000",
+        "0000000000000000000000000000000000000003",
+        "0000000000000000000000000000000000000001",
+        "0000000000000000000000000000000000000002",
+        "0100000000000000000001CDC98AE0E2DE574ABF33", 1
+};
+
+/* mapping between ECCurveName enum and pointers to ECCurveParams */
+static const ECCurveParams *ecCurve_map[] = {
+    NULL,                               /* ECCurve_noName */
+    &ecCurve_NIST_P192,                 /* ECCurve_NIST_P192 */
+    &ecCurve_NIST_P224,                 /* ECCurve_NIST_P224 */
+    &ecCurve_NIST_P256,                 /* ECCurve_NIST_P256 */
+    &ecCurve_NIST_P384,                 /* ECCurve_NIST_P384 */
+    &ecCurve_NIST_P521,                 /* ECCurve_NIST_P521 */
+    &ecCurve_NIST_K163,                 /* ECCurve_NIST_K163 */
+    &ecCurve_NIST_B163,                 /* ECCurve_NIST_B163 */
+    &ecCurve_NIST_K233,                 /* ECCurve_NIST_K233 */
+    &ecCurve_NIST_B233,                 /* ECCurve_NIST_B233 */
+    &ecCurve_NIST_K283,                 /* ECCurve_NIST_K283 */
+    &ecCurve_NIST_B283,                 /* ECCurve_NIST_B283 */
+    &ecCurve_NIST_K409,                 /* ECCurve_NIST_K409 */
+    &ecCurve_NIST_B409,                 /* ECCurve_NIST_B409 */
+    &ecCurve_NIST_K571,                 /* ECCurve_NIST_K571 */
+    &ecCurve_NIST_B571,                 /* ECCurve_NIST_B571 */
+    &ecCurve_X9_62_PRIME_192V2,         /* ECCurve_X9_62_PRIME_192V2 */
+    &ecCurve_X9_62_PRIME_192V3,         /* ECCurve_X9_62_PRIME_192V3 */
+    &ecCurve_X9_62_PRIME_239V1,         /* ECCurve_X9_62_PRIME_239V1 */
+    &ecCurve_X9_62_PRIME_239V2,         /* ECCurve_X9_62_PRIME_239V2 */
+    &ecCurve_X9_62_PRIME_239V3,         /* ECCurve_X9_62_PRIME_239V3 */
+    &ecCurve_X9_62_CHAR2_PNB163V1,      /* ECCurve_X9_62_CHAR2_PNB163V1 */
+    &ecCurve_X9_62_CHAR2_PNB163V2,      /* ECCurve_X9_62_CHAR2_PNB163V2 */
+    &ecCurve_X9_62_CHAR2_PNB163V3,      /* ECCurve_X9_62_CHAR2_PNB163V3 */
+    &ecCurve_X9_62_CHAR2_PNB176V1,      /* ECCurve_X9_62_CHAR2_PNB176V1 */
+    &ecCurve_X9_62_CHAR2_TNB191V1,      /* ECCurve_X9_62_CHAR2_TNB191V1 */
+    &ecCurve_X9_62_CHAR2_TNB191V2,      /* ECCurve_X9_62_CHAR2_TNB191V2 */
+    &ecCurve_X9_62_CHAR2_TNB191V3,      /* ECCurve_X9_62_CHAR2_TNB191V3 */
+    &ecCurve_X9_62_CHAR2_PNB208W1,      /* ECCurve_X9_62_CHAR2_PNB208W1 */
+    &ecCurve_X9_62_CHAR2_TNB239V1,      /* ECCurve_X9_62_CHAR2_TNB239V1 */
+    &ecCurve_X9_62_CHAR2_TNB239V2,      /* ECCurve_X9_62_CHAR2_TNB239V2 */
+    &ecCurve_X9_62_CHAR2_TNB239V3,      /* ECCurve_X9_62_CHAR2_TNB239V3 */
+    &ecCurve_X9_62_CHAR2_PNB272W1,      /* ECCurve_X9_62_CHAR2_PNB272W1 */
+    &ecCurve_X9_62_CHAR2_PNB304W1,      /* ECCurve_X9_62_CHAR2_PNB304W1 */
+    &ecCurve_X9_62_CHAR2_TNB359V1,      /* ECCurve_X9_62_CHAR2_TNB359V1 */
+    &ecCurve_X9_62_CHAR2_PNB368W1,      /* ECCurve_X9_62_CHAR2_PNB368W1 */
+    &ecCurve_X9_62_CHAR2_TNB431R1,      /* ECCurve_X9_62_CHAR2_TNB431R1 */
+    &ecCurve_SECG_PRIME_112R1,          /* ECCurve_SECG_PRIME_112R1 */
+    &ecCurve_SECG_PRIME_112R2,          /* ECCurve_SECG_PRIME_112R2 */
+    &ecCurve_SECG_PRIME_128R1,          /* ECCurve_SECG_PRIME_128R1 */
+    &ecCurve_SECG_PRIME_128R2,          /* ECCurve_SECG_PRIME_128R2 */
+    &ecCurve_SECG_PRIME_160K1,          /* ECCurve_SECG_PRIME_160K1 */
+    &ecCurve_SECG_PRIME_160R1,          /* ECCurve_SECG_PRIME_160R1 */
+    &ecCurve_SECG_PRIME_160R2,          /* ECCurve_SECG_PRIME_160R2 */
+    &ecCurve_SECG_PRIME_192K1,          /* ECCurve_SECG_PRIME_192K1 */
+    &ecCurve_SECG_PRIME_224K1,          /* ECCurve_SECG_PRIME_224K1 */
+    &ecCurve_SECG_PRIME_256K1,          /* ECCurve_SECG_PRIME_256K1 */
+    &ecCurve_SECG_CHAR2_113R1,          /* ECCurve_SECG_CHAR2_113R1 */
+    &ecCurve_SECG_CHAR2_113R2,          /* ECCurve_SECG_CHAR2_113R2 */
+    &ecCurve_SECG_CHAR2_131R1,          /* ECCurve_SECG_CHAR2_131R1 */
+    &ecCurve_SECG_CHAR2_131R2,          /* ECCurve_SECG_CHAR2_131R2 */
+    &ecCurve_SECG_CHAR2_163R1,          /* ECCurve_SECG_CHAR2_163R1 */
+    &ecCurve_SECG_CHAR2_193R1,          /* ECCurve_SECG_CHAR2_193R1 */
+    &ecCurve_SECG_CHAR2_193R2,          /* ECCurve_SECG_CHAR2_193R2 */
+    &ecCurve_SECG_CHAR2_239K1,          /* ECCurve_SECG_CHAR2_239K1 */
+    &ecCurve_WTLS_1,                    /* ECCurve_WTLS_1 */
+    &ecCurve_WTLS_8,                    /* ECCurve_WTLS_8 */
+    &ecCurve_WTLS_9,                    /* ECCurve_WTLS_9 */
+    NULL                                /* ECCurve_pastLastCurve */
+};
+
+#endif /* _ECL_CURVE_H */
diff --git a/jdk/src/share/native/sun/security/ec/ecl-exp.h b/jdk/src/share/native/sun/security/ec/ecl-exp.h
new file mode 100644
index 00000000000..ce9a2cf803c
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecl-exp.h
@@ -0,0 +1,216 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ECL_EXP_H
+#define _ECL_EXP_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* Curve field type */
+typedef enum {
+        ECField_GFp,
+        ECField_GF2m
+} ECField;
+
+/* Hexadecimal encoding of curve parameters */
+struct ECCurveParamsStr {
+        char *text;
+        ECField field;
+        unsigned int size;
+        char *irr;
+        char *curvea;
+        char *curveb;
+        char *genx;
+        char *geny;
+        char *order;
+        int cofactor;
+};
+typedef struct ECCurveParamsStr ECCurveParams;
+
+/* Named curve parameters */
+typedef enum {
+
+        ECCurve_noName = 0,
+
+        /* NIST prime curves */
+        ECCurve_NIST_P192,
+        ECCurve_NIST_P224,
+        ECCurve_NIST_P256,
+        ECCurve_NIST_P384,
+        ECCurve_NIST_P521,
+
+        /* NIST binary curves */
+        ECCurve_NIST_K163,
+        ECCurve_NIST_B163,
+        ECCurve_NIST_K233,
+        ECCurve_NIST_B233,
+        ECCurve_NIST_K283,
+        ECCurve_NIST_B283,
+        ECCurve_NIST_K409,
+        ECCurve_NIST_B409,
+        ECCurve_NIST_K571,
+        ECCurve_NIST_B571,
+
+        /* ANSI X9.62 prime curves */
+        /* ECCurve_X9_62_PRIME_192V1 == ECCurve_NIST_P192 */
+        ECCurve_X9_62_PRIME_192V2,
+        ECCurve_X9_62_PRIME_192V3,
+        ECCurve_X9_62_PRIME_239V1,
+        ECCurve_X9_62_PRIME_239V2,
+        ECCurve_X9_62_PRIME_239V3,
+        /* ECCurve_X9_62_PRIME_256V1 == ECCurve_NIST_P256 */
+
+        /* ANSI X9.62 binary curves */
+        ECCurve_X9_62_CHAR2_PNB163V1,
+        ECCurve_X9_62_CHAR2_PNB163V2,
+        ECCurve_X9_62_CHAR2_PNB163V3,
+        ECCurve_X9_62_CHAR2_PNB176V1,
+        ECCurve_X9_62_CHAR2_TNB191V1,
+        ECCurve_X9_62_CHAR2_TNB191V2,
+        ECCurve_X9_62_CHAR2_TNB191V3,
+        ECCurve_X9_62_CHAR2_PNB208W1,
+        ECCurve_X9_62_CHAR2_TNB239V1,
+        ECCurve_X9_62_CHAR2_TNB239V2,
+        ECCurve_X9_62_CHAR2_TNB239V3,
+        ECCurve_X9_62_CHAR2_PNB272W1,
+        ECCurve_X9_62_CHAR2_PNB304W1,
+        ECCurve_X9_62_CHAR2_TNB359V1,
+        ECCurve_X9_62_CHAR2_PNB368W1,
+        ECCurve_X9_62_CHAR2_TNB431R1,
+
+        /* SEC2 prime curves */
+        ECCurve_SECG_PRIME_112R1,
+        ECCurve_SECG_PRIME_112R2,
+        ECCurve_SECG_PRIME_128R1,
+        ECCurve_SECG_PRIME_128R2,
+        ECCurve_SECG_PRIME_160K1,
+        ECCurve_SECG_PRIME_160R1,
+        ECCurve_SECG_PRIME_160R2,
+        ECCurve_SECG_PRIME_192K1,
+        /* ECCurve_SECG_PRIME_192R1 == ECCurve_NIST_P192 */
+        ECCurve_SECG_PRIME_224K1,
+        /* ECCurve_SECG_PRIME_224R1 == ECCurve_NIST_P224 */
+        ECCurve_SECG_PRIME_256K1,
+        /* ECCurve_SECG_PRIME_256R1 == ECCurve_NIST_P256 */
+        /* ECCurve_SECG_PRIME_384R1 == ECCurve_NIST_P384 */
+        /* ECCurve_SECG_PRIME_521R1 == ECCurve_NIST_P521 */
+
+        /* SEC2 binary curves */
+        ECCurve_SECG_CHAR2_113R1,
+        ECCurve_SECG_CHAR2_113R2,
+        ECCurve_SECG_CHAR2_131R1,
+        ECCurve_SECG_CHAR2_131R2,
+        /* ECCurve_SECG_CHAR2_163K1 == ECCurve_NIST_K163 */
+        ECCurve_SECG_CHAR2_163R1,
+        /* ECCurve_SECG_CHAR2_163R2 == ECCurve_NIST_B163 */
+        ECCurve_SECG_CHAR2_193R1,
+        ECCurve_SECG_CHAR2_193R2,
+        /* ECCurve_SECG_CHAR2_233K1 == ECCurve_NIST_K233 */
+        /* ECCurve_SECG_CHAR2_233R1 == ECCurve_NIST_B233 */
+        ECCurve_SECG_CHAR2_239K1,
+        /* ECCurve_SECG_CHAR2_283K1 == ECCurve_NIST_K283 */
+        /* ECCurve_SECG_CHAR2_283R1 == ECCurve_NIST_B283 */
+        /* ECCurve_SECG_CHAR2_409K1 == ECCurve_NIST_K409 */
+        /* ECCurve_SECG_CHAR2_409R1 == ECCurve_NIST_B409 */
+        /* ECCurve_SECG_CHAR2_571K1 == ECCurve_NIST_K571 */
+        /* ECCurve_SECG_CHAR2_571R1 == ECCurve_NIST_B571 */
+
+        /* WTLS curves */
+        ECCurve_WTLS_1,
+        /* there is no WTLS 2 curve */
+        /* ECCurve_WTLS_3 == ECCurve_NIST_K163 */
+        /* ECCurve_WTLS_4 == ECCurve_SECG_CHAR2_113R1 */
+        /* ECCurve_WTLS_5 == ECCurve_X9_62_CHAR2_PNB163V1 */
+        /* ECCurve_WTLS_6 == ECCurve_SECG_PRIME_112R1 */
+        /* ECCurve_WTLS_7 == ECCurve_SECG_PRIME_160R1 */
+        ECCurve_WTLS_8,
+        ECCurve_WTLS_9,
+        /* ECCurve_WTLS_10 == ECCurve_NIST_K233 */
+        /* ECCurve_WTLS_11 == ECCurve_NIST_B233 */
+        /* ECCurve_WTLS_12 == ECCurve_NIST_P224 */
+
+        ECCurve_pastLastCurve
+} ECCurveName;
+
+/* Aliased named curves */
+
+#define ECCurve_X9_62_PRIME_192V1 ECCurve_NIST_P192
+#define ECCurve_X9_62_PRIME_256V1 ECCurve_NIST_P256
+#define ECCurve_SECG_PRIME_192R1 ECCurve_NIST_P192
+#define ECCurve_SECG_PRIME_224R1 ECCurve_NIST_P224
+#define ECCurve_SECG_PRIME_256R1 ECCurve_NIST_P256
+#define ECCurve_SECG_PRIME_384R1 ECCurve_NIST_P384
+#define ECCurve_SECG_PRIME_521R1 ECCurve_NIST_P521
+#define ECCurve_SECG_CHAR2_163K1 ECCurve_NIST_K163
+#define ECCurve_SECG_CHAR2_163R2 ECCurve_NIST_B163
+#define ECCurve_SECG_CHAR2_233K1 ECCurve_NIST_K233
+#define ECCurve_SECG_CHAR2_233R1 ECCurve_NIST_B233
+#define ECCurve_SECG_CHAR2_283K1 ECCurve_NIST_K283
+#define ECCurve_SECG_CHAR2_283R1 ECCurve_NIST_B283
+#define ECCurve_SECG_CHAR2_409K1 ECCurve_NIST_K409
+#define ECCurve_SECG_CHAR2_409R1 ECCurve_NIST_B409
+#define ECCurve_SECG_CHAR2_571K1 ECCurve_NIST_K571
+#define ECCurve_SECG_CHAR2_571R1 ECCurve_NIST_B571
+#define ECCurve_WTLS_3 ECCurve_NIST_K163
+#define ECCurve_WTLS_4 ECCurve_SECG_CHAR2_113R1
+#define ECCurve_WTLS_5 ECCurve_X9_62_CHAR2_PNB163V1
+#define ECCurve_WTLS_6 ECCurve_SECG_PRIME_112R1
+#define ECCurve_WTLS_7 ECCurve_SECG_PRIME_160R1
+#define ECCurve_WTLS_10 ECCurve_NIST_K233
+#define ECCurve_WTLS_11 ECCurve_NIST_B233
+#define ECCurve_WTLS_12 ECCurve_NIST_P224
+
+#endif /* _ECL_EXP_H */
diff --git a/jdk/src/share/native/sun/security/ec/ecl-priv.h b/jdk/src/share/native/sun/security/ec/ecl-priv.h
new file mode 100644
index 00000000000..12caaf70577
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecl-priv.h
@@ -0,0 +1,304 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stephen Fung <fungstep@hotmail.com> and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ECL_PRIV_H
+#define _ECL_PRIV_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecl.h"
+#include "mpi.h"
+#include "mplogic.h"
+
+/* MAX_FIELD_SIZE_DIGITS is the maximum size of field element supported */
+/* the following needs to go away... */
+#if defined(MP_USE_LONG_LONG_DIGIT) || defined(MP_USE_LONG_DIGIT)
+#define ECL_SIXTY_FOUR_BIT
+#else
+#define ECL_THIRTY_TWO_BIT
+#endif
+
+#define ECL_CURVE_DIGITS(curve_size_in_bits) \
+        (((curve_size_in_bits)+(sizeof(mp_digit)*8-1))/(sizeof(mp_digit)*8))
+#define ECL_BITS (sizeof(mp_digit)*8)
+#define ECL_MAX_FIELD_SIZE_DIGITS (80/sizeof(mp_digit))
+
+/* Gets the i'th bit in the binary representation of a. If i >= length(a),
+ * then return 0. (The above behaviour differs from mpl_get_bit, which
+ * causes an error if i >= length(a).) */
+#define MP_GET_BIT(a, i) \
+        ((i) >= mpl_significant_bits((a))) ? 0 : mpl_get_bit((a), (i))
+
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+#define MP_ADD_CARRY(a1, a2, s, cin, cout)   \
+    { mp_word w; \
+    w = ((mp_word)(cin)) + (a1) + (a2); \
+    s = ACCUM(w); \
+    cout = CARRYOUT(w); }
+
+#define MP_SUB_BORROW(a1, a2, s, bin, bout)   \
+    { mp_word w; \
+    w = ((mp_word)(a1)) - (a2) - (bin); \
+    s = ACCUM(w); \
+    bout = (w >> MP_DIGIT_BIT) & 1; }
+
+#else
+/* NOTE,
+ * cin and cout could be the same variable.
+ * bin and bout could be the same variable.
+ * a1 or a2 and s could be the same variable.
+ * don't trash those outputs until their respective inputs have
+ * been read. */
+#define MP_ADD_CARRY(a1, a2, s, cin, cout)   \
+    { mp_digit tmp,sum; \
+    tmp = (a1); \
+    sum = tmp + (a2); \
+    tmp = (sum < tmp);                     /* detect overflow */ \
+    s = sum += (cin); \
+    cout = tmp + (sum < (cin)); }
+
+#define MP_SUB_BORROW(a1, a2, s, bin, bout)   \
+    { mp_digit tmp; \
+    tmp = (a1); \
+    s = tmp - (a2); \
+    tmp = (s > tmp);                    /* detect borrow */ \
+    if ((bin) && !s--) tmp++;   \
+    bout = tmp; }
+#endif
+
+
+struct GFMethodStr;
+typedef struct GFMethodStr GFMethod;
+struct GFMethodStr {
+        /* Indicates whether the structure was constructed from dynamic memory
+         * or statically created. */
+        int constructed;
+        /* Irreducible that defines the field. For prime fields, this is the
+         * prime p. For binary polynomial fields, this is the bitstring
+         * representation of the irreducible polynomial. */
+        mp_int irr;
+        /* For prime fields, the value irr_arr[0] is the number of bits in the
+         * field. For binary polynomial fields, the irreducible polynomial
+         * f(t) is represented as an array of unsigned int[], where f(t) is
+         * of the form: f(t) = t^p[0] + t^p[1] + ... + t^p[4] where m = p[0]
+         * > p[1] > ... > p[4] = 0. */
+        unsigned int irr_arr[5];
+        /* Field arithmetic methods. All methods (except field_enc and
+         * field_dec) are assumed to take field-encoded parameters and return
+         * field-encoded values. All methods (except field_enc and field_dec)
+         * are required to be implemented. */
+        mp_err (*field_add) (const mp_int *a, const mp_int *b, mp_int *r,
+                                                 const GFMethod *meth);
+        mp_err (*field_neg) (const mp_int *a, mp_int *r, const GFMethod *meth);
+        mp_err (*field_sub) (const mp_int *a, const mp_int *b, mp_int *r,
+                                                 const GFMethod *meth);
+        mp_err (*field_mod) (const mp_int *a, mp_int *r, const GFMethod *meth);
+        mp_err (*field_mul) (const mp_int *a, const mp_int *b, mp_int *r,
+                                                 const GFMethod *meth);
+        mp_err (*field_sqr) (const mp_int *a, mp_int *r, const GFMethod *meth);
+        mp_err (*field_div) (const mp_int *a, const mp_int *b, mp_int *r,
+                                                 const GFMethod *meth);
+        mp_err (*field_enc) (const mp_int *a, mp_int *r, const GFMethod *meth);
+        mp_err (*field_dec) (const mp_int *a, mp_int *r, const GFMethod *meth);
+        /* Extra storage for implementation-specific data.  Any memory
+         * allocated to these extra fields will be cleared by extra_free. */
+        void *extra1;
+        void *extra2;
+        void (*extra_free) (GFMethod *meth);
+};
+
+/* Construct generic GFMethods. */
+GFMethod *GFMethod_consGFp(const mp_int *irr);
+GFMethod *GFMethod_consGFp_mont(const mp_int *irr);
+GFMethod *GFMethod_consGF2m(const mp_int *irr,
+                                                        const unsigned int irr_arr[5]);
+/* Free the memory allocated (if any) to a GFMethod object. */
+void GFMethod_free(GFMethod *meth);
+
+struct ECGroupStr {
+        /* Indicates whether the structure was constructed from dynamic memory
+         * or statically created. */
+        int constructed;
+        /* Field definition and arithmetic. */
+        GFMethod *meth;
+        /* Textual representation of curve name, if any. */
+        char *text;
+#ifdef _KERNEL
+        int text_len;
+#endif
+        /* Curve parameters, field-encoded. */
+        mp_int curvea, curveb;
+        /* x and y coordinates of the base point, field-encoded. */
+        mp_int genx, geny;
+        /* Order and cofactor of the base point. */
+        mp_int order;
+        int cofactor;
+        /* Point arithmetic methods. All methods are assumed to take
+         * field-encoded parameters and return field-encoded values. All
+         * methods (except base_point_mul and points_mul) are required to be
+         * implemented. */
+        mp_err (*point_add) (const mp_int *px, const mp_int *py,
+                                                 const mp_int *qx, const mp_int *qy, mp_int *rx,
+                                                 mp_int *ry, const ECGroup *group);
+        mp_err (*point_sub) (const mp_int *px, const mp_int *py,
+                                                 const mp_int *qx, const mp_int *qy, mp_int *rx,
+                                                 mp_int *ry, const ECGroup *group);
+        mp_err (*point_dbl) (const mp_int *px, const mp_int *py, mp_int *rx,
+                                                 mp_int *ry, const ECGroup *group);
+        mp_err (*point_mul) (const mp_int *n, const mp_int *px,
+                                                 const mp_int *py, mp_int *rx, mp_int *ry,
+                                                 const ECGroup *group);
+        mp_err (*base_point_mul) (const mp_int *n, mp_int *rx, mp_int *ry,
+                                                          const ECGroup *group);
+        mp_err (*points_mul) (const mp_int *k1, const mp_int *k2,
+                                                  const mp_int *px, const mp_int *py, mp_int *rx,
+                                                  mp_int *ry, const ECGroup *group);
+        mp_err (*validate_point) (const mp_int *px, const mp_int *py, const ECGroup *group);
+        /* Extra storage for implementation-specific data.  Any memory
+         * allocated to these extra fields will be cleared by extra_free. */
+        void *extra1;
+        void *extra2;
+        void (*extra_free) (ECGroup *group);
+};
+
+/* Wrapper functions for generic prime field arithmetic. */
+mp_err ec_GFp_add(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_neg(const mp_int *a, mp_int *r, const GFMethod *meth);
+mp_err ec_GFp_sub(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+
+/* fixed length in-line adds. Count is in words */
+mp_err ec_GFp_add_3(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_add_4(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_add_5(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_add_6(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_sub_3(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_sub_4(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_sub_5(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_sub_6(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+
+mp_err ec_GFp_mod(const mp_int *a, mp_int *r, const GFMethod *meth);
+mp_err ec_GFp_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+mp_err ec_GFp_sqr(const mp_int *a, mp_int *r, const GFMethod *meth);
+mp_err ec_GFp_div(const mp_int *a, const mp_int *b, mp_int *r,
+                                  const GFMethod *meth);
+/* Wrapper functions for generic binary polynomial field arithmetic. */
+mp_err ec_GF2m_add(const mp_int *a, const mp_int *b, mp_int *r,
+                                   const GFMethod *meth);
+mp_err ec_GF2m_neg(const mp_int *a, mp_int *r, const GFMethod *meth);
+mp_err ec_GF2m_mod(const mp_int *a, mp_int *r, const GFMethod *meth);
+mp_err ec_GF2m_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                   const GFMethod *meth);
+mp_err ec_GF2m_sqr(const mp_int *a, mp_int *r, const GFMethod *meth);
+mp_err ec_GF2m_div(const mp_int *a, const mp_int *b, mp_int *r,
+                                   const GFMethod *meth);
+
+/* Montgomery prime field arithmetic. */
+mp_err ec_GFp_mul_mont(const mp_int *a, const mp_int *b, mp_int *r,
+                                           const GFMethod *meth);
+mp_err ec_GFp_sqr_mont(const mp_int *a, mp_int *r, const GFMethod *meth);
+mp_err ec_GFp_div_mont(const mp_int *a, const mp_int *b, mp_int *r,
+                                           const GFMethod *meth);
+mp_err ec_GFp_enc_mont(const mp_int *a, mp_int *r, const GFMethod *meth);
+mp_err ec_GFp_dec_mont(const mp_int *a, mp_int *r, const GFMethod *meth);
+void ec_GFp_extra_free_mont(GFMethod *meth);
+
+/* point multiplication */
+mp_err ec_pts_mul_basic(const mp_int *k1, const mp_int *k2,
+                                                const mp_int *px, const mp_int *py, mp_int *rx,
+                                                mp_int *ry, const ECGroup *group);
+mp_err ec_pts_mul_simul_w2(const mp_int *k1, const mp_int *k2,
+                                                   const mp_int *px, const mp_int *py, mp_int *rx,
+                                                   mp_int *ry, const ECGroup *group);
+
+/* Computes the windowed non-adjacent-form (NAF) of a scalar. Out should
+ * be an array of signed char's to output to, bitsize should be the number
+ * of bits of out, in is the original scalar, and w is the window size.
+ * NAF is discussed in the paper: D. Hankerson, J. Hernandez and A.
+ * Menezes, "Software implementation of elliptic curve cryptography over
+ * binary fields", Proc. CHES 2000. */
+mp_err ec_compute_wNAF(signed char *out, int bitsize, const mp_int *in,
+                                           int w);
+
+/* Optimized field arithmetic */
+mp_err ec_group_set_gfp192(ECGroup *group, ECCurveName);
+mp_err ec_group_set_gfp224(ECGroup *group, ECCurveName);
+mp_err ec_group_set_gfp256(ECGroup *group, ECCurveName);
+mp_err ec_group_set_gfp384(ECGroup *group, ECCurveName);
+mp_err ec_group_set_gfp521(ECGroup *group, ECCurveName);
+mp_err ec_group_set_gf2m163(ECGroup *group, ECCurveName name);
+mp_err ec_group_set_gf2m193(ECGroup *group, ECCurveName name);
+mp_err ec_group_set_gf2m233(ECGroup *group, ECCurveName name);
+
+/* Optimized floating-point arithmetic */
+#ifdef ECL_USE_FP
+mp_err ec_group_set_secp160r1_fp(ECGroup *group);
+mp_err ec_group_set_nistp192_fp(ECGroup *group);
+mp_err ec_group_set_nistp224_fp(ECGroup *group);
+#endif
+
+#endif /* _ECL_PRIV_H */
diff --git a/jdk/src/share/native/sun/security/ec/ecl.c b/jdk/src/share/native/sun/security/ec/ecl.c
new file mode 100644
index 00000000000..7089a6d0e9d
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecl.c
@@ -0,0 +1,475 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "mpi.h"
+#include "mplogic.h"
+#include "ecl.h"
+#include "ecl-priv.h"
+#include "ec2.h"
+#include "ecp.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+/* Allocate memory for a new ECGroup object. */
+ECGroup *
+ECGroup_new(int kmflag)
+{
+        mp_err res = MP_OKAY;
+        ECGroup *group;
+#ifdef _KERNEL
+        group = (ECGroup *) kmem_alloc(sizeof(ECGroup), kmflag);
+#else
+        group = (ECGroup *) malloc(sizeof(ECGroup));
+#endif
+        if (group == NULL)
+                return NULL;
+        group->constructed = MP_YES;
+        group->meth = NULL;
+        group->text = NULL;
+        MP_DIGITS(&group->curvea) = 0;
+        MP_DIGITS(&group->curveb) = 0;
+        MP_DIGITS(&group->genx) = 0;
+        MP_DIGITS(&group->geny) = 0;
+        MP_DIGITS(&group->order) = 0;
+        group->base_point_mul = NULL;
+        group->points_mul = NULL;
+        group->validate_point = NULL;
+        group->extra1 = NULL;
+        group->extra2 = NULL;
+        group->extra_free = NULL;
+        MP_CHECKOK(mp_init(&group->curvea, kmflag));
+        MP_CHECKOK(mp_init(&group->curveb, kmflag));
+        MP_CHECKOK(mp_init(&group->genx, kmflag));
+        MP_CHECKOK(mp_init(&group->geny, kmflag));
+        MP_CHECKOK(mp_init(&group->order, kmflag));
+
+  CLEANUP:
+        if (res != MP_OKAY) {
+                ECGroup_free(group);
+                return NULL;
+        }
+        return group;
+}
+
+/* Construct a generic ECGroup for elliptic curves over prime fields. */
+ECGroup *
+ECGroup_consGFp(const mp_int *irr, const mp_int *curvea,
+                                const mp_int *curveb, const mp_int *genx,
+                                const mp_int *geny, const mp_int *order, int cofactor)
+{
+        mp_err res = MP_OKAY;
+        ECGroup *group = NULL;
+
+        group = ECGroup_new(FLAG(irr));
+        if (group == NULL)
+                return NULL;
+
+        group->meth = GFMethod_consGFp(irr);
+        if (group->meth == NULL) {
+                res = MP_MEM;
+                goto CLEANUP;
+        }
+        MP_CHECKOK(mp_copy(curvea, &group->curvea));
+        MP_CHECKOK(mp_copy(curveb, &group->curveb));
+        MP_CHECKOK(mp_copy(genx, &group->genx));
+        MP_CHECKOK(mp_copy(geny, &group->geny));
+        MP_CHECKOK(mp_copy(order, &group->order));
+        group->cofactor = cofactor;
+        group->point_add = &ec_GFp_pt_add_aff;
+        group->point_sub = &ec_GFp_pt_sub_aff;
+        group->point_dbl = &ec_GFp_pt_dbl_aff;
+        group->point_mul = &ec_GFp_pt_mul_jm_wNAF;
+        group->base_point_mul = NULL;
+        group->points_mul = &ec_GFp_pts_mul_jac;
+        group->validate_point = &ec_GFp_validate_point;
+
+  CLEANUP:
+        if (res != MP_OKAY) {
+                ECGroup_free(group);
+                return NULL;
+        }
+        return group;
+}
+
+/* Construct a generic ECGroup for elliptic curves over prime fields with
+ * field arithmetic implemented in Montgomery coordinates. */
+ECGroup *
+ECGroup_consGFp_mont(const mp_int *irr, const mp_int *curvea,
+                                         const mp_int *curveb, const mp_int *genx,
+                                         const mp_int *geny, const mp_int *order, int cofactor)
+{
+        mp_err res = MP_OKAY;
+        ECGroup *group = NULL;
+
+        group = ECGroup_new(FLAG(irr));
+        if (group == NULL)
+                return NULL;
+
+        group->meth = GFMethod_consGFp_mont(irr);
+        if (group->meth == NULL) {
+                res = MP_MEM;
+                goto CLEANUP;
+        }
+        MP_CHECKOK(group->meth->
+                           field_enc(curvea, &group->curvea, group->meth));
+        MP_CHECKOK(group->meth->
+                           field_enc(curveb, &group->curveb, group->meth));
+        MP_CHECKOK(group->meth->field_enc(genx, &group->genx, group->meth));
+        MP_CHECKOK(group->meth->field_enc(geny, &group->geny, group->meth));
+        MP_CHECKOK(mp_copy(order, &group->order));
+        group->cofactor = cofactor;
+        group->point_add = &ec_GFp_pt_add_aff;
+        group->point_sub = &ec_GFp_pt_sub_aff;
+        group->point_dbl = &ec_GFp_pt_dbl_aff;
+        group->point_mul = &ec_GFp_pt_mul_jm_wNAF;
+        group->base_point_mul = NULL;
+        group->points_mul = &ec_GFp_pts_mul_jac;
+        group->validate_point = &ec_GFp_validate_point;
+
+  CLEANUP:
+        if (res != MP_OKAY) {
+                ECGroup_free(group);
+                return NULL;
+        }
+        return group;
+}
+
+#ifdef NSS_ECC_MORE_THAN_SUITE_B
+/* Construct a generic ECGroup for elliptic curves over binary polynomial
+ * fields. */
+ECGroup *
+ECGroup_consGF2m(const mp_int *irr, const unsigned int irr_arr[5],
+                                 const mp_int *curvea, const mp_int *curveb,
+                                 const mp_int *genx, const mp_int *geny,
+                                 const mp_int *order, int cofactor)
+{
+        mp_err res = MP_OKAY;
+        ECGroup *group = NULL;
+
+        group = ECGroup_new(FLAG(irr));
+        if (group == NULL)
+                return NULL;
+
+        group->meth = GFMethod_consGF2m(irr, irr_arr);
+        if (group->meth == NULL) {
+                res = MP_MEM;
+                goto CLEANUP;
+        }
+        MP_CHECKOK(mp_copy(curvea, &group->curvea));
+        MP_CHECKOK(mp_copy(curveb, &group->curveb));
+        MP_CHECKOK(mp_copy(genx, &group->genx));
+        MP_CHECKOK(mp_copy(geny, &group->geny));
+        MP_CHECKOK(mp_copy(order, &group->order));
+        group->cofactor = cofactor;
+        group->point_add = &ec_GF2m_pt_add_aff;
+        group->point_sub = &ec_GF2m_pt_sub_aff;
+        group->point_dbl = &ec_GF2m_pt_dbl_aff;
+        group->point_mul = &ec_GF2m_pt_mul_mont;
+        group->base_point_mul = NULL;
+        group->points_mul = &ec_pts_mul_basic;
+        group->validate_point = &ec_GF2m_validate_point;
+
+  CLEANUP:
+        if (res != MP_OKAY) {
+                ECGroup_free(group);
+                return NULL;
+        }
+        return group;
+}
+#endif
+
+/* Construct ECGroup from hex parameters and name, if any. Called by
+ * ECGroup_fromHex and ECGroup_fromName. */
+ECGroup *
+ecgroup_fromNameAndHex(const ECCurveName name,
+                                   const ECCurveParams * params, int kmflag)
+{
+        mp_int irr, curvea, curveb, genx, geny, order;
+        int bits;
+        ECGroup *group = NULL;
+        mp_err res = MP_OKAY;
+
+        /* initialize values */
+        MP_DIGITS(&irr) = 0;
+        MP_DIGITS(&curvea) = 0;
+        MP_DIGITS(&curveb) = 0;
+        MP_DIGITS(&genx) = 0;
+        MP_DIGITS(&geny) = 0;
+        MP_DIGITS(&order) = 0;
+        MP_CHECKOK(mp_init(&irr, kmflag));
+        MP_CHECKOK(mp_init(&curvea, kmflag));
+        MP_CHECKOK(mp_init(&curveb, kmflag));
+        MP_CHECKOK(mp_init(&genx, kmflag));
+        MP_CHECKOK(mp_init(&geny, kmflag));
+        MP_CHECKOK(mp_init(&order, kmflag));
+        MP_CHECKOK(mp_read_radix(&irr, params->irr, 16));
+        MP_CHECKOK(mp_read_radix(&curvea, params->curvea, 16));
+        MP_CHECKOK(mp_read_radix(&curveb, params->curveb, 16));
+        MP_CHECKOK(mp_read_radix(&genx, params->genx, 16));
+        MP_CHECKOK(mp_read_radix(&geny, params->geny, 16));
+        MP_CHECKOK(mp_read_radix(&order, params->order, 16));
+
+        /* determine number of bits */
+        bits = mpl_significant_bits(&irr) - 1;
+        if (bits < MP_OKAY) {
+                res = bits;
+                goto CLEANUP;
+        }
+
+        /* determine which optimizations (if any) to use */
+        if (params->field == ECField_GFp) {
+#ifdef NSS_ECC_MORE_THAN_SUITE_B
+            switch (name) {
+#ifdef ECL_USE_FP
+                case ECCurve_SECG_PRIME_160R1:
+                        group =
+                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                                                &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                        MP_CHECKOK(ec_group_set_secp160r1_fp(group));
+                        break;
+#endif
+                case ECCurve_SECG_PRIME_192R1:
+#ifdef ECL_USE_FP
+                        group =
+                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                                                &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                        MP_CHECKOK(ec_group_set_nistp192_fp(group));
+#else
+                        group =
+                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                                                &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                        MP_CHECKOK(ec_group_set_gfp192(group, name));
+#endif
+                        break;
+                case ECCurve_SECG_PRIME_224R1:
+#ifdef ECL_USE_FP
+                        group =
+                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                                                &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                        MP_CHECKOK(ec_group_set_nistp224_fp(group));
+#else
+                        group =
+                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                                                &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                        MP_CHECKOK(ec_group_set_gfp224(group, name));
+#endif
+                        break;
+                case ECCurve_SECG_PRIME_256R1:
+                        group =
+                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                                                &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                        MP_CHECKOK(ec_group_set_gfp256(group, name));
+                        break;
+                case ECCurve_SECG_PRIME_521R1:
+                        group =
+                                ECGroup_consGFp(&irr, &curvea, &curveb, &genx, &geny,
+                                                                &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                        MP_CHECKOK(ec_group_set_gfp521(group, name));
+                        break;
+                default:
+                        /* use generic arithmetic */
+#endif
+                        group =
+                                ECGroup_consGFp_mont(&irr, &curvea, &curveb, &genx, &geny,
+                                                                         &order, params->cofactor);
+                        if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+#ifdef NSS_ECC_MORE_THAN_SUITE_B
+                }
+        } else if (params->field == ECField_GF2m) {
+                group = ECGroup_consGF2m(&irr, NULL, &curvea, &curveb, &genx, &geny, &order, params->cofactor);
+                if (group == NULL) { res = MP_UNDEF; goto CLEANUP; }
+                if ((name == ECCurve_NIST_K163) ||
+                    (name == ECCurve_NIST_B163) ||
+                    (name == ECCurve_SECG_CHAR2_163R1)) {
+                        MP_CHECKOK(ec_group_set_gf2m163(group, name));
+                } else if ((name == ECCurve_SECG_CHAR2_193R1) ||
+                           (name == ECCurve_SECG_CHAR2_193R2)) {
+                        MP_CHECKOK(ec_group_set_gf2m193(group, name));
+                } else if ((name == ECCurve_NIST_K233) ||
+                           (name == ECCurve_NIST_B233)) {
+                        MP_CHECKOK(ec_group_set_gf2m233(group, name));
+                }
+#endif
+        } else {
+                res = MP_UNDEF;
+                goto CLEANUP;
+        }
+
+        /* set name, if any */
+        if ((group != NULL) && (params->text != NULL)) {
+#ifdef _KERNEL
+                int n = strlen(params->text) + 1;
+
+                group->text = kmem_alloc(n, kmflag);
+                if (group->text == NULL) {
+                        res = MP_MEM;
+                        goto CLEANUP;
+                }
+                bcopy(params->text, group->text, n);
+                group->text_len = n;
+#else
+                group->text = strdup(params->text);
+                if (group->text == NULL) {
+                        res = MP_MEM;
+                }
+#endif
+        }
+
+  CLEANUP:
+        mp_clear(&irr);
+        mp_clear(&curvea);
+        mp_clear(&curveb);
+        mp_clear(&genx);
+        mp_clear(&geny);
+        mp_clear(&order);
+        if (res != MP_OKAY) {
+                ECGroup_free(group);
+                return NULL;
+        }
+        return group;
+}
+
+/* Construct ECGroup from hexadecimal representations of parameters. */
+ECGroup *
+ECGroup_fromHex(const ECCurveParams * params, int kmflag)
+{
+        return ecgroup_fromNameAndHex(ECCurve_noName, params, kmflag);
+}
+
+/* Construct ECGroup from named parameters. */
+ECGroup *
+ECGroup_fromName(const ECCurveName name, int kmflag)
+{
+        ECGroup *group = NULL;
+        ECCurveParams *params = NULL;
+        mp_err res = MP_OKAY;
+
+        params = EC_GetNamedCurveParams(name, kmflag);
+        if (params == NULL) {
+                res = MP_UNDEF;
+                goto CLEANUP;
+        }
+
+        /* construct actual group */
+        group = ecgroup_fromNameAndHex(name, params, kmflag);
+        if (group == NULL) {
+                res = MP_UNDEF;
+                goto CLEANUP;
+        }
+
+  CLEANUP:
+        EC_FreeCurveParams(params);
+        if (res != MP_OKAY) {
+                ECGroup_free(group);
+                return NULL;
+        }
+        return group;
+}
+
+/* Validates an EC public key as described in Section 5.2.2 of X9.62. */
+mp_err ECPoint_validate(const ECGroup *group, const mp_int *px, const
+                                        mp_int *py)
+{
+    /* 1: Verify that publicValue is not the point at infinity */
+    /* 2: Verify that the coordinates of publicValue are elements
+     *    of the field.
+     */
+    /* 3: Verify that publicValue is on the curve. */
+    /* 4: Verify that the order of the curve times the publicValue
+     *    is the point at infinity.
+     */
+        return group->validate_point(px, py, group);
+}
+
+/* Free the memory allocated (if any) to an ECGroup object. */
+void
+ECGroup_free(ECGroup *group)
+{
+        if (group == NULL)
+                return;
+        GFMethod_free(group->meth);
+        if (group->constructed == MP_NO)
+                return;
+        mp_clear(&group->curvea);
+        mp_clear(&group->curveb);
+        mp_clear(&group->genx);
+        mp_clear(&group->geny);
+        mp_clear(&group->order);
+        if (group->text != NULL)
+#ifdef _KERNEL
+                kmem_free(group->text, group->text_len);
+#else
+                free(group->text);
+#endif
+        if (group->extra_free != NULL)
+                group->extra_free(group);
+#ifdef _KERNEL
+        kmem_free(group, sizeof (ECGroup));
+#else
+        free(group);
+#endif
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecl.h b/jdk/src/share/native/sun/security/ec/ecl.h
new file mode 100644
index 00000000000..9dcdbc677ce
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecl.h
@@ -0,0 +1,111 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ECL_H
+#define _ECL_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* Although this is not an exported header file, code which uses elliptic
+ * curve point operations will need to include it. */
+
+#include "ecl-exp.h"
+#include "mpi.h"
+
+struct ECGroupStr;
+typedef struct ECGroupStr ECGroup;
+
+/* Construct ECGroup from hexadecimal representations of parameters. */
+ECGroup *ECGroup_fromHex(const ECCurveParams * params, int kmflag);
+
+/* Construct ECGroup from named parameters. */
+ECGroup *ECGroup_fromName(const ECCurveName name, int kmflag);
+
+/* Free an allocated ECGroup. */
+void ECGroup_free(ECGroup *group);
+
+/* Construct ECCurveParams from an ECCurveName */
+ECCurveParams *EC_GetNamedCurveParams(const ECCurveName name, int kmflag);
+
+/* Duplicates an ECCurveParams */
+ECCurveParams *ECCurveParams_dup(const ECCurveParams * params, int kmflag);
+
+/* Free an allocated ECCurveParams */
+void EC_FreeCurveParams(ECCurveParams * params);
+
+/* Elliptic curve scalar-point multiplication. Computes Q(x, y) = k * P(x,
+ * y).  If x, y = NULL, then P is assumed to be the generator (base point)
+ * of the group of points on the elliptic curve. Input and output values
+ * are assumed to be NOT field-encoded. */
+mp_err ECPoint_mul(const ECGroup *group, const mp_int *k, const mp_int *px,
+                                   const mp_int *py, mp_int *qx, mp_int *qy);
+
+/* Elliptic curve scalar-point multiplication. Computes Q(x, y) = k1 * G +
+ * k2 * P(x, y), where G is the generator (base point) of the group of
+ * points on the elliptic curve. Input and output values are assumed to
+ * be NOT field-encoded. */
+mp_err ECPoints_mul(const ECGroup *group, const mp_int *k1,
+                                        const mp_int *k2, const mp_int *px, const mp_int *py,
+                                        mp_int *qx, mp_int *qy);
+
+/* Validates an EC public key as described in Section 5.2.2 of X9.62.
+ * Returns MP_YES if the public key is valid, MP_NO if the public key
+ * is invalid, or an error code if the validation could not be
+ * performed. */
+mp_err ECPoint_validate(const ECGroup *group, const mp_int *px, const
+                                        mp_int *py);
+
+#endif /* _ECL_H */
diff --git a/jdk/src/share/native/sun/security/ec/ecl_curve.c b/jdk/src/share/native/sun/security/ec/ecl_curve.c
new file mode 100644
index 00000000000..d2d2d82291c
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecl_curve.c
@@ -0,0 +1,216 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecl.h"
+#include "ecl-curve.h"
+#include "ecl-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#define CHECK(func) if ((func) == NULL) { res = 0; goto CLEANUP; }
+
+/* Duplicates an ECCurveParams */
+ECCurveParams *
+ECCurveParams_dup(const ECCurveParams * params, int kmflag)
+{
+        int res = 1;
+        ECCurveParams *ret = NULL;
+
+#ifdef _KERNEL
+        ret = (ECCurveParams *) kmem_zalloc(sizeof(ECCurveParams), kmflag);
+#else
+        CHECK(ret = (ECCurveParams *) calloc(1, sizeof(ECCurveParams)));
+#endif
+        if (params->text != NULL) {
+#ifdef _KERNEL
+                ret->text = kmem_alloc(strlen(params->text) + 1, kmflag);
+                bcopy(params->text, ret->text, strlen(params->text) + 1);
+#else
+                CHECK(ret->text = strdup(params->text));
+#endif
+        }
+        ret->field = params->field;
+        ret->size = params->size;
+        if (params->irr != NULL) {
+#ifdef _KERNEL
+                ret->irr = kmem_alloc(strlen(params->irr) + 1, kmflag);
+                bcopy(params->irr, ret->irr, strlen(params->irr) + 1);
+#else
+                CHECK(ret->irr = strdup(params->irr));
+#endif
+        }
+        if (params->curvea != NULL) {
+#ifdef _KERNEL
+                ret->curvea = kmem_alloc(strlen(params->curvea) + 1, kmflag);
+                bcopy(params->curvea, ret->curvea, strlen(params->curvea) + 1);
+#else
+                CHECK(ret->curvea = strdup(params->curvea));
+#endif
+        }
+        if (params->curveb != NULL) {
+#ifdef _KERNEL
+                ret->curveb = kmem_alloc(strlen(params->curveb) + 1, kmflag);
+                bcopy(params->curveb, ret->curveb, strlen(params->curveb) + 1);
+#else
+                CHECK(ret->curveb = strdup(params->curveb));
+#endif
+        }
+        if (params->genx != NULL) {
+#ifdef _KERNEL
+                ret->genx = kmem_alloc(strlen(params->genx) + 1, kmflag);
+                bcopy(params->genx, ret->genx, strlen(params->genx) + 1);
+#else
+                CHECK(ret->genx = strdup(params->genx));
+#endif
+        }
+        if (params->geny != NULL) {
+#ifdef _KERNEL
+                ret->geny = kmem_alloc(strlen(params->geny) + 1, kmflag);
+                bcopy(params->geny, ret->geny, strlen(params->geny) + 1);
+#else
+                CHECK(ret->geny = strdup(params->geny));
+#endif
+        }
+        if (params->order != NULL) {
+#ifdef _KERNEL
+                ret->order = kmem_alloc(strlen(params->order) + 1, kmflag);
+                bcopy(params->order, ret->order, strlen(params->order) + 1);
+#else
+                CHECK(ret->order = strdup(params->order));
+#endif
+        }
+        ret->cofactor = params->cofactor;
+
+  CLEANUP:
+        if (res != 1) {
+                EC_FreeCurveParams(ret);
+                return NULL;
+        }
+        return ret;
+}
+
+#undef CHECK
+
+/* Construct ECCurveParams from an ECCurveName */
+ECCurveParams *
+EC_GetNamedCurveParams(const ECCurveName name, int kmflag)
+{
+        if ((name <= ECCurve_noName) || (ECCurve_pastLastCurve <= name) ||
+                                        (ecCurve_map[name] == NULL)) {
+                return NULL;
+        } else {
+                return ECCurveParams_dup(ecCurve_map[name], kmflag);
+        }
+}
+
+/* Free the memory allocated (if any) to an ECCurveParams object. */
+void
+EC_FreeCurveParams(ECCurveParams * params)
+{
+        if (params == NULL)
+                return;
+        if (params->text != NULL)
+#ifdef _KERNEL
+                kmem_free(params->text, strlen(params->text) + 1);
+#else
+                free(params->text);
+#endif
+        if (params->irr != NULL)
+#ifdef _KERNEL
+                kmem_free(params->irr, strlen(params->irr) + 1);
+#else
+                free(params->irr);
+#endif
+        if (params->curvea != NULL)
+#ifdef _KERNEL
+                kmem_free(params->curvea, strlen(params->curvea) + 1);
+#else
+                free(params->curvea);
+#endif
+        if (params->curveb != NULL)
+#ifdef _KERNEL
+                kmem_free(params->curveb, strlen(params->curveb) + 1);
+#else
+                free(params->curveb);
+#endif
+        if (params->genx != NULL)
+#ifdef _KERNEL
+                kmem_free(params->genx, strlen(params->genx) + 1);
+#else
+                free(params->genx);
+#endif
+        if (params->geny != NULL)
+#ifdef _KERNEL
+                kmem_free(params->geny, strlen(params->geny) + 1);
+#else
+                free(params->geny);
+#endif
+        if (params->order != NULL)
+#ifdef _KERNEL
+                kmem_free(params->order, strlen(params->order) + 1);
+#else
+                free(params->order);
+#endif
+#ifdef _KERNEL
+        kmem_free(params, sizeof(ECCurveParams));
+#else
+        free(params);
+#endif
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecl_gf.c b/jdk/src/share/native/sun/security/ec/ecl_gf.c
new file mode 100644
index 00000000000..a651fa84e7c
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecl_gf.c
@@ -0,0 +1,1062 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stephen Fung <fungstep@hotmail.com> and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "mpi.h"
+#include "mp_gf2m.h"
+#include "ecl-priv.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Allocate memory for a new GFMethod object. */
+GFMethod *
+GFMethod_new(int kmflag)
+{
+        mp_err res = MP_OKAY;
+        GFMethod *meth;
+#ifdef _KERNEL
+        meth = (GFMethod *) kmem_alloc(sizeof(GFMethod), kmflag);
+#else
+        meth = (GFMethod *) malloc(sizeof(GFMethod));
+        if (meth == NULL)
+                return NULL;
+#endif
+        meth->constructed = MP_YES;
+        MP_DIGITS(&meth->irr) = 0;
+        meth->extra_free = NULL;
+        MP_CHECKOK(mp_init(&meth->irr, kmflag));
+
+  CLEANUP:
+        if (res != MP_OKAY) {
+                GFMethod_free(meth);
+                return NULL;
+        }
+        return meth;
+}
+
+/* Construct a generic GFMethod for arithmetic over prime fields with
+ * irreducible irr. */
+GFMethod *
+GFMethod_consGFp(const mp_int *irr)
+{
+        mp_err res = MP_OKAY;
+        GFMethod *meth = NULL;
+
+        meth = GFMethod_new(FLAG(irr));
+        if (meth == NULL)
+                return NULL;
+
+        MP_CHECKOK(mp_copy(irr, &meth->irr));
+        meth->irr_arr[0] = mpl_significant_bits(irr);
+        meth->irr_arr[1] = meth->irr_arr[2] = meth->irr_arr[3] =
+                meth->irr_arr[4] = 0;
+        switch(MP_USED(&meth->irr)) {
+        /* maybe we need 1 and 2 words here as well?*/
+        case 3:
+                meth->field_add = &ec_GFp_add_3;
+                meth->field_sub = &ec_GFp_sub_3;
+                break;
+        case 4:
+                meth->field_add = &ec_GFp_add_4;
+                meth->field_sub = &ec_GFp_sub_4;
+                break;
+        case 5:
+                meth->field_add = &ec_GFp_add_5;
+                meth->field_sub = &ec_GFp_sub_5;
+                break;
+        case 6:
+                meth->field_add = &ec_GFp_add_6;
+                meth->field_sub = &ec_GFp_sub_6;
+                break;
+        default:
+                meth->field_add = &ec_GFp_add;
+                meth->field_sub = &ec_GFp_sub;
+        }
+        meth->field_neg = &ec_GFp_neg;
+        meth->field_mod = &ec_GFp_mod;
+        meth->field_mul = &ec_GFp_mul;
+        meth->field_sqr = &ec_GFp_sqr;
+        meth->field_div = &ec_GFp_div;
+        meth->field_enc = NULL;
+        meth->field_dec = NULL;
+        meth->extra1 = NULL;
+        meth->extra2 = NULL;
+        meth->extra_free = NULL;
+
+  CLEANUP:
+        if (res != MP_OKAY) {
+                GFMethod_free(meth);
+                return NULL;
+        }
+        return meth;
+}
+
+/* Construct a generic GFMethod for arithmetic over binary polynomial
+ * fields with irreducible irr that has array representation irr_arr (see
+ * ecl-priv.h for description of the representation).  If irr_arr is NULL,
+ * then it is constructed from the bitstring representation. */
+GFMethod *
+GFMethod_consGF2m(const mp_int *irr, const unsigned int irr_arr[5])
+{
+        mp_err res = MP_OKAY;
+        int ret;
+        GFMethod *meth = NULL;
+
+        meth = GFMethod_new(FLAG(irr));
+        if (meth == NULL)
+                return NULL;
+
+        MP_CHECKOK(mp_copy(irr, &meth->irr));
+        if (irr_arr != NULL) {
+                /* Irreducible polynomials are either trinomials or pentanomials. */
+                meth->irr_arr[0] = irr_arr[0];
+                meth->irr_arr[1] = irr_arr[1];
+                meth->irr_arr[2] = irr_arr[2];
+                if (irr_arr[2] > 0) {
+                        meth->irr_arr[3] = irr_arr[3];
+                        meth->irr_arr[4] = irr_arr[4];
+                } else {
+                        meth->irr_arr[3] = meth->irr_arr[4] = 0;
+                }
+        } else {
+                ret = mp_bpoly2arr(irr, meth->irr_arr, 5);
+                /* Irreducible polynomials are either trinomials or pentanomials. */
+                if ((ret != 5) && (ret != 3)) {
+                        res = MP_UNDEF;
+                        goto CLEANUP;
+                }
+        }
+        meth->field_add = &ec_GF2m_add;
+        meth->field_neg = &ec_GF2m_neg;
+        meth->field_sub = &ec_GF2m_add;
+        meth->field_mod = &ec_GF2m_mod;
+        meth->field_mul = &ec_GF2m_mul;
+        meth->field_sqr = &ec_GF2m_sqr;
+        meth->field_div = &ec_GF2m_div;
+        meth->field_enc = NULL;
+        meth->field_dec = NULL;
+        meth->extra1 = NULL;
+        meth->extra2 = NULL;
+        meth->extra_free = NULL;
+
+  CLEANUP:
+        if (res != MP_OKAY) {
+                GFMethod_free(meth);
+                return NULL;
+        }
+        return meth;
+}
+
+/* Free the memory allocated (if any) to a GFMethod object. */
+void
+GFMethod_free(GFMethod *meth)
+{
+        if (meth == NULL)
+                return;
+        if (meth->constructed == MP_NO)
+                return;
+        mp_clear(&meth->irr);
+        if (meth->extra_free != NULL)
+                meth->extra_free(meth);
+#ifdef _KERNEL
+        kmem_free(meth, sizeof(GFMethod));
+#else
+        free(meth);
+#endif
+}
+
+/* Wrapper functions for generic prime field arithmetic. */
+
+/* Add two field elements.  Assumes that 0 <= a, b < meth->irr */
+mp_err
+ec_GFp_add(const mp_int *a, const mp_int *b, mp_int *r,
+                   const GFMethod *meth)
+{
+        /* PRE: 0 <= a, b < p = meth->irr POST: 0 <= r < p, r = a + b (mod p) */
+        mp_err res;
+
+        if ((res = mp_add(a, b, r)) != MP_OKAY) {
+                return res;
+        }
+        if (mp_cmp(r, &meth->irr) >= 0) {
+                return mp_sub(r, &meth->irr, r);
+        }
+        return res;
+}
+
+/* Negates a field element.  Assumes that 0 <= a < meth->irr */
+mp_err
+ec_GFp_neg(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        /* PRE: 0 <= a < p = meth->irr POST: 0 <= r < p, r = -a (mod p) */
+
+        if (mp_cmp_z(a) == 0) {
+                mp_zero(r);
+                return MP_OKAY;
+        }
+        return mp_sub(&meth->irr, a, r);
+}
+
+/* Subtracts two field elements.  Assumes that 0 <= a, b < meth->irr */
+mp_err
+ec_GFp_sub(const mp_int *a, const mp_int *b, mp_int *r,
+                   const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        /* PRE: 0 <= a, b < p = meth->irr POST: 0 <= r < p, r = a - b (mod p) */
+        res = mp_sub(a, b, r);
+        if (res == MP_RANGE) {
+                MP_CHECKOK(mp_sub(b, a, r));
+                if (mp_cmp_z(r) < 0) {
+                        MP_CHECKOK(mp_add(r, &meth->irr, r));
+                }
+                MP_CHECKOK(ec_GFp_neg(r, r, meth));
+        }
+        if (mp_cmp_z(r) < 0) {
+                MP_CHECKOK(mp_add(r, &meth->irr, r));
+        }
+  CLEANUP:
+        return res;
+}
+/*
+ * Inline adds for small curve lengths.
+ */
+/* 3 words */
+mp_err
+ec_GFp_add_3(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit a0 = 0, a1 = 0, a2 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0;
+        mp_digit carry;
+
+        switch(MP_USED(a)) {
+        case 3:
+                a2 = MP_DIGIT(a,2);
+        case 2:
+                a1 = MP_DIGIT(a,1);
+        case 1:
+                a0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 3:
+                r2 = MP_DIGIT(b,2);
+        case 2:
+                r1 = MP_DIGIT(b,1);
+        case 1:
+                r0 = MP_DIGIT(b,0);
+        }
+
+#ifndef MPI_AMD64_ADD
+        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
+        MP_ADD_CARRY(a1, r1, r1, carry, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry, carry);
+#else
+        __asm__ (
+                "xorq   %3,%3           \n\t"
+                "addq   %4,%0           \n\t"
+                "adcq   %5,%1           \n\t"
+                "adcq   %6,%2           \n\t"
+                "adcq   $0,%3           \n\t"
+                : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(carry)
+                : "r" (a0), "r" (a1), "r" (a2),
+                  "0" (r0), "1" (r1), "2" (r2)
+                : "%cc" );
+#endif
+
+        MP_CHECKOK(s_mp_pad(r, 3));
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 3;
+
+        /* Do quick 'subract' if we've gone over
+         * (add the 2's complement of the curve field) */
+         a2 = MP_DIGIT(&meth->irr,2);
+        if (carry ||  r2 >  a2 ||
+                ((r2 == a2) && mp_cmp(r,&meth->irr) != MP_LT)) {
+                a1 = MP_DIGIT(&meth->irr,1);
+                a0 = MP_DIGIT(&meth->irr,0);
+#ifndef MPI_AMD64_ADD
+                MP_SUB_BORROW(r0, a0, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a1, r1, carry, carry);
+                MP_SUB_BORROW(r2, a2, r2, carry, carry);
+#else
+                __asm__ (
+                        "subq   %3,%0           \n\t"
+                        "sbbq   %4,%1           \n\t"
+                        "sbbq   %5,%2           \n\t"
+                        : "=r"(r0), "=r"(r1), "=r"(r2)
+                        : "r" (a0), "r" (a1), "r" (a2),
+                          "0" (r0), "1" (r1), "2" (r2)
+                        : "%cc" );
+#endif
+                MP_DIGIT(r, 2) = r2;
+                MP_DIGIT(r, 1) = r1;
+                MP_DIGIT(r, 0) = r0;
+        }
+
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* 4 words */
+mp_err
+ec_GFp_add_4(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit a0 = 0, a1 = 0, a2 = 0, a3 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0, r3 = 0;
+        mp_digit carry;
+
+        switch(MP_USED(a)) {
+        case 4:
+                a3 = MP_DIGIT(a,3);
+        case 3:
+                a2 = MP_DIGIT(a,2);
+        case 2:
+                a1 = MP_DIGIT(a,1);
+        case 1:
+                a0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 4:
+                r3 = MP_DIGIT(b,3);
+        case 3:
+                r2 = MP_DIGIT(b,2);
+        case 2:
+                r1 = MP_DIGIT(b,1);
+        case 1:
+                r0 = MP_DIGIT(b,0);
+        }
+
+#ifndef MPI_AMD64_ADD
+        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
+        MP_ADD_CARRY(a1, r1, r1, carry, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry, carry);
+        MP_ADD_CARRY(a3, r3, r3, carry, carry);
+#else
+        __asm__ (
+                "xorq   %4,%4           \n\t"
+                "addq   %5,%0           \n\t"
+                "adcq   %6,%1           \n\t"
+                "adcq   %7,%2           \n\t"
+                "adcq   %8,%3           \n\t"
+                "adcq   $0,%4           \n\t"
+                : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3), "=r"(carry)
+                : "r" (a0), "r" (a1), "r" (a2), "r" (a3),
+                  "0" (r0), "1" (r1), "2" (r2), "3" (r3)
+                : "%cc" );
+#endif
+
+        MP_CHECKOK(s_mp_pad(r, 4));
+        MP_DIGIT(r, 3) = r3;
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 4;
+
+        /* Do quick 'subract' if we've gone over
+         * (add the 2's complement of the curve field) */
+         a3 = MP_DIGIT(&meth->irr,3);
+        if (carry ||  r3 >  a3 ||
+                ((r3 == a3) && mp_cmp(r,&meth->irr) != MP_LT)) {
+                a2 = MP_DIGIT(&meth->irr,2);
+                a1 = MP_DIGIT(&meth->irr,1);
+                a0 = MP_DIGIT(&meth->irr,0);
+#ifndef MPI_AMD64_ADD
+                MP_SUB_BORROW(r0, a0, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a1, r1, carry, carry);
+                MP_SUB_BORROW(r2, a2, r2, carry, carry);
+                MP_SUB_BORROW(r3, a3, r3, carry, carry);
+#else
+                __asm__ (
+                        "subq   %4,%0           \n\t"
+                        "sbbq   %5,%1           \n\t"
+                        "sbbq   %6,%2           \n\t"
+                        "sbbq   %7,%3           \n\t"
+                        : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3)
+                        : "r" (a0), "r" (a1), "r" (a2), "r" (a3),
+                          "0" (r0), "1" (r1), "2" (r2), "3" (r3)
+                        : "%cc" );
+#endif
+                MP_DIGIT(r, 3) = r3;
+                MP_DIGIT(r, 2) = r2;
+                MP_DIGIT(r, 1) = r1;
+                MP_DIGIT(r, 0) = r0;
+        }
+
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* 5 words */
+mp_err
+ec_GFp_add_5(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit a0 = 0, a1 = 0, a2 = 0, a3 = 0, a4 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0, r3 = 0, r4 = 0;
+        mp_digit carry;
+
+        switch(MP_USED(a)) {
+        case 5:
+                a4 = MP_DIGIT(a,4);
+        case 4:
+                a3 = MP_DIGIT(a,3);
+        case 3:
+                a2 = MP_DIGIT(a,2);
+        case 2:
+                a1 = MP_DIGIT(a,1);
+        case 1:
+                a0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 5:
+                r4 = MP_DIGIT(b,4);
+        case 4:
+                r3 = MP_DIGIT(b,3);
+        case 3:
+                r2 = MP_DIGIT(b,2);
+        case 2:
+                r1 = MP_DIGIT(b,1);
+        case 1:
+                r0 = MP_DIGIT(b,0);
+        }
+
+        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
+        MP_ADD_CARRY(a1, r1, r1, carry, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry, carry);
+        MP_ADD_CARRY(a3, r3, r3, carry, carry);
+        MP_ADD_CARRY(a4, r4, r4, carry, carry);
+
+        MP_CHECKOK(s_mp_pad(r, 5));
+        MP_DIGIT(r, 4) = r4;
+        MP_DIGIT(r, 3) = r3;
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 5;
+
+        /* Do quick 'subract' if we've gone over
+         * (add the 2's complement of the curve field) */
+         a4 = MP_DIGIT(&meth->irr,4);
+        if (carry ||  r4 >  a4 ||
+                ((r4 == a4) && mp_cmp(r,&meth->irr) != MP_LT)) {
+                a3 = MP_DIGIT(&meth->irr,3);
+                a2 = MP_DIGIT(&meth->irr,2);
+                a1 = MP_DIGIT(&meth->irr,1);
+                a0 = MP_DIGIT(&meth->irr,0);
+                MP_SUB_BORROW(r0, a0, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a1, r1, carry, carry);
+                MP_SUB_BORROW(r2, a2, r2, carry, carry);
+                MP_SUB_BORROW(r3, a3, r3, carry, carry);
+                MP_SUB_BORROW(r4, a4, r4, carry, carry);
+                MP_DIGIT(r, 4) = r4;
+                MP_DIGIT(r, 3) = r3;
+                MP_DIGIT(r, 2) = r2;
+                MP_DIGIT(r, 1) = r1;
+                MP_DIGIT(r, 0) = r0;
+        }
+
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* 6 words */
+mp_err
+ec_GFp_add_6(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit a0 = 0, a1 = 0, a2 = 0, a3 = 0, a4 = 0, a5 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0, r3 = 0, r4 = 0, r5 = 0;
+        mp_digit carry;
+
+        switch(MP_USED(a)) {
+        case 6:
+                a5 = MP_DIGIT(a,5);
+        case 5:
+                a4 = MP_DIGIT(a,4);
+        case 4:
+                a3 = MP_DIGIT(a,3);
+        case 3:
+                a2 = MP_DIGIT(a,2);
+        case 2:
+                a1 = MP_DIGIT(a,1);
+        case 1:
+                a0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 6:
+                r5 = MP_DIGIT(b,5);
+        case 5:
+                r4 = MP_DIGIT(b,4);
+        case 4:
+                r3 = MP_DIGIT(b,3);
+        case 3:
+                r2 = MP_DIGIT(b,2);
+        case 2:
+                r1 = MP_DIGIT(b,1);
+        case 1:
+                r0 = MP_DIGIT(b,0);
+        }
+
+        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
+        MP_ADD_CARRY(a1, r1, r1, carry, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry, carry);
+        MP_ADD_CARRY(a3, r3, r3, carry, carry);
+        MP_ADD_CARRY(a4, r4, r4, carry, carry);
+        MP_ADD_CARRY(a5, r5, r5, carry, carry);
+
+        MP_CHECKOK(s_mp_pad(r, 6));
+        MP_DIGIT(r, 5) = r5;
+        MP_DIGIT(r, 4) = r4;
+        MP_DIGIT(r, 3) = r3;
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 6;
+
+        /* Do quick 'subract' if we've gone over
+         * (add the 2's complement of the curve field) */
+        a5 = MP_DIGIT(&meth->irr,5);
+        if (carry ||  r5 >  a5 ||
+                ((r5 == a5) && mp_cmp(r,&meth->irr) != MP_LT)) {
+                a4 = MP_DIGIT(&meth->irr,4);
+                a3 = MP_DIGIT(&meth->irr,3);
+                a2 = MP_DIGIT(&meth->irr,2);
+                a1 = MP_DIGIT(&meth->irr,1);
+                a0 = MP_DIGIT(&meth->irr,0);
+                MP_SUB_BORROW(r0, a0, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a1, r1, carry, carry);
+                MP_SUB_BORROW(r2, a2, r2, carry, carry);
+                MP_SUB_BORROW(r3, a3, r3, carry, carry);
+                MP_SUB_BORROW(r4, a4, r4, carry, carry);
+                MP_SUB_BORROW(r5, a5, r5, carry, carry);
+                MP_DIGIT(r, 5) = r5;
+                MP_DIGIT(r, 4) = r4;
+                MP_DIGIT(r, 3) = r3;
+                MP_DIGIT(r, 2) = r2;
+                MP_DIGIT(r, 1) = r1;
+                MP_DIGIT(r, 0) = r0;
+        }
+
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/*
+ * The following subraction functions do in-line subractions based
+ * on our curve size.
+ *
+ * ... 3 words
+ */
+mp_err
+ec_GFp_sub_3(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit b0 = 0, b1 = 0, b2 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0;
+        mp_digit borrow;
+
+        switch(MP_USED(a)) {
+        case 3:
+                r2 = MP_DIGIT(a,2);
+        case 2:
+                r1 = MP_DIGIT(a,1);
+        case 1:
+                r0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 3:
+                b2 = MP_DIGIT(b,2);
+        case 2:
+                b1 = MP_DIGIT(b,1);
+        case 1:
+                b0 = MP_DIGIT(b,0);
+        }
+
+#ifndef MPI_AMD64_ADD
+        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
+#else
+        __asm__ (
+                "xorq   %3,%3           \n\t"
+                "subq   %4,%0           \n\t"
+                "sbbq   %5,%1           \n\t"
+                "sbbq   %6,%2           \n\t"
+                "adcq   $0,%3           \n\t"
+                : "=r"(r0), "=r"(r1), "=r"(r2), "=r" (borrow)
+                : "r" (b0), "r" (b1), "r" (b2),
+                  "0" (r0), "1" (r1), "2" (r2)
+                : "%cc" );
+#endif
+
+        /* Do quick 'add' if we've gone under 0
+         * (subtract the 2's complement of the curve field) */
+        if (borrow) {
+                b2 = MP_DIGIT(&meth->irr,2);
+                b1 = MP_DIGIT(&meth->irr,1);
+                b0 = MP_DIGIT(&meth->irr,0);
+#ifndef MPI_AMD64_ADD
+                MP_ADD_CARRY(b0, r0, r0, 0,      borrow);
+                MP_ADD_CARRY(b1, r1, r1, borrow, borrow);
+                MP_ADD_CARRY(b2, r2, r2, borrow, borrow);
+#else
+                __asm__ (
+                        "addq   %3,%0           \n\t"
+                        "adcq   %4,%1           \n\t"
+                        "adcq   %5,%2           \n\t"
+                        : "=r"(r0), "=r"(r1), "=r"(r2)
+                        : "r" (b0), "r" (b1), "r" (b2),
+                          "0" (r0), "1" (r1), "2" (r2)
+                        : "%cc" );
+#endif
+        }
+
+#ifdef MPI_AMD64_ADD
+        /* compiler fakeout? */
+        if ((r2 == b0) && (r1 == b0) && (r0 == b0)) {
+                MP_CHECKOK(s_mp_pad(r, 4));
+        }
+#endif
+        MP_CHECKOK(s_mp_pad(r, 3));
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 3;
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* 4 words */
+mp_err
+ec_GFp_sub_4(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit b0 = 0, b1 = 0, b2 = 0, b3 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0, r3 = 0;
+        mp_digit borrow;
+
+        switch(MP_USED(a)) {
+        case 4:
+                r3 = MP_DIGIT(a,3);
+        case 3:
+                r2 = MP_DIGIT(a,2);
+        case 2:
+                r1 = MP_DIGIT(a,1);
+        case 1:
+                r0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 4:
+                b3 = MP_DIGIT(b,3);
+        case 3:
+                b2 = MP_DIGIT(b,2);
+        case 2:
+                b1 = MP_DIGIT(b,1);
+        case 1:
+                b0 = MP_DIGIT(b,0);
+        }
+
+#ifndef MPI_AMD64_ADD
+        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
+        MP_SUB_BORROW(r3, b3, r3, borrow, borrow);
+#else
+        __asm__ (
+                "xorq   %4,%4           \n\t"
+                "subq   %5,%0           \n\t"
+                "sbbq   %6,%1           \n\t"
+                "sbbq   %7,%2           \n\t"
+                "sbbq   %8,%3           \n\t"
+                "adcq   $0,%4           \n\t"
+                : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3), "=r" (borrow)
+                : "r" (b0), "r" (b1), "r" (b2), "r" (b3),
+                  "0" (r0), "1" (r1), "2" (r2), "3" (r3)
+                : "%cc" );
+#endif
+
+        /* Do quick 'add' if we've gone under 0
+         * (subtract the 2's complement of the curve field) */
+        if (borrow) {
+                b3 = MP_DIGIT(&meth->irr,3);
+                b2 = MP_DIGIT(&meth->irr,2);
+                b1 = MP_DIGIT(&meth->irr,1);
+                b0 = MP_DIGIT(&meth->irr,0);
+#ifndef MPI_AMD64_ADD
+                MP_ADD_CARRY(b0, r0, r0, 0,      borrow);
+                MP_ADD_CARRY(b1, r1, r1, borrow, borrow);
+                MP_ADD_CARRY(b2, r2, r2, borrow, borrow);
+                MP_ADD_CARRY(b3, r3, r3, borrow, borrow);
+#else
+                __asm__ (
+                        "addq   %4,%0           \n\t"
+                        "adcq   %5,%1           \n\t"
+                        "adcq   %6,%2           \n\t"
+                        "adcq   %7,%3           \n\t"
+                        : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3)
+                        : "r" (b0), "r" (b1), "r" (b2), "r" (b3),
+                          "0" (r0), "1" (r1), "2" (r2), "3" (r3)
+                        : "%cc" );
+#endif
+        }
+#ifdef MPI_AMD64_ADD
+        /* compiler fakeout? */
+        if ((r3 == b0) && (r1 == b0) && (r0 == b0)) {
+                MP_CHECKOK(s_mp_pad(r, 4));
+        }
+#endif
+        MP_CHECKOK(s_mp_pad(r, 4));
+        MP_DIGIT(r, 3) = r3;
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 4;
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* 5 words */
+mp_err
+ec_GFp_sub_5(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit b0 = 0, b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0, r3 = 0, r4 = 0;
+        mp_digit borrow;
+
+        switch(MP_USED(a)) {
+        case 5:
+                r4 = MP_DIGIT(a,4);
+        case 4:
+                r3 = MP_DIGIT(a,3);
+        case 3:
+                r2 = MP_DIGIT(a,2);
+        case 2:
+                r1 = MP_DIGIT(a,1);
+        case 1:
+                r0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 5:
+                b4 = MP_DIGIT(b,4);
+        case 4:
+                b3 = MP_DIGIT(b,3);
+        case 3:
+                b2 = MP_DIGIT(b,2);
+        case 2:
+                b1 = MP_DIGIT(b,1);
+        case 1:
+                b0 = MP_DIGIT(b,0);
+        }
+
+        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
+        MP_SUB_BORROW(r3, b3, r3, borrow, borrow);
+        MP_SUB_BORROW(r4, b4, r4, borrow, borrow);
+
+        /* Do quick 'add' if we've gone under 0
+         * (subtract the 2's complement of the curve field) */
+        if (borrow) {
+                b4 = MP_DIGIT(&meth->irr,4);
+                b3 = MP_DIGIT(&meth->irr,3);
+                b2 = MP_DIGIT(&meth->irr,2);
+                b1 = MP_DIGIT(&meth->irr,1);
+                b0 = MP_DIGIT(&meth->irr,0);
+                MP_ADD_CARRY(b0, r0, r0, 0,      borrow);
+                MP_ADD_CARRY(b1, r1, r1, borrow, borrow);
+                MP_ADD_CARRY(b2, r2, r2, borrow, borrow);
+                MP_ADD_CARRY(b3, r3, r3, borrow, borrow);
+        }
+        MP_CHECKOK(s_mp_pad(r, 5));
+        MP_DIGIT(r, 4) = r4;
+        MP_DIGIT(r, 3) = r3;
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 5;
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+/* 6 words */
+mp_err
+ec_GFp_sub_6(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit b0 = 0, b1 = 0, b2 = 0, b3 = 0, b4 = 0, b5 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0, r3 = 0, r4 = 0, r5 = 0;
+        mp_digit borrow;
+
+        switch(MP_USED(a)) {
+        case 6:
+                r5 = MP_DIGIT(a,5);
+        case 5:
+                r4 = MP_DIGIT(a,4);
+        case 4:
+                r3 = MP_DIGIT(a,3);
+        case 3:
+                r2 = MP_DIGIT(a,2);
+        case 2:
+                r1 = MP_DIGIT(a,1);
+        case 1:
+                r0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 6:
+                b5 = MP_DIGIT(b,5);
+        case 5:
+                b4 = MP_DIGIT(b,4);
+        case 4:
+                b3 = MP_DIGIT(b,3);
+        case 3:
+                b2 = MP_DIGIT(b,2);
+        case 2:
+                b1 = MP_DIGIT(b,1);
+        case 1:
+                b0 = MP_DIGIT(b,0);
+        }
+
+        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
+        MP_SUB_BORROW(r3, b3, r3, borrow, borrow);
+        MP_SUB_BORROW(r4, b4, r4, borrow, borrow);
+        MP_SUB_BORROW(r5, b5, r5, borrow, borrow);
+
+        /* Do quick 'add' if we've gone under 0
+         * (subtract the 2's complement of the curve field) */
+        if (borrow) {
+                b5 = MP_DIGIT(&meth->irr,5);
+                b4 = MP_DIGIT(&meth->irr,4);
+                b3 = MP_DIGIT(&meth->irr,3);
+                b2 = MP_DIGIT(&meth->irr,2);
+                b1 = MP_DIGIT(&meth->irr,1);
+                b0 = MP_DIGIT(&meth->irr,0);
+                MP_ADD_CARRY(b0, r0, r0, 0,      borrow);
+                MP_ADD_CARRY(b1, r1, r1, borrow, borrow);
+                MP_ADD_CARRY(b2, r2, r2, borrow, borrow);
+                MP_ADD_CARRY(b3, r3, r3, borrow, borrow);
+                MP_ADD_CARRY(b4, r4, r4, borrow, borrow);
+        }
+
+        MP_CHECKOK(s_mp_pad(r, 6));
+        MP_DIGIT(r, 5) = r5;
+        MP_DIGIT(r, 4) = r4;
+        MP_DIGIT(r, 3) = r3;
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 6;
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+
+/* Reduces an integer to a field element. */
+mp_err
+ec_GFp_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        return mp_mod(a, &meth->irr, r);
+}
+
+/* Multiplies two field elements. */
+mp_err
+ec_GFp_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                   const GFMethod *meth)
+{
+        return mp_mulmod(a, b, &meth->irr, r);
+}
+
+/* Squares a field element. */
+mp_err
+ec_GFp_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        return mp_sqrmod(a, &meth->irr, r);
+}
+
+/* Divides two field elements. If a is NULL, then returns the inverse of
+ * b. */
+mp_err
+ec_GFp_div(const mp_int *a, const mp_int *b, mp_int *r,
+                   const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_int t;
+
+        /* If a is NULL, then return the inverse of b, otherwise return a/b. */
+        if (a == NULL) {
+                return mp_invmod(b, &meth->irr, r);
+        } else {
+                /* MPI doesn't support divmod, so we implement it using invmod and
+                 * mulmod. */
+                MP_CHECKOK(mp_init(&t, FLAG(b)));
+                MP_CHECKOK(mp_invmod(b, &meth->irr, &t));
+                MP_CHECKOK(mp_mulmod(a, &t, &meth->irr, r));
+          CLEANUP:
+                mp_clear(&t);
+                return res;
+        }
+}
+
+/* Wrapper functions for generic binary polynomial field arithmetic. */
+
+/* Adds two field elements. */
+mp_err
+ec_GF2m_add(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        return mp_badd(a, b, r);
+}
+
+/* Negates a field element. Note that for binary polynomial fields, the
+ * negation of a field element is the field element itself. */
+mp_err
+ec_GF2m_neg(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        if (a == r) {
+                return MP_OKAY;
+        } else {
+                return mp_copy(a, r);
+        }
+}
+
+/* Reduces a binary polynomial to a field element. */
+mp_err
+ec_GF2m_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        return mp_bmod(a, meth->irr_arr, r);
+}
+
+/* Multiplies two field elements. */
+mp_err
+ec_GF2m_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        return mp_bmulmod(a, b, meth->irr_arr, r);
+}
+
+/* Squares a field element. */
+mp_err
+ec_GF2m_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        return mp_bsqrmod(a, meth->irr_arr, r);
+}
+
+/* Divides two field elements. If a is NULL, then returns the inverse of
+ * b. */
+mp_err
+ec_GF2m_div(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_int t;
+
+        /* If a is NULL, then return the inverse of b, otherwise return a/b. */
+        if (a == NULL) {
+                /* The GF(2^m) portion of MPI doesn't support invmod, so we
+                 * compute 1/b. */
+                MP_CHECKOK(mp_init(&t, FLAG(b)));
+                MP_CHECKOK(mp_set_int(&t, 1));
+                MP_CHECKOK(mp_bdivmod(&t, b, &meth->irr, meth->irr_arr, r));
+          CLEANUP:
+                mp_clear(&t);
+                return res;
+        } else {
+                return mp_bdivmod(a, b, &meth->irr, meth->irr_arr, r);
+        }
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecl_mult.c b/jdk/src/share/native/sun/security/ec/ecl_mult.c
new file mode 100644
index 00000000000..c5a01fabad3
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecl_mult.c
@@ -0,0 +1,378 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "mpi.h"
+#include "mplogic.h"
+#include "ecl.h"
+#include "ecl-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Elliptic curve scalar-point multiplication. Computes R(x, y) = k * P(x,
+ * y).  If x, y = NULL, then P is assumed to be the generator (base point)
+ * of the group of points on the elliptic curve. Input and output values
+ * are assumed to be NOT field-encoded. */
+mp_err
+ECPoint_mul(const ECGroup *group, const mp_int *k, const mp_int *px,
+                        const mp_int *py, mp_int *rx, mp_int *ry)
+{
+        mp_err res = MP_OKAY;
+        mp_int kt;
+
+        ARGCHK((k != NULL) && (group != NULL), MP_BADARG);
+        MP_DIGITS(&kt) = 0;
+
+        /* want scalar to be less than or equal to group order */
+        if (mp_cmp(k, &group->order) > 0) {
+                MP_CHECKOK(mp_init(&kt, FLAG(k)));
+                MP_CHECKOK(mp_mod(k, &group->order, &kt));
+        } else {
+                MP_SIGN(&kt) = MP_ZPOS;
+                MP_USED(&kt) = MP_USED(k);
+                MP_ALLOC(&kt) = MP_ALLOC(k);
+                MP_DIGITS(&kt) = MP_DIGITS(k);
+        }
+
+        if ((px == NULL) || (py == NULL)) {
+                if (group->base_point_mul) {
+                        MP_CHECKOK(group->base_point_mul(&kt, rx, ry, group));
+                } else {
+                        MP_CHECKOK(group->
+                                           point_mul(&kt, &group->genx, &group->geny, rx, ry,
+                                                                 group));
+                }
+        } else {
+                if (group->meth->field_enc) {
+                        MP_CHECKOK(group->meth->field_enc(px, rx, group->meth));
+                        MP_CHECKOK(group->meth->field_enc(py, ry, group->meth));
+                        MP_CHECKOK(group->point_mul(&kt, rx, ry, rx, ry, group));
+                } else {
+                        MP_CHECKOK(group->point_mul(&kt, px, py, rx, ry, group));
+                }
+        }
+        if (group->meth->field_dec) {
+                MP_CHECKOK(group->meth->field_dec(rx, rx, group->meth));
+                MP_CHECKOK(group->meth->field_dec(ry, ry, group->meth));
+        }
+
+  CLEANUP:
+        if (MP_DIGITS(&kt) != MP_DIGITS(k)) {
+                mp_clear(&kt);
+        }
+        return res;
+}
+
+/* Elliptic curve scalar-point multiplication. Computes R(x, y) = k1 * G +
+ * k2 * P(x, y), where G is the generator (base point) of the group of
+ * points on the elliptic curve. Allows k1 = NULL or { k2, P } = NULL.
+ * Input and output values are assumed to be NOT field-encoded. */
+mp_err
+ec_pts_mul_basic(const mp_int *k1, const mp_int *k2, const mp_int *px,
+                                 const mp_int *py, mp_int *rx, mp_int *ry,
+                                 const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int sx, sy;
+
+        ARGCHK(group != NULL, MP_BADARG);
+        ARGCHK(!((k1 == NULL)
+                         && ((k2 == NULL) || (px == NULL)
+                                 || (py == NULL))), MP_BADARG);
+
+        /* if some arguments are not defined used ECPoint_mul */
+        if (k1 == NULL) {
+                return ECPoint_mul(group, k2, px, py, rx, ry);
+        } else if ((k2 == NULL) || (px == NULL) || (py == NULL)) {
+                return ECPoint_mul(group, k1, NULL, NULL, rx, ry);
+        }
+
+        MP_DIGITS(&sx) = 0;
+        MP_DIGITS(&sy) = 0;
+        MP_CHECKOK(mp_init(&sx, FLAG(k1)));
+        MP_CHECKOK(mp_init(&sy, FLAG(k1)));
+
+        MP_CHECKOK(ECPoint_mul(group, k1, NULL, NULL, &sx, &sy));
+        MP_CHECKOK(ECPoint_mul(group, k2, px, py, rx, ry));
+
+        if (group->meth->field_enc) {
+                MP_CHECKOK(group->meth->field_enc(&sx, &sx, group->meth));
+                MP_CHECKOK(group->meth->field_enc(&sy, &sy, group->meth));
+                MP_CHECKOK(group->meth->field_enc(rx, rx, group->meth));
+                MP_CHECKOK(group->meth->field_enc(ry, ry, group->meth));
+        }
+
+        MP_CHECKOK(group->point_add(&sx, &sy, rx, ry, rx, ry, group));
+
+        if (group->meth->field_dec) {
+                MP_CHECKOK(group->meth->field_dec(rx, rx, group->meth));
+                MP_CHECKOK(group->meth->field_dec(ry, ry, group->meth));
+        }
+
+  CLEANUP:
+        mp_clear(&sx);
+        mp_clear(&sy);
+        return res;
+}
+
+/* Elliptic curve scalar-point multiplication. Computes R(x, y) = k1 * G +
+ * k2 * P(x, y), where G is the generator (base point) of the group of
+ * points on the elliptic curve. Allows k1 = NULL or { k2, P } = NULL.
+ * Input and output values are assumed to be NOT field-encoded. Uses
+ * algorithm 15 (simultaneous multiple point multiplication) from Brown,
+ * Hankerson, Lopez, Menezes. Software Implementation of the NIST
+ * Elliptic Curves over Prime Fields. */
+mp_err
+ec_pts_mul_simul_w2(const mp_int *k1, const mp_int *k2, const mp_int *px,
+                                        const mp_int *py, mp_int *rx, mp_int *ry,
+                                        const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int precomp[4][4][2];
+        const mp_int *a, *b;
+        int i, j;
+        int ai, bi, d;
+
+        ARGCHK(group != NULL, MP_BADARG);
+        ARGCHK(!((k1 == NULL)
+                         && ((k2 == NULL) || (px == NULL)
+                                 || (py == NULL))), MP_BADARG);
+
+        /* if some arguments are not defined used ECPoint_mul */
+        if (k1 == NULL) {
+                return ECPoint_mul(group, k2, px, py, rx, ry);
+        } else if ((k2 == NULL) || (px == NULL) || (py == NULL)) {
+                return ECPoint_mul(group, k1, NULL, NULL, rx, ry);
+        }
+
+        /* initialize precomputation table */
+        for (i = 0; i < 4; i++) {
+                for (j = 0; j < 4; j++) {
+                        MP_DIGITS(&precomp[i][j][0]) = 0;
+                        MP_DIGITS(&precomp[i][j][1]) = 0;
+                }
+        }
+        for (i = 0; i < 4; i++) {
+                for (j = 0; j < 4; j++) {
+                         MP_CHECKOK( mp_init_size(&precomp[i][j][0],
+                                         ECL_MAX_FIELD_SIZE_DIGITS, FLAG(k1)) );
+                         MP_CHECKOK( mp_init_size(&precomp[i][j][1],
+                                         ECL_MAX_FIELD_SIZE_DIGITS, FLAG(k1)) );
+                }
+        }
+
+        /* fill precomputation table */
+        /* assign {k1, k2} = {a, b} such that len(a) >= len(b) */
+        if (mpl_significant_bits(k1) < mpl_significant_bits(k2)) {
+                a = k2;
+                b = k1;
+                if (group->meth->field_enc) {
+                        MP_CHECKOK(group->meth->
+                                           field_enc(px, &precomp[1][0][0], group->meth));
+                        MP_CHECKOK(group->meth->
+                                           field_enc(py, &precomp[1][0][1], group->meth));
+                } else {
+                        MP_CHECKOK(mp_copy(px, &precomp[1][0][0]));
+                        MP_CHECKOK(mp_copy(py, &precomp[1][0][1]));
+                }
+                MP_CHECKOK(mp_copy(&group->genx, &precomp[0][1][0]));
+                MP_CHECKOK(mp_copy(&group->geny, &precomp[0][1][1]));
+        } else {
+                a = k1;
+                b = k2;
+                MP_CHECKOK(mp_copy(&group->genx, &precomp[1][0][0]));
+                MP_CHECKOK(mp_copy(&group->geny, &precomp[1][0][1]));
+                if (group->meth->field_enc) {
+                        MP_CHECKOK(group->meth->
+                                           field_enc(px, &precomp[0][1][0], group->meth));
+                        MP_CHECKOK(group->meth->
+                                           field_enc(py, &precomp[0][1][1], group->meth));
+                } else {
+                        MP_CHECKOK(mp_copy(px, &precomp[0][1][0]));
+                        MP_CHECKOK(mp_copy(py, &precomp[0][1][1]));
+                }
+        }
+        /* precompute [*][0][*] */
+        mp_zero(&precomp[0][0][0]);
+        mp_zero(&precomp[0][0][1]);
+        MP_CHECKOK(group->
+                           point_dbl(&precomp[1][0][0], &precomp[1][0][1],
+                                                 &precomp[2][0][0], &precomp[2][0][1], group));
+        MP_CHECKOK(group->
+                           point_add(&precomp[1][0][0], &precomp[1][0][1],
+                                                 &precomp[2][0][0], &precomp[2][0][1],
+                                                 &precomp[3][0][0], &precomp[3][0][1], group));
+        /* precompute [*][1][*] */
+        for (i = 1; i < 4; i++) {
+                MP_CHECKOK(group->
+                                   point_add(&precomp[0][1][0], &precomp[0][1][1],
+                                                         &precomp[i][0][0], &precomp[i][0][1],
+                                                         &precomp[i][1][0], &precomp[i][1][1], group));
+        }
+        /* precompute [*][2][*] */
+        MP_CHECKOK(group->
+                           point_dbl(&precomp[0][1][0], &precomp[0][1][1],
+                                                 &precomp[0][2][0], &precomp[0][2][1], group));
+        for (i = 1; i < 4; i++) {
+                MP_CHECKOK(group->
+                                   point_add(&precomp[0][2][0], &precomp[0][2][1],
+                                                         &precomp[i][0][0], &precomp[i][0][1],
+                                                         &precomp[i][2][0], &precomp[i][2][1], group));
+        }
+        /* precompute [*][3][*] */
+        MP_CHECKOK(group->
+                           point_add(&precomp[0][1][0], &precomp[0][1][1],
+                                                 &precomp[0][2][0], &precomp[0][2][1],
+                                                 &precomp[0][3][0], &precomp[0][3][1], group));
+        for (i = 1; i < 4; i++) {
+                MP_CHECKOK(group->
+                                   point_add(&precomp[0][3][0], &precomp[0][3][1],
+                                                         &precomp[i][0][0], &precomp[i][0][1],
+                                                         &precomp[i][3][0], &precomp[i][3][1], group));
+        }
+
+        d = (mpl_significant_bits(a) + 1) / 2;
+
+        /* R = inf */
+        mp_zero(rx);
+        mp_zero(ry);
+
+        for (i = d - 1; i >= 0; i--) {
+                ai = MP_GET_BIT(a, 2 * i + 1);
+                ai <<= 1;
+                ai |= MP_GET_BIT(a, 2 * i);
+                bi = MP_GET_BIT(b, 2 * i + 1);
+                bi <<= 1;
+                bi |= MP_GET_BIT(b, 2 * i);
+                /* R = 2^2 * R */
+                MP_CHECKOK(group->point_dbl(rx, ry, rx, ry, group));
+                MP_CHECKOK(group->point_dbl(rx, ry, rx, ry, group));
+                /* R = R + (ai * A + bi * B) */
+                MP_CHECKOK(group->
+                                   point_add(rx, ry, &precomp[ai][bi][0],
+                                                         &precomp[ai][bi][1], rx, ry, group));
+        }
+
+        if (group->meth->field_dec) {
+                MP_CHECKOK(group->meth->field_dec(rx, rx, group->meth));
+                MP_CHECKOK(group->meth->field_dec(ry, ry, group->meth));
+        }
+
+  CLEANUP:
+        for (i = 0; i < 4; i++) {
+                for (j = 0; j < 4; j++) {
+                        mp_clear(&precomp[i][j][0]);
+                        mp_clear(&precomp[i][j][1]);
+                }
+        }
+        return res;
+}
+
+/* Elliptic curve scalar-point multiplication. Computes R(x, y) = k1 * G +
+ * k2 * P(x, y), where G is the generator (base point) of the group of
+ * points on the elliptic curve. Allows k1 = NULL or { k2, P } = NULL.
+ * Input and output values are assumed to be NOT field-encoded. */
+mp_err
+ECPoints_mul(const ECGroup *group, const mp_int *k1, const mp_int *k2,
+                         const mp_int *px, const mp_int *py, mp_int *rx, mp_int *ry)
+{
+        mp_err res = MP_OKAY;
+        mp_int k1t, k2t;
+        const mp_int *k1p, *k2p;
+
+        MP_DIGITS(&k1t) = 0;
+        MP_DIGITS(&k2t) = 0;
+
+        ARGCHK(group != NULL, MP_BADARG);
+
+        /* want scalar to be less than or equal to group order */
+        if (k1 != NULL) {
+                if (mp_cmp(k1, &group->order) >= 0) {
+                        MP_CHECKOK(mp_init(&k1t, FLAG(k1)));
+                        MP_CHECKOK(mp_mod(k1, &group->order, &k1t));
+                        k1p = &k1t;
+                } else {
+                        k1p = k1;
+                }
+        } else {
+                k1p = k1;
+        }
+        if (k2 != NULL) {
+                if (mp_cmp(k2, &group->order) >= 0) {
+                        MP_CHECKOK(mp_init(&k2t, FLAG(k2)));
+                        MP_CHECKOK(mp_mod(k2, &group->order, &k2t));
+                        k2p = &k2t;
+                } else {
+                        k2p = k2;
+                }
+        } else {
+                k2p = k2;
+        }
+
+        /* if points_mul is defined, then use it */
+        if (group->points_mul) {
+                res = group->points_mul(k1p, k2p, px, py, rx, ry, group);
+        } else {
+                res = ec_pts_mul_simul_w2(k1p, k2p, px, py, rx, ry, group);
+        }
+
+  CLEANUP:
+        mp_clear(&k1t);
+        mp_clear(&k2t);
+        return res;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp.h b/jdk/src/share/native/sun/security/ec/ecp.h
new file mode 100644
index 00000000000..5e045ba6320
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp.h
@@ -0,0 +1,160 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _ECP_H
+#define _ECP_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecl-priv.h"
+
+/* Checks if point P(px, py) is at infinity.  Uses affine coordinates. */
+mp_err ec_GFp_pt_is_inf_aff(const mp_int *px, const mp_int *py);
+
+/* Sets P(px, py) to be the point at infinity.  Uses affine coordinates. */
+mp_err ec_GFp_pt_set_inf_aff(mp_int *px, mp_int *py);
+
+/* Computes R = P + Q where R is (rx, ry), P is (px, py) and Q is (qx,
+ * qy). Uses affine coordinates. */
+mp_err ec_GFp_pt_add_aff(const mp_int *px, const mp_int *py,
+                                                 const mp_int *qx, const mp_int *qy, mp_int *rx,
+                                                 mp_int *ry, const ECGroup *group);
+
+/* Computes R = P - Q.  Uses affine coordinates. */
+mp_err ec_GFp_pt_sub_aff(const mp_int *px, const mp_int *py,
+                                                 const mp_int *qx, const mp_int *qy, mp_int *rx,
+                                                 mp_int *ry, const ECGroup *group);
+
+/* Computes R = 2P.  Uses affine coordinates. */
+mp_err ec_GFp_pt_dbl_aff(const mp_int *px, const mp_int *py, mp_int *rx,
+                                                 mp_int *ry, const ECGroup *group);
+
+/* Validates a point on a GFp curve. */
+mp_err ec_GFp_validate_point(const mp_int *px, const mp_int *py, const ECGroup *group);
+
+#ifdef ECL_ENABLE_GFP_PT_MUL_AFF
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the prime that
+ * determines the field GFp.  Uses affine coordinates. */
+mp_err ec_GFp_pt_mul_aff(const mp_int *n, const mp_int *px,
+                                                 const mp_int *py, mp_int *rx, mp_int *ry,
+                                                 const ECGroup *group);
+#endif
+
+/* Converts a point P(px, py) from affine coordinates to Jacobian
+ * projective coordinates R(rx, ry, rz). */
+mp_err ec_GFp_pt_aff2jac(const mp_int *px, const mp_int *py, mp_int *rx,
+                                                 mp_int *ry, mp_int *rz, const ECGroup *group);
+
+/* Converts a point P(px, py, pz) from Jacobian projective coordinates to
+ * affine coordinates R(rx, ry). */
+mp_err ec_GFp_pt_jac2aff(const mp_int *px, const mp_int *py,
+                                                 const mp_int *pz, mp_int *rx, mp_int *ry,
+                                                 const ECGroup *group);
+
+/* Checks if point P(px, py, pz) is at infinity.  Uses Jacobian
+ * coordinates. */
+mp_err ec_GFp_pt_is_inf_jac(const mp_int *px, const mp_int *py,
+                                                        const mp_int *pz);
+
+/* Sets P(px, py, pz) to be the point at infinity.  Uses Jacobian
+ * coordinates. */
+mp_err ec_GFp_pt_set_inf_jac(mp_int *px, mp_int *py, mp_int *pz);
+
+/* Computes R = P + Q where R is (rx, ry, rz), P is (px, py, pz) and Q is
+ * (qx, qy, qz).  Uses Jacobian coordinates. */
+mp_err ec_GFp_pt_add_jac_aff(const mp_int *px, const mp_int *py,
+                                                         const mp_int *pz, const mp_int *qx,
+                                                         const mp_int *qy, mp_int *rx, mp_int *ry,
+                                                         mp_int *rz, const ECGroup *group);
+
+/* Computes R = 2P.  Uses Jacobian coordinates. */
+mp_err ec_GFp_pt_dbl_jac(const mp_int *px, const mp_int *py,
+                                                 const mp_int *pz, mp_int *rx, mp_int *ry,
+                                                 mp_int *rz, const ECGroup *group);
+
+#ifdef ECL_ENABLE_GFP_PT_MUL_JAC
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the prime that
+ * determines the field GFp.  Uses Jacobian coordinates. */
+mp_err ec_GFp_pt_mul_jac(const mp_int *n, const mp_int *px,
+                                                 const mp_int *py, mp_int *rx, mp_int *ry,
+                                                 const ECGroup *group);
+#endif
+
+/* Computes R(x, y) = k1 * G + k2 * P(x, y), where G is the generator
+ * (base point) of the group of points on the elliptic curve. Allows k1 =
+ * NULL or { k2, P } = NULL.  Implemented using mixed Jacobian-affine
+ * coordinates. Input and output values are assumed to be NOT
+ * field-encoded and are in affine form. */
+mp_err
+ ec_GFp_pts_mul_jac(const mp_int *k1, const mp_int *k2, const mp_int *px,
+                                        const mp_int *py, mp_int *rx, mp_int *ry,
+                                        const ECGroup *group);
+
+/* Computes R = nP where R is (rx, ry) and P is the base point. Elliptic
+ * curve points P and R can be identical. Uses mixed Modified-Jacobian
+ * co-ordinates for doubling and Chudnovsky Jacobian coordinates for
+ * additions. Assumes input is already field-encoded using field_enc, and
+ * returns output that is still field-encoded. Uses 5-bit window NAF
+ * method (algorithm 11) for scalar-point multiplication from Brown,
+ * Hankerson, Lopez, Menezes. Software Implementation of the NIST Elliptic
+ * Curves Over Prime Fields. */
+mp_err
+ ec_GFp_pt_mul_jm_wNAF(const mp_int *n, const mp_int *px, const mp_int *py,
+                                           mp_int *rx, mp_int *ry, const ECGroup *group);
+
+#endif /* _ECP_H */
diff --git a/jdk/src/share/native/sun/security/ec/ecp_192.c b/jdk/src/share/native/sun/security/ec/ecp_192.c
new file mode 100644
index 00000000000..f2c62a40e90
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_192.c
@@ -0,0 +1,538 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecp.h"
+#include "mpi.h"
+#include "mplogic.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+#define ECP192_DIGITS ECL_CURVE_DIGITS(192)
+
+/* Fast modular reduction for p192 = 2^192 - 2^64 - 1.  a can be r. Uses
+ * algorithm 7 from Brown, Hankerson, Lopez, Menezes. Software
+ * Implementation of the NIST Elliptic Curves over Prime Fields. */
+mp_err
+ec_GFp_nistp192_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_size a_used = MP_USED(a);
+        mp_digit r3;
+#ifndef MPI_AMD64_ADD
+        mp_digit carry;
+#endif
+#ifdef ECL_THIRTY_TWO_BIT
+        mp_digit a5a = 0, a5b = 0, a4a = 0, a4b = 0, a3a = 0, a3b = 0;
+        mp_digit r0a, r0b, r1a, r1b, r2a, r2b;
+#else
+        mp_digit a5 = 0, a4 = 0, a3 = 0;
+        mp_digit r0, r1, r2;
+#endif
+
+        /* reduction not needed if a is not larger than field size */
+        if (a_used < ECP192_DIGITS) {
+                if (a == r) {
+                        return MP_OKAY;
+                }
+                return mp_copy(a, r);
+        }
+
+        /* for polynomials larger than twice the field size, use regular
+         * reduction */
+        if (a_used > ECP192_DIGITS*2) {
+                MP_CHECKOK(mp_mod(a, &meth->irr, r));
+        } else {
+                /* copy out upper words of a */
+
+#ifdef ECL_THIRTY_TWO_BIT
+
+                /* in all the math below,
+                 * nXb is most signifiant, nXa is least significant */
+                switch (a_used) {
+                case 12:
+                        a5b = MP_DIGIT(a, 11);
+                case 11:
+                        a5a = MP_DIGIT(a, 10);
+                case 10:
+                        a4b = MP_DIGIT(a, 9);
+                case 9:
+                        a4a = MP_DIGIT(a, 8);
+                case 8:
+                        a3b = MP_DIGIT(a, 7);
+                case 7:
+                        a3a = MP_DIGIT(a, 6);
+                }
+
+
+                r2b= MP_DIGIT(a, 5);
+                r2a= MP_DIGIT(a, 4);
+                r1b = MP_DIGIT(a, 3);
+                r1a = MP_DIGIT(a, 2);
+                r0b = MP_DIGIT(a, 1);
+                r0a = MP_DIGIT(a, 0);
+
+                /* implement r = (a2,a1,a0)+(a5,a5,a5)+(a4,a4,0)+(0,a3,a3) */
+                MP_ADD_CARRY(r0a, a3a, r0a, 0,    carry);
+                MP_ADD_CARRY(r0b, a3b, r0b, carry, carry);
+                MP_ADD_CARRY(r1a, a3a, r1a, carry, carry);
+                MP_ADD_CARRY(r1b, a3b, r1b, carry, carry);
+                MP_ADD_CARRY(r2a, a4a, r2a, carry, carry);
+                MP_ADD_CARRY(r2b, a4b, r2b, carry, carry);
+                r3 = carry; carry = 0;
+                MP_ADD_CARRY(r0a, a5a, r0a, 0,     carry);
+                MP_ADD_CARRY(r0b, a5b, r0b, carry, carry);
+                MP_ADD_CARRY(r1a, a5a, r1a, carry, carry);
+                MP_ADD_CARRY(r1b, a5b, r1b, carry, carry);
+                MP_ADD_CARRY(r2a, a5a, r2a, carry, carry);
+                MP_ADD_CARRY(r2b, a5b, r2b, carry, carry);
+                r3 += carry;
+                MP_ADD_CARRY(r1a, a4a, r1a, 0,     carry);
+                MP_ADD_CARRY(r1b, a4b, r1b, carry, carry);
+                MP_ADD_CARRY(r2a,   0, r2a, carry, carry);
+                MP_ADD_CARRY(r2b,   0, r2b, carry, carry);
+                r3 += carry;
+
+                /* reduce out the carry */
+                while (r3) {
+                        MP_ADD_CARRY(r0a, r3, r0a, 0,     carry);
+                        MP_ADD_CARRY(r0b,  0, r0b, carry, carry);
+                        MP_ADD_CARRY(r1a, r3, r1a, carry, carry);
+                        MP_ADD_CARRY(r1b,  0, r1b, carry, carry);
+                        MP_ADD_CARRY(r2a,  0, r2a, carry, carry);
+                        MP_ADD_CARRY(r2b,  0, r2b, carry, carry);
+                        r3 = carry;
+                }
+
+                /* check for final reduction */
+                /*
+                 * our field is 0xffffffffffffffff, 0xfffffffffffffffe,
+                 * 0xffffffffffffffff. That means we can only be over and need
+                 * one more reduction
+                 *  if r2 == 0xffffffffffffffffff (same as r2+1 == 0)
+                 *     and
+                 *     r1 == 0xffffffffffffffffff   or
+                 *     r1 == 0xfffffffffffffffffe and r0 = 0xfffffffffffffffff
+                 * In all cases, we subtract the field (or add the 2's
+                 * complement value (1,1,0)).  (r0, r1, r2)
+                 */
+                if (((r2b == 0xffffffff) && (r2a == 0xffffffff)
+                        && (r1b == 0xffffffff) ) &&
+                           ((r1a == 0xffffffff) ||
+                            (r1a == 0xfffffffe) && (r0a == 0xffffffff) &&
+                                        (r0b == 0xffffffff)) ) {
+                        /* do a quick subtract */
+                        MP_ADD_CARRY(r0a, 1, r0a, 0, carry);
+                        r0b += carry;
+                        r1a = r1b = r2a = r2b = 0;
+                }
+
+                /* set the lower words of r */
+                if (a != r) {
+                        MP_CHECKOK(s_mp_pad(r, 6));
+                }
+                MP_DIGIT(r, 5) = r2b;
+                MP_DIGIT(r, 4) = r2a;
+                MP_DIGIT(r, 3) = r1b;
+                MP_DIGIT(r, 2) = r1a;
+                MP_DIGIT(r, 1) = r0b;
+                MP_DIGIT(r, 0) = r0a;
+                MP_USED(r) = 6;
+#else
+                switch (a_used) {
+                case 6:
+                        a5 = MP_DIGIT(a, 5);
+                case 5:
+                        a4 = MP_DIGIT(a, 4);
+                case 4:
+                        a3 = MP_DIGIT(a, 3);
+                }
+
+                r2 = MP_DIGIT(a, 2);
+                r1 = MP_DIGIT(a, 1);
+                r0 = MP_DIGIT(a, 0);
+
+                /* implement r = (a2,a1,a0)+(a5,a5,a5)+(a4,a4,0)+(0,a3,a3) */
+#ifndef MPI_AMD64_ADD
+                MP_ADD_CARRY(r0, a3, r0, 0,     carry);
+                MP_ADD_CARRY(r1, a3, r1, carry, carry);
+                MP_ADD_CARRY(r2, a4, r2, carry, carry);
+                r3 = carry;
+                MP_ADD_CARRY(r0, a5, r0, 0,     carry);
+                MP_ADD_CARRY(r1, a5, r1, carry, carry);
+                MP_ADD_CARRY(r2, a5, r2, carry, carry);
+                r3 += carry;
+                MP_ADD_CARRY(r1, a4, r1, 0,     carry);
+                MP_ADD_CARRY(r2,  0, r2, carry, carry);
+                r3 += carry;
+
+#else
+                r2 = MP_DIGIT(a, 2);
+                r1 = MP_DIGIT(a, 1);
+                r0 = MP_DIGIT(a, 0);
+
+                /* set the lower words of r */
+                __asm__ (
+                "xorq   %3,%3           \n\t"
+                "addq   %4,%0           \n\t"
+                "adcq   %4,%1           \n\t"
+                "adcq   %5,%2           \n\t"
+                "adcq   $0,%3           \n\t"
+                "addq   %6,%0           \n\t"
+                "adcq   %6,%1           \n\t"
+                "adcq   %6,%2           \n\t"
+                "adcq   $0,%3           \n\t"
+                "addq   %5,%1           \n\t"
+                "adcq   $0,%2           \n\t"
+                "adcq   $0,%3           \n\t"
+                : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3), "=r"(a3),
+                  "=r"(a4), "=r"(a5)
+                : "0" (r0), "1" (r1), "2" (r2), "3" (r3),
+                  "4" (a3), "5" (a4), "6"(a5)
+                : "%cc" );
+#endif
+
+                /* reduce out the carry */
+                while (r3) {
+#ifndef MPI_AMD64_ADD
+                        MP_ADD_CARRY(r0, r3, r0, 0,     carry);
+                        MP_ADD_CARRY(r1, r3, r1, carry, carry);
+                        MP_ADD_CARRY(r2,  0, r2, carry, carry);
+                        r3 = carry;
+#else
+                        a3=r3;
+                        __asm__ (
+                        "xorq   %3,%3           \n\t"
+                        "addq   %4,%0           \n\t"
+                        "adcq   %4,%1           \n\t"
+                        "adcq   $0,%2           \n\t"
+                        "adcq   $0,%3           \n\t"
+                        : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(r3), "=r"(a3)
+                        : "0" (r0), "1" (r1), "2" (r2), "3" (r3), "4"(a3)
+                        : "%cc" );
+#endif
+                }
+
+                /* check for final reduction */
+                /*
+                 * our field is 0xffffffffffffffff, 0xfffffffffffffffe,
+                 * 0xffffffffffffffff. That means we can only be over and need
+                 * one more reduction
+                 *  if r2 == 0xffffffffffffffffff (same as r2+1 == 0)
+                 *     and
+                 *     r1 == 0xffffffffffffffffff   or
+                 *     r1 == 0xfffffffffffffffffe and r0 = 0xfffffffffffffffff
+                 * In all cases, we subtract the field (or add the 2's
+                 * complement value (1,1,0)).  (r0, r1, r2)
+                 */
+                if (r3 || ((r2 == MP_DIGIT_MAX) &&
+                      ((r1 == MP_DIGIT_MAX) ||
+                        ((r1 == (MP_DIGIT_MAX-1)) && (r0 == MP_DIGIT_MAX))))) {
+                        /* do a quick subtract */
+                        r0++;
+                        r1 = r2 = 0;
+                }
+                /* set the lower words of r */
+                if (a != r) {
+                        MP_CHECKOK(s_mp_pad(r, 3));
+                }
+                MP_DIGIT(r, 2) = r2;
+                MP_DIGIT(r, 1) = r1;
+                MP_DIGIT(r, 0) = r0;
+                MP_USED(r) = 3;
+#endif
+        }
+
+  CLEANUP:
+        return res;
+}
+
+#ifndef ECL_THIRTY_TWO_BIT
+/* Compute the sum of 192 bit curves. Do the work in-line since the
+ * number of words are so small, we don't want to overhead of mp function
+ * calls.  Uses optimized modular reduction for p192.
+ */
+mp_err
+ec_GFp_nistp192_add(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit a0 = 0, a1 = 0, a2 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0;
+        mp_digit carry;
+
+        switch(MP_USED(a)) {
+        case 3:
+                a2 = MP_DIGIT(a,2);
+        case 2:
+                a1 = MP_DIGIT(a,1);
+        case 1:
+                a0 = MP_DIGIT(a,0);
+        }
+        switch(MP_USED(b)) {
+        case 3:
+                r2 = MP_DIGIT(b,2);
+        case 2:
+                r1 = MP_DIGIT(b,1);
+        case 1:
+                r0 = MP_DIGIT(b,0);
+        }
+
+#ifndef MPI_AMD64_ADD
+        MP_ADD_CARRY(a0, r0, r0, 0,     carry);
+        MP_ADD_CARRY(a1, r1, r1, carry, carry);
+        MP_ADD_CARRY(a2, r2, r2, carry, carry);
+#else
+        __asm__ (
+                "xorq   %3,%3           \n\t"
+                "addq   %4,%0           \n\t"
+                "adcq   %5,%1           \n\t"
+                "adcq   %6,%2           \n\t"
+                "adcq   $0,%3           \n\t"
+                : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(carry)
+                : "r" (a0), "r" (a1), "r" (a2), "0" (r0),
+                  "1" (r1), "2" (r2)
+                : "%cc" );
+#endif
+
+        /* Do quick 'subract' if we've gone over
+         * (add the 2's complement of the curve field) */
+        if (carry || ((r2 == MP_DIGIT_MAX) &&
+                      ((r1 == MP_DIGIT_MAX) ||
+                        ((r1 == (MP_DIGIT_MAX-1)) && (r0 == MP_DIGIT_MAX))))) {
+#ifndef MPI_AMD64_ADD
+                MP_ADD_CARRY(r0, 1, r0, 0,     carry);
+                MP_ADD_CARRY(r1, 1, r1, carry, carry);
+                MP_ADD_CARRY(r2, 0, r2, carry, carry);
+#else
+                __asm__ (
+                        "addq   $1,%0           \n\t"
+                        "adcq   $1,%1           \n\t"
+                        "adcq   $0,%2           \n\t"
+                        : "=r"(r0), "=r"(r1), "=r"(r2)
+                        : "0" (r0), "1" (r1), "2" (r2)
+                        : "%cc" );
+#endif
+        }
+
+
+        MP_CHECKOK(s_mp_pad(r, 3));
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 3;
+        s_mp_clamp(r);
+
+
+  CLEANUP:
+        return res;
+}
+
+/* Compute the diff of 192 bit curves. Do the work in-line since the
+ * number of words are so small, we don't want to overhead of mp function
+ * calls.  Uses optimized modular reduction for p192.
+ */
+mp_err
+ec_GFp_nistp192_sub(const mp_int *a, const mp_int *b, mp_int *r,
+                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_digit b0 = 0, b1 = 0, b2 = 0;
+        mp_digit r0 = 0, r1 = 0, r2 = 0;
+        mp_digit borrow;
+
+        switch(MP_USED(a)) {
+        case 3:
+                r2 = MP_DIGIT(a,2);
+        case 2:
+                r1 = MP_DIGIT(a,1);
+        case 1:
+                r0 = MP_DIGIT(a,0);
+        }
+
+        switch(MP_USED(b)) {
+        case 3:
+                b2 = MP_DIGIT(b,2);
+        case 2:
+                b1 = MP_DIGIT(b,1);
+        case 1:
+                b0 = MP_DIGIT(b,0);
+        }
+
+#ifndef MPI_AMD64_ADD
+        MP_SUB_BORROW(r0, b0, r0, 0,     borrow);
+        MP_SUB_BORROW(r1, b1, r1, borrow, borrow);
+        MP_SUB_BORROW(r2, b2, r2, borrow, borrow);
+#else
+        __asm__ (
+                "xorq   %3,%3           \n\t"
+                "subq   %4,%0           \n\t"
+                "sbbq   %5,%1           \n\t"
+                "sbbq   %6,%2           \n\t"
+                "adcq   $0,%3           \n\t"
+                : "=r"(r0), "=r"(r1), "=r"(r2), "=r"(borrow)
+                : "r" (b0), "r" (b1), "r" (b2), "0" (r0),
+                  "1" (r1), "2" (r2)
+                : "%cc" );
+#endif
+
+        /* Do quick 'add' if we've gone under 0
+         * (subtract the 2's complement of the curve field) */
+        if (borrow) {
+#ifndef MPI_AMD64_ADD
+                MP_SUB_BORROW(r0, 1, r0, 0,     borrow);
+                MP_SUB_BORROW(r1, 1, r1, borrow, borrow);
+                MP_SUB_BORROW(r2,  0, r2, borrow, borrow);
+#else
+                __asm__ (
+                        "subq   $1,%0           \n\t"
+                        "sbbq   $1,%1           \n\t"
+                        "sbbq   $0,%2           \n\t"
+                        : "=r"(r0), "=r"(r1), "=r"(r2)
+                        : "0" (r0), "1" (r1), "2" (r2)
+                        : "%cc" );
+#endif
+        }
+
+        MP_CHECKOK(s_mp_pad(r, 3));
+        MP_DIGIT(r, 2) = r2;
+        MP_DIGIT(r, 1) = r1;
+        MP_DIGIT(r, 0) = r0;
+        MP_SIGN(r) = MP_ZPOS;
+        MP_USED(r) = 3;
+        s_mp_clamp(r);
+
+  CLEANUP:
+        return res;
+}
+
+#endif
+
+/* Compute the square of polynomial a, reduce modulo p192. Store the
+ * result in r.  r could be a.  Uses optimized modular reduction for p192.
+ */
+mp_err
+ec_GFp_nistp192_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_sqr(a, r));
+        MP_CHECKOK(ec_GFp_nistp192_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Compute the product of two polynomials a and b, reduce modulo p192.
+ * Store the result in r.  r could be a or b; a could be b.  Uses
+ * optimized modular reduction for p192. */
+mp_err
+ec_GFp_nistp192_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_mul(a, b, r));
+        MP_CHECKOK(ec_GFp_nistp192_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Divides two field elements. If a is NULL, then returns the inverse of
+ * b. */
+mp_err
+ec_GFp_nistp192_div(const mp_int *a, const mp_int *b, mp_int *r,
+                   const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_int t;
+
+        /* If a is NULL, then return the inverse of b, otherwise return a/b. */
+        if (a == NULL) {
+                return  mp_invmod(b, &meth->irr, r);
+        } else {
+                /* MPI doesn't support divmod, so we implement it using invmod and
+                 * mulmod. */
+                MP_CHECKOK(mp_init(&t, FLAG(b)));
+                MP_CHECKOK(mp_invmod(b, &meth->irr, &t));
+                MP_CHECKOK(mp_mul(a, &t, r));
+                MP_CHECKOK(ec_GFp_nistp192_mod(r, r, meth));
+          CLEANUP:
+                mp_clear(&t);
+                return res;
+        }
+}
+
+/* Wire in fast field arithmetic and precomputation of base point for
+ * named curves. */
+mp_err
+ec_group_set_gfp192(ECGroup *group, ECCurveName name)
+{
+        if (name == ECCurve_NIST_P192) {
+                group->meth->field_mod = &ec_GFp_nistp192_mod;
+                group->meth->field_mul = &ec_GFp_nistp192_mul;
+                group->meth->field_sqr = &ec_GFp_nistp192_sqr;
+                group->meth->field_div = &ec_GFp_nistp192_div;
+#ifndef ECL_THIRTY_TWO_BIT
+                group->meth->field_add = &ec_GFp_nistp192_add;
+                group->meth->field_sub = &ec_GFp_nistp192_sub;
+#endif
+        }
+        return MP_OKAY;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp_224.c b/jdk/src/share/native/sun/security/ec/ecp_224.c
new file mode 100644
index 00000000000..1ea82fd78d7
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_224.c
@@ -0,0 +1,394 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecp.h"
+#include "mpi.h"
+#include "mplogic.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+#define ECP224_DIGITS ECL_CURVE_DIGITS(224)
+
+/* Fast modular reduction for p224 = 2^224 - 2^96 + 1.  a can be r. Uses
+ * algorithm 7 from Brown, Hankerson, Lopez, Menezes. Software
+ * Implementation of the NIST Elliptic Curves over Prime Fields. */
+mp_err
+ec_GFp_nistp224_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_size a_used = MP_USED(a);
+
+        int    r3b;
+        mp_digit carry;
+#ifdef ECL_THIRTY_TWO_BIT
+        mp_digit a6a = 0, a6b = 0,
+                a5a = 0, a5b = 0, a4a = 0, a4b = 0, a3a = 0, a3b = 0;
+        mp_digit r0a, r0b, r1a, r1b, r2a, r2b, r3a;
+#else
+        mp_digit a6 = 0, a5 = 0, a4 = 0, a3b = 0, a5a = 0;
+        mp_digit a6b = 0, a6a_a5b = 0, a5b = 0, a5a_a4b = 0, a4a_a3b = 0;
+        mp_digit r0, r1, r2, r3;
+#endif
+
+        /* reduction not needed if a is not larger than field size */
+        if (a_used < ECP224_DIGITS) {
+                if (a == r) return MP_OKAY;
+                return mp_copy(a, r);
+        }
+        /* for polynomials larger than twice the field size, use regular
+         * reduction */
+        if (a_used > ECL_CURVE_DIGITS(224*2)) {
+                MP_CHECKOK(mp_mod(a, &meth->irr, r));
+        } else {
+#ifdef ECL_THIRTY_TWO_BIT
+                /* copy out upper words of a */
+                switch (a_used) {
+                case 14:
+                        a6b = MP_DIGIT(a, 13);
+                case 13:
+                        a6a = MP_DIGIT(a, 12);
+                case 12:
+                        a5b = MP_DIGIT(a, 11);
+                case 11:
+                        a5a = MP_DIGIT(a, 10);
+                case 10:
+                        a4b = MP_DIGIT(a, 9);
+                case 9:
+                        a4a = MP_DIGIT(a, 8);
+                case 8:
+                        a3b = MP_DIGIT(a, 7);
+                }
+                r3a = MP_DIGIT(a, 6);
+                r2b= MP_DIGIT(a, 5);
+                r2a= MP_DIGIT(a, 4);
+                r1b = MP_DIGIT(a, 3);
+                r1a = MP_DIGIT(a, 2);
+                r0b = MP_DIGIT(a, 1);
+                r0a = MP_DIGIT(a, 0);
+
+
+                /* implement r = (a3a,a2,a1,a0)
+                        +(a5a, a4,a3b,  0)
+                        +(  0, a6,a5b,  0)
+                        -(  0    0,    0|a6b, a6a|a5b )
+                        -(  a6b, a6a|a5b, a5a|a4b, a4a|a3b ) */
+                MP_ADD_CARRY (r1b, a3b, r1b, 0,     carry);
+                MP_ADD_CARRY (r2a, a4a, r2a, carry, carry);
+                MP_ADD_CARRY (r2b, a4b, r2b, carry, carry);
+                MP_ADD_CARRY (r3a, a5a, r3a, carry, carry);
+                r3b = carry;
+                MP_ADD_CARRY (r1b, a5b, r1b, 0,     carry);
+                MP_ADD_CARRY (r2a, a6a, r2a, carry, carry);
+                MP_ADD_CARRY (r2b, a6b, r2b, carry, carry);
+                MP_ADD_CARRY (r3a,   0, r3a, carry, carry);
+                r3b += carry;
+                MP_SUB_BORROW(r0a, a3b, r0a, 0,     carry);
+                MP_SUB_BORROW(r0b, a4a, r0b, carry, carry);
+                MP_SUB_BORROW(r1a, a4b, r1a, carry, carry);
+                MP_SUB_BORROW(r1b, a5a, r1b, carry, carry);
+                MP_SUB_BORROW(r2a, a5b, r2a, carry, carry);
+                MP_SUB_BORROW(r2b, a6a, r2b, carry, carry);
+                MP_SUB_BORROW(r3a, a6b, r3a, carry, carry);
+                r3b -= carry;
+                MP_SUB_BORROW(r0a, a5b, r0a, 0,     carry);
+                MP_SUB_BORROW(r0b, a6a, r0b, carry, carry);
+                MP_SUB_BORROW(r1a, a6b, r1a, carry, carry);
+                if (carry) {
+                        MP_SUB_BORROW(r1b, 0, r1b, carry, carry);
+                        MP_SUB_BORROW(r2a, 0, r2a, carry, carry);
+                        MP_SUB_BORROW(r2b, 0, r2b, carry, carry);
+                        MP_SUB_BORROW(r3a, 0, r3a, carry, carry);
+                        r3b -= carry;
+                }
+
+                while (r3b > 0) {
+                        int tmp;
+                        MP_ADD_CARRY(r1b, r3b, r1b, 0,     carry);
+                        if (carry) {
+                                MP_ADD_CARRY(r2a,  0, r2a, carry, carry);
+                                MP_ADD_CARRY(r2b,  0, r2b, carry, carry);
+                                MP_ADD_CARRY(r3a,  0, r3a, carry, carry);
+                        }
+                        tmp = carry;
+                        MP_SUB_BORROW(r0a, r3b, r0a, 0,     carry);
+                        if (carry) {
+                                MP_SUB_BORROW(r0b, 0, r0b, carry, carry);
+                                MP_SUB_BORROW(r1a, 0, r1a, carry, carry);
+                                MP_SUB_BORROW(r1b, 0, r1b, carry, carry);
+                                MP_SUB_BORROW(r2a, 0, r2a, carry, carry);
+                                MP_SUB_BORROW(r2b, 0, r2b, carry, carry);
+                                MP_SUB_BORROW(r3a, 0, r3a, carry, carry);
+                                tmp -= carry;
+                        }
+                        r3b = tmp;
+                }
+
+                while (r3b < 0) {
+                        mp_digit maxInt = MP_DIGIT_MAX;
+                        MP_ADD_CARRY (r0a, 1, r0a, 0,     carry);
+                        MP_ADD_CARRY (r0b, 0, r0b, carry, carry);
+                        MP_ADD_CARRY (r1a, 0, r1a, carry, carry);
+                        MP_ADD_CARRY (r1b, maxInt, r1b, carry, carry);
+                        MP_ADD_CARRY (r2a, maxInt, r2a, carry, carry);
+                        MP_ADD_CARRY (r2b, maxInt, r2b, carry, carry);
+                        MP_ADD_CARRY (r3a, maxInt, r3a, carry, carry);
+                        r3b += carry;
+                }
+                /* check for final reduction */
+                /* now the only way we are over is if the top 4 words are all ones */
+                if ((r3a == MP_DIGIT_MAX) && (r2b == MP_DIGIT_MAX)
+                        && (r2a == MP_DIGIT_MAX) && (r1b == MP_DIGIT_MAX) &&
+                         ((r1a != 0) || (r0b != 0) || (r0a != 0)) ) {
+                        /* one last subraction */
+                        MP_SUB_BORROW(r0a, 1, r0a, 0,     carry);
+                        MP_SUB_BORROW(r0b, 0, r0b, carry, carry);
+                        MP_SUB_BORROW(r1a, 0, r1a, carry, carry);
+                        r1b = r2a = r2b = r3a = 0;
+                }
+
+
+                if (a != r) {
+                        MP_CHECKOK(s_mp_pad(r, 7));
+                }
+                /* set the lower words of r */
+                MP_SIGN(r) = MP_ZPOS;
+                MP_USED(r) = 7;
+                MP_DIGIT(r, 6) = r3a;
+                MP_DIGIT(r, 5) = r2b;
+                MP_DIGIT(r, 4) = r2a;
+                MP_DIGIT(r, 3) = r1b;
+                MP_DIGIT(r, 2) = r1a;
+                MP_DIGIT(r, 1) = r0b;
+                MP_DIGIT(r, 0) = r0a;
+#else
+                /* copy out upper words of a */
+                switch (a_used) {
+                case 7:
+                        a6 = MP_DIGIT(a, 6);
+                        a6b = a6 >> 32;
+                        a6a_a5b = a6 << 32;
+                case 6:
+                        a5 = MP_DIGIT(a, 5);
+                        a5b = a5 >> 32;
+                        a6a_a5b |= a5b;
+                        a5b = a5b << 32;
+                        a5a_a4b = a5 << 32;
+                        a5a = a5 & 0xffffffff;
+                case 5:
+                        a4 = MP_DIGIT(a, 4);
+                        a5a_a4b |= a4 >> 32;
+                        a4a_a3b = a4 << 32;
+                case 4:
+                        a3b = MP_DIGIT(a, 3) >> 32;
+                        a4a_a3b |= a3b;
+                        a3b = a3b << 32;
+                }
+
+                r3 = MP_DIGIT(a, 3) & 0xffffffff;
+                r2 = MP_DIGIT(a, 2);
+                r1 = MP_DIGIT(a, 1);
+                r0 = MP_DIGIT(a, 0);
+
+                /* implement r = (a3a,a2,a1,a0)
+                        +(a5a, a4,a3b,  0)
+                        +(  0, a6,a5b,  0)
+                        -(  0    0,    0|a6b, a6a|a5b )
+                        -(  a6b, a6a|a5b, a5a|a4b, a4a|a3b ) */
+                MP_ADD_CARRY (r1, a3b, r1, 0,     carry);
+                MP_ADD_CARRY (r2, a4 , r2, carry, carry);
+                MP_ADD_CARRY (r3, a5a, r3, carry, carry);
+                MP_ADD_CARRY (r1, a5b, r1, 0,     carry);
+                MP_ADD_CARRY (r2, a6 , r2, carry, carry);
+                MP_ADD_CARRY (r3,   0, r3, carry, carry);
+
+                MP_SUB_BORROW(r0, a4a_a3b, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a5a_a4b, r1, carry, carry);
+                MP_SUB_BORROW(r2, a6a_a5b, r2, carry, carry);
+                MP_SUB_BORROW(r3, a6b    , r3, carry, carry);
+                MP_SUB_BORROW(r0, a6a_a5b, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a6b    , r1, carry, carry);
+                if (carry) {
+                        MP_SUB_BORROW(r2, 0, r2, carry, carry);
+                        MP_SUB_BORROW(r3, 0, r3, carry, carry);
+                }
+
+
+                /* if the value is negative, r3 has a 2's complement
+                 * high value */
+                r3b = (int)(r3 >>32);
+                while (r3b > 0) {
+                        r3 &= 0xffffffff;
+                        MP_ADD_CARRY(r1,((mp_digit)r3b) << 32, r1, 0, carry);
+                        if (carry) {
+                                MP_ADD_CARRY(r2,  0, r2, carry, carry);
+                                MP_ADD_CARRY(r3,  0, r3, carry, carry);
+                        }
+                        MP_SUB_BORROW(r0, r3b, r0, 0, carry);
+                        if (carry) {
+                                MP_SUB_BORROW(r1, 0, r1, carry, carry);
+                                MP_SUB_BORROW(r2, 0, r2, carry, carry);
+                                MP_SUB_BORROW(r3, 0, r3, carry, carry);
+                        }
+                        r3b = (int)(r3 >>32);
+                }
+
+                while (r3b < 0) {
+                        MP_ADD_CARRY (r0, 1, r0, 0,     carry);
+                        MP_ADD_CARRY (r1, MP_DIGIT_MAX <<32, r1, carry, carry);
+                        MP_ADD_CARRY (r2, MP_DIGIT_MAX, r2, carry, carry);
+                        MP_ADD_CARRY (r3, MP_DIGIT_MAX >> 32, r3, carry, carry);
+                        r3b = (int)(r3 >>32);
+                }
+                /* check for final reduction */
+                /* now the only way we are over is if the top 4 words are all ones */
+                if ((r3 == (MP_DIGIT_MAX >> 32)) && (r2 == MP_DIGIT_MAX)
+                        && ((r1 & MP_DIGIT_MAX << 32)== MP_DIGIT_MAX << 32) &&
+                         ((r1 != MP_DIGIT_MAX << 32 ) || (r0 != 0)) ) {
+                        /* one last subraction */
+                        MP_SUB_BORROW(r0, 1, r0, 0,     carry);
+                        MP_SUB_BORROW(r1, 0, r1, carry, carry);
+                        r2 = r3 = 0;
+                }
+
+
+                if (a != r) {
+                        MP_CHECKOK(s_mp_pad(r, 4));
+                }
+                /* set the lower words of r */
+                MP_SIGN(r) = MP_ZPOS;
+                MP_USED(r) = 4;
+                MP_DIGIT(r, 3) = r3;
+                MP_DIGIT(r, 2) = r2;
+                MP_DIGIT(r, 1) = r1;
+                MP_DIGIT(r, 0) = r0;
+#endif
+        }
+
+  CLEANUP:
+        return res;
+}
+
+/* Compute the square of polynomial a, reduce modulo p224. Store the
+ * result in r.  r could be a.  Uses optimized modular reduction for p224.
+ */
+mp_err
+ec_GFp_nistp224_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_sqr(a, r));
+        MP_CHECKOK(ec_GFp_nistp224_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Compute the product of two polynomials a and b, reduce modulo p224.
+ * Store the result in r.  r could be a or b; a could be b.  Uses
+ * optimized modular reduction for p224. */
+mp_err
+ec_GFp_nistp224_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_mul(a, b, r));
+        MP_CHECKOK(ec_GFp_nistp224_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Divides two field elements. If a is NULL, then returns the inverse of
+ * b. */
+mp_err
+ec_GFp_nistp224_div(const mp_int *a, const mp_int *b, mp_int *r,
+                   const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_int t;
+
+        /* If a is NULL, then return the inverse of b, otherwise return a/b. */
+        if (a == NULL) {
+                return  mp_invmod(b, &meth->irr, r);
+        } else {
+                /* MPI doesn't support divmod, so we implement it using invmod and
+                 * mulmod. */
+                MP_CHECKOK(mp_init(&t, FLAG(b)));
+                MP_CHECKOK(mp_invmod(b, &meth->irr, &t));
+                MP_CHECKOK(mp_mul(a, &t, r));
+                MP_CHECKOK(ec_GFp_nistp224_mod(r, r, meth));
+          CLEANUP:
+                mp_clear(&t);
+                return res;
+        }
+}
+
+/* Wire in fast field arithmetic and precomputation of base point for
+ * named curves. */
+mp_err
+ec_group_set_gfp224(ECGroup *group, ECCurveName name)
+{
+        if (name == ECCurve_NIST_P224) {
+                group->meth->field_mod = &ec_GFp_nistp224_mod;
+                group->meth->field_mul = &ec_GFp_nistp224_mul;
+                group->meth->field_sqr = &ec_GFp_nistp224_sqr;
+                group->meth->field_div = &ec_GFp_nistp224_div;
+        }
+        return MP_OKAY;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp_256.c b/jdk/src/share/native/sun/security/ec/ecp_256.c
new file mode 100644
index 00000000000..6f4de5be0ee
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_256.c
@@ -0,0 +1,451 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecp.h"
+#include "mpi.h"
+#include "mplogic.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Fast modular reduction for p256 = 2^256 - 2^224 + 2^192+ 2^96 - 1.  a can be r.
+ * Uses algorithm 2.29 from Hankerson, Menezes, Vanstone. Guide to
+ * Elliptic Curve Cryptography. */
+mp_err
+ec_GFp_nistp256_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_size a_used = MP_USED(a);
+        int a_bits = mpl_significant_bits(a);
+        mp_digit carry;
+
+#ifdef ECL_THIRTY_TWO_BIT
+        mp_digit a8=0, a9=0, a10=0, a11=0, a12=0, a13=0, a14=0, a15=0;
+        mp_digit r0, r1, r2, r3, r4, r5, r6, r7;
+        int r8; /* must be a signed value ! */
+#else
+        mp_digit a4=0, a5=0, a6=0, a7=0;
+        mp_digit a4h, a4l, a5h, a5l, a6h, a6l, a7h, a7l;
+        mp_digit r0, r1, r2, r3;
+        int r4; /* must be a signed value ! */
+#endif
+        /* for polynomials larger than twice the field size
+         * use regular reduction */
+        if (a_bits < 256) {
+                if (a == r) return MP_OKAY;
+                return mp_copy(a,r);
+        }
+        if (a_bits > 512)  {
+                MP_CHECKOK(mp_mod(a, &meth->irr, r));
+        } else {
+
+#ifdef ECL_THIRTY_TWO_BIT
+                switch (a_used) {
+                case 16:
+                        a15 = MP_DIGIT(a,15);
+                case 15:
+                        a14 = MP_DIGIT(a,14);
+                case 14:
+                        a13 = MP_DIGIT(a,13);
+                case 13:
+                        a12 = MP_DIGIT(a,12);
+                case 12:
+                        a11 = MP_DIGIT(a,11);
+                case 11:
+                        a10 = MP_DIGIT(a,10);
+                case 10:
+                        a9 = MP_DIGIT(a,9);
+                case 9:
+                        a8 = MP_DIGIT(a,8);
+                }
+
+                r0 = MP_DIGIT(a,0);
+                r1 = MP_DIGIT(a,1);
+                r2 = MP_DIGIT(a,2);
+                r3 = MP_DIGIT(a,3);
+                r4 = MP_DIGIT(a,4);
+                r5 = MP_DIGIT(a,5);
+                r6 = MP_DIGIT(a,6);
+                r7 = MP_DIGIT(a,7);
+
+                /* sum 1 */
+                MP_ADD_CARRY(r3, a11, r3, 0,     carry);
+                MP_ADD_CARRY(r4, a12, r4, carry, carry);
+                MP_ADD_CARRY(r5, a13, r5, carry, carry);
+                MP_ADD_CARRY(r6, a14, r6, carry, carry);
+                MP_ADD_CARRY(r7, a15, r7, carry, carry);
+                r8 = carry;
+                MP_ADD_CARRY(r3, a11, r3, 0,     carry);
+                MP_ADD_CARRY(r4, a12, r4, carry, carry);
+                MP_ADD_CARRY(r5, a13, r5, carry, carry);
+                MP_ADD_CARRY(r6, a14, r6, carry, carry);
+                MP_ADD_CARRY(r7, a15, r7, carry, carry);
+                r8 += carry;
+                /* sum 2 */
+                MP_ADD_CARRY(r3, a12, r3, 0,     carry);
+                MP_ADD_CARRY(r4, a13, r4, carry, carry);
+                MP_ADD_CARRY(r5, a14, r5, carry, carry);
+                MP_ADD_CARRY(r6, a15, r6, carry, carry);
+                MP_ADD_CARRY(r7,   0, r7, carry, carry);
+                r8 += carry;
+                /* combine last bottom of sum 3 with second sum 2 */
+                MP_ADD_CARRY(r0, a8,  r0, 0,     carry);
+                MP_ADD_CARRY(r1, a9,  r1, carry, carry);
+                MP_ADD_CARRY(r2, a10, r2, carry, carry);
+                MP_ADD_CARRY(r3, a12, r3, carry, carry);
+                MP_ADD_CARRY(r4, a13, r4, carry, carry);
+                MP_ADD_CARRY(r5, a14, r5, carry, carry);
+                MP_ADD_CARRY(r6, a15, r6, carry, carry);
+                MP_ADD_CARRY(r7, a15, r7, carry, carry); /* from sum 3 */
+                r8 += carry;
+                /* sum 3 (rest of it)*/
+                MP_ADD_CARRY(r6, a14, r6, 0,     carry);
+                MP_ADD_CARRY(r7,   0, r7, carry, carry);
+                r8 += carry;
+                /* sum 4 (rest of it)*/
+                MP_ADD_CARRY(r0, a9,  r0, 0,     carry);
+                MP_ADD_CARRY(r1, a10, r1, carry, carry);
+                MP_ADD_CARRY(r2, a11, r2, carry, carry);
+                MP_ADD_CARRY(r3, a13, r3, carry, carry);
+                MP_ADD_CARRY(r4, a14, r4, carry, carry);
+                MP_ADD_CARRY(r5, a15, r5, carry, carry);
+                MP_ADD_CARRY(r6, a13, r6, carry, carry);
+                MP_ADD_CARRY(r7, a8,  r7, carry, carry);
+                r8 += carry;
+                /* diff 5 */
+                MP_SUB_BORROW(r0, a11, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a12, r1, carry, carry);
+                MP_SUB_BORROW(r2, a13, r2, carry, carry);
+                MP_SUB_BORROW(r3,   0, r3, carry, carry);
+                MP_SUB_BORROW(r4,   0, r4, carry, carry);
+                MP_SUB_BORROW(r5,   0, r5, carry, carry);
+                MP_SUB_BORROW(r6, a8,  r6, carry, carry);
+                MP_SUB_BORROW(r7, a10, r7, carry, carry);
+                r8 -= carry;
+                /* diff 6 */
+                MP_SUB_BORROW(r0, a12, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a13, r1, carry, carry);
+                MP_SUB_BORROW(r2, a14, r2, carry, carry);
+                MP_SUB_BORROW(r3, a15, r3, carry, carry);
+                MP_SUB_BORROW(r4,   0, r4, carry, carry);
+                MP_SUB_BORROW(r5,   0, r5, carry, carry);
+                MP_SUB_BORROW(r6, a9,  r6, carry, carry);
+                MP_SUB_BORROW(r7, a11, r7, carry, carry);
+                r8 -= carry;
+                /* diff 7 */
+                MP_SUB_BORROW(r0, a13, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a14, r1, carry, carry);
+                MP_SUB_BORROW(r2, a15, r2, carry, carry);
+                MP_SUB_BORROW(r3, a8,  r3, carry, carry);
+                MP_SUB_BORROW(r4, a9,  r4, carry, carry);
+                MP_SUB_BORROW(r5, a10, r5, carry, carry);
+                MP_SUB_BORROW(r6, 0,   r6, carry, carry);
+                MP_SUB_BORROW(r7, a12, r7, carry, carry);
+                r8 -= carry;
+                /* diff 8 */
+                MP_SUB_BORROW(r0, a14, r0, 0,     carry);
+                MP_SUB_BORROW(r1, a15, r1, carry, carry);
+                MP_SUB_BORROW(r2, 0,   r2, carry, carry);
+                MP_SUB_BORROW(r3, a9,  r3, carry, carry);
+                MP_SUB_BORROW(r4, a10, r4, carry, carry);
+                MP_SUB_BORROW(r5, a11, r5, carry, carry);
+                MP_SUB_BORROW(r6, 0,   r6, carry, carry);
+                MP_SUB_BORROW(r7, a13, r7, carry, carry);
+                r8 -= carry;
+
+                /* reduce the overflows */
+                while (r8 > 0) {
+                        mp_digit r8_d = r8;
+                        MP_ADD_CARRY(r0, r8_d,         r0, 0,     carry);
+                        MP_ADD_CARRY(r1, 0,            r1, carry, carry);
+                        MP_ADD_CARRY(r2, 0,            r2, carry, carry);
+                        MP_ADD_CARRY(r3, -r8_d,        r3, carry, carry);
+                        MP_ADD_CARRY(r4, MP_DIGIT_MAX, r4, carry, carry);
+                        MP_ADD_CARRY(r5, MP_DIGIT_MAX, r5, carry, carry);
+                        MP_ADD_CARRY(r6, -(r8_d+1),    r6, carry, carry);
+                        MP_ADD_CARRY(r7, (r8_d-1),     r7, carry, carry);
+                        r8 = carry;
+                }
+
+                /* reduce the underflows */
+                while (r8 < 0) {
+                        mp_digit r8_d = -r8;
+                        MP_SUB_BORROW(r0, r8_d,         r0, 0,     carry);
+                        MP_SUB_BORROW(r1, 0,            r1, carry, carry);
+                        MP_SUB_BORROW(r2, 0,            r2, carry, carry);
+                        MP_SUB_BORROW(r3, -r8_d,        r3, carry, carry);
+                        MP_SUB_BORROW(r4, MP_DIGIT_MAX, r4, carry, carry);
+                        MP_SUB_BORROW(r5, MP_DIGIT_MAX, r5, carry, carry);
+                        MP_SUB_BORROW(r6, -(r8_d+1),    r6, carry, carry);
+                        MP_SUB_BORROW(r7, (r8_d-1),     r7, carry, carry);
+                        r8 = -carry;
+                }
+                if (a != r) {
+                        MP_CHECKOK(s_mp_pad(r,8));
+                }
+                MP_SIGN(r) = MP_ZPOS;
+                MP_USED(r) = 8;
+
+                MP_DIGIT(r,7) = r7;
+                MP_DIGIT(r,6) = r6;
+                MP_DIGIT(r,5) = r5;
+                MP_DIGIT(r,4) = r4;
+                MP_DIGIT(r,3) = r3;
+                MP_DIGIT(r,2) = r2;
+                MP_DIGIT(r,1) = r1;
+                MP_DIGIT(r,0) = r0;
+
+                /* final reduction if necessary */
+                if ((r7 == MP_DIGIT_MAX) &&
+                        ((r6 > 1) || ((r6 == 1) &&
+                        (r5 || r4 || r3 ||
+                                ((r2 == MP_DIGIT_MAX) && (r1 == MP_DIGIT_MAX)
+                                  && (r0 == MP_DIGIT_MAX)))))) {
+                        MP_CHECKOK(mp_sub(r, &meth->irr, r));
+                }
+#ifdef notdef
+
+
+                /* smooth the negatives */
+                while (MP_SIGN(r) != MP_ZPOS) {
+                        MP_CHECKOK(mp_add(r, &meth->irr, r));
+                }
+                while (MP_USED(r) > 8) {
+                        MP_CHECKOK(mp_sub(r, &meth->irr, r));
+                }
+
+                /* final reduction if necessary */
+                if (MP_DIGIT(r,7) >= MP_DIGIT(&meth->irr,7)) {
+                    if (mp_cmp(r,&meth->irr) != MP_LT) {
+                        MP_CHECKOK(mp_sub(r, &meth->irr, r));
+                    }
+                }
+#endif
+                s_mp_clamp(r);
+#else
+                switch (a_used) {
+                case 8:
+                        a7 = MP_DIGIT(a,7);
+                case 7:
+                        a6 = MP_DIGIT(a,6);
+                case 6:
+                        a5 = MP_DIGIT(a,5);
+                case 5:
+                        a4 = MP_DIGIT(a,4);
+                }
+                a7l = a7 << 32;
+                a7h = a7 >> 32;
+                a6l = a6 << 32;
+                a6h = a6 >> 32;
+                a5l = a5 << 32;
+                a5h = a5 >> 32;
+                a4l = a4 << 32;
+                a4h = a4 >> 32;
+                r3 = MP_DIGIT(a,3);
+                r2 = MP_DIGIT(a,2);
+                r1 = MP_DIGIT(a,1);
+                r0 = MP_DIGIT(a,0);
+
+                /* sum 1 */
+                MP_ADD_CARRY(r1, a5h << 32, r1, 0,     carry);
+                MP_ADD_CARRY(r2, a6,        r2, carry, carry);
+                MP_ADD_CARRY(r3, a7,        r3, carry, carry);
+                r4 = carry;
+                MP_ADD_CARRY(r1, a5h << 32, r1, 0,     carry);
+                MP_ADD_CARRY(r2, a6,        r2, carry, carry);
+                MP_ADD_CARRY(r3, a7,        r3, carry, carry);
+                r4 += carry;
+                /* sum 2 */
+                MP_ADD_CARRY(r1, a6l,       r1, 0,     carry);
+                MP_ADD_CARRY(r2, a6h | a7l, r2, carry, carry);
+                MP_ADD_CARRY(r3, a7h,       r3, carry, carry);
+                r4 += carry;
+                MP_ADD_CARRY(r1, a6l,       r1, 0,     carry);
+                MP_ADD_CARRY(r2, a6h | a7l, r2, carry, carry);
+                MP_ADD_CARRY(r3, a7h,       r3, carry, carry);
+                r4 += carry;
+
+                /* sum 3 */
+                MP_ADD_CARRY(r0, a4,        r0, 0,     carry);
+                MP_ADD_CARRY(r1, a5l >> 32, r1, carry, carry);
+                MP_ADD_CARRY(r2, 0,         r2, carry, carry);
+                MP_ADD_CARRY(r3, a7,        r3, carry, carry);
+                r4 += carry;
+                /* sum 4 */
+                MP_ADD_CARRY(r0, a4h | a5l,     r0, 0,     carry);
+                MP_ADD_CARRY(r1, a5h|(a6h<<32), r1, carry, carry);
+                MP_ADD_CARRY(r2, a7,            r2, carry, carry);
+                MP_ADD_CARRY(r3, a6h | a4l,     r3, carry, carry);
+                r4 += carry;
+                /* diff 5 */
+                MP_SUB_BORROW(r0, a5h | a6l,    r0, 0,     carry);
+                MP_SUB_BORROW(r1, a6h,          r1, carry, carry);
+                MP_SUB_BORROW(r2, 0,            r2, carry, carry);
+                MP_SUB_BORROW(r3, (a4l>>32)|a5l,r3, carry, carry);
+                r4 -= carry;
+                /* diff 6 */
+                MP_SUB_BORROW(r0, a6,           r0, 0,     carry);
+                MP_SUB_BORROW(r1, a7,           r1, carry, carry);
+                MP_SUB_BORROW(r2, 0,            r2, carry, carry);
+                MP_SUB_BORROW(r3, a4h|(a5h<<32),r3, carry, carry);
+                r4 -= carry;
+                /* diff 7 */
+                MP_SUB_BORROW(r0, a6h|a7l,      r0, 0,     carry);
+                MP_SUB_BORROW(r1, a7h|a4l,      r1, carry, carry);
+                MP_SUB_BORROW(r2, a4h|a5l,      r2, carry, carry);
+                MP_SUB_BORROW(r3, a6l,          r3, carry, carry);
+                r4 -= carry;
+                /* diff 8 */
+                MP_SUB_BORROW(r0, a7,           r0, 0,     carry);
+                MP_SUB_BORROW(r1, a4h<<32,      r1, carry, carry);
+                MP_SUB_BORROW(r2, a5,           r2, carry, carry);
+                MP_SUB_BORROW(r3, a6h<<32,      r3, carry, carry);
+                r4 -= carry;
+
+                /* reduce the overflows */
+                while (r4 > 0) {
+                        mp_digit r4_long = r4;
+                        mp_digit r4l = (r4_long << 32);
+                        MP_ADD_CARRY(r0, r4_long,      r0, 0,     carry);
+                        MP_ADD_CARRY(r1, -r4l,         r1, carry, carry);
+                        MP_ADD_CARRY(r2, MP_DIGIT_MAX, r2, carry, carry);
+                        MP_ADD_CARRY(r3, r4l-r4_long-1,r3, carry, carry);
+                        r4 = carry;
+                }
+
+                /* reduce the underflows */
+                while (r4 < 0) {
+                        mp_digit r4_long = -r4;
+                        mp_digit r4l = (r4_long << 32);
+                        MP_SUB_BORROW(r0, r4_long,      r0, 0,     carry);
+                        MP_SUB_BORROW(r1, -r4l,         r1, carry, carry);
+                        MP_SUB_BORROW(r2, MP_DIGIT_MAX, r2, carry, carry);
+                        MP_SUB_BORROW(r3, r4l-r4_long-1,r3, carry, carry);
+                        r4 = -carry;
+                }
+
+                if (a != r) {
+                        MP_CHECKOK(s_mp_pad(r,4));
+                }
+                MP_SIGN(r) = MP_ZPOS;
+                MP_USED(r) = 4;
+
+                MP_DIGIT(r,3) = r3;
+                MP_DIGIT(r,2) = r2;
+                MP_DIGIT(r,1) = r1;
+                MP_DIGIT(r,0) = r0;
+
+                /* final reduction if necessary */
+                if ((r3 > 0xFFFFFFFF00000001ULL) ||
+                        ((r3 == 0xFFFFFFFF00000001ULL) &&
+                        (r2 || (r1 >> 32)||
+                               (r1 == 0xFFFFFFFFULL && r0 == MP_DIGIT_MAX)))) {
+                        /* very rare, just use mp_sub */
+                        MP_CHECKOK(mp_sub(r, &meth->irr, r));
+                }
+
+                s_mp_clamp(r);
+#endif
+        }
+
+  CLEANUP:
+        return res;
+}
+
+/* Compute the square of polynomial a, reduce modulo p256. Store the
+ * result in r.  r could be a.  Uses optimized modular reduction for p256.
+ */
+mp_err
+ec_GFp_nistp256_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_sqr(a, r));
+        MP_CHECKOK(ec_GFp_nistp256_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Compute the product of two polynomials a and b, reduce modulo p256.
+ * Store the result in r.  r could be a or b; a could be b.  Uses
+ * optimized modular reduction for p256. */
+mp_err
+ec_GFp_nistp256_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_mul(a, b, r));
+        MP_CHECKOK(ec_GFp_nistp256_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Wire in fast field arithmetic and precomputation of base point for
+ * named curves. */
+mp_err
+ec_group_set_gfp256(ECGroup *group, ECCurveName name)
+{
+        if (name == ECCurve_NIST_P256) {
+                group->meth->field_mod = &ec_GFp_nistp256_mod;
+                group->meth->field_mul = &ec_GFp_nistp256_mul;
+                group->meth->field_sqr = &ec_GFp_nistp256_sqr;
+        }
+        return MP_OKAY;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp_384.c b/jdk/src/share/native/sun/security/ec/ecp_384.c
new file mode 100644
index 00000000000..93b9259da6b
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_384.c
@@ -0,0 +1,315 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecp.h"
+#include "mpi.h"
+#include "mplogic.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Fast modular reduction for p384 = 2^384 - 2^128 - 2^96 + 2^32 - 1.  a can be r.
+ * Uses algorithm 2.30 from Hankerson, Menezes, Vanstone. Guide to
+ * Elliptic Curve Cryptography. */
+mp_err
+ec_GFp_nistp384_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        int a_bits = mpl_significant_bits(a);
+        int i;
+
+        /* m1, m2 are statically-allocated mp_int of exactly the size we need */
+        mp_int m[10];
+
+#ifdef ECL_THIRTY_TWO_BIT
+        mp_digit s[10][12];
+        for (i = 0; i < 10; i++) {
+                MP_SIGN(&m[i]) = MP_ZPOS;
+                MP_ALLOC(&m[i]) = 12;
+                MP_USED(&m[i]) = 12;
+                MP_DIGITS(&m[i]) = s[i];
+        }
+#else
+        mp_digit s[10][6];
+        for (i = 0; i < 10; i++) {
+                MP_SIGN(&m[i]) = MP_ZPOS;
+                MP_ALLOC(&m[i]) = 6;
+                MP_USED(&m[i]) = 6;
+                MP_DIGITS(&m[i]) = s[i];
+        }
+#endif
+
+#ifdef ECL_THIRTY_TWO_BIT
+        /* for polynomials larger than twice the field size or polynomials
+         * not using all words, use regular reduction */
+        if ((a_bits > 768) || (a_bits <= 736)) {
+                MP_CHECKOK(mp_mod(a, &meth->irr, r));
+        } else {
+                for (i = 0; i < 12; i++) {
+                        s[0][i] = MP_DIGIT(a, i);
+                }
+                s[1][0] = 0;
+                s[1][1] = 0;
+                s[1][2] = 0;
+                s[1][3] = 0;
+                s[1][4] = MP_DIGIT(a, 21);
+                s[1][5] = MP_DIGIT(a, 22);
+                s[1][6] = MP_DIGIT(a, 23);
+                s[1][7] = 0;
+                s[1][8] = 0;
+                s[1][9] = 0;
+                s[1][10] = 0;
+                s[1][11] = 0;
+                for (i = 0; i < 12; i++) {
+                        s[2][i] = MP_DIGIT(a, i+12);
+                }
+                s[3][0] = MP_DIGIT(a, 21);
+                s[3][1] = MP_DIGIT(a, 22);
+                s[3][2] = MP_DIGIT(a, 23);
+                for (i = 3; i < 12; i++) {
+                        s[3][i] = MP_DIGIT(a, i+9);
+                }
+                s[4][0] = 0;
+                s[4][1] = MP_DIGIT(a, 23);
+                s[4][2] = 0;
+                s[4][3] = MP_DIGIT(a, 20);
+                for (i = 4; i < 12; i++) {
+                        s[4][i] = MP_DIGIT(a, i+8);
+                }
+                s[5][0] = 0;
+                s[5][1] = 0;
+                s[5][2] = 0;
+                s[5][3] = 0;
+                s[5][4] = MP_DIGIT(a, 20);
+                s[5][5] = MP_DIGIT(a, 21);
+                s[5][6] = MP_DIGIT(a, 22);
+                s[5][7] = MP_DIGIT(a, 23);
+                s[5][8] = 0;
+                s[5][9] = 0;
+                s[5][10] = 0;
+                s[5][11] = 0;
+                s[6][0] = MP_DIGIT(a, 20);
+                s[6][1] = 0;
+                s[6][2] = 0;
+                s[6][3] = MP_DIGIT(a, 21);
+                s[6][4] = MP_DIGIT(a, 22);
+                s[6][5] = MP_DIGIT(a, 23);
+                s[6][6] = 0;
+                s[6][7] = 0;
+                s[6][8] = 0;
+                s[6][9] = 0;
+                s[6][10] = 0;
+                s[6][11] = 0;
+                s[7][0] = MP_DIGIT(a, 23);
+                for (i = 1; i < 12; i++) {
+                        s[7][i] = MP_DIGIT(a, i+11);
+                }
+                s[8][0] = 0;
+                s[8][1] = MP_DIGIT(a, 20);
+                s[8][2] = MP_DIGIT(a, 21);
+                s[8][3] = MP_DIGIT(a, 22);
+                s[8][4] = MP_DIGIT(a, 23);
+                s[8][5] = 0;
+                s[8][6] = 0;
+                s[8][7] = 0;
+                s[8][8] = 0;
+                s[8][9] = 0;
+                s[8][10] = 0;
+                s[8][11] = 0;
+                s[9][0] = 0;
+                s[9][1] = 0;
+                s[9][2] = 0;
+                s[9][3] = MP_DIGIT(a, 23);
+                s[9][4] = MP_DIGIT(a, 23);
+                s[9][5] = 0;
+                s[9][6] = 0;
+                s[9][7] = 0;
+                s[9][8] = 0;
+                s[9][9] = 0;
+                s[9][10] = 0;
+                s[9][11] = 0;
+
+                MP_CHECKOK(mp_add(&m[0], &m[1], r));
+                MP_CHECKOK(mp_add(r, &m[1], r));
+                MP_CHECKOK(mp_add(r, &m[2], r));
+                MP_CHECKOK(mp_add(r, &m[3], r));
+                MP_CHECKOK(mp_add(r, &m[4], r));
+                MP_CHECKOK(mp_add(r, &m[5], r));
+                MP_CHECKOK(mp_add(r, &m[6], r));
+                MP_CHECKOK(mp_sub(r, &m[7], r));
+                MP_CHECKOK(mp_sub(r, &m[8], r));
+                MP_CHECKOK(mp_submod(r, &m[9], &meth->irr, r));
+                s_mp_clamp(r);
+        }
+#else
+        /* for polynomials larger than twice the field size or polynomials
+         * not using all words, use regular reduction */
+        if ((a_bits > 768) || (a_bits <= 736)) {
+                MP_CHECKOK(mp_mod(a, &meth->irr, r));
+        } else {
+                for (i = 0; i < 6; i++) {
+                        s[0][i] = MP_DIGIT(a, i);
+                }
+                s[1][0] = 0;
+                s[1][1] = 0;
+                s[1][2] = (MP_DIGIT(a, 10) >> 32) | (MP_DIGIT(a, 11) << 32);
+                s[1][3] = MP_DIGIT(a, 11) >> 32;
+                s[1][4] = 0;
+                s[1][5] = 0;
+                for (i = 0; i < 6; i++) {
+                        s[2][i] = MP_DIGIT(a, i+6);
+                }
+                s[3][0] = (MP_DIGIT(a, 10) >> 32) | (MP_DIGIT(a, 11) << 32);
+                s[3][1] = (MP_DIGIT(a, 11) >> 32) | (MP_DIGIT(a, 6) << 32);
+                for (i = 2; i < 6; i++) {
+                        s[3][i] = (MP_DIGIT(a, i+4) >> 32) | (MP_DIGIT(a, i+5) << 32);
+                }
+                s[4][0] = (MP_DIGIT(a, 11) >> 32) << 32;
+                s[4][1] = MP_DIGIT(a, 10) << 32;
+                for (i = 2; i < 6; i++) {
+                        s[4][i] = MP_DIGIT(a, i+4);
+                }
+                s[5][0] = 0;
+                s[5][1] = 0;
+                s[5][2] = MP_DIGIT(a, 10);
+                s[5][3] = MP_DIGIT(a, 11);
+                s[5][4] = 0;
+                s[5][5] = 0;
+                s[6][0] = (MP_DIGIT(a, 10) << 32) >> 32;
+                s[6][1] = (MP_DIGIT(a, 10) >> 32) << 32;
+                s[6][2] = MP_DIGIT(a, 11);
+                s[6][3] = 0;
+                s[6][4] = 0;
+                s[6][5] = 0;
+                s[7][0] = (MP_DIGIT(a, 11) >> 32) | (MP_DIGIT(a, 6) << 32);
+                for (i = 1; i < 6; i++) {
+                        s[7][i] = (MP_DIGIT(a, i+5) >> 32) | (MP_DIGIT(a, i+6) << 32);
+                }
+                s[8][0] = MP_DIGIT(a, 10) << 32;
+                s[8][1] = (MP_DIGIT(a, 10) >> 32) | (MP_DIGIT(a, 11) << 32);
+                s[8][2] = MP_DIGIT(a, 11) >> 32;
+                s[8][3] = 0;
+                s[8][4] = 0;
+                s[8][5] = 0;
+                s[9][0] = 0;
+                s[9][1] = (MP_DIGIT(a, 11) >> 32) << 32;
+                s[9][2] = MP_DIGIT(a, 11) >> 32;
+                s[9][3] = 0;
+                s[9][4] = 0;
+                s[9][5] = 0;
+
+                MP_CHECKOK(mp_add(&m[0], &m[1], r));
+                MP_CHECKOK(mp_add(r, &m[1], r));
+                MP_CHECKOK(mp_add(r, &m[2], r));
+                MP_CHECKOK(mp_add(r, &m[3], r));
+                MP_CHECKOK(mp_add(r, &m[4], r));
+                MP_CHECKOK(mp_add(r, &m[5], r));
+                MP_CHECKOK(mp_add(r, &m[6], r));
+                MP_CHECKOK(mp_sub(r, &m[7], r));
+                MP_CHECKOK(mp_sub(r, &m[8], r));
+                MP_CHECKOK(mp_submod(r, &m[9], &meth->irr, r));
+                s_mp_clamp(r);
+        }
+#endif
+
+  CLEANUP:
+        return res;
+}
+
+/* Compute the square of polynomial a, reduce modulo p384. Store the
+ * result in r.  r could be a.  Uses optimized modular reduction for p384.
+ */
+mp_err
+ec_GFp_nistp384_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_sqr(a, r));
+        MP_CHECKOK(ec_GFp_nistp384_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Compute the product of two polynomials a and b, reduce modulo p384.
+ * Store the result in r.  r could be a or b; a could be b.  Uses
+ * optimized modular reduction for p384. */
+mp_err
+ec_GFp_nistp384_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_mul(a, b, r));
+        MP_CHECKOK(ec_GFp_nistp384_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Wire in fast field arithmetic and precomputation of base point for
+ * named curves. */
+mp_err
+ec_group_set_gfp384(ECGroup *group, ECCurveName name)
+{
+        if (name == ECCurve_NIST_P384) {
+                group->meth->field_mod = &ec_GFp_nistp384_mod;
+                group->meth->field_mul = &ec_GFp_nistp384_mul;
+                group->meth->field_sqr = &ec_GFp_nistp384_sqr;
+        }
+        return MP_OKAY;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp_521.c b/jdk/src/share/native/sun/security/ec/ecp_521.c
new file mode 100644
index 00000000000..68dca16a774
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_521.c
@@ -0,0 +1,192 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecp.h"
+#include "mpi.h"
+#include "mplogic.h"
+#include "mpi-priv.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+#define ECP521_DIGITS ECL_CURVE_DIGITS(521)
+
+/* Fast modular reduction for p521 = 2^521 - 1.  a can be r. Uses
+ * algorithm 2.31 from Hankerson, Menezes, Vanstone. Guide to
+ * Elliptic Curve Cryptography. */
+mp_err
+ec_GFp_nistp521_mod(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        int a_bits = mpl_significant_bits(a);
+        int i;
+
+        /* m1, m2 are statically-allocated mp_int of exactly the size we need */
+        mp_int m1;
+
+        mp_digit s1[ECP521_DIGITS] = { 0 };
+
+        MP_SIGN(&m1) = MP_ZPOS;
+        MP_ALLOC(&m1) = ECP521_DIGITS;
+        MP_USED(&m1) = ECP521_DIGITS;
+        MP_DIGITS(&m1) = s1;
+
+        if (a_bits < 521) {
+                if (a==r) return MP_OKAY;
+                return mp_copy(a, r);
+        }
+        /* for polynomials larger than twice the field size or polynomials
+         * not using all words, use regular reduction */
+        if (a_bits > (521*2)) {
+                MP_CHECKOK(mp_mod(a, &meth->irr, r));
+        } else {
+#define FIRST_DIGIT (ECP521_DIGITS-1)
+                for (i = FIRST_DIGIT; i < MP_USED(a)-1; i++) {
+                        s1[i-FIRST_DIGIT] = (MP_DIGIT(a, i) >> 9)
+                                | (MP_DIGIT(a, 1+i) << (MP_DIGIT_BIT-9));
+                }
+                s1[i-FIRST_DIGIT] = MP_DIGIT(a, i) >> 9;
+
+                if ( a != r ) {
+                        MP_CHECKOK(s_mp_pad(r,ECP521_DIGITS));
+                        for (i = 0; i < ECP521_DIGITS; i++) {
+                                MP_DIGIT(r,i) = MP_DIGIT(a, i);
+                        }
+                }
+                MP_USED(r) = ECP521_DIGITS;
+                MP_DIGIT(r,FIRST_DIGIT) &=  0x1FF;
+
+                MP_CHECKOK(s_mp_add(r, &m1));
+                if (MP_DIGIT(r, FIRST_DIGIT) & 0x200) {
+                        MP_CHECKOK(s_mp_add_d(r,1));
+                        MP_DIGIT(r,FIRST_DIGIT) &=  0x1FF;
+                }
+                s_mp_clamp(r);
+        }
+
+  CLEANUP:
+        return res;
+}
+
+/* Compute the square of polynomial a, reduce modulo p521. Store the
+ * result in r.  r could be a.  Uses optimized modular reduction for p521.
+ */
+mp_err
+ec_GFp_nistp521_sqr(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_sqr(a, r));
+        MP_CHECKOK(ec_GFp_nistp521_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Compute the product of two polynomials a and b, reduce modulo p521.
+ * Store the result in r.  r could be a or b; a could be b.  Uses
+ * optimized modular reduction for p521. */
+mp_err
+ec_GFp_nistp521_mul(const mp_int *a, const mp_int *b, mp_int *r,
+                                        const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        MP_CHECKOK(mp_mul(a, b, r));
+        MP_CHECKOK(ec_GFp_nistp521_mod(r, r, meth));
+  CLEANUP:
+        return res;
+}
+
+/* Divides two field elements. If a is NULL, then returns the inverse of
+ * b. */
+mp_err
+ec_GFp_nistp521_div(const mp_int *a, const mp_int *b, mp_int *r,
+                   const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+        mp_int t;
+
+        /* If a is NULL, then return the inverse of b, otherwise return a/b. */
+        if (a == NULL) {
+                return mp_invmod(b, &meth->irr, r);
+        } else {
+                /* MPI doesn't support divmod, so we implement it using invmod and
+                 * mulmod. */
+                MP_CHECKOK(mp_init(&t, FLAG(b)));
+                MP_CHECKOK(mp_invmod(b, &meth->irr, &t));
+                MP_CHECKOK(mp_mul(a, &t, r));
+                MP_CHECKOK(ec_GFp_nistp521_mod(r, r, meth));
+          CLEANUP:
+                mp_clear(&t);
+                return res;
+        }
+}
+
+/* Wire in fast field arithmetic and precomputation of base point for
+ * named curves. */
+mp_err
+ec_group_set_gfp521(ECGroup *group, ECCurveName name)
+{
+        if (name == ECCurve_NIST_P521) {
+                group->meth->field_mod = &ec_GFp_nistp521_mod;
+                group->meth->field_mul = &ec_GFp_nistp521_mul;
+                group->meth->field_sqr = &ec_GFp_nistp521_sqr;
+                group->meth->field_div = &ec_GFp_nistp521_div;
+        }
+        return MP_OKAY;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp_aff.c b/jdk/src/share/native/sun/security/ec/ecp_aff.c
new file mode 100644
index 00000000000..f8d88d4dcbc
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_aff.c
@@ -0,0 +1,379 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang-Shantz <sheueling.chang@sun.com>,
+ *   Stephen Fung <fungstep@hotmail.com>, and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories.
+ *   Bodo Moeller <moeller@cdc.informatik.tu-darmstadt.de>,
+ *   Nils Larsch <nla@trustcenter.de>, and
+ *   Lenka Fibikova <fibikova@exp-math.uni-essen.de>, the OpenSSL Project
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecp.h"
+#include "mplogic.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+/* Checks if point P(px, py) is at infinity.  Uses affine coordinates. */
+mp_err
+ec_GFp_pt_is_inf_aff(const mp_int *px, const mp_int *py)
+{
+
+        if ((mp_cmp_z(px) == 0) && (mp_cmp_z(py) == 0)) {
+                return MP_YES;
+        } else {
+                return MP_NO;
+        }
+
+}
+
+/* Sets P(px, py) to be the point at infinity.  Uses affine coordinates. */
+mp_err
+ec_GFp_pt_set_inf_aff(mp_int *px, mp_int *py)
+{
+        mp_zero(px);
+        mp_zero(py);
+        return MP_OKAY;
+}
+
+/* Computes R = P + Q based on IEEE P1363 A.10.1. Elliptic curve points P,
+ * Q, and R can all be identical. Uses affine coordinates. Assumes input
+ * is already field-encoded using field_enc, and returns output that is
+ * still field-encoded. */
+mp_err
+ec_GFp_pt_add_aff(const mp_int *px, const mp_int *py, const mp_int *qx,
+                                  const mp_int *qy, mp_int *rx, mp_int *ry,
+                                  const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int lambda, temp, tempx, tempy;
+
+        MP_DIGITS(&lambda) = 0;
+        MP_DIGITS(&temp) = 0;
+        MP_DIGITS(&tempx) = 0;
+        MP_DIGITS(&tempy) = 0;
+        MP_CHECKOK(mp_init(&lambda, FLAG(px)));
+        MP_CHECKOK(mp_init(&temp, FLAG(px)));
+        MP_CHECKOK(mp_init(&tempx, FLAG(px)));
+        MP_CHECKOK(mp_init(&tempy, FLAG(px)));
+        /* if P = inf, then R = Q */
+        if (ec_GFp_pt_is_inf_aff(px, py) == 0) {
+                MP_CHECKOK(mp_copy(qx, rx));
+                MP_CHECKOK(mp_copy(qy, ry));
+                res = MP_OKAY;
+                goto CLEANUP;
+        }
+        /* if Q = inf, then R = P */
+        if (ec_GFp_pt_is_inf_aff(qx, qy) == 0) {
+                MP_CHECKOK(mp_copy(px, rx));
+                MP_CHECKOK(mp_copy(py, ry));
+                res = MP_OKAY;
+                goto CLEANUP;
+        }
+        /* if px != qx, then lambda = (py-qy) / (px-qx) */
+        if (mp_cmp(px, qx) != 0) {
+                MP_CHECKOK(group->meth->field_sub(py, qy, &tempy, group->meth));
+                MP_CHECKOK(group->meth->field_sub(px, qx, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_div(&tempy, &tempx, &lambda, group->meth));
+        } else {
+                /* if py != qy or qy = 0, then R = inf */
+                if (((mp_cmp(py, qy) != 0)) || (mp_cmp_z(qy) == 0)) {
+                        mp_zero(rx);
+                        mp_zero(ry);
+                        res = MP_OKAY;
+                        goto CLEANUP;
+                }
+                /* lambda = (3qx^2+a) / (2qy) */
+                MP_CHECKOK(group->meth->field_sqr(qx, &tempx, group->meth));
+                MP_CHECKOK(mp_set_int(&temp, 3));
+                if (group->meth->field_enc) {
+                        MP_CHECKOK(group->meth->field_enc(&temp, &temp, group->meth));
+                }
+                MP_CHECKOK(group->meth->
+                                   field_mul(&tempx, &temp, &tempx, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&tempx, &group->curvea, &tempx, group->meth));
+                MP_CHECKOK(mp_set_int(&temp, 2));
+                if (group->meth->field_enc) {
+                        MP_CHECKOK(group->meth->field_enc(&temp, &temp, group->meth));
+                }
+                MP_CHECKOK(group->meth->field_mul(qy, &temp, &tempy, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_div(&tempx, &tempy, &lambda, group->meth));
+        }
+        /* rx = lambda^2 - px - qx */
+        MP_CHECKOK(group->meth->field_sqr(&lambda, &tempx, group->meth));
+        MP_CHECKOK(group->meth->field_sub(&tempx, px, &tempx, group->meth));
+        MP_CHECKOK(group->meth->field_sub(&tempx, qx, &tempx, group->meth));
+        /* ry = (x1-x2) * lambda - y1 */
+        MP_CHECKOK(group->meth->field_sub(qx, &tempx, &tempy, group->meth));
+        MP_CHECKOK(group->meth->
+                           field_mul(&tempy, &lambda, &tempy, group->meth));
+        MP_CHECKOK(group->meth->field_sub(&tempy, qy, &tempy, group->meth));
+        MP_CHECKOK(mp_copy(&tempx, rx));
+        MP_CHECKOK(mp_copy(&tempy, ry));
+
+  CLEANUP:
+        mp_clear(&lambda);
+        mp_clear(&temp);
+        mp_clear(&tempx);
+        mp_clear(&tempy);
+        return res;
+}
+
+/* Computes R = P - Q. Elliptic curve points P, Q, and R can all be
+ * identical. Uses affine coordinates. Assumes input is already
+ * field-encoded using field_enc, and returns output that is still
+ * field-encoded. */
+mp_err
+ec_GFp_pt_sub_aff(const mp_int *px, const mp_int *py, const mp_int *qx,
+                                  const mp_int *qy, mp_int *rx, mp_int *ry,
+                                  const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int nqy;
+
+        MP_DIGITS(&nqy) = 0;
+        MP_CHECKOK(mp_init(&nqy, FLAG(px)));
+        /* nqy = -qy */
+        MP_CHECKOK(group->meth->field_neg(qy, &nqy, group->meth));
+        res = group->point_add(px, py, qx, &nqy, rx, ry, group);
+  CLEANUP:
+        mp_clear(&nqy);
+        return res;
+}
+
+/* Computes R = 2P. Elliptic curve points P and R can be identical. Uses
+ * affine coordinates. Assumes input is already field-encoded using
+ * field_enc, and returns output that is still field-encoded. */
+mp_err
+ec_GFp_pt_dbl_aff(const mp_int *px, const mp_int *py, mp_int *rx,
+                                  mp_int *ry, const ECGroup *group)
+{
+        return ec_GFp_pt_add_aff(px, py, px, py, rx, ry, group);
+}
+
+/* by default, this routine is unused and thus doesn't need to be compiled */
+#ifdef ECL_ENABLE_GFP_PT_MUL_AFF
+/* Computes R = nP based on IEEE P1363 A.10.3. Elliptic curve points P and
+ * R can be identical. Uses affine coordinates. Assumes input is already
+ * field-encoded using field_enc, and returns output that is still
+ * field-encoded. */
+mp_err
+ec_GFp_pt_mul_aff(const mp_int *n, const mp_int *px, const mp_int *py,
+                                  mp_int *rx, mp_int *ry, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int k, k3, qx, qy, sx, sy;
+        int b1, b3, i, l;
+
+        MP_DIGITS(&k) = 0;
+        MP_DIGITS(&k3) = 0;
+        MP_DIGITS(&qx) = 0;
+        MP_DIGITS(&qy) = 0;
+        MP_DIGITS(&sx) = 0;
+        MP_DIGITS(&sy) = 0;
+        MP_CHECKOK(mp_init(&k));
+        MP_CHECKOK(mp_init(&k3));
+        MP_CHECKOK(mp_init(&qx));
+        MP_CHECKOK(mp_init(&qy));
+        MP_CHECKOK(mp_init(&sx));
+        MP_CHECKOK(mp_init(&sy));
+
+        /* if n = 0 then r = inf */
+        if (mp_cmp_z(n) == 0) {
+                mp_zero(rx);
+                mp_zero(ry);
+                res = MP_OKAY;
+                goto CLEANUP;
+        }
+        /* Q = P, k = n */
+        MP_CHECKOK(mp_copy(px, &qx));
+        MP_CHECKOK(mp_copy(py, &qy));
+        MP_CHECKOK(mp_copy(n, &k));
+        /* if n < 0 then Q = -Q, k = -k */
+        if (mp_cmp_z(n) < 0) {
+                MP_CHECKOK(group->meth->field_neg(&qy, &qy, group->meth));
+                MP_CHECKOK(mp_neg(&k, &k));
+        }
+#ifdef ECL_DEBUG                                /* basic double and add method */
+        l = mpl_significant_bits(&k) - 1;
+        MP_CHECKOK(mp_copy(&qx, &sx));
+        MP_CHECKOK(mp_copy(&qy, &sy));
+        for (i = l - 1; i >= 0; i--) {
+                /* S = 2S */
+                MP_CHECKOK(group->point_dbl(&sx, &sy, &sx, &sy, group));
+                /* if k_i = 1, then S = S + Q */
+                if (mpl_get_bit(&k, i) != 0) {
+                        MP_CHECKOK(group->
+                                           point_add(&sx, &sy, &qx, &qy, &sx, &sy, group));
+                }
+        }
+#else                                                   /* double and add/subtract method from
+                                                                 * standard */
+        /* k3 = 3 * k */
+        MP_CHECKOK(mp_set_int(&k3, 3));
+        MP_CHECKOK(mp_mul(&k, &k3, &k3));
+        /* S = Q */
+        MP_CHECKOK(mp_copy(&qx, &sx));
+        MP_CHECKOK(mp_copy(&qy, &sy));
+        /* l = index of high order bit in binary representation of 3*k */
+        l = mpl_significant_bits(&k3) - 1;
+        /* for i = l-1 downto 1 */
+        for (i = l - 1; i >= 1; i--) {
+                /* S = 2S */
+                MP_CHECKOK(group->point_dbl(&sx, &sy, &sx, &sy, group));
+                b3 = MP_GET_BIT(&k3, i);
+                b1 = MP_GET_BIT(&k, i);
+                /* if k3_i = 1 and k_i = 0, then S = S + Q */
+                if ((b3 == 1) && (b1 == 0)) {
+                        MP_CHECKOK(group->
+                                           point_add(&sx, &sy, &qx, &qy, &sx, &sy, group));
+                        /* if k3_i = 0 and k_i = 1, then S = S - Q */
+                } else if ((b3 == 0) && (b1 == 1)) {
+                        MP_CHECKOK(group->
+                                           point_sub(&sx, &sy, &qx, &qy, &sx, &sy, group));
+                }
+        }
+#endif
+        /* output S */
+        MP_CHECKOK(mp_copy(&sx, rx));
+        MP_CHECKOK(mp_copy(&sy, ry));
+
+  CLEANUP:
+        mp_clear(&k);
+        mp_clear(&k3);
+        mp_clear(&qx);
+        mp_clear(&qy);
+        mp_clear(&sx);
+        mp_clear(&sy);
+        return res;
+}
+#endif
+
+/* Validates a point on a GFp curve. */
+mp_err
+ec_GFp_validate_point(const mp_int *px, const mp_int *py, const ECGroup *group)
+{
+        mp_err res = MP_NO;
+        mp_int accl, accr, tmp, pxt, pyt;
+
+        MP_DIGITS(&accl) = 0;
+        MP_DIGITS(&accr) = 0;
+        MP_DIGITS(&tmp) = 0;
+        MP_DIGITS(&pxt) = 0;
+        MP_DIGITS(&pyt) = 0;
+        MP_CHECKOK(mp_init(&accl, FLAG(px)));
+        MP_CHECKOK(mp_init(&accr, FLAG(px)));
+        MP_CHECKOK(mp_init(&tmp, FLAG(px)));
+        MP_CHECKOK(mp_init(&pxt, FLAG(px)));
+        MP_CHECKOK(mp_init(&pyt, FLAG(px)));
+
+    /* 1: Verify that publicValue is not the point at infinity */
+        if (ec_GFp_pt_is_inf_aff(px, py) == MP_YES) {
+                res = MP_NO;
+                goto CLEANUP;
+        }
+    /* 2: Verify that the coordinates of publicValue are elements
+     *    of the field.
+     */
+        if ((MP_SIGN(px) == MP_NEG) || (mp_cmp(px, &group->meth->irr) >= 0) ||
+                (MP_SIGN(py) == MP_NEG) || (mp_cmp(py, &group->meth->irr) >= 0)) {
+                res = MP_NO;
+                goto CLEANUP;
+        }
+    /* 3: Verify that publicValue is on the curve. */
+        if (group->meth->field_enc) {
+                group->meth->field_enc(px, &pxt, group->meth);
+                group->meth->field_enc(py, &pyt, group->meth);
+        } else {
+                mp_copy(px, &pxt);
+                mp_copy(py, &pyt);
+        }
+        /* left-hand side: y^2  */
+        MP_CHECKOK( group->meth->field_sqr(&pyt, &accl, group->meth) );
+        /* right-hand side: x^3 + a*x + b */
+        MP_CHECKOK( group->meth->field_sqr(&pxt, &tmp, group->meth) );
+        MP_CHECKOK( group->meth->field_mul(&pxt, &tmp, &accr, group->meth) );
+        MP_CHECKOK( group->meth->field_mul(&group->curvea, &pxt, &tmp, group->meth) );
+        MP_CHECKOK( group->meth->field_add(&tmp, &accr, &accr, group->meth) );
+        MP_CHECKOK( group->meth->field_add(&accr, &group->curveb, &accr, group->meth) );
+        /* check LHS - RHS == 0 */
+        MP_CHECKOK( group->meth->field_sub(&accl, &accr, &accr, group->meth) );
+        if (mp_cmp_z(&accr) != 0) {
+                res = MP_NO;
+                goto CLEANUP;
+        }
+    /* 4: Verify that the order of the curve times the publicValue
+     *    is the point at infinity.
+     */
+        MP_CHECKOK( ECPoint_mul(group, &group->order, px, py, &pxt, &pyt) );
+        if (ec_GFp_pt_is_inf_aff(&pxt, &pyt) != MP_YES) {
+                res = MP_NO;
+                goto CLEANUP;
+        }
+
+        res = MP_YES;
+
+CLEANUP:
+        mp_clear(&accl);
+        mp_clear(&accr);
+        mp_clear(&tmp);
+        mp_clear(&pxt);
+        mp_clear(&pyt);
+        return res;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp_jac.c b/jdk/src/share/native/sun/security/ec/ecp_jac.c
new file mode 100644
index 00000000000..47c0e195dc1
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_jac.c
@@ -0,0 +1,575 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang-Shantz <sheueling.chang@sun.com>,
+ *   Stephen Fung <fungstep@hotmail.com>, and
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories.
+ *   Bodo Moeller <moeller@cdc.informatik.tu-darmstadt.de>,
+ *   Nils Larsch <nla@trustcenter.de>, and
+ *   Lenka Fibikova <fibikova@exp-math.uni-essen.de>, the OpenSSL Project
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecp.h"
+#include "mplogic.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+#ifdef ECL_DEBUG
+#include <assert.h>
+#endif
+
+/* Converts a point P(px, py) from affine coordinates to Jacobian
+ * projective coordinates R(rx, ry, rz). Assumes input is already
+ * field-encoded using field_enc, and returns output that is still
+ * field-encoded. */
+mp_err
+ec_GFp_pt_aff2jac(const mp_int *px, const mp_int *py, mp_int *rx,
+                                  mp_int *ry, mp_int *rz, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+
+        if (ec_GFp_pt_is_inf_aff(px, py) == MP_YES) {
+                MP_CHECKOK(ec_GFp_pt_set_inf_jac(rx, ry, rz));
+        } else {
+                MP_CHECKOK(mp_copy(px, rx));
+                MP_CHECKOK(mp_copy(py, ry));
+                MP_CHECKOK(mp_set_int(rz, 1));
+                if (group->meth->field_enc) {
+                        MP_CHECKOK(group->meth->field_enc(rz, rz, group->meth));
+                }
+        }
+  CLEANUP:
+        return res;
+}
+
+/* Converts a point P(px, py, pz) from Jacobian projective coordinates to
+ * affine coordinates R(rx, ry).  P and R can share x and y coordinates.
+ * Assumes input is already field-encoded using field_enc, and returns
+ * output that is still field-encoded. */
+mp_err
+ec_GFp_pt_jac2aff(const mp_int *px, const mp_int *py, const mp_int *pz,
+                                  mp_int *rx, mp_int *ry, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int z1, z2, z3;
+
+        MP_DIGITS(&z1) = 0;
+        MP_DIGITS(&z2) = 0;
+        MP_DIGITS(&z3) = 0;
+        MP_CHECKOK(mp_init(&z1, FLAG(px)));
+        MP_CHECKOK(mp_init(&z2, FLAG(px)));
+        MP_CHECKOK(mp_init(&z3, FLAG(px)));
+
+        /* if point at infinity, then set point at infinity and exit */
+        if (ec_GFp_pt_is_inf_jac(px, py, pz) == MP_YES) {
+                MP_CHECKOK(ec_GFp_pt_set_inf_aff(rx, ry));
+                goto CLEANUP;
+        }
+
+        /* transform (px, py, pz) into (px / pz^2, py / pz^3) */
+        if (mp_cmp_d(pz, 1) == 0) {
+                MP_CHECKOK(mp_copy(px, rx));
+                MP_CHECKOK(mp_copy(py, ry));
+        } else {
+                MP_CHECKOK(group->meth->field_div(NULL, pz, &z1, group->meth));
+                MP_CHECKOK(group->meth->field_sqr(&z1, &z2, group->meth));
+                MP_CHECKOK(group->meth->field_mul(&z1, &z2, &z3, group->meth));
+                MP_CHECKOK(group->meth->field_mul(px, &z2, rx, group->meth));
+                MP_CHECKOK(group->meth->field_mul(py, &z3, ry, group->meth));
+        }
+
+  CLEANUP:
+        mp_clear(&z1);
+        mp_clear(&z2);
+        mp_clear(&z3);
+        return res;
+}
+
+/* Checks if point P(px, py, pz) is at infinity. Uses Jacobian
+ * coordinates. */
+mp_err
+ec_GFp_pt_is_inf_jac(const mp_int *px, const mp_int *py, const mp_int *pz)
+{
+        return mp_cmp_z(pz);
+}
+
+/* Sets P(px, py, pz) to be the point at infinity.  Uses Jacobian
+ * coordinates. */
+mp_err
+ec_GFp_pt_set_inf_jac(mp_int *px, mp_int *py, mp_int *pz)
+{
+        mp_zero(pz);
+        return MP_OKAY;
+}
+
+/* Computes R = P + Q where R is (rx, ry, rz), P is (px, py, pz) and Q is
+ * (qx, qy, 1).  Elliptic curve points P, Q, and R can all be identical.
+ * Uses mixed Jacobian-affine coordinates. Assumes input is already
+ * field-encoded using field_enc, and returns output that is still
+ * field-encoded. Uses equation (2) from Brown, Hankerson, Lopez, and
+ * Menezes. Software Implementation of the NIST Elliptic Curves Over Prime
+ * Fields. */
+mp_err
+ec_GFp_pt_add_jac_aff(const mp_int *px, const mp_int *py, const mp_int *pz,
+                                          const mp_int *qx, const mp_int *qy, mp_int *rx,
+                                          mp_int *ry, mp_int *rz, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int A, B, C, D, C2, C3;
+
+        MP_DIGITS(&A) = 0;
+        MP_DIGITS(&B) = 0;
+        MP_DIGITS(&C) = 0;
+        MP_DIGITS(&D) = 0;
+        MP_DIGITS(&C2) = 0;
+        MP_DIGITS(&C3) = 0;
+        MP_CHECKOK(mp_init(&A, FLAG(px)));
+        MP_CHECKOK(mp_init(&B, FLAG(px)));
+        MP_CHECKOK(mp_init(&C, FLAG(px)));
+        MP_CHECKOK(mp_init(&D, FLAG(px)));
+        MP_CHECKOK(mp_init(&C2, FLAG(px)));
+        MP_CHECKOK(mp_init(&C3, FLAG(px)));
+
+        /* If either P or Q is the point at infinity, then return the other
+         * point */
+        if (ec_GFp_pt_is_inf_jac(px, py, pz) == MP_YES) {
+                MP_CHECKOK(ec_GFp_pt_aff2jac(qx, qy, rx, ry, rz, group));
+                goto CLEANUP;
+        }
+        if (ec_GFp_pt_is_inf_aff(qx, qy) == MP_YES) {
+                MP_CHECKOK(mp_copy(px, rx));
+                MP_CHECKOK(mp_copy(py, ry));
+                MP_CHECKOK(mp_copy(pz, rz));
+                goto CLEANUP;
+        }
+
+        /* A = qx * pz^2, B = qy * pz^3 */
+        MP_CHECKOK(group->meth->field_sqr(pz, &A, group->meth));
+        MP_CHECKOK(group->meth->field_mul(&A, pz, &B, group->meth));
+        MP_CHECKOK(group->meth->field_mul(&A, qx, &A, group->meth));
+        MP_CHECKOK(group->meth->field_mul(&B, qy, &B, group->meth));
+
+        /* C = A - px, D = B - py */
+        MP_CHECKOK(group->meth->field_sub(&A, px, &C, group->meth));
+        MP_CHECKOK(group->meth->field_sub(&B, py, &D, group->meth));
+
+        /* C2 = C^2, C3 = C^3 */
+        MP_CHECKOK(group->meth->field_sqr(&C, &C2, group->meth));
+        MP_CHECKOK(group->meth->field_mul(&C, &C2, &C3, group->meth));
+
+        /* rz = pz * C */
+        MP_CHECKOK(group->meth->field_mul(pz, &C, rz, group->meth));
+
+        /* C = px * C^2 */
+        MP_CHECKOK(group->meth->field_mul(px, &C2, &C, group->meth));
+        /* A = D^2 */
+        MP_CHECKOK(group->meth->field_sqr(&D, &A, group->meth));
+
+        /* rx = D^2 - (C^3 + 2 * (px * C^2)) */
+        MP_CHECKOK(group->meth->field_add(&C, &C, rx, group->meth));
+        MP_CHECKOK(group->meth->field_add(&C3, rx, rx, group->meth));
+        MP_CHECKOK(group->meth->field_sub(&A, rx, rx, group->meth));
+
+        /* C3 = py * C^3 */
+        MP_CHECKOK(group->meth->field_mul(py, &C3, &C3, group->meth));
+
+        /* ry = D * (px * C^2 - rx) - py * C^3 */
+        MP_CHECKOK(group->meth->field_sub(&C, rx, ry, group->meth));
+        MP_CHECKOK(group->meth->field_mul(&D, ry, ry, group->meth));
+        MP_CHECKOK(group->meth->field_sub(ry, &C3, ry, group->meth));
+
+  CLEANUP:
+        mp_clear(&A);
+        mp_clear(&B);
+        mp_clear(&C);
+        mp_clear(&D);
+        mp_clear(&C2);
+        mp_clear(&C3);
+        return res;
+}
+
+/* Computes R = 2P.  Elliptic curve points P and R can be identical.  Uses
+ * Jacobian coordinates.
+ *
+ * Assumes input is already field-encoded using field_enc, and returns
+ * output that is still field-encoded.
+ *
+ * This routine implements Point Doubling in the Jacobian Projective
+ * space as described in the paper "Efficient elliptic curve exponentiation
+ * using mixed coordinates", by H. Cohen, A Miyaji, T. Ono.
+ */
+mp_err
+ec_GFp_pt_dbl_jac(const mp_int *px, const mp_int *py, const mp_int *pz,
+                                  mp_int *rx, mp_int *ry, mp_int *rz, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int t0, t1, M, S;
+
+        MP_DIGITS(&t0) = 0;
+        MP_DIGITS(&t1) = 0;
+        MP_DIGITS(&M) = 0;
+        MP_DIGITS(&S) = 0;
+        MP_CHECKOK(mp_init(&t0, FLAG(px)));
+        MP_CHECKOK(mp_init(&t1, FLAG(px)));
+        MP_CHECKOK(mp_init(&M, FLAG(px)));
+        MP_CHECKOK(mp_init(&S, FLAG(px)));
+
+        if (ec_GFp_pt_is_inf_jac(px, py, pz) == MP_YES) {
+                MP_CHECKOK(ec_GFp_pt_set_inf_jac(rx, ry, rz));
+                goto CLEANUP;
+        }
+
+        if (mp_cmp_d(pz, 1) == 0) {
+                /* M = 3 * px^2 + a */
+                MP_CHECKOK(group->meth->field_sqr(px, &t0, group->meth));
+                MP_CHECKOK(group->meth->field_add(&t0, &t0, &M, group->meth));
+                MP_CHECKOK(group->meth->field_add(&t0, &M, &t0, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_add(&t0, &group->curvea, &M, group->meth));
+        } else if (mp_cmp_int(&group->curvea, -3, FLAG(px)) == 0) {
+                /* M = 3 * (px + pz^2) * (px - pz^2) */
+                MP_CHECKOK(group->meth->field_sqr(pz, &M, group->meth));
+                MP_CHECKOK(group->meth->field_add(px, &M, &t0, group->meth));
+                MP_CHECKOK(group->meth->field_sub(px, &M, &t1, group->meth));
+                MP_CHECKOK(group->meth->field_mul(&t0, &t1, &M, group->meth));
+                MP_CHECKOK(group->meth->field_add(&M, &M, &t0, group->meth));
+                MP_CHECKOK(group->meth->field_add(&t0, &M, &M, group->meth));
+        } else {
+                /* M = 3 * (px^2) + a * (pz^4) */
+                MP_CHECKOK(group->meth->field_sqr(px, &t0, group->meth));
+                MP_CHECKOK(group->meth->field_add(&t0, &t0, &M, group->meth));
+                MP_CHECKOK(group->meth->field_add(&t0, &M, &t0, group->meth));
+                MP_CHECKOK(group->meth->field_sqr(pz, &M, group->meth));
+                MP_CHECKOK(group->meth->field_sqr(&M, &M, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_mul(&M, &group->curvea, &M, group->meth));
+                MP_CHECKOK(group->meth->field_add(&M, &t0, &M, group->meth));
+        }
+
+        /* rz = 2 * py * pz */
+        /* t0 = 4 * py^2 */
+        if (mp_cmp_d(pz, 1) == 0) {
+                MP_CHECKOK(group->meth->field_add(py, py, rz, group->meth));
+                MP_CHECKOK(group->meth->field_sqr(rz, &t0, group->meth));
+        } else {
+                MP_CHECKOK(group->meth->field_add(py, py, &t0, group->meth));
+                MP_CHECKOK(group->meth->field_mul(&t0, pz, rz, group->meth));
+                MP_CHECKOK(group->meth->field_sqr(&t0, &t0, group->meth));
+        }
+
+        /* S = 4 * px * py^2 = px * (2 * py)^2 */
+        MP_CHECKOK(group->meth->field_mul(px, &t0, &S, group->meth));
+
+        /* rx = M^2 - 2 * S */
+        MP_CHECKOK(group->meth->field_add(&S, &S, &t1, group->meth));
+        MP_CHECKOK(group->meth->field_sqr(&M, rx, group->meth));
+        MP_CHECKOK(group->meth->field_sub(rx, &t1, rx, group->meth));
+
+        /* ry = M * (S - rx) - 8 * py^4 */
+        MP_CHECKOK(group->meth->field_sqr(&t0, &t1, group->meth));
+        if (mp_isodd(&t1)) {
+                MP_CHECKOK(mp_add(&t1, &group->meth->irr, &t1));
+        }
+        MP_CHECKOK(mp_div_2(&t1, &t1));
+        MP_CHECKOK(group->meth->field_sub(&S, rx, &S, group->meth));
+        MP_CHECKOK(group->meth->field_mul(&M, &S, &M, group->meth));
+        MP_CHECKOK(group->meth->field_sub(&M, &t1, ry, group->meth));
+
+  CLEANUP:
+        mp_clear(&t0);
+        mp_clear(&t1);
+        mp_clear(&M);
+        mp_clear(&S);
+        return res;
+}
+
+/* by default, this routine is unused and thus doesn't need to be compiled */
+#ifdef ECL_ENABLE_GFP_PT_MUL_JAC
+/* Computes R = nP where R is (rx, ry) and P is (px, py). The parameters
+ * a, b and p are the elliptic curve coefficients and the prime that
+ * determines the field GFp.  Elliptic curve points P and R can be
+ * identical.  Uses mixed Jacobian-affine coordinates. Assumes input is
+ * already field-encoded using field_enc, and returns output that is still
+ * field-encoded. Uses 4-bit window method. */
+mp_err
+ec_GFp_pt_mul_jac(const mp_int *n, const mp_int *px, const mp_int *py,
+                                  mp_int *rx, mp_int *ry, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int precomp[16][2], rz;
+        int i, ni, d;
+
+        MP_DIGITS(&rz) = 0;
+        for (i = 0; i < 16; i++) {
+                MP_DIGITS(&precomp[i][0]) = 0;
+                MP_DIGITS(&precomp[i][1]) = 0;
+        }
+
+        ARGCHK(group != NULL, MP_BADARG);
+        ARGCHK((n != NULL) && (px != NULL) && (py != NULL), MP_BADARG);
+
+        /* initialize precomputation table */
+        for (i = 0; i < 16; i++) {
+                MP_CHECKOK(mp_init(&precomp[i][0]));
+                MP_CHECKOK(mp_init(&precomp[i][1]));
+        }
+
+        /* fill precomputation table */
+        mp_zero(&precomp[0][0]);
+        mp_zero(&precomp[0][1]);
+        MP_CHECKOK(mp_copy(px, &precomp[1][0]));
+        MP_CHECKOK(mp_copy(py, &precomp[1][1]));
+        for (i = 2; i < 16; i++) {
+                MP_CHECKOK(group->
+                                   point_add(&precomp[1][0], &precomp[1][1],
+                                                         &precomp[i - 1][0], &precomp[i - 1][1],
+                                                         &precomp[i][0], &precomp[i][1], group));
+        }
+
+        d = (mpl_significant_bits(n) + 3) / 4;
+
+        /* R = inf */
+        MP_CHECKOK(mp_init(&rz));
+        MP_CHECKOK(ec_GFp_pt_set_inf_jac(rx, ry, &rz));
+
+        for (i = d - 1; i >= 0; i--) {
+                /* compute window ni */
+                ni = MP_GET_BIT(n, 4 * i + 3);
+                ni <<= 1;
+                ni |= MP_GET_BIT(n, 4 * i + 2);
+                ni <<= 1;
+                ni |= MP_GET_BIT(n, 4 * i + 1);
+                ni <<= 1;
+                ni |= MP_GET_BIT(n, 4 * i);
+                /* R = 2^4 * R */
+                MP_CHECKOK(ec_GFp_pt_dbl_jac(rx, ry, &rz, rx, ry, &rz, group));
+                MP_CHECKOK(ec_GFp_pt_dbl_jac(rx, ry, &rz, rx, ry, &rz, group));
+                MP_CHECKOK(ec_GFp_pt_dbl_jac(rx, ry, &rz, rx, ry, &rz, group));
+                MP_CHECKOK(ec_GFp_pt_dbl_jac(rx, ry, &rz, rx, ry, &rz, group));
+                /* R = R + (ni * P) */
+                MP_CHECKOK(ec_GFp_pt_add_jac_aff
+                                   (rx, ry, &rz, &precomp[ni][0], &precomp[ni][1], rx, ry,
+                                        &rz, group));
+        }
+
+        /* convert result S to affine coordinates */
+        MP_CHECKOK(ec_GFp_pt_jac2aff(rx, ry, &rz, rx, ry, group));
+
+  CLEANUP:
+        mp_clear(&rz);
+        for (i = 0; i < 16; i++) {
+                mp_clear(&precomp[i][0]);
+                mp_clear(&precomp[i][1]);
+        }
+        return res;
+}
+#endif
+
+/* Elliptic curve scalar-point multiplication. Computes R(x, y) = k1 * G +
+ * k2 * P(x, y), where G is the generator (base point) of the group of
+ * points on the elliptic curve. Allows k1 = NULL or { k2, P } = NULL.
+ * Uses mixed Jacobian-affine coordinates. Input and output values are
+ * assumed to be NOT field-encoded. Uses algorithm 15 (simultaneous
+ * multiple point multiplication) from Brown, Hankerson, Lopez, Menezes.
+ * Software Implementation of the NIST Elliptic Curves over Prime Fields. */
+mp_err
+ec_GFp_pts_mul_jac(const mp_int *k1, const mp_int *k2, const mp_int *px,
+                                   const mp_int *py, mp_int *rx, mp_int *ry,
+                                   const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int precomp[4][4][2];
+        mp_int rz;
+        const mp_int *a, *b;
+        int i, j;
+        int ai, bi, d;
+
+        for (i = 0; i < 4; i++) {
+                for (j = 0; j < 4; j++) {
+                        MP_DIGITS(&precomp[i][j][0]) = 0;
+                        MP_DIGITS(&precomp[i][j][1]) = 0;
+                }
+        }
+        MP_DIGITS(&rz) = 0;
+
+        ARGCHK(group != NULL, MP_BADARG);
+        ARGCHK(!((k1 == NULL)
+                         && ((k2 == NULL) || (px == NULL)
+                                 || (py == NULL))), MP_BADARG);
+
+        /* if some arguments are not defined used ECPoint_mul */
+        if (k1 == NULL) {
+                return ECPoint_mul(group, k2, px, py, rx, ry);
+        } else if ((k2 == NULL) || (px == NULL) || (py == NULL)) {
+                return ECPoint_mul(group, k1, NULL, NULL, rx, ry);
+        }
+
+        /* initialize precomputation table */
+        for (i = 0; i < 4; i++) {
+                for (j = 0; j < 4; j++) {
+                        MP_CHECKOK(mp_init(&precomp[i][j][0], FLAG(k1)));
+                        MP_CHECKOK(mp_init(&precomp[i][j][1], FLAG(k1)));
+                }
+        }
+
+        /* fill precomputation table */
+        /* assign {k1, k2} = {a, b} such that len(a) >= len(b) */
+        if (mpl_significant_bits(k1) < mpl_significant_bits(k2)) {
+                a = k2;
+                b = k1;
+                if (group->meth->field_enc) {
+                        MP_CHECKOK(group->meth->
+                                           field_enc(px, &precomp[1][0][0], group->meth));
+                        MP_CHECKOK(group->meth->
+                                           field_enc(py, &precomp[1][0][1], group->meth));
+                } else {
+                        MP_CHECKOK(mp_copy(px, &precomp[1][0][0]));
+                        MP_CHECKOK(mp_copy(py, &precomp[1][0][1]));
+                }
+                MP_CHECKOK(mp_copy(&group->genx, &precomp[0][1][0]));
+                MP_CHECKOK(mp_copy(&group->geny, &precomp[0][1][1]));
+        } else {
+                a = k1;
+                b = k2;
+                MP_CHECKOK(mp_copy(&group->genx, &precomp[1][0][0]));
+                MP_CHECKOK(mp_copy(&group->geny, &precomp[1][0][1]));
+                if (group->meth->field_enc) {
+                        MP_CHECKOK(group->meth->
+                                           field_enc(px, &precomp[0][1][0], group->meth));
+                        MP_CHECKOK(group->meth->
+                                           field_enc(py, &precomp[0][1][1], group->meth));
+                } else {
+                        MP_CHECKOK(mp_copy(px, &precomp[0][1][0]));
+                        MP_CHECKOK(mp_copy(py, &precomp[0][1][1]));
+                }
+        }
+        /* precompute [*][0][*] */
+        mp_zero(&precomp[0][0][0]);
+        mp_zero(&precomp[0][0][1]);
+        MP_CHECKOK(group->
+                           point_dbl(&precomp[1][0][0], &precomp[1][0][1],
+                                                 &precomp[2][0][0], &precomp[2][0][1], group));
+        MP_CHECKOK(group->
+                           point_add(&precomp[1][0][0], &precomp[1][0][1],
+                                                 &precomp[2][0][0], &precomp[2][0][1],
+                                                 &precomp[3][0][0], &precomp[3][0][1], group));
+        /* precompute [*][1][*] */
+        for (i = 1; i < 4; i++) {
+                MP_CHECKOK(group->
+                                   point_add(&precomp[0][1][0], &precomp[0][1][1],
+                                                         &precomp[i][0][0], &precomp[i][0][1],
+                                                         &precomp[i][1][0], &precomp[i][1][1], group));
+        }
+        /* precompute [*][2][*] */
+        MP_CHECKOK(group->
+                           point_dbl(&precomp[0][1][0], &precomp[0][1][1],
+                                                 &precomp[0][2][0], &precomp[0][2][1], group));
+        for (i = 1; i < 4; i++) {
+                MP_CHECKOK(group->
+                                   point_add(&precomp[0][2][0], &precomp[0][2][1],
+                                                         &precomp[i][0][0], &precomp[i][0][1],
+                                                         &precomp[i][2][0], &precomp[i][2][1], group));
+        }
+        /* precompute [*][3][*] */
+        MP_CHECKOK(group->
+                           point_add(&precomp[0][1][0], &precomp[0][1][1],
+                                                 &precomp[0][2][0], &precomp[0][2][1],
+                                                 &precomp[0][3][0], &precomp[0][3][1], group));
+        for (i = 1; i < 4; i++) {
+                MP_CHECKOK(group->
+                                   point_add(&precomp[0][3][0], &precomp[0][3][1],
+                                                         &precomp[i][0][0], &precomp[i][0][1],
+                                                         &precomp[i][3][0], &precomp[i][3][1], group));
+        }
+
+        d = (mpl_significant_bits(a) + 1) / 2;
+
+        /* R = inf */
+        MP_CHECKOK(mp_init(&rz, FLAG(k1)));
+        MP_CHECKOK(ec_GFp_pt_set_inf_jac(rx, ry, &rz));
+
+        for (i = d - 1; i >= 0; i--) {
+                ai = MP_GET_BIT(a, 2 * i + 1);
+                ai <<= 1;
+                ai |= MP_GET_BIT(a, 2 * i);
+                bi = MP_GET_BIT(b, 2 * i + 1);
+                bi <<= 1;
+                bi |= MP_GET_BIT(b, 2 * i);
+                /* R = 2^2 * R */
+                MP_CHECKOK(ec_GFp_pt_dbl_jac(rx, ry, &rz, rx, ry, &rz, group));
+                MP_CHECKOK(ec_GFp_pt_dbl_jac(rx, ry, &rz, rx, ry, &rz, group));
+                /* R = R + (ai * A + bi * B) */
+                MP_CHECKOK(ec_GFp_pt_add_jac_aff
+                                   (rx, ry, &rz, &precomp[ai][bi][0], &precomp[ai][bi][1],
+                                        rx, ry, &rz, group));
+        }
+
+        MP_CHECKOK(ec_GFp_pt_jac2aff(rx, ry, &rz, rx, ry, group));
+
+        if (group->meth->field_dec) {
+                MP_CHECKOK(group->meth->field_dec(rx, rx, group->meth));
+                MP_CHECKOK(group->meth->field_dec(ry, ry, group->meth));
+        }
+
+  CLEANUP:
+        mp_clear(&rz);
+        for (i = 0; i < 4; i++) {
+                for (j = 0; j < 4; j++) {
+                        mp_clear(&precomp[i][j][0]);
+                        mp_clear(&precomp[i][j][1]);
+                }
+        }
+        return res;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp_jm.c b/jdk/src/share/native/sun/security/ec/ecp_jm.c
new file mode 100644
index 00000000000..a5e38db21da
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_jm.c
@@ -0,0 +1,353 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library for prime field curves.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stephen Fung <fungstep@hotmail.com>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "ecp.h"
+#include "ecl-priv.h"
+#include "mplogic.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#endif
+
+#define MAX_SCRATCH 6
+
+/* Computes R = 2P.  Elliptic curve points P and R can be identical.  Uses
+ * Modified Jacobian coordinates.
+ *
+ * Assumes input is already field-encoded using field_enc, and returns
+ * output that is still field-encoded.
+ *
+ */
+mp_err
+ec_GFp_pt_dbl_jm(const mp_int *px, const mp_int *py, const mp_int *pz,
+                                 const mp_int *paz4, mp_int *rx, mp_int *ry, mp_int *rz,
+                                 mp_int *raz4, mp_int scratch[], const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int *t0, *t1, *M, *S;
+
+        t0 = &scratch[0];
+        t1 = &scratch[1];
+        M = &scratch[2];
+        S = &scratch[3];
+
+#if MAX_SCRATCH < 4
+#error "Scratch array defined too small "
+#endif
+
+        /* Check for point at infinity */
+        if (ec_GFp_pt_is_inf_jac(px, py, pz) == MP_YES) {
+                /* Set r = pt at infinity by setting rz = 0 */
+
+                MP_CHECKOK(ec_GFp_pt_set_inf_jac(rx, ry, rz));
+                goto CLEANUP;
+        }
+
+        /* M = 3 (px^2) + a*(pz^4) */
+        MP_CHECKOK(group->meth->field_sqr(px, t0, group->meth));
+        MP_CHECKOK(group->meth->field_add(t0, t0, M, group->meth));
+        MP_CHECKOK(group->meth->field_add(t0, M, t0, group->meth));
+        MP_CHECKOK(group->meth->field_add(t0, paz4, M, group->meth));
+
+        /* rz = 2 * py * pz */
+        MP_CHECKOK(group->meth->field_mul(py, pz, S, group->meth));
+        MP_CHECKOK(group->meth->field_add(S, S, rz, group->meth));
+
+        /* t0 = 2y^2 , t1 = 8y^4 */
+        MP_CHECKOK(group->meth->field_sqr(py, t0, group->meth));
+        MP_CHECKOK(group->meth->field_add(t0, t0, t0, group->meth));
+        MP_CHECKOK(group->meth->field_sqr(t0, t1, group->meth));
+        MP_CHECKOK(group->meth->field_add(t1, t1, t1, group->meth));
+
+        /* S = 4 * px * py^2 = 2 * px * t0 */
+        MP_CHECKOK(group->meth->field_mul(px, t0, S, group->meth));
+        MP_CHECKOK(group->meth->field_add(S, S, S, group->meth));
+
+
+        /* rx = M^2 - 2S */
+        MP_CHECKOK(group->meth->field_sqr(M, rx, group->meth));
+        MP_CHECKOK(group->meth->field_sub(rx, S, rx, group->meth));
+        MP_CHECKOK(group->meth->field_sub(rx, S, rx, group->meth));
+
+        /* ry = M * (S - rx) - t1 */
+        MP_CHECKOK(group->meth->field_sub(S, rx, S, group->meth));
+        MP_CHECKOK(group->meth->field_mul(S, M, ry, group->meth));
+        MP_CHECKOK(group->meth->field_sub(ry, t1, ry, group->meth));
+
+        /* ra*z^4 = 2*t1*(apz4) */
+        MP_CHECKOK(group->meth->field_mul(paz4, t1, raz4, group->meth));
+        MP_CHECKOK(group->meth->field_add(raz4, raz4, raz4, group->meth));
+
+
+  CLEANUP:
+        return res;
+}
+
+/* Computes R = P + Q where R is (rx, ry, rz), P is (px, py, pz) and Q is
+ * (qx, qy, 1).  Elliptic curve points P, Q, and R can all be identical.
+ * Uses mixed Modified_Jacobian-affine coordinates. Assumes input is
+ * already field-encoded using field_enc, and returns output that is still
+ * field-encoded. */
+mp_err
+ec_GFp_pt_add_jm_aff(const mp_int *px, const mp_int *py, const mp_int *pz,
+                                         const mp_int *paz4, const mp_int *qx,
+                                         const mp_int *qy, mp_int *rx, mp_int *ry, mp_int *rz,
+                                         mp_int *raz4, mp_int scratch[], const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int *A, *B, *C, *D, *C2, *C3;
+
+        A = &scratch[0];
+        B = &scratch[1];
+        C = &scratch[2];
+        D = &scratch[3];
+        C2 = &scratch[4];
+        C3 = &scratch[5];
+
+#if MAX_SCRATCH < 6
+#error "Scratch array defined too small "
+#endif
+
+        /* If either P or Q is the point at infinity, then return the other
+         * point */
+        if (ec_GFp_pt_is_inf_jac(px, py, pz) == MP_YES) {
+                MP_CHECKOK(ec_GFp_pt_aff2jac(qx, qy, rx, ry, rz, group));
+                MP_CHECKOK(group->meth->field_sqr(rz, raz4, group->meth));
+                MP_CHECKOK(group->meth->field_sqr(raz4, raz4, group->meth));
+                MP_CHECKOK(group->meth->
+                                   field_mul(raz4, &group->curvea, raz4, group->meth));
+                goto CLEANUP;
+        }
+        if (ec_GFp_pt_is_inf_aff(qx, qy) == MP_YES) {
+                MP_CHECKOK(mp_copy(px, rx));
+                MP_CHECKOK(mp_copy(py, ry));
+                MP_CHECKOK(mp_copy(pz, rz));
+                MP_CHECKOK(mp_copy(paz4, raz4));
+                goto CLEANUP;
+        }
+
+        /* A = qx * pz^2, B = qy * pz^3 */
+        MP_CHECKOK(group->meth->field_sqr(pz, A, group->meth));
+        MP_CHECKOK(group->meth->field_mul(A, pz, B, group->meth));
+        MP_CHECKOK(group->meth->field_mul(A, qx, A, group->meth));
+        MP_CHECKOK(group->meth->field_mul(B, qy, B, group->meth));
+
+        /* C = A - px, D = B - py */
+        MP_CHECKOK(group->meth->field_sub(A, px, C, group->meth));
+        MP_CHECKOK(group->meth->field_sub(B, py, D, group->meth));
+
+        /* C2 = C^2, C3 = C^3 */
+        MP_CHECKOK(group->meth->field_sqr(C, C2, group->meth));
+        MP_CHECKOK(group->meth->field_mul(C, C2, C3, group->meth));
+
+        /* rz = pz * C */
+        MP_CHECKOK(group->meth->field_mul(pz, C, rz, group->meth));
+
+        /* C = px * C^2 */
+        MP_CHECKOK(group->meth->field_mul(px, C2, C, group->meth));
+        /* A = D^2 */
+        MP_CHECKOK(group->meth->field_sqr(D, A, group->meth));
+
+        /* rx = D^2 - (C^3 + 2 * (px * C^2)) */
+        MP_CHECKOK(group->meth->field_add(C, C, rx, group->meth));
+        MP_CHECKOK(group->meth->field_add(C3, rx, rx, group->meth));
+        MP_CHECKOK(group->meth->field_sub(A, rx, rx, group->meth));
+
+        /* C3 = py * C^3 */
+        MP_CHECKOK(group->meth->field_mul(py, C3, C3, group->meth));
+
+        /* ry = D * (px * C^2 - rx) - py * C^3 */
+        MP_CHECKOK(group->meth->field_sub(C, rx, ry, group->meth));
+        MP_CHECKOK(group->meth->field_mul(D, ry, ry, group->meth));
+        MP_CHECKOK(group->meth->field_sub(ry, C3, ry, group->meth));
+
+        /* raz4 = a * rz^4 */
+        MP_CHECKOK(group->meth->field_sqr(rz, raz4, group->meth));
+        MP_CHECKOK(group->meth->field_sqr(raz4, raz4, group->meth));
+        MP_CHECKOK(group->meth->
+                           field_mul(raz4, &group->curvea, raz4, group->meth));
+CLEANUP:
+        return res;
+}
+
+/* Computes R = nP where R is (rx, ry) and P is the base point. Elliptic
+ * curve points P and R can be identical. Uses mixed Modified-Jacobian
+ * co-ordinates for doubling and Chudnovsky Jacobian coordinates for
+ * additions. Assumes input is already field-encoded using field_enc, and
+ * returns output that is still field-encoded. Uses 5-bit window NAF
+ * method (algorithm 11) for scalar-point multiplication from Brown,
+ * Hankerson, Lopez, Menezes. Software Implementation of the NIST Elliptic
+ * Curves Over Prime Fields. */
+mp_err
+ec_GFp_pt_mul_jm_wNAF(const mp_int *n, const mp_int *px, const mp_int *py,
+                                          mp_int *rx, mp_int *ry, const ECGroup *group)
+{
+        mp_err res = MP_OKAY;
+        mp_int precomp[16][2], rz, tpx, tpy;
+        mp_int raz4;
+        mp_int scratch[MAX_SCRATCH];
+        signed char *naf = NULL;
+        int i, orderBitSize;
+
+        MP_DIGITS(&rz) = 0;
+        MP_DIGITS(&raz4) = 0;
+        MP_DIGITS(&tpx) = 0;
+        MP_DIGITS(&tpy) = 0;
+        for (i = 0; i < 16; i++) {
+                MP_DIGITS(&precomp[i][0]) = 0;
+                MP_DIGITS(&precomp[i][1]) = 0;
+        }
+        for (i = 0; i < MAX_SCRATCH; i++) {
+                MP_DIGITS(&scratch[i]) = 0;
+        }
+
+        ARGCHK(group != NULL, MP_BADARG);
+        ARGCHK((n != NULL) && (px != NULL) && (py != NULL), MP_BADARG);
+
+        /* initialize precomputation table */
+        MP_CHECKOK(mp_init(&tpx, FLAG(n)));
+        MP_CHECKOK(mp_init(&tpy, FLAG(n)));;
+        MP_CHECKOK(mp_init(&rz, FLAG(n)));
+        MP_CHECKOK(mp_init(&raz4, FLAG(n)));
+
+        for (i = 0; i < 16; i++) {
+                MP_CHECKOK(mp_init(&precomp[i][0], FLAG(n)));
+                MP_CHECKOK(mp_init(&precomp[i][1], FLAG(n)));
+        }
+        for (i = 0; i < MAX_SCRATCH; i++) {
+                MP_CHECKOK(mp_init(&scratch[i], FLAG(n)));
+        }
+
+        /* Set out[8] = P */
+        MP_CHECKOK(mp_copy(px, &precomp[8][0]));
+        MP_CHECKOK(mp_copy(py, &precomp[8][1]));
+
+        /* Set (tpx, tpy) = 2P */
+        MP_CHECKOK(group->
+                           point_dbl(&precomp[8][0], &precomp[8][1], &tpx, &tpy,
+                                                 group));
+
+        /* Set 3P, 5P, ..., 15P */
+        for (i = 8; i < 15; i++) {
+                MP_CHECKOK(group->
+                                   point_add(&precomp[i][0], &precomp[i][1], &tpx, &tpy,
+                                                         &precomp[i + 1][0], &precomp[i + 1][1],
+                                                         group));
+        }
+
+        /* Set -15P, -13P, ..., -P */
+        for (i = 0; i < 8; i++) {
+                MP_CHECKOK(mp_copy(&precomp[15 - i][0], &precomp[i][0]));
+                MP_CHECKOK(group->meth->
+                                   field_neg(&precomp[15 - i][1], &precomp[i][1],
+                                                         group->meth));
+        }
+
+        /* R = inf */
+        MP_CHECKOK(ec_GFp_pt_set_inf_jac(rx, ry, &rz));
+
+        orderBitSize = mpl_significant_bits(&group->order);
+
+        /* Allocate memory for NAF */
+#ifdef _KERNEL
+        naf = (signed char *) kmem_alloc((orderBitSize + 1), FLAG(n));
+#else
+        naf = (signed char *) malloc(sizeof(signed char) * (orderBitSize + 1));
+        if (naf == NULL) {
+                res = MP_MEM;
+                goto CLEANUP;
+        }
+#endif
+
+        /* Compute 5NAF */
+        ec_compute_wNAF(naf, orderBitSize, n, 5);
+
+        /* wNAF method */
+        for (i = orderBitSize; i >= 0; i--) {
+                /* R = 2R */
+                ec_GFp_pt_dbl_jm(rx, ry, &rz, &raz4, rx, ry, &rz,
+                                             &raz4, scratch, group);
+                if (naf[i] != 0) {
+                        ec_GFp_pt_add_jm_aff(rx, ry, &rz, &raz4,
+                                                                 &precomp[(naf[i] + 15) / 2][0],
+                                                                 &precomp[(naf[i] + 15) / 2][1], rx, ry,
+                                                                 &rz, &raz4, scratch, group);
+                }
+        }
+
+        /* convert result S to affine coordinates */
+        MP_CHECKOK(ec_GFp_pt_jac2aff(rx, ry, &rz, rx, ry, group));
+
+  CLEANUP:
+        for (i = 0; i < MAX_SCRATCH; i++) {
+                mp_clear(&scratch[i]);
+        }
+        for (i = 0; i < 16; i++) {
+                mp_clear(&precomp[i][0]);
+                mp_clear(&precomp[i][1]);
+        }
+        mp_clear(&tpx);
+        mp_clear(&tpy);
+        mp_clear(&rz);
+        mp_clear(&raz4);
+#ifdef _KERNEL
+        kmem_free(naf, (orderBitSize + 1));
+#else
+        free(naf);
+#endif
+        return res;
+}
diff --git a/jdk/src/share/native/sun/security/ec/ecp_mont.c b/jdk/src/share/native/sun/security/ec/ecp_mont.c
new file mode 100644
index 00000000000..6b4dbb29e25
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/ecp_mont.c
@@ -0,0 +1,223 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the elliptic curve math library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* Uses Montgomery reduction for field arithmetic.  See mpi/mpmontg.c for
+ * code implementation. */
+
+#include "mpi.h"
+#include "mplogic.h"
+#include "mpi-priv.h"
+#include "ecl-priv.h"
+#include "ecp.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#include <stdio.h>
+#endif
+
+/* Construct a generic GFMethod for arithmetic over prime fields with
+ * irreducible irr. */
+GFMethod *
+GFMethod_consGFp_mont(const mp_int *irr)
+{
+        mp_err res = MP_OKAY;
+        int i;
+        GFMethod *meth = NULL;
+        mp_mont_modulus *mmm;
+
+        meth = GFMethod_consGFp(irr);
+        if (meth == NULL)
+                return NULL;
+
+#ifdef _KERNEL
+        mmm = (mp_mont_modulus *) kmem_alloc(sizeof(mp_mont_modulus),
+            FLAG(irr));
+#else
+        mmm = (mp_mont_modulus *) malloc(sizeof(mp_mont_modulus));
+#endif
+        if (mmm == NULL) {
+                res = MP_MEM;
+                goto CLEANUP;
+        }
+
+        meth->field_mul = &ec_GFp_mul_mont;
+        meth->field_sqr = &ec_GFp_sqr_mont;
+        meth->field_div = &ec_GFp_div_mont;
+        meth->field_enc = &ec_GFp_enc_mont;
+        meth->field_dec = &ec_GFp_dec_mont;
+        meth->extra1 = mmm;
+        meth->extra2 = NULL;
+        meth->extra_free = &ec_GFp_extra_free_mont;
+
+        mmm->N = meth->irr;
+        i = mpl_significant_bits(&meth->irr);
+        i += MP_DIGIT_BIT - 1;
+        mmm->b = i - i % MP_DIGIT_BIT;
+        mmm->n0prime = 0 - s_mp_invmod_radix(MP_DIGIT(&meth->irr, 0));
+
+  CLEANUP:
+        if (res != MP_OKAY) {
+                GFMethod_free(meth);
+                return NULL;
+        }
+        return meth;
+}
+
+/* Wrapper functions for generic prime field arithmetic. */
+
+/* Field multiplication using Montgomery reduction. */
+mp_err
+ec_GFp_mul_mont(const mp_int *a, const mp_int *b, mp_int *r,
+                                const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+#ifdef MP_MONT_USE_MP_MUL
+        /* if MP_MONT_USE_MP_MUL is defined, then the function s_mp_mul_mont
+         * is not implemented and we have to use mp_mul and s_mp_redc directly
+         */
+        MP_CHECKOK(mp_mul(a, b, r));
+        MP_CHECKOK(s_mp_redc(r, (mp_mont_modulus *) meth->extra1));
+#else
+        mp_int s;
+
+        MP_DIGITS(&s) = 0;
+        /* s_mp_mul_mont doesn't allow source and destination to be the same */
+        if ((a == r) || (b == r)) {
+                MP_CHECKOK(mp_init(&s, FLAG(a)));
+                MP_CHECKOK(s_mp_mul_mont
+                                   (a, b, &s, (mp_mont_modulus *) meth->extra1));
+                MP_CHECKOK(mp_copy(&s, r));
+                mp_clear(&s);
+        } else {
+                return s_mp_mul_mont(a, b, r, (mp_mont_modulus *) meth->extra1);
+        }
+#endif
+  CLEANUP:
+        return res;
+}
+
+/* Field squaring using Montgomery reduction. */
+mp_err
+ec_GFp_sqr_mont(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        return ec_GFp_mul_mont(a, a, r, meth);
+}
+
+/* Field division using Montgomery reduction. */
+mp_err
+ec_GFp_div_mont(const mp_int *a, const mp_int *b, mp_int *r,
+                                const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        /* if A=aZ represents a encoded in montgomery coordinates with Z and #
+         * and \ respectively represent multiplication and division in
+         * montgomery coordinates, then A\B = (a/b)Z = (A/B)Z and Binv =
+         * (1/b)Z = (1/B)(Z^2) where B # Binv = Z */
+        MP_CHECKOK(ec_GFp_div(a, b, r, meth));
+        MP_CHECKOK(ec_GFp_enc_mont(r, r, meth));
+        if (a == NULL) {
+                MP_CHECKOK(ec_GFp_enc_mont(r, r, meth));
+        }
+  CLEANUP:
+        return res;
+}
+
+/* Encode a field element in Montgomery form. See s_mp_to_mont in
+ * mpi/mpmontg.c */
+mp_err
+ec_GFp_enc_mont(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_mont_modulus *mmm;
+        mp_err res = MP_OKAY;
+
+        mmm = (mp_mont_modulus *) meth->extra1;
+        MP_CHECKOK(mpl_lsh(a, r, mmm->b));
+        MP_CHECKOK(mp_mod(r, &mmm->N, r));
+  CLEANUP:
+        return res;
+}
+
+/* Decode a field element from Montgomery form. */
+mp_err
+ec_GFp_dec_mont(const mp_int *a, mp_int *r, const GFMethod *meth)
+{
+        mp_err res = MP_OKAY;
+
+        if (a != r) {
+                MP_CHECKOK(mp_copy(a, r));
+        }
+        MP_CHECKOK(s_mp_redc(r, (mp_mont_modulus *) meth->extra1));
+  CLEANUP:
+        return res;
+}
+
+/* Free the memory allocated to the extra fields of Montgomery GFMethod
+ * object. */
+void
+ec_GFp_extra_free_mont(GFMethod *meth)
+{
+        if (meth->extra1 != NULL) {
+#ifdef _KERNEL
+                kmem_free(meth->extra1, sizeof(mp_mont_modulus));
+#else
+                free(meth->extra1);
+#endif
+                meth->extra1 = NULL;
+        }
+}
diff --git a/jdk/src/share/native/sun/security/ec/logtab.h b/jdk/src/share/native/sun/security/ec/logtab.h
new file mode 100644
index 00000000000..6efa0199560
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/logtab.h
@@ -0,0 +1,82 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _LOGTAB_H
+#define _LOGTAB_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+const float s_logv_2[] = {
+   0.000000000f, 0.000000000f, 1.000000000f, 0.630929754f,  /*  0  1  2  3 */
+   0.500000000f, 0.430676558f, 0.386852807f, 0.356207187f,  /*  4  5  6  7 */
+   0.333333333f, 0.315464877f, 0.301029996f, 0.289064826f,  /*  8  9 10 11 */
+   0.278942946f, 0.270238154f, 0.262649535f, 0.255958025f,  /* 12 13 14 15 */
+   0.250000000f, 0.244650542f, 0.239812467f, 0.235408913f,  /* 16 17 18 19 */
+   0.231378213f, 0.227670249f, 0.224243824f, 0.221064729f,  /* 20 21 22 23 */
+   0.218104292f, 0.215338279f, 0.212746054f, 0.210309918f,  /* 24 25 26 27 */
+   0.208014598f, 0.205846832f, 0.203795047f, 0.201849087f,  /* 28 29 30 31 */
+   0.200000000f, 0.198239863f, 0.196561632f, 0.194959022f,  /* 32 33 34 35 */
+   0.193426404f, 0.191958720f, 0.190551412f, 0.189200360f,  /* 36 37 38 39 */
+   0.187901825f, 0.186652411f, 0.185449023f, 0.184288833f,  /* 40 41 42 43 */
+   0.183169251f, 0.182087900f, 0.181042597f, 0.180031327f,  /* 44 45 46 47 */
+   0.179052232f, 0.178103594f, 0.177183820f, 0.176291434f,  /* 48 49 50 51 */
+   0.175425064f, 0.174583430f, 0.173765343f, 0.172969690f,  /* 52 53 54 55 */
+   0.172195434f, 0.171441601f, 0.170707280f, 0.169991616f,  /* 56 57 58 59 */
+   0.169293808f, 0.168613099f, 0.167948779f, 0.167300179f,  /* 60 61 62 63 */
+   0.166666667f
+};
+
+#endif /* _LOGTAB_H */
diff --git a/jdk/src/share/native/sun/security/ec/mp_gf2m-priv.h b/jdk/src/share/native/sun/security/ec/mp_gf2m-priv.h
new file mode 100644
index 00000000000..7a4505807fc
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mp_gf2m-priv.h
@@ -0,0 +1,122 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Multi-precision Binary Polynomial Arithmetic Library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang Shantz <sheueling.chang@sun.com> and
+ *   Douglas Stebila <douglas@stebila.ca> of Sun Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MP_GF2M_PRIV_H_
+#define _MP_GF2M_PRIV_H_
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "mpi-priv.h"
+
+extern const mp_digit mp_gf2m_sqr_tb[16];
+
+#if defined(MP_USE_UINT_DIGIT)
+#define MP_DIGIT_BITS 32
+#else
+#define MP_DIGIT_BITS 64
+#endif
+
+/* Platform-specific macros for fast binary polynomial squaring. */
+#if MP_DIGIT_BITS == 32
+#define gf2m_SQR1(w) \
+    mp_gf2m_sqr_tb[(w) >> 28 & 0xF] << 24 | mp_gf2m_sqr_tb[(w) >> 24 & 0xF] << 16 | \
+    mp_gf2m_sqr_tb[(w) >> 20 & 0xF] <<  8 | mp_gf2m_sqr_tb[(w) >> 16 & 0xF]
+#define gf2m_SQR0(w) \
+    mp_gf2m_sqr_tb[(w) >> 12 & 0xF] << 24 | mp_gf2m_sqr_tb[(w) >>  8 & 0xF] << 16 | \
+    mp_gf2m_sqr_tb[(w) >>  4 & 0xF] <<  8 | mp_gf2m_sqr_tb[(w)       & 0xF]
+#else
+#define gf2m_SQR1(w) \
+    mp_gf2m_sqr_tb[(w) >> 60 & 0xF] << 56 | mp_gf2m_sqr_tb[(w) >> 56 & 0xF] << 48 | \
+    mp_gf2m_sqr_tb[(w) >> 52 & 0xF] << 40 | mp_gf2m_sqr_tb[(w) >> 48 & 0xF] << 32 | \
+    mp_gf2m_sqr_tb[(w) >> 44 & 0xF] << 24 | mp_gf2m_sqr_tb[(w) >> 40 & 0xF] << 16 | \
+    mp_gf2m_sqr_tb[(w) >> 36 & 0xF] <<  8 | mp_gf2m_sqr_tb[(w) >> 32 & 0xF]
+#define gf2m_SQR0(w) \
+    mp_gf2m_sqr_tb[(w) >> 28 & 0xF] << 56 | mp_gf2m_sqr_tb[(w) >> 24 & 0xF] << 48 | \
+    mp_gf2m_sqr_tb[(w) >> 20 & 0xF] << 40 | mp_gf2m_sqr_tb[(w) >> 16 & 0xF] << 32 | \
+    mp_gf2m_sqr_tb[(w) >> 12 & 0xF] << 24 | mp_gf2m_sqr_tb[(w) >>  8 & 0xF] << 16 | \
+    mp_gf2m_sqr_tb[(w) >>  4 & 0xF] <<  8 | mp_gf2m_sqr_tb[(w)       & 0xF]
+#endif
+
+/* Multiply two binary polynomials mp_digits a, b.
+ * Result is a polynomial with degree < 2 * MP_DIGIT_BITS - 1.
+ * Output in two mp_digits rh, rl.
+ */
+void s_bmul_1x1(mp_digit *rh, mp_digit *rl, const mp_digit a, const mp_digit b);
+
+/* Compute xor-multiply of two binary polynomials  (a1, a0) x (b1, b0)
+ * result is a binary polynomial in 4 mp_digits r[4].
+ * The caller MUST ensure that r has the right amount of space allocated.
+ */
+void s_bmul_2x2(mp_digit *r, const mp_digit a1, const mp_digit a0, const mp_digit b1,
+        const mp_digit b0);
+
+/* Compute xor-multiply of two binary polynomials  (a2, a1, a0) x (b2, b1, b0)
+ * result is a binary polynomial in 6 mp_digits r[6].
+ * The caller MUST ensure that r has the right amount of space allocated.
+ */
+void s_bmul_3x3(mp_digit *r, const mp_digit a2, const mp_digit a1, const mp_digit a0,
+        const mp_digit b2, const mp_digit b1, const mp_digit b0);
+
+/* Compute xor-multiply of two binary polynomials  (a3, a2, a1, a0) x (b3, b2, b1, b0)
+ * result is a binary polynomial in 8 mp_digits r[8].
+ * The caller MUST ensure that r has the right amount of space allocated.
+ */
+void s_bmul_4x4(mp_digit *r, const mp_digit a3, const mp_digit a2, const mp_digit a1,
+        const mp_digit a0, const mp_digit b3, const mp_digit b2, const mp_digit b1,
+        const mp_digit b0);
+
+#endif /* _MP_GF2M_PRIV_H_ */
diff --git a/jdk/src/share/native/sun/security/ec/mp_gf2m.c b/jdk/src/share/native/sun/security/ec/mp_gf2m.c
new file mode 100644
index 00000000000..74b64789c96
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mp_gf2m.c
@@ -0,0 +1,624 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Multi-precision Binary Polynomial Arithmetic Library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang Shantz <sheueling.chang@sun.com> and
+ *   Douglas Stebila <douglas@stebila.ca> of Sun Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "mp_gf2m.h"
+#include "mp_gf2m-priv.h"
+#include "mplogic.h"
+#include "mpi-priv.h"
+
+const mp_digit mp_gf2m_sqr_tb[16] =
+{
+      0,     1,     4,     5,    16,    17,    20,    21,
+     64,    65,    68,    69,    80,    81,    84,    85
+};
+
+/* Multiply two binary polynomials mp_digits a, b.
+ * Result is a polynomial with degree < 2 * MP_DIGIT_BITS - 1.
+ * Output in two mp_digits rh, rl.
+ */
+#if MP_DIGIT_BITS == 32
+void
+s_bmul_1x1(mp_digit *rh, mp_digit *rl, const mp_digit a, const mp_digit b)
+{
+    register mp_digit h, l, s;
+    mp_digit tab[8], top2b = a >> 30;
+    register mp_digit a1, a2, a4;
+
+    a1 = a & (0x3FFFFFFF); a2 = a1 << 1; a4 = a2 << 1;
+
+    tab[0] =  0; tab[1] = a1;    tab[2] = a2;    tab[3] = a1^a2;
+    tab[4] = a4; tab[5] = a1^a4; tab[6] = a2^a4; tab[7] = a1^a2^a4;
+
+    s = tab[b       & 0x7]; l  = s;
+    s = tab[b >>  3 & 0x7]; l ^= s <<  3; h  = s >> 29;
+    s = tab[b >>  6 & 0x7]; l ^= s <<  6; h ^= s >> 26;
+    s = tab[b >>  9 & 0x7]; l ^= s <<  9; h ^= s >> 23;
+    s = tab[b >> 12 & 0x7]; l ^= s << 12; h ^= s >> 20;
+    s = tab[b >> 15 & 0x7]; l ^= s << 15; h ^= s >> 17;
+    s = tab[b >> 18 & 0x7]; l ^= s << 18; h ^= s >> 14;
+    s = tab[b >> 21 & 0x7]; l ^= s << 21; h ^= s >> 11;
+    s = tab[b >> 24 & 0x7]; l ^= s << 24; h ^= s >>  8;
+    s = tab[b >> 27 & 0x7]; l ^= s << 27; h ^= s >>  5;
+    s = tab[b >> 30      ]; l ^= s << 30; h ^= s >>  2;
+
+    /* compensate for the top two bits of a */
+
+    if (top2b & 01) { l ^= b << 30; h ^= b >> 2; }
+    if (top2b & 02) { l ^= b << 31; h ^= b >> 1; }
+
+    *rh = h; *rl = l;
+}
+#else
+void
+s_bmul_1x1(mp_digit *rh, mp_digit *rl, const mp_digit a, const mp_digit b)
+{
+    register mp_digit h, l, s;
+    mp_digit tab[16], top3b = a >> 61;
+    register mp_digit a1, a2, a4, a8;
+
+    a1 = a & (0x1FFFFFFFFFFFFFFFULL); a2 = a1 << 1;
+    a4 = a2 << 1; a8 = a4 << 1;
+    tab[ 0] = 0;     tab[ 1] = a1;       tab[ 2] = a2;       tab[ 3] = a1^a2;
+    tab[ 4] = a4;    tab[ 5] = a1^a4;    tab[ 6] = a2^a4;    tab[ 7] = a1^a2^a4;
+    tab[ 8] = a8;    tab[ 9] = a1^a8;    tab[10] = a2^a8;    tab[11] = a1^a2^a8;
+    tab[12] = a4^a8; tab[13] = a1^a4^a8; tab[14] = a2^a4^a8; tab[15] = a1^a2^a4^a8;
+
+    s = tab[b       & 0xF]; l  = s;
+    s = tab[b >>  4 & 0xF]; l ^= s <<  4; h  = s >> 60;
+    s = tab[b >>  8 & 0xF]; l ^= s <<  8; h ^= s >> 56;
+    s = tab[b >> 12 & 0xF]; l ^= s << 12; h ^= s >> 52;
+    s = tab[b >> 16 & 0xF]; l ^= s << 16; h ^= s >> 48;
+    s = tab[b >> 20 & 0xF]; l ^= s << 20; h ^= s >> 44;
+    s = tab[b >> 24 & 0xF]; l ^= s << 24; h ^= s >> 40;
+    s = tab[b >> 28 & 0xF]; l ^= s << 28; h ^= s >> 36;
+    s = tab[b >> 32 & 0xF]; l ^= s << 32; h ^= s >> 32;
+    s = tab[b >> 36 & 0xF]; l ^= s << 36; h ^= s >> 28;
+    s = tab[b >> 40 & 0xF]; l ^= s << 40; h ^= s >> 24;
+    s = tab[b >> 44 & 0xF]; l ^= s << 44; h ^= s >> 20;
+    s = tab[b >> 48 & 0xF]; l ^= s << 48; h ^= s >> 16;
+    s = tab[b >> 52 & 0xF]; l ^= s << 52; h ^= s >> 12;
+    s = tab[b >> 56 & 0xF]; l ^= s << 56; h ^= s >>  8;
+    s = tab[b >> 60      ]; l ^= s << 60; h ^= s >>  4;
+
+    /* compensate for the top three bits of a */
+
+    if (top3b & 01) { l ^= b << 61; h ^= b >> 3; }
+    if (top3b & 02) { l ^= b << 62; h ^= b >> 2; }
+    if (top3b & 04) { l ^= b << 63; h ^= b >> 1; }
+
+    *rh = h; *rl = l;
+}
+#endif
+
+/* Compute xor-multiply of two binary polynomials  (a1, a0) x (b1, b0)
+ * result is a binary polynomial in 4 mp_digits r[4].
+ * The caller MUST ensure that r has the right amount of space allocated.
+ */
+void
+s_bmul_2x2(mp_digit *r, const mp_digit a1, const mp_digit a0, const mp_digit b1,
+           const mp_digit b0)
+{
+    mp_digit m1, m0;
+    /* r[3] = h1, r[2] = h0; r[1] = l1; r[0] = l0 */
+    s_bmul_1x1(r+3, r+2, a1, b1);
+    s_bmul_1x1(r+1, r, a0, b0);
+    s_bmul_1x1(&m1, &m0, a0 ^ a1, b0 ^ b1);
+    /* Correction on m1 ^= l1 ^ h1; m0 ^= l0 ^ h0; */
+    r[2] ^= m1 ^ r[1] ^ r[3];  /* h0 ^= m1 ^ l1 ^ h1; */
+    r[1]  = r[3] ^ r[2] ^ r[0] ^ m1 ^ m0;  /* l1 ^= l0 ^ h0 ^ m0; */
+}
+
+/* Compute xor-multiply of two binary polynomials  (a2, a1, a0) x (b2, b1, b0)
+ * result is a binary polynomial in 6 mp_digits r[6].
+ * The caller MUST ensure that r has the right amount of space allocated.
+ */
+void
+s_bmul_3x3(mp_digit *r, const mp_digit a2, const mp_digit a1, const mp_digit a0,
+        const mp_digit b2, const mp_digit b1, const mp_digit b0)
+{
+        mp_digit zm[4];
+
+        s_bmul_1x1(r+5, r+4, a2, b2);         /* fill top 2 words */
+        s_bmul_2x2(zm, a1, a2^a0, b1, b2^b0); /* fill middle 4 words */
+        s_bmul_2x2(r, a1, a0, b1, b0);        /* fill bottom 4 words */
+
+        zm[3] ^= r[3];
+        zm[2] ^= r[2];
+        zm[1] ^= r[1] ^ r[5];
+        zm[0] ^= r[0] ^ r[4];
+
+        r[5]  ^= zm[3];
+        r[4]  ^= zm[2];
+        r[3]  ^= zm[1];
+        r[2]  ^= zm[0];
+}
+
+/* Compute xor-multiply of two binary polynomials  (a3, a2, a1, a0) x (b3, b2, b1, b0)
+ * result is a binary polynomial in 8 mp_digits r[8].
+ * The caller MUST ensure that r has the right amount of space allocated.
+ */
+void s_bmul_4x4(mp_digit *r, const mp_digit a3, const mp_digit a2, const mp_digit a1,
+        const mp_digit a0, const mp_digit b3, const mp_digit b2, const mp_digit b1,
+        const mp_digit b0)
+{
+        mp_digit zm[4];
+
+        s_bmul_2x2(r+4, a3, a2, b3, b2);            /* fill top 4 words */
+        s_bmul_2x2(zm, a3^a1, a2^a0, b3^b1, b2^b0); /* fill middle 4 words */
+        s_bmul_2x2(r, a1, a0, b1, b0);              /* fill bottom 4 words */
+
+        zm[3] ^= r[3] ^ r[7];
+        zm[2] ^= r[2] ^ r[6];
+        zm[1] ^= r[1] ^ r[5];
+        zm[0] ^= r[0] ^ r[4];
+
+        r[5]  ^= zm[3];
+        r[4]  ^= zm[2];
+        r[3]  ^= zm[1];
+        r[2]  ^= zm[0];
+}
+
+/* Compute addition of two binary polynomials a and b,
+ * store result in c; c could be a or b, a and b could be equal;
+ * c is the bitwise XOR of a and b.
+ */
+mp_err
+mp_badd(const mp_int *a, const mp_int *b, mp_int *c)
+{
+    mp_digit *pa, *pb, *pc;
+    mp_size ix;
+    mp_size used_pa, used_pb;
+    mp_err res = MP_OKAY;
+
+    /* Add all digits up to the precision of b.  If b had more
+     * precision than a initially, swap a, b first
+     */
+    if (MP_USED(a) >= MP_USED(b)) {
+        pa = MP_DIGITS(a);
+        pb = MP_DIGITS(b);
+        used_pa = MP_USED(a);
+        used_pb = MP_USED(b);
+    } else {
+        pa = MP_DIGITS(b);
+        pb = MP_DIGITS(a);
+        used_pa = MP_USED(b);
+        used_pb = MP_USED(a);
+    }
+
+    /* Make sure c has enough precision for the output value */
+    MP_CHECKOK( s_mp_pad(c, used_pa) );
+
+    /* Do word-by-word xor */
+    pc = MP_DIGITS(c);
+    for (ix = 0; ix < used_pb; ix++) {
+        (*pc++) = (*pa++) ^ (*pb++);
+    }
+
+    /* Finish the rest of digits until we're actually done */
+    for (; ix < used_pa; ++ix) {
+        *pc++ = *pa++;
+    }
+
+    MP_USED(c) = used_pa;
+    MP_SIGN(c) = ZPOS;
+    s_mp_clamp(c);
+
+CLEANUP:
+    return res;
+}
+
+#define s_mp_div2(a) MP_CHECKOK( mpl_rsh((a), (a), 1) );
+
+/* Compute binary polynomial multiply d = a * b */
+static void
+s_bmul_d(const mp_digit *a, mp_size a_len, mp_digit b, mp_digit *d)
+{
+    mp_digit a_i, a0b0, a1b1, carry = 0;
+    while (a_len--) {
+        a_i = *a++;
+        s_bmul_1x1(&a1b1, &a0b0, a_i, b);
+        *d++ = a0b0 ^ carry;
+        carry = a1b1;
+    }
+    *d = carry;
+}
+
+/* Compute binary polynomial xor multiply accumulate d ^= a * b */
+static void
+s_bmul_d_add(const mp_digit *a, mp_size a_len, mp_digit b, mp_digit *d)
+{
+    mp_digit a_i, a0b0, a1b1, carry = 0;
+    while (a_len--) {
+        a_i = *a++;
+        s_bmul_1x1(&a1b1, &a0b0, a_i, b);
+        *d++ ^= a0b0 ^ carry;
+        carry = a1b1;
+    }
+    *d ^= carry;
+}
+
+/* Compute binary polynomial xor multiply c = a * b.
+ * All parameters may be identical.
+ */
+mp_err
+mp_bmul(const mp_int *a, const mp_int *b, mp_int *c)
+{
+    mp_digit *pb, b_i;
+    mp_int tmp;
+    mp_size ib, a_used, b_used;
+    mp_err res = MP_OKAY;
+
+    MP_DIGITS(&tmp) = 0;
+
+    ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+    if (a == c) {
+        MP_CHECKOK( mp_init_copy(&tmp, a) );
+        if (a == b)
+            b = &tmp;
+        a = &tmp;
+    } else if (b == c) {
+        MP_CHECKOK( mp_init_copy(&tmp, b) );
+        b = &tmp;
+    }
+
+    if (MP_USED(a) < MP_USED(b)) {
+        const mp_int *xch = b;      /* switch a and b if b longer */
+        b = a;
+        a = xch;
+    }
+
+    MP_USED(c) = 1; MP_DIGIT(c, 0) = 0;
+    MP_CHECKOK( s_mp_pad(c, USED(a) + USED(b)) );
+
+    pb = MP_DIGITS(b);
+    s_bmul_d(MP_DIGITS(a), MP_USED(a), *pb++, MP_DIGITS(c));
+
+    /* Outer loop:  Digits of b */
+    a_used = MP_USED(a);
+    b_used = MP_USED(b);
+        MP_USED(c) = a_used + b_used;
+    for (ib = 1; ib < b_used; ib++) {
+        b_i = *pb++;
+
+        /* Inner product:  Digits of a */
+        if (b_i)
+            s_bmul_d_add(MP_DIGITS(a), a_used, b_i, MP_DIGITS(c) + ib);
+        else
+            MP_DIGIT(c, ib + a_used) = b_i;
+    }
+
+    s_mp_clamp(c);
+
+    SIGN(c) = ZPOS;
+
+CLEANUP:
+    mp_clear(&tmp);
+    return res;
+}
+
+
+/* Compute modular reduction of a and store result in r.
+ * r could be a.
+ * For modular arithmetic, the irreducible polynomial f(t) is represented
+ * as an array of int[], where f(t) is of the form:
+ *     f(t) = t^p[0] + t^p[1] + ... + t^p[k]
+ * where m = p[0] > p[1] > ... > p[k] = 0.
+ */
+mp_err
+mp_bmod(const mp_int *a, const unsigned int p[], mp_int *r)
+{
+    int j, k;
+    int n, dN, d0, d1;
+    mp_digit zz, *z, tmp;
+    mp_size used;
+    mp_err res = MP_OKAY;
+
+    /* The algorithm does the reduction in place in r,
+     * if a != r, copy a into r first so reduction can be done in r
+     */
+    if (a != r) {
+        MP_CHECKOK( mp_copy(a, r) );
+    }
+    z = MP_DIGITS(r);
+
+    /* start reduction */
+    dN = p[0] / MP_DIGIT_BITS;
+    used = MP_USED(r);
+
+    for (j = used - 1; j > dN;) {
+
+        zz = z[j];
+        if (zz == 0) {
+            j--; continue;
+        }
+        z[j] = 0;
+
+        for (k = 1; p[k] > 0; k++) {
+            /* reducing component t^p[k] */
+            n = p[0] - p[k];
+            d0 = n % MP_DIGIT_BITS;
+            d1 = MP_DIGIT_BITS - d0;
+            n /= MP_DIGIT_BITS;
+            z[j-n] ^= (zz>>d0);
+            if (d0)
+                z[j-n-1] ^= (zz<<d1);
+        }
+
+        /* reducing component t^0 */
+        n = dN;
+        d0 = p[0] % MP_DIGIT_BITS;
+        d1 = MP_DIGIT_BITS - d0;
+        z[j-n] ^= (zz >> d0);
+        if (d0)
+            z[j-n-1] ^= (zz << d1);
+
+    }
+
+    /* final round of reduction */
+    while (j == dN) {
+
+        d0 = p[0] % MP_DIGIT_BITS;
+        zz = z[dN] >> d0;
+        if (zz == 0) break;
+        d1 = MP_DIGIT_BITS - d0;
+
+        /* clear up the top d1 bits */
+        if (d0) z[dN] = (z[dN] << d1) >> d1;
+        *z ^= zz; /* reduction t^0 component */
+
+        for (k = 1; p[k] > 0; k++) {
+            /* reducing component t^p[k]*/
+            n = p[k] / MP_DIGIT_BITS;
+            d0 = p[k] % MP_DIGIT_BITS;
+            d1 = MP_DIGIT_BITS - d0;
+            z[n] ^= (zz << d0);
+            tmp = zz >> d1;
+            if (d0 && tmp)
+                z[n+1] ^= tmp;
+        }
+    }
+
+    s_mp_clamp(r);
+CLEANUP:
+    return res;
+}
+
+/* Compute the product of two polynomials a and b, reduce modulo p,
+ * Store the result in r.  r could be a or b; a could be b.
+ */
+mp_err
+mp_bmulmod(const mp_int *a, const mp_int *b, const unsigned int p[], mp_int *r)
+{
+    mp_err res;
+
+    if (a == b) return mp_bsqrmod(a, p, r);
+    if ((res = mp_bmul(a, b, r) ) != MP_OKAY)
+        return res;
+    return mp_bmod(r, p, r);
+}
+
+/* Compute binary polynomial squaring c = a*a mod p .
+ * Parameter r and a can be identical.
+ */
+
+mp_err
+mp_bsqrmod(const mp_int *a, const unsigned int p[], mp_int *r)
+{
+    mp_digit *pa, *pr, a_i;
+    mp_int tmp;
+    mp_size ia, a_used;
+    mp_err res;
+
+    ARGCHK(a != NULL && r != NULL, MP_BADARG);
+    MP_DIGITS(&tmp) = 0;
+
+    if (a == r) {
+        MP_CHECKOK( mp_init_copy(&tmp, a) );
+        a = &tmp;
+    }
+
+    MP_USED(r) = 1; MP_DIGIT(r, 0) = 0;
+    MP_CHECKOK( s_mp_pad(r, 2*USED(a)) );
+
+    pa = MP_DIGITS(a);
+    pr = MP_DIGITS(r);
+    a_used = MP_USED(a);
+        MP_USED(r) = 2 * a_used;
+
+    for (ia = 0; ia < a_used; ia++) {
+        a_i = *pa++;
+        *pr++ = gf2m_SQR0(a_i);
+        *pr++ = gf2m_SQR1(a_i);
+    }
+
+    MP_CHECKOK( mp_bmod(r, p, r) );
+    s_mp_clamp(r);
+    SIGN(r) = ZPOS;
+
+CLEANUP:
+    mp_clear(&tmp);
+    return res;
+}
+
+/* Compute binary polynomial y/x mod p, y divided by x, reduce modulo p.
+ * Store the result in r. r could be x or y, and x could equal y.
+ * Uses algorithm Modular_Division_GF(2^m) from
+ *     Chang-Shantz, S.  "From Euclid's GCD to Montgomery Multiplication to
+ *     the Great Divide".
+ */
+int
+mp_bdivmod(const mp_int *y, const mp_int *x, const mp_int *pp,
+    const unsigned int p[], mp_int *r)
+{
+    mp_int aa, bb, uu;
+    mp_int *a, *b, *u, *v;
+    mp_err res = MP_OKAY;
+
+    MP_DIGITS(&aa) = 0;
+    MP_DIGITS(&bb) = 0;
+    MP_DIGITS(&uu) = 0;
+
+    MP_CHECKOK( mp_init_copy(&aa, x) );
+    MP_CHECKOK( mp_init_copy(&uu, y) );
+    MP_CHECKOK( mp_init_copy(&bb, pp) );
+    MP_CHECKOK( s_mp_pad(r, USED(pp)) );
+    MP_USED(r) = 1; MP_DIGIT(r, 0) = 0;
+
+    a = &aa; b= &bb; u=&uu; v=r;
+    /* reduce x and y mod p */
+    MP_CHECKOK( mp_bmod(a, p, a) );
+    MP_CHECKOK( mp_bmod(u, p, u) );
+
+    while (!mp_isodd(a)) {
+        s_mp_div2(a);
+        if (mp_isodd(u)) {
+            MP_CHECKOK( mp_badd(u, pp, u) );
+        }
+        s_mp_div2(u);
+    }
+
+    do {
+        if (mp_cmp_mag(b, a) > 0) {
+            MP_CHECKOK( mp_badd(b, a, b) );
+            MP_CHECKOK( mp_badd(v, u, v) );
+            do {
+                s_mp_div2(b);
+                if (mp_isodd(v)) {
+                    MP_CHECKOK( mp_badd(v, pp, v) );
+                }
+                s_mp_div2(v);
+            } while (!mp_isodd(b));
+        }
+        else if ((MP_DIGIT(a,0) == 1) && (MP_USED(a) == 1))
+            break;
+        else {
+            MP_CHECKOK( mp_badd(a, b, a) );
+            MP_CHECKOK( mp_badd(u, v, u) );
+            do {
+                s_mp_div2(a);
+                if (mp_isodd(u)) {
+                    MP_CHECKOK( mp_badd(u, pp, u) );
+                }
+                s_mp_div2(u);
+            } while (!mp_isodd(a));
+        }
+    } while (1);
+
+    MP_CHECKOK( mp_copy(u, r) );
+
+CLEANUP:
+    /* XXX this appears to be a memory leak in the NSS code */
+    mp_clear(&aa);
+    mp_clear(&bb);
+    mp_clear(&uu);
+    return res;
+
+}
+
+/* Convert the bit-string representation of a polynomial a into an array
+ * of integers corresponding to the bits with non-zero coefficient.
+ * Up to max elements of the array will be filled.  Return value is total
+ * number of coefficients that would be extracted if array was large enough.
+ */
+int
+mp_bpoly2arr(const mp_int *a, unsigned int p[], int max)
+{
+    int i, j, k;
+    mp_digit top_bit, mask;
+
+    top_bit = 1;
+    top_bit <<= MP_DIGIT_BIT - 1;
+
+    for (k = 0; k < max; k++) p[k] = 0;
+    k = 0;
+
+    for (i = MP_USED(a) - 1; i >= 0; i--) {
+        mask = top_bit;
+        for (j = MP_DIGIT_BIT - 1; j >= 0; j--) {
+            if (MP_DIGITS(a)[i] & mask) {
+                if (k < max) p[k] = MP_DIGIT_BIT * i + j;
+                k++;
+            }
+            mask >>= 1;
+        }
+    }
+
+    return k;
+}
+
+/* Convert the coefficient array representation of a polynomial to a
+ * bit-string.  The array must be terminated by 0.
+ */
+mp_err
+mp_barr2poly(const unsigned int p[], mp_int *a)
+{
+
+    mp_err res = MP_OKAY;
+    int i;
+
+    mp_zero(a);
+    for (i = 0; p[i] > 0; i++) {
+        MP_CHECKOK( mpl_set_bit(a, p[i], 1) );
+    }
+    MP_CHECKOK( mpl_set_bit(a, 0, 1) );
+
+CLEANUP:
+    return res;
+}
diff --git a/jdk/src/share/native/sun/security/ec/mp_gf2m.h b/jdk/src/share/native/sun/security/ec/mp_gf2m.h
new file mode 100644
index 00000000000..b09f3d34377
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mp_gf2m.h
@@ -0,0 +1,83 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Multi-precision Binary Polynomial Arithmetic Library.
+ *
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang Shantz <sheueling.chang@sun.com> and
+ *   Douglas Stebila <douglas@stebila.ca> of Sun Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MP_GF2M_H_
+#define _MP_GF2M_H_
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "mpi.h"
+
+mp_err mp_badd(const mp_int *a, const mp_int *b, mp_int *c);
+mp_err mp_bmul(const mp_int *a, const mp_int *b, mp_int *c);
+
+/* For modular arithmetic, the irreducible polynomial f(t) is represented
+ * as an array of int[], where f(t) is of the form:
+ *     f(t) = t^p[0] + t^p[1] + ... + t^p[k]
+ * where m = p[0] > p[1] > ... > p[k] = 0.
+ */
+mp_err mp_bmod(const mp_int *a, const unsigned int p[], mp_int *r);
+mp_err mp_bmulmod(const mp_int *a, const mp_int *b, const unsigned int p[],
+    mp_int *r);
+mp_err mp_bsqrmod(const mp_int *a, const unsigned int p[], mp_int *r);
+mp_err mp_bdivmod(const mp_int *y, const mp_int *x, const mp_int *pp,
+    const unsigned int p[], mp_int *r);
+
+int mp_bpoly2arr(const mp_int *a, unsigned int p[], int max);
+mp_err mp_barr2poly(const unsigned int p[], mp_int *a);
+
+#endif /* _MP_GF2M_H_ */
diff --git a/jdk/src/share/native/sun/security/ec/mpi-config.h b/jdk/src/share/native/sun/security/ec/mpi-config.h
new file mode 100644
index 00000000000..3618677a90a
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mpi-config.h
@@ -0,0 +1,130 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael J. Fromberger.
+ * Portions created by the Initial Developer are Copyright (C) 1997
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Netscape Communications Corporation
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MPI_CONFIG_H
+#define _MPI_CONFIG_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* $Id: mpi-config.h,v 1.5 2004/04/25 15:03:10 gerv%gerv.net Exp $ */
+
+/*
+  For boolean options,
+  0 = no
+  1 = yes
+
+  Other options are documented individually.
+
+ */
+
+#ifndef MP_IOFUNC
+#define MP_IOFUNC     0  /* include mp_print() ?                */
+#endif
+
+#ifndef MP_MODARITH
+#define MP_MODARITH   1  /* include modular arithmetic ?        */
+#endif
+
+#ifndef MP_NUMTH
+#define MP_NUMTH      1  /* include number theoretic functions? */
+#endif
+
+#ifndef MP_LOGTAB
+#define MP_LOGTAB     1  /* use table of logs instead of log()? */
+#endif
+
+#ifndef MP_MEMSET
+#define MP_MEMSET     1  /* use memset() to zero buffers?       */
+#endif
+
+#ifndef MP_MEMCPY
+#define MP_MEMCPY     1  /* use memcpy() to copy buffers?       */
+#endif
+
+#ifndef MP_CRYPTO
+#define MP_CRYPTO     1  /* erase memory on free?               */
+#endif
+
+#ifndef MP_ARGCHK
+/*
+  0 = no parameter checks
+  1 = runtime checks, continue execution and return an error to caller
+  2 = assertions; dump core on parameter errors
+ */
+#ifdef DEBUG
+#define MP_ARGCHK     2  /* how to check input arguments        */
+#else
+#define MP_ARGCHK     1  /* how to check input arguments        */
+#endif
+#endif
+
+#ifndef MP_DEBUG
+#define MP_DEBUG      0  /* print diagnostic output?            */
+#endif
+
+#ifndef MP_DEFPREC
+#define MP_DEFPREC    64 /* default precision, in digits        */
+#endif
+
+#ifndef MP_MACRO
+#define MP_MACRO      0  /* use macros for frequent calls?      */
+#endif
+
+#ifndef MP_SQUARE
+#define MP_SQUARE     1  /* use separate squaring code?         */
+#endif
+
+#endif /* _MPI_CONFIG_H */
diff --git a/jdk/src/share/native/sun/security/ec/mpi-priv.h b/jdk/src/share/native/sun/security/ec/mpi-priv.h
new file mode 100644
index 00000000000..b2b07ec3210
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mpi-priv.h
@@ -0,0 +1,340 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ *  Arbitrary precision integer arithmetic library
+ *
+ *  NOTE WELL: the content of this header file is NOT part of the "public"
+ *  API for the MPI library, and may change at any time.
+ *  Application programs that use libmpi should NOT include this header file.
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael J. Fromberger.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Netscape Communications Corporation
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MPI_PRIV_H
+#define _MPI_PRIV_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* $Id: mpi-priv.h,v 1.20 2005/11/22 07:16:43 relyea%netscape.com Exp $ */
+
+#include "mpi.h"
+#ifndef _KERNEL
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#endif /* _KERNEL */
+
+#if MP_DEBUG
+#include <stdio.h>
+
+#define DIAG(T,V) {fprintf(stderr,T);mp_print(V,stderr);fputc('\n',stderr);}
+#else
+#define DIAG(T,V)
+#endif
+
+/* If we aren't using a wired-in logarithm table, we need to include
+   the math library to get the log() function
+ */
+
+/* {{{ s_logv_2[] - log table for 2 in various bases */
+
+#if MP_LOGTAB
+/*
+  A table of the logs of 2 for various bases (the 0 and 1 entries of
+  this table are meaningless and should not be referenced).
+
+  This table is used to compute output lengths for the mp_toradix()
+  function.  Since a number n in radix r takes up about log_r(n)
+  digits, we estimate the output size by taking the least integer
+  greater than log_r(n), where:
+
+  log_r(n) = log_2(n) * log_r(2)
+
+  This table, therefore, is a table of log_r(2) for 2 <= r <= 36,
+  which are the output bases supported.
+ */
+
+extern const float s_logv_2[];
+#define LOG_V_2(R)  s_logv_2[(R)]
+
+#else
+
+/*
+   If MP_LOGTAB is not defined, use the math library to compute the
+   logarithms on the fly.  Otherwise, use the table.
+   Pick which works best for your system.
+ */
+
+#include <math.h>
+#define LOG_V_2(R)  (log(2.0)/log(R))
+
+#endif /* if MP_LOGTAB */
+
+/* }}} */
+
+/* {{{ Digit arithmetic macros */
+
+/*
+  When adding and multiplying digits, the results can be larger than
+  can be contained in an mp_digit.  Thus, an mp_word is used.  These
+  macros mask off the upper and lower digits of the mp_word (the
+  mp_word may be more than 2 mp_digits wide, but we only concern
+  ourselves with the low-order 2 mp_digits)
+ */
+
+#define  CARRYOUT(W)  (mp_digit)((W)>>DIGIT_BIT)
+#define  ACCUM(W)     (mp_digit)(W)
+
+#define MP_MIN(a,b)   (((a) < (b)) ? (a) : (b))
+#define MP_MAX(a,b)   (((a) > (b)) ? (a) : (b))
+#define MP_HOWMANY(a,b) (((a) + (b) - 1)/(b))
+#define MP_ROUNDUP(a,b) (MP_HOWMANY(a,b) * (b))
+
+/* }}} */
+
+/* {{{ Comparison constants */
+
+#define  MP_LT       -1
+#define  MP_EQ        0
+#define  MP_GT        1
+
+/* }}} */
+
+/* {{{ private function declarations */
+
+/*
+   If MP_MACRO is false, these will be defined as actual functions;
+   otherwise, suitable macro definitions will be used.  This works
+   around the fact that ANSI C89 doesn't support an 'inline' keyword
+   (although I hear C9x will ... about bloody time).  At present, the
+   macro definitions are identical to the function bodies, but they'll
+   expand in place, instead of generating a function call.
+
+   I chose these particular functions to be made into macros because
+   some profiling showed they are called a lot on a typical workload,
+   and yet they are primarily housekeeping.
+ */
+#if MP_MACRO == 0
+ void     s_mp_setz(mp_digit *dp, mp_size count); /* zero digits           */
+ void     s_mp_copy(const mp_digit *sp, mp_digit *dp, mp_size count); /* copy */
+ void    *s_mp_alloc(size_t nb, size_t ni, int flag); /* general allocator    */
+ void     s_mp_free(void *ptr, mp_size);          /* general free function */
+extern unsigned long mp_allocs;
+extern unsigned long mp_frees;
+extern unsigned long mp_copies;
+#else
+
+ /* Even if these are defined as macros, we need to respect the settings
+    of the MP_MEMSET and MP_MEMCPY configuration options...
+  */
+ #if MP_MEMSET == 0
+  #define  s_mp_setz(dp, count) \
+       {int ix;for(ix=0;ix<(count);ix++)(dp)[ix]=0;}
+ #else
+  #define  s_mp_setz(dp, count) memset(dp, 0, (count) * sizeof(mp_digit))
+ #endif /* MP_MEMSET */
+
+ #if MP_MEMCPY == 0
+  #define  s_mp_copy(sp, dp, count) \
+       {int ix;for(ix=0;ix<(count);ix++)(dp)[ix]=(sp)[ix];}
+ #else
+  #define  s_mp_copy(sp, dp, count) memcpy(dp, sp, (count) * sizeof(mp_digit))
+ #endif /* MP_MEMCPY */
+
+ #define  s_mp_alloc(nb, ni)  calloc(nb, ni)
+ #define  s_mp_free(ptr) {if(ptr) free(ptr);}
+#endif /* MP_MACRO */
+
+mp_err   s_mp_grow(mp_int *mp, mp_size min);   /* increase allocated size */
+mp_err   s_mp_pad(mp_int *mp, mp_size min);    /* left pad with zeroes    */
+
+#if MP_MACRO == 0
+ void     s_mp_clamp(mp_int *mp);               /* clip leading zeroes     */
+#else
+ #define  s_mp_clamp(mp)\
+  { mp_size used = MP_USED(mp); \
+    while (used > 1 && DIGIT(mp, used - 1) == 0) --used; \
+    MP_USED(mp) = used; \
+  }
+#endif /* MP_MACRO */
+
+void     s_mp_exch(mp_int *a, mp_int *b);      /* swap a and b in place   */
+
+mp_err   s_mp_lshd(mp_int *mp, mp_size p);     /* left-shift by p digits  */
+void     s_mp_rshd(mp_int *mp, mp_size p);     /* right-shift by p digits */
+mp_err   s_mp_mul_2d(mp_int *mp, mp_digit d);  /* multiply by 2^d in place */
+void     s_mp_div_2d(mp_int *mp, mp_digit d);  /* divide by 2^d in place  */
+void     s_mp_mod_2d(mp_int *mp, mp_digit d);  /* modulo 2^d in place     */
+void     s_mp_div_2(mp_int *mp);               /* divide by 2 in place    */
+mp_err   s_mp_mul_2(mp_int *mp);               /* multiply by 2 in place  */
+mp_err   s_mp_norm(mp_int *a, mp_int *b, mp_digit *pd);
+                                               /* normalize for division  */
+mp_err   s_mp_add_d(mp_int *mp, mp_digit d);   /* unsigned digit addition */
+mp_err   s_mp_sub_d(mp_int *mp, mp_digit d);   /* unsigned digit subtract */
+mp_err   s_mp_mul_d(mp_int *mp, mp_digit d);   /* unsigned digit multiply */
+mp_err   s_mp_div_d(mp_int *mp, mp_digit d, mp_digit *r);
+                                               /* unsigned digit divide   */
+mp_err   s_mp_reduce(mp_int *x, const mp_int *m, const mp_int *mu);
+                                               /* Barrett reduction       */
+mp_err   s_mp_add(mp_int *a, const mp_int *b); /* magnitude addition      */
+mp_err   s_mp_add_3arg(const mp_int *a, const mp_int *b, mp_int *c);
+mp_err   s_mp_sub(mp_int *a, const mp_int *b); /* magnitude subtract      */
+mp_err   s_mp_sub_3arg(const mp_int *a, const mp_int *b, mp_int *c);
+mp_err   s_mp_add_offset(mp_int *a, mp_int *b, mp_size offset);
+                                               /* a += b * RADIX^offset   */
+mp_err   s_mp_mul(mp_int *a, const mp_int *b); /* magnitude multiply      */
+#if MP_SQUARE
+mp_err   s_mp_sqr(mp_int *a);                  /* magnitude square        */
+#else
+#define  s_mp_sqr(a) s_mp_mul(a, a)
+#endif
+mp_err   s_mp_div(mp_int *rem, mp_int *div, mp_int *quot); /* magnitude div */
+mp_err   s_mp_exptmod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c);
+mp_err   s_mp_2expt(mp_int *a, mp_digit k);    /* a = 2^k                 */
+int      s_mp_cmp(const mp_int *a, const mp_int *b); /* magnitude comparison */
+int      s_mp_cmp_d(const mp_int *a, mp_digit d); /* magnitude digit compare */
+int      s_mp_ispow2(const mp_int *v);         /* is v a power of 2?      */
+int      s_mp_ispow2d(mp_digit d);             /* is d a power of 2?      */
+
+int      s_mp_tovalue(char ch, int r);          /* convert ch to value    */
+char     s_mp_todigit(mp_digit val, int r, int low); /* convert val to digit */
+int      s_mp_outlen(int bits, int r);          /* output length in bytes */
+mp_digit s_mp_invmod_radix(mp_digit P);   /* returns (P ** -1) mod RADIX */
+mp_err   s_mp_invmod_odd_m( const mp_int *a, const mp_int *m, mp_int *c);
+mp_err   s_mp_invmod_2d(    const mp_int *a, mp_size k,       mp_int *c);
+mp_err   s_mp_invmod_even_m(const mp_int *a, const mp_int *m, mp_int *c);
+
+#ifdef NSS_USE_COMBA
+
+#define IS_POWER_OF_2(a) ((a) && !((a) & ((a)-1)))
+
+void s_mp_mul_comba_4(const mp_int *A, const mp_int *B, mp_int *C);
+void s_mp_mul_comba_8(const mp_int *A, const mp_int *B, mp_int *C);
+void s_mp_mul_comba_16(const mp_int *A, const mp_int *B, mp_int *C);
+void s_mp_mul_comba_32(const mp_int *A, const mp_int *B, mp_int *C);
+
+void s_mp_sqr_comba_4(const mp_int *A, mp_int *B);
+void s_mp_sqr_comba_8(const mp_int *A, mp_int *B);
+void s_mp_sqr_comba_16(const mp_int *A, mp_int *B);
+void s_mp_sqr_comba_32(const mp_int *A, mp_int *B);
+
+#endif /* end NSS_USE_COMBA */
+
+/* ------ mpv functions, operate on arrays of digits, not on mp_int's ------ */
+#if defined (__OS2__) && defined (__IBMC__)
+#define MPI_ASM_DECL __cdecl
+#else
+#define MPI_ASM_DECL
+#endif
+
+#ifdef MPI_AMD64
+
+mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit);
+mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit);
+
+/* c = a * b */
+#define s_mpv_mul_d(a, a_len, b, c) \
+        ((unsigned long*)c)[a_len] = s_mpv_mul_set_vec64(c, a, a_len, b)
+
+/* c += a * b */
+#define s_mpv_mul_d_add(a, a_len, b, c) \
+        ((unsigned long*)c)[a_len] = s_mpv_mul_add_vec64(c, a, a_len, b)
+
+#else
+
+void     MPI_ASM_DECL s_mpv_mul_d(const mp_digit *a, mp_size a_len,
+                                        mp_digit b, mp_digit *c);
+void     MPI_ASM_DECL s_mpv_mul_d_add(const mp_digit *a, mp_size a_len,
+                                            mp_digit b, mp_digit *c);
+
+#endif
+
+void     MPI_ASM_DECL s_mpv_mul_d_add_prop(const mp_digit *a,
+                                                mp_size a_len, mp_digit b,
+                                                mp_digit *c);
+void     MPI_ASM_DECL s_mpv_sqr_add_prop(const mp_digit *a,
+                                                mp_size a_len,
+                                                mp_digit *sqrs);
+
+mp_err   MPI_ASM_DECL s_mpv_div_2dx1d(mp_digit Nhi, mp_digit Nlo,
+                            mp_digit divisor, mp_digit *quot, mp_digit *rem);
+
+/* c += a * b * (MP_RADIX ** offset);  */
+#define s_mp_mul_d_add_offset(a, b, c, off) \
+(s_mpv_mul_d_add_prop(MP_DIGITS(a), MP_USED(a), b, MP_DIGITS(c) + off), MP_OKAY)
+
+typedef struct {
+  mp_int       N;       /* modulus N */
+  mp_digit     n0prime; /* n0' = - (n0 ** -1) mod MP_RADIX */
+  mp_size      b;       /* R == 2 ** b,  also b = # significant bits in N */
+} mp_mont_modulus;
+
+mp_err s_mp_mul_mont(const mp_int *a, const mp_int *b, mp_int *c,
+                       mp_mont_modulus *mmm);
+mp_err s_mp_redc(mp_int *T, mp_mont_modulus *mmm);
+
+/*
+ * s_mpi_getProcessorLineSize() returns the size in bytes of the cache line
+ * if a cache exists, or zero if there is no cache. If more than one
+ * cache line exists, it should return the smallest line size (which is
+ * usually the L1 cache).
+ *
+ * mp_modexp uses this information to make sure that private key information
+ * isn't being leaked through the cache.
+ *
+ * see mpcpucache.c for the implementation.
+ */
+unsigned long s_mpi_getProcessorLineSize();
+
+/* }}} */
+#endif /* _MPI_PRIV_H */
diff --git a/jdk/src/share/native/sun/security/ec/mpi.c b/jdk/src/share/native/sun/security/ec/mpi.c
new file mode 100644
index 00000000000..9f771882b01
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mpi.c
@@ -0,0 +1,4886 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ *
+ *  Arbitrary precision integer arithmetic library
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael J. Fromberger.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Netscape Communications Corporation
+ *   Douglas Stebila <douglas@stebila.ca> of Sun Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* $Id: mpi.c,v 1.45 2006/09/29 20:12:21 alexei.volkov.bugs%sun.com Exp $ */
+
+#include "mpi-priv.h"
+#if defined(OSF1)
+#include <c_asm.h>
+#endif
+
+#if MP_LOGTAB
+/*
+  A table of the logs of 2 for various bases (the 0 and 1 entries of
+  this table are meaningless and should not be referenced).
+
+  This table is used to compute output lengths for the mp_toradix()
+  function.  Since a number n in radix r takes up about log_r(n)
+  digits, we estimate the output size by taking the least integer
+  greater than log_r(n), where:
+
+  log_r(n) = log_2(n) * log_r(2)
+
+  This table, therefore, is a table of log_r(2) for 2 <= r <= 36,
+  which are the output bases supported.
+ */
+#include "logtab.h"
+#endif
+
+/* {{{ Constant strings */
+
+/* Constant strings returned by mp_strerror() */
+static const char *mp_err_string[] = {
+  "unknown result code",     /* say what?            */
+  "boolean true",            /* MP_OKAY, MP_YES      */
+  "boolean false",           /* MP_NO                */
+  "out of memory",           /* MP_MEM               */
+  "argument out of range",   /* MP_RANGE             */
+  "invalid input parameter", /* MP_BADARG            */
+  "result is undefined"      /* MP_UNDEF             */
+};
+
+/* Value to digit maps for radix conversion   */
+
+/* s_dmap_1 - standard digits and letters */
+static const char *s_dmap_1 =
+  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/";
+
+/* }}} */
+
+unsigned long mp_allocs;
+unsigned long mp_frees;
+unsigned long mp_copies;
+
+/* {{{ Default precision manipulation */
+
+/* Default precision for newly created mp_int's      */
+static mp_size s_mp_defprec = MP_DEFPREC;
+
+mp_size mp_get_prec(void)
+{
+  return s_mp_defprec;
+
+} /* end mp_get_prec() */
+
+void         mp_set_prec(mp_size prec)
+{
+  if(prec == 0)
+    s_mp_defprec = MP_DEFPREC;
+  else
+    s_mp_defprec = prec;
+
+} /* end mp_set_prec() */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/* {{{ mp_init(mp, kmflag) */
+
+/*
+  mp_init(mp, kmflag)
+
+  Initialize a new zero-valued mp_int.  Returns MP_OKAY if successful,
+  MP_MEM if memory could not be allocated for the structure.
+ */
+
+mp_err mp_init(mp_int *mp, int kmflag)
+{
+  return mp_init_size(mp, s_mp_defprec, kmflag);
+
+} /* end mp_init() */
+
+/* }}} */
+
+/* {{{ mp_init_size(mp, prec, kmflag) */
+
+/*
+  mp_init_size(mp, prec, kmflag)
+
+  Initialize a new zero-valued mp_int with at least the given
+  precision; returns MP_OKAY if successful, or MP_MEM if memory could
+  not be allocated for the structure.
+ */
+
+mp_err mp_init_size(mp_int *mp, mp_size prec, int kmflag)
+{
+  ARGCHK(mp != NULL && prec > 0, MP_BADARG);
+
+  prec = MP_ROUNDUP(prec, s_mp_defprec);
+  if((DIGITS(mp) = s_mp_alloc(prec, sizeof(mp_digit), kmflag)) == NULL)
+    return MP_MEM;
+
+  SIGN(mp) = ZPOS;
+  USED(mp) = 1;
+  ALLOC(mp) = prec;
+
+  return MP_OKAY;
+
+} /* end mp_init_size() */
+
+/* }}} */
+
+/* {{{ mp_init_copy(mp, from) */
+
+/*
+  mp_init_copy(mp, from)
+
+  Initialize mp as an exact copy of from.  Returns MP_OKAY if
+  successful, MP_MEM if memory could not be allocated for the new
+  structure.
+ */
+
+mp_err mp_init_copy(mp_int *mp, const mp_int *from)
+{
+  ARGCHK(mp != NULL && from != NULL, MP_BADARG);
+
+  if(mp == from)
+    return MP_OKAY;
+
+  if((DIGITS(mp) = s_mp_alloc(ALLOC(from), sizeof(mp_digit), FLAG(from))) == NULL)
+    return MP_MEM;
+
+  s_mp_copy(DIGITS(from), DIGITS(mp), USED(from));
+  USED(mp) = USED(from);
+  ALLOC(mp) = ALLOC(from);
+  SIGN(mp) = SIGN(from);
+
+#ifndef _WIN32
+  FLAG(mp) = FLAG(from);
+#endif /* _WIN32 */
+
+  return MP_OKAY;
+
+} /* end mp_init_copy() */
+
+/* }}} */
+
+/* {{{ mp_copy(from, to) */
+
+/*
+  mp_copy(from, to)
+
+  Copies the mp_int 'from' to the mp_int 'to'.  It is presumed that
+  'to' has already been initialized (if not, use mp_init_copy()
+  instead). If 'from' and 'to' are identical, nothing happens.
+ */
+
+mp_err mp_copy(const mp_int *from, mp_int *to)
+{
+  ARGCHK(from != NULL && to != NULL, MP_BADARG);
+
+  if(from == to)
+    return MP_OKAY;
+
+  ++mp_copies;
+  { /* copy */
+    mp_digit   *tmp;
+
+    /*
+      If the allocated buffer in 'to' already has enough space to hold
+      all the used digits of 'from', we'll re-use it to avoid hitting
+      the memory allocater more than necessary; otherwise, we'd have
+      to grow anyway, so we just allocate a hunk and make the copy as
+      usual
+     */
+    if(ALLOC(to) >= USED(from)) {
+      s_mp_setz(DIGITS(to) + USED(from), ALLOC(to) - USED(from));
+      s_mp_copy(DIGITS(from), DIGITS(to), USED(from));
+
+    } else {
+      if((tmp = s_mp_alloc(ALLOC(from), sizeof(mp_digit), FLAG(from))) == NULL)
+        return MP_MEM;
+
+      s_mp_copy(DIGITS(from), tmp, USED(from));
+
+      if(DIGITS(to) != NULL) {
+#if MP_CRYPTO
+        s_mp_setz(DIGITS(to), ALLOC(to));
+#endif
+        s_mp_free(DIGITS(to), ALLOC(to));
+      }
+
+      DIGITS(to) = tmp;
+      ALLOC(to) = ALLOC(from);
+    }
+
+    /* Copy the precision and sign from the original */
+    USED(to) = USED(from);
+    SIGN(to) = SIGN(from);
+  } /* end copy */
+
+  return MP_OKAY;
+
+} /* end mp_copy() */
+
+/* }}} */
+
+/* {{{ mp_exch(mp1, mp2) */
+
+/*
+  mp_exch(mp1, mp2)
+
+  Exchange mp1 and mp2 without allocating any intermediate memory
+  (well, unless you count the stack space needed for this call and the
+  locals it creates...).  This cannot fail.
+ */
+
+void mp_exch(mp_int *mp1, mp_int *mp2)
+{
+#if MP_ARGCHK == 2
+  assert(mp1 != NULL && mp2 != NULL);
+#else
+  if(mp1 == NULL || mp2 == NULL)
+    return;
+#endif
+
+  s_mp_exch(mp1, mp2);
+
+} /* end mp_exch() */
+
+/* }}} */
+
+/* {{{ mp_clear(mp) */
+
+/*
+  mp_clear(mp)
+
+  Release the storage used by an mp_int, and void its fields so that
+  if someone calls mp_clear() again for the same int later, we won't
+  get tollchocked.
+ */
+
+void   mp_clear(mp_int *mp)
+{
+  if(mp == NULL)
+    return;
+
+  if(DIGITS(mp) != NULL) {
+#if MP_CRYPTO
+    s_mp_setz(DIGITS(mp), ALLOC(mp));
+#endif
+    s_mp_free(DIGITS(mp), ALLOC(mp));
+    DIGITS(mp) = NULL;
+  }
+
+  USED(mp) = 0;
+  ALLOC(mp) = 0;
+
+} /* end mp_clear() */
+
+/* }}} */
+
+/* {{{ mp_zero(mp) */
+
+/*
+  mp_zero(mp)
+
+  Set mp to zero.  Does not change the allocated size of the structure,
+  and therefore cannot fail (except on a bad argument, which we ignore)
+ */
+void   mp_zero(mp_int *mp)
+{
+  if(mp == NULL)
+    return;
+
+  s_mp_setz(DIGITS(mp), ALLOC(mp));
+  USED(mp) = 1;
+  SIGN(mp) = ZPOS;
+
+} /* end mp_zero() */
+
+/* }}} */
+
+/* {{{ mp_set(mp, d) */
+
+void   mp_set(mp_int *mp, mp_digit d)
+{
+  if(mp == NULL)
+    return;
+
+  mp_zero(mp);
+  DIGIT(mp, 0) = d;
+
+} /* end mp_set() */
+
+/* }}} */
+
+/* {{{ mp_set_int(mp, z) */
+
+mp_err mp_set_int(mp_int *mp, long z)
+{
+  int            ix;
+  unsigned long  v = labs(z);
+  mp_err         res;
+
+  ARGCHK(mp != NULL, MP_BADARG);
+
+  mp_zero(mp);
+  if(z == 0)
+    return MP_OKAY;  /* shortcut for zero */
+
+  if (sizeof v <= sizeof(mp_digit)) {
+    DIGIT(mp,0) = v;
+  } else {
+    for (ix = sizeof(long) - 1; ix >= 0; ix--) {
+      if ((res = s_mp_mul_d(mp, (UCHAR_MAX + 1))) != MP_OKAY)
+        return res;
+
+      res = s_mp_add_d(mp, (mp_digit)((v >> (ix * CHAR_BIT)) & UCHAR_MAX));
+      if (res != MP_OKAY)
+        return res;
+    }
+  }
+  if(z < 0)
+    SIGN(mp) = NEG;
+
+  return MP_OKAY;
+
+} /* end mp_set_int() */
+
+/* }}} */
+
+/* {{{ mp_set_ulong(mp, z) */
+
+mp_err mp_set_ulong(mp_int *mp, unsigned long z)
+{
+  int            ix;
+  mp_err         res;
+
+  ARGCHK(mp != NULL, MP_BADARG);
+
+  mp_zero(mp);
+  if(z == 0)
+    return MP_OKAY;  /* shortcut for zero */
+
+  if (sizeof z <= sizeof(mp_digit)) {
+    DIGIT(mp,0) = z;
+  } else {
+    for (ix = sizeof(long) - 1; ix >= 0; ix--) {
+      if ((res = s_mp_mul_d(mp, (UCHAR_MAX + 1))) != MP_OKAY)
+        return res;
+
+      res = s_mp_add_d(mp, (mp_digit)((z >> (ix * CHAR_BIT)) & UCHAR_MAX));
+      if (res != MP_OKAY)
+        return res;
+    }
+  }
+  return MP_OKAY;
+} /* end mp_set_ulong() */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/* {{{ Digit arithmetic */
+
+/* {{{ mp_add_d(a, d, b) */
+
+/*
+  mp_add_d(a, d, b)
+
+  Compute the sum b = a + d, for a single digit d.  Respects the sign of
+  its primary addend (single digits are unsigned anyway).
+ */
+
+mp_err mp_add_d(const mp_int *a, mp_digit d, mp_int *b)
+{
+  mp_int   tmp;
+  mp_err   res;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  if((res = mp_init_copy(&tmp, a)) != MP_OKAY)
+    return res;
+
+  if(SIGN(&tmp) == ZPOS) {
+    if((res = s_mp_add_d(&tmp, d)) != MP_OKAY)
+      goto CLEANUP;
+  } else if(s_mp_cmp_d(&tmp, d) >= 0) {
+    if((res = s_mp_sub_d(&tmp, d)) != MP_OKAY)
+      goto CLEANUP;
+  } else {
+    mp_neg(&tmp, &tmp);
+
+    DIGIT(&tmp, 0) = d - DIGIT(&tmp, 0);
+  }
+
+  if(s_mp_cmp_d(&tmp, 0) == 0)
+    SIGN(&tmp) = ZPOS;
+
+  s_mp_exch(&tmp, b);
+
+CLEANUP:
+  mp_clear(&tmp);
+  return res;
+
+} /* end mp_add_d() */
+
+/* }}} */
+
+/* {{{ mp_sub_d(a, d, b) */
+
+/*
+  mp_sub_d(a, d, b)
+
+  Compute the difference b = a - d, for a single digit d.  Respects the
+  sign of its subtrahend (single digits are unsigned anyway).
+ */
+
+mp_err mp_sub_d(const mp_int *a, mp_digit d, mp_int *b)
+{
+  mp_int   tmp;
+  mp_err   res;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  if((res = mp_init_copy(&tmp, a)) != MP_OKAY)
+    return res;
+
+  if(SIGN(&tmp) == NEG) {
+    if((res = s_mp_add_d(&tmp, d)) != MP_OKAY)
+      goto CLEANUP;
+  } else if(s_mp_cmp_d(&tmp, d) >= 0) {
+    if((res = s_mp_sub_d(&tmp, d)) != MP_OKAY)
+      goto CLEANUP;
+  } else {
+    mp_neg(&tmp, &tmp);
+
+    DIGIT(&tmp, 0) = d - DIGIT(&tmp, 0);
+    SIGN(&tmp) = NEG;
+  }
+
+  if(s_mp_cmp_d(&tmp, 0) == 0)
+    SIGN(&tmp) = ZPOS;
+
+  s_mp_exch(&tmp, b);
+
+CLEANUP:
+  mp_clear(&tmp);
+  return res;
+
+} /* end mp_sub_d() */
+
+/* }}} */
+
+/* {{{ mp_mul_d(a, d, b) */
+
+/*
+  mp_mul_d(a, d, b)
+
+  Compute the product b = a * d, for a single digit d.  Respects the sign
+  of its multiplicand (single digits are unsigned anyway)
+ */
+
+mp_err mp_mul_d(const mp_int *a, mp_digit d, mp_int *b)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  if(d == 0) {
+    mp_zero(b);
+    return MP_OKAY;
+  }
+
+  if((res = mp_copy(a, b)) != MP_OKAY)
+    return res;
+
+  res = s_mp_mul_d(b, d);
+
+  return res;
+
+} /* end mp_mul_d() */
+
+/* }}} */
+
+/* {{{ mp_mul_2(a, c) */
+
+mp_err mp_mul_2(const mp_int *a, mp_int *c)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL && c != NULL, MP_BADARG);
+
+  if((res = mp_copy(a, c)) != MP_OKAY)
+    return res;
+
+  return s_mp_mul_2(c);
+
+} /* end mp_mul_2() */
+
+/* }}} */
+
+/* {{{ mp_div_d(a, d, q, r) */
+
+/*
+  mp_div_d(a, d, q, r)
+
+  Compute the quotient q = a / d and remainder r = a mod d, for a
+  single digit d.  Respects the sign of its divisor (single digits are
+  unsigned anyway).
+ */
+
+mp_err mp_div_d(const mp_int *a, mp_digit d, mp_int *q, mp_digit *r)
+{
+  mp_err   res;
+  mp_int   qp;
+  mp_digit rem;
+  int      pow;
+
+  ARGCHK(a != NULL, MP_BADARG);
+
+  if(d == 0)
+    return MP_RANGE;
+
+  /* Shortcut for powers of two ... */
+  if((pow = s_mp_ispow2d(d)) >= 0) {
+    mp_digit  mask;
+
+    mask = ((mp_digit)1 << pow) - 1;
+    rem = DIGIT(a, 0) & mask;
+
+    if(q) {
+      mp_copy(a, q);
+      s_mp_div_2d(q, pow);
+    }
+
+    if(r)
+      *r = rem;
+
+    return MP_OKAY;
+  }
+
+  if((res = mp_init_copy(&qp, a)) != MP_OKAY)
+    return res;
+
+  res = s_mp_div_d(&qp, d, &rem);
+
+  if(s_mp_cmp_d(&qp, 0) == 0)
+    SIGN(q) = ZPOS;
+
+  if(r)
+    *r = rem;
+
+  if(q)
+    s_mp_exch(&qp, q);
+
+  mp_clear(&qp);
+  return res;
+
+} /* end mp_div_d() */
+
+/* }}} */
+
+/* {{{ mp_div_2(a, c) */
+
+/*
+  mp_div_2(a, c)
+
+  Compute c = a / 2, disregarding the remainder.
+ */
+
+mp_err mp_div_2(const mp_int *a, mp_int *c)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL && c != NULL, MP_BADARG);
+
+  if((res = mp_copy(a, c)) != MP_OKAY)
+    return res;
+
+  s_mp_div_2(c);
+
+  return MP_OKAY;
+
+} /* end mp_div_2() */
+
+/* }}} */
+
+/* {{{ mp_expt_d(a, d, b) */
+
+mp_err mp_expt_d(const mp_int *a, mp_digit d, mp_int *c)
+{
+  mp_int   s, x;
+  mp_err   res;
+
+  ARGCHK(a != NULL && c != NULL, MP_BADARG);
+
+  if((res = mp_init(&s, FLAG(a))) != MP_OKAY)
+    return res;
+  if((res = mp_init_copy(&x, a)) != MP_OKAY)
+    goto X;
+
+  DIGIT(&s, 0) = 1;
+
+  while(d != 0) {
+    if(d & 1) {
+      if((res = s_mp_mul(&s, &x)) != MP_OKAY)
+        goto CLEANUP;
+    }
+
+    d /= 2;
+
+    if((res = s_mp_sqr(&x)) != MP_OKAY)
+      goto CLEANUP;
+  }
+
+  s_mp_exch(&s, c);
+
+CLEANUP:
+  mp_clear(&x);
+X:
+  mp_clear(&s);
+
+  return res;
+
+} /* end mp_expt_d() */
+
+/* }}} */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/* {{{ Full arithmetic */
+
+/* {{{ mp_abs(a, b) */
+
+/*
+  mp_abs(a, b)
+
+  Compute b = |a|.  'a' and 'b' may be identical.
+ */
+
+mp_err mp_abs(const mp_int *a, mp_int *b)
+{
+  mp_err   res;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  if((res = mp_copy(a, b)) != MP_OKAY)
+    return res;
+
+  SIGN(b) = ZPOS;
+
+  return MP_OKAY;
+
+} /* end mp_abs() */
+
+/* }}} */
+
+/* {{{ mp_neg(a, b) */
+
+/*
+  mp_neg(a, b)
+
+  Compute b = -a.  'a' and 'b' may be identical.
+ */
+
+mp_err mp_neg(const mp_int *a, mp_int *b)
+{
+  mp_err   res;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  if((res = mp_copy(a, b)) != MP_OKAY)
+    return res;
+
+  if(s_mp_cmp_d(b, 0) == MP_EQ)
+    SIGN(b) = ZPOS;
+  else
+    SIGN(b) = (SIGN(b) == NEG) ? ZPOS : NEG;
+
+  return MP_OKAY;
+
+} /* end mp_neg() */
+
+/* }}} */
+
+/* {{{ mp_add(a, b, c) */
+
+/*
+  mp_add(a, b, c)
+
+  Compute c = a + b.  All parameters may be identical.
+ */
+
+mp_err mp_add(const mp_int *a, const mp_int *b, mp_int *c)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+  if(SIGN(a) == SIGN(b)) { /* same sign:  add values, keep sign */
+    MP_CHECKOK( s_mp_add_3arg(a, b, c) );
+  } else if(s_mp_cmp(a, b) >= 0) {  /* different sign: |a| >= |b|   */
+    MP_CHECKOK( s_mp_sub_3arg(a, b, c) );
+  } else {                          /* different sign: |a|  < |b|   */
+    MP_CHECKOK( s_mp_sub_3arg(b, a, c) );
+  }
+
+  if (s_mp_cmp_d(c, 0) == MP_EQ)
+    SIGN(c) = ZPOS;
+
+CLEANUP:
+  return res;
+
+} /* end mp_add() */
+
+/* }}} */
+
+/* {{{ mp_sub(a, b, c) */
+
+/*
+  mp_sub(a, b, c)
+
+  Compute c = a - b.  All parameters may be identical.
+ */
+
+mp_err mp_sub(const mp_int *a, const mp_int *b, mp_int *c)
+{
+  mp_err  res;
+  int     magDiff;
+
+  ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+  if (a == b) {
+    mp_zero(c);
+    return MP_OKAY;
+  }
+
+  if (MP_SIGN(a) != MP_SIGN(b)) {
+    MP_CHECKOK( s_mp_add_3arg(a, b, c) );
+  } else if (!(magDiff = s_mp_cmp(a, b))) {
+    mp_zero(c);
+    res = MP_OKAY;
+  } else if (magDiff > 0) {
+    MP_CHECKOK( s_mp_sub_3arg(a, b, c) );
+  } else {
+    MP_CHECKOK( s_mp_sub_3arg(b, a, c) );
+    MP_SIGN(c) = !MP_SIGN(a);
+  }
+
+  if (s_mp_cmp_d(c, 0) == MP_EQ)
+    MP_SIGN(c) = MP_ZPOS;
+
+CLEANUP:
+  return res;
+
+} /* end mp_sub() */
+
+/* }}} */
+
+/* {{{ mp_mul(a, b, c) */
+
+/*
+  mp_mul(a, b, c)
+
+  Compute c = a * b.  All parameters may be identical.
+ */
+mp_err   mp_mul(const mp_int *a, const mp_int *b, mp_int * c)
+{
+  mp_digit *pb;
+  mp_int   tmp;
+  mp_err   res;
+  mp_size  ib;
+  mp_size  useda, usedb;
+
+  ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+  if (a == c) {
+    if ((res = mp_init_copy(&tmp, a)) != MP_OKAY)
+      return res;
+    if (a == b)
+      b = &tmp;
+    a = &tmp;
+  } else if (b == c) {
+    if ((res = mp_init_copy(&tmp, b)) != MP_OKAY)
+      return res;
+    b = &tmp;
+  } else {
+    MP_DIGITS(&tmp) = 0;
+  }
+
+  if (MP_USED(a) < MP_USED(b)) {
+    const mp_int *xch = b;      /* switch a and b, to do fewer outer loops */
+    b = a;
+    a = xch;
+  }
+
+  MP_USED(c) = 1; MP_DIGIT(c, 0) = 0;
+  if((res = s_mp_pad(c, USED(a) + USED(b))) != MP_OKAY)
+    goto CLEANUP;
+
+#ifdef NSS_USE_COMBA
+  if ((MP_USED(a) == MP_USED(b)) && IS_POWER_OF_2(MP_USED(b))) {
+      if (MP_USED(a) == 4) {
+          s_mp_mul_comba_4(a, b, c);
+          goto CLEANUP;
+      }
+      if (MP_USED(a) == 8) {
+          s_mp_mul_comba_8(a, b, c);
+          goto CLEANUP;
+      }
+      if (MP_USED(a) == 16) {
+          s_mp_mul_comba_16(a, b, c);
+          goto CLEANUP;
+      }
+      if (MP_USED(a) == 32) {
+          s_mp_mul_comba_32(a, b, c);
+          goto CLEANUP;
+      }
+  }
+#endif
+
+  pb = MP_DIGITS(b);
+  s_mpv_mul_d(MP_DIGITS(a), MP_USED(a), *pb++, MP_DIGITS(c));
+
+  /* Outer loop:  Digits of b */
+  useda = MP_USED(a);
+  usedb = MP_USED(b);
+  for (ib = 1; ib < usedb; ib++) {
+    mp_digit b_i    = *pb++;
+
+    /* Inner product:  Digits of a */
+    if (b_i)
+      s_mpv_mul_d_add(MP_DIGITS(a), useda, b_i, MP_DIGITS(c) + ib);
+    else
+      MP_DIGIT(c, ib + useda) = b_i;
+  }
+
+  s_mp_clamp(c);
+
+  if(SIGN(a) == SIGN(b) || s_mp_cmp_d(c, 0) == MP_EQ)
+    SIGN(c) = ZPOS;
+  else
+    SIGN(c) = NEG;
+
+CLEANUP:
+  mp_clear(&tmp);
+  return res;
+} /* end mp_mul() */
+
+/* }}} */
+
+/* {{{ mp_sqr(a, sqr) */
+
+#if MP_SQUARE
+/*
+  Computes the square of a.  This can be done more
+  efficiently than a general multiplication, because many of the
+  computation steps are redundant when squaring.  The inner product
+  step is a bit more complicated, but we save a fair number of
+  iterations of the multiplication loop.
+ */
+
+/* sqr = a^2;   Caller provides both a and tmp; */
+mp_err   mp_sqr(const mp_int *a, mp_int *sqr)
+{
+  mp_digit *pa;
+  mp_digit d;
+  mp_err   res;
+  mp_size  ix;
+  mp_int   tmp;
+  int      count;
+
+  ARGCHK(a != NULL && sqr != NULL, MP_BADARG);
+
+  if (a == sqr) {
+    if((res = mp_init_copy(&tmp, a)) != MP_OKAY)
+      return res;
+    a = &tmp;
+  } else {
+    DIGITS(&tmp) = 0;
+    res = MP_OKAY;
+  }
+
+  ix = 2 * MP_USED(a);
+  if (ix > MP_ALLOC(sqr)) {
+    MP_USED(sqr) = 1;
+    MP_CHECKOK( s_mp_grow(sqr, ix) );
+  }
+  MP_USED(sqr) = ix;
+  MP_DIGIT(sqr, 0) = 0;
+
+#ifdef NSS_USE_COMBA
+  if (IS_POWER_OF_2(MP_USED(a))) {
+      if (MP_USED(a) == 4) {
+          s_mp_sqr_comba_4(a, sqr);
+          goto CLEANUP;
+      }
+      if (MP_USED(a) == 8) {
+          s_mp_sqr_comba_8(a, sqr);
+          goto CLEANUP;
+      }
+      if (MP_USED(a) == 16) {
+          s_mp_sqr_comba_16(a, sqr);
+          goto CLEANUP;
+      }
+      if (MP_USED(a) == 32) {
+          s_mp_sqr_comba_32(a, sqr);
+          goto CLEANUP;
+      }
+  }
+#endif
+
+  pa = MP_DIGITS(a);
+  count = MP_USED(a) - 1;
+  if (count > 0) {
+    d = *pa++;
+    s_mpv_mul_d(pa, count, d, MP_DIGITS(sqr) + 1);
+    for (ix = 3; --count > 0; ix += 2) {
+      d = *pa++;
+      s_mpv_mul_d_add(pa, count, d, MP_DIGITS(sqr) + ix);
+    } /* for(ix ...) */
+    MP_DIGIT(sqr, MP_USED(sqr)-1) = 0; /* above loop stopped short of this. */
+
+    /* now sqr *= 2 */
+    s_mp_mul_2(sqr);
+  } else {
+    MP_DIGIT(sqr, 1) = 0;
+  }
+
+  /* now add the squares of the digits of a to sqr. */
+  s_mpv_sqr_add_prop(MP_DIGITS(a), MP_USED(a), MP_DIGITS(sqr));
+
+  SIGN(sqr) = ZPOS;
+  s_mp_clamp(sqr);
+
+CLEANUP:
+  mp_clear(&tmp);
+  return res;
+
+} /* end mp_sqr() */
+#endif
+
+/* }}} */
+
+/* {{{ mp_div(a, b, q, r) */
+
+/*
+  mp_div(a, b, q, r)
+
+  Compute q = a / b and r = a mod b.  Input parameters may be re-used
+  as output parameters.  If q or r is NULL, that portion of the
+  computation will be discarded (although it will still be computed)
+ */
+mp_err mp_div(const mp_int *a, const mp_int *b, mp_int *q, mp_int *r)
+{
+  mp_err   res;
+  mp_int   *pQ, *pR;
+  mp_int   qtmp, rtmp, btmp;
+  int      cmp;
+  mp_sign  signA;
+  mp_sign  signB;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  signA = MP_SIGN(a);
+  signB = MP_SIGN(b);
+
+  if(mp_cmp_z(b) == MP_EQ)
+    return MP_RANGE;
+
+  DIGITS(&qtmp) = 0;
+  DIGITS(&rtmp) = 0;
+  DIGITS(&btmp) = 0;
+
+  /* Set up some temporaries... */
+  if (!r || r == a || r == b) {
+    MP_CHECKOK( mp_init_copy(&rtmp, a) );
+    pR = &rtmp;
+  } else {
+    MP_CHECKOK( mp_copy(a, r) );
+    pR = r;
+  }
+
+  if (!q || q == a || q == b) {
+    MP_CHECKOK( mp_init_size(&qtmp, MP_USED(a), FLAG(a)) );
+    pQ = &qtmp;
+  } else {
+    MP_CHECKOK( s_mp_pad(q, MP_USED(a)) );
+    pQ = q;
+    mp_zero(pQ);
+  }
+
+  /*
+    If |a| <= |b|, we can compute the solution without division;
+    otherwise, we actually do the work required.
+   */
+  if ((cmp = s_mp_cmp(a, b)) <= 0) {
+    if (cmp) {
+      /* r was set to a above. */
+      mp_zero(pQ);
+    } else {
+      mp_set(pQ, 1);
+      mp_zero(pR);
+    }
+  } else {
+    MP_CHECKOK( mp_init_copy(&btmp, b) );
+    MP_CHECKOK( s_mp_div(pR, &btmp, pQ) );
+  }
+
+  /* Compute the signs for the output  */
+  MP_SIGN(pR) = signA;   /* Sr = Sa              */
+  /* Sq = ZPOS if Sa == Sb */ /* Sq = NEG if Sa != Sb */
+  MP_SIGN(pQ) = (signA == signB) ? ZPOS : NEG;
+
+  if(s_mp_cmp_d(pQ, 0) == MP_EQ)
+    SIGN(pQ) = ZPOS;
+  if(s_mp_cmp_d(pR, 0) == MP_EQ)
+    SIGN(pR) = ZPOS;
+
+  /* Copy output, if it is needed      */
+  if(q && q != pQ)
+    s_mp_exch(pQ, q);
+
+  if(r && r != pR)
+    s_mp_exch(pR, r);
+
+CLEANUP:
+  mp_clear(&btmp);
+  mp_clear(&rtmp);
+  mp_clear(&qtmp);
+
+  return res;
+
+} /* end mp_div() */
+
+/* }}} */
+
+/* {{{ mp_div_2d(a, d, q, r) */
+
+mp_err mp_div_2d(const mp_int *a, mp_digit d, mp_int *q, mp_int *r)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL, MP_BADARG);
+
+  if(q) {
+    if((res = mp_copy(a, q)) != MP_OKAY)
+      return res;
+  }
+  if(r) {
+    if((res = mp_copy(a, r)) != MP_OKAY)
+      return res;
+  }
+  if(q) {
+    s_mp_div_2d(q, d);
+  }
+  if(r) {
+    s_mp_mod_2d(r, d);
+  }
+
+  return MP_OKAY;
+
+} /* end mp_div_2d() */
+
+/* }}} */
+
+/* {{{ mp_expt(a, b, c) */
+
+/*
+  mp_expt(a, b, c)
+
+  Compute c = a ** b, that is, raise a to the b power.  Uses a
+  standard iterative square-and-multiply technique.
+ */
+
+mp_err mp_expt(mp_int *a, mp_int *b, mp_int *c)
+{
+  mp_int   s, x;
+  mp_err   res;
+  mp_digit d;
+  int      dig, bit;
+
+  ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+  if(mp_cmp_z(b) < 0)
+    return MP_RANGE;
+
+  if((res = mp_init(&s, FLAG(a))) != MP_OKAY)
+    return res;
+
+  mp_set(&s, 1);
+
+  if((res = mp_init_copy(&x, a)) != MP_OKAY)
+    goto X;
+
+  /* Loop over low-order digits in ascending order */
+  for(dig = 0; dig < (USED(b) - 1); dig++) {
+    d = DIGIT(b, dig);
+
+    /* Loop over bits of each non-maximal digit */
+    for(bit = 0; bit < DIGIT_BIT; bit++) {
+      if(d & 1) {
+        if((res = s_mp_mul(&s, &x)) != MP_OKAY)
+          goto CLEANUP;
+      }
+
+      d >>= 1;
+
+      if((res = s_mp_sqr(&x)) != MP_OKAY)
+        goto CLEANUP;
+    }
+  }
+
+  /* Consider now the last digit... */
+  d = DIGIT(b, dig);
+
+  while(d) {
+    if(d & 1) {
+      if((res = s_mp_mul(&s, &x)) != MP_OKAY)
+        goto CLEANUP;
+    }
+
+    d >>= 1;
+
+    if((res = s_mp_sqr(&x)) != MP_OKAY)
+      goto CLEANUP;
+  }
+
+  if(mp_iseven(b))
+    SIGN(&s) = SIGN(a);
+
+  res = mp_copy(&s, c);
+
+CLEANUP:
+  mp_clear(&x);
+X:
+  mp_clear(&s);
+
+  return res;
+
+} /* end mp_expt() */
+
+/* }}} */
+
+/* {{{ mp_2expt(a, k) */
+
+/* Compute a = 2^k */
+
+mp_err mp_2expt(mp_int *a, mp_digit k)
+{
+  ARGCHK(a != NULL, MP_BADARG);
+
+  return s_mp_2expt(a, k);
+
+} /* end mp_2expt() */
+
+/* }}} */
+
+/* {{{ mp_mod(a, m, c) */
+
+/*
+  mp_mod(a, m, c)
+
+  Compute c = a (mod m).  Result will always be 0 <= c < m.
+ */
+
+mp_err mp_mod(const mp_int *a, const mp_int *m, mp_int *c)
+{
+  mp_err  res;
+  int     mag;
+
+  ARGCHK(a != NULL && m != NULL && c != NULL, MP_BADARG);
+
+  if(SIGN(m) == NEG)
+    return MP_RANGE;
+
+  /*
+     If |a| > m, we need to divide to get the remainder and take the
+     absolute value.
+
+     If |a| < m, we don't need to do any division, just copy and adjust
+     the sign (if a is negative).
+
+     If |a| == m, we can simply set the result to zero.
+
+     This order is intended to minimize the average path length of the
+     comparison chain on common workloads -- the most frequent cases are
+     that |a| != m, so we do those first.
+   */
+  if((mag = s_mp_cmp(a, m)) > 0) {
+    if((res = mp_div(a, m, NULL, c)) != MP_OKAY)
+      return res;
+
+    if(SIGN(c) == NEG) {
+      if((res = mp_add(c, m, c)) != MP_OKAY)
+        return res;
+    }
+
+  } else if(mag < 0) {
+    if((res = mp_copy(a, c)) != MP_OKAY)
+      return res;
+
+    if(mp_cmp_z(a) < 0) {
+      if((res = mp_add(c, m, c)) != MP_OKAY)
+        return res;
+
+    }
+
+  } else {
+    mp_zero(c);
+
+  }
+
+  return MP_OKAY;
+
+} /* end mp_mod() */
+
+/* }}} */
+
+/* {{{ mp_mod_d(a, d, c) */
+
+/*
+  mp_mod_d(a, d, c)
+
+  Compute c = a (mod d).  Result will always be 0 <= c < d
+ */
+mp_err mp_mod_d(const mp_int *a, mp_digit d, mp_digit *c)
+{
+  mp_err   res;
+  mp_digit rem;
+
+  ARGCHK(a != NULL && c != NULL, MP_BADARG);
+
+  if(s_mp_cmp_d(a, d) > 0) {
+    if((res = mp_div_d(a, d, NULL, &rem)) != MP_OKAY)
+      return res;
+
+  } else {
+    if(SIGN(a) == NEG)
+      rem = d - DIGIT(a, 0);
+    else
+      rem = DIGIT(a, 0);
+  }
+
+  if(c)
+    *c = rem;
+
+  return MP_OKAY;
+
+} /* end mp_mod_d() */
+
+/* }}} */
+
+/* {{{ mp_sqrt(a, b) */
+
+/*
+  mp_sqrt(a, b)
+
+  Compute the integer square root of a, and store the result in b.
+  Uses an integer-arithmetic version of Newton's iterative linear
+  approximation technique to determine this value; the result has the
+  following two properties:
+
+     b^2 <= a
+     (b+1)^2 >= a
+
+  It is a range error to pass a negative value.
+ */
+mp_err mp_sqrt(const mp_int *a, mp_int *b)
+{
+  mp_int   x, t;
+  mp_err   res;
+  mp_size  used;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  /* Cannot take square root of a negative value */
+  if(SIGN(a) == NEG)
+    return MP_RANGE;
+
+  /* Special cases for zero and one, trivial     */
+  if(mp_cmp_d(a, 1) <= 0)
+    return mp_copy(a, b);
+
+  /* Initialize the temporaries we'll use below  */
+  if((res = mp_init_size(&t, USED(a), FLAG(a))) != MP_OKAY)
+    return res;
+
+  /* Compute an initial guess for the iteration as a itself */
+  if((res = mp_init_copy(&x, a)) != MP_OKAY)
+    goto X;
+
+  used = MP_USED(&x);
+  if (used > 1) {
+    s_mp_rshd(&x, used / 2);
+  }
+
+  for(;;) {
+    /* t = (x * x) - a */
+    mp_copy(&x, &t);      /* can't fail, t is big enough for original x */
+    if((res = mp_sqr(&t, &t)) != MP_OKAY ||
+       (res = mp_sub(&t, a, &t)) != MP_OKAY)
+      goto CLEANUP;
+
+    /* t = t / 2x       */
+    s_mp_mul_2(&x);
+    if((res = mp_div(&t, &x, &t, NULL)) != MP_OKAY)
+      goto CLEANUP;
+    s_mp_div_2(&x);
+
+    /* Terminate the loop, if the quotient is zero */
+    if(mp_cmp_z(&t) == MP_EQ)
+      break;
+
+    /* x = x - t       */
+    if((res = mp_sub(&x, &t, &x)) != MP_OKAY)
+      goto CLEANUP;
+
+  }
+
+  /* Copy result to output parameter */
+  mp_sub_d(&x, 1, &x);
+  s_mp_exch(&x, b);
+
+ CLEANUP:
+  mp_clear(&x);
+ X:
+  mp_clear(&t);
+
+  return res;
+
+} /* end mp_sqrt() */
+
+/* }}} */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/* {{{ Modular arithmetic */
+
+#if MP_MODARITH
+/* {{{ mp_addmod(a, b, m, c) */
+
+/*
+  mp_addmod(a, b, m, c)
+
+  Compute c = (a + b) mod m
+ */
+
+mp_err mp_addmod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL && b != NULL && m != NULL && c != NULL, MP_BADARG);
+
+  if((res = mp_add(a, b, c)) != MP_OKAY)
+    return res;
+  if((res = mp_mod(c, m, c)) != MP_OKAY)
+    return res;
+
+  return MP_OKAY;
+
+}
+
+/* }}} */
+
+/* {{{ mp_submod(a, b, m, c) */
+
+/*
+  mp_submod(a, b, m, c)
+
+  Compute c = (a - b) mod m
+ */
+
+mp_err mp_submod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL && b != NULL && m != NULL && c != NULL, MP_BADARG);
+
+  if((res = mp_sub(a, b, c)) != MP_OKAY)
+    return res;
+  if((res = mp_mod(c, m, c)) != MP_OKAY)
+    return res;
+
+  return MP_OKAY;
+
+}
+
+/* }}} */
+
+/* {{{ mp_mulmod(a, b, m, c) */
+
+/*
+  mp_mulmod(a, b, m, c)
+
+  Compute c = (a * b) mod m
+ */
+
+mp_err mp_mulmod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL && b != NULL && m != NULL && c != NULL, MP_BADARG);
+
+  if((res = mp_mul(a, b, c)) != MP_OKAY)
+    return res;
+  if((res = mp_mod(c, m, c)) != MP_OKAY)
+    return res;
+
+  return MP_OKAY;
+
+}
+
+/* }}} */
+
+/* {{{ mp_sqrmod(a, m, c) */
+
+#if MP_SQUARE
+mp_err mp_sqrmod(const mp_int *a, const mp_int *m, mp_int *c)
+{
+  mp_err  res;
+
+  ARGCHK(a != NULL && m != NULL && c != NULL, MP_BADARG);
+
+  if((res = mp_sqr(a, c)) != MP_OKAY)
+    return res;
+  if((res = mp_mod(c, m, c)) != MP_OKAY)
+    return res;
+
+  return MP_OKAY;
+
+} /* end mp_sqrmod() */
+#endif
+
+/* }}} */
+
+/* {{{ s_mp_exptmod(a, b, m, c) */
+
+/*
+  s_mp_exptmod(a, b, m, c)
+
+  Compute c = (a ** b) mod m.  Uses a standard square-and-multiply
+  method with modular reductions at each step. (This is basically the
+  same code as mp_expt(), except for the addition of the reductions)
+
+  The modular reductions are done using Barrett's algorithm (see
+  s_mp_reduce() below for details)
+ */
+
+mp_err s_mp_exptmod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c)
+{
+  mp_int   s, x, mu;
+  mp_err   res;
+  mp_digit d;
+  int      dig, bit;
+
+  ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+  if(mp_cmp_z(b) < 0 || mp_cmp_z(m) <= 0)
+    return MP_RANGE;
+
+  if((res = mp_init(&s, FLAG(a))) != MP_OKAY)
+    return res;
+  if((res = mp_init_copy(&x, a)) != MP_OKAY ||
+     (res = mp_mod(&x, m, &x)) != MP_OKAY)
+    goto X;
+  if((res = mp_init(&mu, FLAG(a))) != MP_OKAY)
+    goto MU;
+
+  mp_set(&s, 1);
+
+  /* mu = b^2k / m */
+  s_mp_add_d(&mu, 1);
+  s_mp_lshd(&mu, 2 * USED(m));
+  if((res = mp_div(&mu, m, &mu, NULL)) != MP_OKAY)
+    goto CLEANUP;
+
+  /* Loop over digits of b in ascending order, except highest order */
+  for(dig = 0; dig < (USED(b) - 1); dig++) {
+    d = DIGIT(b, dig);
+
+    /* Loop over the bits of the lower-order digits */
+    for(bit = 0; bit < DIGIT_BIT; bit++) {
+      if(d & 1) {
+        if((res = s_mp_mul(&s, &x)) != MP_OKAY)
+          goto CLEANUP;
+        if((res = s_mp_reduce(&s, m, &mu)) != MP_OKAY)
+          goto CLEANUP;
+      }
+
+      d >>= 1;
+
+      if((res = s_mp_sqr(&x)) != MP_OKAY)
+        goto CLEANUP;
+      if((res = s_mp_reduce(&x, m, &mu)) != MP_OKAY)
+        goto CLEANUP;
+    }
+  }
+
+  /* Now do the last digit... */
+  d = DIGIT(b, dig);
+
+  while(d) {
+    if(d & 1) {
+      if((res = s_mp_mul(&s, &x)) != MP_OKAY)
+        goto CLEANUP;
+      if((res = s_mp_reduce(&s, m, &mu)) != MP_OKAY)
+        goto CLEANUP;
+    }
+
+    d >>= 1;
+
+    if((res = s_mp_sqr(&x)) != MP_OKAY)
+      goto CLEANUP;
+    if((res = s_mp_reduce(&x, m, &mu)) != MP_OKAY)
+      goto CLEANUP;
+  }
+
+  s_mp_exch(&s, c);
+
+ CLEANUP:
+  mp_clear(&mu);
+ MU:
+  mp_clear(&x);
+ X:
+  mp_clear(&s);
+
+  return res;
+
+} /* end s_mp_exptmod() */
+
+/* }}} */
+
+/* {{{ mp_exptmod_d(a, d, m, c) */
+
+mp_err mp_exptmod_d(const mp_int *a, mp_digit d, const mp_int *m, mp_int *c)
+{
+  mp_int   s, x;
+  mp_err   res;
+
+  ARGCHK(a != NULL && c != NULL, MP_BADARG);
+
+  if((res = mp_init(&s, FLAG(a))) != MP_OKAY)
+    return res;
+  if((res = mp_init_copy(&x, a)) != MP_OKAY)
+    goto X;
+
+  mp_set(&s, 1);
+
+  while(d != 0) {
+    if(d & 1) {
+      if((res = s_mp_mul(&s, &x)) != MP_OKAY ||
+         (res = mp_mod(&s, m, &s)) != MP_OKAY)
+        goto CLEANUP;
+    }
+
+    d /= 2;
+
+    if((res = s_mp_sqr(&x)) != MP_OKAY ||
+       (res = mp_mod(&x, m, &x)) != MP_OKAY)
+      goto CLEANUP;
+  }
+
+  s_mp_exch(&s, c);
+
+CLEANUP:
+  mp_clear(&x);
+X:
+  mp_clear(&s);
+
+  return res;
+
+} /* end mp_exptmod_d() */
+
+/* }}} */
+#endif /* if MP_MODARITH */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/* {{{ Comparison functions */
+
+/* {{{ mp_cmp_z(a) */
+
+/*
+  mp_cmp_z(a)
+
+  Compare a <=> 0.  Returns <0 if a<0, 0 if a=0, >0 if a>0.
+ */
+
+int    mp_cmp_z(const mp_int *a)
+{
+  if(SIGN(a) == NEG)
+    return MP_LT;
+  else if(USED(a) == 1 && DIGIT(a, 0) == 0)
+    return MP_EQ;
+  else
+    return MP_GT;
+
+} /* end mp_cmp_z() */
+
+/* }}} */
+
+/* {{{ mp_cmp_d(a, d) */
+
+/*
+  mp_cmp_d(a, d)
+
+  Compare a <=> d.  Returns <0 if a<d, 0 if a=d, >0 if a>d
+ */
+
+int    mp_cmp_d(const mp_int *a, mp_digit d)
+{
+  ARGCHK(a != NULL, MP_EQ);
+
+  if(SIGN(a) == NEG)
+    return MP_LT;
+
+  return s_mp_cmp_d(a, d);
+
+} /* end mp_cmp_d() */
+
+/* }}} */
+
+/* {{{ mp_cmp(a, b) */
+
+int    mp_cmp(const mp_int *a, const mp_int *b)
+{
+  ARGCHK(a != NULL && b != NULL, MP_EQ);
+
+  if(SIGN(a) == SIGN(b)) {
+    int  mag;
+
+    if((mag = s_mp_cmp(a, b)) == MP_EQ)
+      return MP_EQ;
+
+    if(SIGN(a) == ZPOS)
+      return mag;
+    else
+      return -mag;
+
+  } else if(SIGN(a) == ZPOS) {
+    return MP_GT;
+  } else {
+    return MP_LT;
+  }
+
+} /* end mp_cmp() */
+
+/* }}} */
+
+/* {{{ mp_cmp_mag(a, b) */
+
+/*
+  mp_cmp_mag(a, b)
+
+  Compares |a| <=> |b|, and returns an appropriate comparison result
+ */
+
+int    mp_cmp_mag(mp_int *a, mp_int *b)
+{
+  ARGCHK(a != NULL && b != NULL, MP_EQ);
+
+  return s_mp_cmp(a, b);
+
+} /* end mp_cmp_mag() */
+
+/* }}} */
+
+/* {{{ mp_cmp_int(a, z, kmflag) */
+
+/*
+  This just converts z to an mp_int, and uses the existing comparison
+  routines.  This is sort of inefficient, but it's not clear to me how
+  frequently this wil get used anyway.  For small positive constants,
+  you can always use mp_cmp_d(), and for zero, there is mp_cmp_z().
+ */
+int    mp_cmp_int(const mp_int *a, long z, int kmflag)
+{
+  mp_int  tmp;
+  int     out;
+
+  ARGCHK(a != NULL, MP_EQ);
+
+  mp_init(&tmp, kmflag); mp_set_int(&tmp, z);
+  out = mp_cmp(a, &tmp);
+  mp_clear(&tmp);
+
+  return out;
+
+} /* end mp_cmp_int() */
+
+/* }}} */
+
+/* {{{ mp_isodd(a) */
+
+/*
+  mp_isodd(a)
+
+  Returns a true (non-zero) value if a is odd, false (zero) otherwise.
+ */
+int    mp_isodd(const mp_int *a)
+{
+  ARGCHK(a != NULL, 0);
+
+  return (int)(DIGIT(a, 0) & 1);
+
+} /* end mp_isodd() */
+
+/* }}} */
+
+/* {{{ mp_iseven(a) */
+
+int    mp_iseven(const mp_int *a)
+{
+  return !mp_isodd(a);
+
+} /* end mp_iseven() */
+
+/* }}} */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/* {{{ Number theoretic functions */
+
+#if MP_NUMTH
+/* {{{ mp_gcd(a, b, c) */
+
+/*
+  Like the old mp_gcd() function, except computes the GCD using the
+  binary algorithm due to Josef Stein in 1961 (via Knuth).
+ */
+mp_err mp_gcd(mp_int *a, mp_int *b, mp_int *c)
+{
+  mp_err   res;
+  mp_int   u, v, t;
+  mp_size  k = 0;
+
+  ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+  if(mp_cmp_z(a) == MP_EQ && mp_cmp_z(b) == MP_EQ)
+      return MP_RANGE;
+  if(mp_cmp_z(a) == MP_EQ) {
+    return mp_copy(b, c);
+  } else if(mp_cmp_z(b) == MP_EQ) {
+    return mp_copy(a, c);
+  }
+
+  if((res = mp_init(&t, FLAG(a))) != MP_OKAY)
+    return res;
+  if((res = mp_init_copy(&u, a)) != MP_OKAY)
+    goto U;
+  if((res = mp_init_copy(&v, b)) != MP_OKAY)
+    goto V;
+
+  SIGN(&u) = ZPOS;
+  SIGN(&v) = ZPOS;
+
+  /* Divide out common factors of 2 until at least 1 of a, b is even */
+  while(mp_iseven(&u) && mp_iseven(&v)) {
+    s_mp_div_2(&u);
+    s_mp_div_2(&v);
+    ++k;
+  }
+
+  /* Initialize t */
+  if(mp_isodd(&u)) {
+    if((res = mp_copy(&v, &t)) != MP_OKAY)
+      goto CLEANUP;
+
+    /* t = -v */
+    if(SIGN(&v) == ZPOS)
+      SIGN(&t) = NEG;
+    else
+      SIGN(&t) = ZPOS;
+
+  } else {
+    if((res = mp_copy(&u, &t)) != MP_OKAY)
+      goto CLEANUP;
+
+  }
+
+  for(;;) {
+    while(mp_iseven(&t)) {
+      s_mp_div_2(&t);
+    }
+
+    if(mp_cmp_z(&t) == MP_GT) {
+      if((res = mp_copy(&t, &u)) != MP_OKAY)
+        goto CLEANUP;
+
+    } else {
+      if((res = mp_copy(&t, &v)) != MP_OKAY)
+        goto CLEANUP;
+
+      /* v = -t */
+      if(SIGN(&t) == ZPOS)
+        SIGN(&v) = NEG;
+      else
+        SIGN(&v) = ZPOS;
+    }
+
+    if((res = mp_sub(&u, &v, &t)) != MP_OKAY)
+      goto CLEANUP;
+
+    if(s_mp_cmp_d(&t, 0) == MP_EQ)
+      break;
+  }
+
+  s_mp_2expt(&v, k);       /* v = 2^k   */
+  res = mp_mul(&u, &v, c); /* c = u * v */
+
+ CLEANUP:
+  mp_clear(&v);
+ V:
+  mp_clear(&u);
+ U:
+  mp_clear(&t);
+
+  return res;
+
+} /* end mp_gcd() */
+
+/* }}} */
+
+/* {{{ mp_lcm(a, b, c) */
+
+/* We compute the least common multiple using the rule:
+
+   ab = [a, b](a, b)
+
+   ... by computing the product, and dividing out the gcd.
+ */
+
+mp_err mp_lcm(mp_int *a, mp_int *b, mp_int *c)
+{
+  mp_int  gcd, prod;
+  mp_err  res;
+
+  ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+  /* Set up temporaries */
+  if((res = mp_init(&gcd, FLAG(a))) != MP_OKAY)
+    return res;
+  if((res = mp_init(&prod, FLAG(a))) != MP_OKAY)
+    goto GCD;
+
+  if((res = mp_mul(a, b, &prod)) != MP_OKAY)
+    goto CLEANUP;
+  if((res = mp_gcd(a, b, &gcd)) != MP_OKAY)
+    goto CLEANUP;
+
+  res = mp_div(&prod, &gcd, c, NULL);
+
+ CLEANUP:
+  mp_clear(&prod);
+ GCD:
+  mp_clear(&gcd);
+
+  return res;
+
+} /* end mp_lcm() */
+
+/* }}} */
+
+/* {{{ mp_xgcd(a, b, g, x, y) */
+
+/*
+  mp_xgcd(a, b, g, x, y)
+
+  Compute g = (a, b) and values x and y satisfying Bezout's identity
+  (that is, ax + by = g).  This uses the binary extended GCD algorithm
+  based on the Stein algorithm used for mp_gcd()
+  See algorithm 14.61 in Handbook of Applied Cryptogrpahy.
+ */
+
+mp_err mp_xgcd(const mp_int *a, const mp_int *b, mp_int *g, mp_int *x, mp_int *y)
+{
+  mp_int   gx, xc, yc, u, v, A, B, C, D;
+  mp_int  *clean[9];
+  mp_err   res;
+  int      last = -1;
+
+  if(mp_cmp_z(b) == 0)
+    return MP_RANGE;
+
+  /* Initialize all these variables we need */
+  MP_CHECKOK( mp_init(&u, FLAG(a)) );
+  clean[++last] = &u;
+  MP_CHECKOK( mp_init(&v, FLAG(a)) );
+  clean[++last] = &v;
+  MP_CHECKOK( mp_init(&gx, FLAG(a)) );
+  clean[++last] = &gx;
+  MP_CHECKOK( mp_init(&A, FLAG(a)) );
+  clean[++last] = &A;
+  MP_CHECKOK( mp_init(&B, FLAG(a)) );
+  clean[++last] = &B;
+  MP_CHECKOK( mp_init(&C, FLAG(a)) );
+  clean[++last] = &C;
+  MP_CHECKOK( mp_init(&D, FLAG(a)) );
+  clean[++last] = &D;
+  MP_CHECKOK( mp_init_copy(&xc, a) );
+  clean[++last] = &xc;
+  mp_abs(&xc, &xc);
+  MP_CHECKOK( mp_init_copy(&yc, b) );
+  clean[++last] = &yc;
+  mp_abs(&yc, &yc);
+
+  mp_set(&gx, 1);
+
+  /* Divide by two until at least one of them is odd */
+  while(mp_iseven(&xc) && mp_iseven(&yc)) {
+    mp_size nx = mp_trailing_zeros(&xc);
+    mp_size ny = mp_trailing_zeros(&yc);
+    mp_size n  = MP_MIN(nx, ny);
+    s_mp_div_2d(&xc,n);
+    s_mp_div_2d(&yc,n);
+    MP_CHECKOK( s_mp_mul_2d(&gx,n) );
+  }
+
+  mp_copy(&xc, &u);
+  mp_copy(&yc, &v);
+  mp_set(&A, 1); mp_set(&D, 1);
+
+  /* Loop through binary GCD algorithm */
+  do {
+    while(mp_iseven(&u)) {
+      s_mp_div_2(&u);
+
+      if(mp_iseven(&A) && mp_iseven(&B)) {
+        s_mp_div_2(&A); s_mp_div_2(&B);
+      } else {
+        MP_CHECKOK( mp_add(&A, &yc, &A) );
+        s_mp_div_2(&A);
+        MP_CHECKOK( mp_sub(&B, &xc, &B) );
+        s_mp_div_2(&B);
+      }
+    }
+
+    while(mp_iseven(&v)) {
+      s_mp_div_2(&v);
+
+      if(mp_iseven(&C) && mp_iseven(&D)) {
+        s_mp_div_2(&C); s_mp_div_2(&D);
+      } else {
+        MP_CHECKOK( mp_add(&C, &yc, &C) );
+        s_mp_div_2(&C);
+        MP_CHECKOK( mp_sub(&D, &xc, &D) );
+        s_mp_div_2(&D);
+      }
+    }
+
+    if(mp_cmp(&u, &v) >= 0) {
+      MP_CHECKOK( mp_sub(&u, &v, &u) );
+      MP_CHECKOK( mp_sub(&A, &C, &A) );
+      MP_CHECKOK( mp_sub(&B, &D, &B) );
+    } else {
+      MP_CHECKOK( mp_sub(&v, &u, &v) );
+      MP_CHECKOK( mp_sub(&C, &A, &C) );
+      MP_CHECKOK( mp_sub(&D, &B, &D) );
+    }
+  } while (mp_cmp_z(&u) != 0);
+
+  /* copy results to output */
+  if(x)
+    MP_CHECKOK( mp_copy(&C, x) );
+
+  if(y)
+    MP_CHECKOK( mp_copy(&D, y) );
+
+  if(g)
+    MP_CHECKOK( mp_mul(&gx, &v, g) );
+
+ CLEANUP:
+  while(last >= 0)
+    mp_clear(clean[last--]);
+
+  return res;
+
+} /* end mp_xgcd() */
+
+/* }}} */
+
+mp_size mp_trailing_zeros(const mp_int *mp)
+{
+  mp_digit d;
+  mp_size  n = 0;
+  int      ix;
+
+  if (!mp || !MP_DIGITS(mp) || !mp_cmp_z(mp))
+    return n;
+
+  for (ix = 0; !(d = MP_DIGIT(mp,ix)) && (ix < MP_USED(mp)); ++ix)
+    n += MP_DIGIT_BIT;
+  if (!d)
+    return 0;   /* shouldn't happen, but ... */
+#if !defined(MP_USE_UINT_DIGIT)
+  if (!(d & 0xffffffffU)) {
+    d >>= 32;
+    n  += 32;
+  }
+#endif
+  if (!(d & 0xffffU)) {
+    d >>= 16;
+    n  += 16;
+  }
+  if (!(d & 0xffU)) {
+    d >>= 8;
+    n  += 8;
+  }
+  if (!(d & 0xfU)) {
+    d >>= 4;
+    n  += 4;
+  }
+  if (!(d & 0x3U)) {
+    d >>= 2;
+    n  += 2;
+  }
+  if (!(d & 0x1U)) {
+    d >>= 1;
+    n  += 1;
+  }
+#if MP_ARGCHK == 2
+  assert(0 != (d & 1));
+#endif
+  return n;
+}
+
+/* Given a and prime p, computes c and k such that a*c == 2**k (mod p).
+** Returns k (positive) or error (negative).
+** This technique from the paper "Fast Modular Reciprocals" (unpublished)
+** by Richard Schroeppel (a.k.a. Captain Nemo).
+*/
+mp_err s_mp_almost_inverse(const mp_int *a, const mp_int *p, mp_int *c)
+{
+  mp_err res;
+  mp_err k    = 0;
+  mp_int d, f, g;
+
+  ARGCHK(a && p && c, MP_BADARG);
+
+  MP_DIGITS(&d) = 0;
+  MP_DIGITS(&f) = 0;
+  MP_DIGITS(&g) = 0;
+  MP_CHECKOK( mp_init(&d, FLAG(a)) );
+  MP_CHECKOK( mp_init_copy(&f, a) );    /* f = a */
+  MP_CHECKOK( mp_init_copy(&g, p) );    /* g = p */
+
+  mp_set(c, 1);
+  mp_zero(&d);
+
+  if (mp_cmp_z(&f) == 0) {
+    res = MP_UNDEF;
+  } else
+  for (;;) {
+    int diff_sign;
+    while (mp_iseven(&f)) {
+      mp_size n = mp_trailing_zeros(&f);
+      if (!n) {
+        res = MP_UNDEF;
+        goto CLEANUP;
+      }
+      s_mp_div_2d(&f, n);
+      MP_CHECKOK( s_mp_mul_2d(&d, n) );
+      k += n;
+    }
+    if (mp_cmp_d(&f, 1) == MP_EQ) {     /* f == 1 */
+      res = k;
+      break;
+    }
+    diff_sign = mp_cmp(&f, &g);
+    if (diff_sign < 0) {                /* f < g */
+      s_mp_exch(&f, &g);
+      s_mp_exch(c, &d);
+    } else if (diff_sign == 0) {                /* f == g */
+      res = MP_UNDEF;           /* a and p are not relatively prime */
+      break;
+    }
+    if ((MP_DIGIT(&f,0) % 4) == (MP_DIGIT(&g,0) % 4)) {
+      MP_CHECKOK( mp_sub(&f, &g, &f) ); /* f = f - g */
+      MP_CHECKOK( mp_sub(c,  &d,  c) ); /* c = c - d */
+    } else {
+      MP_CHECKOK( mp_add(&f, &g, &f) ); /* f = f + g */
+      MP_CHECKOK( mp_add(c,  &d,  c) ); /* c = c + d */
+    }
+  }
+  if (res >= 0) {
+    while (MP_SIGN(c) != MP_ZPOS) {
+      MP_CHECKOK( mp_add(c, p, c) );
+    }
+    res = k;
+  }
+
+CLEANUP:
+  mp_clear(&d);
+  mp_clear(&f);
+  mp_clear(&g);
+  return res;
+}
+
+/* Compute T = (P ** -1) mod MP_RADIX.  Also works for 16-bit mp_digits.
+** This technique from the paper "Fast Modular Reciprocals" (unpublished)
+** by Richard Schroeppel (a.k.a. Captain Nemo).
+*/
+mp_digit  s_mp_invmod_radix(mp_digit P)
+{
+  mp_digit T = P;
+  T *= 2 - (P * T);
+  T *= 2 - (P * T);
+  T *= 2 - (P * T);
+  T *= 2 - (P * T);
+#if !defined(MP_USE_UINT_DIGIT)
+  T *= 2 - (P * T);
+  T *= 2 - (P * T);
+#endif
+  return T;
+}
+
+/* Given c, k, and prime p, where a*c == 2**k (mod p),
+** Compute x = (a ** -1) mod p.  This is similar to Montgomery reduction.
+** This technique from the paper "Fast Modular Reciprocals" (unpublished)
+** by Richard Schroeppel (a.k.a. Captain Nemo).
+*/
+mp_err  s_mp_fixup_reciprocal(const mp_int *c, const mp_int *p, int k, mp_int *x)
+{
+  int      k_orig = k;
+  mp_digit r;
+  mp_size  ix;
+  mp_err   res;
+
+  if (mp_cmp_z(c) < 0) {                /* c < 0 */
+    MP_CHECKOK( mp_add(c, p, x) );      /* x = c + p */
+  } else {
+    MP_CHECKOK( mp_copy(c, x) );        /* x = c */
+  }
+
+  /* make sure x is large enough */
+  ix = MP_HOWMANY(k, MP_DIGIT_BIT) + MP_USED(p) + 1;
+  ix = MP_MAX(ix, MP_USED(x));
+  MP_CHECKOK( s_mp_pad(x, ix) );
+
+  r = 0 - s_mp_invmod_radix(MP_DIGIT(p,0));
+
+  for (ix = 0; k > 0; ix++) {
+    int      j = MP_MIN(k, MP_DIGIT_BIT);
+    mp_digit v = r * MP_DIGIT(x, ix);
+    if (j < MP_DIGIT_BIT) {
+      v &= ((mp_digit)1 << j) - 1;      /* v = v mod (2 ** j) */
+    }
+    s_mp_mul_d_add_offset(p, v, x, ix); /* x += p * v * (RADIX ** ix) */
+    k -= j;
+  }
+  s_mp_clamp(x);
+  s_mp_div_2d(x, k_orig);
+  res = MP_OKAY;
+
+CLEANUP:
+  return res;
+}
+
+/* compute mod inverse using Schroeppel's method, only if m is odd */
+mp_err s_mp_invmod_odd_m(const mp_int *a, const mp_int *m, mp_int *c)
+{
+  int k;
+  mp_err  res;
+  mp_int  x;
+
+  ARGCHK(a && m && c, MP_BADARG);
+
+  if(mp_cmp_z(a) == 0 || mp_cmp_z(m) == 0)
+    return MP_RANGE;
+  if (mp_iseven(m))
+    return MP_UNDEF;
+
+  MP_DIGITS(&x) = 0;
+
+  if (a == c) {
+    if ((res = mp_init_copy(&x, a)) != MP_OKAY)
+      return res;
+    if (a == m)
+      m = &x;
+    a = &x;
+  } else if (m == c) {
+    if ((res = mp_init_copy(&x, m)) != MP_OKAY)
+      return res;
+    m = &x;
+  } else {
+    MP_DIGITS(&x) = 0;
+  }
+
+  MP_CHECKOK( s_mp_almost_inverse(a, m, c) );
+  k = res;
+  MP_CHECKOK( s_mp_fixup_reciprocal(c, m, k, c) );
+CLEANUP:
+  mp_clear(&x);
+  return res;
+}
+
+/* Known good algorithm for computing modular inverse.  But slow. */
+mp_err mp_invmod_xgcd(const mp_int *a, const mp_int *m, mp_int *c)
+{
+  mp_int  g, x;
+  mp_err  res;
+
+  ARGCHK(a && m && c, MP_BADARG);
+
+  if(mp_cmp_z(a) == 0 || mp_cmp_z(m) == 0)
+    return MP_RANGE;
+
+  MP_DIGITS(&g) = 0;
+  MP_DIGITS(&x) = 0;
+  MP_CHECKOK( mp_init(&x, FLAG(a)) );
+  MP_CHECKOK( mp_init(&g, FLAG(a)) );
+
+  MP_CHECKOK( mp_xgcd(a, m, &g, &x, NULL) );
+
+  if (mp_cmp_d(&g, 1) != MP_EQ) {
+    res = MP_UNDEF;
+    goto CLEANUP;
+  }
+
+  res = mp_mod(&x, m, c);
+  SIGN(c) = SIGN(a);
+
+CLEANUP:
+  mp_clear(&x);
+  mp_clear(&g);
+
+  return res;
+}
+
+/* modular inverse where modulus is 2**k. */
+/* c = a**-1 mod 2**k */
+mp_err s_mp_invmod_2d(const mp_int *a, mp_size k, mp_int *c)
+{
+  mp_err res;
+  mp_size ix = k + 4;
+  mp_int t0, t1, val, tmp, two2k;
+
+  static const mp_digit d2 = 2;
+  static const mp_int two = { 0, MP_ZPOS, 1, 1, (mp_digit *)&d2 };
+
+  if (mp_iseven(a))
+    return MP_UNDEF;
+  if (k <= MP_DIGIT_BIT) {
+    mp_digit i = s_mp_invmod_radix(MP_DIGIT(a,0));
+    if (k < MP_DIGIT_BIT)
+      i &= ((mp_digit)1 << k) - (mp_digit)1;
+    mp_set(c, i);
+    return MP_OKAY;
+  }
+  MP_DIGITS(&t0) = 0;
+  MP_DIGITS(&t1) = 0;
+  MP_DIGITS(&val) = 0;
+  MP_DIGITS(&tmp) = 0;
+  MP_DIGITS(&two2k) = 0;
+  MP_CHECKOK( mp_init_copy(&val, a) );
+  s_mp_mod_2d(&val, k);
+  MP_CHECKOK( mp_init_copy(&t0, &val) );
+  MP_CHECKOK( mp_init_copy(&t1, &t0)  );
+  MP_CHECKOK( mp_init(&tmp, FLAG(a)) );
+  MP_CHECKOK( mp_init(&two2k, FLAG(a)) );
+  MP_CHECKOK( s_mp_2expt(&two2k, k) );
+  do {
+    MP_CHECKOK( mp_mul(&val, &t1, &tmp)  );
+    MP_CHECKOK( mp_sub(&two, &tmp, &tmp) );
+    MP_CHECKOK( mp_mul(&t1, &tmp, &t1)   );
+    s_mp_mod_2d(&t1, k);
+    while (MP_SIGN(&t1) != MP_ZPOS) {
+      MP_CHECKOK( mp_add(&t1, &two2k, &t1) );
+    }
+    if (mp_cmp(&t1, &t0) == MP_EQ)
+      break;
+    MP_CHECKOK( mp_copy(&t1, &t0) );
+  } while (--ix > 0);
+  if (!ix) {
+    res = MP_UNDEF;
+  } else {
+    mp_exch(c, &t1);
+  }
+
+CLEANUP:
+  mp_clear(&t0);
+  mp_clear(&t1);
+  mp_clear(&val);
+  mp_clear(&tmp);
+  mp_clear(&two2k);
+  return res;
+}
+
+mp_err s_mp_invmod_even_m(const mp_int *a, const mp_int *m, mp_int *c)
+{
+  mp_err res;
+  mp_size k;
+  mp_int oddFactor, evenFactor; /* factors of the modulus */
+  mp_int oddPart, evenPart;     /* parts to combine via CRT. */
+  mp_int C2, tmp1, tmp2;
+
+  /*static const mp_digit d1 = 1; */
+  /*static const mp_int one = { MP_ZPOS, 1, 1, (mp_digit *)&d1 }; */
+
+  if ((res = s_mp_ispow2(m)) >= 0) {
+    k = res;
+    return s_mp_invmod_2d(a, k, c);
+  }
+  MP_DIGITS(&oddFactor) = 0;
+  MP_DIGITS(&evenFactor) = 0;
+  MP_DIGITS(&oddPart) = 0;
+  MP_DIGITS(&evenPart) = 0;
+  MP_DIGITS(&C2)     = 0;
+  MP_DIGITS(&tmp1)   = 0;
+  MP_DIGITS(&tmp2)   = 0;
+
+  MP_CHECKOK( mp_init_copy(&oddFactor, m) );    /* oddFactor = m */
+  MP_CHECKOK( mp_init(&evenFactor, FLAG(m)) );
+  MP_CHECKOK( mp_init(&oddPart, FLAG(m)) );
+  MP_CHECKOK( mp_init(&evenPart, FLAG(m)) );
+  MP_CHECKOK( mp_init(&C2, FLAG(m))     );
+  MP_CHECKOK( mp_init(&tmp1, FLAG(m))   );
+  MP_CHECKOK( mp_init(&tmp2, FLAG(m))   );
+
+  k = mp_trailing_zeros(m);
+  s_mp_div_2d(&oddFactor, k);
+  MP_CHECKOK( s_mp_2expt(&evenFactor, k) );
+
+  /* compute a**-1 mod oddFactor. */
+  MP_CHECKOK( s_mp_invmod_odd_m(a, &oddFactor, &oddPart) );
+  /* compute a**-1 mod evenFactor, where evenFactor == 2**k. */
+  MP_CHECKOK( s_mp_invmod_2d(   a,       k,    &evenPart) );
+
+  /* Use Chinese Remainer theorem to compute a**-1 mod m. */
+  /* let m1 = oddFactor,  v1 = oddPart,
+   * let m2 = evenFactor, v2 = evenPart.
+   */
+
+  /* Compute C2 = m1**-1 mod m2. */
+  MP_CHECKOK( s_mp_invmod_2d(&oddFactor, k,    &C2) );
+
+  /* compute u = (v2 - v1)*C2 mod m2 */
+  MP_CHECKOK( mp_sub(&evenPart, &oddPart,   &tmp1) );
+  MP_CHECKOK( mp_mul(&tmp1,     &C2,        &tmp2) );
+  s_mp_mod_2d(&tmp2, k);
+  while (MP_SIGN(&tmp2) != MP_ZPOS) {
+    MP_CHECKOK( mp_add(&tmp2, &evenFactor, &tmp2) );
+  }
+
+  /* compute answer = v1 + u*m1 */
+  MP_CHECKOK( mp_mul(&tmp2,     &oddFactor, c) );
+  MP_CHECKOK( mp_add(&oddPart,  c,          c) );
+  /* not sure this is necessary, but it's low cost if not. */
+  MP_CHECKOK( mp_mod(c,         m,          c) );
+
+CLEANUP:
+  mp_clear(&oddFactor);
+  mp_clear(&evenFactor);
+  mp_clear(&oddPart);
+  mp_clear(&evenPart);
+  mp_clear(&C2);
+  mp_clear(&tmp1);
+  mp_clear(&tmp2);
+  return res;
+}
+
+
+/* {{{ mp_invmod(a, m, c) */
+
+/*
+  mp_invmod(a, m, c)
+
+  Compute c = a^-1 (mod m), if there is an inverse for a (mod m).
+  This is equivalent to the question of whether (a, m) = 1.  If not,
+  MP_UNDEF is returned, and there is no inverse.
+ */
+
+mp_err mp_invmod(const mp_int *a, const mp_int *m, mp_int *c)
+{
+
+  ARGCHK(a && m && c, MP_BADARG);
+
+  if(mp_cmp_z(a) == 0 || mp_cmp_z(m) == 0)
+    return MP_RANGE;
+
+  if (mp_isodd(m)) {
+    return s_mp_invmod_odd_m(a, m, c);
+  }
+  if (mp_iseven(a))
+    return MP_UNDEF;    /* not invertable */
+
+  return s_mp_invmod_even_m(a, m, c);
+
+} /* end mp_invmod() */
+
+/* }}} */
+#endif /* if MP_NUMTH */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/* {{{ mp_print(mp, ofp) */
+
+#if MP_IOFUNC
+/*
+  mp_print(mp, ofp)
+
+  Print a textual representation of the given mp_int on the output
+  stream 'ofp'.  Output is generated using the internal radix.
+ */
+
+void   mp_print(mp_int *mp, FILE *ofp)
+{
+  int   ix;
+
+  if(mp == NULL || ofp == NULL)
+    return;
+
+  fputc((SIGN(mp) == NEG) ? '-' : '+', ofp);
+
+  for(ix = USED(mp) - 1; ix >= 0; ix--) {
+    fprintf(ofp, DIGIT_FMT, DIGIT(mp, ix));
+  }
+
+} /* end mp_print() */
+
+#endif /* if MP_IOFUNC */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/* {{{ More I/O Functions */
+
+/* {{{ mp_read_raw(mp, str, len) */
+
+/*
+   mp_read_raw(mp, str, len)
+
+   Read in a raw value (base 256) into the given mp_int
+ */
+
+mp_err  mp_read_raw(mp_int *mp, char *str, int len)
+{
+  int            ix;
+  mp_err         res;
+  unsigned char *ustr = (unsigned char *)str;
+
+  ARGCHK(mp != NULL && str != NULL && len > 0, MP_BADARG);
+
+  mp_zero(mp);
+
+  /* Get sign from first byte */
+  if(ustr[0])
+    SIGN(mp) = NEG;
+  else
+    SIGN(mp) = ZPOS;
+
+  /* Read the rest of the digits */
+  for(ix = 1; ix < len; ix++) {
+    if((res = mp_mul_d(mp, 256, mp)) != MP_OKAY)
+      return res;
+    if((res = mp_add_d(mp, ustr[ix], mp)) != MP_OKAY)
+      return res;
+  }
+
+  return MP_OKAY;
+
+} /* end mp_read_raw() */
+
+/* }}} */
+
+/* {{{ mp_raw_size(mp) */
+
+int    mp_raw_size(mp_int *mp)
+{
+  ARGCHK(mp != NULL, 0);
+
+  return (USED(mp) * sizeof(mp_digit)) + 1;
+
+} /* end mp_raw_size() */
+
+/* }}} */
+
+/* {{{ mp_toraw(mp, str) */
+
+mp_err mp_toraw(mp_int *mp, char *str)
+{
+  int  ix, jx, pos = 1;
+
+  ARGCHK(mp != NULL && str != NULL, MP_BADARG);
+
+  str[0] = (char)SIGN(mp);
+
+  /* Iterate over each digit... */
+  for(ix = USED(mp) - 1; ix >= 0; ix--) {
+    mp_digit  d = DIGIT(mp, ix);
+
+    /* Unpack digit bytes, high order first */
+    for(jx = sizeof(mp_digit) - 1; jx >= 0; jx--) {
+      str[pos++] = (char)(d >> (jx * CHAR_BIT));
+    }
+  }
+
+  return MP_OKAY;
+
+} /* end mp_toraw() */
+
+/* }}} */
+
+/* {{{ mp_read_radix(mp, str, radix) */
+
+/*
+  mp_read_radix(mp, str, radix)
+
+  Read an integer from the given string, and set mp to the resulting
+  value.  The input is presumed to be in base 10.  Leading non-digit
+  characters are ignored, and the function reads until a non-digit
+  character or the end of the string.
+ */
+
+mp_err  mp_read_radix(mp_int *mp, const char *str, int radix)
+{
+  int     ix = 0, val = 0;
+  mp_err  res;
+  mp_sign sig = ZPOS;
+
+  ARGCHK(mp != NULL && str != NULL && radix >= 2 && radix <= MAX_RADIX,
+         MP_BADARG);
+
+  mp_zero(mp);
+
+  /* Skip leading non-digit characters until a digit or '-' or '+' */
+  while(str[ix] &&
+        (s_mp_tovalue(str[ix], radix) < 0) &&
+        str[ix] != '-' &&
+        str[ix] != '+') {
+    ++ix;
+  }
+
+  if(str[ix] == '-') {
+    sig = NEG;
+    ++ix;
+  } else if(str[ix] == '+') {
+    sig = ZPOS; /* this is the default anyway... */
+    ++ix;
+  }
+
+  while((val = s_mp_tovalue(str[ix], radix)) >= 0) {
+    if((res = s_mp_mul_d(mp, radix)) != MP_OKAY)
+      return res;
+    if((res = s_mp_add_d(mp, val)) != MP_OKAY)
+      return res;
+    ++ix;
+  }
+
+  if(s_mp_cmp_d(mp, 0) == MP_EQ)
+    SIGN(mp) = ZPOS;
+  else
+    SIGN(mp) = sig;
+
+  return MP_OKAY;
+
+} /* end mp_read_radix() */
+
+mp_err mp_read_variable_radix(mp_int *a, const char * str, int default_radix)
+{
+  int     radix = default_radix;
+  int     cx;
+  mp_sign sig   = ZPOS;
+  mp_err  res;
+
+  /* Skip leading non-digit characters until a digit or '-' or '+' */
+  while ((cx = *str) != 0 &&
+        (s_mp_tovalue(cx, radix) < 0) &&
+        cx != '-' &&
+        cx != '+') {
+    ++str;
+  }
+
+  if (cx == '-') {
+    sig = NEG;
+    ++str;
+  } else if (cx == '+') {
+    sig = ZPOS; /* this is the default anyway... */
+    ++str;
+  }
+
+  if (str[0] == '0') {
+    if ((str[1] | 0x20) == 'x') {
+      radix = 16;
+      str += 2;
+    } else {
+      radix = 8;
+      str++;
+    }
+  }
+  res = mp_read_radix(a, str, radix);
+  if (res == MP_OKAY) {
+    MP_SIGN(a) = (s_mp_cmp_d(a, 0) == MP_EQ) ? ZPOS : sig;
+  }
+  return res;
+}
+
+/* }}} */
+
+/* {{{ mp_radix_size(mp, radix) */
+
+int    mp_radix_size(mp_int *mp, int radix)
+{
+  int  bits;
+
+  if(!mp || radix < 2 || radix > MAX_RADIX)
+    return 0;
+
+  bits = USED(mp) * DIGIT_BIT - 1;
+
+  return s_mp_outlen(bits, radix);
+
+} /* end mp_radix_size() */
+
+/* }}} */
+
+/* {{{ mp_toradix(mp, str, radix) */
+
+mp_err mp_toradix(mp_int *mp, char *str, int radix)
+{
+  int  ix, pos = 0;
+
+  ARGCHK(mp != NULL && str != NULL, MP_BADARG);
+  ARGCHK(radix > 1 && radix <= MAX_RADIX, MP_RANGE);
+
+  if(mp_cmp_z(mp) == MP_EQ) {
+    str[0] = '0';
+    str[1] = '\0';
+  } else {
+    mp_err   res;
+    mp_int   tmp;
+    mp_sign  sgn;
+    mp_digit rem, rdx = (mp_digit)radix;
+    char     ch;
+
+    if((res = mp_init_copy(&tmp, mp)) != MP_OKAY)
+      return res;
+
+    /* Save sign for later, and take absolute value */
+    sgn = SIGN(&tmp); SIGN(&tmp) = ZPOS;
+
+    /* Generate output digits in reverse order      */
+    while(mp_cmp_z(&tmp) != 0) {
+      if((res = mp_div_d(&tmp, rdx, &tmp, &rem)) != MP_OKAY) {
+        mp_clear(&tmp);
+        return res;
+      }
+
+      /* Generate digits, use capital letters */
+      ch = s_mp_todigit(rem, radix, 0);
+
+      str[pos++] = ch;
+    }
+
+    /* Add - sign if original value was negative */
+    if(sgn == NEG)
+      str[pos++] = '-';
+
+    /* Add trailing NUL to end the string        */
+    str[pos--] = '\0';
+
+    /* Reverse the digits and sign indicator     */
+    ix = 0;
+    while(ix < pos) {
+      char tmp = str[ix];
+
+      str[ix] = str[pos];
+      str[pos] = tmp;
+      ++ix;
+      --pos;
+    }
+
+    mp_clear(&tmp);
+  }
+
+  return MP_OKAY;
+
+} /* end mp_toradix() */
+
+/* }}} */
+
+/* {{{ mp_tovalue(ch, r) */
+
+int    mp_tovalue(char ch, int r)
+{
+  return s_mp_tovalue(ch, r);
+
+} /* end mp_tovalue() */
+
+/* }}} */
+
+/* }}} */
+
+/* {{{ mp_strerror(ec) */
+
+/*
+  mp_strerror(ec)
+
+  Return a string describing the meaning of error code 'ec'.  The
+  string returned is allocated in static memory, so the caller should
+  not attempt to modify or free the memory associated with this
+  string.
+ */
+const char  *mp_strerror(mp_err ec)
+{
+  int   aec = (ec < 0) ? -ec : ec;
+
+  /* Code values are negative, so the senses of these comparisons
+     are accurate */
+  if(ec < MP_LAST_CODE || ec > MP_OKAY) {
+    return mp_err_string[0];  /* unknown error code */
+  } else {
+    return mp_err_string[aec + 1];
+  }
+
+} /* end mp_strerror() */
+
+/* }}} */
+
+/*========================================================================*/
+/*------------------------------------------------------------------------*/
+/* Static function definitions (internal use only)                        */
+
+/* {{{ Memory management */
+
+/* {{{ s_mp_grow(mp, min) */
+
+/* Make sure there are at least 'min' digits allocated to mp              */
+mp_err   s_mp_grow(mp_int *mp, mp_size min)
+{
+  if(min > ALLOC(mp)) {
+    mp_digit   *tmp;
+
+    /* Set min to next nearest default precision block size */
+    min = MP_ROUNDUP(min, s_mp_defprec);
+
+    if((tmp = s_mp_alloc(min, sizeof(mp_digit), FLAG(mp))) == NULL)
+      return MP_MEM;
+
+    s_mp_copy(DIGITS(mp), tmp, USED(mp));
+
+#if MP_CRYPTO
+    s_mp_setz(DIGITS(mp), ALLOC(mp));
+#endif
+    s_mp_free(DIGITS(mp), ALLOC(mp));
+    DIGITS(mp) = tmp;
+    ALLOC(mp) = min;
+  }
+
+  return MP_OKAY;
+
+} /* end s_mp_grow() */
+
+/* }}} */
+
+/* {{{ s_mp_pad(mp, min) */
+
+/* Make sure the used size of mp is at least 'min', growing if needed     */
+mp_err   s_mp_pad(mp_int *mp, mp_size min)
+{
+  if(min > USED(mp)) {
+    mp_err  res;
+
+    /* Make sure there is room to increase precision  */
+    if (min > ALLOC(mp)) {
+      if ((res = s_mp_grow(mp, min)) != MP_OKAY)
+        return res;
+    } else {
+      s_mp_setz(DIGITS(mp) + USED(mp), min - USED(mp));
+    }
+
+    /* Increase precision; should already be 0-filled */
+    USED(mp) = min;
+  }
+
+  return MP_OKAY;
+
+} /* end s_mp_pad() */
+
+/* }}} */
+
+/* {{{ s_mp_setz(dp, count) */
+
+#if MP_MACRO == 0
+/* Set 'count' digits pointed to by dp to be zeroes                       */
+void s_mp_setz(mp_digit *dp, mp_size count)
+{
+#if MP_MEMSET == 0
+  int  ix;
+
+  for(ix = 0; ix < count; ix++)
+    dp[ix] = 0;
+#else
+  memset(dp, 0, count * sizeof(mp_digit));
+#endif
+
+} /* end s_mp_setz() */
+#endif
+
+/* }}} */
+
+/* {{{ s_mp_copy(sp, dp, count) */
+
+#if MP_MACRO == 0
+/* Copy 'count' digits from sp to dp                                      */
+void s_mp_copy(const mp_digit *sp, mp_digit *dp, mp_size count)
+{
+#if MP_MEMCPY == 0
+  int  ix;
+
+  for(ix = 0; ix < count; ix++)
+    dp[ix] = sp[ix];
+#else
+  memcpy(dp, sp, count * sizeof(mp_digit));
+#endif
+
+} /* end s_mp_copy() */
+#endif
+
+/* }}} */
+
+/* {{{ s_mp_alloc(nb, ni, kmflag) */
+
+#if MP_MACRO == 0
+/* Allocate ni records of nb bytes each, and return a pointer to that     */
+void    *s_mp_alloc(size_t nb, size_t ni, int kmflag)
+{
+  mp_int *mp;
+  ++mp_allocs;
+#ifdef _KERNEL
+  mp = kmem_zalloc(nb * ni, kmflag);
+  if (mp != NULL)
+    FLAG(mp) = kmflag;
+  return (mp);
+#else
+  return calloc(nb, ni);
+#endif
+
+} /* end s_mp_alloc() */
+#endif
+
+/* }}} */
+
+/* {{{ s_mp_free(ptr) */
+
+#if MP_MACRO == 0
+/* Free the memory pointed to by ptr                                      */
+void     s_mp_free(void *ptr, mp_size alloc)
+{
+  if(ptr) {
+    ++mp_frees;
+#ifdef _KERNEL
+    kmem_free(ptr, alloc * sizeof (mp_digit));
+#else
+    free(ptr);
+#endif
+  }
+} /* end s_mp_free() */
+#endif
+
+/* }}} */
+
+/* {{{ s_mp_clamp(mp) */
+
+#if MP_MACRO == 0
+/* Remove leading zeroes from the given value                             */
+void     s_mp_clamp(mp_int *mp)
+{
+  mp_size used = MP_USED(mp);
+  while (used > 1 && DIGIT(mp, used - 1) == 0)
+    --used;
+  MP_USED(mp) = used;
+} /* end s_mp_clamp() */
+#endif
+
+/* }}} */
+
+/* {{{ s_mp_exch(a, b) */
+
+/* Exchange the data for a and b; (b, a) = (a, b)                         */
+void     s_mp_exch(mp_int *a, mp_int *b)
+{
+  mp_int   tmp;
+
+  tmp = *a;
+  *a = *b;
+  *b = tmp;
+
+} /* end s_mp_exch() */
+
+/* }}} */
+
+/* }}} */
+
+/* {{{ Arithmetic helpers */
+
+/* {{{ s_mp_lshd(mp, p) */
+
+/*
+   Shift mp leftward by p digits, growing if needed, and zero-filling
+   the in-shifted digits at the right end.  This is a convenient
+   alternative to multiplication by powers of the radix
+   The value of USED(mp) must already have been set to the value for
+   the shifted result.
+ */
+
+mp_err   s_mp_lshd(mp_int *mp, mp_size p)
+{
+  mp_err  res;
+  mp_size pos;
+  int     ix;
+
+  if(p == 0)
+    return MP_OKAY;
+
+  if (MP_USED(mp) == 1 && MP_DIGIT(mp, 0) == 0)
+    return MP_OKAY;
+
+  if((res = s_mp_pad(mp, USED(mp) + p)) != MP_OKAY)
+    return res;
+
+  pos = USED(mp) - 1;
+
+  /* Shift all the significant figures over as needed */
+  for(ix = pos - p; ix >= 0; ix--)
+    DIGIT(mp, ix + p) = DIGIT(mp, ix);
+
+  /* Fill the bottom digits with zeroes */
+  for(ix = 0; ix < p; ix++)
+    DIGIT(mp, ix) = 0;
+
+  return MP_OKAY;
+
+} /* end s_mp_lshd() */
+
+/* }}} */
+
+/* {{{ s_mp_mul_2d(mp, d) */
+
+/*
+  Multiply the integer by 2^d, where d is a number of bits.  This
+  amounts to a bitwise shift of the value.
+ */
+mp_err   s_mp_mul_2d(mp_int *mp, mp_digit d)
+{
+  mp_err   res;
+  mp_digit dshift, bshift;
+  mp_digit mask;
+
+  ARGCHK(mp != NULL,  MP_BADARG);
+
+  dshift = d / MP_DIGIT_BIT;
+  bshift = d % MP_DIGIT_BIT;
+  /* bits to be shifted out of the top word */
+  mask   = ((mp_digit)~0 << (MP_DIGIT_BIT - bshift));
+  mask  &= MP_DIGIT(mp, MP_USED(mp) - 1);
+
+  if (MP_OKAY != (res = s_mp_pad(mp, MP_USED(mp) + dshift + (mask != 0) )))
+    return res;
+
+  if (dshift && MP_OKAY != (res = s_mp_lshd(mp, dshift)))
+    return res;
+
+  if (bshift) {
+    mp_digit *pa = MP_DIGITS(mp);
+    mp_digit *alim = pa + MP_USED(mp);
+    mp_digit  prev = 0;
+
+    for (pa += dshift; pa < alim; ) {
+      mp_digit x = *pa;
+      *pa++ = (x << bshift) | prev;
+      prev = x >> (DIGIT_BIT - bshift);
+    }
+  }
+
+  s_mp_clamp(mp);
+  return MP_OKAY;
+} /* end s_mp_mul_2d() */
+
+/* {{{ s_mp_rshd(mp, p) */
+
+/*
+   Shift mp rightward by p digits.  Maintains the invariant that
+   digits above the precision are all zero.  Digits shifted off the
+   end are lost.  Cannot fail.
+ */
+
+void     s_mp_rshd(mp_int *mp, mp_size p)
+{
+  mp_size  ix;
+  mp_digit *src, *dst;
+
+  if(p == 0)
+    return;
+
+  /* Shortcut when all digits are to be shifted off */
+  if(p >= USED(mp)) {
+    s_mp_setz(DIGITS(mp), ALLOC(mp));
+    USED(mp) = 1;
+    SIGN(mp) = ZPOS;
+    return;
+  }
+
+  /* Shift all the significant figures over as needed */
+  dst = MP_DIGITS(mp);
+  src = dst + p;
+  for (ix = USED(mp) - p; ix > 0; ix--)
+    *dst++ = *src++;
+
+  MP_USED(mp) -= p;
+  /* Fill the top digits with zeroes */
+  while (p-- > 0)
+    *dst++ = 0;
+
+#if 0
+  /* Strip off any leading zeroes    */
+  s_mp_clamp(mp);
+#endif
+
+} /* end s_mp_rshd() */
+
+/* }}} */
+
+/* {{{ s_mp_div_2(mp) */
+
+/* Divide by two -- take advantage of radix properties to do it fast      */
+void     s_mp_div_2(mp_int *mp)
+{
+  s_mp_div_2d(mp, 1);
+
+} /* end s_mp_div_2() */
+
+/* }}} */
+
+/* {{{ s_mp_mul_2(mp) */
+
+mp_err s_mp_mul_2(mp_int *mp)
+{
+  mp_digit *pd;
+  int      ix, used;
+  mp_digit kin = 0;
+
+  /* Shift digits leftward by 1 bit */
+  used = MP_USED(mp);
+  pd = MP_DIGITS(mp);
+  for (ix = 0; ix < used; ix++) {
+    mp_digit d = *pd;
+    *pd++ = (d << 1) | kin;
+    kin = (d >> (DIGIT_BIT - 1));
+  }
+
+  /* Deal with rollover from last digit */
+  if (kin) {
+    if (ix >= ALLOC(mp)) {
+      mp_err res;
+      if((res = s_mp_grow(mp, ALLOC(mp) + 1)) != MP_OKAY)
+        return res;
+    }
+
+    DIGIT(mp, ix) = kin;
+    USED(mp) += 1;
+  }
+
+  return MP_OKAY;
+
+} /* end s_mp_mul_2() */
+
+/* }}} */
+
+/* {{{ s_mp_mod_2d(mp, d) */
+
+/*
+  Remainder the integer by 2^d, where d is a number of bits.  This
+  amounts to a bitwise AND of the value, and does not require the full
+  division code
+ */
+void     s_mp_mod_2d(mp_int *mp, mp_digit d)
+{
+  mp_size  ndig = (d / DIGIT_BIT), nbit = (d % DIGIT_BIT);
+  mp_size  ix;
+  mp_digit dmask;
+
+  if(ndig >= USED(mp))
+    return;
+
+  /* Flush all the bits above 2^d in its digit */
+  dmask = ((mp_digit)1 << nbit) - 1;
+  DIGIT(mp, ndig) &= dmask;
+
+  /* Flush all digits above the one with 2^d in it */
+  for(ix = ndig + 1; ix < USED(mp); ix++)
+    DIGIT(mp, ix) = 0;
+
+  s_mp_clamp(mp);
+
+} /* end s_mp_mod_2d() */
+
+/* }}} */
+
+/* {{{ s_mp_div_2d(mp, d) */
+
+/*
+  Divide the integer by 2^d, where d is a number of bits.  This
+  amounts to a bitwise shift of the value, and does not require the
+  full division code (used in Barrett reduction, see below)
+ */
+void     s_mp_div_2d(mp_int *mp, mp_digit d)
+{
+  int       ix;
+  mp_digit  save, next, mask;
+
+  s_mp_rshd(mp, d / DIGIT_BIT);
+  d %= DIGIT_BIT;
+  if (d) {
+    mask = ((mp_digit)1 << d) - 1;
+    save = 0;
+    for(ix = USED(mp) - 1; ix >= 0; ix--) {
+      next = DIGIT(mp, ix) & mask;
+      DIGIT(mp, ix) = (DIGIT(mp, ix) >> d) | (save << (DIGIT_BIT - d));
+      save = next;
+    }
+  }
+  s_mp_clamp(mp);
+
+} /* end s_mp_div_2d() */
+
+/* }}} */
+
+/* {{{ s_mp_norm(a, b, *d) */
+
+/*
+  s_mp_norm(a, b, *d)
+
+  Normalize a and b for division, where b is the divisor.  In order
+  that we might make good guesses for quotient digits, we want the
+  leading digit of b to be at least half the radix, which we
+  accomplish by multiplying a and b by a power of 2.  The exponent
+  (shift count) is placed in *pd, so that the remainder can be shifted
+  back at the end of the division process.
+ */
+
+mp_err   s_mp_norm(mp_int *a, mp_int *b, mp_digit *pd)
+{
+  mp_digit  d;
+  mp_digit  mask;
+  mp_digit  b_msd;
+  mp_err    res    = MP_OKAY;
+
+  d = 0;
+  mask  = DIGIT_MAX & ~(DIGIT_MAX >> 1);        /* mask is msb of digit */
+  b_msd = DIGIT(b, USED(b) - 1);
+  while (!(b_msd & mask)) {
+    b_msd <<= 1;
+    ++d;
+  }
+
+  if (d) {
+    MP_CHECKOK( s_mp_mul_2d(a, d) );
+    MP_CHECKOK( s_mp_mul_2d(b, d) );
+  }
+
+  *pd = d;
+CLEANUP:
+  return res;
+
+} /* end s_mp_norm() */
+
+/* }}} */
+
+/* }}} */
+
+/* {{{ Primitive digit arithmetic */
+
+/* {{{ s_mp_add_d(mp, d) */
+
+/* Add d to |mp| in place                                                 */
+mp_err   s_mp_add_d(mp_int *mp, mp_digit d)    /* unsigned digit addition */
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  mp_word   w, k = 0;
+  mp_size   ix = 1;
+
+  w = (mp_word)DIGIT(mp, 0) + d;
+  DIGIT(mp, 0) = ACCUM(w);
+  k = CARRYOUT(w);
+
+  while(ix < USED(mp) && k) {
+    w = (mp_word)DIGIT(mp, ix) + k;
+    DIGIT(mp, ix) = ACCUM(w);
+    k = CARRYOUT(w);
+    ++ix;
+  }
+
+  if(k != 0) {
+    mp_err  res;
+
+    if((res = s_mp_pad(mp, USED(mp) + 1)) != MP_OKAY)
+      return res;
+
+    DIGIT(mp, ix) = (mp_digit)k;
+  }
+
+  return MP_OKAY;
+#else
+  mp_digit * pmp = MP_DIGITS(mp);
+  mp_digit sum, mp_i, carry = 0;
+  mp_err   res = MP_OKAY;
+  int used = (int)MP_USED(mp);
+
+  mp_i = *pmp;
+  *pmp++ = sum = d + mp_i;
+  carry = (sum < d);
+  while (carry && --used > 0) {
+    mp_i = *pmp;
+    *pmp++ = sum = carry + mp_i;
+    carry = !sum;
+  }
+  if (carry && !used) {
+    /* mp is growing */
+    used = MP_USED(mp);
+    MP_CHECKOK( s_mp_pad(mp, used + 1) );
+    MP_DIGIT(mp, used) = carry;
+  }
+CLEANUP:
+  return res;
+#endif
+} /* end s_mp_add_d() */
+
+/* }}} */
+
+/* {{{ s_mp_sub_d(mp, d) */
+
+/* Subtract d from |mp| in place, assumes |mp| > d                        */
+mp_err   s_mp_sub_d(mp_int *mp, mp_digit d)    /* unsigned digit subtract */
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+  mp_word   w, b = 0;
+  mp_size   ix = 1;
+
+  /* Compute initial subtraction    */
+  w = (RADIX + (mp_word)DIGIT(mp, 0)) - d;
+  b = CARRYOUT(w) ? 0 : 1;
+  DIGIT(mp, 0) = ACCUM(w);
+
+  /* Propagate borrows leftward     */
+  while(b && ix < USED(mp)) {
+    w = (RADIX + (mp_word)DIGIT(mp, ix)) - b;
+    b = CARRYOUT(w) ? 0 : 1;
+    DIGIT(mp, ix) = ACCUM(w);
+    ++ix;
+  }
+
+  /* Remove leading zeroes          */
+  s_mp_clamp(mp);
+
+  /* If we have a borrow out, it's a violation of the input invariant */
+  if(b)
+    return MP_RANGE;
+  else
+    return MP_OKAY;
+#else
+  mp_digit *pmp = MP_DIGITS(mp);
+  mp_digit mp_i, diff, borrow;
+  mp_size  used = MP_USED(mp);
+
+  mp_i = *pmp;
+  *pmp++ = diff = mp_i - d;
+  borrow = (diff > mp_i);
+  while (borrow && --used) {
+    mp_i = *pmp;
+    *pmp++ = diff = mp_i - borrow;
+    borrow = (diff > mp_i);
+  }
+  s_mp_clamp(mp);
+  return (borrow && !used) ? MP_RANGE : MP_OKAY;
+#endif
+} /* end s_mp_sub_d() */
+
+/* }}} */
+
+/* {{{ s_mp_mul_d(a, d) */
+
+/* Compute a = a * d, single digit multiplication                         */
+mp_err   s_mp_mul_d(mp_int *a, mp_digit d)
+{
+  mp_err  res;
+  mp_size used;
+  int     pow;
+
+  if (!d) {
+    mp_zero(a);
+    return MP_OKAY;
+  }
+  if (d == 1)
+    return MP_OKAY;
+  if (0 <= (pow = s_mp_ispow2d(d))) {
+    return s_mp_mul_2d(a, (mp_digit)pow);
+  }
+
+  used = MP_USED(a);
+  MP_CHECKOK( s_mp_pad(a, used + 1) );
+
+  s_mpv_mul_d(MP_DIGITS(a), used, d, MP_DIGITS(a));
+
+  s_mp_clamp(a);
+
+CLEANUP:
+  return res;
+
+} /* end s_mp_mul_d() */
+
+/* }}} */
+
+/* {{{ s_mp_div_d(mp, d, r) */
+
+/*
+  s_mp_div_d(mp, d, r)
+
+  Compute the quotient mp = mp / d and remainder r = mp mod d, for a
+  single digit d.  If r is null, the remainder will be discarded.
+ */
+
+mp_err   s_mp_div_d(mp_int *mp, mp_digit d, mp_digit *r)
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_DIV_WORD)
+  mp_word   w = 0, q;
+#else
+  mp_digit  w, q;
+#endif
+  int       ix;
+  mp_err    res;
+  mp_int    quot;
+  mp_int    rem;
+
+  if(d == 0)
+    return MP_RANGE;
+  if (d == 1) {
+    if (r)
+      *r = 0;
+    return MP_OKAY;
+  }
+  /* could check for power of 2 here, but mp_div_d does that. */
+  if (MP_USED(mp) == 1) {
+    mp_digit n   = MP_DIGIT(mp,0);
+    mp_digit rem;
+
+    q   = n / d;
+    rem = n % d;
+    MP_DIGIT(mp,0) = q;
+    if (r)
+      *r = rem;
+    return MP_OKAY;
+  }
+
+  MP_DIGITS(&rem)  = 0;
+  MP_DIGITS(&quot) = 0;
+  /* Make room for the quotient */
+  MP_CHECKOK( mp_init_size(&quot, USED(mp), FLAG(mp)) );
+
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_DIV_WORD)
+  for(ix = USED(mp) - 1; ix >= 0; ix--) {
+    w = (w << DIGIT_BIT) | DIGIT(mp, ix);
+
+    if(w >= d) {
+      q = w / d;
+      w = w % d;
+    } else {
+      q = 0;
+    }
+
+    s_mp_lshd(&quot, 1);
+    DIGIT(&quot, 0) = (mp_digit)q;
+  }
+#else
+  {
+    mp_digit p;
+#if !defined(MP_ASSEMBLY_DIV_2DX1D)
+    mp_digit norm;
+#endif
+
+    MP_CHECKOK( mp_init_copy(&rem, mp) );
+
+#if !defined(MP_ASSEMBLY_DIV_2DX1D)
+    MP_DIGIT(&quot, 0) = d;
+    MP_CHECKOK( s_mp_norm(&rem, &quot, &norm) );
+    if (norm)
+      d <<= norm;
+    MP_DIGIT(&quot, 0) = 0;
+#endif
+
+    p = 0;
+    for (ix = USED(&rem) - 1; ix >= 0; ix--) {
+      w = DIGIT(&rem, ix);
+
+      if (p) {
+        MP_CHECKOK( s_mpv_div_2dx1d(p, w, d, &q, &w) );
+      } else if (w >= d) {
+        q = w / d;
+        w = w % d;
+      } else {
+        q = 0;
+      }
+
+      MP_CHECKOK( s_mp_lshd(&quot, 1) );
+      DIGIT(&quot, 0) = q;
+      p = w;
+    }
+#if !defined(MP_ASSEMBLY_DIV_2DX1D)
+    if (norm)
+      w >>= norm;
+#endif
+  }
+#endif
+
+  /* Deliver the remainder, if desired */
+  if(r)
+    *r = (mp_digit)w;
+
+  s_mp_clamp(&quot);
+  mp_exch(&quot, mp);
+CLEANUP:
+  mp_clear(&quot);
+  mp_clear(&rem);
+
+  return res;
+} /* end s_mp_div_d() */
+
+/* }}} */
+
+
+/* }}} */
+
+/* {{{ Primitive full arithmetic */
+
+/* {{{ s_mp_add(a, b) */
+
+/* Compute a = |a| + |b|                                                  */
+mp_err   s_mp_add(mp_int *a, const mp_int *b)  /* magnitude addition      */
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  mp_word   w = 0;
+#else
+  mp_digit  d, sum, carry = 0;
+#endif
+  mp_digit *pa, *pb;
+  mp_size   ix;
+  mp_size   used;
+  mp_err    res;
+
+  /* Make sure a has enough precision for the output value */
+  if((USED(b) > USED(a)) && (res = s_mp_pad(a, USED(b))) != MP_OKAY)
+    return res;
+
+  /*
+    Add up all digits up to the precision of b.  If b had initially
+    the same precision as a, or greater, we took care of it by the
+    padding step above, so there is no problem.  If b had initially
+    less precision, we'll have to make sure the carry out is duly
+    propagated upward among the higher-order digits of the sum.
+   */
+  pa = MP_DIGITS(a);
+  pb = MP_DIGITS(b);
+  used = MP_USED(b);
+  for(ix = 0; ix < used; ix++) {
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+    w = w + *pa + *pb++;
+    *pa++ = ACCUM(w);
+    w = CARRYOUT(w);
+#else
+    d = *pa;
+    sum = d + *pb++;
+    d = (sum < d);                      /* detect overflow */
+    *pa++ = sum += carry;
+    carry = d + (sum < carry);          /* detect overflow */
+#endif
+  }
+
+  /* If we run out of 'b' digits before we're actually done, make
+     sure the carries get propagated upward...
+   */
+  used = MP_USED(a);
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  while (w && ix < used) {
+    w = w + *pa;
+    *pa++ = ACCUM(w);
+    w = CARRYOUT(w);
+    ++ix;
+  }
+#else
+  while (carry && ix < used) {
+    sum = carry + *pa;
+    *pa++ = sum;
+    carry = !sum;
+    ++ix;
+  }
+#endif
+
+  /* If there's an overall carry out, increase precision and include
+     it.  We could have done this initially, but why touch the memory
+     allocator unless we're sure we have to?
+   */
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  if (w) {
+    if((res = s_mp_pad(a, used + 1)) != MP_OKAY)
+      return res;
+
+    DIGIT(a, ix) = (mp_digit)w;
+  }
+#else
+  if (carry) {
+    if((res = s_mp_pad(a, used + 1)) != MP_OKAY)
+      return res;
+
+    DIGIT(a, used) = carry;
+  }
+#endif
+
+  return MP_OKAY;
+} /* end s_mp_add() */
+
+/* }}} */
+
+/* Compute c = |a| + |b|         */ /* magnitude addition      */
+mp_err   s_mp_add_3arg(const mp_int *a, const mp_int *b, mp_int *c)
+{
+  mp_digit *pa, *pb, *pc;
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  mp_word   w = 0;
+#else
+  mp_digit  sum, carry = 0, d;
+#endif
+  mp_size   ix;
+  mp_size   used;
+  mp_err    res;
+
+  MP_SIGN(c) = MP_SIGN(a);
+  if (MP_USED(a) < MP_USED(b)) {
+    const mp_int *xch = a;
+    a = b;
+    b = xch;
+  }
+
+  /* Make sure a has enough precision for the output value */
+  if (MP_OKAY != (res = s_mp_pad(c, MP_USED(a))))
+    return res;
+
+  /*
+    Add up all digits up to the precision of b.  If b had initially
+    the same precision as a, or greater, we took care of it by the
+    exchange step above, so there is no problem.  If b had initially
+    less precision, we'll have to make sure the carry out is duly
+    propagated upward among the higher-order digits of the sum.
+   */
+  pa = MP_DIGITS(a);
+  pb = MP_DIGITS(b);
+  pc = MP_DIGITS(c);
+  used = MP_USED(b);
+  for (ix = 0; ix < used; ix++) {
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+    w = w + *pa++ + *pb++;
+    *pc++ = ACCUM(w);
+    w = CARRYOUT(w);
+#else
+    d = *pa++;
+    sum = d + *pb++;
+    d = (sum < d);                      /* detect overflow */
+    *pc++ = sum += carry;
+    carry = d + (sum < carry);          /* detect overflow */
+#endif
+  }
+
+  /* If we run out of 'b' digits before we're actually done, make
+     sure the carries get propagated upward...
+   */
+  for (used = MP_USED(a); ix < used; ++ix) {
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+    w = w + *pa++;
+    *pc++ = ACCUM(w);
+    w = CARRYOUT(w);
+#else
+    *pc++ = sum = carry + *pa++;
+    carry = (sum < carry);
+#endif
+  }
+
+  /* If there's an overall carry out, increase precision and include
+     it.  We could have done this initially, but why touch the memory
+     allocator unless we're sure we have to?
+   */
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  if (w) {
+    if((res = s_mp_pad(c, used + 1)) != MP_OKAY)
+      return res;
+
+    DIGIT(c, used) = (mp_digit)w;
+    ++used;
+  }
+#else
+  if (carry) {
+    if((res = s_mp_pad(c, used + 1)) != MP_OKAY)
+      return res;
+
+    DIGIT(c, used) = carry;
+    ++used;
+  }
+#endif
+  MP_USED(c) = used;
+  return MP_OKAY;
+}
+/* {{{ s_mp_add_offset(a, b, offset) */
+
+/* Compute a = |a| + ( |b| * (RADIX ** offset) )             */
+mp_err   s_mp_add_offset(mp_int *a, mp_int *b, mp_size offset)
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  mp_word   w, k = 0;
+#else
+  mp_digit  d, sum, carry = 0;
+#endif
+  mp_size   ib;
+  mp_size   ia;
+  mp_size   lim;
+  mp_err    res;
+
+  /* Make sure a has enough precision for the output value */
+  lim = MP_USED(b) + offset;
+  if((lim > USED(a)) && (res = s_mp_pad(a, lim)) != MP_OKAY)
+    return res;
+
+  /*
+    Add up all digits up to the precision of b.  If b had initially
+    the same precision as a, or greater, we took care of it by the
+    padding step above, so there is no problem.  If b had initially
+    less precision, we'll have to make sure the carry out is duly
+    propagated upward among the higher-order digits of the sum.
+   */
+  lim = USED(b);
+  for(ib = 0, ia = offset; ib < lim; ib++, ia++) {
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+    w = (mp_word)DIGIT(a, ia) + DIGIT(b, ib) + k;
+    DIGIT(a, ia) = ACCUM(w);
+    k = CARRYOUT(w);
+#else
+    d = MP_DIGIT(a, ia);
+    sum = d + MP_DIGIT(b, ib);
+    d = (sum < d);
+    MP_DIGIT(a,ia) = sum += carry;
+    carry = d + (sum < carry);
+#endif
+  }
+
+  /* If we run out of 'b' digits before we're actually done, make
+     sure the carries get propagated upward...
+   */
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  for (lim = MP_USED(a); k && (ia < lim); ++ia) {
+    w = (mp_word)DIGIT(a, ia) + k;
+    DIGIT(a, ia) = ACCUM(w);
+    k = CARRYOUT(w);
+  }
+#else
+  for (lim = MP_USED(a); carry && (ia < lim); ++ia) {
+    d = MP_DIGIT(a, ia);
+    MP_DIGIT(a,ia) = sum = d + carry;
+    carry = (sum < d);
+  }
+#endif
+
+  /* If there's an overall carry out, increase precision and include
+     it.  We could have done this initially, but why touch the memory
+     allocator unless we're sure we have to?
+   */
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_ADD_WORD)
+  if(k) {
+    if((res = s_mp_pad(a, USED(a) + 1)) != MP_OKAY)
+      return res;
+
+    DIGIT(a, ia) = (mp_digit)k;
+  }
+#else
+  if (carry) {
+    if((res = s_mp_pad(a, lim + 1)) != MP_OKAY)
+      return res;
+
+    DIGIT(a, lim) = carry;
+  }
+#endif
+  s_mp_clamp(a);
+
+  return MP_OKAY;
+
+} /* end s_mp_add_offset() */
+
+/* }}} */
+
+/* {{{ s_mp_sub(a, b) */
+
+/* Compute a = |a| - |b|, assumes |a| >= |b|                              */
+mp_err   s_mp_sub(mp_int *a, const mp_int *b)  /* magnitude subtract      */
+{
+  mp_digit *pa, *pb, *limit;
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+  mp_sword  w = 0;
+#else
+  mp_digit  d, diff, borrow = 0;
+#endif
+
+  /*
+    Subtract and propagate borrow.  Up to the precision of b, this
+    accounts for the digits of b; after that, we just make sure the
+    carries get to the right place.  This saves having to pad b out to
+    the precision of a just to make the loops work right...
+   */
+  pa = MP_DIGITS(a);
+  pb = MP_DIGITS(b);
+  limit = pb + MP_USED(b);
+  while (pb < limit) {
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+    w = w + *pa - *pb++;
+    *pa++ = ACCUM(w);
+    w >>= MP_DIGIT_BIT;
+#else
+    d = *pa;
+    diff = d - *pb++;
+    d = (diff > d);                             /* detect borrow */
+    if (borrow && --diff == MP_DIGIT_MAX)
+      ++d;
+    *pa++ = diff;
+    borrow = d;
+#endif
+  }
+  limit = MP_DIGITS(a) + MP_USED(a);
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+  while (w && pa < limit) {
+    w = w + *pa;
+    *pa++ = ACCUM(w);
+    w >>= MP_DIGIT_BIT;
+  }
+#else
+  while (borrow && pa < limit) {
+    d = *pa;
+    *pa++ = diff = d - borrow;
+    borrow = (diff > d);
+  }
+#endif
+
+  /* Clobber any leading zeroes we created    */
+  s_mp_clamp(a);
+
+  /*
+     If there was a borrow out, then |b| > |a| in violation
+     of our input invariant.  We've already done the work,
+     but we'll at least complain about it...
+   */
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+  return w ? MP_RANGE : MP_OKAY;
+#else
+  return borrow ? MP_RANGE : MP_OKAY;
+#endif
+} /* end s_mp_sub() */
+
+/* }}} */
+
+/* Compute c = |a| - |b|, assumes |a| >= |b| */ /* magnitude subtract      */
+mp_err   s_mp_sub_3arg(const mp_int *a, const mp_int *b, mp_int *c)
+{
+  mp_digit *pa, *pb, *pc;
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+  mp_sword  w = 0;
+#else
+  mp_digit  d, diff, borrow = 0;
+#endif
+  int       ix, limit;
+  mp_err    res;
+
+  MP_SIGN(c) = MP_SIGN(a);
+
+  /* Make sure a has enough precision for the output value */
+  if (MP_OKAY != (res = s_mp_pad(c, MP_USED(a))))
+    return res;
+
+  /*
+    Subtract and propagate borrow.  Up to the precision of b, this
+    accounts for the digits of b; after that, we just make sure the
+    carries get to the right place.  This saves having to pad b out to
+    the precision of a just to make the loops work right...
+   */
+  pa = MP_DIGITS(a);
+  pb = MP_DIGITS(b);
+  pc = MP_DIGITS(c);
+  limit = MP_USED(b);
+  for (ix = 0; ix < limit; ++ix) {
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+    w = w + *pa++ - *pb++;
+    *pc++ = ACCUM(w);
+    w >>= MP_DIGIT_BIT;
+#else
+    d = *pa++;
+    diff = d - *pb++;
+    d = (diff > d);
+    if (borrow && --diff == MP_DIGIT_MAX)
+      ++d;
+    *pc++ = diff;
+    borrow = d;
+#endif
+  }
+  for (limit = MP_USED(a); ix < limit; ++ix) {
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+    w = w + *pa++;
+    *pc++ = ACCUM(w);
+    w >>= MP_DIGIT_BIT;
+#else
+    d = *pa++;
+    *pc++ = diff = d - borrow;
+    borrow = (diff > d);
+#endif
+  }
+
+  /* Clobber any leading zeroes we created    */
+  MP_USED(c) = ix;
+  s_mp_clamp(c);
+
+  /*
+     If there was a borrow out, then |b| > |a| in violation
+     of our input invariant.  We've already done the work,
+     but we'll at least complain about it...
+   */
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_SUB_WORD)
+  return w ? MP_RANGE : MP_OKAY;
+#else
+  return borrow ? MP_RANGE : MP_OKAY;
+#endif
+}
+/* {{{ s_mp_mul(a, b) */
+
+/* Compute a = |a| * |b|                                                  */
+mp_err   s_mp_mul(mp_int *a, const mp_int *b)
+{
+  return mp_mul(a, b, a);
+} /* end s_mp_mul() */
+
+/* }}} */
+
+#if defined(MP_USE_UINT_DIGIT) && defined(MP_USE_LONG_LONG_MULTIPLY)
+/* This trick works on Sparc V8 CPUs with the Workshop compilers. */
+#define MP_MUL_DxD(a, b, Phi, Plo) \
+  { unsigned long long product = (unsigned long long)a * b; \
+    Plo = (mp_digit)product; \
+    Phi = (mp_digit)(product >> MP_DIGIT_BIT); }
+#elif defined(OSF1)
+#define MP_MUL_DxD(a, b, Phi, Plo) \
+  { Plo = asm ("mulq %a0, %a1, %v0", a, b);\
+    Phi = asm ("umulh %a0, %a1, %v0", a, b); }
+#else
+#define MP_MUL_DxD(a, b, Phi, Plo) \
+  { mp_digit a0b1, a1b0; \
+    Plo = (a & MP_HALF_DIGIT_MAX) * (b & MP_HALF_DIGIT_MAX); \
+    Phi = (a >> MP_HALF_DIGIT_BIT) * (b >> MP_HALF_DIGIT_BIT); \
+    a0b1 = (a & MP_HALF_DIGIT_MAX) * (b >> MP_HALF_DIGIT_BIT); \
+    a1b0 = (a >> MP_HALF_DIGIT_BIT) * (b & MP_HALF_DIGIT_MAX); \
+    a1b0 += a0b1; \
+    Phi += a1b0 >> MP_HALF_DIGIT_BIT; \
+    if (a1b0 < a0b1)  \
+      Phi += MP_HALF_RADIX; \
+    a1b0 <<= MP_HALF_DIGIT_BIT; \
+    Plo += a1b0; \
+    if (Plo < a1b0) \
+      ++Phi; \
+  }
+#endif
+
+#if !defined(MP_ASSEMBLY_MULTIPLY)
+/* c = a * b */
+void s_mpv_mul_d(const mp_digit *a, mp_size a_len, mp_digit b, mp_digit *c)
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_MUL_WORD)
+  mp_digit   d = 0;
+
+  /* Inner product:  Digits of a */
+  while (a_len--) {
+    mp_word w = ((mp_word)b * *a++) + d;
+    *c++ = ACCUM(w);
+    d = CARRYOUT(w);
+  }
+  *c = d;
+#else
+  mp_digit carry = 0;
+  while (a_len--) {
+    mp_digit a_i = *a++;
+    mp_digit a0b0, a1b1;
+
+    MP_MUL_DxD(a_i, b, a1b1, a0b0);
+
+    a0b0 += carry;
+    if (a0b0 < carry)
+      ++a1b1;
+    *c++ = a0b0;
+    carry = a1b1;
+  }
+  *c = carry;
+#endif
+}
+
+/* c += a * b */
+void s_mpv_mul_d_add(const mp_digit *a, mp_size a_len, mp_digit b,
+                              mp_digit *c)
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_MUL_WORD)
+  mp_digit   d = 0;
+
+  /* Inner product:  Digits of a */
+  while (a_len--) {
+    mp_word w = ((mp_word)b * *a++) + *c + d;
+    *c++ = ACCUM(w);
+    d = CARRYOUT(w);
+  }
+  *c = d;
+#else
+  mp_digit carry = 0;
+  while (a_len--) {
+    mp_digit a_i = *a++;
+    mp_digit a0b0, a1b1;
+
+    MP_MUL_DxD(a_i, b, a1b1, a0b0);
+
+    a0b0 += carry;
+    if (a0b0 < carry)
+      ++a1b1;
+    a0b0 += a_i = *c;
+    if (a0b0 < a_i)
+      ++a1b1;
+    *c++ = a0b0;
+    carry = a1b1;
+  }
+  *c = carry;
+#endif
+}
+
+/* Presently, this is only used by the Montgomery arithmetic code. */
+/* c += a * b */
+void s_mpv_mul_d_add_prop(const mp_digit *a, mp_size a_len, mp_digit b, mp_digit *c)
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_MUL_WORD)
+  mp_digit   d = 0;
+
+  /* Inner product:  Digits of a */
+  while (a_len--) {
+    mp_word w = ((mp_word)b * *a++) + *c + d;
+    *c++ = ACCUM(w);
+    d = CARRYOUT(w);
+  }
+
+  while (d) {
+    mp_word w = (mp_word)*c + d;
+    *c++ = ACCUM(w);
+    d = CARRYOUT(w);
+  }
+#else
+  mp_digit carry = 0;
+  while (a_len--) {
+    mp_digit a_i = *a++;
+    mp_digit a0b0, a1b1;
+
+    MP_MUL_DxD(a_i, b, a1b1, a0b0);
+
+    a0b0 += carry;
+    if (a0b0 < carry)
+      ++a1b1;
+
+    a0b0 += a_i = *c;
+    if (a0b0 < a_i)
+      ++a1b1;
+
+    *c++ = a0b0;
+    carry = a1b1;
+  }
+  while (carry) {
+    mp_digit c_i = *c;
+    carry += c_i;
+    *c++ = carry;
+    carry = carry < c_i;
+  }
+#endif
+}
+#endif
+
+#if defined(MP_USE_UINT_DIGIT) && defined(MP_USE_LONG_LONG_MULTIPLY)
+/* This trick works on Sparc V8 CPUs with the Workshop compilers. */
+#define MP_SQR_D(a, Phi, Plo) \
+  { unsigned long long square = (unsigned long long)a * a; \
+    Plo = (mp_digit)square; \
+    Phi = (mp_digit)(square >> MP_DIGIT_BIT); }
+#elif defined(OSF1)
+#define MP_SQR_D(a, Phi, Plo) \
+  { Plo = asm ("mulq  %a0, %a0, %v0", a);\
+    Phi = asm ("umulh %a0, %a0, %v0", a); }
+#else
+#define MP_SQR_D(a, Phi, Plo) \
+  { mp_digit Pmid; \
+    Plo  = (a  & MP_HALF_DIGIT_MAX) * (a  & MP_HALF_DIGIT_MAX); \
+    Phi  = (a >> MP_HALF_DIGIT_BIT) * (a >> MP_HALF_DIGIT_BIT); \
+    Pmid = (a  & MP_HALF_DIGIT_MAX) * (a >> MP_HALF_DIGIT_BIT); \
+    Phi += Pmid >> (MP_HALF_DIGIT_BIT - 1);  \
+    Pmid <<= (MP_HALF_DIGIT_BIT + 1);  \
+    Plo += Pmid;  \
+    if (Plo < Pmid)  \
+      ++Phi;  \
+  }
+#endif
+
+#if !defined(MP_ASSEMBLY_SQUARE)
+/* Add the squares of the digits of a to the digits of b. */
+void s_mpv_sqr_add_prop(const mp_digit *pa, mp_size a_len, mp_digit *ps)
+{
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_MUL_WORD)
+  mp_word  w;
+  mp_digit d;
+  mp_size  ix;
+
+  w  = 0;
+#define ADD_SQUARE(n) \
+    d = pa[n]; \
+    w += (d * (mp_word)d) + ps[2*n]; \
+    ps[2*n] = ACCUM(w); \
+    w = (w >> DIGIT_BIT) + ps[2*n+1]; \
+    ps[2*n+1] = ACCUM(w); \
+    w = (w >> DIGIT_BIT)
+
+  for (ix = a_len; ix >= 4; ix -= 4) {
+    ADD_SQUARE(0);
+    ADD_SQUARE(1);
+    ADD_SQUARE(2);
+    ADD_SQUARE(3);
+    pa += 4;
+    ps += 8;
+  }
+  if (ix) {
+    ps += 2*ix;
+    pa += ix;
+    switch (ix) {
+    case 3: ADD_SQUARE(-3); /* FALLTHRU */
+    case 2: ADD_SQUARE(-2); /* FALLTHRU */
+    case 1: ADD_SQUARE(-1); /* FALLTHRU */
+    case 0: break;
+    }
+  }
+  while (w) {
+    w += *ps;
+    *ps++ = ACCUM(w);
+    w = (w >> DIGIT_BIT);
+  }
+#else
+  mp_digit carry = 0;
+  while (a_len--) {
+    mp_digit a_i = *pa++;
+    mp_digit a0a0, a1a1;
+
+    MP_SQR_D(a_i, a1a1, a0a0);
+
+    /* here a1a1 and a0a0 constitute a_i ** 2 */
+    a0a0 += carry;
+    if (a0a0 < carry)
+      ++a1a1;
+
+    /* now add to ps */
+    a0a0 += a_i = *ps;
+    if (a0a0 < a_i)
+      ++a1a1;
+    *ps++ = a0a0;
+    a1a1 += a_i = *ps;
+    carry = (a1a1 < a_i);
+    *ps++ = a1a1;
+  }
+  while (carry) {
+    mp_digit s_i = *ps;
+    carry += s_i;
+    *ps++ = carry;
+    carry = carry < s_i;
+  }
+#endif
+}
+#endif
+
+#if (defined(MP_NO_MP_WORD) || defined(MP_NO_DIV_WORD)) \
+&& !defined(MP_ASSEMBLY_DIV_2DX1D)
+/*
+** Divide 64-bit (Nhi,Nlo) by 32-bit divisor, which must be normalized
+** so its high bit is 1.   This code is from NSPR.
+*/
+mp_err s_mpv_div_2dx1d(mp_digit Nhi, mp_digit Nlo, mp_digit divisor,
+                       mp_digit *qp, mp_digit *rp)
+{
+    mp_digit d1, d0, q1, q0;
+    mp_digit r1, r0, m;
+
+    d1 = divisor >> MP_HALF_DIGIT_BIT;
+    d0 = divisor & MP_HALF_DIGIT_MAX;
+    r1 = Nhi % d1;
+    q1 = Nhi / d1;
+    m = q1 * d0;
+    r1 = (r1 << MP_HALF_DIGIT_BIT) | (Nlo >> MP_HALF_DIGIT_BIT);
+    if (r1 < m) {
+        q1--, r1 += divisor;
+        if (r1 >= divisor && r1 < m) {
+            q1--, r1 += divisor;
+        }
+    }
+    r1 -= m;
+    r0 = r1 % d1;
+    q0 = r1 / d1;
+    m = q0 * d0;
+    r0 = (r0 << MP_HALF_DIGIT_BIT) | (Nlo & MP_HALF_DIGIT_MAX);
+    if (r0 < m) {
+        q0--, r0 += divisor;
+        if (r0 >= divisor && r0 < m) {
+            q0--, r0 += divisor;
+        }
+    }
+    if (qp)
+        *qp = (q1 << MP_HALF_DIGIT_BIT) | q0;
+    if (rp)
+        *rp = r0 - m;
+    return MP_OKAY;
+}
+#endif
+
+#if MP_SQUARE
+/* {{{ s_mp_sqr(a) */
+
+mp_err   s_mp_sqr(mp_int *a)
+{
+  mp_err   res;
+  mp_int   tmp;
+
+  if((res = mp_init_size(&tmp, 2 * USED(a), FLAG(a))) != MP_OKAY)
+    return res;
+  res = mp_sqr(a, &tmp);
+  if (res == MP_OKAY) {
+    s_mp_exch(&tmp, a);
+  }
+  mp_clear(&tmp);
+  return res;
+}
+
+/* }}} */
+#endif
+
+/* {{{ s_mp_div(a, b) */
+
+/*
+  s_mp_div(a, b)
+
+  Compute a = a / b and b = a mod b.  Assumes b > a.
+ */
+
+mp_err   s_mp_div(mp_int *rem,  /* i: dividend, o: remainder */
+                  mp_int *div,  /* i: divisor                */
+                  mp_int *quot) /* i: 0;        o: quotient  */
+{
+  mp_int   part, t;
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_DIV_WORD)
+  mp_word  q_msd;
+#else
+  mp_digit q_msd;
+#endif
+  mp_err   res;
+  mp_digit d;
+  mp_digit div_msd;
+  int      ix;
+
+  if(mp_cmp_z(div) == 0)
+    return MP_RANGE;
+
+  /* Shortcut if divisor is power of two */
+  if((ix = s_mp_ispow2(div)) >= 0) {
+    MP_CHECKOK( mp_copy(rem, quot) );
+    s_mp_div_2d(quot, (mp_digit)ix);
+    s_mp_mod_2d(rem,  (mp_digit)ix);
+
+    return MP_OKAY;
+  }
+
+  DIGITS(&t) = 0;
+  MP_SIGN(rem) = ZPOS;
+  MP_SIGN(div) = ZPOS;
+
+  /* A working temporary for division     */
+  MP_CHECKOK( mp_init_size(&t, MP_ALLOC(rem), FLAG(rem)));
+
+  /* Normalize to optimize guessing       */
+  MP_CHECKOK( s_mp_norm(rem, div, &d) );
+
+  part = *rem;
+
+  /* Perform the division itself...woo!   */
+  MP_USED(quot) = MP_ALLOC(quot);
+
+  /* Find a partial substring of rem which is at least div */
+  /* If we didn't find one, we're finished dividing    */
+  while (MP_USED(rem) > MP_USED(div) || s_mp_cmp(rem, div) >= 0) {
+    int i;
+    int unusedRem;
+
+    unusedRem = MP_USED(rem) - MP_USED(div);
+    MP_DIGITS(&part) = MP_DIGITS(rem) + unusedRem;
+    MP_ALLOC(&part)  = MP_ALLOC(rem)  - unusedRem;
+    MP_USED(&part)   = MP_USED(div);
+    if (s_mp_cmp(&part, div) < 0) {
+      -- unusedRem;
+#if MP_ARGCHK == 2
+      assert(unusedRem >= 0);
+#endif
+      -- MP_DIGITS(&part);
+      ++ MP_USED(&part);
+      ++ MP_ALLOC(&part);
+    }
+
+    /* Compute a guess for the next quotient digit       */
+    q_msd = MP_DIGIT(&part, MP_USED(&part) - 1);
+    div_msd = MP_DIGIT(div, MP_USED(div) - 1);
+    if (q_msd >= div_msd) {
+      q_msd = 1;
+    } else if (MP_USED(&part) > 1) {
+#if !defined(MP_NO_MP_WORD) && !defined(MP_NO_DIV_WORD)
+      q_msd = (q_msd << MP_DIGIT_BIT) | MP_DIGIT(&part, MP_USED(&part) - 2);
+      q_msd /= div_msd;
+      if (q_msd == RADIX)
+        --q_msd;
+#else
+      mp_digit r;
+      MP_CHECKOK( s_mpv_div_2dx1d(q_msd, MP_DIGIT(&part, MP_USED(&part) - 2),
+                                  div_msd, &q_msd, &r) );
+#endif
+    } else {
+      q_msd = 0;
+    }
+#if MP_ARGCHK == 2
+    assert(q_msd > 0); /* This case should never occur any more. */
+#endif
+    if (q_msd <= 0)
+      break;
+
+    /* See what that multiplies out to                   */
+    mp_copy(div, &t);
+    MP_CHECKOK( s_mp_mul_d(&t, (mp_digit)q_msd) );
+
+    /*
+       If it's too big, back it off.  We should not have to do this
+       more than once, or, in rare cases, twice.  Knuth describes a
+       method by which this could be reduced to a maximum of once, but
+       I didn't implement that here.
+     * When using s_mpv_div_2dx1d, we may have to do this 3 times.
+     */
+    for (i = 4; s_mp_cmp(&t, &part) > 0 && i > 0; --i) {
+      --q_msd;
+      s_mp_sub(&t, div);        /* t -= div */
+    }
+    if (i < 0) {
+      res = MP_RANGE;
+      goto CLEANUP;
+    }
+
+    /* At this point, q_msd should be the right next digit   */
+    MP_CHECKOK( s_mp_sub(&part, &t) );  /* part -= t */
+    s_mp_clamp(rem);
+
+    /*
+      Include the digit in the quotient.  We allocated enough memory
+      for any quotient we could ever possibly get, so we should not
+      have to check for failures here
+     */
+    MP_DIGIT(quot, unusedRem) = (mp_digit)q_msd;
+  }
+
+  /* Denormalize remainder                */
+  if (d) {
+    s_mp_div_2d(rem, d);
+  }
+
+  s_mp_clamp(quot);
+
+CLEANUP:
+  mp_clear(&t);
+
+  return res;
+
+} /* end s_mp_div() */
+
+
+/* }}} */
+
+/* {{{ s_mp_2expt(a, k) */
+
+mp_err   s_mp_2expt(mp_int *a, mp_digit k)
+{
+  mp_err    res;
+  mp_size   dig, bit;
+
+  dig = k / DIGIT_BIT;
+  bit = k % DIGIT_BIT;
+
+  mp_zero(a);
+  if((res = s_mp_pad(a, dig + 1)) != MP_OKAY)
+    return res;
+
+  DIGIT(a, dig) |= ((mp_digit)1 << bit);
+
+  return MP_OKAY;
+
+} /* end s_mp_2expt() */
+
+/* }}} */
+
+/* {{{ s_mp_reduce(x, m, mu) */
+
+/*
+  Compute Barrett reduction, x (mod m), given a precomputed value for
+  mu = b^2k / m, where b = RADIX and k = #digits(m).  This should be
+  faster than straight division, when many reductions by the same
+  value of m are required (such as in modular exponentiation).  This
+  can nearly halve the time required to do modular exponentiation,
+  as compared to using the full integer divide to reduce.
+
+  This algorithm was derived from the _Handbook of Applied
+  Cryptography_ by Menezes, Oorschot and VanStone, Ch. 14,
+  pp. 603-604.
+ */
+
+mp_err   s_mp_reduce(mp_int *x, const mp_int *m, const mp_int *mu)
+{
+  mp_int   q;
+  mp_err   res;
+
+  if((res = mp_init_copy(&q, x)) != MP_OKAY)
+    return res;
+
+  s_mp_rshd(&q, USED(m) - 1);  /* q1 = x / b^(k-1)  */
+  s_mp_mul(&q, mu);            /* q2 = q1 * mu      */
+  s_mp_rshd(&q, USED(m) + 1);  /* q3 = q2 / b^(k+1) */
+
+  /* x = x mod b^(k+1), quick (no division) */
+  s_mp_mod_2d(x, DIGIT_BIT * (USED(m) + 1));
+
+  /* q = q * m mod b^(k+1), quick (no division) */
+  s_mp_mul(&q, m);
+  s_mp_mod_2d(&q, DIGIT_BIT * (USED(m) + 1));
+
+  /* x = x - q */
+  if((res = mp_sub(x, &q, x)) != MP_OKAY)
+    goto CLEANUP;
+
+  /* If x < 0, add b^(k+1) to it */
+  if(mp_cmp_z(x) < 0) {
+    mp_set(&q, 1);
+    if((res = s_mp_lshd(&q, USED(m) + 1)) != MP_OKAY)
+      goto CLEANUP;
+    if((res = mp_add(x, &q, x)) != MP_OKAY)
+      goto CLEANUP;
+  }
+
+  /* Back off if it's too big */
+  while(mp_cmp(x, m) >= 0) {
+    if((res = s_mp_sub(x, m)) != MP_OKAY)
+      break;
+  }
+
+ CLEANUP:
+  mp_clear(&q);
+
+  return res;
+
+} /* end s_mp_reduce() */
+
+/* }}} */
+
+/* }}} */
+
+/* {{{ Primitive comparisons */
+
+/* {{{ s_mp_cmp(a, b) */
+
+/* Compare |a| <=> |b|, return 0 if equal, <0 if a<b, >0 if a>b           */
+int      s_mp_cmp(const mp_int *a, const mp_int *b)
+{
+  mp_size used_a = MP_USED(a);
+  {
+    mp_size used_b = MP_USED(b);
+
+    if (used_a > used_b)
+      goto IS_GT;
+    if (used_a < used_b)
+      goto IS_LT;
+  }
+  {
+    mp_digit *pa, *pb;
+    mp_digit da = 0, db = 0;
+
+#define CMP_AB(n) if ((da = pa[n]) != (db = pb[n])) goto done
+
+    pa = MP_DIGITS(a) + used_a;
+    pb = MP_DIGITS(b) + used_a;
+    while (used_a >= 4) {
+      pa     -= 4;
+      pb     -= 4;
+      used_a -= 4;
+      CMP_AB(3);
+      CMP_AB(2);
+      CMP_AB(1);
+      CMP_AB(0);
+    }
+    while (used_a-- > 0 && ((da = *--pa) == (db = *--pb)))
+      /* do nothing */;
+done:
+    if (da > db)
+      goto IS_GT;
+    if (da < db)
+      goto IS_LT;
+  }
+  return MP_EQ;
+IS_LT:
+  return MP_LT;
+IS_GT:
+  return MP_GT;
+} /* end s_mp_cmp() */
+
+/* }}} */
+
+/* {{{ s_mp_cmp_d(a, d) */
+
+/* Compare |a| <=> d, return 0 if equal, <0 if a<d, >0 if a>d             */
+int      s_mp_cmp_d(const mp_int *a, mp_digit d)
+{
+  if(USED(a) > 1)
+    return MP_GT;
+
+  if(DIGIT(a, 0) < d)
+    return MP_LT;
+  else if(DIGIT(a, 0) > d)
+    return MP_GT;
+  else
+    return MP_EQ;
+
+} /* end s_mp_cmp_d() */
+
+/* }}} */
+
+/* {{{ s_mp_ispow2(v) */
+
+/*
+  Returns -1 if the value is not a power of two; otherwise, it returns
+  k such that v = 2^k, i.e. lg(v).
+ */
+int      s_mp_ispow2(const mp_int *v)
+{
+  mp_digit d;
+  int      extra = 0, ix;
+
+  ix = MP_USED(v) - 1;
+  d = MP_DIGIT(v, ix); /* most significant digit of v */
+
+  extra = s_mp_ispow2d(d);
+  if (extra < 0 || ix == 0)
+    return extra;
+
+  while (--ix >= 0) {
+    if (DIGIT(v, ix) != 0)
+      return -1; /* not a power of two */
+    extra += MP_DIGIT_BIT;
+  }
+
+  return extra;
+
+} /* end s_mp_ispow2() */
+
+/* }}} */
+
+/* {{{ s_mp_ispow2d(d) */
+
+int      s_mp_ispow2d(mp_digit d)
+{
+  if ((d != 0) && ((d & (d-1)) == 0)) { /* d is a power of 2 */
+    int pow = 0;
+#if defined (MP_USE_UINT_DIGIT)
+    if (d & 0xffff0000U)
+      pow += 16;
+    if (d & 0xff00ff00U)
+      pow += 8;
+    if (d & 0xf0f0f0f0U)
+      pow += 4;
+    if (d & 0xccccccccU)
+      pow += 2;
+    if (d & 0xaaaaaaaaU)
+      pow += 1;
+#elif defined(MP_USE_LONG_LONG_DIGIT)
+    if (d & 0xffffffff00000000ULL)
+      pow += 32;
+    if (d & 0xffff0000ffff0000ULL)
+      pow += 16;
+    if (d & 0xff00ff00ff00ff00ULL)
+      pow += 8;
+    if (d & 0xf0f0f0f0f0f0f0f0ULL)
+      pow += 4;
+    if (d & 0xccccccccccccccccULL)
+      pow += 2;
+    if (d & 0xaaaaaaaaaaaaaaaaULL)
+      pow += 1;
+#elif defined(MP_USE_LONG_DIGIT)
+    if (d & 0xffffffff00000000UL)
+      pow += 32;
+    if (d & 0xffff0000ffff0000UL)
+      pow += 16;
+    if (d & 0xff00ff00ff00ff00UL)
+      pow += 8;
+    if (d & 0xf0f0f0f0f0f0f0f0UL)
+      pow += 4;
+    if (d & 0xccccccccccccccccUL)
+      pow += 2;
+    if (d & 0xaaaaaaaaaaaaaaaaUL)
+      pow += 1;
+#else
+#error "unknown type for mp_digit"
+#endif
+    return pow;
+  }
+  return -1;
+
+} /* end s_mp_ispow2d() */
+
+/* }}} */
+
+/* }}} */
+
+/* {{{ Primitive I/O helpers */
+
+/* {{{ s_mp_tovalue(ch, r) */
+
+/*
+  Convert the given character to its digit value, in the given radix.
+  If the given character is not understood in the given radix, -1 is
+  returned.  Otherwise the digit's numeric value is returned.
+
+  The results will be odd if you use a radix < 2 or > 62, you are
+  expected to know what you're up to.
+ */
+int      s_mp_tovalue(char ch, int r)
+{
+  int    val, xch;
+
+  if(r > 36)
+    xch = ch;
+  else
+    xch = toupper(ch);
+
+  if(isdigit(xch))
+    val = xch - '0';
+  else if(isupper(xch))
+    val = xch - 'A' + 10;
+  else if(islower(xch))
+    val = xch - 'a' + 36;
+  else if(xch == '+')
+    val = 62;
+  else if(xch == '/')
+    val = 63;
+  else
+    return -1;
+
+  if(val < 0 || val >= r)
+    return -1;
+
+  return val;
+
+} /* end s_mp_tovalue() */
+
+/* }}} */
+
+/* {{{ s_mp_todigit(val, r, low) */
+
+/*
+  Convert val to a radix-r digit, if possible.  If val is out of range
+  for r, returns zero.  Otherwise, returns an ASCII character denoting
+  the value in the given radix.
+
+  The results may be odd if you use a radix < 2 or > 64, you are
+  expected to know what you're doing.
+ */
+
+char     s_mp_todigit(mp_digit val, int r, int low)
+{
+  char   ch;
+
+  if(val >= r)
+    return 0;
+
+  ch = s_dmap_1[val];
+
+  if(r <= 36 && low)
+    ch = tolower(ch);
+
+  return ch;
+
+} /* end s_mp_todigit() */
+
+/* }}} */
+
+/* {{{ s_mp_outlen(bits, radix) */
+
+/*
+   Return an estimate for how long a string is needed to hold a radix
+   r representation of a number with 'bits' significant bits, plus an
+   extra for a zero terminator (assuming C style strings here)
+ */
+int      s_mp_outlen(int bits, int r)
+{
+  return (int)((double)bits * LOG_V_2(r) + 1.5) + 1;
+
+} /* end s_mp_outlen() */
+
+/* }}} */
+
+/* }}} */
+
+/* {{{ mp_read_unsigned_octets(mp, str, len) */
+/* mp_read_unsigned_octets(mp, str, len)
+   Read in a raw value (base 256) into the given mp_int
+   No sign bit, number is positive.  Leading zeros ignored.
+ */
+
+mp_err
+mp_read_unsigned_octets(mp_int *mp, const unsigned char *str, mp_size len)
+{
+  int            count;
+  mp_err         res;
+  mp_digit       d;
+
+  ARGCHK(mp != NULL && str != NULL && len > 0, MP_BADARG);
+
+  mp_zero(mp);
+
+  count = len % sizeof(mp_digit);
+  if (count) {
+    for (d = 0; count-- > 0; --len) {
+      d = (d << 8) | *str++;
+    }
+    MP_DIGIT(mp, 0) = d;
+  }
+
+  /* Read the rest of the digits */
+  for(; len > 0; len -= sizeof(mp_digit)) {
+    for (d = 0, count = sizeof(mp_digit); count > 0; --count) {
+      d = (d << 8) | *str++;
+    }
+    if (MP_EQ == mp_cmp_z(mp)) {
+      if (!d)
+        continue;
+    } else {
+      if((res = s_mp_lshd(mp, 1)) != MP_OKAY)
+        return res;
+    }
+    MP_DIGIT(mp, 0) = d;
+  }
+  return MP_OKAY;
+} /* end mp_read_unsigned_octets() */
+/* }}} */
+
+/* {{{ mp_unsigned_octet_size(mp) */
+int
+mp_unsigned_octet_size(const mp_int *mp)
+{
+  int  bytes;
+  int  ix;
+  mp_digit  d = 0;
+
+  ARGCHK(mp != NULL, MP_BADARG);
+  ARGCHK(MP_ZPOS == SIGN(mp), MP_BADARG);
+
+  bytes = (USED(mp) * sizeof(mp_digit));
+
+  /* subtract leading zeros. */
+  /* Iterate over each digit... */
+  for(ix = USED(mp) - 1; ix >= 0; ix--) {
+    d = DIGIT(mp, ix);
+    if (d)
+        break;
+    bytes -= sizeof(d);
+  }
+  if (!bytes)
+    return 1;
+
+  /* Have MSD, check digit bytes, high order first */
+  for(ix = sizeof(mp_digit) - 1; ix >= 0; ix--) {
+    unsigned char x = (unsigned char)(d >> (ix * CHAR_BIT));
+    if (x)
+        break;
+    --bytes;
+  }
+  return bytes;
+} /* end mp_unsigned_octet_size() */
+/* }}} */
+
+/* {{{ mp_to_unsigned_octets(mp, str) */
+/* output a buffer of big endian octets no longer than specified. */
+mp_err
+mp_to_unsigned_octets(const mp_int *mp, unsigned char *str, mp_size maxlen)
+{
+  int  ix, pos = 0;
+  int  bytes;
+
+  ARGCHK(mp != NULL && str != NULL && !SIGN(mp), MP_BADARG);
+
+  bytes = mp_unsigned_octet_size(mp);
+  ARGCHK(bytes <= maxlen, MP_BADARG);
+
+  /* Iterate over each digit... */
+  for(ix = USED(mp) - 1; ix >= 0; ix--) {
+    mp_digit  d = DIGIT(mp, ix);
+    int       jx;
+
+    /* Unpack digit bytes, high order first */
+    for(jx = sizeof(mp_digit) - 1; jx >= 0; jx--) {
+      unsigned char x = (unsigned char)(d >> (jx * CHAR_BIT));
+      if (!pos && !x)   /* suppress leading zeros */
+        continue;
+      str[pos++] = x;
+    }
+  }
+  if (!pos)
+    str[pos++] = 0;
+  return pos;
+} /* end mp_to_unsigned_octets() */
+/* }}} */
+
+/* {{{ mp_to_signed_octets(mp, str) */
+/* output a buffer of big endian octets no longer than specified. */
+mp_err
+mp_to_signed_octets(const mp_int *mp, unsigned char *str, mp_size maxlen)
+{
+  int  ix, pos = 0;
+  int  bytes;
+
+  ARGCHK(mp != NULL && str != NULL && !SIGN(mp), MP_BADARG);
+
+  bytes = mp_unsigned_octet_size(mp);
+  ARGCHK(bytes <= maxlen, MP_BADARG);
+
+  /* Iterate over each digit... */
+  for(ix = USED(mp) - 1; ix >= 0; ix--) {
+    mp_digit  d = DIGIT(mp, ix);
+    int       jx;
+
+    /* Unpack digit bytes, high order first */
+    for(jx = sizeof(mp_digit) - 1; jx >= 0; jx--) {
+      unsigned char x = (unsigned char)(d >> (jx * CHAR_BIT));
+      if (!pos) {
+        if (!x)         /* suppress leading zeros */
+          continue;
+        if (x & 0x80) { /* add one leading zero to make output positive.  */
+          ARGCHK(bytes + 1 <= maxlen, MP_BADARG);
+          if (bytes + 1 > maxlen)
+            return MP_BADARG;
+          str[pos++] = 0;
+        }
+      }
+      str[pos++] = x;
+    }
+  }
+  if (!pos)
+    str[pos++] = 0;
+  return pos;
+} /* end mp_to_signed_octets() */
+/* }}} */
+
+/* {{{ mp_to_fixlen_octets(mp, str) */
+/* output a buffer of big endian octets exactly as long as requested. */
+mp_err
+mp_to_fixlen_octets(const mp_int *mp, unsigned char *str, mp_size length)
+{
+  int  ix, pos = 0;
+  int  bytes;
+
+  ARGCHK(mp != NULL && str != NULL && !SIGN(mp), MP_BADARG);
+
+  bytes = mp_unsigned_octet_size(mp);
+  ARGCHK(bytes <= length, MP_BADARG);
+
+  /* place any needed leading zeros */
+  for (;length > bytes; --length) {
+        *str++ = 0;
+  }
+
+  /* Iterate over each digit... */
+  for(ix = USED(mp) - 1; ix >= 0; ix--) {
+    mp_digit  d = DIGIT(mp, ix);
+    int       jx;
+
+    /* Unpack digit bytes, high order first */
+    for(jx = sizeof(mp_digit) - 1; jx >= 0; jx--) {
+      unsigned char x = (unsigned char)(d >> (jx * CHAR_BIT));
+      if (!pos && !x)   /* suppress leading zeros */
+        continue;
+      str[pos++] = x;
+    }
+  }
+  if (!pos)
+    str[pos++] = 0;
+  return MP_OKAY;
+} /* end mp_to_fixlen_octets() */
+/* }}} */
+
+
+/*------------------------------------------------------------------------*/
+/* HERE THERE BE DRAGONS                                                  */
diff --git a/jdk/src/share/native/sun/security/ec/mpi.h b/jdk/src/share/native/sun/security/ec/mpi.h
new file mode 100644
index 00000000000..5f70b763209
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mpi.h
@@ -0,0 +1,409 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ *
+ *  Arbitrary precision integer arithmetic library
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael J. Fromberger.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Netscape Communications Corporation
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MPI_H
+#define _MPI_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* $Id: mpi.h,v 1.22 2004/04/27 23:04:36 gerv%gerv.net Exp $ */
+
+#include "mpi-config.h"
+
+#ifndef _WIN32
+#include <sys/param.h>
+#endif /* _WIN32 */
+
+#ifdef _KERNEL
+#include <sys/debug.h>
+#include <sys/systm.h>
+#define assert ASSERT
+#define labs(a) (a >= 0 ? a : -a)
+#define UCHAR_MAX 255
+#define memset(s, c, n) bzero(s, n)
+#define memcpy(a,b,c) bcopy((caddr_t)b, (caddr_t)a, c)
+/*
+ * Generic #define's to cover missing things in the kernel
+ */
+#ifndef isdigit
+#define isdigit(x)      ((x) >= '0' && (x) <= '9')
+#endif
+#ifndef isupper
+#define isupper(x)      (((unsigned)(x) >= 'A') && ((unsigned)(x) <= 'Z'))
+#endif
+#ifndef islower
+#define islower(x)      (((unsigned)(x) >= 'a') && ((unsigned)(x) <= 'z'))
+#endif
+#ifndef isalpha
+#define isalpha(x)      (isupper(x) || islower(x))
+#endif
+#ifndef toupper
+#define toupper(x)      (islower(x) ? (x) - 'a' + 'A' : (x))
+#endif
+#ifndef tolower
+#define tolower(x)      (isupper(x) ? (x) + 'a' - 'A' : (x))
+#endif
+#ifndef isspace
+#define isspace(x)      (((x) == ' ') || ((x) == '\r') || ((x) == '\n') || \
+                         ((x) == '\t') || ((x) == '\b'))
+#endif
+#endif /* _KERNEL */
+
+#if MP_DEBUG
+#undef MP_IOFUNC
+#define MP_IOFUNC 1
+#endif
+
+#if MP_IOFUNC
+#include <stdio.h>
+#include <ctype.h>
+#endif
+
+#ifndef _KERNEL
+#include <limits.h>
+#endif
+
+#if defined(BSDI)
+#undef ULLONG_MAX
+#endif
+
+#if defined( macintosh )
+#include <Types.h>
+#elif defined( _WIN32_WCE)
+/* #include <sys/types.h> What do we need here ?? */
+#else
+#include <sys/types.h>
+#endif
+
+#define  MP_NEG    1
+#define  MP_ZPOS   0
+
+#define  MP_OKAY          0 /* no error, all is well */
+#define  MP_YES           0 /* yes (boolean result)  */
+#define  MP_NO           -1 /* no (boolean result)   */
+#define  MP_MEM          -2 /* out of memory         */
+#define  MP_RANGE        -3 /* argument out of range */
+#define  MP_BADARG       -4 /* invalid parameter     */
+#define  MP_UNDEF        -5 /* answer is undefined   */
+#define  MP_LAST_CODE    MP_UNDEF
+
+typedef unsigned int      mp_sign;
+typedef unsigned int      mp_size;
+typedef int               mp_err;
+typedef int               mp_flag;
+
+#define MP_32BIT_MAX 4294967295U
+
+#if !defined(ULONG_MAX)
+#error "ULONG_MAX not defined"
+#elif !defined(UINT_MAX)
+#error "UINT_MAX not defined"
+#elif !defined(USHRT_MAX)
+#error "USHRT_MAX not defined"
+#endif
+
+#if defined(ULONG_LONG_MAX)                     /* GCC, HPUX */
+#define MP_ULONG_LONG_MAX ULONG_LONG_MAX
+#elif defined(ULLONG_MAX)                       /* Solaris */
+#define MP_ULONG_LONG_MAX ULLONG_MAX
+/* MP_ULONG_LONG_MAX was defined to be ULLONG_MAX */
+#elif defined(ULONGLONG_MAX)                    /* IRIX, AIX */
+#define MP_ULONG_LONG_MAX ULONGLONG_MAX
+#endif
+
+/* We only use unsigned long for mp_digit iff long is more than 32 bits. */
+#if !defined(MP_USE_UINT_DIGIT) && ULONG_MAX > MP_32BIT_MAX
+typedef unsigned long     mp_digit;
+#define MP_DIGIT_MAX      ULONG_MAX
+#define MP_DIGIT_FMT      "%016lX"   /* printf() format for 1 digit */
+#define MP_HALF_DIGIT_MAX UINT_MAX
+#undef  MP_NO_MP_WORD
+#define MP_NO_MP_WORD 1
+#undef  MP_USE_LONG_DIGIT
+#define MP_USE_LONG_DIGIT 1
+#undef  MP_USE_LONG_LONG_DIGIT
+
+#elif !defined(MP_USE_UINT_DIGIT) && defined(MP_ULONG_LONG_MAX)
+typedef unsigned long long mp_digit;
+#define MP_DIGIT_MAX       MP_ULONG_LONG_MAX
+#define MP_DIGIT_FMT      "%016llX"  /* printf() format for 1 digit */
+#define MP_HALF_DIGIT_MAX  UINT_MAX
+#undef  MP_NO_MP_WORD
+#define MP_NO_MP_WORD 1
+#undef  MP_USE_LONG_LONG_DIGIT
+#define MP_USE_LONG_LONG_DIGIT 1
+#undef  MP_USE_LONG_DIGIT
+
+#else
+typedef unsigned int      mp_digit;
+#define MP_DIGIT_MAX      UINT_MAX
+#define MP_DIGIT_FMT      "%08X"     /* printf() format for 1 digit */
+#define MP_HALF_DIGIT_MAX USHRT_MAX
+#undef  MP_USE_UINT_DIGIT
+#define MP_USE_UINT_DIGIT 1
+#undef  MP_USE_LONG_LONG_DIGIT
+#undef  MP_USE_LONG_DIGIT
+#endif
+
+#if !defined(MP_NO_MP_WORD)
+#if  defined(MP_USE_UINT_DIGIT) && \
+    (defined(MP_ULONG_LONG_MAX) || (ULONG_MAX > UINT_MAX))
+
+#if (ULONG_MAX > UINT_MAX)
+typedef unsigned long     mp_word;
+typedef          long     mp_sword;
+#define MP_WORD_MAX       ULONG_MAX
+
+#else
+typedef unsigned long long mp_word;
+typedef          long long mp_sword;
+#define MP_WORD_MAX       MP_ULONG_LONG_MAX
+#endif
+
+#else
+#define MP_NO_MP_WORD 1
+#endif
+#endif /* !defined(MP_NO_MP_WORD) */
+
+#if !defined(MP_WORD_MAX) && defined(MP_DEFINE_SMALL_WORD)
+typedef unsigned int      mp_word;
+typedef          int      mp_sword;
+#define MP_WORD_MAX       UINT_MAX
+#endif
+
+#ifndef CHAR_BIT
+#define CHAR_BIT 8
+#endif
+
+#define MP_DIGIT_BIT      (CHAR_BIT*sizeof(mp_digit))
+#define MP_WORD_BIT       (CHAR_BIT*sizeof(mp_word))
+#define MP_RADIX          (1+(mp_word)MP_DIGIT_MAX)
+
+#define MP_HALF_DIGIT_BIT (MP_DIGIT_BIT/2)
+#define MP_HALF_RADIX     (1+(mp_digit)MP_HALF_DIGIT_MAX)
+/* MP_HALF_RADIX really ought to be called MP_SQRT_RADIX, but it's named
+** MP_HALF_RADIX because it's the radix for MP_HALF_DIGITs, and it's
+** consistent with the other _HALF_ names.
+*/
+
+
+/* Macros for accessing the mp_int internals           */
+#define  MP_FLAG(MP)     ((MP)->flag)
+#define  MP_SIGN(MP)     ((MP)->sign)
+#define  MP_USED(MP)     ((MP)->used)
+#define  MP_ALLOC(MP)    ((MP)->alloc)
+#define  MP_DIGITS(MP)   ((MP)->dp)
+#define  MP_DIGIT(MP,N)  (MP)->dp[(N)]
+
+/* This defines the maximum I/O base (minimum is 2)   */
+#define MP_MAX_RADIX         64
+
+typedef struct {
+  mp_sign       flag;    /* KM_SLEEP/KM_NOSLEEP        */
+  mp_sign       sign;    /* sign of this quantity      */
+  mp_size       alloc;   /* how many digits allocated  */
+  mp_size       used;    /* how many digits used       */
+  mp_digit     *dp;      /* the digits themselves      */
+} mp_int;
+
+/* Default precision       */
+mp_size mp_get_prec(void);
+void    mp_set_prec(mp_size prec);
+
+/* Memory management       */
+mp_err mp_init(mp_int *mp, int kmflag);
+mp_err mp_init_size(mp_int *mp, mp_size prec, int kmflag);
+mp_err mp_init_copy(mp_int *mp, const mp_int *from);
+mp_err mp_copy(const mp_int *from, mp_int *to);
+void   mp_exch(mp_int *mp1, mp_int *mp2);
+void   mp_clear(mp_int *mp);
+void   mp_zero(mp_int *mp);
+void   mp_set(mp_int *mp, mp_digit d);
+mp_err mp_set_int(mp_int *mp, long z);
+#define mp_set_long(mp,z) mp_set_int(mp,z)
+mp_err mp_set_ulong(mp_int *mp, unsigned long z);
+
+/* Single digit arithmetic */
+mp_err mp_add_d(const mp_int *a, mp_digit d, mp_int *b);
+mp_err mp_sub_d(const mp_int *a, mp_digit d, mp_int *b);
+mp_err mp_mul_d(const mp_int *a, mp_digit d, mp_int *b);
+mp_err mp_mul_2(const mp_int *a, mp_int *c);
+mp_err mp_div_d(const mp_int *a, mp_digit d, mp_int *q, mp_digit *r);
+mp_err mp_div_2(const mp_int *a, mp_int *c);
+mp_err mp_expt_d(const mp_int *a, mp_digit d, mp_int *c);
+
+/* Sign manipulations      */
+mp_err mp_abs(const mp_int *a, mp_int *b);
+mp_err mp_neg(const mp_int *a, mp_int *b);
+
+/* Full arithmetic         */
+mp_err mp_add(const mp_int *a, const mp_int *b, mp_int *c);
+mp_err mp_sub(const mp_int *a, const mp_int *b, mp_int *c);
+mp_err mp_mul(const mp_int *a, const mp_int *b, mp_int *c);
+#if MP_SQUARE
+mp_err mp_sqr(const mp_int *a, mp_int *b);
+#else
+#define mp_sqr(a, b) mp_mul(a, a, b)
+#endif
+mp_err mp_div(const mp_int *a, const mp_int *b, mp_int *q, mp_int *r);
+mp_err mp_div_2d(const mp_int *a, mp_digit d, mp_int *q, mp_int *r);
+mp_err mp_expt(mp_int *a, mp_int *b, mp_int *c);
+mp_err mp_2expt(mp_int *a, mp_digit k);
+mp_err mp_sqrt(const mp_int *a, mp_int *b);
+
+/* Modular arithmetic      */
+#if MP_MODARITH
+mp_err mp_mod(const mp_int *a, const mp_int *m, mp_int *c);
+mp_err mp_mod_d(const mp_int *a, mp_digit d, mp_digit *c);
+mp_err mp_addmod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c);
+mp_err mp_submod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c);
+mp_err mp_mulmod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c);
+#if MP_SQUARE
+mp_err mp_sqrmod(const mp_int *a, const mp_int *m, mp_int *c);
+#else
+#define mp_sqrmod(a, m, c) mp_mulmod(a, a, m, c)
+#endif
+mp_err mp_exptmod(const mp_int *a, const mp_int *b, const mp_int *m, mp_int *c);
+mp_err mp_exptmod_d(const mp_int *a, mp_digit d, const mp_int *m, mp_int *c);
+#endif /* MP_MODARITH */
+
+/* Comparisons             */
+int    mp_cmp_z(const mp_int *a);
+int    mp_cmp_d(const mp_int *a, mp_digit d);
+int    mp_cmp(const mp_int *a, const mp_int *b);
+int    mp_cmp_mag(mp_int *a, mp_int *b);
+int    mp_cmp_int(const mp_int *a, long z, int kmflag);
+int    mp_isodd(const mp_int *a);
+int    mp_iseven(const mp_int *a);
+
+/* Number theoretic        */
+#if MP_NUMTH
+mp_err mp_gcd(mp_int *a, mp_int *b, mp_int *c);
+mp_err mp_lcm(mp_int *a, mp_int *b, mp_int *c);
+mp_err mp_xgcd(const mp_int *a, const mp_int *b, mp_int *g, mp_int *x, mp_int *y);
+mp_err mp_invmod(const mp_int *a, const mp_int *m, mp_int *c);
+mp_err mp_invmod_xgcd(const mp_int *a, const mp_int *m, mp_int *c);
+#endif /* end MP_NUMTH */
+
+/* Input and output        */
+#if MP_IOFUNC
+void   mp_print(mp_int *mp, FILE *ofp);
+#endif /* end MP_IOFUNC */
+
+/* Base conversion         */
+mp_err mp_read_raw(mp_int *mp, char *str, int len);
+int    mp_raw_size(mp_int *mp);
+mp_err mp_toraw(mp_int *mp, char *str);
+mp_err mp_read_radix(mp_int *mp, const char *str, int radix);
+mp_err mp_read_variable_radix(mp_int *a, const char * str, int default_radix);
+int    mp_radix_size(mp_int *mp, int radix);
+mp_err mp_toradix(mp_int *mp, char *str, int radix);
+int    mp_tovalue(char ch, int r);
+
+#define mp_tobinary(M, S)  mp_toradix((M), (S), 2)
+#define mp_tooctal(M, S)   mp_toradix((M), (S), 8)
+#define mp_todecimal(M, S) mp_toradix((M), (S), 10)
+#define mp_tohex(M, S)     mp_toradix((M), (S), 16)
+
+/* Error strings           */
+const  char  *mp_strerror(mp_err ec);
+
+/* Octet string conversion functions */
+mp_err mp_read_unsigned_octets(mp_int *mp, const unsigned char *str, mp_size len);
+int    mp_unsigned_octet_size(const mp_int *mp);
+mp_err mp_to_unsigned_octets(const mp_int *mp, unsigned char *str, mp_size maxlen);
+mp_err mp_to_signed_octets(const mp_int *mp, unsigned char *str, mp_size maxlen);
+mp_err mp_to_fixlen_octets(const mp_int *mp, unsigned char *str, mp_size len);
+
+/* Miscellaneous */
+mp_size mp_trailing_zeros(const mp_int *mp);
+
+#define MP_CHECKOK(x)  if (MP_OKAY > (res = (x))) goto CLEANUP
+#define MP_CHECKERR(x) if (MP_OKAY > (res = (x))) goto CLEANUP
+
+#if defined(MP_API_COMPATIBLE)
+#define NEG             MP_NEG
+#define ZPOS            MP_ZPOS
+#define DIGIT_MAX       MP_DIGIT_MAX
+#define DIGIT_BIT       MP_DIGIT_BIT
+#define DIGIT_FMT       MP_DIGIT_FMT
+#define RADIX           MP_RADIX
+#define MAX_RADIX       MP_MAX_RADIX
+#define FLAG(MP)        MP_FLAG(MP)
+#define SIGN(MP)        MP_SIGN(MP)
+#define USED(MP)        MP_USED(MP)
+#define ALLOC(MP)       MP_ALLOC(MP)
+#define DIGITS(MP)      MP_DIGITS(MP)
+#define DIGIT(MP,N)     MP_DIGIT(MP,N)
+
+#if MP_ARGCHK == 1
+#define  ARGCHK(X,Y)  {if(!(X)){return (Y);}}
+#elif MP_ARGCHK == 2
+#ifdef _KERNEL
+#define  ARGCHK(X,Y)  ASSERT(X)
+#else
+#include <assert.h>
+#define  ARGCHK(X,Y)  assert(X)
+#endif
+#else
+#define  ARGCHK(X,Y)  /*  */
+#endif
+#endif /* defined MP_API_COMPATIBLE */
+
+#endif /* _MPI_H */
diff --git a/jdk/src/share/native/sun/security/ec/mplogic.c b/jdk/src/share/native/sun/security/ec/mplogic.c
new file mode 100644
index 00000000000..6a5f00a1c36
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mplogic.c
@@ -0,0 +1,242 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ *
+ *  Bitwise logical operations on MPI values
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael J. Fromberger.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* $Id: mplogic.c,v 1.15 2004/04/27 23:04:36 gerv%gerv.net Exp $ */
+
+#include "mpi-priv.h"
+#include "mplogic.h"
+
+/* {{{ Lookup table for population count */
+
+static unsigned char bitc[] = {
+   0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
+   1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+   1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+   2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+   1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+   2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+   2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+   3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+   1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+   2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+   2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+   3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+   2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+   3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+   3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+   4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
+};
+
+/* }}} */
+
+/*
+  mpl_rsh(a, b, d)     - b = a >> d
+  mpl_lsh(a, b, d)     - b = a << d
+ */
+
+/* {{{ mpl_rsh(a, b, d) */
+
+mp_err mpl_rsh(const mp_int *a, mp_int *b, mp_digit d)
+{
+  mp_err   res;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  if((res = mp_copy(a, b)) != MP_OKAY)
+    return res;
+
+  s_mp_div_2d(b, d);
+
+  return MP_OKAY;
+
+} /* end mpl_rsh() */
+
+/* }}} */
+
+/* {{{ mpl_lsh(a, b, d) */
+
+mp_err mpl_lsh(const mp_int *a, mp_int *b, mp_digit d)
+{
+  mp_err   res;
+
+  ARGCHK(a != NULL && b != NULL, MP_BADARG);
+
+  if((res = mp_copy(a, b)) != MP_OKAY)
+    return res;
+
+  return s_mp_mul_2d(b, d);
+
+} /* end mpl_lsh() */
+
+/* }}} */
+
+/*------------------------------------------------------------------------*/
+/*
+  mpl_set_bit
+
+  Returns MP_OKAY or some error code.
+  Grows a if needed to set a bit to 1.
+ */
+mp_err mpl_set_bit(mp_int *a, mp_size bitNum, mp_size value)
+{
+  mp_size      ix;
+  mp_err       rv;
+  mp_digit     mask;
+
+  ARGCHK(a != NULL, MP_BADARG);
+
+  ix = bitNum / MP_DIGIT_BIT;
+  if (ix + 1 > MP_USED(a)) {
+    rv = s_mp_pad(a, ix + 1);
+    if (rv != MP_OKAY)
+      return rv;
+  }
+
+  bitNum = bitNum % MP_DIGIT_BIT;
+  mask = (mp_digit)1 << bitNum;
+  if (value)
+    MP_DIGIT(a,ix) |= mask;
+  else
+    MP_DIGIT(a,ix) &= ~mask;
+  s_mp_clamp(a);
+  return MP_OKAY;
+}
+
+/*
+  mpl_get_bit
+
+  returns 0 or 1 or some (negative) error code.
+ */
+mp_err mpl_get_bit(const mp_int *a, mp_size bitNum)
+{
+  mp_size      bit, ix;
+  mp_err       rv;
+
+  ARGCHK(a != NULL, MP_BADARG);
+
+  ix = bitNum / MP_DIGIT_BIT;
+  ARGCHK(ix <= MP_USED(a) - 1, MP_RANGE);
+
+  bit   = bitNum % MP_DIGIT_BIT;
+  rv = (mp_err)(MP_DIGIT(a, ix) >> bit) & 1;
+  return rv;
+}
+
+/*
+  mpl_get_bits
+  - Extracts numBits bits from a, where the least significant extracted bit
+  is bit lsbNum.  Returns a negative value if error occurs.
+  - Because sign bit is used to indicate error, maximum number of bits to
+  be returned is the lesser of (a) the number of bits in an mp_digit, or
+  (b) one less than the number of bits in an mp_err.
+  - lsbNum + numbits can be greater than the number of significant bits in
+  integer a, as long as bit lsbNum is in the high order digit of a.
+ */
+mp_err mpl_get_bits(const mp_int *a, mp_size lsbNum, mp_size numBits)
+{
+  mp_size    rshift = (lsbNum % MP_DIGIT_BIT);
+  mp_size    lsWndx = (lsbNum / MP_DIGIT_BIT);
+  mp_digit * digit  = MP_DIGITS(a) + lsWndx;
+  mp_digit   mask   = ((1 << numBits) - 1);
+
+  ARGCHK(numBits < CHAR_BIT * sizeof mask, MP_BADARG);
+  ARGCHK(MP_HOWMANY(lsbNum, MP_DIGIT_BIT) <= MP_USED(a), MP_RANGE);
+
+  if ((numBits + lsbNum % MP_DIGIT_BIT <= MP_DIGIT_BIT) ||
+      (lsWndx + 1 >= MP_USED(a))) {
+    mask &= (digit[0] >> rshift);
+  } else {
+    mask &= ((digit[0] >> rshift) | (digit[1] << (MP_DIGIT_BIT - rshift)));
+  }
+  return (mp_err)mask;
+}
+
+/*
+  mpl_significant_bits
+  returns number of significnant bits in abs(a).
+  returns 1 if value is zero.
+ */
+mp_err mpl_significant_bits(const mp_int *a)
+{
+  mp_err bits   = 0;
+  int    ix;
+
+  ARGCHK(a != NULL, MP_BADARG);
+
+  ix = MP_USED(a);
+  for (ix = MP_USED(a); ix > 0; ) {
+    mp_digit d;
+    d = MP_DIGIT(a, --ix);
+    if (d) {
+      while (d) {
+        ++bits;
+        d >>= 1;
+      }
+      break;
+    }
+  }
+  bits += ix * MP_DIGIT_BIT;
+  if (!bits)
+    bits = 1;
+  return bits;
+}
+
+/*------------------------------------------------------------------------*/
+/* HERE THERE BE DRAGONS                                                  */
diff --git a/jdk/src/share/native/sun/security/ec/mplogic.h b/jdk/src/share/native/sun/security/ec/mplogic.h
new file mode 100644
index 00000000000..97ddb49c7ea
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mplogic.h
@@ -0,0 +1,105 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ *
+ *  Bitwise logical operations on MPI values
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael J. Fromberger.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MPLOGIC_H
+#define _MPLOGIC_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* $Id: mplogic.h,v 1.7 2004/04/27 23:04:36 gerv%gerv.net Exp $ */
+
+#include "mpi.h"
+
+/*
+  The logical operations treat an mp_int as if it were a bit vector,
+  without regard to its sign (an mp_int is represented in a signed
+  magnitude format).  Values are treated as if they had an infinite
+  string of zeros left of the most-significant bit.
+ */
+
+/* Parity results                    */
+
+#define MP_EVEN       MP_YES
+#define MP_ODD        MP_NO
+
+/* Bitwise functions                 */
+
+mp_err mpl_not(mp_int *a, mp_int *b);            /* one's complement  */
+mp_err mpl_and(mp_int *a, mp_int *b, mp_int *c); /* bitwise AND       */
+mp_err mpl_or(mp_int *a, mp_int *b, mp_int *c);  /* bitwise OR        */
+mp_err mpl_xor(mp_int *a, mp_int *b, mp_int *c); /* bitwise XOR       */
+
+/* Shift functions                   */
+
+mp_err mpl_rsh(const mp_int *a, mp_int *b, mp_digit d);   /* right shift    */
+mp_err mpl_lsh(const mp_int *a, mp_int *b, mp_digit d);   /* left shift     */
+
+/* Bit count and parity              */
+
+mp_err mpl_num_set(mp_int *a, int *num);         /* count set bits    */
+mp_err mpl_num_clear(mp_int *a, int *num);       /* count clear bits  */
+mp_err mpl_parity(mp_int *a);                    /* determine parity  */
+
+/* Get & Set the value of a bit */
+
+mp_err mpl_set_bit(mp_int *a, mp_size bitNum, mp_size value);
+mp_err mpl_get_bit(const mp_int *a, mp_size bitNum);
+mp_err mpl_get_bits(const mp_int *a, mp_size lsbNum, mp_size numBits);
+mp_err mpl_significant_bits(const mp_int *a);
+
+#endif /* _MPLOGIC_H */
diff --git a/jdk/src/share/native/sun/security/ec/mpmontg.c b/jdk/src/share/native/sun/security/ec/mpmontg.c
new file mode 100644
index 00000000000..df17f427321
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mpmontg.c
@@ -0,0 +1,199 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Sheueling Chang Shantz <sheueling.chang@sun.com>,
+ *   Stephen Fung <stephen.fung@sun.com>, and
+ *   Douglas Stebila <douglas@stebila.ca> of Sun Laboratories.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/* $Id: mpmontg.c,v 1.20 2006/08/29 02:41:38 nelson%bolyard.com Exp $ */
+
+/* This file implements moduluar exponentiation using Montgomery's
+ * method for modular reduction.  This file implements the method
+ * described as "Improvement 1" in the paper "A Cryptogrpahic Library for
+ * the Motorola DSP56000" by Stephen R. Dusse' and Burton S. Kaliski Jr.
+ * published in "Advances in Cryptology: Proceedings of EUROCRYPT '90"
+ * "Lecture Notes in Computer Science" volume 473, 1991, pg 230-244,
+ * published by Springer Verlag.
+ */
+
+#define MP_USING_CACHE_SAFE_MOD_EXP 1
+#ifndef _KERNEL
+#include <string.h>
+#include <stddef.h> /* ptrdiff_t */
+#endif
+#include "mpi-priv.h"
+#include "mplogic.h"
+#include "mpprime.h"
+#ifdef MP_USING_MONT_MULF
+#include "montmulf.h"
+#endif
+
+/* if MP_CHAR_STORE_SLOW is defined, we  */
+/* need to know endianness of this platform. */
+#ifdef MP_CHAR_STORE_SLOW
+#if !defined(MP_IS_BIG_ENDIAN) && !defined(MP_IS_LITTLE_ENDIAN)
+#error "You must define MP_IS_BIG_ENDIAN or MP_IS_LITTLE_ENDIAN\n" \
+       "  if you define MP_CHAR_STORE_SLOW."
+#endif
+#endif
+
+#ifndef STATIC
+#define STATIC
+#endif
+
+#define MAX_ODD_INTS    32   /* 2 ** (WINDOW_BITS - 1) */
+
+#ifndef _KERNEL
+#if defined(_WIN32_WCE)
+#define ABORT  res = MP_UNDEF; goto CLEANUP
+#else
+#define ABORT abort()
+#endif
+#else
+#define ABORT  res = MP_UNDEF; goto CLEANUP
+#endif /* _KERNEL */
+
+/* computes T = REDC(T), 2^b == R */
+mp_err s_mp_redc(mp_int *T, mp_mont_modulus *mmm)
+{
+  mp_err res;
+  mp_size i;
+
+  i = MP_USED(T) + MP_USED(&mmm->N) + 2;
+  MP_CHECKOK( s_mp_pad(T, i) );
+  for (i = 0; i < MP_USED(&mmm->N); ++i ) {
+    mp_digit m_i = MP_DIGIT(T, i) * mmm->n0prime;
+    /* T += N * m_i * (MP_RADIX ** i); */
+    MP_CHECKOK( s_mp_mul_d_add_offset(&mmm->N, m_i, T, i) );
+  }
+  s_mp_clamp(T);
+
+  /* T /= R */
+  s_mp_div_2d(T, mmm->b);
+
+  if ((res = s_mp_cmp(T, &mmm->N)) >= 0) {
+    /* T = T - N */
+    MP_CHECKOK( s_mp_sub(T, &mmm->N) );
+#ifdef DEBUG
+    if ((res = mp_cmp(T, &mmm->N)) >= 0) {
+      res = MP_UNDEF;
+      goto CLEANUP;
+    }
+#endif
+  }
+  res = MP_OKAY;
+CLEANUP:
+  return res;
+}
+
+#if !defined(MP_ASSEMBLY_MUL_MONT) && !defined(MP_MONT_USE_MP_MUL)
+mp_err s_mp_mul_mont(const mp_int *a, const mp_int *b, mp_int *c,
+                   mp_mont_modulus *mmm)
+{
+  mp_digit *pb;
+  mp_digit m_i;
+  mp_err   res;
+  mp_size  ib;
+  mp_size  useda, usedb;
+
+  ARGCHK(a != NULL && b != NULL && c != NULL, MP_BADARG);
+
+  if (MP_USED(a) < MP_USED(b)) {
+    const mp_int *xch = b;      /* switch a and b, to do fewer outer loops */
+    b = a;
+    a = xch;
+  }
+
+  MP_USED(c) = 1; MP_DIGIT(c, 0) = 0;
+  ib = MP_USED(a) + MP_MAX(MP_USED(b), MP_USED(&mmm->N)) + 2;
+  if((res = s_mp_pad(c, ib)) != MP_OKAY)
+    goto CLEANUP;
+
+  useda = MP_USED(a);
+  pb = MP_DIGITS(b);
+  s_mpv_mul_d(MP_DIGITS(a), useda, *pb++, MP_DIGITS(c));
+  s_mp_setz(MP_DIGITS(c) + useda + 1, ib - (useda + 1));
+  m_i = MP_DIGIT(c, 0) * mmm->n0prime;
+  s_mp_mul_d_add_offset(&mmm->N, m_i, c, 0);
+
+  /* Outer loop:  Digits of b */
+  usedb = MP_USED(b);
+  for (ib = 1; ib < usedb; ib++) {
+    mp_digit b_i    = *pb++;
+
+    /* Inner product:  Digits of a */
+    if (b_i)
+      s_mpv_mul_d_add_prop(MP_DIGITS(a), useda, b_i, MP_DIGITS(c) + ib);
+    m_i = MP_DIGIT(c, ib) * mmm->n0prime;
+    s_mp_mul_d_add_offset(&mmm->N, m_i, c, ib);
+  }
+  if (usedb < MP_USED(&mmm->N)) {
+    for (usedb = MP_USED(&mmm->N); ib < usedb; ++ib ) {
+      m_i = MP_DIGIT(c, ib) * mmm->n0prime;
+      s_mp_mul_d_add_offset(&mmm->N, m_i, c, ib);
+    }
+  }
+  s_mp_clamp(c);
+  s_mp_div_2d(c, mmm->b);
+  if (s_mp_cmp(c, &mmm->N) >= 0) {
+    MP_CHECKOK( s_mp_sub(c, &mmm->N) );
+  }
+  res = MP_OKAY;
+
+CLEANUP:
+  return res;
+}
+#endif
diff --git a/jdk/src/share/native/sun/security/ec/mpprime.h b/jdk/src/share/native/sun/security/ec/mpprime.h
new file mode 100644
index 00000000000..78bcb18352a
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/mpprime.h
@@ -0,0 +1,89 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ *
+ *  Utilities for finding and working with prime and pseudo-prime
+ *  integers
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the MPI Arbitrary Precision Integer Arithmetic library.
+ *
+ * The Initial Developer of the Original Code is
+ * Michael J. Fromberger.
+ * Portions created by the Initial Developer are Copyright (C) 1997
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MP_PRIME_H
+#define _MP_PRIME_H
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include "mpi.h"
+
+extern const int prime_tab_size;   /* number of primes available */
+extern const mp_digit prime_tab[];
+
+/* Tests for divisibility    */
+mp_err  mpp_divis(mp_int *a, mp_int *b);
+mp_err  mpp_divis_d(mp_int *a, mp_digit d);
+
+/* Random selection          */
+mp_err  mpp_random(mp_int *a);
+mp_err  mpp_random_size(mp_int *a, mp_size prec);
+
+/* Pseudo-primality testing  */
+mp_err  mpp_divis_vector(mp_int *a, const mp_digit *vec, int size, int *which);
+mp_err  mpp_divis_primes(mp_int *a, mp_digit *np);
+mp_err  mpp_fermat(mp_int *a, mp_digit w);
+mp_err mpp_fermat_list(mp_int *a, const mp_digit *primes, mp_size nPrimes);
+mp_err  mpp_pprime(mp_int *a, int nt);
+mp_err mpp_sieve(mp_int *trial, const mp_digit *primes, mp_size nPrimes,
+                 unsigned char *sieve, mp_size nSieve);
+mp_err mpp_make_prime(mp_int *start, mp_size nBits, mp_size strong,
+                      unsigned long * nTries);
+
+#endif /* _MP_PRIME_H */
diff --git a/jdk/src/share/native/sun/security/ec/oid.c b/jdk/src/share/native/sun/security/ec/oid.c
new file mode 100644
index 00000000000..f3ced99bcb5
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/oid.c
@@ -0,0 +1,473 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+#include <sys/types.h>
+
+#ifndef _WIN32
+#ifndef __linux__
+#include <sys/systm.h>
+#endif /* __linux__ */
+#include <sys/param.h>
+#endif /* _WIN32 */
+
+#ifdef _KERNEL
+#include <sys/kmem.h>
+#else
+#include <string.h>
+#endif
+#include "ec.h"
+#include "ecl-curve.h"
+#include "ecc_impl.h"
+#include "secoidt.h"
+
+#define CERTICOM_OID            0x2b, 0x81, 0x04
+#define SECG_OID                CERTICOM_OID, 0x00
+
+#define ANSI_X962_OID           0x2a, 0x86, 0x48, 0xce, 0x3d
+#define ANSI_X962_CURVE_OID     ANSI_X962_OID, 0x03
+#define ANSI_X962_GF2m_OID      ANSI_X962_CURVE_OID, 0x00
+#define ANSI_X962_GFp_OID       ANSI_X962_CURVE_OID, 0x01
+
+#define CONST_OID static const unsigned char
+
+/* ANSI X9.62 prime curve OIDs */
+/* NOTE: prime192v1 is the same as secp192r1, prime256v1 is the
+ * same as secp256r1
+ */
+CONST_OID ansiX962prime192v1[] = { ANSI_X962_GFp_OID, 0x01 };
+CONST_OID ansiX962prime192v2[] = { ANSI_X962_GFp_OID, 0x02 };
+CONST_OID ansiX962prime192v3[] = { ANSI_X962_GFp_OID, 0x03 };
+CONST_OID ansiX962prime239v1[] = { ANSI_X962_GFp_OID, 0x04 };
+CONST_OID ansiX962prime239v2[] = { ANSI_X962_GFp_OID, 0x05 };
+CONST_OID ansiX962prime239v3[] = { ANSI_X962_GFp_OID, 0x06 };
+CONST_OID ansiX962prime256v1[] = { ANSI_X962_GFp_OID, 0x07 };
+
+/* SECG prime curve OIDs */
+CONST_OID secgECsecp112r1[] = { SECG_OID, 0x06 };
+CONST_OID secgECsecp112r2[] = { SECG_OID, 0x07 };
+CONST_OID secgECsecp128r1[] = { SECG_OID, 0x1c };
+CONST_OID secgECsecp128r2[] = { SECG_OID, 0x1d };
+CONST_OID secgECsecp160k1[] = { SECG_OID, 0x09 };
+CONST_OID secgECsecp160r1[] = { SECG_OID, 0x08 };
+CONST_OID secgECsecp160r2[] = { SECG_OID, 0x1e };
+CONST_OID secgECsecp192k1[] = { SECG_OID, 0x1f };
+CONST_OID secgECsecp224k1[] = { SECG_OID, 0x20 };
+CONST_OID secgECsecp224r1[] = { SECG_OID, 0x21 };
+CONST_OID secgECsecp256k1[] = { SECG_OID, 0x0a };
+CONST_OID secgECsecp384r1[] = { SECG_OID, 0x22 };
+CONST_OID secgECsecp521r1[] = { SECG_OID, 0x23 };
+
+/* SECG characterisitic two curve OIDs */
+CONST_OID secgECsect113r1[] = {SECG_OID, 0x04 };
+CONST_OID secgECsect113r2[] = {SECG_OID, 0x05 };
+CONST_OID secgECsect131r1[] = {SECG_OID, 0x16 };
+CONST_OID secgECsect131r2[] = {SECG_OID, 0x17 };
+CONST_OID secgECsect163k1[] = {SECG_OID, 0x01 };
+CONST_OID secgECsect163r1[] = {SECG_OID, 0x02 };
+CONST_OID secgECsect163r2[] = {SECG_OID, 0x0f };
+CONST_OID secgECsect193r1[] = {SECG_OID, 0x18 };
+CONST_OID secgECsect193r2[] = {SECG_OID, 0x19 };
+CONST_OID secgECsect233k1[] = {SECG_OID, 0x1a };
+CONST_OID secgECsect233r1[] = {SECG_OID, 0x1b };
+CONST_OID secgECsect239k1[] = {SECG_OID, 0x03 };
+CONST_OID secgECsect283k1[] = {SECG_OID, 0x10 };
+CONST_OID secgECsect283r1[] = {SECG_OID, 0x11 };
+CONST_OID secgECsect409k1[] = {SECG_OID, 0x24 };
+CONST_OID secgECsect409r1[] = {SECG_OID, 0x25 };
+CONST_OID secgECsect571k1[] = {SECG_OID, 0x26 };
+CONST_OID secgECsect571r1[] = {SECG_OID, 0x27 };
+
+/* ANSI X9.62 characteristic two curve OIDs */
+CONST_OID ansiX962c2pnb163v1[] = { ANSI_X962_GF2m_OID, 0x01 };
+CONST_OID ansiX962c2pnb163v2[] = { ANSI_X962_GF2m_OID, 0x02 };
+CONST_OID ansiX962c2pnb163v3[] = { ANSI_X962_GF2m_OID, 0x03 };
+CONST_OID ansiX962c2pnb176v1[] = { ANSI_X962_GF2m_OID, 0x04 };
+CONST_OID ansiX962c2tnb191v1[] = { ANSI_X962_GF2m_OID, 0x05 };
+CONST_OID ansiX962c2tnb191v2[] = { ANSI_X962_GF2m_OID, 0x06 };
+CONST_OID ansiX962c2tnb191v3[] = { ANSI_X962_GF2m_OID, 0x07 };
+CONST_OID ansiX962c2onb191v4[] = { ANSI_X962_GF2m_OID, 0x08 };
+CONST_OID ansiX962c2onb191v5[] = { ANSI_X962_GF2m_OID, 0x09 };
+CONST_OID ansiX962c2pnb208w1[] = { ANSI_X962_GF2m_OID, 0x0a };
+CONST_OID ansiX962c2tnb239v1[] = { ANSI_X962_GF2m_OID, 0x0b };
+CONST_OID ansiX962c2tnb239v2[] = { ANSI_X962_GF2m_OID, 0x0c };
+CONST_OID ansiX962c2tnb239v3[] = { ANSI_X962_GF2m_OID, 0x0d };
+CONST_OID ansiX962c2onb239v4[] = { ANSI_X962_GF2m_OID, 0x0e };
+CONST_OID ansiX962c2onb239v5[] = { ANSI_X962_GF2m_OID, 0x0f };
+CONST_OID ansiX962c2pnb272w1[] = { ANSI_X962_GF2m_OID, 0x10 };
+CONST_OID ansiX962c2pnb304w1[] = { ANSI_X962_GF2m_OID, 0x11 };
+CONST_OID ansiX962c2tnb359v1[] = { ANSI_X962_GF2m_OID, 0x12 };
+CONST_OID ansiX962c2pnb368w1[] = { ANSI_X962_GF2m_OID, 0x13 };
+CONST_OID ansiX962c2tnb431r1[] = { ANSI_X962_GF2m_OID, 0x14 };
+
+#define OI(x) { siDEROID, (unsigned char *)x, sizeof x }
+#ifndef SECOID_NO_STRINGS
+#define OD(oid,tag,desc,mech,ext) { OI(oid), tag, desc, mech, ext }
+#else
+#define OD(oid,tag,desc,mech,ext) { OI(oid), tag, 0, mech, ext }
+#endif
+
+#define CKM_INVALID_MECHANISM 0xffffffffUL
+
+/* XXX this is incorrect */
+#define INVALID_CERT_EXTENSION 1
+
+#define CKM_ECDSA                      0x00001041
+#define CKM_ECDSA_SHA1                 0x00001042
+#define CKM_ECDH1_DERIVE               0x00001050
+
+static SECOidData ANSI_prime_oids[] = {
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+
+    OD( ansiX962prime192v1, ECCurve_NIST_P192,
+        "ANSI X9.62 elliptic curve prime192v1 (aka secp192r1, NIST P-192)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962prime192v2, ECCurve_X9_62_PRIME_192V2,
+        "ANSI X9.62 elliptic curve prime192v2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962prime192v3, ECCurve_X9_62_PRIME_192V3,
+        "ANSI X9.62 elliptic curve prime192v3",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962prime239v1, ECCurve_X9_62_PRIME_239V1,
+        "ANSI X9.62 elliptic curve prime239v1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962prime239v2, ECCurve_X9_62_PRIME_239V2,
+        "ANSI X9.62 elliptic curve prime239v2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962prime239v3, ECCurve_X9_62_PRIME_239V3,
+        "ANSI X9.62 elliptic curve prime239v3",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962prime256v1, ECCurve_NIST_P256,
+        "ANSI X9.62 elliptic curve prime256v1 (aka secp256r1, NIST P-256)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION )
+};
+
+static SECOidData SECG_oids[] = {
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+
+    OD( secgECsect163k1, ECCurve_NIST_K163,
+        "SECG elliptic curve sect163k1 (aka NIST K-163)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect163r1, ECCurve_SECG_CHAR2_163R1,
+        "SECG elliptic curve sect163r1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect239k1, ECCurve_SECG_CHAR2_239K1,
+        "SECG elliptic curve sect239k1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect113r1, ECCurve_SECG_CHAR2_113R1,
+        "SECG elliptic curve sect113r1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect113r2, ECCurve_SECG_CHAR2_113R2,
+        "SECG elliptic curve sect113r2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp112r1, ECCurve_SECG_PRIME_112R1,
+        "SECG elliptic curve secp112r1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp112r2, ECCurve_SECG_PRIME_112R2,
+        "SECG elliptic curve secp112r2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp160r1, ECCurve_SECG_PRIME_160R1,
+        "SECG elliptic curve secp160r1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp160k1, ECCurve_SECG_PRIME_160K1,
+        "SECG elliptic curve secp160k1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp256k1, ECCurve_SECG_PRIME_256K1,
+        "SECG elliptic curve secp256k1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    OD( secgECsect163r2, ECCurve_NIST_B163,
+        "SECG elliptic curve sect163r2 (aka NIST B-163)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect283k1, ECCurve_NIST_K283,
+        "SECG elliptic curve sect283k1 (aka NIST K-283)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect283r1, ECCurve_NIST_B283,
+        "SECG elliptic curve sect283r1 (aka NIST B-283)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    OD( secgECsect131r1, ECCurve_SECG_CHAR2_131R1,
+        "SECG elliptic curve sect131r1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect131r2, ECCurve_SECG_CHAR2_131R2,
+        "SECG elliptic curve sect131r2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect193r1, ECCurve_SECG_CHAR2_193R1,
+        "SECG elliptic curve sect193r1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect193r2, ECCurve_SECG_CHAR2_193R2,
+        "SECG elliptic curve sect193r2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect233k1, ECCurve_NIST_K233,
+        "SECG elliptic curve sect233k1 (aka NIST K-233)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect233r1, ECCurve_NIST_B233,
+        "SECG elliptic curve sect233r1 (aka NIST B-233)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp128r1, ECCurve_SECG_PRIME_128R1,
+        "SECG elliptic curve secp128r1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp128r2, ECCurve_SECG_PRIME_128R2,
+        "SECG elliptic curve secp128r2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp160r2, ECCurve_SECG_PRIME_160R2,
+        "SECG elliptic curve secp160r2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp192k1, ECCurve_SECG_PRIME_192K1,
+        "SECG elliptic curve secp192k1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp224k1, ECCurve_SECG_PRIME_224K1,
+        "SECG elliptic curve secp224k1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp224r1, ECCurve_NIST_P224,
+        "SECG elliptic curve secp224r1 (aka NIST P-224)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp384r1, ECCurve_NIST_P384,
+        "SECG elliptic curve secp384r1 (aka NIST P-384)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsecp521r1, ECCurve_NIST_P521,
+        "SECG elliptic curve secp521r1 (aka NIST P-521)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect409k1, ECCurve_NIST_K409,
+        "SECG elliptic curve sect409k1 (aka NIST K-409)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect409r1, ECCurve_NIST_B409,
+        "SECG elliptic curve sect409r1 (aka NIST B-409)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect571k1, ECCurve_NIST_K571,
+        "SECG elliptic curve sect571k1 (aka NIST K-571)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( secgECsect571r1, ECCurve_NIST_B571,
+        "SECG elliptic curve sect571r1 (aka NIST B-571)",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION )
+};
+
+static SECOidData ANSI_oids[] = {
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+
+    /* ANSI X9.62 named elliptic curves (characteristic two field) */
+    OD( ansiX962c2pnb163v1, ECCurve_X9_62_CHAR2_PNB163V1,
+        "ANSI X9.62 elliptic curve c2pnb163v1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2pnb163v2, ECCurve_X9_62_CHAR2_PNB163V2,
+        "ANSI X9.62 elliptic curve c2pnb163v2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2pnb163v3, ECCurve_X9_62_CHAR2_PNB163V3,
+        "ANSI X9.62 elliptic curve c2pnb163v3",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2pnb176v1, ECCurve_X9_62_CHAR2_PNB176V1,
+        "ANSI X9.62 elliptic curve c2pnb176v1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2tnb191v1, ECCurve_X9_62_CHAR2_TNB191V1,
+        "ANSI X9.62 elliptic curve c2tnb191v1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2tnb191v2, ECCurve_X9_62_CHAR2_TNB191V2,
+        "ANSI X9.62 elliptic curve c2tnb191v2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2tnb191v3, ECCurve_X9_62_CHAR2_TNB191V3,
+        "ANSI X9.62 elliptic curve c2tnb191v3",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    OD( ansiX962c2pnb208w1, ECCurve_X9_62_CHAR2_PNB208W1,
+        "ANSI X9.62 elliptic curve c2pnb208w1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2tnb239v1, ECCurve_X9_62_CHAR2_TNB239V1,
+        "ANSI X9.62 elliptic curve c2tnb239v1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2tnb239v2, ECCurve_X9_62_CHAR2_TNB239V2,
+        "ANSI X9.62 elliptic curve c2tnb239v2",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2tnb239v3, ECCurve_X9_62_CHAR2_TNB239V3,
+        "ANSI X9.62 elliptic curve c2tnb239v3",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    { { siDEROID, NULL, 0 }, ECCurve_noName,
+        "Unknown OID", CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION },
+    OD( ansiX962c2pnb272w1, ECCurve_X9_62_CHAR2_PNB272W1,
+        "ANSI X9.62 elliptic curve c2pnb272w1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2pnb304w1, ECCurve_X9_62_CHAR2_PNB304W1,
+        "ANSI X9.62 elliptic curve c2pnb304w1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2tnb359v1, ECCurve_X9_62_CHAR2_TNB359V1,
+        "ANSI X9.62 elliptic curve c2tnb359v1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2pnb368w1, ECCurve_X9_62_CHAR2_PNB368W1,
+        "ANSI X9.62 elliptic curve c2pnb368w1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION ),
+    OD( ansiX962c2tnb431r1, ECCurve_X9_62_CHAR2_TNB431R1,
+        "ANSI X9.62 elliptic curve c2tnb431r1",
+        CKM_INVALID_MECHANISM,
+        INVALID_CERT_EXTENSION )
+};
+
+SECOidData *
+SECOID_FindOID(const SECItem *oid)
+{
+    SECOidData *po;
+    SECOidData *ret;
+    int i;
+
+    if (oid->len == 8) {
+        if (oid->data[6] == 0x00) {
+                /* XXX bounds check */
+                po = &ANSI_oids[oid->data[7]];
+                if (memcmp(oid->data, po->oid.data, 8) == 0)
+                        ret = po;
+        }
+        if (oid->data[6] == 0x01) {
+                /* XXX bounds check */
+                po = &ANSI_prime_oids[oid->data[7]];
+                if (memcmp(oid->data, po->oid.data, 8) == 0)
+                        ret = po;
+        }
+    } else if (oid->len == 5) {
+        /* XXX bounds check */
+        po = &SECG_oids[oid->data[4]];
+        if (memcmp(oid->data, po->oid.data, 5) == 0)
+                ret = po;
+    } else {
+        ret = NULL;
+    }
+    return(ret);
+}
+
+ECCurveName
+SECOID_FindOIDTag(const SECItem *oid)
+{
+    SECOidData *oiddata;
+
+    oiddata = SECOID_FindOID (oid);
+    if (oiddata == NULL)
+        return ECCurve_noName;
+
+    return oiddata->offset;
+}
diff --git a/jdk/src/share/native/sun/security/ec/secitem.c b/jdk/src/share/native/sun/security/ec/secitem.c
new file mode 100644
index 00000000000..d9daacc8bc4
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/secitem.c
@@ -0,0 +1,199 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/*
+ * Support routines for SECItem data structure.
+ *
+ * $Id: secitem.c,v 1.14 2006/05/22 22:24:34 wtchang%redhat.com Exp $
+ */
+
+#include <sys/types.h>
+
+#ifndef _WIN32
+#ifndef __linux__
+#include <sys/systm.h>
+#endif /* __linux__ */
+#include <sys/param.h>
+#endif /* _WIN32 */
+
+#ifdef _KERNEL
+#include <sys/kmem.h>
+#else
+#include <string.h>
+
+#ifndef _WIN32
+#include <strings.h>
+#endif /* _WIN32 */
+
+#include <assert.h>
+#endif
+#include "ec.h"
+#include "ecl-curve.h"
+#include "ecc_impl.h"
+
+void SECITEM_FreeItem(SECItem *, PRBool);
+
+SECItem *
+SECITEM_AllocItem(PRArenaPool *arena, SECItem *item, unsigned int len,
+    int kmflag)
+{
+    SECItem *result = NULL;
+    void *mark = NULL;
+
+    if (arena != NULL) {
+        mark = PORT_ArenaMark(arena);
+    }
+
+    if (item == NULL) {
+        if (arena != NULL) {
+            result = PORT_ArenaZAlloc(arena, sizeof(SECItem), kmflag);
+        } else {
+            result = PORT_ZAlloc(sizeof(SECItem), kmflag);
+        }
+        if (result == NULL) {
+            goto loser;
+        }
+    } else {
+        PORT_Assert(item->data == NULL);
+        result = item;
+    }
+
+    result->len = len;
+    if (len) {
+        if (arena != NULL) {
+            result->data = PORT_ArenaAlloc(arena, len, kmflag);
+        } else {
+            result->data = PORT_Alloc(len, kmflag);
+        }
+        if (result->data == NULL) {
+            goto loser;
+        }
+    } else {
+        result->data = NULL;
+    }
+
+    if (mark) {
+        PORT_ArenaUnmark(arena, mark);
+    }
+    return(result);
+
+loser:
+    if ( arena != NULL ) {
+        if (mark) {
+            PORT_ArenaRelease(arena, mark);
+        }
+        if (item != NULL) {
+            item->data = NULL;
+            item->len = 0;
+        }
+    } else {
+        if (result != NULL) {
+            SECITEM_FreeItem(result, (item == NULL) ? PR_TRUE : PR_FALSE);
+        }
+        /*
+         * If item is not NULL, the above has set item->data and
+         * item->len to 0.
+         */
+    }
+    return(NULL);
+}
+
+SECStatus
+SECITEM_CopyItem(PRArenaPool *arena, SECItem *to, const SECItem *from,
+   int kmflag)
+{
+    to->type = from->type;
+    if (from->data && from->len) {
+        if ( arena ) {
+            to->data = (unsigned char*) PORT_ArenaAlloc(arena, from->len,
+                kmflag);
+        } else {
+            to->data = (unsigned char*) PORT_Alloc(from->len, kmflag);
+        }
+
+        if (!to->data) {
+            return SECFailure;
+        }
+        PORT_Memcpy(to->data, from->data, from->len);
+        to->len = from->len;
+    } else {
+        to->data = 0;
+        to->len = 0;
+    }
+    return SECSuccess;
+}
+
+void
+SECITEM_FreeItem(SECItem *zap, PRBool freeit)
+{
+    if (zap) {
+#ifdef _KERNEL
+        kmem_free(zap->data, zap->len);
+#else
+        free(zap->data);
+#endif
+        zap->data = 0;
+        zap->len = 0;
+        if (freeit) {
+#ifdef _KERNEL
+            kmem_free(zap, sizeof (SECItem));
+#else
+            free(zap);
+#endif
+        }
+    }
+}
diff --git a/jdk/src/share/native/sun/security/ec/secoidt.h b/jdk/src/share/native/sun/security/ec/secoidt.h
new file mode 100644
index 00000000000..0935388cdb8
--- /dev/null
+++ b/jdk/src/share/native/sun/security/ec/secoidt.h
@@ -0,0 +1,103 @@
+/* *********************************************************************
+ *
+ * Sun elects to have this file available under and governed by the
+ * Mozilla Public License Version 1.1 ("MPL") (see
+ * http://www.mozilla.org/MPL/ for full license text). For the avoidance
+ * of doubt and subject to the following, Sun also elects to allow
+ * licensees to use this file under the MPL, the GNU General Public
+ * License version 2 only or the Lesser General Public License version
+ * 2.1 only. Any references to the "GNU General Public License version 2
+ * or later" or "GPL" in the following shall be construed to mean the
+ * GNU General Public License version 2 only. Any references to the "GNU
+ * Lesser General Public License version 2.1 or later" or "LGPL" in the
+ * following shall be construed to mean the GNU Lesser General Public
+ * License version 2.1 only. However, the following notice accompanied
+ * the original version of this file:
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Dr Vipul Gupta <vipul.gupta@sun.com>, Sun Microsystems Laboratories
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ *********************************************************************** */
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _SECOIDT_H_
+#define _SECOIDT_H_
+
+#pragma ident   "%Z%%M% %I%     %E% SMI"
+
+/*
+ * secoidt.h - public data structures for ASN.1 OID functions
+ *
+ * $Id: secoidt.h,v 1.23 2007/05/05 22:45:16 nelson%bolyard.com Exp $
+ */
+
+typedef struct SECOidDataStr SECOidData;
+typedef struct SECAlgorithmIDStr SECAlgorithmID;
+
+/*
+** An X.500 algorithm identifier
+*/
+struct SECAlgorithmIDStr {
+    SECItem algorithm;
+    SECItem parameters;
+};
+
+#define SEC_OID_SECG_EC_SECP192R1 SEC_OID_ANSIX962_EC_PRIME192V1
+#define SEC_OID_SECG_EC_SECP256R1 SEC_OID_ANSIX962_EC_PRIME256V1
+#define SEC_OID_PKCS12_KEY_USAGE  SEC_OID_X509_KEY_USAGE
+
+/* fake OID for DSS sign/verify */
+#define SEC_OID_SHA SEC_OID_MISS_DSS
+
+typedef enum {
+    INVALID_CERT_EXTENSION = 0,
+    UNSUPPORTED_CERT_EXTENSION = 1,
+    SUPPORTED_CERT_EXTENSION = 2
+} SECSupportExtenTag;
+
+struct SECOidDataStr {
+    SECItem            oid;
+    ECCurveName        offset;
+    const char *       desc;
+    unsigned long      mechanism;
+    SECSupportExtenTag supportedExtension;
+                                /* only used for x.509 v3 extensions, so
+                                   that we can print the names of those
+                                   extensions that we don't even support */
+};
+
+#endif /* _SECOIDT_H_ */
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
index e6cbe2b6d91..8e80a59077c 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
@@ -337,7 +337,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetSlotList
     CK_ULONG ckTokenNumber;
     CK_SLOT_ID_PTR ckpSlotList;
     CK_BBOOL ckTokenPresent;
-    jlongArray jSlotList;
+    jlongArray jSlotList = NULL;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -637,7 +637,7 @@ Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetMechanismList
     CK_SLOT_ID ckSlotID;
     CK_ULONG ckMechanismNumber;
     CK_MECHANISM_TYPE_PTR ckpMechanismList;
-    jlongArray jMechanismList;
+    jlongArray jMechanismList = NULL;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
index aab0491a30e..501ead98c42 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
@@ -73,9 +73,8 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1GenerateKey
     CK_MECHANISM ckMechanism;
     CK_ATTRIBUTE_PTR ckpAttributes = NULL_PTR;
     CK_ULONG ckAttributesLength;
-    CK_OBJECT_HANDLE ckKeyHandle;
+    CK_OBJECT_HANDLE ckKeyHandle = 0;
     jlong jKeyHandle = 0L;
-    CK_ULONG i;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -151,8 +150,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1Generate
     CK_OBJECT_HANDLE_PTR ckpPublicKeyHandle;  /* pointer to Public Key */
     CK_OBJECT_HANDLE_PTR ckpPrivateKeyHandle; /* pointer to Private Key */
     CK_OBJECT_HANDLE_PTR ckpKeyHandles;     /* pointer to array with Public and Private Key */
-    jlongArray jKeyHandles;
-    CK_ULONG i;
+    jlongArray jKeyHandles = NULL;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -299,9 +297,8 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1UnwrapKey
     CK_ULONG ckWrappedKeyLength;
     CK_ATTRIBUTE_PTR ckpAttributes = NULL_PTR;
     CK_ULONG ckAttributesLength;
-    CK_OBJECT_HANDLE ckKeyHandle;
+    CK_OBJECT_HANDLE ckKeyHandle = 0;
     jlong jKeyHandle = 0L;
-    CK_ULONG i;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -478,8 +475,7 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1DeriveKey
     CK_ATTRIBUTE_PTR ckpAttributes = NULL_PTR;
     CK_ULONG ckAttributesLength;
     CK_OBJECT_HANDLE ckKeyHandle = 0;
-    jlong jKeyHandle;
-    CK_ULONG i;
+    jlong jKeyHandle = 0L;
     CK_RV rv;
     CK_OBJECT_HANDLE_PTR phKey = &ckKeyHandle;
 
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
index a72f20d2719..307f2ee7310 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
@@ -72,8 +72,7 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1CreateObject
     CK_OBJECT_HANDLE ckObjectHandle;
     CK_ATTRIBUTE_PTR ckpAttributes = NULL_PTR;
     CK_ULONG ckAttributesLength;
-    jlong jObjectHandle;
-    CK_ULONG i;
+    jlong jObjectHandle = 0L;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -114,8 +113,7 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1CopyObject
     CK_OBJECT_HANDLE ckNewObjectHandle;
     CK_ATTRIBUTE_PTR ckpAttributes = NULL_PTR;
     CK_ULONG ckAttributesLength;
-    jlong jNewObjectHandle;
-    CK_ULONG i;
+    jlong jNewObjectHandle = 0L;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -180,7 +178,7 @@ JNIEXPORT jlong JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetObjectSize
     CK_SESSION_HANDLE ckSessionHandle;
     CK_OBJECT_HANDLE ckObjectHandle;
     CK_ULONG ckObjectSize;
-    jlong jObjectSize;
+    jlong jObjectSize = 0L;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -217,7 +215,7 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetAttributeVa
     CK_ATTRIBUTE_PTR ckpAttributes = NULL_PTR;
     CK_ULONG ckAttributesLength;
     CK_ULONG ckBufferLength;
-    CK_ULONG i, j;
+    CK_ULONG i;
     jobject jAttribute;
     CK_RV rv;
 
@@ -307,7 +305,6 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1SetAttributeVa
     CK_OBJECT_HANDLE ckObjectHandle;
     CK_ATTRIBUTE_PTR ckpAttributes = NULL_PTR;
     CK_ULONG ckAttributesLength;
-    CK_ULONG i;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -342,7 +339,6 @@ JNIEXPORT void JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObjectsIni
     CK_SESSION_HANDLE ckSessionHandle;
     CK_ATTRIBUTE_PTR ckpAttributes = NULL_PTR;
     CK_ULONG ckAttributesLength;
-    CK_ULONG i;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
@@ -385,7 +381,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObje
     CK_ULONG ckMaxObjectLength;
     CK_OBJECT_HANDLE_PTR ckpObjectHandleArray;
     CK_ULONG ckActualObjectCount;
-    jlongArray jObjectHandleArray;
+    jlongArray jObjectHandleArray = NULL;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
     if (ckpFunctions == NULL) { return NULL; }
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
index e55755d1cf0..6c60fddd940 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
@@ -110,7 +110,7 @@ JNIEXPORT jbyteArray JNICALL Java_sun_security_pkcs11_wrapper_PKCS11_C_1Sign
     CK_BYTE_PTR ckpSignature;
     CK_ULONG ckDataLength;
     CK_ULONG ckSignatureLength = 0;
-    jbyteArray jSignature;
+    jbyteArray jSignature = NULL;
     CK_RV rv;
 
     CK_FUNCTION_LIST_PTR ckpFunctions = getFunctionList(env, obj);
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
index d4c12a06baa..98ec9c3b2e6 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
@@ -194,16 +194,14 @@ jlong ckAssertReturnValueOK(JNIEnv *env, CK_RV returnValue)
     jclass jPKCS11ExceptionClass;
     jmethodID jConstructor;
     jthrowable jPKCS11Exception;
-    jlong jErrorCode;
+    jlong jErrorCode = 0L;
 
-    if (returnValue == CKR_OK) {
-        return 0L ;
-    } else {
+    if (returnValue != CKR_OK) {
+        jErrorCode = ckULongToJLong(returnValue);
         jPKCS11ExceptionClass = (*env)->FindClass(env, CLASS_PKCS11EXCEPTION);
         if (jPKCS11ExceptionClass != NULL) {
             jConstructor = (*env)->GetMethodID(env, jPKCS11ExceptionClass, "<init>", "(J)V");
             if (jConstructor != NULL) {
-                jErrorCode = ckULongToJLong(returnValue);
                 jPKCS11Exception = (jthrowable) (*env)->NewObject(env, jPKCS11ExceptionClass, jConstructor, jErrorCode);
                 if (jPKCS11Exception != NULL) {
                     (*env)->Throw(env, jPKCS11Exception);
@@ -211,8 +209,8 @@ jlong ckAssertReturnValueOK(JNIEnv *env, CK_RV returnValue)
             }
         }
         (*env)->DeleteLocalRef(env, jPKCS11ExceptionClass);
-        return jErrorCode ;
     }
+    return jErrorCode ;
 }
 
 /*
diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h b/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
index 9dd90c30466..78a73f15f3a 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
@@ -300,7 +300,7 @@ void jAttributeArrayToCKAttributeArray(JNIEnv *env, jobjectArray jAArray, CK_ATT
 
 /* funktions to convert a CK-type array and the array length to a Java array */
 
-jcharArray ckByteArrayToJByteArray(JNIEnv *env, const CK_BYTE_PTR ckpArray, CK_ULONG ckLength);
+jbyteArray ckByteArrayToJByteArray(JNIEnv *env, const CK_BYTE_PTR ckpArray, CK_ULONG ckLength);
 jlongArray ckULongArrayToJLongArray(JNIEnv *env, const CK_ULONG_PTR ckpArray, CK_ULONG ckLength);
 jcharArray ckCharArrayToJCharArray(JNIEnv *env, const CK_CHAR_PTR ckpArray, CK_ULONG length);
 jcharArray ckUTF8CharArrayToJCharArray(JNIEnv *env, const CK_UTF8CHAR_PTR ckpArray, CK_ULONG ckLength);
diff --git a/jdk/src/share/sample/nio/file/Xdd.java b/jdk/src/share/sample/nio/file/Xdd.java
index b540b31fd1b..b5102976077 100644
--- a/jdk/src/share/sample/nio/file/Xdd.java
+++ b/jdk/src/share/sample/nio/file/Xdd.java
@@ -57,9 +57,9 @@ public class Xdd {
         Path file = (args.length == 1) ?
             Paths.get(args[0]) : Paths.get(args[2]);
 
-        // check that user defined attributes are supported by the file system
+        // check that user defined attributes are supported by the file store
         FileStore store = file.getFileStore();
-        if (!store.supportsFileAttributeView("user")) {
+        if (!store.supportsFileAttributeView(UserDefinedFileAttributeView.class)) {
             System.err.format("UserDefinedFileAttributeView not supported on %s\n", store);
             System.exit(-1);
 
diff --git a/jdk/src/share/transport/socket/socketTransport.c b/jdk/src/share/transport/socket/socketTransport.c
index f960fae2d39..59ebcc9ad3c 100644
--- a/jdk/src/share/transport/socket/socketTransport.c
+++ b/jdk/src/share/transport/socket/socketTransport.c
@@ -134,15 +134,16 @@ setOptions(int fd)
 
 static jdwpTransportError
 handshake(int fd, jlong timeout) {
-    char *hello = "JDWP-Handshake";
+    const char *hello = "JDWP-Handshake";
     char b[16];
-    int rv, received, i;
+    int rv, helloLen, received;
 
     if (timeout > 0) {
         dbgsysConfigureBlocking(fd, JNI_FALSE);
     }
+    helloLen = (int)strlen(hello);
     received = 0;
-    while (received < (int)strlen(hello)) {
+    while (received < helloLen) {
         int n;
         char *buf;
         if (timeout > 0) {
@@ -154,7 +155,7 @@ handshake(int fd, jlong timeout) {
         }
         buf = b;
         buf += received;
-        n = dbgsysRecv(fd, buf, (int)strlen(hello)-received, 0);
+        n = dbgsysRecv(fd, buf, helloLen-received, 0);
         if (n == 0) {
             setLastError(0, "handshake failed - connection prematurally closed");
             return JDWPTRANSPORT_ERROR_IO_ERROR;
@@ -167,20 +168,19 @@ handshake(int fd, jlong timeout) {
     if (timeout > 0) {
         dbgsysConfigureBlocking(fd, JNI_TRUE);
     }
-    for (i=0; i<(int)strlen(hello); i++) {
-        if (b[i] != hello[i]) {
-            char msg[64];
-            strcpy(msg, "handshake failed - received >");
-            strncat(msg, b, strlen(hello));
-            strcat(msg, "< - excepted >");
-            strcat(msg, hello);
-            strcat(msg, "<");
-            setLastError(0, msg);
-            return JDWPTRANSPORT_ERROR_IO_ERROR;
-        }
+    if (strncmp(b, hello, received) != 0) {
+        char msg[80+2*16];
+        b[received] = '\0';
+        /*
+         * We should really use snprintf here but it's not available on Windows.
+         * We can't use jio_snprintf without linking the transport against the VM.
+         */
+        sprintf(msg, "handshake failed - received >%s< - expected >%s<", b, hello);
+        setLastError(0, msg);
+        return JDWPTRANSPORT_ERROR_IO_ERROR;
     }
 
-    if (dbgsysSend(fd, hello, (int)strlen(hello), 0) != (int)strlen(hello)) {
+    if (dbgsysSend(fd, (char*)hello, helloLen, 0) != helloLen) {
         RETURN_IO_ERROR("send failed during handshake");
     }
     return JDWPTRANSPORT_ERROR_NONE;
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java b/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java
index 218bb303270..d28ec9e1b3f 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java
@@ -71,8 +71,8 @@ public abstract class XErrorHandler {
             return super.handleError(display, err);
         }
         // Shared instance
-        private static IgnoreBadWindowHandler theInstance = new IgnoreBadWindowHandler();
-        public static IgnoreBadWindowHandler getInstance() {
+        private static VerifyChangePropertyHandler theInstance = new VerifyChangePropertyHandler();
+        public static VerifyChangePropertyHandler getInstance() {
             return theInstance;
         }
     }
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java b/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java
index ea39aeacc94..83c655f11c8 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XKeysym.java
@@ -354,6 +354,7 @@ public class XKeysym {
         keysym2UCSHash.put( (long)0xFFB7, (char)0x0037); // XK_KP_7 --> DIGIT SEVEN
         keysym2UCSHash.put( (long)0xFFB8, (char)0x0038); // XK_KP_8 --> DIGIT EIGHT
         keysym2UCSHash.put( (long)0xFFB9, (char)0x0039); // XK_KP_9 --> DIGIT NINE
+        keysym2UCSHash.put( (long)0xFE20, (char)0x0009); // XK_ISO_Left_Tab --> <control>
         keysym2UCSHash.put( (long)0x1a1, (char)0x0104); // XK_Aogonek --> LATIN CAPITAL LETTER A WITH OGONEK
         keysym2UCSHash.put( (long)0x1a2, (char)0x02d8); // XK_breve --> BREVE
         keysym2UCSHash.put( (long)0x1a3, (char)0x0141); // XK_Lstroke --> LATIN CAPITAL LETTER L WITH STROKE
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java
index 663c0ed8a04..82e226363b9 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java
@@ -27,6 +27,7 @@ package sun.awt.X11;
 import java.awt.*;
 import java.awt.peer.*;
 import sun.awt.X11GraphicsConfig;
+import sun.awt.SunToolkit;
 
 class XRobotPeer implements RobotPeer {
     private X11GraphicsConfig   xgc = null;
@@ -38,7 +39,8 @@ class XRobotPeer implements RobotPeer {
 
     XRobotPeer(GraphicsConfiguration gc) {
         this.xgc = (X11GraphicsConfig)gc;
-        setup();
+        SunToolkit tk = (SunToolkit)Toolkit.getDefaultToolkit();
+        setup(tk.getNumberOfButtons());
     }
 
     public void dispose() {
@@ -81,7 +83,7 @@ class XRobotPeer implements RobotPeer {
         return pixelArray;
     }
 
-    private static native synchronized void setup();
+    private static native synchronized void setup(int numberOfButtons);
 
     private static native synchronized void mouseMoveImpl(X11GraphicsConfig xgc, int x, int y);
     private static native synchronized void mousePressImpl(int buttons);
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
index 901532c22aa..9cb6da03c73 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
@@ -169,6 +169,9 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
     }
 
     public static void RESTORE_XERROR_HANDLER() {
+        // wait until all requests are processed by the X server
+        // and only then uninstall the error handler
+        XSync();
         current_error_handler = null;
     }
 
diff --git a/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h b/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h
index e03e2a79c04..e2372ac3c2e 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h
+++ b/jdk/src/solaris/classes/sun/awt/X11/keysym2ucs.h
@@ -649,7 +649,7 @@ SOFTWARE.
 0x0000 #define    XK_ISO_Last_Group                0xFE0E
 0x0000 #define    XK_ISO_Last_Group_Lock                0xFE0F
 
-0x0000 #define    XK_ISO_Left_Tab                    0xFE20
+0x0009 #define    XK_ISO_Left_Tab                    0xFE20
 0x0000 #define    XK_ISO_Move_Line_Up                0xFE21
 0x0000 #define    XK_ISO_Move_Line_Down                0xFE22
 0x0000 #define    XK_ISO_Partial_Line_Up                0xFE23
diff --git a/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java b/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
index c51f15eaec9..0d1b3099836 100644
--- a/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
+++ b/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
@@ -25,12 +25,14 @@
 
 package sun.net.www.protocol.jar;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.ZipFile;
+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.
@@ -41,13 +43,13 @@ import java.security.Permission;
 class JarFileFactory implements URLJarFile.URLJarFileCloseController {
 
     /* the url to file cache */
-    private static HashMap fileCache = new HashMap();
+    private static HashMap<String, JarFile> fileCache = new HashMap<String, JarFile>();
 
     /* the file to url cache */
-    private static HashMap urlCache = new HashMap();
+    private static HashMap<JarFile, URL> urlCache = new HashMap<JarFile, URL>();
 
     URLConnection getConnection(JarFile jarFile) throws IOException {
-        URL u = (URL)urlCache.get(jarFile);
+        URL u = urlCache.get(jarFile);
         if (u != null)
             return u.openConnection();
 
@@ -72,7 +74,7 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
                 synchronized (this) {
                     result = getCachedJarFile(url);
                     if (result == null) {
-                        fileCache.put(url, local_result);
+                        fileCache.put(URLUtil.urlNoFragString(url), local_result);
                         urlCache.put(local_result, url);
                         result = local_result;
                     } else {
@@ -97,15 +99,15 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
      * remove the JarFile from the cache
      */
     public void close(JarFile jarFile) {
-        URL urlRemoved = (URL) urlCache.remove(jarFile);
+        URL urlRemoved = urlCache.remove(jarFile);
         if( urlRemoved != null) {
-                fileCache.remove(urlRemoved);
+                fileCache.remove(URLUtil.urlNoFragString(urlRemoved));
         }
     }
 
 
     private JarFile getCachedJarFile(URL url) {
-        JarFile result = (JarFile)fileCache.get(url);
+        JarFile result = fileCache.get(URLUtil.urlNoFragString(url));
 
         /* if the JAR file is cached, the permission will always be there */
         if (result != null) {
diff --git a/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java b/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java
index a79cb731841..5618cd8fba0 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/EPollPort.java
@@ -248,12 +248,13 @@ final class EPollPort
         public void run() {
             Invoker.GroupAndInvokeCount myGroupAndInvokeCount =
                 Invoker.getGroupAndInvokeCount();
+            final boolean isPooledThread = (myGroupAndInvokeCount != null);
             boolean replaceMe = false;
             Event ev;
             try {
                 for (;;) {
                     // reset invoke count
-                    if (myGroupAndInvokeCount != null)
+                    if (isPooledThread)
                         myGroupAndInvokeCount.resetInvokeCount();
 
                     try {
@@ -289,7 +290,7 @@ final class EPollPort
 
                     // process event
                     try {
-                        ev.channel().onEvent(ev.events());
+                        ev.channel().onEvent(ev.events(), isPooledThread);
                     } catch (Error x) {
                         replaceMe = true; throw x;
                     } catch (RuntimeException x) {
diff --git a/jdk/src/solaris/classes/sun/nio/ch/Port.java b/jdk/src/solaris/classes/sun/nio/ch/Port.java
index 8b19637bc2a..db623265b2b 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/Port.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/Port.java
@@ -49,7 +49,7 @@ abstract class Port extends AsynchronousChannelGroupImpl {
      * Implemented by clients registered with this port.
      */
     interface PollableChannel extends Closeable {
-        void onEvent(int events);
+        void onEvent(int events, boolean mayInvokeDirect);
     }
 
     // maps fd to "pollable" channel
@@ -121,7 +121,7 @@ abstract class Port extends AsynchronousChannelGroupImpl {
     final Object attachForeignChannel(final Channel channel, FileDescriptor fd) {
         int fdVal = IOUtil.fdVal(fd);
         register(fdVal, new PollableChannel() {
-            public void onEvent(int events) { }
+            public void onEvent(int events, boolean mayInvokeDirect) { }
             public void close() throws IOException {
                 channel.close();
             }
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java
index 366ccc52cec..d7842570a2c 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java
@@ -127,8 +127,6 @@ public class SctpChannelImpl extends SctpChannel
 
     /* -- End of fields protected by stateLock -- */
 
-    private SctpResultContainer commUpResultContainer;  /* null */
-
     /**
      * Constructor for normal connecting sockets
      */
@@ -761,12 +759,6 @@ public class SctpChannelImpl extends SctpChannel
                     if (!ensureReceiveOpen())
                         return null;
 
-                    if (commUpResultContainer != null) {
-                        resultContainer = commUpResultContainer;
-                        commUpResultContainer = null;
-                        continue;
-                    }
-
                     int n = 0;
                     try {
                         begin();
@@ -778,7 +770,7 @@ public class SctpChannelImpl extends SctpChannel
                         }
 
                         do {
-                            n = receive(fdVal, buffer, resultContainer);
+                            n = receive(fdVal, buffer, resultContainer, fromConnect);
                         } while ((n == IOStatus.INTERRUPTED) && isOpen());
                     } finally {
                         receiverCleanup();
@@ -809,9 +801,9 @@ public class SctpChannelImpl extends SctpChannel
 
                     if (fromConnect)  {
                         /* If we reach here, then it was connect that invoked
-                         * receive an received the COMM_UP. Save it and allow
-                         * the user handler to process it upon next receive. */
-                        commUpResultContainer = resultContainer;
+                         * receive and received the COMM_UP. We have already
+                         * handled the COMM_UP with the internal notification
+                         * handler. Simply return. */
                         return null;
                     }
                 }  /* receiveLock */
@@ -827,20 +819,21 @@ public class SctpChannelImpl extends SctpChannel
 
     private int receive(int fd,
                         ByteBuffer dst,
-                        SctpResultContainer resultContainer)
+                        SctpResultContainer resultContainer,
+                        boolean peek)
             throws IOException {
         int pos = dst.position();
         int lim = dst.limit();
         assert (pos <= lim);
         int rem = (pos <= lim ? lim - pos : 0);
         if (dst instanceof DirectBuffer && rem > 0)
-            return receiveIntoNativeBuffer(fd, resultContainer, dst, rem, pos);
+            return receiveIntoNativeBuffer(fd, resultContainer, dst, rem, pos, peek);
 
         /* Substitute a native buffer */
         int newSize = Math.max(rem, 1);
         ByteBuffer bb = Util.getTemporaryDirectBuffer(newSize);
         try {
-            int n = receiveIntoNativeBuffer(fd, resultContainer, bb, newSize, 0);
+            int n = receiveIntoNativeBuffer(fd, resultContainer, bb, newSize, 0, peek);
             bb.flip();
             if (n > 0 && rem > 0)
                 dst.put(bb);
@@ -854,10 +847,11 @@ public class SctpChannelImpl extends SctpChannel
                                         SctpResultContainer resultContainer,
                                         ByteBuffer bb,
                                         int rem,
-                                        int pos)
+                                        int pos,
+                                        boolean peek)
         throws IOException
     {
-        int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem);
+        int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem, peek);
 
         if (n > 0)
             bb.position(pos + n);
@@ -1089,7 +1083,7 @@ public class SctpChannelImpl extends SctpChannel
     private static native void initIDs();
 
     static native int receive0(int fd, SctpResultContainer resultContainer,
-            long address, int length) throws IOException;
+            long address, int length, boolean peek) throws IOException;
 
     static native int send0(int fd, long address, int length,
             SocketAddress target, int assocId, int streamNumber,
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java
index 555ce0e5971..b8457fdba27 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java
@@ -31,6 +31,8 @@ import java.net.InetSocketAddress;
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.util.Collections;
+import java.util.Map.Entry;
+import java.util.Iterator;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.HashMap;
@@ -702,7 +704,7 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
             int assocId = association.associationID();
             Set<SocketAddress> addresses = null;
 
-            try {
+             try {
                 addresses = SctpNet.getRemoteAddresses(fdVal, assocId);
             } catch (IOException unused) {
                 /* OK, determining connected addresses may not be possible
@@ -723,9 +725,11 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
                 /* We cannot determine the connected addresses */
                 Set<java.util.Map.Entry<SocketAddress, Association>> addrAssocs =
                         addressMap.entrySet();
-                for (java.util.Map.Entry<SocketAddress, Association> entry : addrAssocs) {
+                Iterator<Entry<SocketAddress, Association>> iterator = addrAssocs.iterator();
+                while (iterator.hasNext()) {
+                    Entry<SocketAddress, Association> entry = iterator.next();
                     if (entry.getValue().equals(association)) {
-                        addressMap.remove(entry.getKey());
+                        iterator.remove();
                     }
                 }
             }
@@ -957,7 +961,7 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
                                 int length)
             throws IOException{
         return SctpChannelImpl.receive0(fd, resultContainer, address,
-                length);
+                length, false /*peek */);
     }
 
     private static int send0(int fd,
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java b/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java
index 908eecce024..1df7a0ba044 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java
@@ -151,12 +151,13 @@ class SolarisEventPort
         public void run() {
             Invoker.GroupAndInvokeCount myGroupAndInvokeCount =
                 Invoker.getGroupAndInvokeCount();
+            final boolean isPooledThread = (myGroupAndInvokeCount != null);
             boolean replaceMe = false;
             long address = unsafe.allocateMemory(SIZEOF_PORT_EVENT);
             try {
                 for (;;) {
                     // reset invoke count
-                    if (myGroupAndInvokeCount != null)
+                    if (isPooledThread)
                         myGroupAndInvokeCount.resetInvokeCount();
 
                     // wait for I/O completion event
@@ -205,7 +206,7 @@ class SolarisEventPort
                     if (ch != null) {
                         replaceMe = true;
                         // no need to translate events
-                        ch.onEvent(events);
+                        ch.onEvent(events, isPooledThread);
                     }
                 }
             } finally {
diff --git a/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
index 1a8c92352d2..15fab5e1812 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
@@ -59,10 +59,13 @@ class UnixAsynchronousServerSocketChannelImpl
     private final Object updateLock = new Object();
 
     // pending accept
-    private PendingFuture<AsynchronousSocketChannel,Object> pendingAccept;
+    private boolean acceptPending;
+    private CompletionHandler<AsynchronousSocketChannel,Object> acceptHandler;
+    private Object acceptAttachment;
+    private PendingFuture<AsynchronousSocketChannel,Object> acceptFuture;
 
     // context for permission check when security manager set
-    private AccessControlContext acc;
+    private AccessControlContext acceptAcc;
 
 
     UnixAsynchronousServerSocketChannelImpl(Port port)
@@ -83,15 +86,6 @@ class UnixAsynchronousServerSocketChannelImpl
         port.register(fdVal, this);
     }
 
-    // returns and clears the result of a pending accept
-    private PendingFuture<AsynchronousSocketChannel,Object> grabPendingAccept() {
-        synchronized (updateLock) {
-            PendingFuture<AsynchronousSocketChannel,Object> result = pendingAccept;
-            pendingAccept = null;
-            return result;
-        }
-    }
-
     @Override
     void implClose() throws IOException {
         // remove the mapping
@@ -101,17 +95,27 @@ class UnixAsynchronousServerSocketChannelImpl
         nd.close(fd);
 
         // if there is a pending accept then complete it
-        final PendingFuture<AsynchronousSocketChannel,Object> result =
-            grabPendingAccept();
-        if (result != null) {
-            // discard the stack trace as otherwise it may appear that implClose
-            // has thrown the exception.
-            AsynchronousCloseException x = new AsynchronousCloseException();
-            x.setStackTrace(new StackTraceElement[0]);
-            result.setFailure(x);
+        CompletionHandler<AsynchronousSocketChannel,Object> handler;
+        Object att;
+        PendingFuture<AsynchronousSocketChannel,Object> future;
+        synchronized (updateLock) {
+            if (!acceptPending)
+                return;  // no pending accept
+            acceptPending = false;
+            handler = acceptHandler;
+            att = acceptAttachment;
+            future = acceptFuture;
+        }
 
+        // discard the stack trace as otherwise it may appear that implClose
+        // has thrown the exception.
+        AsynchronousCloseException x = new AsynchronousCloseException();
+        x.setStackTrace(new StackTraceElement[0]);
+        if (handler == null) {
+            future.setFailure(x);
+        } else {
             // invoke by submitting task rather than directly
-            Invoker.invokeIndirectly(result.handler(), result);
+            Invoker.invokeIndirectly(this, handler, att, null, x);
         }
     }
 
@@ -124,15 +128,17 @@ class UnixAsynchronousServerSocketChannelImpl
      * Invoked by event handling thread when listener socket is polled
      */
     @Override
-    public void onEvent(int events) {
-        PendingFuture<AsynchronousSocketChannel,Object> result = grabPendingAccept();
-        if (result == null)
-            return; // may have been grabbed by asynchronous close
+    public void onEvent(int events, boolean mayInvokeDirect) {
+        synchronized (updateLock) {
+            if (!acceptPending)
+                return;  // may have been grabbed by asynchronous close
+            acceptPending = false;
+        }
 
         // attempt to accept connection
         FileDescriptor newfd = new FileDescriptor();
         InetSocketAddress[] isaa = new InetSocketAddress[1];
-        boolean accepted = false;
+        Throwable exc = null;
         try {
             begin();
             int n = accept0(this.fd, newfd, isaa);
@@ -140,49 +146,52 @@ class UnixAsynchronousServerSocketChannelImpl
             // spurious wakeup, is this possible?
             if (n == IOStatus.UNAVAILABLE) {
                 synchronized (updateLock) {
-                    this.pendingAccept = result;
+                    acceptPending = true;
                 }
                 port.startPoll(fdVal, Port.POLLIN);
                 return;
             }
 
-            // connection accepted
-            accepted = true;
-
         } catch (Throwable x) {
             if (x instanceof ClosedChannelException)
                 x = new AsynchronousCloseException();
-            enableAccept();
-            result.setFailure(x);
+            exc = x;
         } finally {
             end();
         }
 
         // Connection accepted so finish it when not holding locks.
         AsynchronousSocketChannel child = null;
-        if (accepted) {
+        if (exc == null) {
             try {
-                child = finishAccept(newfd, isaa[0], acc);
-                enableAccept();
-                result.setResult(child);
+                child = finishAccept(newfd, isaa[0], acceptAcc);
             } catch (Throwable x) {
-                enableAccept();
                 if (!(x instanceof IOException) && !(x instanceof SecurityException))
                     x = new IOException(x);
-                result.setFailure(x);
+                exc = x;
             }
         }
 
-        // if an async cancel has already cancelled the operation then
-        // close the new channel so as to free resources
-        if (child != null && result.isCancelled()) {
-            try {
-                child.close();
-            } catch (IOException ignore) { }
-        }
+        // copy field befores accept is re-renabled
+        CompletionHandler<AsynchronousSocketChannel,Object> handler = acceptHandler;
+        Object att = acceptAttachment;
+        PendingFuture<AsynchronousSocketChannel,Object> future = acceptFuture;
 
-        // invoke the handler
-        Invoker.invoke(result.handler(), result);
+        // re-enable accepting and invoke handler
+        enableAccept();
+
+        if (handler == null) {
+            future.setResult(child, exc);
+            // if an async cancel has already cancelled the operation then
+            // close the new channel so as to free resources
+            if (child != null && future.isCancelled()) {
+                try {
+                    child.close();
+                } catch (IOException ignore) { }
+            }
+        } else {
+            Invoker.invoke(this, handler, att, child, exc);
+        }
     }
 
     /**
@@ -234,16 +243,18 @@ class UnixAsynchronousServerSocketChannelImpl
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public <A> Future<AsynchronousSocketChannel> accept(A attachment,
-        final CompletionHandler<AsynchronousSocketChannel,? super A> handler)
+    Future<AsynchronousSocketChannel> implAccept(Object att,
+        CompletionHandler<AsynchronousSocketChannel,Object> handler)
     {
         // complete immediately if channel is closed
         if (!isOpen()) {
-            CompletedFuture<AsynchronousSocketChannel,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invokeIndirectly(handler, result);
-            return result;
+            Throwable e = new ClosedChannelException();
+            if (handler == null) {
+                return CompletedFuture.withFailure(e);
+            } else {
+                Invoker.invoke(this, handler, att, null, e);
+                return null;
+            }
         }
         if (localAddress == null)
             throw new NotYetBoundException();
@@ -258,25 +269,31 @@ class UnixAsynchronousServerSocketChannelImpl
             throw new AcceptPendingException();
 
         // attempt accept
-        AbstractFuture<AsynchronousSocketChannel,A> result = null;
         FileDescriptor newfd = new FileDescriptor();
         InetSocketAddress[] isaa = new InetSocketAddress[1];
+        Throwable exc = null;
         try {
             begin();
 
             int n = accept0(this.fd, newfd, isaa);
             if (n == IOStatus.UNAVAILABLE) {
-                // no connection to accept
-                result = new PendingFuture<AsynchronousSocketChannel,A>(this, handler, attachment);
 
                 // 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
-                synchronized (this) {
-                    this.acc = (System.getSecurityManager() == null) ?
+                PendingFuture<AsynchronousSocketChannel,Object> result = null;
+                synchronized (updateLock) {
+                    if (handler == null) {
+                        this.acceptHandler = null;
+                        result = new PendingFuture<AsynchronousSocketChannel,Object>(this);
+                        this.acceptFuture = result;
+                    } else {
+                        this.acceptHandler = handler;
+                        this.acceptAttachment = att;
+                    }
+                    this.acceptAcc = (System.getSecurityManager() == null) ?
                         null : AccessController.getContext();
-                    this.pendingAccept =
-                        (PendingFuture<AsynchronousSocketChannel,Object>)result;
+                    this.acceptPending = true;
                 }
 
                 // register for connections
@@ -287,25 +304,30 @@ class UnixAsynchronousServerSocketChannelImpl
             // accept failed
             if (x instanceof ClosedChannelException)
                 x = new AsynchronousCloseException();
-            result = CompletedFuture.withFailure(this, x, attachment);
+            exc = x;
         } finally {
             end();
         }
 
-        // connection accepted immediately
-        if (result == null) {
+        AsynchronousSocketChannel child = null;
+        if (exc == null) {
+            // connection accepted immediately
             try {
-                AsynchronousSocketChannel ch = finishAccept(newfd, isaa[0], null);
-                result = CompletedFuture.withResult(this, ch, attachment);
+                child = finishAccept(newfd, isaa[0], null);
             } catch (Throwable x) {
-                result = CompletedFuture.withFailure(this, x, attachment);
+                exc = x;
             }
         }
 
-        // re-enable accepting and invoke handler
+        // re-enable accepting before invoking handler
         enableAccept();
-        Invoker.invokeIndirectly(handler, result);
-        return result;
+
+        if (handler == null) {
+            return CompletedFuture.withResult(child, exc);
+        } else {
+            Invoker.invokeIndirectly(this, handler, att, child, exc);
+            return null;
+        }
     }
 
     // -- Native methods --
diff --git a/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
index e80f202bdff..536b0e2ca83 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
@@ -61,20 +61,33 @@ class UnixAsynchronousSocketChannelImpl
     private final Object updateLock = new Object();
 
     // pending connect (updateLock)
-    private PendingFuture<Void,Object> pendingConnect;
+    private boolean connectPending;
+    private CompletionHandler<Void,Object> connectHandler;
+    private Object connectAttachment;
+    private PendingFuture<Void,Object> connectFuture;
 
-    // pending remote address (statLock)
+    // pending remote address (stateLock)
     private SocketAddress pendingRemote;
 
     // pending read (updateLock)
+    private boolean readPending;
+    private boolean isScatteringRead;
+    private ByteBuffer readBuffer;
     private ByteBuffer[] readBuffers;
-    private boolean scatteringRead;
-    private PendingFuture<Number,Object> pendingRead;
+    private CompletionHandler<Number,Object> readHandler;
+    private Object readAttachment;
+    private PendingFuture<Number,Object> readFuture;
+    private Future<?> readTimer;
 
     // pending write (updateLock)
+    private boolean writePending;
+    private boolean isGatheringWrite;
+    private ByteBuffer writeBuffer;
     private ByteBuffer[] writeBuffers;
-    private boolean gatheringWrite;
-    private PendingFuture<Number,Object> pendingWrite;
+    private CompletionHandler<Number,Object> writeHandler;
+    private Object writeAttachment;
+    private PendingFuture<Number,Object> writeFuture;
+    private Future<?> writeTimer;
 
 
     UnixAsynchronousSocketChannelImpl(Port port)
@@ -128,43 +141,36 @@ class UnixAsynchronousSocketChannelImpl
     private void updateEvents() {
         assert Thread.holdsLock(updateLock);
         int events = 0;
-        if (pendingRead != null)
+        if (readPending)
             events |= Port.POLLIN;
-        if (pendingConnect != null || pendingWrite != null)
+        if (connectPending || writePending)
             events |= Port.POLLOUT;
         if (events != 0)
             port.startPoll(fdVal, events);
     }
 
-    /**
-     * Invoked by event handler thread when file descriptor is polled
-     */
-    @Override
-    public void onEvent(int events) {
-        boolean readable = (events & Port.POLLIN) > 0;
-        boolean writable = (events & Port.POLLOUT) > 0;
-        if ((events & (Port.POLLERR | Port.POLLHUP)) > 0) {
-            readable = true;
-            writable = true;
-        }
-
-        PendingFuture<Void,Object> connectResult = null;
-        PendingFuture<Number,Object> readResult = null;
-        PendingFuture<Number,Object> writeResult = null;
+    // invoke to finish read and/or write operations
+    private void finish(boolean mayInvokeDirect,
+                        boolean readable,
+                        boolean writable)
+    {
+        boolean finishRead = false;
+        boolean finishWrite = false;
+        boolean finishConnect = false;
 
         // map event to pending result
         synchronized (updateLock) {
-            if (readable && (pendingRead != null)) {
-                readResult = pendingRead;
-                pendingRead = null;
+            if (readable && this.readPending) {
+                this.readPending = false;
+                finishRead = true;
             }
             if (writable) {
-                if (pendingWrite != null) {
-                    writeResult = pendingWrite;
-                    pendingWrite = null;
-                } else if (pendingConnect != null) {
-                    connectResult = pendingConnect;
-                    pendingConnect = null;
+                if (this.writePending) {
+                    this.writePending = false;
+                    finishWrite = true;
+                } else if (this.connectPending) {
+                    this.connectPending = false;
+                    finishConnect = true;
                 }
             }
         }
@@ -172,36 +178,32 @@ class UnixAsynchronousSocketChannelImpl
         // complete the I/O operation. Special case for when channel is
         // ready for both reading and writing. In that case, submit task to
         // complete write if write operation has a completion handler.
-        if (readResult != null) {
-            if (writeResult != null)
-                finishWrite(writeResult, false);
-            finishRead(readResult, true);
+        if (finishRead) {
+            if (finishWrite)
+                finishWrite(false);
+            finishRead(mayInvokeDirect);
             return;
         }
-        if (writeResult != null) {
-            finishWrite(writeResult, true);
+        if (finishWrite) {
+            finishWrite(mayInvokeDirect);
         }
-        if (connectResult != null) {
-            finishConnect(connectResult, true);
+        if (finishConnect) {
+            finishConnect(mayInvokeDirect);
         }
     }
 
-    // returns and clears the result of a pending read
-    PendingFuture<Number,Object> grabPendingRead() {
-        synchronized (updateLock) {
-            PendingFuture<Number,Object> result = pendingRead;
-            pendingRead = null;
-            return result;
-        }
-    }
-
-    // returns and clears the result of a pending write
-    PendingFuture<Number,Object> grabPendingWrite() {
-        synchronized (updateLock) {
-            PendingFuture<Number,Object> result = pendingWrite;
-            pendingWrite = null;
-            return result;
+    /**
+     * Invoked by event handler thread when file descriptor is polled
+     */
+    @Override
+    public void onEvent(int events, boolean mayInvokeDirect) {
+        boolean readable = (events & Port.POLLIN) > 0;
+        boolean writable = (events & Port.POLLOUT) > 0;
+        if ((events & (Port.POLLERR | Port.POLLHUP)) > 0) {
+            readable = true;
+            writable = true;
         }
+        finish(mayInvokeDirect, readable, writable);
     }
 
     @Override
@@ -213,26 +215,7 @@ class UnixAsynchronousSocketChannelImpl
         nd.close(fd);
 
         // All outstanding I/O operations are required to fail
-        final PendingFuture<Void,Object> readyToConnect;
-        final PendingFuture<Number,Object> readyToRead;
-        final PendingFuture<Number,Object> readyToWrite;
-        synchronized (updateLock) {
-            readyToConnect = pendingConnect;
-            pendingConnect = null;
-            readyToRead = pendingRead;
-            pendingRead = null;
-            readyToWrite = pendingWrite;
-            pendingWrite = null;
-        }
-        if (readyToConnect != null) {
-            finishConnect(readyToConnect, false);
-        }
-        if (readyToRead != null) {
-            finishRead(readyToRead, false);
-        }
-        if (readyToWrite != null) {
-            finishWrite(readyToWrite, false);
-        }
+        finish(false, true, true);
     }
 
     @Override
@@ -240,9 +223,9 @@ class UnixAsynchronousSocketChannelImpl
         if (task.getContext() == OpType.CONNECT)
             killConnect();
         if (task.getContext() == OpType.READ)
-            killConnect();
+            killReading();
         if (task.getContext() == OpType.WRITE)
-            killConnect();
+            killWriting();
     }
 
     // -- connect --
@@ -255,15 +238,12 @@ class UnixAsynchronousSocketChannelImpl
         }
     }
 
-    private void finishConnect(PendingFuture<Void,Object> result,
-                               boolean invokeDirect)
-    {
+    private void finishConnect(boolean mayInvokeDirect) {
         Throwable e = null;
         try {
             begin();
             checkConnect(fdVal);
             setConnected();
-            result.setResult(null);
         } catch (Throwable x) {
             if (x instanceof ClosedChannelException)
                 x = new AsynchronousCloseException();
@@ -276,26 +256,38 @@ class UnixAsynchronousSocketChannelImpl
             try {
                 close();
             } catch (IOException ignore) { }
-            result.setFailure(e);
         }
-        if (invokeDirect) {
-            Invoker.invoke(result.handler(), result);
+
+
+        // invoke handler and set result
+        CompletionHandler<Void,Object> handler = connectHandler;
+        Object att = connectAttachment;
+        PendingFuture<Void,Object> future = connectFuture;
+        if (handler == null) {
+            future.setResult(null, e);
         } else {
-            Invoker.invokeIndirectly(result.handler(), result);
+            if (mayInvokeDirect) {
+                Invoker.invokeUnchecked(handler, att, null, e);
+            } else {
+                Invoker.invokeIndirectly(this, handler, att, null, e);
+            }
         }
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public <A> Future<Void> connect(SocketAddress remote,
-                                    A attachment,
-                                    CompletionHandler<Void,? super A> handler)
+    <A> Future<Void> implConnect(SocketAddress remote,
+                                 A attachment,
+                                 CompletionHandler<Void,? super A> handler)
     {
         if (!isOpen()) {
-            CompletedFuture<Void,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            Throwable e = new ClosedChannelException();
+            if (handler == null) {
+                return CompletedFuture.withFailure(e);
+            } else {
+                Invoker.invoke(this, handler, attachment, null, e);
+                return null;
+            }
         }
 
         InetSocketAddress isa = Net.checkAddress(remote);
@@ -317,7 +309,6 @@ class UnixAsynchronousSocketChannelImpl
             notifyBeforeTcpConnect = (localAddress == null);
         }
 
-        AbstractFuture<Void,A> result = null;
         Throwable e = null;
         try {
             begin();
@@ -327,15 +318,21 @@ class UnixAsynchronousSocketChannelImpl
             int n = Net.connect(fd, isa.getAddress(), isa.getPort());
             if (n == IOStatus.UNAVAILABLE) {
                 // connection could not be established immediately
-                result = new PendingFuture<Void,A>(this, handler, attachment, OpType.CONNECT);
+                PendingFuture<Void,A> result = null;
                 synchronized (updateLock) {
-                    this.pendingConnect = (PendingFuture<Void,Object>)result;
+                    if (handler == null) {
+                        result = new PendingFuture<Void,A>(this, OpType.CONNECT);
+                        this.connectFuture = (PendingFuture<Void,Object>)result;
+                    } else {
+                        this.connectHandler = (CompletionHandler<Void,Object>)handler;
+                        this.connectAttachment = attachment;
+                    }
+                    this.connectPending = true;
                     updateEvents();
                 }
                 return result;
             }
             setConnected();
-            result = CompletedFuture.withResult(this, null, attachment);
         } catch (Throwable x) {
             if (x instanceof ClosedChannelException)
                 x = new AsynchronousCloseException();
@@ -349,84 +346,111 @@ class UnixAsynchronousSocketChannelImpl
             try {
                 close();
             } catch (IOException ignore) { }
-            result = CompletedFuture.withFailure(this, e, attachment);
         }
-
-        Invoker.invoke(handler, result);
-        return result;
+        if (handler == null) {
+            return CompletedFuture.withResult(null, e);
+        } else {
+            Invoker.invoke(this, handler, attachment, null, e);
+            return null;
+        }
     }
 
     // -- read --
 
-    @SuppressWarnings("unchecked")
-    private void finishRead(PendingFuture<Number,Object> result,
-                            boolean invokeDirect)
-    {
+    private void finishRead(boolean mayInvokeDirect) {
         int n = -1;
-        PendingFuture<Number,Object> pending = null;
+        Throwable exc = null;
+
+        // copy fields as we can't access them after reading is re-enabled.
+        boolean scattering = isScatteringRead;
+        CompletionHandler<Number,Object> handler = readHandler;
+        Object att = readAttachment;
+        PendingFuture<Number,Object> future = readFuture;
+        Future<?> timeout = readTimer;
+
         try {
             begin();
 
-            ByteBuffer[] dsts = readBuffers;
-            if (dsts.length == 1) {
-                n = IOUtil.read(fd, dsts[0], -1, nd, null);
+            if (scattering) {
+                n = (int)IOUtil.read(fd, readBuffers, nd);
             } else {
-                n = (int)IOUtil.read(fd, dsts, nd);
+                n = IOUtil.read(fd, readBuffer, -1, nd, null);
             }
             if (n == IOStatus.UNAVAILABLE) {
                 // spurious wakeup, is this possible?
-                pending = result;
+                synchronized (updateLock) {
+                    readPending = true;
+                }
                 return;
             }
 
-            // allow buffer(s) to be GC'ed.
-            readBuffers = null;
+            // allow objects to be GC'ed.
+            this.readBuffer = null;
+            this.readBuffers = null;
+            this.readAttachment = null;
 
             // allow another read to be initiated
-            boolean wasScatteringRead = scatteringRead;
             enableReading();
 
-            // result is Integer or Long
-            if (wasScatteringRead) {
-                result.setResult(Long.valueOf(n));
-            } else {
-                result.setResult(Integer.valueOf(n));
-            }
-
         } catch (Throwable x) {
             enableReading();
             if (x instanceof ClosedChannelException)
                 x = new AsynchronousCloseException();
-            result.setFailure(x);
+            exc = x;
         } finally {
             // restart poll in case of concurrent write
             synchronized (updateLock) {
-                if (pending != null)
-                    this.pendingRead = pending;
                 updateEvents();
             }
             end();
         }
 
-        if (invokeDirect) {
-            Invoker.invoke(result.handler(), result);
+        // cancel the associated timer
+        if (timeout != null)
+            timeout.cancel(false);
+
+        // create result
+        Number result = (exc != null) ? null : (scattering) ?
+            (Number)Long.valueOf(n) : (Number)Integer.valueOf(n);
+
+        // invoke handler or set result
+        if (handler == null) {
+            future.setResult(result, exc);
         } else {
-            Invoker.invokeIndirectly(result.handler(), result);
+            if (mayInvokeDirect) {
+                Invoker.invokeUnchecked(handler, att, result, exc);
+            } else {
+                Invoker.invokeIndirectly(this, handler, att, result, exc);
+            }
         }
     }
 
     private Runnable readTimeoutTask = new Runnable() {
         public void run() {
-            PendingFuture<Number,Object> result = grabPendingRead();
-            if (result == null)
-                return;     // already completed
+            CompletionHandler<Number,Object> handler = null;
+            Object att = null;
+            PendingFuture<Number,Object> future = null;
+
+            synchronized (updateLock) {
+                if (!readPending)
+                    return;
+                readPending = false;
+                handler = readHandler;
+                att = readAttachment;
+                future = readFuture;
+            }
 
             // kill further reading before releasing waiters
             enableReading(true);
 
-            // set completed and invoke handler
-            result.setFailure(new InterruptedByTimeoutException());
-            Invoker.invokeIndirectly(result.handler(), result);
+            // invoke handler or set result
+            Exception exc = new InterruptedByTimeoutException();
+            if (handler == null) {
+                future.setFailure(exc);
+            } else {
+                AsynchronousChannel ch = UnixAsynchronousSocketChannelImpl.this;
+                Invoker.invokeIndirectly(ch, handler, att, null, exc);
+            }
         }
     };
 
@@ -435,8 +459,9 @@ class UnixAsynchronousSocketChannelImpl
      */
     @Override
     @SuppressWarnings("unchecked")
-    <V extends Number,A> Future<V> readImpl(ByteBuffer[] dsts,
-                                            boolean isScatteringRead,
+    <V extends Number,A> Future<V> implRead(boolean isScatteringRead,
+                                            ByteBuffer dst,
+                                            ByteBuffer[] dsts,
                                             long timeout,
                                             TimeUnit unit,
                                             A attachment,
@@ -450,144 +475,178 @@ class UnixAsynchronousSocketChannelImpl
         boolean invokeDirect = false;
         boolean attemptRead = false;
         if (!disableSynchronousRead) {
-            myGroupAndInvokeCount = Invoker.getGroupAndInvokeCount();
-            invokeDirect = Invoker.mayInvokeDirect(myGroupAndInvokeCount, port);
-            attemptRead = (handler == null) || invokeDirect ||
-                !port.isFixedThreadPool();  // okay to attempt read with user thread pool
+            if (handler == null) {
+                attemptRead = true;
+            } else {
+                myGroupAndInvokeCount = Invoker.getGroupAndInvokeCount();
+                invokeDirect = Invoker.mayInvokeDirect(myGroupAndInvokeCount, port);
+                // okay to attempt read with user thread pool
+                attemptRead = invokeDirect || !port.isFixedThreadPool();
+            }
         }
 
-        AbstractFuture<V,A> result;
+        int n = IOStatus.UNAVAILABLE;
+        Throwable exc = null;
+        boolean pending = false;
+
         try {
             begin();
 
-            int n;
             if (attemptRead) {
                 if (isScatteringRead) {
                     n = (int)IOUtil.read(fd, dsts, nd);
                 } else {
-                    n = IOUtil.read(fd, dsts[0], -1, nd, null);
+                    n = IOUtil.read(fd, dst, -1, nd, null);
                 }
-            } else {
-                n = IOStatus.UNAVAILABLE;
             }
 
             if (n == IOStatus.UNAVAILABLE) {
-                result = new PendingFuture<V,A>(this, handler, attachment, OpType.READ);
-
-                // update evetns so that read will complete asynchronously
+                PendingFuture<V,A> result = null;
                 synchronized (updateLock) {
+                    this.isScatteringRead = isScatteringRead;
+                    this.readBuffer = dst;
                     this.readBuffers = dsts;
-                    this.scatteringRead = isScatteringRead;
-                    this.pendingRead = (PendingFuture<Number,Object>)result;
+                    if (handler == null) {
+                        this.readHandler = null;
+                        result = new PendingFuture<V,A>(this, OpType.READ);
+                        this.readFuture = (PendingFuture<Number,Object>)result;
+                        this.readAttachment = null;
+                    } else {
+                        this.readHandler = (CompletionHandler<Number,Object>)handler;
+                        this.readAttachment = attachment;
+                        this.readFuture = null;
+                    }
+                    if (timeout > 0L) {
+                        this.readTimer = port.schedule(readTimeoutTask, timeout, unit);
+                    }
+                    this.readPending = true;
                     updateEvents();
                 }
-
-                // schedule timeout
-                if (timeout > 0L) {
-                    Future<?> timeoutTask =
-                        port.schedule(readTimeoutTask, timeout, unit);
-                    ((PendingFuture<V,A>)result).setTimeoutTask(timeoutTask);
-                }
+                pending = true;
                 return result;
             }
-
-            // data available
-            enableReading();
-
-            // result type is Long or Integer
-            if (isScatteringRead) {
-                result = (CompletedFuture<V,A>)CompletedFuture
-                    .withResult(this, Long.valueOf(n), attachment);
-            } else {
-                result = (CompletedFuture<V,A>)CompletedFuture
-                    .withResult(this, Integer.valueOf(n), attachment);
-            }
         } catch (Throwable x) {
-            enableReading();
             if (x instanceof ClosedChannelException)
                 x = new AsynchronousCloseException();
-            result = CompletedFuture.withFailure(this, x, attachment);
+            exc = x;
         } finally {
+            if (!pending)
+                enableReading();
             end();
         }
 
-        if (invokeDirect) {
-            Invoker.invokeDirect(myGroupAndInvokeCount, handler, result);
+        Number result = (exc != null) ? null : (isScatteringRead) ?
+            (Number)Long.valueOf(n) : (Number)Integer.valueOf(n);
+
+        // read completed immediately
+        if (handler != null) {
+            if (invokeDirect) {
+                Invoker.invokeDirect(myGroupAndInvokeCount, handler, attachment, (V)result, exc);
+            } else {
+                Invoker.invokeIndirectly(this, handler, attachment, (V)result, exc);
+            }
+            return null;
         } else {
-            Invoker.invokeIndirectly(handler, result);
+            return CompletedFuture.withResult((V)result, exc);
         }
-        return result;
     }
 
     // -- write --
 
-    private void finishWrite(PendingFuture<Number,Object> result,
-                             boolean invokeDirect)
-    {
-        PendingFuture<Number,Object> pending = null;
+    private void finishWrite(boolean mayInvokeDirect) {
+        int n = -1;
+        Throwable exc = null;
+
+        // copy fields as we can't access them after reading is re-enabled.
+        boolean gathering = this.isGatheringWrite;
+        CompletionHandler<Number,Object> handler = this.writeHandler;
+        Object att = this.writeAttachment;
+        PendingFuture<Number,Object> future = this.writeFuture;
+        Future<?> timer = this.writeTimer;
+
         try {
             begin();
 
-            ByteBuffer[] srcs = writeBuffers;
-            int n;
-            if (srcs.length == 1) {
-                n = IOUtil.write(fd, srcs[0], -1, nd, null);
+            if (gathering) {
+                n = (int)IOUtil.write(fd, writeBuffers, nd);
             } else {
-                n = (int)IOUtil.write(fd, srcs, nd);
+                n = IOUtil.write(fd, writeBuffer, -1, nd, null);
             }
             if (n == IOStatus.UNAVAILABLE) {
                 // spurious wakeup, is this possible?
-                pending = result;
+                synchronized (updateLock) {
+                    writePending = true;
+                }
                 return;
             }
 
-            // allow buffer(s) to be GC'ed.
-            writeBuffers = null;
+            // allow objects to be GC'ed.
+            this.writeBuffer = null;
+            this.writeBuffers = null;
+            this.writeAttachment = null;
 
             // allow another write to be initiated
-            boolean wasGatheringWrite = gatheringWrite;
             enableWriting();
 
-            // result is a Long or Integer
-            if (wasGatheringWrite) {
-                result.setResult(Long.valueOf(n));
-            } else {
-                result.setResult(Integer.valueOf(n));
-            }
-
         } catch (Throwable x) {
             enableWriting();
             if (x instanceof ClosedChannelException)
                 x = new AsynchronousCloseException();
-            result.setFailure(x);
+            exc = x;
         } finally {
-            // restart poll in case of concurrent read
-            synchronized (this) {
-                if (pending != null)
-                    this.pendingWrite = pending;
+            // restart poll in case of concurrent write
+            synchronized (updateLock) {
                 updateEvents();
             }
             end();
         }
-        if (invokeDirect) {
-            Invoker.invoke(result.handler(), result);
+
+        // cancel the associated timer
+        if (timer != null)
+            timer.cancel(false);
+
+        // create result
+        Number result = (exc != null) ? null : (gathering) ?
+            (Number)Long.valueOf(n) : (Number)Integer.valueOf(n);
+
+        // invoke handler or set result
+        if (handler == null) {
+            future.setResult(result, exc);
         } else {
-            Invoker.invokeIndirectly(result.handler(), result);
+            if (mayInvokeDirect) {
+                Invoker.invokeUnchecked(handler, att, result, exc);
+            } else {
+                Invoker.invokeIndirectly(this, handler, att, result, exc);
+            }
         }
     }
 
     private Runnable writeTimeoutTask = new Runnable() {
         public void run() {
-            PendingFuture<Number,Object> result = grabPendingWrite();
-            if (result == null)
-                return;     // already completed
+            CompletionHandler<Number,Object> handler = null;
+            Object att = null;
+            PendingFuture<Number,Object> future = null;
+
+            synchronized (updateLock) {
+                if (!writePending)
+                    return;
+                writePending = false;
+                handler = writeHandler;
+                att = writeAttachment;
+                future = writeFuture;
+            }
 
             // kill further writing before releasing waiters
             enableWriting(true);
 
-            // set completed and invoke handler
-            result.setFailure(new InterruptedByTimeoutException());
-            Invoker.invokeIndirectly(result.handler(), result);
+            // invoke handler or set result
+            Exception exc = new InterruptedByTimeoutException();
+            if (handler != null) {
+                Invoker.invokeIndirectly(UnixAsynchronousSocketChannelImpl.this,
+                    handler, att, null, exc);
+            } else {
+                future.setFailure(exc);
+            }
         }
     };
 
@@ -596,8 +655,9 @@ class UnixAsynchronousSocketChannelImpl
      */
     @Override
     @SuppressWarnings("unchecked")
-    <V extends Number,A> Future<V> writeImpl(ByteBuffer[] srcs,
-                                             boolean isGatheringWrite,
+    <V extends Number,A> Future<V> implWrite(boolean isGatheringWrite,
+                                             ByteBuffer src,
+                                             ByteBuffer[] srcs,
                                              long timeout,
                                              TimeUnit unit,
                                              A attachment,
@@ -607,66 +667,72 @@ class UnixAsynchronousSocketChannelImpl
             Invoker.getGroupAndInvokeCount();
         boolean invokeDirect = Invoker.mayInvokeDirect(myGroupAndInvokeCount, port);
         boolean attemptWrite = (handler == null) || invokeDirect ||
-            !port.isFixedThreadPool();  // okay to attempt read with user thread pool
+            !port.isFixedThreadPool();  // okay to attempt write with user thread pool
+
+        int n = IOStatus.UNAVAILABLE;
+        Throwable exc = null;
+        boolean pending = false;
 
-        AbstractFuture<V,A> result;
         try {
             begin();
 
-            int n;
             if (attemptWrite) {
                 if (isGatheringWrite) {
                     n = (int)IOUtil.write(fd, srcs, nd);
                 } else {
-                    n = IOUtil.write(fd, srcs[0], -1, nd, null);
+                    n = IOUtil.write(fd, src, -1, nd, null);
                 }
-            } else {
-                n = IOStatus.UNAVAILABLE;
             }
 
             if (n == IOStatus.UNAVAILABLE) {
-                result = new PendingFuture<V,A>(this, handler, attachment, OpType.WRITE);
-
-                // update evetns so that read will complete asynchronously
+                PendingFuture<V,A> result = null;
                 synchronized (updateLock) {
+                    this.isGatheringWrite = isGatheringWrite;
+                    this.writeBuffer = src;
                     this.writeBuffers = srcs;
-                    this.gatheringWrite = isGatheringWrite;
-                    this.pendingWrite = (PendingFuture<Number,Object>)result;
+                    if (handler == null) {
+                        this.writeHandler = null;
+                        result = new PendingFuture<V,A>(this, OpType.WRITE);
+                        this.writeFuture = (PendingFuture<Number,Object>)result;
+                        this.writeAttachment = null;
+                    } else {
+                        this.writeHandler = (CompletionHandler<Number,Object>)handler;
+                        this.writeAttachment = attachment;
+                        this.writeFuture = null;
+                    }
+                    if (timeout > 0L) {
+                        this.writeTimer = port.schedule(writeTimeoutTask, timeout, unit);
+                    }
+                    this.writePending = true;
                     updateEvents();
                 }
-
-                // schedule timeout
-                if (timeout > 0L) {
-                    Future<?> timeoutTask =
-                        port.schedule(writeTimeoutTask, timeout, unit);
-                    ((PendingFuture<V,A>)result).setTimeoutTask(timeoutTask);
-                }
+                pending = true;
                 return result;
             }
-
-            // data available
-            enableWriting();
-            if (isGatheringWrite) {
-                result = (CompletedFuture<V,A>)CompletedFuture
-                    .withResult(this, Long.valueOf(n), attachment);
-            } else {
-                result = (CompletedFuture<V,A>)CompletedFuture
-                    .withResult(this, Integer.valueOf(n), attachment);
-            }
         } catch (Throwable x) {
-            enableWriting();
             if (x instanceof ClosedChannelException)
                 x = new AsynchronousCloseException();
-            result = CompletedFuture.withFailure(this, x, attachment);
+            exc = x;
         } finally {
+            if (!pending)
+                enableWriting();
             end();
         }
-        if (invokeDirect) {
-            Invoker.invokeDirect(myGroupAndInvokeCount, handler, result);
+
+        Number result = (exc != null) ? null : (isGatheringWrite) ?
+            (Number)Long.valueOf(n) : (Number)Integer.valueOf(n);
+
+        // write completed immediately
+        if (handler != null) {
+            if (invokeDirect) {
+                Invoker.invokeDirect(myGroupAndInvokeCount, handler, attachment, (V)result, exc);
+            } else {
+                Invoker.invokeIndirectly(this, handler, attachment, (V)result, exc);
+            }
+            return null;
         } else {
-            Invoker.invokeIndirectly(handler, result);
+            return CompletedFuture.withResult((V)result, exc);
         }
-        return result;
     }
 
     // -- Native methods --
diff --git a/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java b/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java
index 7eb45bde481..81132985b75 100644
--- a/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java
+++ b/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java
@@ -25,6 +25,7 @@
 
 package sun.nio.fs;
 
+import java.nio.file.attribute.*;
 import java.util.*;
 import java.io.IOException;
 
@@ -113,10 +114,12 @@ class LinuxFileStore
     }
 
     @Override
-    public boolean supportsFileAttributeView(String name) {
+    public boolean supportsFileAttributeView(Class<? extends FileAttributeView> type) {
         // support DosFileAttributeView and UserDefinedAttributeView if extended
         // attributes enabled
-        if (name.equals("dos") || name.equals("user")) {
+        if (type == DosFileAttributeView.class ||
+            type == UserDefinedFileAttributeView.class)
+        {
             // lookup fstypes.properties
             FeatureStatus status = checkIfFeaturePresent("user_xattr");
             if (status == FeatureStatus.PRESENT)
@@ -142,7 +145,15 @@ class LinuxFileStore
             }
             return xattrEnabled;
         }
+        return super.supportsFileAttributeView(type);
+    }
 
+    @Override
+    public boolean supportsFileAttributeView(String name) {
+        if (name.equals("dos"))
+            return supportsFileAttributeView(DosFileAttributeView.class);
+        if (name.equals("user"))
+            return supportsFileAttributeView(UserDefinedFileAttributeView.class);
         return super.supportsFileAttributeView(name);
     }
 
diff --git a/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java b/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java
index aaa737137d3..8cf2bbe0818 100644
--- a/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java
+++ b/jdk/src/solaris/classes/sun/nio/fs/SolarisFileStore.java
@@ -25,6 +25,7 @@
 
 package sun.nio.fs;
 
+import java.nio.file.attribute.*;
 import java.io.IOException;
 
 import static sun.nio.fs.UnixNativeDispatcher.*;
@@ -72,27 +73,39 @@ class SolarisFileStore
     }
 
     @Override
-    public boolean supportsFileAttributeView(String name) {
-        if (name.equals("acl")) {
+    public boolean supportsFileAttributeView(Class<? extends FileAttributeView> type) {
+        if (type == AclFileAttributeView.class) {
             // lookup fstypes.properties
             FeatureStatus status = checkIfFeaturePresent("nfsv4acl");
-            if (status == FeatureStatus.PRESENT)
-                return true;
-            if (status == FeatureStatus.NOT_PRESENT)
-                return false;
-            // AclFileAttributeView available on ZFS
-            return (type().equals("zfs"));
+            switch (status) {
+                case PRESENT     : return true;
+                case NOT_PRESENT : return false;
+                default :
+                    // AclFileAttributeView available on ZFS
+                    return (type().equals("zfs"));
+            }
         }
-        if (name.equals("user")) {
+        if (type == UserDefinedFileAttributeView.class) {
             // lookup fstypes.properties
             FeatureStatus status = checkIfFeaturePresent("xattr");
-            if (status == FeatureStatus.PRESENT)
-                return true;
-            if (status == FeatureStatus.NOT_PRESENT)
-                return false;
-            return xattrEnabled;
+            switch (status) {
+                case PRESENT     : return true;
+                case NOT_PRESENT : return false;
+                default :
+                    // UserDefinedFileAttributeView available if extended
+                    // attributes supported
+                    return xattrEnabled;
+            }
         }
+        return super.supportsFileAttributeView(type);
+    }
 
+    @Override
+    public boolean supportsFileAttributeView(String name) {
+        if (name.equals("acl"))
+            return supportsFileAttributeView(AclFileAttributeView.class);
+        if (name.equals("user"))
+            return supportsFileAttributeView(UserDefinedFileAttributeView.class);
         return super.supportsFileAttributeView(name);
     }
 
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java b/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java
index 02397648eae..f19b2f90fe8 100644
--- a/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java
+++ b/jdk/src/solaris/classes/sun/nio/fs/UnixFileStore.java
@@ -145,9 +145,8 @@ abstract class UnixFileStore
         {
             // lookup fstypes.properties
             FeatureStatus status = checkIfFeaturePresent("posix");
-            if (status == FeatureStatus.NOT_PRESENT)
-                return false;
-            return true;
+            // assume supported if UNKNOWN
+            return (status != FeatureStatus.NOT_PRESENT);
         }
         return false;
     }
diff --git a/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java b/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java
index 9d5db356255..2741915e55d 100644
--- a/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java
+++ b/jdk/src/solaris/classes/sun/nio/fs/UnixPath.java
@@ -65,9 +65,6 @@ class UnixPath
     // array of offsets of elements in path (created lazily)
     private volatile int[] offsets;
 
-    // file permissions (created lazily)
-    private volatile FilePermission[] perms;
-
     UnixPath(UnixFileSystem fs, byte[] path) {
         this.fs = fs;
         this.path = path;
@@ -768,45 +765,23 @@ class UnixPath
         }
     }
 
-    // create file permissions used for read and write checks
-    private void checkReadOrWrite(boolean checkRead) {
-        SecurityManager sm = System.getSecurityManager();
-        if (sm == null)
-            return;
-        if (perms == null) {
-            synchronized (this) {
-                if (perms == null) {
-                    FilePermission[] p = new FilePermission[2];
-                    String pathForPermCheck = getPathForPermissionCheck();
-                    p[0] = new FilePermission(pathForPermCheck,
-                        SecurityConstants.FILE_READ_ACTION);
-                    p[1] = new FilePermission(pathForPermCheck,
-                        SecurityConstants.FILE_WRITE_ACTION);
-                    perms = p;
-                }
-            }
-        }
-        if (checkRead) {
-            sm.checkPermission(perms[0]);
-        } else {
-            sm.checkPermission(perms[1]);
-        }
-    }
 
     void checkRead() {
-        checkReadOrWrite(true);
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null)
+            sm.checkRead(getPathForPermissionCheck());
     }
 
     void checkWrite() {
-        checkReadOrWrite(false);
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null)
+            sm.checkWrite(getPathForPermissionCheck());
     }
 
     void checkDelete() {
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            // permission not cached
+        if (sm != null)
             sm.checkDelete(getPathForPermissionCheck());
-        }
     }
 
     @Override
diff --git a/jdk/src/solaris/native/java/lang/UNIXProcess_md.c b/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
index 041413574d4..3e1895926df 100644
--- a/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+++ b/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
@@ -50,27 +50,72 @@
 #include <limits.h>
 
 /*
- * (Hopefully temporarily) disable the clone-exec feature pending
- * further investigation and bug-fixing.
- * 32-bit (but not 64-bit) Linux fails on the program
- *   Runtime.getRuntime().exec("/bin/true").waitFor();
- * with:
- * #  Internal Error (os_linux_x86.cpp:683), pid=19940, tid=2934639536
- * #  Error: pthread_getattr_np failed with errno = 3 (ESRCH)
- * Linux kernel/pthread gurus are invited to figure this out.
+ * There are 3 possible strategies we might use to "fork":
+ *
+ * - fork(2).  Very portable and reliable but subject to
+ *   failure due to overcommit (see the documentation on
+ *   /proc/sys/vm/overcommit_memory in Linux proc(5)).
+ *   This is the ancient problem of spurious failure whenever a large
+ *   process starts a small subprocess.
+ *
+ * - vfork().  Using this is scary because all relevant man pages
+ *   contain dire warnings, e.g. Linux vfork(2).  But at least it's
+ *   documented in the glibc docs and is standardized by XPG4.
+ *   http://www.opengroup.org/onlinepubs/000095399/functions/vfork.html
+ *   On Linux, one might think that vfork() would be implemented using
+ *   the clone system call with flag CLONE_VFORK, but in fact vfork is
+ *   a separate system call (which is a good sign, suggesting that
+ *   vfork will continue to be supported at least on Linux).
+ *   Another good sign is that glibc implements posix_spawn using
+ *   vfork whenever possible.  Note that we cannot use posix_spawn
+ *   ourselves because there's no reliable way to close all inherited
+ *   file descriptors.
+ *
+ * - clone() with flags CLONE_VM but not CLONE_THREAD.  clone() is
+ *   Linux-specific, but this ought to work - at least the glibc
+ *   sources contain code to handle different combinations of CLONE_VM
+ *   and CLONE_THREAD.  However, when this was implemented, it
+ *   appeared to fail on 32-bit i386 (but not 64-bit x86_64) Linux with
+ *   the simple program
+ *     Runtime.getRuntime().exec("/bin/true").waitFor();
+ *   with:
+ *     #  Internal Error (os_linux_x86.cpp:683), pid=19940, tid=2934639536
+ *     #  Error: pthread_getattr_np failed with errno = 3 (ESRCH)
+ *   We believe this is a glibc bug, reported here:
+ *     http://sources.redhat.com/bugzilla/show_bug.cgi?id=10311
+ *   but the glibc maintainers closed it as WONTFIX.
+ *
+ * Based on the above analysis, we are currently using vfork() on
+ * Linux and fork() on other Unix systems, but the code to use clone()
+ * remains.
  */
-#define USE_CLONE 0
 
-#ifndef USE_CLONE
-#ifdef __linux__
-#define USE_CLONE 1
-#else
-#define USE_CLONE 0
-#endif
+#define START_CHILD_USE_CLONE 0  /* clone() currently disabled; see above. */
+
+#ifndef START_CHILD_USE_CLONE
+  #ifdef __linux__
+    #define START_CHILD_USE_CLONE 1
+  #else
+    #define START_CHILD_USE_CLONE 0
+  #endif
 #endif
 
-#if USE_CLONE
+/* By default, use vfork() on Linux. */
+#ifndef START_CHILD_USE_VFORK
+  #ifdef __linux__
+    #define START_CHILD_USE_VFORK 1
+  #else
+    #define START_CHILD_USE_VFORK 0
+  #endif
+#endif
+
+#if START_CHILD_USE_CLONE
 #include <sched.h>
+#define START_CHILD_SYSTEM_CALL "clone"
+#elif START_CHILD_USE_VFORK
+#define START_CHILD_SYSTEM_CALL "vfork"
+#else
+#define START_CHILD_SYSTEM_CALL "fork"
 #endif
 
 #ifndef STDIN_FILENO
@@ -95,6 +140,27 @@
 
 #define FAIL_FILENO (STDERR_FILENO + 1)
 
+/* TODO: Refactor. */
+#define RESTARTABLE(_cmd, _result) do { \
+  do { \
+    _result = _cmd; \
+  } while((_result == -1) && (errno == EINTR)); \
+} while(0)
+
+/* This is one of the rare times it's more portable to declare an
+ * external symbol explicitly, rather than via a system header.
+ * The declaration is standardized as part of UNIX98, but there is
+ * no standard (not even de-facto) header file where the
+ * declaration is to be found.  See:
+ * http://www.opengroup.org/onlinepubs/009695399/functions/environ.html
+ * http://www.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_02.html
+ *
+ * "All identifiers in this volume of IEEE Std 1003.1-2001, except
+ * environ, are defined in at least one of the headers" (!)
+ */
+extern char **environ;
+
+
 static void
 setSIGCHLDHandler(JNIEnv *env)
 {
@@ -283,6 +349,36 @@ Java_java_lang_UNIXProcess_waitForProcessExit(JNIEnv* env,
     }
 }
 
+static ssize_t
+restartableWrite(int fd, const void *buf, size_t count)
+{
+    ssize_t result;
+    RESTARTABLE(write(fd, buf, count), result);
+    return result;
+}
+
+static int
+restartableDup2(int fd_from, int fd_to)
+{
+    int err;
+    RESTARTABLE(dup2(fd_from, fd_to), err);
+    return err;
+}
+
+static int
+restartableClose(int fd)
+{
+    int err;
+    RESTARTABLE(close(fd), err);
+    return err;
+}
+
+static int
+closeSafely(int fd)
+{
+    return (fd == -1) ? 0 : restartableClose(fd);
+}
+
 static int
 isAsciiDigit(char c)
 {
@@ -303,8 +399,8 @@ closeDescriptors(void)
      * the lowest numbered file descriptor, just like open().  So we
      * close a couple explicitly.  */
 
-    close(from_fd);             /* for possible use by opendir() */
-    close(from_fd + 1);         /* another one for good luck */
+    restartableClose(from_fd);          /* for possible use by opendir() */
+    restartableClose(from_fd + 1);      /* another one for good luck */
 
     if ((dp = opendir("/proc/self/fd")) == NULL)
         return 0;
@@ -316,7 +412,7 @@ closeDescriptors(void)
         int fd;
         if (isAsciiDigit(dirp->d_name[0]) &&
             (fd = strtol(dirp->d_name, NULL, 10)) >= from_fd + 2)
-            close(fd);
+            restartableClose(fd);
     }
 
     closedir(dp);
@@ -324,13 +420,15 @@ closeDescriptors(void)
     return 1;
 }
 
-static void
+static int
 moveDescriptor(int fd_from, int fd_to)
 {
     if (fd_from != fd_to) {
-        dup2(fd_from, fd_to);
-        close(fd_from);
+        if ((restartableDup2(fd_from, fd_to) == -1) ||
+            (restartableClose(fd_from) == -1))
+            return -1;
     }
+    return 0;
 }
 
 static const char *
@@ -434,41 +532,30 @@ execve_with_shell_fallback(const char *file,
                            const char *argv[],
                            const char *const envp[])
 {
-#if USE_CLONE
+#if START_CHILD_USE_CLONE || START_CHILD_USE_VFORK
+    /* shared address space; be very careful. */
     execve(file, (char **) argv, (char **) envp);
     if (errno == ENOEXEC)
         execve_as_traditional_shell_script(file, argv, envp);
 #else
-    /* Our address space is unshared, so can mutate environ. */
-    extern char **environ;
+    /* unshared address space; we can mutate environ. */
     environ = (char **) envp;
     execvp(file, (char **) argv);
 #endif
 }
 
 /**
- * execvpe should have been included in the Unix standards.
- * execvpe is identical to execvp, except that the child environment is
+ * 'execvpe' should have been included in the Unix standards,
+ * and is a GNU extension in glibc 2.10.
+ *
+ * JDK_execvpe is identical to execvp, except that the child environment is
  * specified via the 3rd argument instead of being inherited from environ.
  */
 static void
-execvpe(const char *file,
-        const char *argv[],
-        const char *const envp[])
+JDK_execvpe(const char *file,
+            const char *argv[],
+            const char *const envp[])
 {
-    /* This is one of the rare times it's more portable to declare an
-     * external symbol explicitly, rather than via a system header.
-     * The declaration is standardized as part of UNIX98, but there is
-     * no standard (not even de-facto) header file where the
-     * declaration is to be found.  See:
-     * http://www.opengroup.org/onlinepubs/009695399/functions/environ.html
-     * http://www.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_02.html
-     *
-     * "All identifiers in this volume of IEEE Std 1003.1-2001, except
-     * environ, are defined in at least one of the headers" (!)
-     */
-    extern char **environ;
-
     if (envp == NULL || (char **) envp == environ) {
         execvp(file, (char **) argv);
         return;
@@ -538,13 +625,6 @@ execvpe(const char *file,
     }
 }
 
-static void
-closeSafely(int fd)
-{
-    if (fd != -1)
-        close(fd);
-}
-
 /*
  * Reads nbyte bytes from file descriptor fd into buf,
  * The read operation is retried in case of EINTR or partial reads.
@@ -587,6 +667,9 @@ typedef struct _ChildStuff
     const char **envv;
     const char *pdir;
     jboolean redirectErrorStream;
+#if START_CHILD_USE_CLONE
+    void *clone_stack;
+#endif
 } ChildStuff;
 
 static void
@@ -610,31 +693,40 @@ childProcess(void *arg)
     /* Close the parent sides of the pipes.
        Closing pipe fds here is redundant, since closeDescriptors()
        would do it anyways, but a little paranoia is a good thing. */
-    closeSafely(p->in[1]);
-    closeSafely(p->out[0]);
-    closeSafely(p->err[0]);
-    closeSafely(p->fail[0]);
+    if ((closeSafely(p->in[1])   == -1) ||
+        (closeSafely(p->out[0])  == -1) ||
+        (closeSafely(p->err[0])  == -1) ||
+        (closeSafely(p->fail[0]) == -1))
+        goto WhyCantJohnnyExec;
 
     /* Give the child sides of the pipes the right fileno's. */
     /* Note: it is possible for in[0] == 0 */
-    moveDescriptor(p->in[0] != -1 ?  p->in[0] : p->fds[0], STDIN_FILENO);
-    moveDescriptor(p->out[1]!= -1 ? p->out[1] : p->fds[1], STDOUT_FILENO);
+    if ((moveDescriptor(p->in[0] != -1 ?  p->in[0] : p->fds[0],
+                        STDIN_FILENO) == -1) ||
+        (moveDescriptor(p->out[1]!= -1 ? p->out[1] : p->fds[1],
+                        STDOUT_FILENO) == -1))
+        goto WhyCantJohnnyExec;
 
     if (p->redirectErrorStream) {
-      closeSafely(p->err[1]);
-      dup2(STDOUT_FILENO, STDERR_FILENO);
+        if ((closeSafely(p->err[1]) == -1) ||
+            (restartableDup2(STDOUT_FILENO, STDERR_FILENO) == -1))
+            goto WhyCantJohnnyExec;
     } else {
-      moveDescriptor(p->err[1] != -1 ? p->err[1] : p->fds[2], STDERR_FILENO);
+        if (moveDescriptor(p->err[1] != -1 ? p->err[1] : p->fds[2],
+                           STDERR_FILENO) == -1)
+            goto WhyCantJohnnyExec;
     }
 
-    moveDescriptor(p->fail[1], FAIL_FILENO);
+    if (moveDescriptor(p->fail[1], FAIL_FILENO) == -1)
+        goto WhyCantJohnnyExec;
 
     /* close everything */
     if (closeDescriptors() == 0) { /* failed,  close the old way */
         int max_fd = (int)sysconf(_SC_OPEN_MAX);
-        int i;
-        for (i = FAIL_FILENO + 1; i < max_fd; i++)
-            close(i);
+        int fd;
+        for (fd = FAIL_FILENO + 1; fd < max_fd; fd++)
+            if (restartableClose(fd) == -1 && errno != EBADF)
+                goto WhyCantJohnnyExec;
     }
 
     /* change to the new working directory */
@@ -644,7 +736,7 @@ childProcess(void *arg)
     if (fcntl(FAIL_FILENO, F_SETFD, FD_CLOEXEC) == -1)
         goto WhyCantJohnnyExec;
 
-    execvpe(p->argv[0], p->argv, p->envv);
+    JDK_execvpe(p->argv[0], p->argv, p->envv);
 
  WhyCantJohnnyExec:
     /* We used to go to an awful lot of trouble to predict whether the
@@ -659,13 +751,62 @@ childProcess(void *arg)
      */
     {
         int errnum = errno;
-        write(FAIL_FILENO, &errnum, sizeof(errnum));
+        restartableWrite(FAIL_FILENO, &errnum, sizeof(errnum));
     }
-    close(FAIL_FILENO);
+    restartableClose(FAIL_FILENO);
     _exit(-1);
     return 0;  /* Suppress warning "no return value from function" */
 }
 
+/**
+ * Start a child process running function childProcess.
+ * This function only returns in the parent.
+ * We are unusually paranoid; use of clone/vfork is
+ * especially likely to tickle gcc/glibc bugs.
+ */
+#ifdef __attribute_noinline__  /* See: sys/cdefs.h */
+__attribute_noinline__
+#endif
+static pid_t
+startChild(ChildStuff *c) {
+#if START_CHILD_USE_CLONE
+#define START_CHILD_CLONE_STACK_SIZE (64 * 1024)
+    /*
+     * See clone(2).
+     * Instead of worrying about which direction the stack grows, just
+     * allocate twice as much and start the stack in the middle.
+     */
+    if ((c->clone_stack = malloc(2 * START_CHILD_CLONE_STACK_SIZE)) == NULL)
+        /* errno will be set to ENOMEM */
+        return -1;
+    return clone(childProcess,
+                 c->clone_stack + START_CHILD_CLONE_STACK_SIZE,
+                 CLONE_VFORK | CLONE_VM | SIGCHLD, c);
+#else
+  #if START_CHILD_USE_VFORK
+    /*
+     * We separate the call to vfork into a separate function to make
+     * very sure to keep stack of child from corrupting stack of parent,
+     * as suggested by the scary gcc warning:
+     *  warning: variable 'foo' might be clobbered by 'longjmp' or 'vfork'
+     */
+    volatile pid_t resultPid = vfork();
+  #else
+    /*
+     * From Solaris fork(2): In Solaris 10, a call to fork() is
+     * identical to a call to fork1(); only the calling thread is
+     * replicated in the child process. This is the POSIX-specified
+     * behavior for fork().
+     */
+    pid_t resultPid = fork();
+  #endif
+    if (resultPid == 0)
+        childProcess(c);
+    assert(resultPid != 0);  /* childProcess never returns */
+    return resultPid;
+#endif /* ! START_CHILD_USE_CLONE */
+}
+
 JNIEXPORT jint JNICALL
 Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
                                        jobject process,
@@ -678,9 +819,6 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
 {
     int errnum;
     int resultPid = -1;
-#if USE_CLONE
-    void *clone_stack = NULL;
-#endif
     int in[2], out[2], err[2], fail[2];
     jint *fds = NULL;
     const char *pprog = NULL;
@@ -694,6 +832,9 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
     c->argv = NULL;
     c->envv = NULL;
     c->pdir = NULL;
+#if START_CHILD_USE_CLONE
+    c->clone_stack = NULL;
+#endif
 
     /* Convert prog + argBlock into a char ** argv.
      * Add one word room for expansion of argv for use by
@@ -739,37 +880,15 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
 
     c->redirectErrorStream = redirectErrorStream;
 
-    {
-#if USE_CLONE
-        /* See clone(2).
-         * Instead of worrying about which direction the stack grows, just
-         * allocate twice as much and start the stack in the middle. */
-        const int stack_size = 64 * 1024;
-        if ((clone_stack = NEW(char, 2 * stack_size)) == NULL) goto Catch;
-        resultPid = clone(childProcess, clone_stack + stack_size,
-                          /* CLONE_VFORK | // works, but unnecessary */
-                          CLONE_VM | SIGCHLD, c);
-#else
-        /* From fork(2): In Solaris 10, a call to fork() is identical
-         * to a call to fork1(); only the calling thread is replicated
-         * in the child process. This is the POSIX-specified behavior
-         * for fork(). */
-        resultPid = fork();
-        if (resultPid == 0) {
-          childProcess(c);
-          assert(0);  /* childProcess must not return */
-        }
-#endif
-    }
+    resultPid = startChild(c);
+    assert(resultPid != 0);
 
     if (resultPid < 0) {
-        throwIOException(env, errno, "Fork failed");
+        throwIOException(env, errno, START_CHILD_SYSTEM_CALL " failed");
         goto Catch;
     }
 
-    /* parent process */
-
-    close(fail[1]); fail[1] = -1; /* See: WhyCantJohnnyExec */
+    restartableClose(fail[1]); fail[1] = -1; /* See: WhyCantJohnnyExec */
 
     switch (readFully(fail[0], &errnum, sizeof(errnum))) {
     case 0: break; /* Exec succeeded */
@@ -787,8 +906,8 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
     fds[2] = (err[0] != -1) ? err[0] : -1;
 
  Finally:
-#if USE_CLONE
-    free(clone_stack);
+#if START_CHILD_USE_CLONE
+    free(c->clone_stack);
 #endif
 
     /* Always clean up the child's side of the pipes */
diff --git a/jdk/src/solaris/native/java/util/TimeZone_md.c b/jdk/src/solaris/native/java/util/TimeZone_md.c
index a3b9fc74c1e..4ec6ef4122a 100644
--- a/jdk/src/solaris/native/java/util/TimeZone_md.c
+++ b/jdk/src/solaris/native/java/util/TimeZone_md.c
@@ -51,9 +51,9 @@
 
 #ifdef __linux__
 
-static const char *sysconfig_clock_file = "/etc/sysconfig/clock";
-static const char *zoneinfo_dir = "/usr/share/zoneinfo";
-static const char *defailt_zoneinfo_file = "/etc/localtime";
+static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
+static const char *ZONEINFO_DIR = "/usr/share/zoneinfo";
+static const char *DEFAULT_ZONEINFO_FILE = "/etc/localtime";
 
 /*
  * Returns a point to the zone ID portion of the given zoneinfo file
@@ -201,53 +201,22 @@ getPlatformTimeZoneID()
     size_t size;
 
     /*
-     * First, try the ZONE entry in /etc/sysconfig/clock. However, the
-     * ZONE entry is not set up after initial Red Hat Linux
-     * installation. In case that /etc/localtime is set up without
-     * using timeconfig, there might be inconsistency between
-     * /etc/localtime and the ZONE entry. The inconsistency between
-     * timeconfig and linuxconf is reported as a bug in the Red Hat
-     * web page as of May 1, 2000.
+     * Try reading the /etc/timezone file for Debian distros. There's
+     * no spec of the file format available. This parsing assumes that
+     * there's one line of an Olson tzid followed by a '\n', no
+     * leading or trailing spaces, no comments.
      */
-    if ((fp = fopen(sysconfig_clock_file, "r")) != NULL) {
+    if ((fp = fopen(ETC_TIMEZONE_FILE, "r")) != NULL) {
         char line[256];
 
-        while (fgets(line, sizeof(line), fp) != NULL) {
-            char *p = line;
-            char *s;
-
-            SKIP_SPACE(p);
-            if (*p != 'Z') {
-                continue;
+        if (fgets(line, sizeof(line), fp) != NULL) {
+            char *p = strchr(line, '\n');
+            if (p != NULL) {
+                *p = '\0';
             }
-            if (strncmp(p, "ZONE=\"", 6) == 0) {
-                p += 6;
-            } else {
-                /*
-                 * In case we need to parse it token by token.
-                 */
-                if (strncmp(p, "ZONE", 4) != 0) {
-                    continue;
-                }
-                p += 4;
-                SKIP_SPACE(p);
-                if (*p++ != '=') {
-                    break;
-                }
-                SKIP_SPACE(p);
-                if (*p++ != '"') {
-                    break;
-                }
+            if (strlen(line) > 0) {
+                tz = strdup(line);
             }
-            for (s = p; *s && *s != '"'; s++)
-                ;
-            if (*s != '"') {
-                /* this ZONE entry is broken. */
-                break;
-            }
-            *s = '\0';
-            tz = strdup(p);
-            break;
         }
         (void) fclose(fp);
         if (tz != NULL) {
@@ -258,7 +227,7 @@ getPlatformTimeZoneID()
     /*
      * Next, try /etc/localtime to find the zone ID.
      */
-    if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
+    if (lstat(DEFAULT_ZONEINFO_FILE, &statbuf) == -1) {
         return NULL;
     }
 
@@ -273,9 +242,9 @@ getPlatformTimeZoneID()
         char linkbuf[PATH_MAX+1];
         int len;
 
-        if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
+        if ((len = readlink(DEFAULT_ZONEINFO_FILE, linkbuf, sizeof(linkbuf)-1)) == -1) {
             jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
-                        defailt_zoneinfo_file);
+                        DEFAULT_ZONEINFO_FILE);
             return NULL;
         }
         linkbuf[len] = '\0';
@@ -295,7 +264,7 @@ getPlatformTimeZoneID()
     if (buf == NULL) {
         return NULL;
     }
-    if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
+    if ((fd = open(DEFAULT_ZONEINFO_FILE, O_RDONLY)) == -1) {
         free((void *) buf);
         return NULL;
     }
@@ -307,7 +276,7 @@ getPlatformTimeZoneID()
     }
     (void) close(fd);
 
-    tz = findZoneinfoFile(buf, size, zoneinfo_dir);
+    tz = findZoneinfoFile(buf, size, ZONEINFO_DIR);
     free((void *) buf);
     return tz;
 }
diff --git a/jdk/src/solaris/native/sun/awt/awt_Robot.c b/jdk/src/solaris/native/sun/awt/awt_Robot.c
index 18aa1554b98..dbeebfe44fb 100644
--- a/jdk/src/solaris/native/sun/awt/awt_Robot.c
+++ b/jdk/src/solaris/native/sun/awt/awt_Robot.c
@@ -51,9 +51,8 @@
 
 extern struct X11GraphicsConfigIDs x11GraphicsConfigIDs;
 
-extern int32_t getNumButtons();
-
 static jint * masks;
+static jint num_buttons;
 
 static int32_t isXTestAvailable() {
     int32_t major_opcode, first_event, first_error;
@@ -164,34 +163,34 @@ static XImage *getWindowImage(Display * display, Window window,
 
 /*********************************************************************************************/
 
+// this should be called from XRobotPeer constructor
 JNIEXPORT void JNICALL
-Java_sun_awt_X11_XRobotPeer_setup (JNIEnv * env, jclass cls) {
+Java_sun_awt_X11_XRobotPeer_setup (JNIEnv * env, jclass cls, jint numberOfButtons) {
     int32_t xtestAvailable;
 
-// this should be called from XRobotPeer constructor
+    DTRACE_PRINTLN("RobotPeer: setup()");
+
+    num_buttons = numberOfButtons;
+
     jclass inputEventClazz = (*env)->FindClass(env, "java/awt/event/InputEvent");
     jmethodID getButtonDownMasksID = (*env)->GetStaticMethodID(env, inputEventClazz, "getButtonDownMasks", "()[I");
     jintArray obj = (jintArray)(*env)->CallStaticObjectMethod(env, inputEventClazz, getButtonDownMasksID);
-    jsize len = (*env)->GetArrayLength(env, obj);
     jint * tmp = (*env)->GetIntArrayElements(env, obj, JNI_FALSE);
 
-    masks  = (jint *)malloc(sizeof(jint)*len);
+    masks  = (jint *)malloc(sizeof(jint) * num_buttons);
     if (masks == (jint *) NULL) {
         JNU_ThrowOutOfMemoryError((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2), NULL);
         goto finally;
     }
 
     int i;
-    for (i = 0; i < len; i++) {
+    for (i = 0; i < num_buttons; i++) {
         masks[i] = tmp[i];
     }
     (*env)->ReleaseIntArrayElements(env, obj, tmp, 0);
     (*env)->DeleteLocalRef(env, obj);
 
-    DTRACE_PRINTLN("RobotPeer: setup()");
-
     AWT_LOCK();
-
     xtestAvailable = isXTestAvailable();
     DTRACE_PRINTLN1("RobotPeer: XTest available = %d", xtestAvailable);
     if (!xtestAvailable) {
@@ -338,8 +337,6 @@ void mouseAction(JNIEnv *env,
 {
     AWT_LOCK();
 
-    int32_t num_buttons = getNumButtons(); //from XToolkit.c
-
     DTRACE_PRINTLN1("RobotPeer: mouseAction(%i)", buttonMask);
     DTRACE_PRINTLN1("RobotPeer: mouseAction, press = %d", isMousePress);
 
diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c
index 14ef8d14305..79031de6b59 100644
--- a/jdk/src/solaris/native/sun/nio/ch/Net.c
+++ b/jdk/src/solaris/native/sun/nio/ch/Net.c
@@ -541,7 +541,7 @@ Java_sun_nio_ch_Net_shutdown(JNIEnv *env, jclass cl, jobject fdo, jint jhow)
 {
     int how = (jhow == sun_nio_ch_Net_SHUT_RD) ? SHUT_RD :
         (jhow == sun_nio_ch_Net_SHUT_WR) ? SHUT_WR : SHUT_RDWR;
-    if (shutdown(fdval(env, fdo), how) < 0)
+    if ((shutdown(fdval(env, fdo), how) < 0) && (errno != ENOTCONN))
         handleSocketError(env, errno);
 }
 
diff --git a/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c b/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c
index 7bb312a6ba5..0cc1b6bf626 100644
--- a/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c
+++ b/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c
@@ -417,11 +417,11 @@ void handleMessage
 /*
  * Class:     sun_nio_ch_SctpChannelImpl
  * Method:    receive0
- * Signature: (ILsun/nio/ch/SctpResultContainer;JI)I
+ * Signature: (ILsun/nio/ch/SctpResultContainer;JIZ)I
  */
 JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_receive0
   (JNIEnv *env, jclass klass, jint fd, jobject resultContainerObj,
-   jlong address, jint length) {
+   jlong address, jint length, jboolean peek) {
     SOCKADDR sa;
     int sa_len = sizeof(sa);
     ssize_t rv = 0;
@@ -429,6 +429,7 @@ JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_receive0
     struct iovec iov[1];
     struct msghdr msg[1];
     char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))];
+    int flags = peek == JNI_TRUE ? MSG_PEEK : 0;
 
     /* Set up the msghdr structure for receiving */
     memset(msg, 0, sizeof (*msg));
@@ -443,7 +444,7 @@ JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_receive0
     msg->msg_flags = 0;
 
     do {
-        if ((rv = recvmsg(fd, msg, 0)) < 0) {
+        if ((rv = recvmsg(fd, msg, flags)) < 0) {
             if (errno == EWOULDBLOCK) {
                 return IOS_UNAVAILABLE;
             } else if (errno == EINTR) {
@@ -473,7 +474,7 @@ JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_receive0
                 memcpy(buf, addr, rv);
                 iov->iov_base = buf + rv;
                 iov->iov_len = NOTIFICATION_BUFFER_SIZE - rv;
-                if ((rv = recvmsg(fd, msg, 0)) < 0) {
+                if ((rv = recvmsg(fd, msg, flags)) < 0) {
                     handleSocketError(env, errno);
                     return 0;
                 }
diff --git a/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c b/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
index 6f55bbed069..a39f10df40a 100644
--- a/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
+++ b/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
@@ -85,19 +85,21 @@ static jfieldID entry_options;
 static jfieldID entry_dev;
 
 /**
- * System calls that may not be available at build time.
+ * System calls that may not be available at run time.
  */
 typedef int openat64_func(int, const char *, int, ...);
 typedef int fstatat64_func(int, const char *, struct stat64 *, int);
 typedef int unlinkat_func(int, const char*, int);
 typedef int renameat_func(int, const char*, int, const char*);
 typedef int futimesat_func(int, const char *, const struct timeval *);
+typedef DIR* fdopendir_func(int);
 
 static openat64_func* my_openat64_func = NULL;
 static fstatat64_func* my_fstatat64_func = NULL;
 static unlinkat_func* my_unlinkat_func = NULL;
 static renameat_func* my_renameat_func = NULL;
 static futimesat_func* my_futimesat_func = NULL;
+static fdopendir_func* my_fdopendir_func = NULL;
 
 /**
  * fstatat missing from glibc on Linux. Temporary workaround
@@ -183,7 +185,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this)
     entry_options = (*env)->GetFieldID(env, clazz, "opts", "[B");
     entry_dev = (*env)->GetFieldID(env, clazz, "dev", "J");
 
-    /* system calls that might not be available at build time */
+    /* system calls that might not be available at run time */
 
 #if defined(__solaris__) && defined(_LP64)
     /* Solaris 64-bit does not have openat64/fstatat64 */
@@ -196,6 +198,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this)
     my_unlinkat_func = (unlinkat_func*) dlsym(RTLD_DEFAULT, "unlinkat");
     my_renameat_func = (renameat_func*) dlsym(RTLD_DEFAULT, "renameat");
     my_futimesat_func = (futimesat_func*) dlsym(RTLD_DEFAULT, "futimesat");
+    my_fdopendir_func = (fdopendir_func*) dlsym(RTLD_DEFAULT, "fdopendir");
 
 #if defined(FSTATAT64_SYSCALL_AVAILABLE)
     /* fstatat64 missing from glibc */
@@ -205,7 +208,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this)
 
     if (my_openat64_func != NULL &&  my_fstatat64_func != NULL &&
         my_unlinkat_func != NULL && my_renameat_func != NULL &&
-        my_futimesat_func != NULL)
+        my_futimesat_func != NULL && my_fdopendir_func != NULL)
     {
         flags |= sun_nio_fs_UnixNativeDispatcher_HAS_AT_SYSCALLS;
     }
@@ -565,8 +568,13 @@ JNIEXPORT jlong JNICALL
 Java_sun_nio_fs_UnixNativeDispatcher_fdopendir(JNIEnv* env, jclass this, int dfd) {
     DIR* dir;
 
+    if (my_fdopendir_func == NULL) {
+        JNU_ThrowInternalError(env, "should not reach here");
+        return (jlong)-1;
+    }
+
     /* EINTR not listed as a possible error */
-    dir = fdopendir((int)dfd);
+    dir = (*my_fdopendir_func)((int)dfd);
     if (dir == NULL) {
         throwUnixException(env, errno);
     }
diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java
index 716b56238cf..c1efb0de52c 100644
--- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java
+++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -29,7 +29,6 @@ import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.*;
@@ -74,12 +73,7 @@ final class Win32ShellFolder2 extends ShellFolder {
 
     private static native void initIDs();
 
-    private static final boolean is98;
-
     static {
-        String osName = System.getProperty("os.name");
-        is98 = (osName != null && osName.startsWith("Windows 98"));
-
         initIDs();
     }
 
@@ -185,8 +179,8 @@ final class Win32ShellFolder2 extends ShellFolder {
         boolean disposed;
         public void dispose() {
             if (disposed) return;
-            ShellFolder.getInvoker().invoke(new Callable<Void>() {
-                public Void call() throws Exception {
+            invoke(new Callable<Void>() {
+                public Void call() {
                     if (relativePIDL != 0) {
                         releasePIDL(relativePIDL);
                     }
@@ -224,7 +218,7 @@ final class Win32ShellFolder2 extends ShellFolder {
      */
     private boolean isPersonal;
 
-    private static String composePathForCsidl(int csidl) throws IOException {
+    private static String composePathForCsidl(int csidl) throws IOException, InterruptedException {
         String path = getFileSystemPath(csidl);
         return path == null
                 ? ("ShellFolder: 0x" + Integer.toHexString(csidl))
@@ -235,12 +229,13 @@ final class Win32ShellFolder2 extends ShellFolder {
      * Create a system special shell folder, such as the
      * desktop or Network Neighborhood.
      */
-    Win32ShellFolder2(final int csidl) throws IOException {
+    Win32ShellFolder2(final int csidl) throws IOException, InterruptedException {
         // Desktop is parent of DRIVES and NETWORK, not necessarily
         // other special shell folders.
         super(null, composePathForCsidl(csidl));
-        ShellFolder.getInvoker().invoke(new Callable<Void>() {
-            public Void call() throws Exception {
+
+        invoke(new Callable<Void>() {
+            public Void call() throws InterruptedException {
                 if (csidl == DESKTOP) {
                     initDesktop();
                 } else {
@@ -276,7 +271,7 @@ final class Win32ShellFolder2 extends ShellFolder {
                 }
                 return null;
             }
-        });
+        }, InterruptedException.class);
 
         sun.java2d.Disposer.addRecord(this, disposer);
     }
@@ -296,16 +291,15 @@ final class Win32ShellFolder2 extends ShellFolder {
     /**
      * Creates a shell folder with a parent and relative PIDL
      */
-    Win32ShellFolder2(final Win32ShellFolder2 parent, final long relativePIDL) {
+    Win32ShellFolder2(final Win32ShellFolder2 parent, final long relativePIDL) throws InterruptedException {
         super(parent,
-            ShellFolder.getInvoker().invoke(new Callable<String>() {
-                public String call() throws Exception {
+            invoke(new Callable<String>() {
+                public String call() {
                     return getFileSystemPath(parent.getIShellFolder(), relativePIDL);
                 }
-            })
+            }, RuntimeException.class)
         );
         this.disposer.relativePIDL = relativePIDL;
-        getAbsolutePath();
         sun.java2d.Disposer.addRecord(this, disposer);
     }
 
@@ -335,8 +329,8 @@ final class Win32ShellFolder2 extends ShellFolder {
      * drive (normally "C:\").
      */
     protected Object writeReplace() throws java.io.ObjectStreamException {
-        return ShellFolder.getInvoker().invoke(new Callable<File>() {
-            public File call() throws Exception {
+        return invoke(new Callable<File>() {
+            public File call() {
                 if (isFileSystem()) {
                     return new File(getPath());
                 } else {
@@ -398,11 +392,11 @@ final class Win32ShellFolder2 extends ShellFolder {
     /**
      * Accessor for IShellFolder
      */
-    public long getIShellFolder() {
+    private long getIShellFolder() {
         if (disposer.pIShellFolder == 0) {
-            disposer.pIShellFolder =
-                ShellFolder.getInvoker().invoke(new Callable<Long>() {
-                    public Long call() throws Exception {
+            try {
+                disposer.pIShellFolder = invoke(new Callable<Long>() {
+                    public Long call() {
                         assert(isDirectory());
                         assert(parent != null);
                         long parentIShellFolder = getParentIShellFolder();
@@ -421,7 +415,10 @@ final class Win32ShellFolder2 extends ShellFolder {
                         }
                         return pIShellFolder;
                     }
-                });
+                }, RuntimeException.class);
+            } catch (InterruptedException e) {
+                // Ignore error
+            }
         }
         return disposer.pIShellFolder;
     }
@@ -505,18 +502,23 @@ final class Win32ShellFolder2 extends ShellFolder {
         }
 
         if (parent == rhs.parent || parent.equals(rhs.parent)) {
-            return pidlsEqual(getParentIShellFolder(), disposer.relativePIDL, rhs.disposer.relativePIDL);
+            try {
+                return pidlsEqual(getParentIShellFolder(), disposer.relativePIDL, rhs.disposer.relativePIDL);
+            } catch (InterruptedException e) {
+                return false;
+            }
         }
 
         return false;
     }
 
-    private static boolean pidlsEqual(final long pIShellFolder, final long pidl1, final long pidl2) {
-        return ShellFolder.getInvoker().invoke(new Callable<Boolean>() {
-            public Boolean call() throws Exception {
-                return (compareIDs(pIShellFolder, pidl1, pidl2) == 0);
+    private static boolean pidlsEqual(final long pIShellFolder, final long pidl1, final long pidl2)
+            throws InterruptedException {
+        return invoke(new Callable<Boolean>() {
+            public Boolean call() {
+                return compareIDs(pIShellFolder, pidl1, pidl2) == 0;
             }
-        });
+        }, RuntimeException.class);
     }
 
     // NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details
@@ -539,14 +541,16 @@ final class Win32ShellFolder2 extends ShellFolder {
      * Return whether the given attribute flag is set for this object
      */
     public boolean hasAttribute(final int attribute) {
-        return ShellFolder.getInvoker().invoke(new Callable<Boolean>() {
-            public Boolean call() throws Exception {
+        Boolean result = invoke(new Callable<Boolean>() {
+            public Boolean call() {
                 // Caching at this point doesn't seem to be cost efficient
                 return (getAttributes0(getParentIShellFolder(),
                     getRelativePIDL(), attribute)
                     & attribute) != 0;
             }
         });
+
+        return result != null && result;
     }
 
     /**
@@ -561,32 +565,29 @@ final class Win32ShellFolder2 extends ShellFolder {
     private static native int getAttributes0(long pParentIShellFolder, long pIDL, int attrsMask);
 
     // Return the path to the underlying file system object
+    // Should be called from the COM thread
     private static String getFileSystemPath(final long parentIShellFolder, final long relativePIDL) {
-        return ShellFolder.getInvoker().invoke(new Callable<String>() {
-            public String call() throws Exception {
-                int linkedFolder = ATTRIB_LINK | ATTRIB_FOLDER;
-                if (parentIShellFolder == Win32ShellFolderManager2.getNetwork().getIShellFolder() &&
-                        getAttributes0(parentIShellFolder, relativePIDL, linkedFolder) == linkedFolder) {
+        int linkedFolder = ATTRIB_LINK | ATTRIB_FOLDER;
+        if (parentIShellFolder == Win32ShellFolderManager2.getNetwork().getIShellFolder() &&
+                getAttributes0(parentIShellFolder, relativePIDL, linkedFolder) == linkedFolder) {
 
-                    String s =
-                            getFileSystemPath(Win32ShellFolderManager2.getDesktop().getIShellFolder(),
-                                    getLinkLocation(parentIShellFolder, relativePIDL, false));
-                    if (s != null && s.startsWith("\\\\")) {
-                        return s;
-                    }
-                }
-                return getDisplayNameOf(parentIShellFolder, relativePIDL, SHGDN_FORPARSING);
+            String s =
+                    getFileSystemPath(Win32ShellFolderManager2.getDesktop().getIShellFolder(),
+                            getLinkLocation(parentIShellFolder, relativePIDL, false));
+            if (s != null && s.startsWith("\\\\")) {
+                return s;
             }
-        });
+        }
+        return getDisplayNameOf(parentIShellFolder, relativePIDL, SHGDN_FORPARSING);
     }
 
     // Needs to be accessible to Win32ShellFolderManager2
-    static String getFileSystemPath(final int csidl) throws IOException {
-        return ShellFolder.getInvoker().invoke(new Callable<String>() {
-            public String call() throws Exception {
+    static String getFileSystemPath(final int csidl) throws IOException, InterruptedException {
+        return invoke(new Callable<String>() {
+            public String call() throws IOException {
                 return getFileSystemPath0(csidl);
             }
-        });
+        }, IOException.class);
     }
 
     // NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details
@@ -609,11 +610,8 @@ final class Win32ShellFolder2 extends ShellFolder {
     public boolean isDirectory() {
         if (isDir == null) {
             // Folders with SFGAO_BROWSABLE have "shell extension" handlers and are
-            // not traversable in JFileChooser. An exception is "My Documents" on
-            // Windows 98.
-            if (hasAttribute(ATTRIB_FOLDER)
-                && (!hasAttribute(ATTRIB_BROWSABLE) ||
-                    (is98 && equals(Win32ShellFolderManager2.getPersonal())))) {
+            // not traversable in JFileChooser.
+            if (hasAttribute(ATTRIB_FOLDER) && !hasAttribute(ATTRIB_BROWSABLE)) {
                 isDir = Boolean.TRUE;
             } else if (isLink()) {
                 ShellFolder linkLocation = getLinkLocation(false);
@@ -630,13 +628,14 @@ final class Win32ShellFolder2 extends ShellFolder {
      */
     // Returns an IEnumIDList interface for an IShellFolder.  The value
     // returned must be released using releaseEnumObjects().
-    private long getEnumObjects(long pIShellFolder, final boolean includeHiddenFiles) {
-        final boolean isDesktop = (disposer.pIShellFolder == getDesktopIShellFolder());
-        return ShellFolder.getInvoker().invoke(new Callable<Long>() {
-            public Long call() throws Exception {
+    private long getEnumObjects(final boolean includeHiddenFiles) throws InterruptedException {
+        return invoke(new Callable<Long>() {
+            public Long call() {
+                boolean isDesktop = disposer.pIShellFolder == getDesktopIShellFolder();
+
                 return getEnumObjects(disposer.pIShellFolder, isDesktop, includeHiddenFiles);
             }
-        });
+        }, RuntimeException.class);
     }
 
     // Returns an IEnumIDList interface for an IShellFolder.  The value
@@ -670,58 +669,62 @@ final class Win32ShellFolder2 extends ShellFolder {
             security.checkRead(getPath());
         }
 
-        return ShellFolder.getInvoker().invoke(new Callable<File[]>() {
-            public File[] call() throws Exception {
-                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];
-                }
+        try {
+            return invoke(new Callable<File[]>() {
+                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();
+                    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.
-                long pIShellFolder = getIShellFolder();
-                // Now we can enumerate the objects in this folder.
-                ArrayList<Win32ShellFolder2> list = new ArrayList<Win32ShellFolder2>();
-                long pEnumObjects = getEnumObjects(pIShellFolder, includeHiddenFiles);
-                if (pEnumObjects != 0) {
-                    long childPIDL;
-                    int testedAttrs = ATTRIB_FILESYSTEM | ATTRIB_FILESYSANCESTOR;
-                    do {
-                        childPIDL = getNextChild(pEnumObjects);
-                        boolean releasePIDL = true;
-                        if (childPIDL != 0 &&
-                                (getAttributes0(pIShellFolder, childPIDL, testedAttrs) & testedAttrs) != 0) {
-                            Win32ShellFolder2 childFolder;
-                            if (Win32ShellFolder2.this.equals(desktop)
-                                    && personal != null
-                                    && pidlsEqual(pIShellFolder, childPIDL, personal.disposer.relativePIDL)) {
-                                childFolder = personal;
-                            } else {
-                                childFolder = new Win32ShellFolder2(Win32ShellFolder2.this, childPIDL);
-                                releasePIDL = false;
+                    // 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.
+                    long pIShellFolder = getIShellFolder();
+                    // Now we can enumerate the objects in this folder.
+                    ArrayList<Win32ShellFolder2> list = new ArrayList<Win32ShellFolder2>();
+                    long pEnumObjects = getEnumObjects(includeHiddenFiles);
+                    if (pEnumObjects != 0) {
+                        long childPIDL;
+                        int testedAttrs = ATTRIB_FILESYSTEM | ATTRIB_FILESYSANCESTOR;
+                        do {
+                            childPIDL = getNextChild(pEnumObjects);
+                            boolean releasePIDL = true;
+                            if (childPIDL != 0 &&
+                                    (getAttributes0(pIShellFolder, childPIDL, testedAttrs) & testedAttrs) != 0) {
+                                Win32ShellFolder2 childFolder;
+                                if (Win32ShellFolder2.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);
                             }
-                            list.add(childFolder);
-                        }
-                        if (releasePIDL) {
-                            releasePIDL(childPIDL);
-                        }
-                    } while (childPIDL != 0 && !Thread.currentThread().isInterrupted());
-                    releaseEnumObjects(pEnumObjects);
+                            if (releasePIDL) {
+                                releasePIDL(childPIDL);
+                            }
+                        } while (childPIDL != 0 && !Thread.currentThread().isInterrupted());
+                        releaseEnumObjects(pEnumObjects);
+                    }
+                    return Thread.currentThread().isInterrupted()
+                        ? new File[0]
+                        : list.toArray(new ShellFolder[list.size()]);
                 }
-                return Thread.currentThread().isInterrupted()
-                    ? new File[0]
-                    : list.toArray(new ShellFolder[list.size()]);
-            }
-        });
+            }, InterruptedException.class);
+        } catch (InterruptedException e) {
+            return new File[0];
+        }
     }
 
 
@@ -730,13 +733,13 @@ final class Win32ShellFolder2 extends ShellFolder {
      *
      * @return The child shellfolder, or null if not found.
      */
-    Win32ShellFolder2 getChildByPath(final String filePath) {
-        return ShellFolder.getInvoker().invoke(new Callable<Win32ShellFolder2>() {
-            public Win32ShellFolder2 call() throws Exception {
+    Win32ShellFolder2 getChildByPath(final String filePath) throws InterruptedException {
+        return invoke(new Callable<Win32ShellFolder2>() {
+            public Win32ShellFolder2 call() throws InterruptedException {
                 long pIShellFolder = getIShellFolder();
-                long pEnumObjects = getEnumObjects(pIShellFolder, true);
+                long pEnumObjects = getEnumObjects(true);
                 Win32ShellFolder2 child = null;
-                long childPIDL = 0;
+                long childPIDL;
 
                 while ((childPIDL = getNextChild(pEnumObjects)) != 0) {
                     if (getAttributes0(pIShellFolder, childPIDL, ATTRIB_FILESYSTEM) != 0) {
@@ -753,7 +756,7 @@ final class Win32ShellFolder2 extends ShellFolder {
                 releaseEnumObjects(pEnumObjects);
                 return child;
             }
-        });
+        }, InterruptedException.class);
     }
 
     private Boolean cachedIsLink;
@@ -791,8 +794,8 @@ final class Win32ShellFolder2 extends ShellFolder {
     }
 
     private ShellFolder getLinkLocation(final boolean resolve) {
-        return ShellFolder.getInvoker().invoke(new Callable<ShellFolder>() {
-            public ShellFolder call() throws Exception {
+        return invoke(new Callable<ShellFolder>() {
+            public ShellFolder call() {
                 if (!isLink()) {
                     return null;
                 }
@@ -805,6 +808,8 @@ final class Win32ShellFolder2 extends ShellFolder {
                         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
@@ -816,19 +821,12 @@ final class Win32ShellFolder2 extends ShellFolder {
     }
 
     // Parse a display name into a PIDL relative to the current IShellFolder.
-    long parseDisplayName(final String name) throws FileNotFoundException {
-        try {
-            return ShellFolder.getInvoker().invoke(new Callable<Long>() {
-                public Long call() throws Exception {
-                    return parseDisplayName0(getIShellFolder(), name);
-                }
-            });
-        } catch (RuntimeException e) {
-            if (e.getCause() instanceof IOException) {
-                throw new FileNotFoundException("Could not find file " + name);
+    long parseDisplayName(final String name) throws IOException, InterruptedException {
+        return invoke(new Callable<Long>() {
+            public Long call() throws IOException {
+                return parseDisplayName0(getIShellFolder(), name);
             }
-            throw e;
-        }
+        }, IOException.class);
     }
 
     // NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details
@@ -846,8 +844,8 @@ final class Win32ShellFolder2 extends ShellFolder {
     public String getDisplayName() {
         if (displayName == null) {
             displayName =
-                ShellFolder.getInvoker().invoke(new Callable<String>() {
-                    public String call() throws Exception {
+                invoke(new Callable<String>() {
+                    public String call() {
                         return getDisplayNameOf(getParentIShellFolder(),
                                 getRelativePIDL(), SHGDN_NORMAL);
                     }
@@ -867,8 +865,8 @@ final class Win32ShellFolder2 extends ShellFolder {
         if (folderType == null) {
             final long absolutePIDL = getAbsolutePIDL();
             folderType =
-                ShellFolder.getInvoker().invoke(new Callable<String>() {
-                    public String call() throws Exception {
+                invoke(new Callable<String>() {
+                    public String call() {
                         return getFolderType(absolutePIDL);
                     }
                 });
@@ -926,15 +924,12 @@ final class Win32ShellFolder2 extends ShellFolder {
 
     public static native int[] getFileChooserBitmapBits();
 
+    // Should be called from the COM thread
     private long getIShellIcon() {
         if (pIShellIcon == -1L) {
-            pIShellIcon =
-                ShellFolder.getInvoker().invoke(new Callable<Long>() {
-                    public Long call() throws Exception {
-                        return getIShellIcon(getIShellFolder());
-                    }
-                });
+            pIShellIcon = getIShellIcon(getIShellFolder());
         }
+
         return pIShellIcon;
     }
 
@@ -988,8 +983,8 @@ final class Win32ShellFolder2 extends ShellFolder {
         Image icon = getLargeIcon ? largeIcon : smallIcon;
         if (icon == null) {
             icon =
-                ShellFolder.getInvoker().invoke(new Callable<Image>() {
-                    public Image call() throws Exception {
+                invoke(new Callable<Image>() {
+                    public Image call() {
                         Image newIcon = null;
                         if (isFileSystem()) {
                             long parentIShellIcon = (parent != null)
@@ -1113,8 +1108,8 @@ final class Win32ShellFolder2 extends ShellFolder {
     private static final int LVCFMT_CENTER = 2;
 
     public ShellFolderColumnInfo[] getFolderColumns() {
-        return ShellFolder.getInvoker().invoke(new Callable<ShellFolderColumnInfo[]>() {
-            public ShellFolderColumnInfo[] call() throws Exception {
+        return invoke(new Callable<ShellFolderColumnInfo[]>() {
+            public ShellFolderColumnInfo[] call() {
                 ShellFolderColumnInfo[] columns = doGetColumnInfo(getIShellFolder());
 
                 if (columns != null) {
@@ -1143,8 +1138,8 @@ final class Win32ShellFolder2 extends ShellFolder {
     }
 
     public Object getFolderColumnValue(final int column) {
-        return ShellFolder.getInvoker().invoke(new Callable<Object>() {
-            public Object call() throws Exception {
+        return invoke(new Callable<Object>() {
+            public Object call() {
                 return doGetColumnValue(getParentIShellFolder(), getRelativePIDL(), column);
             }
         });
@@ -1163,8 +1158,8 @@ final class Win32ShellFolder2 extends ShellFolder {
     public void sortChildren(final List<? extends File> files) {
         // To avoid loads of synchronizations with Invoker and improve performance we
         // synchronize the whole code of the sort method once
-        getInvoker().invoke(new Callable<Void>() {
-            public Void call() throws Exception {
+        invoke(new Callable<Void>() {
+            public Void call() {
                 Collections.sort(files, new ColumnComparator(getIShellFolder(), 0));
 
                 return null;
@@ -1184,19 +1179,21 @@ final class Win32ShellFolder2 extends ShellFolder {
 
         // compares 2 objects within this folder by the specified column
         public int compare(final File o, final File o1) {
-            return ShellFolder.getInvoker().invoke(new Callable<Integer>() {
-                public Integer call() throws Exception {
+            Integer result = invoke(new Callable<Integer>() {
+                public Integer call() {
                     if (o instanceof Win32ShellFolder2
-                            && o1 instanceof Win32ShellFolder2) {
+                        && o1 instanceof Win32ShellFolder2) {
                         // delegates comparison to native method
                         return compareIDsByColumn(parentIShellFolder,
-                                ((Win32ShellFolder2) o).getRelativePIDL(),
-                                ((Win32ShellFolder2) o1).getRelativePIDL(),
-                                columnIdx);
+                            ((Win32ShellFolder2) o).getRelativePIDL(),
+                            ((Win32ShellFolder2) o1).getRelativePIDL(),
+                            columnIdx);
                     }
                     return 0;
                 }
             });
+
+            return result == null ? 0 : result;
         }
     }
 }
diff --git a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
index 1586846357e..8b692fa685a 100644
--- a/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
+++ b/jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -58,10 +58,15 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
     }
 
     public ShellFolder createShellFolder(File file) throws FileNotFoundException {
-        return createShellFolder(getDesktop(), file);
+        try {
+            return createShellFolder(getDesktop(), file);
+        } catch (InterruptedException e) {
+            throw new FileNotFoundException("Execution was interrupted");
+        }
     }
 
-    static Win32ShellFolder2 createShellFolder(Win32ShellFolder2 parent, File file) throws FileNotFoundException {
+    static Win32ShellFolder2 createShellFolder(Win32ShellFolder2 parent, File file)
+            throws FileNotFoundException, InterruptedException {
         long pIDL;
         try {
             pIDL = parent.parseDisplayName(file.getCanonicalPath());
@@ -77,7 +82,8 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
         return folder;
     }
 
-    static Win32ShellFolder2 createShellFolderFromRelativePIDL(Win32ShellFolder2 parent, long pIDL) {
+    static Win32ShellFolder2 createShellFolderFromRelativePIDL(Win32ShellFolder2 parent, long pIDL)
+            throws InterruptedException {
         // Walk down this relative pIDL, creating new nodes for each of the entries
         while (pIDL != 0) {
             long curPIDL = Win32ShellFolder2.copyFirstPIDLEntry(pIDL);
@@ -99,16 +105,20 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
     private static Win32ShellFolder2 network;
     private static Win32ShellFolder2 personal;
 
-    private static String osVersion = System.getProperty("os.version");
-    private static final boolean useShell32Icons =
-                        (osVersion != null && osVersion.compareTo("5.1") >= 0);
+    private static final boolean USE_SHELL32_ICONS = AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+        public Boolean run() {
+            return OSInfo.getWindowsVersion().compareTo(OSInfo.WINDOWS_XP) >= 0;
+        }
+    });
 
     static Win32ShellFolder2 getDesktop() {
         if (desktop == null) {
             try {
                 desktop = new Win32ShellFolder2(DESKTOP);
             } catch (IOException e) {
-                desktop = null;
+                // Ignore error
+            } catch (InterruptedException e) {
+                // Ignore error
             }
         }
         return desktop;
@@ -119,7 +129,9 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
             try {
                 drives = new Win32ShellFolder2(DRIVES);
             } catch (IOException e) {
-                drives = null;
+                // Ignore error
+            } catch (InterruptedException e) {
+                // Ignore error
             }
         }
         return drives;
@@ -132,8 +144,10 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
                 if (path != null) {
                     recent = createShellFolder(getDesktop(), new File(path));
                 }
+            } catch (InterruptedException e) {
+                // Ignore error
             } catch (IOException e) {
-                recent = null;
+                // Ignore error
             }
         }
         return recent;
@@ -144,7 +158,9 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
             try {
                 network = new Win32ShellFolder2(NETWORK);
             } catch (IOException e) {
-                network = null;
+                // Ignore error
+            } catch (InterruptedException e) {
+                // Ignore error
             }
         }
         return network;
@@ -164,8 +180,10 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
                         personal.setIsPersonal();
                     }
                 }
+            } catch (InterruptedException e) {
+                // Ignore error
             } catch (IOException e) {
-                personal = null;
+                // Ignore error
             }
         }
         return personal;
@@ -267,6 +285,9 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
                     }
                 } catch (IOException e) {
                     // Skip this value
+                } catch (InterruptedException e) {
+                    // Return empty result
+                    return new File[0];
                 }
             } while (value != null);
 
@@ -288,15 +309,15 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
                 i = Integer.parseInt(name);
             } catch (NumberFormatException ex) {
                 if (name.equals("ListView")) {
-                    i = (useShell32Icons) ? 21 : 2;
+                    i = (USE_SHELL32_ICONS) ? 21 : 2;
                 } else if (name.equals("DetailsView")) {
-                    i = (useShell32Icons) ? 23 : 3;
+                    i = (USE_SHELL32_ICONS) ? 23 : 3;
                 } else if (name.equals("UpFolder")) {
-                    i = (useShell32Icons) ? 28 : 8;
+                    i = (USE_SHELL32_ICONS) ? 28 : 8;
                 } else if (name.equals("NewFolder")) {
-                    i = (useShell32Icons) ? 31 : 11;
+                    i = (USE_SHELL32_ICONS) ? 31 : 11;
                 } else if (name.equals("ViewMenu")) {
-                    i = (useShell32Icons) ? 21 : 2;
+                    i = (USE_SHELL32_ICONS) ? 21 : 2;
                 }
             }
             if (i >= 0) {
@@ -333,11 +354,16 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
      * Does <code>dir</code> represent a "computer" such as a node on the network, or
      * "My Computer" on the desktop.
      */
-    public boolean isComputerNode(File dir) {
+    public boolean isComputerNode(final File dir) {
         if (dir != null && dir == getDrives()) {
             return true;
         } else {
-            String path = dir.getAbsolutePath();
+            String path = AccessController.doPrivileged(new PrivilegedAction<String>() {
+                public String run() {
+                    return dir.getAbsolutePath();
+                }
+            });
+
             return (path.startsWith("\\\\") && path.indexOf("\\", 2) < 0);      //Network path
         }
     }
@@ -476,33 +502,45 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
             return comThread;
         }
 
-        public <T> T invoke(Callable<T> task) {
-            try {
-                if (Thread.currentThread() == comThread) {
-                    // if it's already called from the COM
-                    // thread, we don't need to delegate the task
-                    return task.call();
-                } else {
-                    while (true) {
-                        Future<T> future = submit(task);
+        public <T> T invoke(Callable<T> task) throws Exception {
+            if (Thread.currentThread() == comThread) {
+                // if it's already called from the COM
+                // thread, we don't need to delegate the task
+                return task.call();
+            } else {
+                final Future<T> future;
 
-                        try {
-                            return future.get();
-                        } catch (InterruptedException e) {
-                            // Repeat the attempt
+                try {
+                    future = submit(task);
+                } catch (RejectedExecutionException e) {
+                    throw new InterruptedException(e.getMessage());
+                }
+
+                try {
+                    return future.get();
+                } catch (InterruptedException e) {
+                    AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                        public Void run() {
                             future.cancel(true);
+
+                            return null;
                         }
+                    });
+
+                    throw e;
+                } catch (ExecutionException e) {
+                    Throwable cause = e.getCause();
+
+                    if (cause instanceof Exception) {
+                        throw (Exception) cause;
                     }
+
+                    if (cause instanceof Error) {
+                        throw (Error) cause;
+                    }
+
+                    throw new RuntimeException("Unexpected error", cause);
                 }
-            } catch (Exception e) {
-                Throwable cause = (e instanceof ExecutionException) ? e.getCause() : e;
-                if (cause instanceof RuntimeException) {
-                    throw (RuntimeException) cause;
-                }
-                if (cause instanceof Error) {
-                    throw (Error) cause;
-                }
-                throw new RuntimeException(cause);
             }
         }
     }
diff --git a/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties b/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties
index a4e8e83ff79..b3aef483fd4 100644
--- a/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties
+++ b/jdk/src/windows/classes/sun/awt/windows/fontconfig.properties
@@ -1,6 +1,6 @@
 #
 # 
-# Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -31,8 +31,11 @@ version=1
 # Component Font Mappings
 
 allfonts.chinese-ms936=SimSun
+allfonts.chinese-ms936-extb=SimSun-ExtB
 allfonts.chinese-gb18030=SimSun-18030
+allfonts.chinese-gb18030-extb=SimSun-ExtB
 allfonts.chinese-hkscs=MingLiU_HKSCS
+allfonts.chinese-ms950-extb=MingLiU-ExtB
 allfonts.devanagari=Mangal
 allfonts.dingbats=Wingdings
 allfonts.lucida=Lucida Sans Regular
@@ -41,120 +44,140 @@ allfonts.thai=Lucida Sans Regular
 
 serif.plain.alphabetic=Times New Roman
 serif.plain.chinese-ms950=MingLiU
+serif.plain.chinese-ms950-extb=MingLiU-ExtB
 serif.plain.hebrew=David
 serif.plain.japanese=MS Mincho
 serif.plain.korean=Batang
 
 serif.bold.alphabetic=Times New Roman Bold
 serif.bold.chinese-ms950=PMingLiU
+serif.bold.chinese-ms950-extb=PMingLiU-ExtB
 serif.bold.hebrew=David Bold
 serif.bold.japanese=MS Mincho
 serif.bold.korean=Batang
 
 serif.italic.alphabetic=Times New Roman Italic
 serif.italic.chinese-ms950=PMingLiU
+serif.italic.chinese-ms950-extb=PMingLiU-ExtB
 serif.italic.hebrew=David
 serif.italic.japanese=MS Mincho
 serif.italic.korean=Batang
 
 serif.bolditalic.alphabetic=Times New Roman Bold Italic
 serif.bolditalic.chinese-ms950=PMingLiU
+serif.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 serif.bolditalic.hebrew=David Bold
 serif.bolditalic.japanese=MS Mincho
 serif.bolditalic.korean=Batang
 
 sansserif.plain.alphabetic=Arial
 sansserif.plain.chinese-ms950=MingLiU
+sansserif.plain.chinese-ms950-extb=MingLiU-ExtB
 sansserif.plain.hebrew=David
 sansserif.plain.japanese=MS Gothic
 sansserif.plain.korean=Gulim
 
 sansserif.bold.alphabetic=Arial Bold
 sansserif.bold.chinese-ms950=PMingLiU
+sansserif.bold.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.bold.hebrew=David Bold
 sansserif.bold.japanese=MS Gothic
 sansserif.bold.korean=Gulim
 
 sansserif.italic.alphabetic=Arial Italic
 sansserif.italic.chinese-ms950=PMingLiU
+sansserif.italic.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.italic.hebrew=David
 sansserif.italic.japanese=MS Gothic
 sansserif.italic.korean=Gulim
 
 sansserif.bolditalic.alphabetic=Arial Bold Italic
 sansserif.bolditalic.chinese-ms950=PMingLiU
+sansserif.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 sansserif.bolditalic.hebrew=David Bold
 sansserif.bolditalic.japanese=MS Gothic
 sansserif.bolditalic.korean=Gulim
 
 monospaced.plain.alphabetic=Courier New
 monospaced.plain.chinese-ms950=MingLiU
+monospaced.plain.chinese-ms950-extb=MingLiU-ExtB
 monospaced.plain.hebrew=David
 monospaced.plain.japanese=MS Gothic
 monospaced.plain.korean=GulimChe
 
 monospaced.bold.alphabetic=Courier New Bold
 monospaced.bold.chinese-ms950=PMingLiU
+monospaced.bold.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.bold.hebrew=David Bold
 monospaced.bold.japanese=MS Gothic
 monospaced.bold.korean=GulimChe
 
 monospaced.italic.alphabetic=Courier New Italic
 monospaced.italic.chinese-ms950=PMingLiU
+monospaced.italic.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.italic.hebrew=David
 monospaced.italic.japanese=MS Gothic
 monospaced.italic.korean=GulimChe
 
 monospaced.bolditalic.alphabetic=Courier New Bold Italic
 monospaced.bolditalic.chinese-ms950=PMingLiU
+monospaced.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 monospaced.bolditalic.hebrew=David Bold
 monospaced.bolditalic.japanese=MS Gothic
 monospaced.bolditalic.korean=GulimChe
 
 dialog.plain.alphabetic=Arial
 dialog.plain.chinese-ms950=MingLiU
+dialog.plain.chinese-ms950-extb=MingLiU-ExtB
 dialog.plain.hebrew=David
 dialog.plain.japanese=MS Gothic
 dialog.plain.korean=Gulim
 
 dialog.bold.alphabetic=Arial Bold
 dialog.bold.chinese-ms950=PMingLiU
+dialog.bold.chinese-ms950-extb=PMingLiU-ExtB
 dialog.bold.hebrew=David Bold
 dialog.bold.japanese=MS Gothic
 dialog.bold.korean=Gulim
 
 dialog.italic.alphabetic=Arial Italic
 dialog.italic.chinese-ms950=PMingLiU
+dialog.italic.chinese-ms950-extb=PMingLiU-ExtB
 dialog.italic.hebrew=David
 dialog.italic.japanese=MS Gothic
 dialog.italic.korean=Gulim
 
 dialog.bolditalic.alphabetic=Arial Bold Italic
 dialog.bolditalic.chinese-ms950=PMingLiU
+dialog.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 dialog.bolditalic.hebrew=David Bold
 dialog.bolditalic.japanese=MS Gothic
 dialog.bolditalic.korean=Gulim
 
 dialoginput.plain.alphabetic=Courier New
 dialoginput.plain.chinese-ms950=MingLiU
+dialoginput.plain.chinese-ms950-extb=MingLiU-ExtB
 dialoginput.plain.hebrew=David
 dialoginput.plain.japanese=MS Gothic
 dialoginput.plain.korean=Gulim
 
 dialoginput.bold.alphabetic=Courier New Bold
 dialoginput.bold.chinese-ms950=PMingLiU
+dialoginput.bold.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.bold.hebrew=David Bold
 dialoginput.bold.japanese=MS Gothic
 dialoginput.bold.korean=Gulim
 
 dialoginput.italic.alphabetic=Courier New Italic
 dialoginput.italic.chinese-ms950=PMingLiU
+dialoginput.italic.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.italic.hebrew=David
 dialoginput.italic.japanese=MS Gothic
 dialoginput.italic.korean=Gulim
 
 dialoginput.bolditalic.alphabetic=Courier New Bold Italic
 dialoginput.bolditalic.chinese-ms950=PMingLiU
+dialoginput.bolditalic.chinese-ms950-extb=PMingLiU-ExtB
 dialoginput.bolditalic.hebrew=David Bold
 dialoginput.bolditalic.japanese=MS Gothic
 dialoginput.bolditalic.korean=Gulim
@@ -163,31 +186,32 @@ dialoginput.bolditalic.korean=Gulim
 
 sequence.allfonts=alphabetic/default,dingbats,symbol
 
-sequence.serif.GBK=alphabetic,chinese-ms936,dingbats,symbol
-sequence.sansserif.GBK=alphabetic,chinese-ms936,dingbats,symbol
-sequence.monospaced.GBK=chinese-ms936,alphabetic,dingbats,symbol
-sequence.dialog.GBK=alphabetic,chinese-ms936,dingbats,symbol
-sequence.dialoginput.GBK=alphabetic,chinese-ms936,dingbats,symbol
+sequence.serif.GBK=alphabetic,chinese-ms936,dingbats,symbol,chinese-ms936-extb
+sequence.sansserif.GBK=alphabetic,chinese-ms936,dingbats,symbol,chinese-ms936-extb
+sequence.monospaced.GBK=chinese-ms936,alphabetic,dingbats,symbol,chinese-ms936-extb
+sequence.dialog.GBK=alphabetic,chinese-ms936,dingbats,symbol,chinese-ms936-extb
+sequence.dialoginput.GBK=alphabetic,chinese-ms936,dingbats,symbol,chinese-ms936-extb
 
-sequence.serif.GB18030=alphabetic,chinese-gb18030,dingbats,symbol
-sequence.sansserif.GB18030=alphabetic,chinese-gb18030,dingbats,symbol
-sequence.monospaced.GB18030=chinese-gb18030,alphabetic,dingbats,symbol
-sequence.dialog.GB18030=alphabetic,chinese-gb18030,dingbats,symbol
-sequence.dialoginput.GB18030=alphabetic,chinese-gb18030,dingbats,symbol
+sequence.serif.GB18030=alphabetic,chinese-gb18030,dingbats,symbol,chinese-gb18030-extb
+sequence.sansserif.GB18030=alphabetic,chinese-gb18030,dingbats,symbol,chinese-gb18030-extb
+sequence.monospaced.GB18030=chinese-gb18030,alphabetic,dingbats,symbol,chinese-gb18030-extb
+sequence.dialog.GB18030=alphabetic,chinese-gb18030,dingbats,symbol,chinese-gb18030-extb
+sequence.dialoginput.GB18030=alphabetic,chinese-gb18030,dingbats,symbol,chinese-gb18030-extb
 
-sequence.serif.x-windows-950=alphabetic,chinese-ms950,dingbats,symbol
-sequence.sansserif.x-windows-950=alphabetic,chinese-ms950,dingbats,symbol
-sequence.monospaced.x-windows-950=chinese-ms950,alphabetic,dingbats,symbol
-sequence.dialog.x-windows-950=alphabetic,chinese-ms950,dingbats,symbol
-sequence.dialoginput.x-windows-950=alphabetic,chinese-ms950,dingbats,symbol
+sequence.serif.x-windows-950=alphabetic,chinese-ms950,dingbats,symbol,chinese-ms950-extb
+sequence.sansserif.x-windows-950=alphabetic,chinese-ms950,dingbats,symbol,chinese-ms950-extb
+sequence.monospaced.x-windows-950=chinese-ms950,alphabetic,dingbats,symbol,chinese-ms950-extb
+sequence.dialog.x-windows-950=alphabetic,chinese-ms950,dingbats,symbol,chinese-ms950-extb
+sequence.dialoginput.x-windows-950=alphabetic,chinese-ms950,dingbats,symbol,chinese-ms950-extb
 
-sequence.serif.x-MS950-HKSCS=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol
-sequence.sansserif.x-MS950-HKSCS=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol
-sequence.monospaced.x-MS950-HKSCS=chinese-ms950,alphabetic,chinese-hkscs,dingbats,symbol
-sequence.dialog.x-MS950-HKSCS=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol
-sequence.dialoginput.x-MS950-HKSCS=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol
+sequence.serif.x-MS950-HKSCS=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol,chinese-ms950-extb
+sequence.sansserif.x-MS950-HKSCS=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol,chinese-ms950-extb
+sequence.monospaced.x-MS950-HKSCS=chinese-ms950,alphabetic,chinese-hkscs,dingbats,symbol,chinese-ms950-extb
+sequence.dialog.x-MS950-HKSCS=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol,chinese-ms950-extb
+sequence.dialoginput.x-MS950-HKSCS=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol,chinese-ms950-extb
 
 sequence.allfonts.UTF-8.hi=alphabetic/1252,devanagari,dingbats,symbol
+sequence.allfonts.UTF-8.ja=alphabetic,japanese,devanagari,dingbats,symbol
 
 sequence.allfonts.windows-1255=hebrew,alphabetic/1252,dingbats,symbol
 
@@ -207,7 +231,7 @@ sequence.allfonts.x-windows-874=alphabetic,thai,dingbats,symbol
 
 sequence.fallback=lucida,\
                   chinese-ms950,chinese-hkscs,chinese-ms936,chinese-gb18030,\
-                  japanese,korean
+                  japanese,korean,chinese-ms950-extb,chinese-ms936-extb
 
 # Exclusion Ranges
 
@@ -220,6 +244,7 @@ exclusion.hebrew=0041-005a,0060-007a,007f-00ff,20ac-20ac
 proportional.MS_Gothic=MS PGothic
 proportional.MS_Mincho=MS PMincho
 proportional.MingLiU=PMingLiU
+proportional.MingLiU-ExtB=PMingLiU-ExtB
 
 # Font File Names
 
@@ -240,9 +265,12 @@ filename.Times_New_Roman_Bold_Italic=TIMESBI.TTF
 
 filename.SimSun=SIMSUN.TTC
 filename.SimSun-18030=SIMSUN18030.TTC
+filename.SimSun-ExtB=SIMSUNB.TTF
 
 filename.MingLiU=MINGLIU.TTC
+filename.MingLiU-ExtB=MINGLIUB.TTC
 filename.PMingLiU=MINGLIU.TTC
+filename.PMingLiU-ExtB=MINGLIUB.TTC
 filename.MingLiU_HKSCS=hkscsm3u.ttf
 
 filename.David=DAVID.TTF
diff --git a/jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java b/jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
index 3192c52d030..9df86326e40 100644
--- a/jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
+++ b/jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
@@ -25,12 +25,14 @@
 
 package sun.net.www.protocol.jar;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.jar.*;
-import java.util.zip.ZipFile;
+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.
@@ -41,13 +43,13 @@ import java.security.Permission;
 class JarFileFactory implements URLJarFile.URLJarFileCloseController {
 
     /* the url to file cache */
-    private static HashMap fileCache = new HashMap();
+    private static HashMap<String, JarFile> fileCache = new HashMap<String, JarFile>();
 
     /* the file to url cache */
-    private static HashMap urlCache = new HashMap();
+    private static HashMap<JarFile, URL> urlCache = new HashMap<JarFile, URL>();
 
     URLConnection getConnection(JarFile jarFile) throws IOException {
-        URL u = (URL)urlCache.get(jarFile);
+        URL u = urlCache.get(jarFile);
         if (u != null)
             return u.openConnection();
 
@@ -82,7 +84,7 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
                 synchronized (this) {
                     result = getCachedJarFile(url);
                     if (result == null) {
-                        fileCache.put(url, local_result);
+                        fileCache.put(URLUtil.urlNoFragString(url), local_result);
                         urlCache.put(local_result, url);
                         result = local_result;
                     } else {
@@ -107,14 +109,14 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
      * remove the JarFile from the cache
      */
     public void close(JarFile jarFile) {
-        URL urlRemoved = (URL) urlCache.remove(jarFile);
+        URL urlRemoved = urlCache.remove(jarFile);
         if( urlRemoved != null) {
-                fileCache.remove(urlRemoved);
+                fileCache.remove(URLUtil.urlNoFragString(urlRemoved));
         }
     }
 
     private JarFile getCachedJarFile(URL url) {
-        JarFile result = (JarFile)fileCache.get(url);
+        JarFile result = fileCache.get(URLUtil.urlNoFragString(url));
 
         /* if the JAR file is cached, the permission will always be there */
         if (result != null) {
diff --git a/jdk/src/windows/classes/sun/nio/ch/Iocp.java b/jdk/src/windows/classes/sun/nio/ch/Iocp.java
index b4c2cdef61e..97467fc7c00 100644
--- a/jdk/src/windows/classes/sun/nio/ch/Iocp.java
+++ b/jdk/src/windows/classes/sun/nio/ch/Iocp.java
@@ -34,6 +34,8 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.security.AccessController;
+import sun.security.action.GetPropertyAction;
 import sun.misc.Unsafe;
 
 /**
@@ -44,6 +46,7 @@ import sun.misc.Unsafe;
 class Iocp extends AsynchronousChannelGroupImpl {
     private static final Unsafe unsafe = Unsafe.getUnsafe();
     private static final long INVALID_HANDLE_VALUE  = -1L;
+    private static final boolean supportsThreadAgnosticIo;
 
     // maps completion key to channel
     private final ReadWriteLock keyToChannelLock = new ReentrantReadWriteLock();
@@ -87,6 +90,13 @@ class Iocp extends AsynchronousChannelGroupImpl {
         <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) {
@@ -216,8 +226,9 @@ class Iocp extends AsynchronousChannelGroupImpl {
             } while ((key == 0) || keyToChannel.containsKey(key));
 
             // associate with I/O completion port
-            if (handle != 0L)
+            if (handle != 0L) {
                 createIoCompletionPort(handle, port, key, 0);
+            }
 
             // setup mapping
             keyToChannel.put(key, ch);
@@ -282,7 +293,7 @@ class Iocp extends AsynchronousChannelGroupImpl {
         /**
          * Invoked if the I/O operation completes successfully.
          */
-        public void completed(int bytesTransferred);
+        public void completed(int bytesTransferred, boolean canInvokeDirect);
 
         /**
          * Invoked if the I/O operation fails.
@@ -305,6 +316,7 @@ class Iocp extends AsynchronousChannelGroupImpl {
         public void run() {
             Invoker.GroupAndInvokeCount myGroupAndInvokeCount =
                 Invoker.getGroupAndInvokeCount();
+            boolean canInvokeDirect = (myGroupAndInvokeCount != null);
             CompletionStatus ioResult = new CompletionStatus();
             boolean replaceMe = false;
 
@@ -382,7 +394,7 @@ class Iocp extends AsynchronousChannelGroupImpl {
                     ResultHandler rh = (ResultHandler)result.getContext();
                     replaceMe = true; // (if error/exception then replace thread)
                     if (error == 0) {
-                        rh.completed(ioResult.bytesTransferred());
+                        rh.completed(ioResult.bytesTransferred(), canInvokeDirect);
                     } else {
                         rh.failed(error, translateErrorToIOException(error));
                     }
@@ -433,5 +445,11 @@ class Iocp extends AsynchronousChannelGroupImpl {
     static {
         Util.load();
         initIDs();
+
+        // thread agnostic I/O on Vista/2008 or newer
+        String osversion = AccessController.doPrivileged(
+            new GetPropertyAction("os.version"));
+        String vers[] = osversion.split("\\.");
+        supportsThreadAgnosticIo = Integer.parseInt(vers[0]) >= 6;
     }
 }
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
index e08f460d919..0b43ab0d516 100644
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java
@@ -146,10 +146,12 @@ public class WindowsAsynchronousFileChannelImpl
         // waits until all I/O operations have completed
         ioCache.close();
 
-        // disassociate from port and shutdown thread pool if not default
+        // disassociate from port
         iocp.disassociate(completionKey);
+
+        // for the non-default group close the port
         if (!isDefaultIocp)
-            iocp.shutdown();
+            iocp.detachFromThreadPool();
     }
 
     @Override
@@ -258,14 +260,18 @@ public class WindowsAsynchronousFileChannelImpl
             }
 
             // invoke completion handler
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
 
         @Override
-        public void completed(int bytesTransferred) {
+        public void completed(int bytesTransferred, boolean canInvokeDirect) {
             // release waiters and invoke completion handler
             result.setResult(fli);
-            Invoker.invoke(result.handler(), result);
+            if (canInvokeDirect) {
+                Invoker.invokeUnchecked(result);
+            } else {
+                Invoker.invoke(result);
+            }
         }
 
         @Override
@@ -279,16 +285,16 @@ public class WindowsAsynchronousFileChannelImpl
             } else {
                 result.setFailure(new AsynchronousCloseException());
             }
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
     }
 
     @Override
-    public <A> Future<FileLock> lock(long position,
-                                     long size,
-                                     boolean shared,
-                                     A attachment,
-                                     CompletionHandler<FileLock,? super A> handler)
+    <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();
@@ -298,10 +304,11 @@ public class WindowsAsynchronousFileChannelImpl
         // add to lock table
         FileLockImpl fli = addToFileLockTable(position, size, shared);
         if (fli == null) {
-            CompletedFuture<FileLock,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            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
@@ -310,13 +317,20 @@ public class WindowsAsynchronousFileChannelImpl
         LockTask lockTask = new LockTask<A>(position, fli, result);
         result.setContext(lockTask);
 
-        // initiate I/O (can only be done from thread in thread pool)
-        try {
-            Invoker.invokeOnThreadInThreadPool(this, lockTask);
-        } catch (ShutdownChannelGroupException e) {
-            // rollback
-            removeFromFileLockTable(fli);
-            throw e;
+        // initiate I/O
+        if (Iocp.supportsThreadAgnosticIo()) {
+            lockTask.run();
+        } else {
+            boolean executed = false;
+            try {
+                Invoker.invokeOnThreadInThreadPool(this, lockTask);
+                executed = true;
+            } finally {
+                if (!executed) {
+                    // rollback
+                    removeFromFileLockTable(fli);
+                }
+            }
         }
         return result;
     }
@@ -461,14 +475,14 @@ public class WindowsAsynchronousFileChannelImpl
             releaseBufferIfSubstituted();
 
             // invoke completion handler
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
 
         /**
          * Executed when the I/O has completed
          */
         @Override
-        public void completed(int bytesTransferred) {
+        public void completed(int bytesTransferred, boolean canInvokeDirect) {
             updatePosition(bytesTransferred);
 
             // return direct buffer to cache if substituted
@@ -476,14 +490,18 @@ public class WindowsAsynchronousFileChannelImpl
 
             // release waiters and invoke completion handler
             result.setResult(bytesTransferred);
-            Invoker.invoke(result.handler(), result);
+            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);
+                completed(-1, false);
             } else {
                 // return direct buffer to cache if substituted
                 releaseBufferIfSubstituted();
@@ -494,16 +512,16 @@ public class WindowsAsynchronousFileChannelImpl
                 } else {
                     result.setFailure(new AsynchronousCloseException());
                 }
-                Invoker.invoke(result.handler(), result);
+                Invoker.invoke(result);
             }
         }
     }
 
     @Override
-    public <A> Future<Integer> read(ByteBuffer dst,
-                                    long position,
-                                    A attachment,
-                                    CompletionHandler<Integer,? super A> handler)
+    <A> Future<Integer> implRead(ByteBuffer dst,
+                                 long position,
+                                 A attachment,
+                                 CompletionHandler<Integer,? super A> handler)
     {
         if (!reading)
             throw new NonReadableChannelException();
@@ -514,10 +532,11 @@ public class WindowsAsynchronousFileChannelImpl
 
         // check if channel is closed
         if (!isOpen()) {
-            CompletedFuture<Integer,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            Throwable exc = new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withFailure(exc);
+            Invoker.invoke(this, handler, attachment, null, exc);
+            return null;
         }
 
         int pos = dst.position();
@@ -527,10 +546,10 @@ public class WindowsAsynchronousFileChannelImpl
 
         // no space remaining
         if (rem == 0) {
-            CompletedFuture<Integer,A> result =
-                CompletedFuture.withResult(this, 0, attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            if (handler == null)
+                return CompletedFuture.withResult(0);
+            Invoker.invoke(this, handler, attachment, 0, null);
+            return null;
         }
 
         // create Future and task that initiates read
@@ -539,8 +558,12 @@ public class WindowsAsynchronousFileChannelImpl
         ReadTask readTask = new ReadTask<A>(dst, pos, rem, position, result);
         result.setContext(readTask);
 
-        // initiate I/O (can only be done from thread in thread pool)
-        Invoker.invokeOnThreadInThreadPool(this, readTask);
+        // initiate I/O
+        if (Iocp.supportsThreadAgnosticIo()) {
+            readTask.run();
+        } else {
+            Invoker.invokeOnThreadInThreadPool(this, readTask);
+        }
         return result;
     }
 
@@ -639,14 +662,14 @@ public class WindowsAsynchronousFileChannelImpl
             }
 
             // invoke completion handler
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
 
         /**
          * Executed when the I/O has completed
          */
         @Override
-        public void completed(int bytesTransferred) {
+        public void completed(int bytesTransferred, boolean canInvokeDirect) {
             updatePosition(bytesTransferred);
 
             // return direct buffer to cache if substituted
@@ -654,7 +677,11 @@ public class WindowsAsynchronousFileChannelImpl
 
             // release waiters and invoke completion handler
             result.setResult(bytesTransferred);
-            Invoker.invoke(result.handler(), result);
+            if (canInvokeDirect) {
+                Invoker.invokeUnchecked(result);
+            } else {
+                Invoker.invoke(result);
+            }
         }
 
         @Override
@@ -668,15 +695,14 @@ public class WindowsAsynchronousFileChannelImpl
             } else {
                 result.setFailure(new AsynchronousCloseException());
             }
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
     }
 
-    @Override
-    public <A> Future<Integer> write(ByteBuffer src,
-                                     long position,
-                                     A attachment,
-                                     CompletionHandler<Integer,? super A> handler)
+    <A> Future<Integer> implWrite(ByteBuffer src,
+                                  long position,
+                                  A attachment,
+                                  CompletionHandler<Integer,? super A> handler)
     {
         if (!writing)
             throw new NonWritableChannelException();
@@ -685,10 +711,11 @@ public class WindowsAsynchronousFileChannelImpl
 
         // check if channel is closed
         if (!isOpen()) {
-            CompletedFuture<Integer,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+           Throwable exc = new ClosedChannelException();
+            if (handler == null)
+                return CompletedFuture.withFailure(exc);
+            Invoker.invoke(this, handler, attachment, null, exc);
+            return null;
         }
 
         int pos = src.position();
@@ -698,10 +725,10 @@ public class WindowsAsynchronousFileChannelImpl
 
         // nothing to write
         if (rem == 0) {
-            CompletedFuture<Integer,A> result =
-                CompletedFuture.withResult(this, 0, attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            if (handler == null)
+                return CompletedFuture.withResult(0);
+            Invoker.invoke(this, handler, attachment, 0, null);
+            return null;
         }
 
         // create Future and task to initiate write
@@ -710,8 +737,12 @@ public class WindowsAsynchronousFileChannelImpl
         WriteTask writeTask = new WriteTask<A>(src, pos, rem, position, result);
         result.setContext(writeTask);
 
-        // initiate I/O (can only be done from thread in thread pool)
-        Invoker.invokeOnThreadInThreadPool(this, writeTask);
+        // initiate I/O
+        if (Iocp.supportsThreadAgnosticIo()) {
+            writeTask.run();
+        } else {
+            Invoker.invokeOnThreadInThreadPool(this, writeTask);
+        }
         return result;
     }
 
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
index 8efb10d75e6..4c85952ac5f 100644
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
@@ -113,14 +113,14 @@ class WindowsAsynchronousServerSocketChannelImpl
     /**
      * Task to initiate accept operation and to handle result.
      */
-    private class AcceptTask<A> implements Runnable, Iocp.ResultHandler {
+    private class AcceptTask implements Runnable, Iocp.ResultHandler {
         private final WindowsAsynchronousSocketChannelImpl channel;
         private final AccessControlContext acc;
-        private final PendingFuture<AsynchronousSocketChannel,A> result;
+        private final PendingFuture<AsynchronousSocketChannel,Object> result;
 
         AcceptTask(WindowsAsynchronousSocketChannelImpl channel,
                    AccessControlContext acc,
-                   PendingFuture<AsynchronousSocketChannel,A> result)
+                   PendingFuture<AsynchronousSocketChannel,Object> result)
         {
             this.channel = channel;
             this.acc = acc;
@@ -222,14 +222,14 @@ class WindowsAsynchronousServerSocketChannelImpl
             }
 
             // invoke completion handler
-            Invoker.invokeIndirectly(result.handler(), result);
+            Invoker.invokeIndirectly(result);
         }
 
         /**
          * Executed when the I/O has completed
          */
         @Override
-        public void completed(int bytesTransferred) {
+        public void completed(int bytesTransferred, boolean canInvokeDirect) {
             try {
                 // connection accept after group has shutdown
                 if (iocp.isShutdown()) {
@@ -269,7 +269,7 @@ class WindowsAsynchronousServerSocketChannelImpl
             }
 
             // invoke handler (but not directly)
-            Invoker.invokeIndirectly(result.handler(), result);
+            Invoker.invokeIndirectly(result);
         }
 
         @Override
@@ -283,19 +283,20 @@ class WindowsAsynchronousServerSocketChannelImpl
             } else {
                 result.setFailure(new AsynchronousCloseException());
             }
-            Invoker.invokeIndirectly(result.handler(), result);
+            Invoker.invokeIndirectly(result);
         }
     }
 
     @Override
-    public <A> Future<AsynchronousSocketChannel> accept(A attachment,
-        final CompletionHandler<AsynchronousSocketChannel,? super A> handler)
+    Future<AsynchronousSocketChannel> implAccept(Object attachment,
+        final CompletionHandler<AsynchronousSocketChannel,Object> handler)
     {
         if (!isOpen()) {
-            CompletedFuture<AsynchronousSocketChannel,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invokeIndirectly(handler, result);
-            return result;
+            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");
@@ -319,10 +320,10 @@ class WindowsAsynchronousServerSocketChannelImpl
             end();
         }
         if (ioe != null) {
-            CompletedFuture<AsynchronousSocketChannel,A> result =
-                CompletedFuture.withFailure(this, ioe, attachment);
-            Invoker.invokeIndirectly(handler, result);
-            return result;
+            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
@@ -331,20 +332,21 @@ class WindowsAsynchronousServerSocketChannelImpl
         AccessControlContext acc = (System.getSecurityManager() == null) ?
             null : AccessController.getContext();
 
-        PendingFuture<AsynchronousSocketChannel,A> result =
-            new PendingFuture<AsynchronousSocketChannel,A>(this, handler, attachment);
-        AcceptTask task = new AcceptTask<A>(ch, acc, result);
+        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 accept. As I/O operations are tied to the initiating thread
-        // then it will only be invoked direcly if this thread is in the thread
-        // pool. If this thread is not in the thread pool when a task is
-        // submitted to initiate the accept.
-        Invoker.invokeOnThreadInThreadPool(this, task);
+        // initiate I/O
+        if (Iocp.supportsThreadAgnosticIo()) {
+            task.run();
+        } else {
+            Invoker.invokeOnThreadInThreadPool(this, task);
+        }
         return result;
     }
 
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
index 5ec0af0468f..80c32ff56dc 100644
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
@@ -250,14 +250,14 @@ class WindowsAsynchronousSocketChannelImpl
                 closeChannel();
                 result.setFailure(toIOException(exc));
             }
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
 
         /**
          * Invoked by handler thread when connection established.
          */
         @Override
-        public void completed(int bytesTransferred) {
+        public void completed(int bytesTransferred, boolean canInvokeDirect) {
             Throwable exc = null;
             try {
                 begin();
@@ -276,7 +276,11 @@ class WindowsAsynchronousSocketChannelImpl
                 result.setFailure(toIOException(exc));
             }
 
-            Invoker.invoke(result.handler(), result);
+            if (canInvokeDirect) {
+                Invoker.invokeUnchecked(result);
+            } else {
+                Invoker.invoke(result);
+            }
         }
 
         /**
@@ -290,20 +294,21 @@ class WindowsAsynchronousSocketChannelImpl
             } else {
                 result.setFailure(new AsynchronousCloseException());
             }
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
     }
 
     @Override
-    public <A> Future<Void> connect(SocketAddress remote,
-                                    A attachment,
-                                    CompletionHandler<Void,? super A> handler)
+    <A> Future<Void> implConnect(SocketAddress remote,
+                                 A attachment,
+                                 CompletionHandler<Void,? super A> handler)
     {
         if (!isOpen()) {
-            CompletedFuture<Void,A> result = CompletedFuture
-                .withFailure(this, new ClosedChannelException(), attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            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);
@@ -337,10 +342,10 @@ class WindowsAsynchronousSocketChannelImpl
             try {
                 close();
             } catch (IOException ignore) { }
-            CompletedFuture<Void,A> result = CompletedFuture
-                .withFailure(this, bindException, attachment);
-            Invoker.invoke(handler, result);
-            return result;
+            if (handler == null)
+                return CompletedFuture.withFailure(bindException);
+            Invoker.invoke(this, handler, attachment, null, bindException);
+            return null;
         }
 
         // setup task
@@ -349,8 +354,12 @@ class WindowsAsynchronousSocketChannelImpl
         ConnectTask task = new ConnectTask<A>(isa, result);
         result.setContext(task);
 
-        // initiate I/O (can only be done from thread in thread pool)
-        Invoker.invokeOnThreadInThreadPool(this, task);
+        // initiate I/O
+        if (Iocp.supportsThreadAgnosticIo()) {
+            task.run();
+        } else {
+            Invoker.invokeOnThreadInThreadPool(this, task);
+        }
         return result;
     }
 
@@ -514,7 +523,7 @@ class WindowsAsynchronousSocketChannelImpl
             }
 
             // invoke completion handler
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
 
         /**
@@ -522,7 +531,7 @@ class WindowsAsynchronousSocketChannelImpl
          */
         @Override
         @SuppressWarnings("unchecked")
-        public void completed(int bytesTransferred) {
+        public void completed(int bytesTransferred, boolean canInvokeDirect) {
             if (bytesTransferred == 0) {
                 bytesTransferred = -1;  // EOF
             } else {
@@ -543,7 +552,11 @@ class WindowsAsynchronousSocketChannelImpl
                     result.setResult((V)Integer.valueOf(bytesTransferred));
                 }
             }
-            Invoker.invoke(result.handler(), result);
+            if (canInvokeDirect) {
+                Invoker.invokeUnchecked(result);
+            } else {
+                Invoker.invoke(result);
+            }
         }
 
         @Override
@@ -561,7 +574,7 @@ class WindowsAsynchronousSocketChannelImpl
                 enableReading();
                 result.setFailure(x);
             }
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
 
         /**
@@ -579,13 +592,14 @@ class WindowsAsynchronousSocketChannelImpl
             }
 
             // invoke handler without any locks
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
     }
 
     @Override
-    <V extends Number,A> Future<V> readImpl(ByteBuffer[] bufs,
-                                            boolean scatteringRead,
+    <V extends Number,A> Future<V> implRead(boolean isScatteringRead,
+                                            ByteBuffer dst,
+                                            ByteBuffer[] dsts,
                                             long timeout,
                                             TimeUnit unit,
                                             A attachment,
@@ -594,7 +608,14 @@ class WindowsAsynchronousSocketChannelImpl
         // setup task
         PendingFuture<V,A> result =
             new PendingFuture<V,A>(this, handler, attachment);
-        final ReadTask readTask = new ReadTask<V,A>(bufs, scatteringRead, result);
+        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
@@ -607,8 +628,12 @@ class WindowsAsynchronousSocketChannelImpl
             result.setTimeoutTask(timeoutTask);
         }
 
-        // initiate I/O (can only be done from thread in thread pool)
-        Invoker.invokeOnThreadInThreadPool(this, readTask);
+        // initiate I/O
+        if (Iocp.supportsThreadAgnosticIo()) {
+            readTask.run();
+        } else {
+            Invoker.invokeOnThreadInThreadPool(this, readTask);
+        }
         return result;
     }
 
@@ -710,7 +735,7 @@ class WindowsAsynchronousSocketChannelImpl
         }
 
         @Override
-        @SuppressWarnings("unchecked")
+        //@SuppressWarnings("unchecked")
         public void run() {
             long overlapped = 0L;
             boolean prepared = false;
@@ -759,7 +784,7 @@ class WindowsAsynchronousSocketChannelImpl
             }
 
             // invoke completion handler
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
 
         /**
@@ -767,7 +792,7 @@ class WindowsAsynchronousSocketChannelImpl
          */
         @Override
         @SuppressWarnings("unchecked")
-        public void completed(int bytesTransferred) {
+        public void completed(int bytesTransferred, boolean canInvokeDirect) {
             updateBuffers(bytesTransferred);
 
             // return direct buffer to cache if substituted
@@ -784,7 +809,11 @@ class WindowsAsynchronousSocketChannelImpl
                     result.setResult((V)Integer.valueOf(bytesTransferred));
                 }
             }
-            Invoker.invoke(result.handler(), result);
+            if (canInvokeDirect) {
+                Invoker.invokeUnchecked(result);
+            } else {
+                Invoker.invoke(result);
+            }
         }
 
         @Override
@@ -802,7 +831,7 @@ class WindowsAsynchronousSocketChannelImpl
                 enableWriting();
                 result.setFailure(x);
             }
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
 
         /**
@@ -820,13 +849,14 @@ class WindowsAsynchronousSocketChannelImpl
             }
 
             // invoke handler without any locks
-            Invoker.invoke(result.handler(), result);
+            Invoker.invoke(result);
         }
     }
 
     @Override
-    <V extends Number,A> Future<V> writeImpl(ByteBuffer[] bufs,
-                                             boolean gatheringWrite,
+    <V extends Number,A> Future<V> implWrite(boolean gatheringWrite,
+                                             ByteBuffer src,
+                                             ByteBuffer[] srcs,
                                              long timeout,
                                              TimeUnit unit,
                                              A attachment,
@@ -835,6 +865,13 @@ class WindowsAsynchronousSocketChannelImpl
         // 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);
 
@@ -849,7 +886,12 @@ class WindowsAsynchronousSocketChannelImpl
         }
 
         // initiate I/O (can only be done from thread in thread pool)
-        Invoker.invokeOnThreadInThreadPool(this, writeTask);
+        // initiate I/O
+        if (Iocp.supportsThreadAgnosticIo()) {
+            writeTask.run();
+        } else {
+            Invoker.invokeOnThreadInThreadPool(this, writeTask);
+        }
         return result;
     }
 
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java b/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java
index 077a4893b2f..a99f3fd448f 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java
@@ -92,6 +92,7 @@ class WindowsConstants {
     public static final int ERROR_INVALID_DATA          = 13;
     public static final int ERROR_NOT_SAME_DEVICE       = 17;
     public static final int ERROR_NOT_READY             = 21;
+    public static final int ERROR_SHARING_VIOLATION     = 32;
     public static final int ERROR_FILE_EXISTS           = 80;
     public static final int ERROR_INVALID_PARAMATER     = 87;
     public static final int ERROR_DISK_FULL             = 112;
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java b/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
index 5af9876f33c..44cdb276de2 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
@@ -46,6 +46,7 @@ class WindowsFileAttributeViews {
 
         @Override
         public WindowsFileAttributes readAttributes() throws IOException {
+            file.checkRead();
             try {
                 return WindowsFileAttributes.get(file, followLinks);
             } catch (WindowsException x) {
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java b/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java
index f930eab98d3..69105a96834 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java
@@ -246,8 +246,8 @@ class WindowsFileAttributes
         long lastWriteTime = unsafe.getLong(address + OFFSETOF_FIND_DATA_LASTWRITETIME);
         long size = ((long)(unsafe.getInt(address + OFFSETOF_FIND_DATA_SIZEHIGH)) << 32)
             + (unsafe.getInt(address + OFFSETOF_FIND_DATA_SIZELOW) & 0xFFFFFFFFL);
-        int reparseTag = ((fileAttrs & FILE_ATTRIBUTE_REPARSE_POINT) != 0) ?
-            + unsafe.getInt(address + OFFSETOF_FIND_DATA_RESERVED0) : 0;
+        int reparseTag = isReparsePoint(fileAttrs) ?
+            unsafe.getInt(address + OFFSETOF_FIND_DATA_RESERVED0) : 0;
         return new WindowsFileAttributes(fileAttrs,
                                          creationTime,
                                          lastAccessTime,
@@ -275,7 +275,7 @@ class WindowsFileAttributes
             int reparseTag = 0;
             int fileAttrs = unsafe
                 .getInt(address + OFFSETOF_FILE_INFORMATION_ATTRIBUTES);
-            if ((fileAttrs & FILE_ATTRIBUTE_REPARSE_POINT) != 0) {
+            if (isReparsePoint(fileAttrs)) {
                 int size = MAXIMUM_REPARSE_DATA_BUFFER_SIZE;
                 NativeBuffer reparseBuffer = NativeBuffers.getNativeBuffer(size);
                 try {
@@ -299,6 +299,9 @@ class WindowsFileAttributes
         throws WindowsException
     {
         if (!ensureAccurateMetadata) {
+            WindowsException firstException = null;
+
+            // GetFileAttributesEx is the fastest way to read the attributes
             NativeBuffer buffer =
                 NativeBuffers.getNativeBuffer(SIZEOF_FILE_ATTRIBUTE_DATA);
             try {
@@ -308,11 +311,41 @@ class WindowsFileAttributes
                 // just return the attributes
                 int fileAttrs = unsafe
                     .getInt(address + OFFSETOF_FILE_ATTRIBUTE_DATA_ATTRIBUTES);
-                if ((fileAttrs & FILE_ATTRIBUTE_REPARSE_POINT) == 0)
+                if (!isReparsePoint(fileAttrs))
                     return fromFileAttributeData(address, 0);
+            } catch (WindowsException x) {
+                if (x.lastError() != ERROR_SHARING_VIOLATION)
+                    throw x;
+                firstException = x;
             } finally {
                 buffer.release();
             }
+
+            // For sharing violations, fallback to FindFirstFile if the file
+            // is not a root directory.
+            if (firstException != null) {
+                String search = path.getPathForWin32Calls();
+                char last = search.charAt(search.length() -1);
+                if (last == ':' || last == '\\')
+                    throw firstException;
+                buffer = getBufferForFindData();
+                try {
+                    long handle = FindFirstFile(search, buffer.address());
+                    FindClose(handle);
+                    WindowsFileAttributes attrs = fromFindData(buffer.address());
+                    // FindFirstFile does not follow sym links. Even if
+                    // followLinks is false, there isn't sufficient information
+                    // in the WIN32_FIND_DATA structure to know if the reparse
+                    // point is a sym link.
+                    if (attrs.isReparsePoint())
+                        throw firstException;
+                    return attrs;
+                } catch (WindowsException ignore) {
+                    throw firstException;
+                } finally {
+                    buffer.release();
+                }
+            }
         }
 
         // file is reparse point so need to open file to get attributes
@@ -325,7 +358,7 @@ class WindowsFileAttributes
     }
 
     /**
-     * Returns true if the attribtues are of the same file - both files must
+     * Returns true if the attributes are of the same file - both files must
      * be open.
      */
     static boolean isSameFile(WindowsFileAttributes attrs1,
@@ -337,6 +370,13 @@ class WindowsFileAttributes
                (attrs1.fileIndexLow == attrs2.fileIndexLow);
     }
 
+    /**
+     * Returns true if the attributes are of a file with a reparse point.
+     */
+    static boolean isReparsePoint(int attributes) {
+        return (attributes & FILE_ATTRIBUTE_REPARSE_POINT) != 0;
+    }
+
     // package-private
     int attributes() {
         return fileAttrs;
@@ -387,7 +427,7 @@ class WindowsFileAttributes
 
     // package private
     boolean isReparsePoint() {
-        return (fileAttrs & FILE_ATTRIBUTE_REPARSE_POINT) != 0;
+        return isReparsePoint(fileAttrs);
     }
 
     boolean isDirectoryLink() {
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java b/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java
index a906b54e0de..5af14f1673f 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsFileStore.java
@@ -153,7 +153,7 @@ class WindowsFileStore
     public boolean supportsFileAttributeView(Class<? extends FileAttributeView> type) {
         if (type == null)
             throw new NullPointerException();
-        if (type == BasicFileAttributeView.class)
+        if (type == BasicFileAttributeView.class || type == DosFileAttributeView.class)
             return true;
         if (type == AclFileAttributeView.class || type == FileOwnerAttributeView.class)
             return ((volInfo.flags() & FILE_PERSISTENT_ACLS) != 0);
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java b/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java
index 54712098b67..2ad40cb7798 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java
@@ -283,25 +283,15 @@ class WindowsFileSystem
             }
         }
 
-        // match in uppercase
-        StringBuilder sb = new StringBuilder(expr.length());
-        for (int i=0; i<expr.length(); i++) {
-            sb.append(Character.toUpperCase(expr.charAt(i)));
-        }
-        expr = sb.toString();
+        // match in unicode_case_insensitive
+        final Pattern pattern = Pattern.compile(expr,
+            Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
         // return matcher
-        final Pattern pattern = Pattern.compile(expr);
         return new PathMatcher() {
             @Override
             public boolean matches(Path path) {
-                // match in uppercase
-                String s = path.toString();
-                StringBuilder sb = new StringBuilder(s.length());
-                for (int i=0; i<s.length(); i++) {
-                    sb.append( Character.toUpperCase(s.charAt(i)) );
-                }
-                return pattern.matcher(sb).matches();
+                return pattern.matcher(path.toString()).matches();
             }
         };
     }
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java b/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java
index 9ad84818927..bb0ccdb84f6 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java
@@ -62,6 +62,30 @@ class WindowsLinkSupport {
         }
     }
 
+    /**
+     * Returns the final path (all symbolic links resolved) or null if this
+     * operation is not supported.
+     */
+    private static String getFinalPath(WindowsPath input) throws IOException {
+        long h = 0;
+        try {
+            h = input.openForReadAttributeAccess(true);
+        } catch (WindowsException x) {
+            x.rethrowAsIOException(input);
+        }
+        try {
+            return stripPrefix(GetFinalPathNameByHandle(h));
+        } catch (WindowsException x) {
+            // ERROR_INVALID_LEVEL is the error returned when not supported
+            // (a sym link to file on FAT32 or Samba server for example)
+            if (x.lastError() != ERROR_INVALID_LEVEL)
+                x.rethrowAsIOException(input);
+        } finally {
+            CloseHandle(h);
+        }
+        return null;
+    }
+
     /**
      * Returns the final path of a given path as a String. This should be used
      * prior to calling Win32 system calls that do not follow links.
@@ -70,7 +94,6 @@ class WindowsLinkSupport {
         throws IOException
     {
         WindowsFileSystem fs = input.getFileSystem();
-
         try {
             // if not following links then don't need final path
             if (!followLinks || !fs.supportsLinks())
@@ -84,25 +107,10 @@ class WindowsLinkSupport {
             x.rethrowAsIOException(input);
         }
 
-        // The file is a symbolic link so we open it and try to get the
-        // normalized path. This should succeed on NTFS but may fail if there
-        // is a link to a non-NFTS file system.
-        long h = 0;
-        try {
-            h = input.openForReadAttributeAccess(true);
-        } catch (WindowsException x) {
-            x.rethrowAsIOException(input);
-        }
-        try {
-            return stripPrefix(GetFinalPathNameByHandle(h));
-        } catch (WindowsException x) {
-            // ERROR_INVALID_LEVEL is the error returned when not supported by
-            // the file system
-            if (x.lastError() != ERROR_INVALID_LEVEL)
-                x.rethrowAsIOException(input);
-        } finally {
-            CloseHandle(h);
-        }
+        // The file is a symbolic link so attempt to get the final path
+        String result = getFinalPath(input);
+        if (result != null)
+            return result;
 
         // Fallback: read target of link, resolve against parent, and repeat
         // until file is not a link.
@@ -149,31 +157,9 @@ class WindowsLinkSupport {
         throws IOException
     {
         WindowsFileSystem fs = input.getFileSystem();
-        if (!fs.supportsLinks())
+        if (resolveLinks && !fs.supportsLinks())
             resolveLinks = false;
 
-        // On Vista use GetFinalPathNameByHandle. This should succeed on NTFS
-        // but may fail if there is a link to a non-NFTS file system.
-        if (resolveLinks) {
-            long h = 0;
-            try {
-                h = input.openForReadAttributeAccess(true);
-            } catch (WindowsException x) {
-                x.rethrowAsIOException(input);
-            }
-            try {
-                return stripPrefix(GetFinalPathNameByHandle(h));
-            } catch (WindowsException x) {
-                if (x.lastError() != ERROR_INVALID_LEVEL)
-                    x.rethrowAsIOException(input);
-            } finally {
-                CloseHandle(h);
-            }
-        }
-
-        // Not resolving links or we are on Windows Vista (or newer) with a
-        // link to non-NFTS file system.
-
         // Start with absolute path
         String path = null;
         try {
@@ -183,15 +169,12 @@ class WindowsLinkSupport {
         }
 
         // Collapse "." and ".."
-        try {
-            path = GetFullPathName(path);
-        } catch (WindowsException x) {
-            x.rethrowAsIOException(input);
-        }
-
-        // eliminate all symbolic links
-        if (resolveLinks) {
-            path = resolveAllLinks(WindowsPath.createFromNormalizedPath(fs, path));
+        if (path.indexOf('.') >= 0) {
+            try {
+                path = GetFullPathName(path);
+            } catch (WindowsException x) {
+                x.rethrowAsIOException(input);
+            }
         }
 
         // string builder to build up components of path
@@ -229,12 +212,15 @@ class WindowsLinkSupport {
             throw new AssertionError("path type not recognized");
         }
 
-        // check root directory exists
-        try {
-            FirstFile fileData = FindFirstFile(sb.toString() + "*");
-            FindClose(fileData.handle());
-        } catch (WindowsException x) {
-            x.rethrowAsIOException(path);
+        // if the result is only a root component then we simply check it exists
+        if (start >= path.length()) {
+            String result = sb.toString();
+            try {
+                GetFileAttributes(result);
+            } catch (WindowsException x) {
+                x.rethrowAsIOException(path);
+            }
+            return result;
         }
 
         // iterate through each component to get its actual name in the
@@ -246,13 +232,28 @@ class WindowsLinkSupport {
             String search = sb.toString() + path.substring(curr, end);
             try {
                 FirstFile fileData = FindFirstFile(addLongPathPrefixIfNeeded(search));
-                try {
-                    sb.append(fileData.name());
-                    if (next != -1) {
-                        sb.append('\\');
+                FindClose(fileData.handle());
+
+                // if a reparse point is encountered then we must return the
+                // final path.
+                if (resolveLinks &&
+                    WindowsFileAttributes.isReparsePoint(fileData.attributes()))
+                {
+                    String result = getFinalPath(input);
+                    if (result == null) {
+                        // Fallback to slow path, usually because there is a sym
+                        // link to a file system that doesn't support sym links.
+                        WindowsPath resolved = resolveAllLinks(
+                            WindowsPath.createFromNormalizedPath(fs, path));
+                        result = getRealPath(resolved, false);
                     }
-                } finally {
-                    FindClose(fileData.handle());
+                    return result;
+                }
+
+                // add the name to the result
+                sb.append(fileData.name());
+                if (next != -1) {
+                    sb.append('\\');
                 }
             } catch (WindowsException e) {
                 e.rethrowAsIOException(path);
@@ -342,7 +343,7 @@ class WindowsLinkSupport {
     /**
      * Resolve all symbolic-links in a given absolute and normalized path
      */
-    private static String resolveAllLinks(WindowsPath path)
+    private static WindowsPath resolveAllLinks(WindowsPath path)
         throws IOException
     {
         assert path.isAbsolute();
@@ -401,7 +402,7 @@ class WindowsLinkSupport {
             }
         }
 
-        return path.toString();
+        return path;
     }
 
     /**
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java b/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
index a116bf81190..0ad876755be 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java
@@ -180,10 +180,12 @@ class WindowsNativeDispatcher {
     static class FirstFile {
         private long handle;
         private String name;
+        private int attributes;
 
         private FirstFile() { }
         public long handle()    { return handle; }
         public String name()    { return name; }
+        public int attributes() { return attributes; }
     }
     private static native void FindFirstFile0(long lpFileName, FirstFile obj)
         throws WindowsException;
diff --git a/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java b/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java
index 029431faa0f..dcfc50e5956 100644
--- a/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java
+++ b/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java
@@ -1177,14 +1177,20 @@ class WindowsPath extends AbstractPath {
 
         /*
          * Windows treates symbolic links to directories differently than it
-         * does to other file types. For that reason we check if the exists and
-         * is a directory.
+         * does to other file types. For that reason we need to check if the
+         * target is a directory (or a directory junction).
          */
+        WindowsPath resolvedTarget;
+        if (target.type == WindowsPathType.RELATIVE) {
+            WindowsPath parent = getParent();
+            resolvedTarget = (parent == null) ? target : parent.resolve(target);
+        } else {
+            resolvedTarget = resolve(target);
+        }
         int flags = 0;
-        WindowsPath resolvedTarget =
-            WindowsPath.createFromNormalizedPath(getFileSystem(), resolve(target).path);
         try {
-            if (WindowsFileAttributes.get(resolvedTarget, true).isDirectory())
+            WindowsFileAttributes wattrs = WindowsFileAttributes.get(resolvedTarget, false);
+            if (wattrs.isDirectory() || wattrs.isDirectoryLink())
                 flags |= SYMBOLIC_LINK_FLAG_DIRECTORY;
         } catch (WindowsException x) {
             // unable to access target so assume target is not a directory
diff --git a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java
index c4724fbd382..5cb919b9d52 100644
--- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java
+++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java
@@ -1,4 +1,5 @@
 /*
+ * Portions Copyright 2003-2009 Sun Microsystems, Inc.  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
diff --git a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java
index b773189c113..30be1b51405 100644
--- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java
+++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java
@@ -1,4 +1,5 @@
 /*
+ * Portions Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -30,16 +31,15 @@
 package sun.security.krb5.internal.tools;
 
 import sun.security.krb5.*;
-import sun.security.krb5.internal.*;
 import sun.security.krb5.internal.ktab.*;
-import sun.security.krb5.KrbCryptoException;
-import java.lang.RuntimeException;
 import java.io.IOException;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
-import java.io.FileOutputStream;
 import java.io.File;
+import java.text.DateFormat;
 import java.util.Arrays;
+import java.util.Date;
+import sun.security.krb5.internal.crypto.EType;
 /**
  * This class can execute as a command-line tool to help the user manage
  * entires in the key table.
@@ -55,6 +55,9 @@ public class Ktab {
     char action;
     String name;   // name and directory of key table
     String principal;
+    boolean showEType;
+    boolean showTime;
+    int etype = -1;
     char[] password = null;
 
     /**
@@ -62,13 +65,14 @@ public class Ktab {
      * <br>Usage: ktab <options>
      * <br>available options to Ktab:
      * <ul>
-     * <li><b>-l</b>  list the keytab name and entries
+     * <li><b>-l [-e] [-t]</b>  list the keytab name and entries, -e show
+     * encryption etypes, -t show timestamps.
      * <li><b>-a</b>  &lt;<i>principal name</i>&gt;
      * (&lt;<i>password</i>&gt;)  add an entry to the keytab.
      * The entry is added only to the keytab. No changes are made to the
      * Kerberos database.
-     * <li><b>-d</b>  &lt;<i>principal name</i>&gt;
-     * delete an entry from the keytab
+     * <li><b>-d</b>  &lt;<i>principal name</i>&gt; [&lt;<i>etype</i>&gt;]
+     * delete an entry from the keytab.
      * The entry is deleted only from the keytab. No changes are made to the
      * Kerberos database.
      * <li><b>-k</b>  &lt;<i>keytab name</i> &gt;
@@ -182,6 +186,11 @@ public class Ktab {
                 i++;
                 if ((i < args.length) && (!args[i].startsWith("-"))) {
                     principal = args[i];
+                    int j = i + 1;
+                    if ((j < args.length) && (!args[j].startsWith("-"))) {
+                        etype = Integer.parseInt(args[j]);
+                        i = j;
+                    }
                 } else {
                     System.out.println("Please specify the principal" +
                                        "name of the entry you want to " +
@@ -207,6 +216,12 @@ public class Ktab {
                     System.exit(-1);
                 }
                 break;
+            case 'e':
+                showEType = true;
+                break;
+            case 't':
+                showTime = true;
+                break;
             default:
                 printHelp();
                 System.exit(-1);
@@ -271,25 +286,54 @@ public class Ktab {
      * Lists key table name and entries in it.
      */
     void listKt() {
-        int version;
-        String principal;
-        // System.out.println("Keytab name: " + admin.getKeyTabName());
-        System.out.println("Keytab name: " + table.tabName());
-        // KeyTabEntry[] entries = admin.getEntries();
+        System.out.println("Keytab name: " + KeyTab.tabName());
         KeyTabEntry[] entries = table.getEntries();
         if ((entries != null) && (entries.length > 0)) {
-            System.out.println("KVNO    Principal");
+            String[][] output = new String[entries.length+1][showTime?3:2];
+            int column = 0;
+            output[0][column++] = "KVNO";
+            if (showTime) output[0][column++] = "Timestamp";
+            output[0][column++] = "Principal";
             for (int i = 0; i < entries.length; i++) {
-                version = entries[i].getKey().getKeyVersionNumber().intValue();
-                principal = entries[i].getService().toString();
-                if (i == 0) {
-                    StringBuffer separator = new StringBuffer();
-                    for (int j = 0; j < 9 + principal.length(); j++) {
-                        separator.append("-");
-                    }
-                    System.out.println(separator.toString());
+                column = 0;
+                output[i+1][column++] = entries[i].getKey().
+                        getKeyVersionNumber().toString();
+                if (showTime) output[i+1][column++] =
+                        DateFormat.getDateTimeInstance(
+                        DateFormat.SHORT, DateFormat.SHORT).format(
+                        new Date(entries[i].getTimeStamp().getTime()));
+                String princ = entries[i].getService().toString();
+                if (showEType) {
+                    int e = entries[i].getKey().getEType();
+                    output[i+1][column++] = princ + " (" + e + ":" +
+                            EType.toString(e) + ")";
+                } else {
+                    output[i+1][column++] = princ;
                 }
-                System.out.println("  " + version + "     " + principal);
+            }
+            int[] width = new int[column];
+            for (int j=0; j<column; j++) {
+                for (int i=0; i <= entries.length; i++) {
+                    if (output[i][j].length() > width[j]) {
+                        width[j] = output[i][j].length();
+                    }
+                }
+                if (j != 0) width[j] = -width[j];
+            }
+            for (int j=0; j<column; j++) {
+                System.out.printf("%" + width[j] + "s ", output[0][j]);
+            }
+            System.out.println();
+            for (int j=0; j<column; j++) {
+                for (int k=0; k<Math.abs(width[j]); k++) System.out.print("-");
+                System.out.print(" ");
+            }
+            System.out.println();
+            for (int i=0; i<entries.length; i++) {
+                for (int j=0; j<column; j++) {
+                    System.out.printf("%" + width[j] + "s ", output[i+1][j]);
+                }
+                System.out.println();
             }
         } else {
             System.out.println("0 entry.");
@@ -309,9 +353,10 @@ public class Ktab {
             String answer;
             BufferedReader cis =
                 new BufferedReader(new InputStreamReader(System.in));
-            System.out.print("Are you sure you want to "+
+            System.out.print("Are you sure you want to"+
                              " delete service key for " + pname.toString() +
-                             " in " + table.tabName() + "?(Y/N) :");
+                             " (" + (etype==-1?"all etypes":("etype = "+etype)) +
+                             ") in " + table.tabName() + "?(Y/N): ");
 
             System.out.flush();
             answer = cis.readLine();
@@ -333,19 +378,26 @@ public class Ktab {
             e.printStackTrace();
             System.exit(-1);
         }
-        // admin.deleteEntry(pname);
-        table.deleteEntry(pname);
 
-        try {
-            table.save();
-        } catch (IOException e) {
-            System.err.println("Error occurs while saving the keytab." +
+        int count;
+        if (etype == -1) count = table.deleteEntry(pname);
+        else count = table.deleteEntry(pname, etype);
+
+        if (count == 0) {
+            System.err.println("No matched entry in the keytab. " +
                                "Deletion fails.");
-            e.printStackTrace();
             System.exit(-1);
+        } else {
+            try {
+                table.save();
+            } catch (IOException e) {
+                System.err.println("Error occurs while saving the keytab. " +
+                                   "Deletion fails.");
+                e.printStackTrace();
+                System.exit(-1);
+            }
+            System.out.println("Done!");
         }
-        System.out.println("Done!");
-
     }
 
     /**
@@ -355,12 +407,12 @@ public class Ktab {
         System.out.println("\nUsage: ktab " +
                            "<options>");
         System.out.println("available options to Ktab:");
-        System.out.println("-l\t\t\t\tlist the keytab name and entries");
+        System.out.println("-l [-e] [-t]\t\t\tlist the keytab name and entries,\n\t\t\t\t-e with etype, -t with timestamp");
         System.out.println("-a <principal name> (<password>)add an entry " +
                            "to the keytab");
-        System.out.println("-d <principal name>\t\tdelete an entry from "+
-                           "the keytab");
+        System.out.println("-d <principal name> [<etype>]\tdelete an "+
+                           "entry from the keytab");
         System.out.println("-k <keytab name>\t\tspecify keytab name and "+
-                           " path with prefix FILE:");
+                           "path with prefix FILE:");
     }
 }
diff --git a/jdk/src/windows/classes/sun/security/mscapi/JarVerifier.java b/jdk/src/windows/classes/sun/security/mscapi/JarVerifier.java
deleted file mode 100644
index 1fcd6c997ae..00000000000
--- a/jdk/src/windows/classes/sun/security/mscapi/JarVerifier.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2007 Sun Microsystems, Inc.  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.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-
-package sun.security.mscapi;
-
-// NOTE: this class is duplicated amongst SunJCE, SunPKCS11, and SunMSCAPI.
-// All files should be kept in sync.
-
-import java.io.*;
-import java.util.*;
-import java.util.jar.*;
-import java.net.URL;
-import java.net.JarURLConnection;
-import java.net.MalformedURLException;
-
-import java.security.*;
-import java.security.cert.*;
-import java.security.cert.Certificate;
-
-/**
- * This class verifies JAR files (and any supporting JAR files), and
- * determines whether they may be used in this implementation.
- *
- * The JCE in OpenJDK has an open cryptographic interface, meaning it
- * does not restrict which providers can be used.  Compliance with
- * United States export controls and with local law governing the
- * import/export of products incorporating the JCE in the OpenJDK is
- * the responsibility of the licensee.
- *
- * @since 1.7
- */
-final class JarVerifier {
-
-    private static final boolean debug = false;
-
-    /**
-     * Verify the JAR file is signed by an entity which has a certificate
-     * issued by a trusted CA.
-     *
-     * Note: this is a temporary method and will change soon to use the
-     * exception chaining mechanism, which can provide more details
-     * as to why the verification failed.
-     *
-     * @param c the class to be verified.
-     * @return true if verification is successful.
-     */
-    static boolean verify(final Class c) {
-        return true;
-    }
-}
diff --git a/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java b/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java
index 06a82c5cdde..9a4a01c7cd6 100644
--- a/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java
+++ b/jdk/src/windows/classes/sun/security/mscapi/RSACipher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -93,7 +93,6 @@ public final class RSACipher extends CipherSpi {
     private sun.security.mscapi.Key privateKey;
 
     public RSACipher() {
-        SunMSCAPI.verifySelfIntegrity(getClass());
         paddingType = PAD_PKCS1;
     }
 
diff --git a/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java b/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java
index 4dcf217117d..009406c60c9 100644
--- a/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java
+++ b/jdk/src/windows/classes/sun/security/mscapi/SunMSCAPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -117,22 +117,4 @@ public final class SunMSCAPI extends Provider {
             AccessController.doPrivileged(new PutAllAction(this, map));
         }
     }
-
-    // set to true once self verification is complete
-    private static volatile boolean integrityVerified;
-
-    static void verifySelfIntegrity(Class c) {
-        if (integrityVerified) {
-            return;
-        }
-        doVerifySelfIntegrity(c);
-    }
-
-    private static synchronized void doVerifySelfIntegrity(Class c) {
-        integrityVerified = JarVerifier.verify(c);
-        if (integrityVerified == false) {
-            throw new ProviderException
-                ("The SunMSCAPI provider may have been tampered with.");
-        }
-    }
 }
diff --git a/jdk/src/windows/lib/tzmappings b/jdk/src/windows/lib/tzmappings
index a45200b7596..ec2732f64fb 100644
--- a/jdk/src/windows/lib/tzmappings
+++ b/jdk/src/windows/lib/tzmappings
@@ -82,8 +82,8 @@ GMT:0,1::Europe/London:
 GMT Standard Time:0,1::Europe/London:
 Ekaterinburg:10,11::Asia/Yekaterinburg:
 Ekaterinburg Standard Time:10,11::Asia/Yekaterinburg:
-West Asia:10,11::Asia/Karachi:
-West Asia Standard Time:10,11::Asia/Karachi:
+West Asia:10,11:UZ:Asia/Tashkent:
+West Asia Standard Time:10,11:UZ:Asia/Tashkent:
 Central Asia:12,13::Asia/Dhaka:
 Central Asia Standard Time:12,13::Asia/Dhaka:
 N. Central Asia Standard Time:12,13::Asia/Novosibirsk:
@@ -146,8 +146,8 @@ South Africa:4,69::Africa/Harare:
 South Africa Standard Time:4,69::Africa/Harare:
 Atlantic:40,41::America/Halifax:
 Atlantic Standard Time:40,41::America/Halifax:
-SA Eastern:42,43::America/Buenos_Aires:
-SA Eastern Standard Time:42,43::America/Buenos_Aires:
+SA Eastern:42,43:GF:America/Cayenne:
+SA Eastern Standard Time:42,43:GF:America/Cayenne:
 Mid-Atlantic:44,45::Atlantic/South_Georgia:
 Mid-Atlantic Standard Time:44,45::Atlantic/South_Georgia:
 Azores:46,47::Atlantic/Azores:
@@ -160,21 +160,28 @@ New Zealand Standard Time:78,79::Pacific/Auckland:
 Tonga Standard Time:78,79::Pacific/Tongatapu:
 Arabian:8,9::Asia/Muscat:
 Arabian Standard Time:8,9::Asia/Muscat:
-Caucasus:8,9::GMT+0400:
-Caucasus Standard Time:8,9::GMT+0400:
+Caucasus:8,9:AM:Asia/Yerevan:
+Caucasus Standard Time:8,9:AM:Asia/Yerevan:
 GMT Standard Time:88,89::GMT:
 Greenwich:88,89::GMT:
 Greenwich Standard Time:88,89::GMT:
-Central Brazilian Standard Time:900,900:BR:America/Manaus:
-Central Standard Time (Mexico):901,901::America/Mexico_City:
-Georgian Standard Time:902,902:GE:Asia/Tbilisi:
-Mountain Standard Time (Mexico):903,903:MX:America/Chihuahua:
-Namibia Standard Time:904,904:NA:Africa/Windhoek:
-Pacific Standard Time (Mexico):905,905:MX:America/Tijuana:
-Western Brazilian Standard Time:906,906:BR:America/Rio_Branco:
-Azerbaijan Standard Time:907,907:AZ:Asia/Baku:
-Jordan Standard Time:908,908:JO:Asia/Amman:
-Middle East Standard Time:909,909:LB:Asia/Beirut:
-Armenian Standard Time:910,910:AM:Asia/Yerevan:
-Montevideo Standard Time:911,911:UY:America/Montevideo:
-Venezuela Standard Time:912,912::America/Caracas:
+Argentina Standard Time:900,900::America/Buenos_Aires:
+Azerbaijan Standard Time:901,901:AZ:Asia/Baku:
+Central Brazilian Standard Time:902,902:BR:America/Manaus:
+Central Standard Time (Mexico):903,903::America/Mexico_City:
+Georgian Standard Time:904,904:GE:Asia/Tbilisi:
+Jordan Standard Time:905,905:JO:Asia/Amman:
+Mauritius Standard Time:906,906:MU:Indian/Mauritius:
+Middle East Standard Time:907,907:LB:Asia/Beirut:
+Montevideo Standard Time:908,908:UY:America/Montevideo:
+Morocco Standard Time:909,909:MA:Africa/Casablanca:
+Mountain Standard Time (Mexico):910,910:MX:America/Chihuahua:
+Namibia Standard Time:911,911:NA:Africa/Windhoek:
+Pacific Standard Time (Mexico):912,912:MX:America/Tijuana:
+Pakistan Standard Time:913,913::Asia/Karachi:
+UTC:914,914::UTC:
+Venezuela Standard Time:915,915::America/Caracas:
+Kamchatka Standard Time:916,916:RU:Asia/Kamchatka:
+Paraguay Standard Time:917,917:PY:America/Asuncion:
+Western Brazilian Standard Time:918,918:BR:America/Rio_Branco:
+Armenian Standard Time:919,919:AM:Asia/Yerevan:
diff --git a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c b/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
index f4cc691115b..30d0d371ce4 100644
--- a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
+++ b/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
@@ -51,13 +51,25 @@ static struct {
     jfieldID path;
 } ids;
 
+/**
+ * GetFinalPathNameByHandle is available on Windows Vista and newer
+ */
+typedef BOOL (WINAPI* GetFinalPathNameByHandleProc) (HANDLE, LPWSTR, DWORD, DWORD);
+static GetFinalPathNameByHandleProc GetFinalPathNameByHandle_func;
+
 JNIEXPORT void JNICALL
 Java_java_io_WinNTFileSystem_initIDs(JNIEnv *env, jclass cls)
 {
+    HANDLE handle;
     jclass fileClass = (*env)->FindClass(env, "java/io/File");
     if (!fileClass) return;
     ids.path =
              (*env)->GetFieldID(env, fileClass, "path", "Ljava/lang/String;");
+    handle = LoadLibrary("kernel32");
+    if (handle != NULL) {
+        GetFinalPathNameByHandle_func = (GetFinalPathNameByHandleProc)
+            GetProcAddress(handle, "GetFinalPathNameByHandleW");
+    }
 }
 
 /* -- Path operations -- */
@@ -65,6 +77,138 @@ Java_java_io_WinNTFileSystem_initIDs(JNIEnv *env, jclass cls)
 extern int wcanonicalize(const WCHAR *path, WCHAR *out, int len);
 extern int wcanonicalizeWithPrefix(const WCHAR *canonicalPrefix, const WCHAR *pathWithCanonicalPrefix, WCHAR *out, int len);
 
+/**
+ * Retrieves the fully resolved (final) path for the given path or NULL
+ * if the function fails.
+ */
+static WCHAR* getFinalPath(const WCHAR *path)
+{
+    HANDLE h;
+    WCHAR *result;
+    DWORD error;
+
+    /* Need Windows Vista or newer to get the final path */
+    if (GetFinalPathNameByHandle_func == NULL)
+        return NULL;
+
+    h = CreateFileW(path,
+                    FILE_READ_ATTRIBUTES,
+                    FILE_SHARE_DELETE |
+                        FILE_SHARE_READ | FILE_SHARE_WRITE,
+                    NULL,
+                    OPEN_EXISTING,
+                    FILE_FLAG_BACKUP_SEMANTICS,
+                    NULL);
+    if (h == INVALID_HANDLE_VALUE)
+        return NULL;
+
+    /**
+     * Allocate a buffer for the resolved path. For a long path we may need
+     * to allocate a larger buffer.
+     */
+    result = (WCHAR*)malloc(MAX_PATH * sizeof(WCHAR));
+    if (result != NULL) {
+        DWORD len = (*GetFinalPathNameByHandle_func)(h, result, MAX_PATH, 0);
+        if (len >= MAX_PATH) {
+            /* retry with a buffer of the right size */
+            result = (WCHAR*)realloc(result, (len+1) * sizeof(WCHAR));
+            if (result != NULL) {
+                len = (*GetFinalPathNameByHandle_func)(h, result, len, 0);
+            } else {
+                len = 0;
+            }
+        }
+        if (len > 0) {
+            /**
+             * Strip prefix (should be \\?\ or \\?\UNC)
+             */
+            if (result[0] == L'\\' && result[1] == L'\\' &&
+                result[2] == L'?' && result[3] == L'\\')
+            {
+                int isUnc = (result[4] == L'U' &&
+                             result[5] == L'N' &&
+                             result[6] == L'C');
+                int prefixLen = (isUnc) ? 7 : 4;
+                /* actual result length (includes terminator) */
+                int resultLen = len - prefixLen + (isUnc ? 1 : 0) + 1;
+
+                /* copy result without prefix into new buffer */
+                WCHAR *tmp = (WCHAR*)malloc(resultLen * sizeof(WCHAR));
+                if (tmp == NULL) {
+                    len = 0;
+                } else {
+                    WCHAR *p = result;
+                    p += prefixLen;
+                    if (isUnc) {
+                        WCHAR *p2 = tmp;
+                        p2[0] = L'\\';
+                        p2++;
+                        wcscpy(p2, p);
+                    } else {
+                        wcscpy(tmp, p);
+                    }
+                    free(result);
+                    result = tmp;
+                }
+            }
+        }
+
+        /* unable to get final path */
+        if (len == 0 && result != NULL) {
+            free(result);
+            result = NULL;
+        }
+    }
+
+    error = GetLastError();
+    if (CloseHandle(h))
+        SetLastError(error);
+    return result;
+}
+
+/**
+ * Retrieves file information for the specified file. If the file is
+ * symbolic link then the information on fully resolved target is
+ * returned.
+ */
+static BOOL getFileInformation(const WCHAR *path,
+                               BY_HANDLE_FILE_INFORMATION *finfo)
+{
+    BOOL result;
+    DWORD error;
+    HANDLE h = CreateFileW(path,
+                           FILE_READ_ATTRIBUTES,
+                           FILE_SHARE_DELETE |
+                               FILE_SHARE_READ | FILE_SHARE_WRITE,
+                           NULL,
+                           OPEN_EXISTING,
+                           FILE_FLAG_BACKUP_SEMANTICS,
+                           NULL);
+    if (h == INVALID_HANDLE_VALUE)
+        return FALSE;
+    result = GetFileInformationByHandle(h, finfo);
+    error = GetLastError();
+    if (CloseHandle(h))
+        SetLastError(error);
+    return result;
+}
+
+/**
+ * If the given attributes are the attributes of a reparse point, then
+ * read and return the attributes of the final target.
+ */
+DWORD getFinalAttributesIfReparsePoint(WCHAR *path, DWORD a)
+{
+    if ((a != INVALID_FILE_ATTRIBUTES) &&
+        ((a & FILE_ATTRIBUTE_REPARSE_POINT) != 0))
+    {
+        BY_HANDLE_FILE_INFORMATION finfo;
+        BOOL res = getFileInformation(path, &finfo);
+        a = (res) ? finfo.dwFileAttributes : INVALID_FILE_ATTRIBUTES;
+    }
+    return a;
+}
+
 JNIEXPORT jstring JNICALL
 Java_java_io_WinNTFileSystem_canonicalize0(JNIEnv *env, jobject this,
                                            jstring pathname)
@@ -202,12 +346,15 @@ Java_java_io_WinNTFileSystem_getBooleanAttributes(JNIEnv *env, jobject this,
         return rv;
     if (!isReservedDeviceNameW(pathbuf)) {
         if (GetFileAttributesExW(pathbuf, GetFileExInfoStandard, &wfad)) {
-            rv = (java_io_FileSystem_BA_EXISTS
-                  | ((wfad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-                     ? java_io_FileSystem_BA_DIRECTORY
-                     : java_io_FileSystem_BA_REGULAR)
-                  | ((wfad.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
-                     ? java_io_FileSystem_BA_HIDDEN : 0));
+            DWORD a = getFinalAttributesIfReparsePoint(pathbuf, wfad.dwFileAttributes);
+            if (a != INVALID_FILE_ATTRIBUTES) {
+                rv = (java_io_FileSystem_BA_EXISTS
+                    | ((a & FILE_ATTRIBUTE_DIRECTORY)
+                        ? java_io_FileSystem_BA_DIRECTORY
+                        : java_io_FileSystem_BA_REGULAR)
+                    | ((a & FILE_ATTRIBUTE_HIDDEN)
+                        ? java_io_FileSystem_BA_HIDDEN : 0));
+            }
         } else { /* pagefile.sys is a special case */
             if (GetLastError() == ERROR_SHARING_VIOLATION) {
                 rv = java_io_FileSystem_BA_EXISTS;
@@ -234,6 +381,7 @@ JNICALL Java_java_io_WinNTFileSystem_checkAccess(JNIEnv *env, jobject this,
     if (pathbuf == NULL)
         return JNI_FALSE;
     attr = GetFileAttributesW(pathbuf);
+    attr = getFinalAttributesIfReparsePoint(pathbuf, attr);
     free(pathbuf);
     if (attr == INVALID_FILE_ATTRIBUTES)
         return JNI_FALSE;
@@ -272,6 +420,20 @@ Java_java_io_WinNTFileSystem_setPermission(JNIEnv *env, jobject this,
     if (pathbuf == NULL)
         return JNI_FALSE;
     a = GetFileAttributesW(pathbuf);
+
+    /* if reparse point, get final target */
+    if ((a != INVALID_FILE_ATTRIBUTES) &&
+        ((a & FILE_ATTRIBUTE_REPARSE_POINT) != 0))
+    {
+        WCHAR *fp = getFinalPath(pathbuf);
+        if (fp == NULL) {
+            a = INVALID_FILE_ATTRIBUTES;
+        } else {
+            free(pathbuf);
+            pathbuf = fp;
+            a = GetFileAttributesW(pathbuf);
+        }
+    }
     if (a != INVALID_FILE_ATTRIBUTES) {
         if (enable)
             a =  a & ~FILE_ATTRIBUTE_READONLY;
@@ -305,7 +467,7 @@ Java_java_io_WinNTFileSystem_getLastModifiedTime(JNIEnv *env, jobject this,
                     /* Open existing or fail */
                     OPEN_EXISTING,
                     /* Backup semantics for directories */
-                    FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS,
+                    FILE_FLAG_BACKUP_SEMANTICS,
                     /* No template file */
                     NULL);
     if (h != INVALID_HANDLE_VALUE) {
@@ -332,7 +494,16 @@ Java_java_io_WinNTFileSystem_getLength(JNIEnv *env, jobject this, jobject file)
     if (GetFileAttributesExW(pathbuf,
                              GetFileExInfoStandard,
                              &wfad)) {
-        rv = wfad.nFileSizeHigh * ((jlong)MAXDWORD + 1) + wfad.nFileSizeLow;
+        if ((wfad.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) == 0) {
+            rv = wfad.nFileSizeHigh * ((jlong)MAXDWORD + 1) + wfad.nFileSizeLow;
+        } else {
+            /* file is a reparse point so read attributes of final target */
+            BY_HANDLE_FILE_INFORMATION finfo;
+            if (getFileInformation(pathbuf, &finfo)) {
+                rv = finfo.nFileSizeHigh * ((jlong)MAXDWORD + 1) +
+                    finfo.nFileSizeLow;
+            }
+        }
     } else {
         if (GetLastError() == ERROR_SHARING_VIOLATION) {
             /* The error is "share violation", which means the file/dir
@@ -360,31 +531,29 @@ Java_java_io_WinNTFileSystem_createFileExclusively(JNIEnv *env, jclass cls,
     if (pathbuf == NULL)
         return JNI_FALSE;
     h = CreateFileW(
-        pathbuf,                             /* Wide char path name */
-        GENERIC_READ | GENERIC_WRITE,  /* Read and write permission */
+        pathbuf,                              /* Wide char path name */
+        GENERIC_READ | GENERIC_WRITE,         /* Read and write permission */
         FILE_SHARE_READ | FILE_SHARE_WRITE,   /* File sharing flags */
-        NULL,                                /* Security attributes */
-        CREATE_NEW,                         /* creation disposition */
-        FILE_ATTRIBUTE_NORMAL,              /* flags and attributes */
+        NULL,                                 /* Security attributes */
+        CREATE_NEW,                           /* creation disposition */
+        FILE_ATTRIBUTE_NORMAL |
+            FILE_FLAG_OPEN_REPARSE_POINT,     /* flags and attributes */
         NULL);
 
     if (h == INVALID_HANDLE_VALUE) {
         DWORD error = GetLastError();
         if ((error != ERROR_FILE_EXISTS) && (error != ERROR_ALREADY_EXISTS)) {
-
-            // If a directory by the named path already exists,
-            // return false (behavior of solaris and linux) instead of
-            // throwing an exception
-            DWORD fattr = GetFileAttributesW(pathbuf);
-            if ((fattr == INVALID_FILE_ATTRIBUTES) ||
-                    (fattr & ~FILE_ATTRIBUTE_DIRECTORY)) {
+            // return false rather than throwing an exception when there is
+            // an existing file.
+            DWORD a = GetFileAttributesW(pathbuf);
+            if (a == INVALID_FILE_ATTRIBUTES) {
                 SetLastError(error);
                 JNU_ThrowIOExceptionWithLastError(env, "Could not open file");
             }
          }
          free(pathbuf);
          return JNI_FALSE;
-    }
+        }
     free(pathbuf);
     CloseHandle(h);
     return JNI_TRUE;
@@ -396,9 +565,9 @@ removeFileOrDirectory(const jchar *path)
     /* Returns 0 on success */
     DWORD a;
 
-    SetFileAttributesW(path, 0);
+    SetFileAttributesW(path, FILE_ATTRIBUTE_NORMAL);
     a = GetFileAttributesW(path);
-    if (a == ((DWORD)-1)) {
+    if (a == INVALID_FILE_ATTRIBUTES) {
         return 1;
     } else if (a & FILE_ATTRIBUTE_DIRECTORY) {
         return !RemoveDirectoryW(path);
@@ -578,8 +747,13 @@ Java_java_io_WinNTFileSystem_setLastModifiedTime(JNIEnv *env, jobject this,
     HANDLE h;
     if (pathbuf == NULL)
         return JNI_FALSE;
-    h = CreateFileW(pathbuf, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
-                    FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS, 0);
+    h = CreateFileW(pathbuf,
+                    FILE_WRITE_ATTRIBUTES,
+                    FILE_SHARE_READ | FILE_SHARE_WRITE,
+                    NULL,
+                    OPEN_EXISTING,
+                    FILE_FLAG_BACKUP_SEMANTICS,
+                    0);
     if (h != INVALID_HANDLE_VALUE) {
         LARGE_INTEGER modTime;
         FILETIME t;
@@ -607,6 +781,21 @@ Java_java_io_WinNTFileSystem_setReadOnly(JNIEnv *env, jobject this,
     if (pathbuf == NULL)
         return JNI_FALSE;
     a = GetFileAttributesW(pathbuf);
+
+    /* if reparse point, get final target */
+    if ((a != INVALID_FILE_ATTRIBUTES) &&
+        ((a & FILE_ATTRIBUTE_REPARSE_POINT) != 0))
+    {
+        WCHAR *fp = getFinalPath(pathbuf);
+        if (fp == NULL) {
+            a = INVALID_FILE_ATTRIBUTES;
+        } else {
+            free(pathbuf);
+            pathbuf = fp;
+            a = GetFileAttributesW(pathbuf);
+        }
+    }
+
     if (a != INVALID_FILE_ATTRIBUTES) {
         if (SetFileAttributesW(pathbuf, a | FILE_ATTRIBUTE_READONLY))
         rv = JNI_TRUE;
diff --git a/jdk/src/windows/native/sun/jkernel/kernel.cpp b/jdk/src/windows/native/sun/jkernel/kernel.cpp
index 354b47cf2b5..e67bb3a0595 100644
--- a/jdk/src/windows/native/sun/jkernel/kernel.cpp
+++ b/jdk/src/windows/native/sun/jkernel/kernel.cpp
@@ -116,11 +116,11 @@ char* getStringPlatformChars(JNIEnv* env, jstring jstr) {
     char *result = NULL;
     size_t len;
     const jchar* utf16 = env->GetStringChars(jstr, NULL);
-    len = wcstombs(NULL, utf16, env->GetStringLength(jstr) * 4) + 1;
+    len = wcstombs(NULL, (const wchar_t*)utf16, env->GetStringLength(jstr) * 4) + 1;
     if (len == -1)
         return NULL;
     result = (char*) malloc(len);
-    if (wcstombs(result, utf16, len) == -1)
+    if (wcstombs(result, (const wchar_t*)utf16, len) == -1)
         return NULL;
     env->ReleaseStringChars(jstr, utf16);
     return result;
@@ -640,7 +640,7 @@ JNIEXPORT void JNICALL Java_sun_jkernel_DownloadManager_startBackgroundDownloadW
 }
 
 
-void getParent(const TCHAR *path, TCHAR *dest) {
+void getParent(TCHAR *path, TCHAR *dest) {
     char* lastSlash = max(strrchr(path, '\\'), strrchr(path, '/'));
     if (lastSlash == NULL) {
         *dest = NULL;
diff --git a/jdk/src/windows/native/sun/nio/ch/Iocp.c b/jdk/src/windows/native/sun/nio/ch/Iocp.c
index 9568189ee6b..e80cd91205c 100644
--- a/jdk/src/windows/native/sun/nio/ch/Iocp.c
+++ b/jdk/src/windows/native/sun/nio/ch/Iocp.c
@@ -58,6 +58,16 @@ Java_sun_nio_ch_Iocp_initIDs(JNIEnv* env, jclass this)
     completionStatus_overlapped = (*env)->GetFieldID(env, clazz, "overlapped", "J");
 }
 
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_Iocp_osMajorVersion(JNIEnv* env, jclass this)
+{
+    OSVERSIONINFOEX ver;
+    ver.dwOSVersionInfoSize = sizeof(ver);
+    GetVersionEx((OSVERSIONINFO *) &ver);
+    return (ver.dwPlatformId == VER_PLATFORM_WIN32_NT) ?
+        (jint)(ver.dwMajorVersion) : (jint)0;
+}
+
 JNIEXPORT jlong JNICALL
 Java_sun_nio_ch_Iocp_createIoCompletionPort(JNIEnv* env, jclass this,
     jlong handle, jlong existingPort, jint completionKey, jint concurrency)
diff --git a/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c b/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c
index d5195c4f7b3..8e07bde64b6 100644
--- a/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c
+++ b/jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c
@@ -48,6 +48,7 @@
  */
 static jfieldID findFirst_handle;
 static jfieldID findFirst_name;
+static jfieldID findFirst_attributes;
 
 static jfieldID findStream_handle;
 static jfieldID findStream_name;
@@ -134,6 +135,7 @@ Java_sun_nio_fs_WindowsNativeDispatcher_initIDs(JNIEnv* env, jclass this)
     }
     findFirst_handle = (*env)->GetFieldID(env, clazz, "handle", "J");
     findFirst_name = (*env)->GetFieldID(env, clazz, "name", "Ljava/lang/String;");
+    findFirst_attributes = (*env)->GetFieldID(env, clazz, "attributes", "I");
 
     clazz = (*env)->FindClass(env, "sun/nio/fs/WindowsNativeDispatcher$FirstStream");
     if (clazz == NULL) {
@@ -371,6 +373,7 @@ Java_sun_nio_fs_WindowsNativeDispatcher_FindFirstFile0(JNIEnv* env, jclass this,
             return;
         (*env)->SetLongField(env, obj, findFirst_handle, ptr_to_jlong(handle));
         (*env)->SetObjectField(env, obj, findFirst_name, name);
+        (*env)->SetIntField(env, obj, findFirst_attributes, data.dwFileAttributes);
     } else {
         throwWindowsException(env, GetLastError());
     }
@@ -387,7 +390,7 @@ Java_sun_nio_fs_WindowsNativeDispatcher_FindFirstFile1(JNIEnv* env, jclass this,
     if (handle == INVALID_HANDLE_VALUE) {
         throwWindowsException(env, GetLastError());
     }
-        return ptr_to_jlong(handle);
+    return ptr_to_jlong(handle);
 }
 
 JNIEXPORT jstring JNICALL
diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp
index 1da71d1fd4e..b2767bac72c 100644
--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp
@@ -3739,11 +3739,12 @@ void AwtComponent::SetCandidateWindow(int iCandType, int x, int y)
 
 MsgRouting AwtComponent::WmImeSetContext(BOOL fSet, LPARAM *lplParam)
 {
-    // This message causes native status window shown even it is disabled.  So don't
-    // let DefWindowProc process this message if this IMC is disabled.
+    // If the Windows input context is disabled, do not let Windows
+    // display any UIs.
     HIMC hIMC = ImmGetContext();
     if (hIMC == NULL) {
-        return mrConsume;
+        *lplParam = 0;
+        return mrDoDefault;
     }
 
     if (fSet) {
diff --git a/jdk/src/windows/native/sun/windows/awt_Dialog.cpp b/jdk/src/windows/native/sun/windows/awt_Dialog.cpp
index 147bcf711eb..c0637237da4 100644
--- a/jdk/src/windows/native/sun/windows/awt_Dialog.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Dialog.cpp
@@ -364,6 +364,7 @@ void AwtDialog::Show()
     if (locationByPlatform) {
          moveToDefaultLocation();
     }
+    EnableTranslucency(TRUE);
     if (IsFocusableWindow() && (IsAutoRequestFocus() || IsFocusedWindowModalBlocker())) {
         ::ShowWindow(GetHWnd(), SW_SHOW);
     } else {
diff --git a/jdk/src/windows/native/sun/windows/awt_Frame.cpp b/jdk/src/windows/native/sun/windows/awt_Frame.cpp
index 6e2ec9c0ff7..7d48921bab8 100644
--- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp
@@ -690,6 +690,8 @@ AwtFrame::Show()
     if (locationByPlatform) {
          moveToDefaultLocation();
     }
+    EnableTranslucency(TRUE);
+
     BOOL autoRequestFocus = IsAutoRequestFocus();
 
     if (m_iconic) {
diff --git a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
index 5158ef6c43e..b612bd1bf16 100644
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
@@ -1596,18 +1596,18 @@ void AwtToolkit::RegisterEmbedderProcessId(HWND embedder)
 }
 
 JNIEnv* AwtToolkit::m_env;
-HANDLE AwtToolkit::m_thread;
+DWORD AwtToolkit::m_threadId;
 
 void AwtToolkit::SetEnv(JNIEnv *env) {
     if (m_env != NULL) { // If already cashed (by means of embeddedInit() call).
         return;
     }
-    m_thread = GetCurrentThread();
+    m_threadId = GetCurrentThreadId();
     m_env = env;
 }
 
 JNIEnv* AwtToolkit::GetEnv() {
-    return (m_env == NULL || m_thread != GetCurrentThread()) ?
+    return (m_env == NULL || m_threadId != GetCurrentThreadId()) ?
         (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2) : m_env;
 }
 
diff --git a/jdk/src/windows/native/sun/windows/awt_Toolkit.h b/jdk/src/windows/native/sun/windows/awt_Toolkit.h
index 0673201d026..efaf9ff8432 100644
--- a/jdk/src/windows/native/sun/windows/awt_Toolkit.h
+++ b/jdk/src/windows/native/sun/windows/awt_Toolkit.h
@@ -442,7 +442,7 @@ public:
 
  private:
     static JNIEnv *m_env;
-    static HANDLE m_thread;
+    static DWORD m_threadId;
  public:
     static void SetEnv(JNIEnv *env);
     static JNIEnv* GetEnv();
diff --git a/jdk/src/windows/native/sun/windows/awt_Window.cpp b/jdk/src/windows/native/sun/windows/awt_Window.cpp
index bc3e0c2414d..4c902c3fb47 100644
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp
@@ -218,12 +218,7 @@ AwtWindow::~AwtWindow()
     if (warningString != NULL) {
         delete [] warningString;
     }
-    ::EnterCriticalSection(&contentBitmapCS);
-    if (hContentBitmap != NULL) {
-        ::DeleteObject(hContentBitmap);
-        hContentBitmap = NULL;
-    }
-    ::LeaveCriticalSection(&contentBitmapCS);
+    DeleteContentBitmap();
     ::DeleteCriticalSection(&contentBitmapCS);
 }
 
@@ -372,6 +367,10 @@ MsgRouting AwtWindow::WmWindowPosChanged(LPARAM windowPos) {
         }
     }
 
+    if (wp->flags & SWP_HIDEWINDOW) {
+        EnableTranslucency(FALSE);
+    }
+
     return mrDoDefault;
 }
 
@@ -501,7 +500,7 @@ void AwtWindow::CreateWarningWindow(JNIEnv *env)
 
     RegisterWarningWindowClass();
     warningWindow = ::CreateWindowEx(
-            WS_EX_NOACTIVATE | WS_EX_LAYERED,
+            WS_EX_NOACTIVATE,
             GetWarningWindowClassName(),
             warningString,
             WS_POPUP,
@@ -513,7 +512,7 @@ void AwtWindow::CreateWarningWindow(JNIEnv *env)
             NULL // lParam
             );
     if (warningWindow == NULL) {
-        //XXX: actually this is bad... We didn't manage to create the widow.
+        //XXX: actually this is bad... We didn't manage to create the window.
         return;
     }
 
@@ -684,31 +683,6 @@ void AwtWindow::CalculateWarningWindowBounds(JNIEnv *env, LPRECT rect)
 
     env->DeleteLocalRef(point2D);
 
-    //Make sure the warning is not far from the window bounds
-    x = max(x, windowBounds.left - (int)warningWindowWidth - 2);
-    x = min(x, windowBounds.right + (int)warningWindowWidth + 2);
-
-    y = max(y, windowBounds.top - (int)warningWindowHeight - 2);
-    y = min(y, windowBounds.bottom + (int)warningWindowHeight + 2);
-
-    // Now make sure the warning window is visible on the screen
-    HMONITOR hmon = MonitorFromWindow(GetHWnd(), MONITOR_DEFAULTTOPRIMARY);
-    DASSERT(hmon != NULL);
-
-    RECT monitorBounds;
-    RECT monitorInsets;
-
-    MonitorBounds(hmon, &monitorBounds);
-    if (!AwtToolkit::GetScreenInsets(m_screenNum, &monitorInsets)) {
-        ::ZeroMemory(&monitorInsets, sizeof(monitorInsets));
-    }
-
-    x = max(x, monitorBounds.left + monitorInsets.left);
-    x = min(x, monitorBounds.right - monitorInsets.right - (int)warningWindowWidth);
-
-    y = max(y, monitorBounds.top + monitorInsets.top);
-    y = min(y, monitorBounds.bottom - monitorInsets.bottom - (int)warningWindowHeight);
-
     rect->left = x;
     rect->top = y;
     rect->right = rect->left + warningWindowWidth;
@@ -813,6 +787,19 @@ void AwtWindow::RepaintWarningWindow()
     ::ReleaseDC(warningWindow, hdc);
 }
 
+void AwtWindow::SetLayered(HWND window, bool layered)
+{
+    const LONG ex_style = ::GetWindowLong(window, GWL_EXSTYLE);
+    ::SetWindowLong(window, GWL_EXSTYLE, layered ?
+            ex_style | WS_EX_LAYERED : ex_style & ~WS_EX_LAYERED);
+}
+
+bool AwtWindow::IsLayered(HWND window)
+{
+    const LONG ex_style = ::GetWindowLong(window, GWL_EXSTYLE);
+    return ex_style & WS_EX_LAYERED;
+}
+
 void AwtWindow::StartSecurityAnimation(AnimationKind kind)
 {
     if (!IsUntrusted()) {
@@ -835,8 +822,14 @@ void AwtWindow::StartSecurityAnimation(AnimationKind kind)
 
         ::SetLayeredWindowAttributes(warningWindow, RGB(0, 0, 0),
                 0xFF, LWA_ALPHA);
+        AwtWindow::SetLayered(warningWindow, false);
         ::RedrawWindow(warningWindow, NULL, NULL,
                 RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN);
+    } else if (securityAnimationKind == akPreHide) {
+        // Pre-hiding means fading-out. We have to make the window layered.
+        // Note: Some VNC clients do not support layered windows, hence
+        // we dynamically turn it on and off. See 6805231.
+        AwtWindow::SetLayered(warningWindow, true);
     }
 }
 
@@ -1136,6 +1129,8 @@ void AwtWindow::Show()
          moveToDefaultLocation();
     }
 
+    EnableTranslucency(TRUE);
+
     // The following block exists to support Menu/Tooltip animation for
     // Swing programs in a way which avoids introducing any new public api into
     // AWT or Swing.
@@ -2500,48 +2495,93 @@ void AwtWindow::RedrawWindow()
     }
 }
 
-void AwtWindow::SetTranslucency(BYTE opacity, BOOL opaque)
+// Deletes the hContentBitmap if it is non-null
+void AwtWindow::DeleteContentBitmap()
 {
-    BYTE old_opacity = getOpacity();
-    BOOL old_opaque = isOpaque();
+    ::EnterCriticalSection(&contentBitmapCS);
+    if (hContentBitmap != NULL) {
+        ::DeleteObject(hContentBitmap);
+        hContentBitmap = NULL;
+    }
+    ::LeaveCriticalSection(&contentBitmapCS);
+}
+
+// The effects are enabled only upon showing the window.
+// See 6780496 for details.
+void AwtWindow::EnableTranslucency(BOOL enable)
+{
+    if (enable) {
+        SetTranslucency(getOpacity(), isOpaque(), FALSE, TRUE);
+    } else {
+        SetTranslucency(0xFF, TRUE, FALSE);
+    }
+}
+
+/**
+ * Sets the translucency effects.
+ *
+ * This method is used to:
+ *
+ * 1. Apply the translucency effects upon showing the window
+ *    (setValues == FALSE, useDefaultForOldValues == TRUE);
+ * 2. Turn off the effects upon hiding the window
+ *    (setValues == FALSE, useDefaultForOldValues == FALSE);
+ * 3. Set the effects per user's request
+ *    (setValues == TRUE, useDefaultForOldValues == FALSE);
+ *
+ * In case #3 the effects may or may not be applied immediately depending on
+ * the current visibility status of the window.
+ *
+ * The setValues argument indicates if we need to preserve the passed values
+ * in local fields for further use.
+ * The useDefaultForOldValues argument indicates whether we should consider
+ * the window as if it has not any effects applied at the moment.
+ */
+void AwtWindow::SetTranslucency(BYTE opacity, BOOL opaque, BOOL setValues,
+        BOOL useDefaultForOldValues)
+{
+    BYTE old_opacity = useDefaultForOldValues ? 0xFF : getOpacity();
+    BOOL old_opaque = useDefaultForOldValues ? TRUE : isOpaque();
 
     if (opacity == old_opacity && opaque == old_opaque) {
         return;
     }
 
-    setOpacity(opacity);
-    setOpaque(opaque);
+    if (setValues) {
+       m_opacity = opacity;
+       m_opaque = opaque;
+    }
+
+    // If we're invisible and are storing the values, return
+    // Otherwise, apply the effects immediately
+    if (!IsVisible() && setValues) {
+        return;
+    }
 
     HWND hwnd = GetHWnd();
 
-    LONG ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
-
     if (opaque != old_opaque) {
-        ::EnterCriticalSection(&contentBitmapCS);
-        if (hContentBitmap != NULL) {
-            ::DeleteObject(hContentBitmap);
-            hContentBitmap = NULL;
-        }
-        ::LeaveCriticalSection(&contentBitmapCS);
+        DeleteContentBitmap();
     }
 
     if (opaque && opacity == 0xff) {
         // Turn off all the effects
-        ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style & ~WS_EX_LAYERED);
+        AwtWindow::SetLayered(hwnd, false);
+
         // Ask the window to repaint itself and all the children
         RedrawWindow();
     } else {
         // We're going to enable some effects
-        if (!(ex_style & WS_EX_LAYERED)) {
-            ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style | WS_EX_LAYERED);
+        if (!AwtWindow::IsLayered(hwnd)) {
+            AwtWindow::SetLayered(hwnd, true);
         } else {
             if ((opaque && opacity < 0xff) ^ (old_opaque && old_opacity < 0xff)) {
                 // _One_ of the modes uses the SetLayeredWindowAttributes.
                 // Need to reset the style in this case.
                 // If both modes are simple (i.e. just changing the opacity level),
                 // no need to reset the style.
-                ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style & ~WS_EX_LAYERED);
-                ::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style | WS_EX_LAYERED);
+                AwtWindow::SetLayered(hwnd, false);
+                AwtWindow::SetLayered(hwnd, true);
             }
         }
 
@@ -2641,9 +2681,7 @@ void AwtWindow::UpdateWindow(JNIEnv* env, jintArray data, int width, int height,
     }
 
     ::EnterCriticalSection(&contentBitmapCS);
-    if (hContentBitmap != NULL) {
-        ::DeleteObject(hContentBitmap);
-    }
+    DeleteContentBitmap();
     hContentBitmap = hBitmap;
     contentWidth = width;
     contentHeight = height;
diff --git a/jdk/src/windows/native/sun/windows/awt_Window.h b/jdk/src/windows/native/sun/windows/awt_Window.h
index 68a6d05894f..1d238b44dac 100644
--- a/jdk/src/windows/native/sun/windows/awt_Window.h
+++ b/jdk/src/windows/native/sun/windows/awt_Window.h
@@ -262,32 +262,29 @@ private:
                                        // from its hierarchy when shown. Currently applied to instances of
                                        // javax/swing/Popup$HeavyWeightWindow class.
 
+    // SetTranslucency() is the setter for the following two fields
     BYTE m_opacity;         // The opacity level. == 0xff by default (when opacity mode is disabled)
     BOOL m_opaque;          // Whether the window uses the perpixel translucency (false), or not (true).
 
     inline BYTE getOpacity() {
         return m_opacity;
     }
-    inline void setOpacity(BYTE opacity) {
-        m_opacity = opacity;
-    }
 
     inline BOOL isOpaque() {
         return m_opaque;
     }
-    inline void setOpaque(BOOL opaque) {
-        m_opaque = opaque;
-    }
 
     CRITICAL_SECTION contentBitmapCS;
     HBITMAP hContentBitmap;
     UINT contentWidth;
     UINT contentHeight;
 
-    void SetTranslucency(BYTE opacity, BOOL opaque);
+    void SetTranslucency(BYTE opacity, BOOL opaque, BOOL setValues = TRUE,
+            BOOL useDefaultForOldValues = FALSE);
     void UpdateWindow(int width, int height, HBITMAP hBitmap);
     void UpdateWindowImpl(int width, int height, HBITMAP hBitmap);
     void RedrawWindow();
+    void DeleteContentBitmap();
 
     static UINT untrustedWindowsCounter;
 
@@ -331,6 +328,9 @@ private:
 
     void RepositionSecurityWarning(JNIEnv *env);
 
+    static void SetLayered(HWND window, bool layered);
+    static bool IsLayered(HWND window);
+
 public:
     void UpdateSecurityWarningVisibility();
     static bool IsWarningWindow(HWND hWnd);
@@ -349,6 +349,8 @@ protected:
 
     UINT currentWmSizeState;
 
+    void EnableTranslucency(BOOL enable);
+
 private:
     int m_screenNum;
 
diff --git a/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java
new file mode 100644
index 00000000000..183bec947e9
--- /dev/null
+++ b/jdk/test/com/sun/java/swing/plaf/windows/Test6824600.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @bug 6824600
+   @summary OOM occurs when setLookAndFeel() is executed in Windows L&F(XP style)
+   @author Pavel Porvatov
+   @run main Test6824600
+*/
+
+import com.sun.java.swing.plaf.windows.DesktopProperty;
+
+import java.awt.*;
+
+public class Test6824600 {
+    public static void main(String[] args) throws Exception {
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+
+        HackedDesktopProperty desktopProperty = new HackedDesktopProperty("Button.background", null);
+
+        // Register listener in toolkit
+        desktopProperty.getValueFromDesktop();
+
+        int length = toolkit.getPropertyChangeListeners().length;
+
+        // Make several invocations
+        desktopProperty.getValueFromDesktop();
+        desktopProperty.getValueFromDesktop();
+
+        desktopProperty.invalidate();
+
+        desktopProperty.getValueFromDesktop();
+        desktopProperty.getValueFromDesktop();
+
+        if (length != toolkit.getPropertyChangeListeners().length) {
+            throw new RuntimeException("New listeners were added into Toolkit");
+        }
+    }
+
+    public static class HackedDesktopProperty extends DesktopProperty {
+        public HackedDesktopProperty(String key, Object fallback) {
+            super(key, fallback);
+        }
+
+        // Publish the method
+        public Object getValueFromDesktop() {
+            return super.getValueFromDesktop();
+        }
+    }
+}
diff --git a/jdk/test/com/sun/jdi/BadHandshakeTest.java b/jdk/test/com/sun/jdi/BadHandshakeTest.java
index a0fba898f0b..d5ecd0a73b8 100644
--- a/jdk/test/com/sun/jdi/BadHandshakeTest.java
+++ b/jdk/test/com/sun/jdi/BadHandshakeTest.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 6306165
+ * @bug 6306165 6432567
  * @summary Check that a bad handshake doesn't cause a debuggee to abort
  *
  * @build VMConnection BadHandshakeTest Exit0
diff --git a/jdk/test/com/sun/jdi/EnumTest.java b/jdk/test/com/sun/jdi/EnumTest.java
index be06c0f4524..51d3a976ad5 100644
--- a/jdk/test/com/sun/jdi/EnumTest.java
+++ b/jdk/test/com/sun/jdi/EnumTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -source 1.5 -target 1.5 -g EnumTest.java
+ *  @run compile -g EnumTest.java
  *  @run main EnumTest
  */
 import com.sun.jdi.*;
diff --git a/jdk/test/com/sun/jdi/GenericsTest.java b/jdk/test/com/sun/jdi/GenericsTest.java
index 2220dd7bbfc..5156e9d8e09 100644
--- a/jdk/test/com/sun/jdi/GenericsTest.java
+++ b/jdk/test/com/sun/jdi/GenericsTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -source 1.5 -target 1.5 -g GenericsTest.java
+ *  @run compile -g GenericsTest.java
  *  @run main GenericsTest
  */
 import com.sun.jdi.*;
diff --git a/jdk/test/com/sun/jdi/JdbVarargsTest.sh b/jdk/test/com/sun/jdi/JdbVarargsTest.sh
index 72d9561f54c..82e0b18e60e 100644
--- a/jdk/test/com/sun/jdi/JdbVarargsTest.sh
+++ b/jdk/test/com/sun/jdi/JdbVarargsTest.sh
@@ -32,7 +32,6 @@
 #  @run shell JdbVarargsTest.sh
 
 classname=JdbVarargsTest
-compileOptions="-source 1.5 -target 1.5"
 createJavaFile()
 {
     cat <<EOF > $classname.java.1
diff --git a/jdk/test/com/sun/jdi/StepTest.java b/jdk/test/com/sun/jdi/StepTest.java
index 9c2344d09db..041507a8b9d 100644
--- a/jdk/test/com/sun/jdi/StepTest.java
+++ b/jdk/test/com/sun/jdi/StepTest.java
@@ -27,7 +27,7 @@
  *  @author Gordon Hirsch
  *
  *  @run build TestScaffold VMConnection TargetAdapter TargetListener
- *  @run compile -g -target 1.5 MethodCalls.java
+ *  @run compile -g MethodCalls.java
  *  @run compile -g MethodCallsReflection.java
  *  @run compile -g ControlFlow.java
  *  @run build StepTest
diff --git a/jdk/test/com/sun/jdi/UTF8Test.java b/jdk/test/com/sun/jdi/UTF8Test.java
index b7b28665894..4396770e093 100644
--- a/jdk/test/com/sun/jdi/UTF8Test.java
+++ b/jdk/test/com/sun/jdi/UTF8Test.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -g -source 1.5 UTF8Test.java
+ *  @run compile -g UTF8Test.java
  *  @run main UTF8Test
  */
 
diff --git a/jdk/test/com/sun/jdi/VarargsTest.java b/jdk/test/com/sun/jdi/VarargsTest.java
index ed4323e2d4f..1ea51ad245b 100644
--- a/jdk/test/com/sun/jdi/VarargsTest.java
+++ b/jdk/test/com/sun/jdi/VarargsTest.java
@@ -29,7 +29,7 @@
  *  @author jjh
  *
  *  @run build TestScaffold VMConnection TargetListener TargetAdapter
- *  @run compile -g -source 1.5 -target 1.5 VarargsTest.java
+ *  @run compile -g VarargsTest.java
  *  @run main VarargsTest
  */
 import com.sun.jdi.*;
diff --git a/jdk/test/com/sun/jndi/dns/CheckAccess.java b/jdk/test/com/sun/jndi/dns/CheckAccess.java
new file mode 100644
index 00000000000..478575167a5
--- /dev/null
+++ b/jdk/test/com/sun/jndi/dns/CheckAccess.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6657619
+ * @summary DnsContext.debug is public static mutable (findbugs)
+ * @author Vincent Ryan
+ */
+
+import java.lang.reflect.*;
+
+/*
+ * Check that the 'debug' class member is no longer publicly accessible.
+ */
+public class CheckAccess {
+    public static final void main(String[] args) throws Exception {
+        try {
+            Class clazz = Class.forName("com.sun.jndi.dns.DnsContext");
+            Field field = clazz.getField("debug");
+            if (Modifier.isPublic(field.getModifiers())) {
+                throw new Exception(
+                    "class member 'debug' must not be publicly accessible");
+            }
+        } catch (NoSuchFieldException e) {
+            // 'debug' is not publicly accessible, ignore exception
+        }
+    }
+}
diff --git a/jdk/test/com/sun/jndi/ldap/BalancedParentheses.java b/jdk/test/com/sun/jndi/ldap/BalancedParentheses.java
new file mode 100644
index 00000000000..2053aba7e05
--- /dev/null
+++ b/jdk/test/com/sun/jndi/ldap/BalancedParentheses.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6449574
+ * @summary Invalid ldap filter is accepted and processed
+ */
+
+import java.io.*;
+import javax.naming.*;
+import javax.naming.directory.*;
+import java.util.Properties;
+import java.util.Hashtable;
+
+import java.net.Socket;
+import java.net.ServerSocket;
+
+public class BalancedParentheses {
+    // Should we run the client or server in a separate thread?
+    //
+    // Both sides can throw exceptions, but do you have a preference
+    // as to which side should be the main thread.
+    static boolean separateServerThread = true;
+
+    // use any free port by default
+    volatile int serverPort = 0;
+
+    // Is the server ready to serve?
+    volatile static boolean serverReady = false;
+
+    // Define the server side of the test.
+    //
+    // If the server prematurely exits, serverReady will be set to true
+    // to avoid infinite hangs.
+    void doServerSide() throws Exception {
+        ServerSocket serverSock = new ServerSocket(serverPort);
+
+        // signal client, it's ready to accecpt connection
+        serverPort = serverSock.getLocalPort();
+        serverReady = true;
+
+        // accept a connection
+        Socket socket = serverSock.accept();
+        System.out.println("Server: Connection accepted");
+
+        InputStream is = socket.getInputStream();
+        OutputStream os = socket.getOutputStream();
+
+        // read the bindRequest
+        while (is.read() != -1) {
+            // ignore
+            is.skip(is.available());
+            break;
+        }
+
+        byte[] bindResponse = {0x30, 0x0C, 0x02, 0x01, 0x01, 0x61, 0x07, 0x0A,
+                               0x01, 0x00, 0x04, 0x00, 0x04, 0x00};
+        // write bindResponse
+        os.write(bindResponse);
+        os.flush();
+
+        // ignore any more request.
+        while (is.read() != -1) {
+            // ignore
+            is.skip(is.available());
+        }
+
+        is.close();
+        os.close();
+        socket.close();
+        serverSock.close();
+    }
+
+    //  Define the client side of the test.
+    //
+    // If the server prematurely exits, serverReady will be set to true
+    // to avoid infinite hangs.
+    void doClientSide() throws Exception {
+        // Wait for server to get started.
+        while (!serverReady) {
+            Thread.sleep(50);
+        }
+
+        // set up the environment for creating the initial context
+        Hashtable<Object, Object> env = new Hashtable<Object, Object>();
+        env.put(Context.INITIAL_CONTEXT_FACTORY,
+                                "com.sun.jndi.ldap.LdapCtxFactory");
+        env.put(Context.PROVIDER_URL, "ldap://localhost:" + serverPort);
+        env.put("com.sun.jndi.ldap.read.timeout", "1000");
+
+        // env.put(Context.SECURITY_AUTHENTICATION, "simple");
+        // env.put(Context.SECURITY_PRINCIPAL,"cn=root");
+        // env.put(Context.SECURITY_CREDENTIALS,"root");
+
+        // create initial context
+        DirContext context = new InitialDirContext(env);
+
+        // searching
+        SearchControls scs = new SearchControls();
+        scs.setSearchScope(SearchControls.SUBTREE_SCOPE);
+
+        try {
+            NamingEnumeration answer = context.search(
+                                        "o=sun,c=us", "(&(cn=Bob)))", scs);
+        } catch (InvalidSearchFilterException isfe) {
+            // ignore, it is the expected filter exception.
+            System.out.println("Expected exception: " + isfe.getMessage());
+        } catch (NamingException ne) {
+            // maybe a read timeout exception, as the server does not response.
+            throw new Exception("Expect a InvalidSearchFilterException", ne);
+        }
+
+        try {
+            NamingEnumeration answer = context.search(
+                                        "o=sun,c=us", ")(&(cn=Bob)", scs);
+        } catch (InvalidSearchFilterException isfe) {
+            // ignore, it is the expected filter exception.
+            System.out.println("Expected exception: " + isfe.getMessage());
+        } catch (NamingException ne) {
+            // maybe a read timeout exception, as the server does not response.
+            throw new Exception("Expect a InvalidSearchFilterException", ne);
+        }
+
+        try {
+            NamingEnumeration answer = context.search(
+                                        "o=sun,c=us", "(&(cn=Bob))", scs);
+        } catch (InvalidSearchFilterException isfe) {
+            // ignore, it is the expected filter exception.
+            throw new Exception("Unexpected ISFE", isfe);
+        } catch (NamingException ne) {
+            // maybe a read timeout exception, as the server does not response.
+            System.out.println("Expected exception: " + ne.getMessage());
+        }
+
+        context.close();
+    }
+
+    /*
+     * ============================================================
+     * The remainder is just support stuff
+     */
+
+    // client and server thread
+    Thread clientThread = null;
+    Thread serverThread = null;
+
+    // client and server exceptions
+    volatile Exception serverException = null;
+    volatile Exception clientException = null;
+
+    void startServer(boolean newThread) throws Exception {
+        if (newThread) {
+            serverThread = new Thread() {
+                public void run() {
+                    try {
+                        doServerSide();
+                    } catch (Exception e) {
+                        /*
+                         * Our server thread just died.
+                         *
+                         * Release the client, if not active already...
+                         */
+                        System.err.println("Server died...");
+                        System.err.println(e);
+                        serverReady = true;
+                        serverException = e;
+                    }
+                }
+            };
+            serverThread.start();
+        } else {
+            doServerSide();
+        }
+    }
+
+    void startClient(boolean newThread) throws Exception {
+        if (newThread) {
+            clientThread = new Thread() {
+                public void run() {
+                    try {
+                        doClientSide();
+                    } catch (Exception e) {
+                        /*
+                         * Our client thread just died.
+                         */
+                        System.err.println("Client died...");
+                        clientException = e;
+                    }
+                }
+            };
+            clientThread.start();
+        } else {
+            doClientSide();
+        }
+    }
+
+    // Primary constructor, used to drive remainder of the test.
+    BalancedParentheses() throws Exception {
+        if (separateServerThread) {
+            startServer(true);
+            startClient(false);
+        } else {
+            startClient(true);
+            startServer(false);
+        }
+
+        /*
+         * Wait for other side to close down.
+         */
+        if (separateServerThread) {
+            serverThread.join();
+        } else {
+            clientThread.join();
+        }
+
+        /*
+         * When we get here, the test is pretty much over.
+         *
+         * If the main thread excepted, that propagates back
+         * immediately.  If the other thread threw an exception, we
+         * should report back.
+         */
+        if (serverException != null) {
+            System.out.print("Server Exception:");
+            throw serverException;
+        }
+        if (clientException != null) {
+            System.out.print("Client Exception:");
+            throw clientException;
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        // start the test
+        new BalancedParentheses();
+    }
+
+}
diff --git a/jdk/test/com/sun/nio/sctp/SctpChannel/CommUp.java b/jdk/test/com/sun/nio/sctp/SctpChannel/CommUp.java
new file mode 100644
index 00000000000..ec2e68ac4d2
--- /dev/null
+++ b/jdk/test/com/sun/nio/sctp/SctpChannel/CommUp.java
@@ -0,0 +1,364 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6863110
+ * @summary Newly connected/accepted SctpChannel should fire OP_READ if registered with a Selector
+ * @author chegar
+ */
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.nio.ByteBuffer;
+import java.nio.channels.Selector;
+import java.nio.channels.SelectionKey;
+import com.sun.nio.sctp.AbstractNotificationHandler;
+import com.sun.nio.sctp.AssociationChangeNotification;
+import com.sun.nio.sctp.AssociationChangeNotification.AssocChangeEvent;
+import com.sun.nio.sctp.HandlerResult;
+import com.sun.nio.sctp.Notification;
+import com.sun.nio.sctp.SctpChannel;
+import com.sun.nio.sctp.SctpServerChannel;
+import com.sun.nio.sctp.ShutdownNotification;
+import static java.lang.System.out;
+import static java.lang.System.err;
+import static java.nio.channels.SelectionKey.OP_CONNECT;
+import static java.nio.channels.SelectionKey.OP_READ;
+
+public class CommUp {
+    static CountDownLatch acceptLatch = new CountDownLatch(1);
+    static final int TIMEOUT = 10000;
+
+    CommUpNotificationHandler clientHandler = new CommUpNotificationHandler();
+    CommUpNotificationHandler serverHandler = new CommUpNotificationHandler();
+    CommUpServer server;
+    Thread clientThread;
+
+    void test(String[] args) {
+        SocketAddress address = null;
+
+        if (!Util.isSCTPSupported()) {
+            out.println("SCTP protocol is not supported");
+            out.println("Test cannot be run");
+            return;
+        }
+
+        if (args.length == 2) {
+            /* requested to connecct to a specific address */
+            try {
+                int port = Integer.valueOf(args[1]);
+                address = new InetSocketAddress(args[0], port);
+            } catch (NumberFormatException nfe) {
+                err.println(nfe);
+            }
+        } else {
+            /* start server on local machine, default */
+            try {
+                server = new CommUpServer();
+                server.start();
+                address = server.address();
+                debug("Server started and listening on " + address);
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+                return;
+            }
+        }
+
+        /* store the main thread so that the server can interrupt it, if necessary */
+        clientThread = Thread.currentThread();
+
+        doClient(address);
+    }
+
+    void doClient(SocketAddress peerAddress) {
+        SctpChannel sc = null;
+        try {
+            debug("connecting to " + peerAddress);
+            sc = SctpChannel.open();
+            sc.configureBlocking(false);
+            check(sc.isBlocking() == false, "Should be in non-blocking mode");
+            sc.connect(peerAddress);
+
+            Selector selector = Selector.open();
+            SelectionKey selectiontKey = sc.register(selector, OP_CONNECT);
+
+            /* Expect two interest Ops */
+            boolean opConnectReceived = false;
+            boolean opReadReceived = false;
+            for (int z=0; z<2; z++) {
+                debug("select " + z);
+                int keysAdded = selector.select(TIMEOUT);
+                debug("returned " + keysAdded + " keys");
+                if (keysAdded > 0) {
+                    Set<SelectionKey> keys = selector.selectedKeys();
+                    Iterator<SelectionKey> i = keys.iterator();
+                    while(i.hasNext()) {
+                        SelectionKey sk = i.next();
+                        i.remove();
+                        SctpChannel readyChannel =
+                            (SctpChannel)sk.channel();
+
+                        /* OP_CONNECT */
+                        if (sk.isConnectable()) {
+                            /* some trivial checks */
+                            check(opConnectReceived == false,
+                                  "should only received one OP_CONNECT");
+                            check(opReadReceived == false,
+                                  "should not receive OP_READ before OP_CONNECT");
+                            check(readyChannel.equals(sc),
+                                  "channels should be equal");
+                            check(!sk.isAcceptable(),
+                                  "key should not be acceptable");
+                            check(!sk.isReadable(),
+                                  "key should not be readable");
+                            check(!sk.isWritable(),
+                                  "key should not be writable");
+
+                            /* now process the OP_CONNECT */
+                            opConnectReceived = true;
+                            check((sk.interestOps() & OP_CONNECT) == OP_CONNECT,
+                                  "selection key interest ops should contain OP_CONNECT");
+                            sk.interestOps(OP_READ);
+                            check((sk.interestOps() & OP_CONNECT) != OP_CONNECT,
+                                  "selection key interest ops should not contain OP_CONNECT");
+                            check(sc.finishConnect(),
+                                  "finishConnect should return true");
+                        } /* OP_READ */
+                          else if (sk.isReadable()) {
+                            /* some trivial checks */
+                            check(opConnectReceived == true,
+                                  "should receive one OP_CONNECT before OP_READ");
+                            check(opReadReceived == false,
+                                  "should not receive OP_READ before OP_CONNECT");
+                            check(readyChannel.equals(sc),
+                                  "channels should be equal");
+                            check(!sk.isAcceptable(),
+                                  "key should not be acceptable");
+                            check(sk.isReadable(),
+                                  "key should be readable");
+                            check(!sk.isWritable(),
+                                  "key should not be writable");
+                            check(!sk.isConnectable(),
+                                  "key should not be connectable");
+
+                            /* now process the OP_READ */
+                            opReadReceived = true;
+                            selectiontKey.cancel();
+
+                            /* try with small buffer to see if native
+                             * implementation can handle this */
+                            ByteBuffer buffer = ByteBuffer.allocateDirect(1);
+                            readyChannel.receive(buffer, null, clientHandler);
+                            check(clientHandler.receivedCommUp(),
+                                    "Client should have received COMM_UP");
+
+                            /* dont close (or put anything on) the channel until
+                             * we check that the server's accepted channel also
+                             * received COMM_UP */
+                            serverHandler.waitForCommUp();
+                        } else {
+                            fail("Unexpected selection key");
+                        }
+                    }
+                } else {
+                    fail("Client selector returned 0 ready keys");
+                    /* stop the server */
+                    server.thread().interrupt();
+                }
+            } //for
+
+        } catch (IOException ioe) {
+            unexpected(ioe);
+        } catch (InterruptedException ie) {
+            unexpected(ie);
+        }
+    }
+
+    class CommUpServer implements Runnable
+    {
+        final InetSocketAddress serverAddr;
+        private SctpServerChannel ssc;
+        private Thread serverThread;
+
+        public CommUpServer() throws IOException {
+            ssc = SctpServerChannel.open().bind(null);
+            java.util.Set<SocketAddress> addrs = ssc.getAllLocalAddresses();
+            if (addrs.isEmpty())
+                debug("addrs should not be empty");
+
+            serverAddr = (InetSocketAddress) addrs.iterator().next();
+        }
+
+        void start() {
+            serverThread = new Thread(this, "CommUpServer-"  +
+                                              serverAddr.getPort());
+            serverThread.start();
+        }
+
+        InetSocketAddress address () {
+            return serverAddr;
+        }
+
+        Thread thread() {
+            return serverThread;
+        }
+
+        @Override
+        public void run() {
+            Selector selector = null;
+            SctpChannel sc = null;
+            SelectionKey readKey = null;
+            try {
+                sc = ssc.accept();
+                debug("accepted " + sc);
+
+                selector = Selector.open();
+                sc.configureBlocking(false);
+                check(sc.isBlocking() == false, "Should be in non-blocking mode");
+                readKey = sc.register(selector, SelectionKey.OP_READ);
+
+                debug("select");
+                int keysAdded = selector.select(TIMEOUT);
+                debug("returned " + keysAdded + " keys");
+                if (keysAdded > 0) {
+                    Set<SelectionKey> keys = selector.selectedKeys();
+                    Iterator<SelectionKey> i = keys.iterator();
+                    while(i.hasNext()) {
+                        SelectionKey sk = i.next();
+                        i.remove();
+                        SctpChannel readyChannel =
+                            (SctpChannel)sk.channel();
+                        check(readyChannel.equals(sc),
+                                "channels should be equal");
+                        check(!sk.isAcceptable(),
+                                "key should not be acceptable");
+                        check(sk.isReadable(),
+                                "key should be readable");
+                        check(!sk.isWritable(),
+                                "key should not be writable");
+                        check(!sk.isConnectable(),
+                                "key should not be connectable");
+
+                        /* block until we check if the client has received its COMM_UP*/
+                        clientHandler.waitForCommUp();
+
+                        ByteBuffer buffer = ByteBuffer.allocateDirect(1);
+                        sc.receive(buffer, null, serverHandler);
+                        check(serverHandler.receivedCommUp(),
+                                "Accepted channel should have received COMM_UP");
+                    }
+                } else {
+                   fail("Server selector returned 0 ready keys");
+                   /* stop the client */
+                   clientThread.interrupt();
+            }
+            } catch (IOException ioe) {
+                ioe.printStackTrace();
+            } catch (InterruptedException unused) {
+            } finally {
+                if (readKey != null) readKey.cancel();
+                try { if (selector != null) selector.close(); }
+                catch (IOException  ioe) { unexpected(ioe); }
+                try { if (ssc != null) ssc.close(); }
+                catch (IOException  ioe) { unexpected(ioe); }
+                try { if (sc != null) sc.close(); }
+                catch (IOException  ioe) { unexpected(ioe); }
+            }
+        }
+    }
+
+    class CommUpNotificationHandler extends AbstractNotificationHandler<Object>
+    {
+        private boolean receivedCommUp;  // false
+
+        public synchronized boolean receivedCommUp() {
+            return receivedCommUp;
+        }
+
+        public synchronized boolean waitForCommUp() throws InterruptedException {
+            while (receivedCommUp == false) {
+                wait();
+            }
+
+            return false;
+        }
+
+        @Override
+        public HandlerResult handleNotification(
+                Notification notification, Object attachment) {
+            fail("Unknown notification type");
+            return HandlerResult.CONTINUE;
+        }
+
+        @Override
+        public synchronized HandlerResult handleNotification(
+                AssociationChangeNotification notification, Object attachment) {
+            AssocChangeEvent event = notification.event();
+            debug("AssociationChangeNotification");
+            debug("  Association: " + notification.association());
+            debug("  Event: " + event);
+
+            if (event.equals(AssocChangeEvent.COMM_UP)) {
+                receivedCommUp = true;
+                notifyAll();
+            }
+
+            return HandlerResult.RETURN;
+        }
+
+        @Override
+        public HandlerResult handleNotification(
+                ShutdownNotification notification, Object attachment) {
+            debug("ShutdownNotification");
+            debug("  Association: " + notification.association());
+            return HandlerResult.RETURN;
+        }
+    }
+
+        //--------------------- Infrastructure ---------------------------
+    boolean debug = true;
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void check(boolean cond, String failMessage) {if (cond) pass(); else fail(failMessage);}
+    void debug(String message) {if(debug) { out.println(Thread.currentThread().getName() + ": " + message); }  }
+    void sleep(long millis) { try { Thread.currentThread().sleep(millis); }
+                          catch(InterruptedException ie) { unexpected(ie); }}
+    public static void main(String[] args) throws Throwable {
+        Class<?> k = new Object(){}.getClass().getEnclosingClass();
+        try {k.getMethod("instanceMain",String[].class)
+                .invoke( k.newInstance(), (Object) args);}
+        catch (Throwable e) {throw e.getCause();}}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+
+}
diff --git a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java b/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java
index eb75415614f..7db79e341d1 100644
--- a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java
+++ b/jdk/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java
@@ -115,7 +115,6 @@ public class Branch {
             /* Receive the COMM_UP */
             buffer.clear();
             BranchNotificationHandler handler = new BranchNotificationHandler();
-            channel.configureBlocking(false);
             info = channel.receive(buffer, null, handler);
             check(handler.receivedCommUp(), "COMM_UP no received");
             Set<Association> associations = channel.associations();
diff --git a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java b/jdk/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java
index 1495f5399e3..e4292dd2339 100644
--- a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java
+++ b/jdk/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java
@@ -181,7 +181,6 @@ public class SocketOptionTests {
         /* Receive the COMM_UP */
         buffer.clear();
         SOTNotificationHandler handler = new SOTNotificationHandler();
-        smc.configureBlocking(false);
         info = smc.receive(buffer, null, handler);
         check(handler.receivedCommUp(), "COMM_UP no received");
         Set<Association> associations = smc.associations();
@@ -220,6 +219,7 @@ public class SocketOptionTests {
             }
             check(found, "SCTP_PRIMARY_ADDR returned bogus address!");
 
+            System.out.println("Try SCTP_PRIMARY_ADDR set to: " + addrToSet);
             smc.setOption(SCTP_PRIMARY_ADDR, addrToSet, assoc);
             System.out.println("SCTP_PRIMARY_ADDR set to: " + addrToSet);
             primaryAddr = smc.getOption(SCTP_PRIMARY_ADDR, assoc);
diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java b/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java
new file mode 100644
index 00000000000..a77d02b84f9
--- /dev/null
+++ b/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test %I% %E%
+ * @bug 6824440 6858484
+ * @summary Check that Apache XMLSec APIs will not accept HMAC truncation
+ *    lengths less than minimum bound
+ * @compile -XDignore.symbol.file TruncateHMAC.java
+ * @run main TruncateHMAC
+ */
+
+import java.io.File;
+import javax.crypto.SecretKey;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import com.sun.org.apache.xml.internal.security.Init;
+import com.sun.org.apache.xml.internal.security.c14n.Canonicalizer;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignature;
+import com.sun.org.apache.xml.internal.security.signature.XMLSignatureException;
+import com.sun.org.apache.xml.internal.security.utils.Constants;
+
+
+public class TruncateHMAC {
+
+    private final static String DIR = System.getProperty("test.src", ".");
+    private static DocumentBuilderFactory dbf = null;
+    private static boolean atLeastOneFailed = false;
+
+    public static void main(String[] args) throws Exception {
+
+        Init.init();
+        dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        dbf.setValidating(false);
+        validate("signature-enveloping-hmac-sha1-trunclen-0-attack.xml", false);
+        validate("signature-enveloping-hmac-sha1-trunclen-8-attack.xml", false);
+        // this one should pass
+        validate("signature-enveloping-hmac-sha1.xml", true);
+        generate_hmac_sha1_40();
+
+        if (atLeastOneFailed) {
+            throw new Exception
+                ("At least one signature did not validate as expected");
+        }
+    }
+
+    private static void validate(String data, boolean pass) throws Exception {
+        System.out.println("Validating " + data);
+        File file = new File(DIR, data);
+
+        Document doc = dbf.newDocumentBuilder().parse(file);
+        NodeList nl =
+            doc.getElementsByTagNameNS(Constants.SignatureSpecNS, "Signature");
+        if (nl.getLength() == 0) {
+            throw new Exception("Couldn't find signature Element");
+        }
+        Element sigElement = (Element) nl.item(0);
+        XMLSignature signature = new XMLSignature
+            (sigElement, file.toURI().toString());
+        SecretKey sk = signature.createSecretKey("secret".getBytes("ASCII"));
+        try {
+            System.out.println
+                ("Validation status: " + signature.checkSignatureValue(sk));
+            if (!pass) {
+                System.out.println("FAILED");
+                atLeastOneFailed = true;
+            } else {
+                System.out.println("PASSED");
+            }
+        } catch (XMLSignatureException xse) {
+            System.out.println(xse.getMessage());
+            if (!pass) {
+                System.out.println("PASSED");
+            } else {
+                System.out.println("FAILED");
+            }
+        }
+    }
+
+    private static void generate_hmac_sha1_40() throws Exception {
+        System.out.println("Generating ");
+
+        Document doc = dbf.newDocumentBuilder().newDocument();
+        XMLSignature sig = new XMLSignature
+            (doc, null, XMLSignature.ALGO_ID_MAC_HMAC_SHA1, 40,
+             Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS);
+        try {
+            sig.sign(getSecretKey("secret".getBytes("ASCII")));
+            System.out.println("FAILED");
+            atLeastOneFailed = true;
+        } catch (XMLSignatureException xse) {
+            System.out.println(xse.getMessage());
+            System.out.println("PASSED");
+        }
+    }
+
+    private static SecretKey getSecretKey(final byte[] secret) {
+        return new SecretKey() {
+            public String getFormat()   { return "RAW"; }
+            public byte[] getEncoded()  { return secret; }
+            public String getAlgorithm(){ return "SECRET"; }
+        };
+    }
+}
diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml b/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml
new file mode 100644
index 00000000000..5008dae5193
--- /dev/null
+++ b/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+  <SignedInfo>
+    <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1">
+      <HMACOutputLength>0</HMACOutputLength>
+    </SignatureMethod>
+    <Reference URI="#object">
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+      <DigestValue>nz4GS0NbH2SrWlD/4fX313CoTzc=</DigestValue>
+    </Reference>
+  </SignedInfo>
+  <SignatureValue>
+  </SignatureValue>
+  <Object Id="object">some other text</Object>
+</Signature>
diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml b/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml
new file mode 100644
index 00000000000..dfe0a0df9a5
--- /dev/null
+++ b/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+  <SignedInfo>
+    <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1">
+      <HMACOutputLength>8</HMACOutputLength>
+    </SignatureMethod>
+    <Reference URI="#object">
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+      <DigestValue>nz4GS0NbH2SrWlD/4fX313CoTzc=</DigestValue>
+    </Reference>
+  </SignedInfo>
+  <SignatureValue>
+    Qw==
+  </SignatureValue>
+  <Object Id="object">some other text</Object>
+</Signature>
diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml b/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml
new file mode 100644
index 00000000000..c0c8343a895
--- /dev/null
+++ b/jdk/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+  <SignedInfo>
+    <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1" />
+    <Reference URI="#object">
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+      <DigestValue>7/XTsHaBSOnJ/jXD5v0zL6VKYsk=</DigestValue>
+    </Reference>
+  </SignedInfo>
+  <SignatureValue>
+    JElPttIT4Am7Q+MNoMyv+WDfAZw=
+  </SignatureValue>
+  <Object Id="object">some text</Object>
+</Signature>
diff --git a/jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java b/jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java
new file mode 100644
index 00000000000..61330616f06
--- /dev/null
+++ b/jdk/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6825240
+ * @summary Password.readPassword() echos the input when System.Console is null
+ * @ignore run these by hand
+ */
+
+import com.sun.security.auth.callback.TextCallbackHandler;
+import javax.security.auth.callback.*;
+
+public class Password {
+   public static void main(String args[]) throws Exception {
+        TextCallbackHandler h = new TextCallbackHandler();
+        PasswordCallback nc = new PasswordCallback("Invisible: ", false);
+        PasswordCallback nc2 = new PasswordCallback("Visible: ", true);
+
+        System.out.println("Two passwords will be prompted for. The first one " +
+                "should have echo off, the second one on. Otherwise, this test fails");
+        Callback[] callbacks = { nc, nc2 };
+        h.handle(callbacks);
+        System.out.println("You input " + new String(nc.getPassword()) +
+                " and " + new String(nc2.getPassword()));
+   }
+}
diff --git a/jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java b/jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java
new file mode 100644
index 00000000000..5a940ae91eb
--- /dev/null
+++ b/jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6710360
+ * @summary export Kerberos session key to applications
+ */
+
+import com.sun.security.jgss.InquireSecContextPermission;
+
+public class InquireSecContextPermissionCheck {
+
+    public static void main(String[] args) throws Exception {
+
+        InquireSecContextPermission p0, p1;
+        p0 = new InquireSecContextPermission(
+                "KRB5_GET_SESSION_KEY");
+        p1 = new InquireSecContextPermission("*");
+
+        if (!p1.implies(p0) || !p1.implies(p1) || !p0.implies(p0)) {
+            throw new Exception("Check failed");
+        }
+
+        if (p0.implies(p1)) {
+            throw new Exception("This is bad");
+        }
+    }
+}
+
diff --git a/jdk/test/com/sun/security/sasl/util/CheckAccess.java b/jdk/test/com/sun/security/sasl/util/CheckAccess.java
new file mode 100644
index 00000000000..9ac0674b15c
--- /dev/null
+++ b/jdk/test/com/sun/security/sasl/util/CheckAccess.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6657695
+ * @summary AbstractSaslImpl.logger is a static mutable (findbugs)
+ * @author Vincent Ryan
+ */
+
+import java.lang.reflect.*;
+
+/*
+ * Check that the 'logger' class member is immutable.
+ */
+public class CheckAccess {
+    public static final void main(String[] args) throws Exception {
+            Class clazz =
+                Class.forName("com.sun.security.sasl.util.AbstractSaslImpl");
+            Field field = clazz.getDeclaredField("logger");
+            if (! Modifier.isFinal(field.getModifiers())) {
+                throw new Exception(
+                    "class member 'logger' must be immutable");
+            }
+    }
+}
diff --git a/jdk/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java b/jdk/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java
new file mode 100644
index 00000000000..a4ba1daaca4
--- /dev/null
+++ b/jdk/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6656586
+ * @summary Test that Cursor.predefined array is not used in
+Cursor.getPredefinedCursor() method
+ * @author Artem Ananiev
+ * @run main PredefinedPrivate
+ */
+
+import java.awt.*;
+
+public class PredefinedPrivate {
+    public static void main(String args[]) {
+        new MyCursor();
+        if (Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR) instanceof MyCursor) {
+            throw new RuntimeException("Test FAILED: getPredefinedCursor() returned modified cursor");
+        }
+    }
+}
+
+class MyCursor extends Cursor {
+    public MyCursor() {
+        super(DEFAULT_CURSOR);
+        Cursor.predefined[DEFAULT_CURSOR] = this;
+    }
+}
diff --git a/jdk/test/java/awt/EventQueue/6638195/bug6638195.java b/jdk/test/java/awt/EventQueue/6638195/bug6638195.java
index 9dc3b50b973..c4612391547 100644
--- a/jdk/test/java/awt/EventQueue/6638195/bug6638195.java
+++ b/jdk/test/java/awt/EventQueue/6638195/bug6638195.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  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
@@ -23,7 +23,7 @@
 
 /* @test
  *
- * @bug 6638195
+ * @bug 6638195 6844297
  * @author Igor Kushnirskiy
  * @summary tests if EventQueueDelegate.Delegate is invoked.
  */
@@ -47,11 +47,22 @@ public class bug6638195 {
     }
 
     private static void runTest(MyEventQueueDelegate delegate) throws Exception {
+        // We need an empty runnable here, so the next event is
+        // processed with a new EventQueueDelegate. See 6844297
+        // for details
         EventQueue.invokeLater(
             new Runnable() {
                 public void run() {
                 }
             });
+        // The following event is expected to be processed by
+        // the EventQueueDelegate instance
+        EventQueue.invokeLater(
+            new Runnable() {
+                public void run() {
+                }
+            });
+        // Finally, proceed on the main thread
         final CountDownLatch latch = new CountDownLatch(1);
         EventQueue.invokeLater(
             new Runnable() {
@@ -60,7 +71,7 @@ public class bug6638195 {
                 }
             });
         latch.await();
-        if (! delegate.allInvoked()) {
+        if (!delegate.allInvoked()) {
             throw new RuntimeException("failed");
         }
     }
@@ -125,6 +136,7 @@ public class bug6638195 {
 
         return objectMap;
     }
+
     static class MyEventQueueDelegate implements EventQueueDelegate.Delegate {
         private volatile boolean getNextEventInvoked = false;
         private volatile boolean beforeDispatchInvoked = false;
diff --git a/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java b/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java
index b220ec5cc01..29a4399a609 100644
--- a/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java
+++ b/jdk/test/java/awt/Frame/FrameSize/TestFrameSize.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2009 Red Hat, Inc.  All Rights Reserved.
+ * Portions Copyright 2009 Sun Microsystems, Inc.  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
@@ -37,35 +38,62 @@
  * Test fails if size of window is wrong
  */
 
-import java.awt.Dimension;
-import java.awt.Frame;
+import java.awt.*;
 
 public class TestFrameSize {
 
-        static Dimension desiredDimensions = new Dimension(200, 200);
-        static int ERROR_MARGIN = 15;
-        static Frame mainWindow;
+    static Dimension desiredDimensions = new Dimension(200, 200);
+    static Frame mainWindow;
 
-        public static void drawGui() {
-                mainWindow = new Frame("");
-                mainWindow.setPreferredSize(desiredDimensions);
-                mainWindow.pack();
+    private static Dimension getClientSize(Frame window) {
+        Dimension size = window.getSize();
+        Insets insets = window.getInsets();
 
-                Dimension actualDimensions = mainWindow.getSize();
-                System.out.println("Desired dimensions: " + desiredDimensions.toString());
-                System.out.println("Actual dimensions:  " + actualDimensions.toString());
-                if (Math.abs(actualDimensions.height - desiredDimensions.height) > ERROR_MARGIN) {
-                        throw new RuntimeException("Incorrect widow size");
-                }
+        System.out.println("getClientSize() for " + window);
+        System.out.println("   size: " + size);
+        System.out.println("   insets: " + insets);
+
+        return new Dimension(
+                size.width - insets.left - insets.right,
+                size.height - insets.top - insets.bottom);
+    }
+
+    public static void drawGui() {
+        mainWindow = new Frame("");
+        mainWindow.setPreferredSize(desiredDimensions);
+        mainWindow.pack();
+
+        Dimension actualDimensions = mainWindow.getSize();
+        System.out.println("Desired dimensions: " + desiredDimensions.toString());
+        System.out.println("Actual dimensions:  " + actualDimensions.toString());
+        if (!actualDimensions.equals(desiredDimensions)) {
+            throw new RuntimeException("Incorrect widow size");
         }
 
-        public static void main(String[] args) {
-                try {
-                        drawGui();
-                } finally {
-                        if (mainWindow != null) {
-                                mainWindow.dispose();
-                        }
-                }
+        // pack() guarantees to preserve the size of the client area after
+        // showing the window.
+        Dimension clientSize1 = getClientSize(mainWindow);
+        System.out.println("Client size before showing: " + clientSize1);
+
+        mainWindow.setVisible(true);
+
+        ((sun.awt.SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+
+        Dimension clientSize2 = getClientSize(mainWindow);
+        System.out.println("Client size after showing: " + clientSize2);
+
+        if (!clientSize2.equals(clientSize1)) {
+            throw new RuntimeException("Incorrect client area size.");
         }
+    }
+
+    public static void main(String[] args) {
+        try {
+            drawGui();
+        } finally {
+            if (mainWindow != null) {
+                mainWindow.dispose();
+            }
+        }
+    }
 }
diff --git a/jdk/test/java/beans/Introspector/Test6660539.java b/jdk/test/java/beans/Introspector/Test6660539.java
new file mode 100644
index 00000000000..b0678a5a04b
--- /dev/null
+++ b/jdk/test/java/beans/Introspector/Test6660539.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6660539
+ * @summary Tests changeable BeanInfo cache in different application contexts
+ * @author Sergey Malenkov
+ */
+
+import sun.awt.SunToolkit;
+
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+
+public class Test6660539 implements Runnable {
+    private static final String NAME = "$$$";
+
+    public static void main(String[] args) throws Exception {
+        for (PropertyDescriptor pd : getPropertyDescriptors()) {
+            pd.setDisplayName(NAME);
+        }
+        ThreadGroup group = new ThreadGroup(NAME);
+        Thread thread = new Thread(group, new Test6660539());
+        thread.start();
+        thread.join();
+    }
+
+    public void run() {
+        SunToolkit.createNewAppContext();
+        for (PropertyDescriptor pd : getPropertyDescriptors()) {
+            if (pd.getDisplayName().equals(NAME))
+                throw new Error("shared BeanInfo cache");
+        }
+    }
+
+    private static PropertyDescriptor[] getPropertyDescriptors() {
+        try {
+            BeanInfo info = Introspector.getBeanInfo(Test6660539.class);
+            return info.getPropertyDescriptors();
+        }
+        catch (IntrospectionException exception) {
+            throw new Error("unexpected", exception);
+        }
+    }
+}
diff --git a/jdk/test/java/beans/Introspector/Test6868189.java b/jdk/test/java/beans/Introspector/Test6868189.java
new file mode 100644
index 00000000000..3aa10aa6d86
--- /dev/null
+++ b/jdk/test/java/beans/Introspector/Test6868189.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6868189
+ * @summary Tests custom BeanInfo in the same package
+ * @author Sergey Malenkov
+ */
+
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.beans.SimpleBeanInfo;
+
+public class Test6868189 {
+
+    private static final String PROPERTY = "$?"; // NON-NLS: the property name
+    private static final String GETTER = "name"; // NON-NLS: the method name
+    private static final String SETTER = null;
+
+    public static void main(String[] args) throws IntrospectionException {
+        PropertyDescriptor[] pds = Introspector.getBeanInfo(Enumeration.class).getPropertyDescriptors();
+        if ((pds.length != 1)|| !PROPERTY.equals(pds[0].getName())){
+            throw new Error("unexpected property");
+        }
+    }
+
+    public enum Enumeration {
+        FIRST, SECOND
+    }
+
+    public static class EnumerationBeanInfo extends SimpleBeanInfo {
+        @Override
+        public PropertyDescriptor[] getPropertyDescriptors() {
+            try {
+                return new PropertyDescriptor[] {
+                        new PropertyDescriptor(PROPERTY, Enumeration.class, GETTER, SETTER)
+                };
+            }
+            catch (IntrospectionException exception) {
+                throw new Error("unexpected exception", exception);
+            }
+        }
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestBox.java b/jdk/test/java/beans/XMLEncoder/6777487/TestBox.java
new file mode 100644
index 00000000000..1287f4414b5
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestBox.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for BoxLayout
+ * @author Sergey Malenkov
+ */
+
+import java.awt.FlowLayout;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+
+public final class TestBox {
+    private static final Integer OBJECT = Integer.valueOf(-123);
+
+    public static void main(String[] args) {
+        TestEncoder.test(
+                new Box(BoxLayout.LINE_AXIS),
+                new Box(BoxLayout.PAGE_AXIS) {
+                    @Override
+                    public FlowLayout getLayout() {
+                        return new FlowLayout() {
+                            private final Object axis = OBJECT;
+                        };
+                    }
+                },
+                OBJECT
+        );
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java
new file mode 100644
index 00000000000..805f05f4299
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for CheckedCollection
+ * @author Sergey Malenkov
+ */
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public final class TestCheckedCollection {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        List<String> list = Collections.emptyList();
+        TestEncoder.test(
+                Collections.checkedCollection(list, String.class),
+                new ArrayList() {
+                    private final Object type = OBJECT;
+                },
+                OBJECT
+        );
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedList.java b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedList.java
new file mode 100644
index 00000000000..69d6ca9c8ba
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedList.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for CheckedList
+ * @author Sergey Malenkov
+ */
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public final class TestCheckedList {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        List<String> list = Collections.emptyList();
+        TestEncoder.test(
+                Collections.checkedList(list, String.class),
+                new ArrayList() {
+                    private final Object type = OBJECT;
+                },
+                OBJECT
+        );
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedMap.java b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedMap.java
new file mode 100644
index 00000000000..7105782b179
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedMap.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for CheckedMap
+ * @author Sergey Malenkov
+ */
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class TestCheckedMap {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        Map<String, String> map = Collections.emptyMap();
+        TestEncoder.test(
+                Collections.checkedMap(map, String.class, String.class),
+                new HashMap() {
+                    private final Object keyType = OBJECT;
+                    private final Object valueType = OBJECT;
+                },
+                OBJECT
+        );
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java
new file mode 100644
index 00000000000..5141bc80620
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for CheckedRandomAccessList
+ * @author Sergey Malenkov
+ */
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public final class TestCheckedRandomAccessList {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        List<String> list = new ArrayList<String>();
+        TestEncoder.test(
+                Collections.checkedList(list, String.class),
+                new ArrayList() {
+                    private final Object type = OBJECT;
+                },
+                OBJECT
+        );
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSet.java b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSet.java
new file mode 100644
index 00000000000..d4dd04160b0
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSet.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for CheckedSet
+ * @author Sergey Malenkov
+ */
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public final class TestCheckedSet {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        Set<String> set = Collections.emptySet();
+        TestEncoder.test(
+                Collections.checkedSet(set, String.class),
+                new HashSet() {
+                    private final Object type = OBJECT;
+                },
+                OBJECT
+        );
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java
new file mode 100644
index 00000000000..f39e7e2e060
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for CheckedSortedMap
+ * @author Sergey Malenkov
+ */
+
+import java.util.Collections;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+public final class TestCheckedSortedMap {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        SortedMap<String, String> map = new TreeMap<String, String>();
+        TestEncoder.test(
+                Collections.checkedSortedMap(map, String.class, String.class),
+                new TreeMap() {
+                    private final Object keyType = OBJECT;
+                    private final Object valueType = OBJECT;
+                },
+                OBJECT
+        );
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java
new file mode 100644
index 00000000000..f49c6ea3d94
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for CheckedSortedSet
+ * @author Sergey Malenkov
+ */
+
+import java.util.Collections;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+public final class TestCheckedSortedSet {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        SortedSet<String> set = new TreeSet<String>();
+        TestEncoder.test(
+                Collections.checkedSortedSet(set, String.class),
+                new TreeSet() {
+                    private final Object type = OBJECT;
+                },
+                OBJECT
+        );
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestEncoder.java b/jdk/test/java/beans/XMLEncoder/6777487/TestEncoder.java
new file mode 100644
index 00000000000..a06289c8738
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestEncoder.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.beans.Expression;
+import java.beans.XMLEncoder;
+
+final class TestEncoder extends XMLEncoder {
+    private Expression expression;
+
+    private TestEncoder() {
+        super(System.out);
+    }
+
+    @Override
+    public void writeExpression(Expression expression) {
+        if (this.expression == null) {
+            this.expression = expression;
+        }
+        super.writeExpression(expression);
+    }
+
+    public static void test(Object provider, Object object, Object value) {
+        System.setSecurityManager(new SecurityManager());
+
+        TestEncoder encoder = new TestEncoder();
+        encoder.setPersistenceDelegate(
+                object.getClass(),
+                encoder.getPersistenceDelegate(provider.getClass()));
+        encoder.writeObject(object);
+        encoder.close();
+
+        if (encoder.expression != null) {
+            for (Object argument : encoder.expression.getArguments()) {
+                if (value.equals(argument)) {
+                    throw new Error("Found private value!");
+                }
+            }
+        }
+    }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestEnumMap.java b/jdk/test/java/beans/XMLEncoder/6777487/TestEnumMap.java
new file mode 100644
index 00000000000..1d046c63e88
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestEnumMap.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for EnumMap
+ * @author Sergey Malenkov
+ */
+
+import java.util.EnumMap;
+import java.util.HashMap;
+
+public final class TestEnumMap {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        TestEncoder.test(
+                new EnumMap<Point, String>(Point.class),
+                new HashMap() {
+                    private final Object keyType = OBJECT;
+                },
+                OBJECT);
+    }
+
+    public enum Point { X, Y, Z }
+}
diff --git a/jdk/test/java/beans/XMLEncoder/6777487/TestEnumSet.java b/jdk/test/java/beans/XMLEncoder/6777487/TestEnumSet.java
new file mode 100644
index 00000000000..b9f518d9979
--- /dev/null
+++ b/jdk/test/java/beans/XMLEncoder/6777487/TestEnumSet.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6777487
+ * @summary Tests private field access for EnumSet
+ * @author Sergey Malenkov
+ */
+
+import java.util.EnumSet;
+import java.util.HashSet;
+
+public final class TestEnumSet {
+    private static final Object OBJECT = new Object();
+
+    public static void main(String[] args) {
+        TestEncoder.test(
+                EnumSet.noneOf(Point.class),
+                new HashSet() {
+                    private final Object elementType = OBJECT;
+                },
+                OBJECT);
+    }
+
+    public enum Point { X, Y, Z }
+}
diff --git a/jdk/test/java/io/File/SymLinks.java b/jdk/test/java/io/File/SymLinks.java
new file mode 100644
index 00000000000..748f2086bd1
--- /dev/null
+++ b/jdk/test/java/io/File/SymLinks.java
@@ -0,0 +1,380 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6595866
+ * @summary Test java.io.File operations with sym links
+ */
+
+import java.io.*;
+import java.nio.file.Path;
+import java.nio.file.attribute.*;
+import static java.nio.file.LinkOption.*;
+
+public class SymLinks {
+    final static PrintStream out = System.out;
+
+    final static File top = new File(System.getProperty("test.dir", "."));
+
+    // files used by the test
+
+    final static File file              = new File(top, "foofile");
+    final static File link2file         = new File(top, "link2file");
+    final static File link2link2file    = new File(top, "link2link2file");
+
+    final static File dir               = new File(top, "foodir");
+    final static File link2dir          = new File(top, "link2dir");
+    final static File link2link2dir     = new File(top, "link2link2dir");
+
+    final static File link2nobody       = new File(top, "link2nobody");
+    final static File link2link2nobody  = new File(top, "link2link2nobody");
+
+    /**
+     * Setup files, directories, and sym links used by test.
+     */
+    static void setup() throws IOException {
+        // link2link2file -> link2file -> foofile
+        FileOutputStream fos = new FileOutputStream(file);
+        try {
+            fos.write(new byte[16*1024]);
+        } finally {
+            fos.close();
+        }
+        mklink(link2file, file);
+        mklink(link2link2file, link2file);
+
+        // link2link2dir -> link2dir -> dir
+        assertTrue(dir.mkdir());
+        mklink(link2dir, dir);
+        mklink(link2link2dir, link2dir);
+
+        // link2link2nobody -> link2nobody -> <does-not-exist>
+        mklink(link2nobody, new File(top, "DoesNotExist"));
+        mklink(link2link2nobody, link2nobody);
+    }
+
+    /**
+     * Remove files, directories, and sym links used by test.
+     */
+    static void cleanup() throws IOException {
+        if (file != null)
+            file.delete();
+        if (link2file != null)
+            link2file.toPath().deleteIfExists();
+        if (link2link2file != null)
+            link2link2file.toPath().deleteIfExists();
+        if (dir != null)
+            dir.delete();
+        if (link2dir != null)
+            link2dir.toPath().deleteIfExists();
+        if (link2link2dir != null)
+            link2link2dir.toPath().deleteIfExists();
+        if (link2nobody != null)
+            link2nobody.toPath().deleteIfExists();
+        if (link2link2nobody != null)
+            link2link2nobody.toPath().deleteIfExists();
+    }
+
+    /**
+     * Creates a sym link source->target
+     */
+    static void mklink(File source, File target) throws IOException {
+        source.toPath().createSymbolicLink(target.toPath());
+    }
+
+    /**
+     * Returns true if the "link" exists and is a sym link.
+     */
+    static boolean isSymLink(File link) {
+         try {
+            BasicFileAttributes attrs =
+                Attributes.readBasicFileAttributes(link.toPath(), NOFOLLOW_LINKS);
+            return attrs.isSymbolicLink();
+         } catch (IOException x) {
+             return false;
+         }
+    }
+
+    /**
+     * Returns the last modified time of a sym link.
+     */
+    static long lastModifiedOfSymLink(File link) throws IOException {
+        BasicFileAttributes attrs =
+            Attributes.readBasicFileAttributes(link.toPath(), NOFOLLOW_LINKS);
+        assertTrue(attrs.isSymbolicLink());
+        return attrs.lastModifiedTime().toMillis();
+    }
+
+    /**
+     * Returns true if sym links are supported on the file system where
+     * "dir" exists.
+     */
+    static boolean supportsSymLinks(File dir) {
+        Path link = dir.toPath().resolve("link");
+        Path target = dir.toPath().resolve("target");
+        try {
+            link.createSymbolicLink(target);
+            link.delete();
+            return true;
+        } catch (UnsupportedOperationException x) {
+            return false;
+        } catch (IOException x) {
+            return false;
+        }
+    }
+
+    static void assertTrue(boolean v) {
+        if (!v) throw new RuntimeException("Test failed");
+    }
+
+    static void assertFalse(boolean v) {
+        assertTrue(!v);
+    }
+
+    static void header(String h) {
+        out.println();
+        out.println();
+        out.println("-- " + h + " --");
+    }
+
+    /**
+     * Tests go here.
+     */
+    static void go() throws IOException {
+
+        // check setup
+        assertTrue(file.isFile());
+        assertTrue(isSymLink(link2file));
+        assertTrue(isSymLink(link2link2file));
+        assertTrue(dir.isDirectory());
+        assertTrue(isSymLink(link2dir));
+        assertTrue(isSymLink(link2link2dir));
+        assertTrue(isSymLink(link2nobody));
+        assertTrue(isSymLink(link2link2nobody));
+
+        header("createNewFile");
+
+        assertFalse(file.createNewFile());
+        assertFalse(link2file.createNewFile());
+        assertFalse(link2link2file.createNewFile());
+        assertFalse(dir.createNewFile());
+        assertFalse(link2dir.createNewFile());
+        assertFalse(link2link2dir.createNewFile());
+        assertFalse(link2nobody.createNewFile());
+        assertFalse(link2link2nobody.createNewFile());
+
+        header("mkdir");
+
+        assertFalse(file.mkdir());
+        assertFalse(link2file.mkdir());
+        assertFalse(link2link2file.mkdir());
+        assertFalse(dir.mkdir());
+        assertFalse(link2dir.mkdir());
+        assertFalse(link2link2dir.mkdir());
+        assertFalse(link2nobody.mkdir());
+        assertFalse(link2link2nobody.mkdir());
+
+        header("delete");
+
+        File link = new File(top, "mylink");
+        try {
+            mklink(link, file);
+            assertTrue(link.delete());
+            assertTrue(!isSymLink(link));
+            assertTrue(file.exists());
+
+            mklink(link, link2file);
+            assertTrue(link.delete());
+            assertTrue(!isSymLink(link));
+            assertTrue(link2file.exists());
+
+            mklink(link, dir);
+            assertTrue(link.delete());
+            assertTrue(!isSymLink(link));
+            assertTrue(dir.exists());
+
+            mklink(link, link2dir);
+            assertTrue(link.delete());
+            assertTrue(!isSymLink(link));
+            assertTrue(link2dir.exists());
+
+            mklink(link, link2nobody);
+            assertTrue(link.delete());
+            assertTrue(!isSymLink(link));
+            assertTrue(isSymLink(link2nobody));
+
+        } finally {
+            link.toPath().deleteIfExists();
+        }
+
+        header("renameTo");
+
+        File newlink = new File(top, "newlink");
+        assertTrue(link2file.renameTo(newlink));
+        try {
+            assertTrue(file.exists());
+            assertTrue(isSymLink(newlink));
+            assertTrue(!isSymLink(link2file));
+        } finally {
+            newlink.renameTo(link2file);  // restore link
+        }
+
+        assertTrue(link2dir.renameTo(newlink));
+        try {
+            assertTrue(dir.exists());
+            assertTrue(isSymLink(newlink));
+            assertTrue(!isSymLink(link2dir));
+        } finally {
+            newlink.renameTo(link2dir);  // restore link
+        }
+
+        header("list");
+
+        final String name = "entry";
+        File entry = new File(dir, name);
+        try {
+            assertTrue(dir.list().length == 0);   // directory should be empty
+            assertTrue(link2dir.list().length == 0);
+            assertTrue(link2link2dir.list().length == 0);
+
+            assertTrue(entry.createNewFile());
+            assertTrue(dir.list().length == 1);
+            assertTrue(dir.list()[0].equals(name));
+
+            // access directory by following links
+            assertTrue(link2dir.list().length == 1);
+            assertTrue(link2dir.list()[0].equals(name));
+            assertTrue(link2link2dir.list().length == 1);
+            assertTrue(link2link2dir.list()[0].equals(name));
+
+            // files that are not directories
+            assertTrue(link2file.list() == null);
+            assertTrue(link2nobody.list() == null);
+
+        } finally {
+            entry.delete();
+        }
+
+        header("isXXX");
+
+        assertTrue(file.isFile());
+        assertTrue(link2file.isFile());
+        assertTrue(link2link2file.isFile());
+
+        assertTrue(dir.isDirectory());
+        assertTrue(link2dir.isDirectory());
+        assertTrue(link2link2dir.isDirectory());
+
+        // on Windows we test with the DOS hidden attribute set
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            DosFileAttributeView view = file.toPath()
+                .getFileAttributeView(DosFileAttributeView.class);
+            view.setHidden(true);
+            try {
+                assertTrue(file.isHidden());
+                assertTrue(link2file.isHidden());
+                assertTrue(link2link2file.isHidden());
+            } finally {
+                view.setHidden(false);
+            }
+            assertFalse(file.isHidden());
+            assertFalse(link2file.isHidden());
+            assertFalse(link2link2file.isHidden());
+        }
+
+        header("length");
+
+        long len = file.length();
+        assertTrue(len > 0L);
+        // these tests should follow links
+        assertTrue(link2file.length() == len);
+        assertTrue(link2link2file.length() == len);
+        assertTrue(link2nobody.length() == 0L);
+
+        header("lastModified / setLastModified");
+
+        // need time to diff between link and file
+        long origLastModified = file.lastModified();
+        assertTrue(origLastModified != 0L);
+        try { Thread.sleep(2000); } catch (InterruptedException x) { }
+        file.setLastModified(System.currentTimeMillis());
+
+        long lastModified = file.lastModified();
+        assertTrue(lastModified != origLastModified);
+        assertTrue(lastModifiedOfSymLink(link2file) != lastModified);
+        assertTrue(lastModifiedOfSymLink(link2link2file) != lastModified);
+        assertTrue(link2file.lastModified() == lastModified);
+        assertTrue(link2link2file.lastModified() == lastModified);
+        assertTrue(link2nobody.lastModified() == 0L);
+
+        origLastModified = dir.lastModified();
+        assertTrue(origLastModified != 0L);
+        dir.setLastModified(0L);
+        assertTrue(dir.lastModified() == 0L);
+        assertTrue(link2dir.lastModified() == 0L);
+        assertTrue(link2link2dir.lastModified() == 0L);
+        dir.setLastModified(origLastModified);
+
+        header("setXXX / canXXX");
+
+        assertTrue(file.canRead());
+        assertTrue(file.canWrite());
+        assertTrue(link2file.canRead());
+        assertTrue(link2file.canWrite());
+        assertTrue(link2link2file.canRead());
+        assertTrue(link2link2file.canWrite());
+
+        if (file.setReadOnly()) {
+            assertFalse(file.canWrite());
+            assertFalse(link2file.canWrite());
+            assertFalse(link2link2file.canWrite());
+
+            assertTrue(file.setWritable(true));             // make writable
+            assertTrue(file.canWrite());
+            assertTrue(link2file.canWrite());
+            assertTrue(link2link2file.canWrite());
+
+            assertTrue(link2file.setReadOnly());            // make read only
+            assertFalse(file.canWrite());
+            assertFalse(link2file.canWrite());
+            assertFalse(link2link2file.canWrite());
+
+            assertTrue(link2link2file.setWritable(true));   // make writable
+            assertTrue(file.canWrite());
+            assertTrue(link2file.canWrite());
+            assertTrue(link2link2file.canWrite());
+        }
+    }
+
+    public static void main(String[] args) throws IOException {
+        if (supportsSymLinks(top)) {
+            try {
+                setup();
+                go();
+            } finally {
+                cleanup();
+            }
+        }
+    }
+
+}
diff --git a/jdk/test/java/lang/String/Split.java b/jdk/test/java/lang/String/Split.java
index b4ab5fb4c54..fa03eb397b9 100644
--- a/jdk/test/java/lang/String/Split.java
+++ b/jdk/test/java/lang/String/Split.java
@@ -23,14 +23,18 @@
 
 /**
  * @test
+ * @bug 6840246
  * @summary test String.split()
  */
+import java.util.Arrays;
+import java.util.Random;
 import java.util.regex.*;
 
 public class Split {
 
     public static void main(String[] args) throws Exception {
         String source = "0123456789";
+
         for (int limit=-2; limit<3; limit++) {
             for (int x=0; x<10; x++) {
                 String[] result = source.split(Integer.toString(x), limit);
@@ -80,5 +84,48 @@ public class Split {
             throw new RuntimeException("String.split failure 8");
         if (!result[0].equals(source))
             throw new RuntimeException("String.split failure 9");
+
+        // check fastpath of String.split()
+        source = "0123456789abcdefgABCDEFG";
+        Random r = new Random();
+
+        for (boolean doEscape: new boolean[] {false, true}) {
+            for (int cp = 0; cp < 0x11000; cp++) {
+                Pattern p = null;
+                String regex = new String(Character.toChars(cp));
+                if (doEscape)
+                    regex = "\\" + regex;
+                try {
+                    p = Pattern.compile(regex);
+                } catch (PatternSyntaxException pse) {
+                    // illegal syntax
+                    try {
+                        "abc".split(regex);
+                    } catch (PatternSyntaxException pse0) {
+                        continue;
+                    }
+                    throw new RuntimeException("String.split failure 11");
+                }
+                int off = r.nextInt(source.length());
+                String[] srcStrs = new String[] {
+                    "",
+                    source,
+                    regex + source,
+                    source + regex,
+                    source.substring(0, 3)
+                        + regex + source.substring(3, 9)
+                        + regex + source.substring(9, 15)
+                        + regex + source.substring(15),
+                    source.substring(0, off) + regex + source.substring(off)
+                };
+                for (String src: srcStrs) {
+                    for (int limit=-2; limit<3; limit++) {
+                        if (!Arrays.equals(src.split(regex, limit),
+                                           p.split(src, limit)))
+                            throw new RuntimeException("String.split failure 12");
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/jdk/test/java/lang/reflect/Generics/Probe.java b/jdk/test/java/lang/reflect/Generics/Probe.java
index 30d6f21e5a3..4d92aa884ad 100644
--- a/jdk/test/java/lang/reflect/Generics/Probe.java
+++ b/jdk/test/java/lang/reflect/Generics/Probe.java
@@ -23,11 +23,9 @@
 
 /*
  * @test
- * @bug 5003916 6704655
+ * @bug 5003916 6704655 6873951
  * @summary Testing parsing of signatures attributes of nested classes
  * @author Joseph D. Darcy
- * @compile -source 1.5 Probe.java
- * @run main Probe
  */
 
 import java.lang.reflect.*;
@@ -35,51 +33,35 @@ import java.lang.annotation.*;
 import java.util.*;
 import static java.util.Arrays.*;
 
-@Classes(value={
-        "java.util.concurrent.FutureTask",
-        "java.util.concurrent.ConcurrentHashMap$EntryIterator",
-        "java.util.concurrent.ConcurrentHashMap$KeyIterator",
-        "java.util.concurrent.ConcurrentHashMap$ValueIterator",
-        "java.util.AbstractList$ListItr",
-        "java.util.EnumMap$EntryIterator",
-        "java.util.EnumMap$KeyIterator",
-        "java.util.EnumMap$ValueIterator",
-        "java.util.IdentityHashMap$EntryIterator",
-        "java.util.IdentityHashMap$KeyIterator",
-        "java.util.IdentityHashMap$ValueIterator",
-        "java.util.WeakHashMap$EntryIterator",
-        "java.util.WeakHashMap$KeyIterator",
-        "java.util.WeakHashMap$ValueIterator",
-        "java.util.TreeMap$EntryIterator",
-        "java.util.TreeMap$KeyIterator",
-        "java.util.TreeMap$ValueIterator",
-        "java.util.HashMap$EntryIterator",
-        "java.util.HashMap$KeyIterator",
-        "java.util.HashMap$ValueIterator",
-        "java.util.LinkedHashMap$EntryIterator",
-        "java.util.LinkedHashMap$KeyIterator",
-        "java.util.LinkedHashMap$ValueIterator"
-        },
-        sunClasses={
-        "javax.crypto.SunJCE_c",
-        "javax.crypto.SunJCE_e",
-        "javax.crypto.SunJCE_f",
-        "javax.crypto.SunJCE_j",
-        "javax.crypto.SunJCE_k",
-        "javax.crypto.SunJCE_l"
-        })
+@Classes({"java.util.concurrent.FutureTask",
+          "java.util.concurrent.ConcurrentHashMap$EntryIterator",
+          "java.util.concurrent.ConcurrentHashMap$KeyIterator",
+          "java.util.concurrent.ConcurrentHashMap$ValueIterator",
+          "java.util.AbstractList$ListItr",
+          "java.util.EnumMap$EntryIterator",
+          "java.util.EnumMap$KeyIterator",
+          "java.util.EnumMap$ValueIterator",
+          "java.util.IdentityHashMap$EntryIterator",
+          "java.util.IdentityHashMap$KeyIterator",
+          "java.util.IdentityHashMap$ValueIterator",
+          "java.util.WeakHashMap$EntryIterator",
+          "java.util.WeakHashMap$KeyIterator",
+          "java.util.WeakHashMap$ValueIterator",
+          "java.util.TreeMap$EntryIterator",
+          "java.util.TreeMap$KeyIterator",
+          "java.util.TreeMap$ValueIterator",
+          "java.util.HashMap$EntryIterator",
+          "java.util.HashMap$KeyIterator",
+          "java.util.HashMap$ValueIterator",
+          "java.util.LinkedHashMap$EntryIterator",
+          "java.util.LinkedHashMap$KeyIterator",
+          "java.util.LinkedHashMap$ValueIterator"})
 public class Probe {
-    public static void main (String[] args) throws Throwable {
+    public static void main (String... args) throws Throwable {
         Classes classesAnnotation = (Probe.class).getAnnotation(Classes.class);
         List<String> names =
             new ArrayList<String>(asList(classesAnnotation.value()));
 
-        if (System.getProperty("java.runtime.name").startsWith("Java(TM)")) {
-            // Sun production JDK; test crypto classes too
-            for(String name: classesAnnotation.sunClasses())
-                names.add(name);
-        }
-
         int errs = 0;
         for(String name: names) {
             System.out.println("\nCLASS " + name);
@@ -152,5 +134,4 @@ public class Probe {
 @Retention(RetentionPolicy.RUNTIME)
 @interface Classes {
     String [] value(); // list of classes to probe
-    String [] sunClasses(); // list of Sun-production JDK specific classes to probe
 }
diff --git a/jdk/test/java/math/BigDecimal/DivideTests.java b/jdk/test/java/math/BigDecimal/DivideTests.java
index 89692255edc..7d04a60ca4b 100644
--- a/jdk/test/java/math/BigDecimal/DivideTests.java
+++ b/jdk/test/java/math/BigDecimal/DivideTests.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 4851776 4907265 6177836
+ * @bug 4851776 4907265 6177836 6876282
  * @summary Some tests for the divide methods.
  * @author Joseph D. Darcy
  * @compile -source 1.5 DivideTests.java
@@ -328,6 +328,35 @@ public class DivideTests {
             }
         }
 
+        // 6876282
+        BigDecimal[][] testCases2 = {
+            // { dividend, divisor, expected quotient }
+            { new BigDecimal(3090), new BigDecimal(7), new BigDecimal(441) },
+            { new BigDecimal("309000000000000000000000"), new BigDecimal("700000000000000000000"),
+              new BigDecimal(441) },
+            { new BigDecimal("962.430000000000"), new BigDecimal("8346463.460000000000"),
+              new BigDecimal("0.000115309916") },
+            { new BigDecimal("18446744073709551631"), new BigDecimal("4611686018427387909"),
+              new BigDecimal(4) },
+            { new BigDecimal("18446744073709551630"), new BigDecimal("4611686018427387909"),
+              new BigDecimal(4) },
+            { new BigDecimal("23058430092136939523"), new BigDecimal("4611686018427387905"),
+              new BigDecimal(5) },
+            { new BigDecimal("-18446744073709551661"), new BigDecimal("-4611686018427387919"),
+              new BigDecimal(4) },
+            { new BigDecimal("-18446744073709551660"), new BigDecimal("-4611686018427387919"),
+              new BigDecimal(4) },
+        };
+
+        for (BigDecimal test[] : testCases2) {
+            BigDecimal quo = test[0].divide(test[1], RoundingMode.HALF_UP);
+            if (!quo.equals(test[2])) {
+                failures++;
+                System.err.println("Unexpected quotient from " + test[0] + " / " + test[1] +
+                                   " rounding mode HALF_UP" +
+                                   "; expected " + test[2] + " got " + quo);
+            }
+        }
         return failures;
     }
 
diff --git a/jdk/test/java/net/Authenticator/B4933582.sh b/jdk/test/java/net/Authenticator/B4933582.sh
index b103592f42d..0826063a805 100644
--- a/jdk/test/java/net/Authenticator/B4933582.sh
+++ b/jdk/test/java/net/Authenticator/B4933582.sh
@@ -30,6 +30,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
@@ -39,7 +43,7 @@ case "$OS" in
     exit 1;
     ;;
 esac
-${TESTJAVA}${FS}bin${FS}javac -d . -classpath ${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest ${TESTSRC}${FS}B4933582.java
+${TESTJAVA}${FS}bin${FS}javac -d . -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest" ${TESTSRC}${FS}B4933582.java
 rm -f cache.ser auth.save
-${TESTJAVA}${FS}bin${FS}java -classpath ${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}. B4933582 first
-${TESTJAVA}${FS}bin${FS}java -classpath ${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}. B4933582 second
+${TESTJAVA}${FS}bin${FS}java -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 first
+${TESTJAVA}${FS}bin${FS}java -classpath "${TESTSRC}${FS}..${FS}..${FS}..${FS}sun${FS}net${FS}www${FS}httptest${PS}." B4933582 second
diff --git a/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh b/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
index ba8b7cb5184..18f7c0ea94c 100644
--- a/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
+++ b/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
@@ -35,6 +35,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  CYGWIN* )
+    PATHSEP=";"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
diff --git a/jdk/test/java/net/Socket/OldSocketImpl.sh b/jdk/test/java/net/Socket/OldSocketImpl.sh
index 85845464f2b..50692f8e045 100644
--- a/jdk/test/java/net/Socket/OldSocketImpl.sh
+++ b/jdk/test/java/net/Socket/OldSocketImpl.sh
@@ -32,6 +32,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/java/net/URL/B5086147.sh b/jdk/test/java/net/URL/B5086147.sh
index 53034443a80..aaa9eadf31c 100644
--- a/jdk/test/java/net/URL/B5086147.sh
+++ b/jdk/test/java/net/URL/B5086147.sh
@@ -29,6 +29,10 @@ case "$OS" in
   SunOS | Linux )
     exit 0
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/java/net/URL/runconstructor.sh b/jdk/test/java/net/URL/runconstructor.sh
index 93a80de4b3c..30ae96a3c10 100644
--- a/jdk/test/java/net/URL/runconstructor.sh
+++ b/jdk/test/java/net/URL/runconstructor.sh
@@ -31,6 +31,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/java/net/URLClassLoader/B5077773.sh b/jdk/test/java/net/URLClassLoader/B5077773.sh
index 6dcba9c39a9..43bff5ad4a1 100644
--- a/jdk/test/java/net/URLClassLoader/B5077773.sh
+++ b/jdk/test/java/net/URLClassLoader/B5077773.sh
@@ -42,6 +42,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh b/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
index e46ac2915ce..191ff6f4750 100644
--- a/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
+++ b/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
@@ -35,6 +35,10 @@ case "$OS" in
     PS=":"
     FS="/"            
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
@@ -49,10 +53,10 @@ esac
 if [ x"$TESTJAVA" = x ]; then TESTJAVA=$1; fi
 if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
 
-CLASSPATH=.${PS}${TESTSRC}${FS}a${PS}${TESTSRC}${FS}b.jar
+CLASSPATH=".${PS}${TESTSRC}${FS}a${PS}${TESTSRC}${FS}b.jar"
 
-${TESTJAVA}${FS}bin${FS}javac -classpath ${CLASSPATH} -d . ${TESTSRC}${FS}CheckSealed.java
-${TESTJAVA}${FS}bin${FS}java -cp ${CLASSPATH} CheckSealed 1
+${TESTJAVA}${FS}bin${FS}javac -classpath "${CLASSPATH}" -d . ${TESTSRC}${FS}CheckSealed.java
+${TESTJAVA}${FS}bin${FS}java -cp "${CLASSPATH}" CheckSealed 1
 if [ $? != 0 ]; then exit 1; fi
-${TESTJAVA}${FS}bin${FS}java -cp ${CLASSPATH} CheckSealed 2
+${TESTJAVA}${FS}bin${FS}java -cp "${CLASSPATH}" CheckSealed 2
 if [ $? != 0 ]; then exit 1; fi
diff --git a/jdk/test/java/net/URLConnection/6212146/test.sh b/jdk/test/java/net/URLConnection/6212146/test.sh
index 29b187ab307..cdf970db41e 100644
--- a/jdk/test/java/net/URLConnection/6212146/test.sh
+++ b/jdk/test/java/net/URLConnection/6212146/test.sh
@@ -41,6 +41,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java b/jdk/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java
index b116245ceaf..3988ab8c568 100644
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4607272
+ * @bug 4607272 6842687
  * @summary Unit test for AsynchronousChannelGroup
  */
 
@@ -44,14 +44,12 @@ public class GroupOfOne {
         final AsynchronousServerSocketChannel listener =
             AsynchronousServerSocketChannel.open()
                 .bind(new InetSocketAddress(0));
-        listener.accept(null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
+        listener.accept((Void)null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
             public void completed(AsynchronousSocketChannel ch, Void att) {
-                listener.accept(null, this);
+                listener.accept((Void)null, this);
             }
             public void failed(Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
 
         int port = ((InetSocketAddress)(listener.getLocalAddress())).getPort();
@@ -81,13 +79,13 @@ public class GroupOfOne {
         // 2. the close/shutdown completes
         final CountDownLatch latch = new CountDownLatch(2);
 
-        ch.connect(sa, null, new CompletionHandler<Void,Void>() {
+        ch.connect(sa, (Void)null, new CompletionHandler<Void,Void>() {
             public void completed(Void result, Void att)  {
                 System.out.println("Connected");
 
                 // initiate I/O operation that does not complete (successfully)
                 ByteBuffer buf = ByteBuffer.allocate(100);
-                ch.read(buf, null, new CompletionHandler<Integer,Void>() {
+                ch.read(buf, (Void)null, new CompletionHandler<Integer,Void>() {
                     public void completed(Integer bytesRead, Void att)  {
                         throw new RuntimeException();
                     }
@@ -97,9 +95,6 @@ public class GroupOfOne {
                         System.out.println("Read failed (expected)");
                         latch.countDown();
                     }
-                    public void cancelled(Void att) {
-                        throw new RuntimeException();
-                    }
                 });
 
                 // close channel or shutdown group
@@ -122,9 +117,6 @@ public class GroupOfOne {
             public void failed(Throwable exc, Void att) {
                 throw new RuntimeException(exc);
             }
-            public void cancelled(Void att) {
-                throw new RuntimeException();
-            }
         });
 
         latch.await();
diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Identity.java b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Identity.java
index f41c12c807f..6756187ce00 100644
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Identity.java
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Identity.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4607272
+ * @bug 4607272 6842687
  * @summary Unit test for AsynchronousChannelGroup
  */
 
@@ -78,26 +78,22 @@ public class Identity {
         final AsynchronousServerSocketChannel listener =
             AsynchronousServerSocketChannel.open()
                 .bind(new InetSocketAddress(0));
-        listener.accept(null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
+        listener.accept((Void)null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
             public void completed(final AsynchronousSocketChannel ch, Void att) {
-                listener.accept(null, this);
+                listener.accept((Void)null, this);
 
                 final ByteBuffer buf = ByteBuffer.allocate(100);
-                ch.read(buf, null, new CompletionHandler<Integer,Void>() {
+                ch.read(buf, (Void)null, new CompletionHandler<Integer,Void>() {
                     public void completed(Integer bytesRead, Void att) {
                         buf.clear();
-                        ch.read(buf, null, this);
+                        ch.read(buf, (Void)null, this);
                     }
                     public void failed(Throwable exc, Void att) {
                     }
-                    public void cancelled(Void att) {
-                    }
                 });
             }
             public void failed(Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
         int port = ((InetSocketAddress)(listener.getLocalAddress())).getPort();
         SocketAddress sa = new InetSocketAddress(InetAddress.getLocalHost(), port);
@@ -141,9 +137,6 @@ public class Identity {
             public void failed(Throwable exc, Integer groupId) {
                 fail(exc.getMessage());
             }
-            public void cancelled(Integer groupId) {
-                fail("I/O operation was cancelled");
-            }
         });
 
         // wait until
diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Restart.java b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Restart.java
index 567321e3008..1645246efda 100644
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Restart.java
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Restart.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4607272
+ * @bug 4607272 6842687
  * @summary Unit test for AsynchronousChannelGroup
  * @build Restart
  * @run main/othervm -XX:-UseVMInterruptibleIO Restart
@@ -94,7 +94,7 @@ public class Restart {
         for (int i=0; i<count; i++) {
             final CountDownLatch latch = new CountDownLatch(1);
 
-            listener.accept(null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
+            listener.accept((Void)null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
                 public void completed(AsynchronousSocketChannel ch, Void att) {
                     try {
                         ch.close();
@@ -111,8 +111,6 @@ public class Restart {
                 }
                 public void failed(Throwable exc, Void att) {
                 }
-                public void cancelled(Void att) {
-                }
             });
 
             // establish loopback connection which should cause completion
diff --git a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java
index f615c3c5063..7b947d949e6 100644
--- a/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java
+++ b/jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4607272
+ * @bug 4607272 6842687
  * @summary Unit test for AsynchronousChannelGroup
  */
 
@@ -45,15 +45,13 @@ public class Unbounded {
         final AsynchronousServerSocketChannel listener =
             AsynchronousServerSocketChannel.open()
                 .bind(new InetSocketAddress(0));
-        listener.accept(null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
+        listener.accept((Void)null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
             public void completed(AsynchronousSocketChannel ch, Void att) {
                 queue.add(ch);
-                listener.accept(null, this);
+                listener.accept((Void)null, this);
             }
             public void failed(Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
         System.out.println("Listener created.");
 
@@ -97,8 +95,6 @@ public class Unbounded {
                     }
                     public void failed(Throwable exc, AsynchronousSocketChannel ch) {
                     }
-                    public void cancelled(AsynchronousSocketChannel ch) {
-                    }
                 });
         }
         System.out.println("All read operations outstanding.");
diff --git a/jdk/test/java/nio/channels/AsynchronousDatagramChannel/Basic.java b/jdk/test/java/nio/channels/AsynchronousDatagramChannel/Basic.java
index 5ed3d83a90d..9c390105716 100644
--- a/jdk/test/java/nio/channels/AsynchronousDatagramChannel/Basic.java
+++ b/jdk/test/java/nio/channels/AsynchronousDatagramChannel/Basic.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4527345
+ * @bug 4527345 6842687
  * @summary Unit test for AsynchronousDatagramChannel
  */
 
@@ -66,14 +66,12 @@ public class Basic {
         // Test: datagram packet not received immediately
         dst.clear();
         final CountDownLatch latch = new CountDownLatch(1);
-        ch.receive(dst, null, new CompletionHandler<SocketAddress,Void>() {
+        ch.receive(dst, (Void)null, new CompletionHandler<SocketAddress,Void>() {
             public void completed(SocketAddress source, Void att) {
                 latch.countDown();
             }
             public void failed (Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
         Thread.sleep(2000);
         sender.send(ByteBuffer.wrap(msg), sa);
@@ -82,14 +80,12 @@ public class Basic {
         // Test: timeout
         dst.clear();
         final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
-        ch.receive(dst, 2, TimeUnit.SECONDS, null, new CompletionHandler<SocketAddress,Void>() {
+        ch.receive(dst, 2, TimeUnit.SECONDS, (Void)null, new CompletionHandler<SocketAddress,Void>() {
             public void completed(SocketAddress source, Void att) {
             }
             public void failed (Throwable exc, Void att) {
                 exception.set(exc);
             }
-            public void cancelled(Void att) {
-            }
         });
         Throwable result;
         while ((result = exception.get()) == null) {
@@ -101,14 +97,12 @@ public class Basic {
         // AsynchronousCloseException
         dst = ByteBuffer.allocateDirect(100);
         exception.set(null);
-        ch.receive(dst, null, new CompletionHandler<SocketAddress,Void>() {
+        ch.receive(dst, (Void)null, new CompletionHandler<SocketAddress,Void>() {
             public void completed(SocketAddress source, Void att) {
             }
             public void failed (Throwable exc, Void att) {
                 exception.set(exc);
             }
-            public void cancelled(Void att) {
-            }
         });
         ch.close();
         while ((result = exception.get()) == null) {
@@ -156,14 +150,12 @@ public class Basic {
         // Test: datagram packet not received immediately
         dst.clear();
         final CountDownLatch l1 = new CountDownLatch(1);
-        ch.read(dst, null, new CompletionHandler<Integer,Void>() {
+        ch.read(dst, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer bytesRead, Void att) {
                 l1.countDown();
             }
             public void failed (Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
         Thread.sleep(2000);
         sender.send(ByteBuffer.wrap(msg), sa);
@@ -172,14 +164,12 @@ public class Basic {
         // Test: timeout
         dst.clear();
         final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
-        ch.read(dst, 2, TimeUnit.SECONDS, null, new CompletionHandler<Integer,Void>() {
+        ch.read(dst, 2, TimeUnit.SECONDS, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer bytesRead, Void att) {
             }
             public void failed (Throwable exc, Void att) {
                 exception.set(exc);
             }
-            public void cancelled(Void att) {
-            }
         });
         Throwable result;
         while ((result = exception.get()) == null) {
@@ -191,14 +181,12 @@ public class Basic {
         // AsynchronousCloseException
         dst.clear();
         exception.set(null);
-        ch.read(dst, null, new CompletionHandler<Integer,Void>() {
+        ch.read(dst, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer bytesRead, Void att) {
             }
             public void failed (Throwable exc, Void att) {
                 exception.set(exc);
             }
-            public void cancelled(Void att) {
-            }
         });
         ch.close();
         while ((result = exception.get()) == null) {
@@ -238,7 +226,7 @@ public class Basic {
         // Test: send datagram packet to reader and check completion handler
         // is invoked
         final CountDownLatch l2 = new CountDownLatch(1);
-        ch.send(ByteBuffer.wrap(msg), sa, null, new CompletionHandler<Integer,Void>() {
+        ch.send(ByteBuffer.wrap(msg), sa, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer bytesSent, Void att) {
                 if (bytesSent != msg.length)
                     throw new RuntimeException("Unexpected number of bytes received");
@@ -246,8 +234,6 @@ public class Basic {
             }
             public void failed (Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
         l2.await(5, TimeUnit.SECONDS);
 
@@ -261,7 +247,7 @@ public class Basic {
         // Test: check that failed method is invoked
         ch.close();
         final CountDownLatch l3 = new CountDownLatch(1);
-        ch.send(ByteBuffer.wrap(msg), sa, null, new CompletionHandler<Integer,Void>() {
+        ch.send(ByteBuffer.wrap(msg), sa, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer bytesSent, Void att) {
                 throw new RuntimeException("completed method invoked");
             }
@@ -272,8 +258,6 @@ public class Basic {
                     throw new RuntimeException(exc);
                 }
             }
-            public void cancelled(Void att) {
-            }
         });
         l3.await(5, TimeUnit.SECONDS);
 
@@ -315,7 +299,7 @@ public class Basic {
 
         // Test: write datagram and check completion handler is invoked
         final CountDownLatch l2 = new CountDownLatch(1);
-        ch.write(ByteBuffer.wrap(msg), null, new CompletionHandler<Integer,Void>() {
+        ch.write(ByteBuffer.wrap(msg), (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer bytesSent, Void att) {
                 if (bytesSent != msg.length)
                     throw new RuntimeException("Unexpected number of bytes received");
@@ -323,8 +307,6 @@ public class Basic {
             }
             public void failed (Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
         l2.await(5, TimeUnit.SECONDS);
 
@@ -340,7 +322,7 @@ public class Basic {
         reader.close();
     }
 
-    static void cancelAndCheck(Future<?> result, CountDownLatch latch)
+    static void cancelAndCheck(Future<?> result)
         throws InterruptedException
     {
         boolean cancelled = result.cancel(false);
@@ -356,37 +338,22 @@ public class Basic {
         } catch (ExecutionException e) {
             throw new RuntimeException("Should not fail");
         }
-
-        // make sure that completion handler is invoked
-        latch.await();
     }
 
     // basic cancel tests
     static void doCancelTests() throws Exception {
         InetAddress lh = InetAddress.getLocalHost();
 
-        // timed and non-timed receive
+        // receive
         for (int i=0; i<2; i++) {
             AsynchronousDatagramChannel ch =
                 AsynchronousDatagramChannel.open().bind(new InetSocketAddress(0));
-            final CountDownLatch latch = new CountDownLatch(1);
-            long timeout = (i == 0) ? 0L : 60L;
-            Future<SocketAddress> remote = ch
-                .receive(ByteBuffer.allocate(100), timeout, TimeUnit.SECONDS, null,
-                    new CompletionHandler<SocketAddress,Void>() {
-                        public void completed(SocketAddress source, Void att) {
-                        }
-                        public void failed (Throwable exc, Void att) {
-                        }
-                        public void cancelled(Void att) {
-                            latch.countDown();
-                        }
-                    });
-            cancelAndCheck(remote, latch);
+            Future<SocketAddress> remote = ch.receive(ByteBuffer.allocate(100));
+            cancelAndCheck(remote);
             ch.close();
         }
 
-        // timed and non-timed read
+        // read
         for (int i=0; i<2; i++) {
             AsynchronousDatagramChannel ch =
                 AsynchronousDatagramChannel.open().bind(new InetSocketAddress(0));
@@ -394,18 +361,8 @@ public class Basic {
                 ((InetSocketAddress)(ch.getLocalAddress())).getPort()));
             final CountDownLatch latch = new CountDownLatch(1);
             long timeout = (i == 0) ? 0L : 60L;
-            Future<Integer> result = ch
-                .read(ByteBuffer.allocate(100), timeout, TimeUnit.SECONDS, null,
-                    new CompletionHandler<Integer,Void>() {
-                        public void completed(Integer bytesRead, Void att) {
-                        }
-                        public void failed (Throwable exc, Void att) {
-                        }
-                        public void cancelled(Void att) {
-                            latch.countDown();
-                        }
-                    });
-            cancelAndCheck(result, latch);
+            Future<Integer> result = ch.read(ByteBuffer.allocate(100));
+            cancelAndCheck(result);
             ch.close();
         }
     }
diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java b/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java
index 1f37d4be11c..75bd1348ef5 100644
--- a/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java
+++ b/jdk/test/java/nio/channels/AsynchronousFileChannel/Basic.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4607272 6822643 6830721
+ * @bug 4607272 6822643 6830721 6842687
  * @summary Unit test for AsynchronousFileChannel
  */
 
@@ -190,13 +190,11 @@ public class Basic {
             if (fl == null)
                 throw new RuntimeException("Unable to acquire lock");
             try {
-                ch.lock(null, new CompletionHandler<FileLock,Void> () {
+                ch.lock((Void)null, new CompletionHandler<FileLock,Void> () {
                     public void completed(FileLock result, Void att) {
                     }
                     public void failed(Throwable exc, Void att) {
                     }
-                    public void cancelled(Void att) {
-                    }
                 });
                 throw new RuntimeException("OverlappingFileLockException expected");
             } catch (OverlappingFileLockException x) {
@@ -217,7 +215,7 @@ public class Basic {
         ByteBuffer buf = ByteBuffer.allocateDirect(100);
         final CountDownLatch latch = new CountDownLatch(1);
 
-        ch.read(buf, 0L, null, new CompletionHandler<Integer,Void>() {
+        ch.read(buf, 0L, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer result, Void att) {
                 try {
                     Thread.currentThread().interrupt();
@@ -229,8 +227,6 @@ public class Basic {
             }
             public void failed(Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
 
         // wait for handler to complete
@@ -311,15 +307,13 @@ public class Basic {
                     final AtomicReference<Thread> invoker = new AtomicReference<Thread>();
                     final CountDownLatch latch = new CountDownLatch(1);
 
-                    ch.write(genBuffer(), 0L, null, new CompletionHandler<Integer,Void>() {
+                    ch.write(genBuffer(), 0L, (Void)null, new CompletionHandler<Integer,Void>() {
                         public void completed(Integer result, Void att) {
                             invoker.set(Thread.currentThread());
                             latch.countDown();
                         }
                         public void failed(Throwable exc, Void att) {
                         }
-                        public void cancelled(Void att) {
-                        }
                     });
                     await(latch);
 
@@ -338,8 +332,41 @@ public class Basic {
                 }
             } finally {
                 ch.close();
+                executor.shutdown();
             }
         }
+
+
+        // test sharing a thread pool between many channels
+        ExecutorService executor = Executors
+            .newFixedThreadPool(1+rand.nextInt(10), threadFactory);
+        final int n = 50 + rand.nextInt(50);
+        AsynchronousFileChannel[] channels = new AsynchronousFileChannel[n];
+        try {
+            for (int i=0; i<n; i++) {
+                Set<StandardOpenOption> opts = EnumSet.of(WRITE);
+                channels[i] = AsynchronousFileChannel.open(file, opts, executor);
+                final CountDownLatch latch = new CountDownLatch(1);
+                channels[i].write(genBuffer(), 0L, (Void)null, new CompletionHandler<Integer,Void>() {
+                    public void completed(Integer result, Void att) {
+                        latch.countDown();
+                    }
+                    public void failed(Throwable exc, Void att) {
+                    }
+                });
+                await(latch);
+
+                // close ~half the channels
+                if (rand.nextBoolean())
+                    channels[i].close();
+            }
+        } finally {
+            // close remaining channels
+            for (int i=0; i<n; i++) {
+                if (channels[i] != null) channels[i].close();
+            }
+            executor.shutdown();
+        }
     }
 
     // exercise asynchronous close
@@ -409,17 +436,7 @@ public class Basic {
                 .open(file, WRITE, SYNC);
 
             // start write operation
-            final CountDownLatch latch = new CountDownLatch(1);
-            Future<Integer> res = ch.write(genBuffer(), 0L, null,
-                new CompletionHandler<Integer,Void>() {
-                    public void completed(Integer result, Void att) {
-                    }
-                    public void failed(Throwable exc, Void att) {
-                    }
-                    public void cancelled(Void att) {
-                        latch.countDown();
-                    }
-            });
+            Future<Integer> res = ch.write(genBuffer(), 0L);
 
             // cancel operation
             boolean cancelled = res.cancel(mayInterruptIfRunning);
@@ -456,10 +473,6 @@ public class Basic {
                 throw new RuntimeException(x);
             }
 
-            // check that cancelled method is invoked
-            if (cancelled)
-                await(latch);
-
             ch.close();
         }
     }
@@ -547,8 +560,6 @@ public class Basic {
             }
             public void failed(Throwable exc, Long position) {
             }
-            public void cancelled(Long position) {
-            }
         });
 
         // wait for writes to complete
@@ -574,8 +585,6 @@ public class Basic {
             }
             public void failed(Throwable exc, Long position) {
             }
-            public void cancelled(Long position) {
-            }
         });
 
         // wait for reads to complete
diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java b/jdk/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java
index 9f9025dd232..610124d2061 100644
--- a/jdk/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java
+++ b/jdk/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4607272
+ * @bug 4607272 6842687
  * @summary Unit test for java.nio.channels.AsynchronousFileChannel
  * @build CustomThreadPool MyThreadFactory
  * @run main/othervm -Djava.nio.channels.DefaultThreadPool.threadFactory=MyThreadFactory CustomThreadPool
@@ -51,8 +51,6 @@ public class CustomThreadPool {
                 }
                 public void failed(Throwable exc, AtomicReference<Thread> invoker) {
                 }
-                public void cancelled(AtomicReference<Thread> invoker) {
-                }
             });
         Thread t;
         while ((t = invoker.get()) == null) {
diff --git a/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java b/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java
index f8b55cc44f8..2b41c86766f 100644
--- a/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java
+++ b/jdk/test/java/nio/channels/AsynchronousFileChannel/Lock.java
@@ -23,7 +23,7 @@
 
 
 /* @test
- * @bug 4607272 6814948
+ * @bug 4607272 6814948 6842687
  * @summary Unit test for AsynchronousFileChannel#lock method
  */
 
@@ -97,7 +97,7 @@ public class Lock {
         slave.lock(0, 10, false);
 
         // this VM acquires lock on non-overlapping range
-        fl = ch.lock(10, 10, false, null, null).get();
+        fl = ch.lock(10, 10, false).get();
         fl.release();
 
         // done
diff --git a/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java b/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java
index e0965fb6e74..3ff2151fed7 100644
--- a/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java
+++ b/jdk/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4607272
+ * @bug 4607272 6842687
  * @summary Unit test for AsynchronousServerSocketChannel
  * @run main/timeout=180 Basic
  */
@@ -95,7 +95,7 @@ public class Basic {
        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
 
         // start accepting
-        listener.accept(null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
+        listener.accept((Void)null, new CompletionHandler<AsynchronousSocketChannel,Void>() {
             public void completed(AsynchronousSocketChannel ch, Void att) {
                 try {
                     ch.close();
@@ -104,8 +104,6 @@ public class Basic {
             public void failed(Throwable exc, Void att) {
                 exception.set(exc);
             }
-            public void cancelled(Void att) {
-            }
         });
 
         // check AcceptPendingException
diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
index 8b140f17bbf..88c4c16e2cd 100644
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4607272
+ * @bug 4607272 6842687
  * @summary Unit test for AsynchronousSocketChannel
  * @run main/timeout=600 Basic
  */
@@ -181,14 +181,12 @@ public class Basic {
         }
         final AtomicReference<Throwable> connectException =
             new AtomicReference<Throwable>();
-        ch.connect(server.address(), null, new CompletionHandler<Void,Void>() {
+        ch.connect(server.address(), (Void)null, new CompletionHandler<Void,Void>() {
             public void completed(Void result, Void att) {
             }
             public void failed(Throwable exc, Void att) {
                 connectException.set(exc);
             }
-            public void cancelled(Void att) {
-            }
         });
         while (connectException.get() == null) {
             Thread.sleep(100);
@@ -289,8 +287,6 @@ public class Basic {
             public void failed(Throwable x, AsynchronousSocketChannel ch) {
                 writeException.set(x);
             }
-            public void cancelled(AsynchronousSocketChannel ch) {
-            }
         });
 
         // give time for socket buffer to fill up.
@@ -330,18 +326,8 @@ public class Basic {
             SocketChannel peer = server.accept();
 
             // start read operation
-            final CountDownLatch latch = new CountDownLatch(1);
             ByteBuffer buf = ByteBuffer.allocate(1);
-            Future<Integer> res = ch.read(buf, null,
-                new CompletionHandler<Integer,Void>() {
-                    public void completed(Integer result, Void att) {
-                    }
-                    public void failed(Throwable exc, Void att) {
-                    }
-                    public void cancelled(Void att) {
-                        latch.countDown();
-                    }
-            });
+            Future<Integer> res = ch.read(buf);
 
             // cancel operation
             boolean cancelled = res.cancel(mayInterruptIfRunning);
@@ -362,8 +348,11 @@ public class Basic {
             } catch (CancellationException x) {
             }
 
-            // check that completion handler executed.
-            latch.await();
+            // check that the cancel doesn't impact writing to the channel
+            if (!mayInterruptIfRunning) {
+                buf = ByteBuffer.wrap("a".getBytes());
+                ch.write(buf).get();
+            }
 
             ch.close();
             peer.close();
@@ -397,19 +386,17 @@ public class Basic {
         // reads should complete immediately
         final ByteBuffer dst = ByteBuffer.allocateDirect(src.capacity() + 100);
         final CountDownLatch latch = new CountDownLatch(1);
-        ch.read(dst, null, new CompletionHandler<Integer,Void>() {
+        ch.read(dst, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer result, Void att) {
                 int n = result;
                 if (n > 0) {
-                    ch.read(dst, null, this);
+                    ch.read(dst, (Void)null, this);
                 } else {
                     latch.countDown();
                 }
             }
             public void failed(Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
 
         latch.await();
@@ -450,18 +437,16 @@ public class Basic {
         // read until the buffer is full
         final ByteBuffer dst = ByteBuffer.allocateDirect(src.capacity());
         final CountDownLatch latch = new CountDownLatch(1);
-        ch.read(dst, null, new CompletionHandler<Integer,Void>() {
+        ch.read(dst, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer result, Void att) {
                 if (dst.hasRemaining()) {
-                    ch.read(dst, null, this);
+                    ch.read(dst, (Void)null, this);
                 } else {
                     latch.countDown();
                 }
             }
             public void failed(Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
 
         // trickle the writing
@@ -507,26 +492,24 @@ public class Basic {
         }
 
         // scattering read that completes ascynhronously
-        final CountDownLatch latch = new CountDownLatch(1);
-        ch.read(dsts, 0, dsts.length, 0L, TimeUnit.SECONDS, null,
+        final CountDownLatch l1 = new CountDownLatch(1);
+        ch.read(dsts, 0, dsts.length, 0L, TimeUnit.SECONDS, (Void)null,
             new CompletionHandler<Long,Void>() {
                 public void completed(Long result, Void att) {
                     long n = result;
                     if (n <= 0)
                         throw new RuntimeException("No bytes read");
-                    latch.countDown();
+                    l1.countDown();
                 }
                 public void failed(Throwable exc, Void att) {
                 }
-                public void cancelled(Void att) {
-                }
         });
 
         // write some bytes
         sc.write(genBuffer());
 
         // read should now complete
-        latch.await();
+        l1.await();
 
         // write more bytes
         sc.write(genBuffer());
@@ -535,10 +518,20 @@ public class Basic {
         for (int i=0; i<dsts.length; i++) {
             dsts[i].rewind();
         }
-        long n = ch
-            .read(dsts, 0, dsts.length, 0L, TimeUnit.SECONDS, null, null).get();
-        if (n <= 0)
-            throw new RuntimeException("No bytes read");
+
+        final CountDownLatch l2 = new CountDownLatch(1);
+        ch.read(dsts, 0, dsts.length, 0L, TimeUnit.SECONDS, (Void)null,
+            new CompletionHandler<Long,Void>() {
+                public void completed(Long result, Void att) {
+                    long n = result;
+                    if (n <= 0)
+                        throw new RuntimeException("No bytes read");
+                    l2.countDown();
+                }
+                public void failed(Throwable exc, Void att) {
+                }
+        });
+        l2.await();
 
         ch.close();
         sc.close();
@@ -562,10 +555,10 @@ public class Basic {
 
         // write all bytes and close connection when done
         final ByteBuffer src = genBuffer();
-        ch.write(src, null, new CompletionHandler<Integer,Void>() {
+        ch.write(src, (Void)null, new CompletionHandler<Integer,Void>() {
             public void completed(Integer result, Void att) {
                 if (src.hasRemaining()) {
-                    ch.write(src, null, this);
+                    ch.write(src, (Void)null, this);
                 } else {
                     try {
                         ch.close();
@@ -574,8 +567,6 @@ public class Basic {
             }
             public void failed(Throwable exc, Void att) {
             }
-            public void cancelled(Void att) {
-            }
         });
 
         // read to EOF or buffer full
@@ -613,23 +604,33 @@ public class Basic {
         ch.connect(server.address()).get();
         SocketChannel sc = server.accept();
 
+        // number of bytes written
+        final AtomicLong bytesWritten = new AtomicLong(0);
+
         // write buffers (should complete immediately)
         ByteBuffer[] srcs = genBuffers(1);
-        long n = ch
-            .write(srcs, 0, srcs.length, 0L, TimeUnit.SECONDS, null, null).get();
-        if (n <= 0)
-            throw new RuntimeException("No bytes written");
+        final CountDownLatch l1 = new CountDownLatch(1);
+        ch.write(srcs, 0, srcs.length, 0L, TimeUnit.SECONDS, (Void)null,
+            new CompletionHandler<Long,Void>() {
+                public void completed(Long result, Void att) {
+                    long n = result;
+                    if (n <= 0)
+                        throw new RuntimeException("No bytes read");
+                    bytesWritten.addAndGet(n);
+                    l1.countDown();
+                }
+                public void failed(Throwable exc, Void att) {
+                }
+        });
+        l1.await();
 
         // set to true to signal that no more buffers should be written
         final AtomicBoolean continueWriting = new AtomicBoolean(true);
 
-        // number of bytes written
-        final AtomicLong bytesWritten = new AtomicLong(n);
-
         // write until socket buffer is full so as to create the conditions
         // for when a write does not complete immediately
         srcs = genBuffers(1);
-        ch.write(srcs, 0, srcs.length, 0L, TimeUnit.SECONDS, null,
+        ch.write(srcs, 0, srcs.length, 0L, TimeUnit.SECONDS, (Void)null,
             new CompletionHandler<Long,Void>() {
                 public void completed(Long result, Void att) {
                     long n = result;
@@ -639,13 +640,11 @@ public class Basic {
                     if (continueWriting.get()) {
                         ByteBuffer[] srcs = genBuffers(8);
                         ch.write(srcs, 0, srcs.length, 0L, TimeUnit.SECONDS,
-                            null, this);
+                            (Void)null, this);
                     }
                 }
                 public void failed(Throwable exc, Void att) {
                 }
-                public void cancelled(Void att) {
-                }
         });
 
         // give time for socket buffer to fill up.
@@ -658,7 +657,7 @@ public class Basic {
         ByteBuffer buf = ByteBuffer.allocateDirect(4096);
         long total = 0L;
         do {
-            n = sc.read(buf);
+            int n = sc.read(buf);
             if (n <= 0)
                 throw new RuntimeException("No bytes read");
             buf.rewind();
@@ -714,15 +713,27 @@ public class Basic {
 
         System.out.println("-- timeout when reading --");
 
-        // this read should timeout
         ByteBuffer dst = ByteBuffer.allocate(512);
-        try {
-            ch.read(dst, 3, TimeUnit.SECONDS, null, null).get();
-            throw new RuntimeException("Read did not timeout");
-        } catch (ExecutionException x) {
-            if (!(x.getCause() instanceof InterruptedByTimeoutException))
-                throw new RuntimeException("InterruptedByTimeoutException expected");
+
+        final AtomicReference<Throwable> readException = new AtomicReference<Throwable>();
+
+        // this read should timeout
+        ch.read(dst, 3, TimeUnit.SECONDS, (Void)null,
+            new CompletionHandler<Integer,Void>()
+        {
+            public void completed(Integer result, Void att) {
+                throw new RuntimeException("Should not complete");
+            }
+            public void failed(Throwable exc, Void att) {
+                readException.set(exc);
+            }
+        });
+        // wait for exception
+        while (readException.get() == null) {
+            Thread.sleep(100);
         }
+        if (!(readException.get() instanceof InterruptedByTimeoutException))
+            throw new RuntimeException("InterruptedByTimeoutException expected");
 
         // after a timeout then further reading should throw unspecified runtime exception
         boolean exceptionThrown = false;
@@ -752,8 +763,6 @@ public class Basic {
             public void failed(Throwable exc, AsynchronousSocketChannel ch) {
                 writeException.set(exc);
             }
-            public void cancelled(AsynchronousSocketChannel ch) {
-            }
         });
 
         // wait for exception
diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java b/jdk/test/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java
new file mode 100644
index 00000000000..1f4efb845df
--- /dev/null
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2008-2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6842687
+ * @summary Unit test for AsynchronousSocketChannel/AsynchronousServerSocketChannel
+ */
+import java.nio.ByteBuffer;
+import java.nio.channels.*;
+import java.net.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Initiates I/O operation on a thread that terminates before the I/O completes.
+ */
+
+public class DieBeforeComplete {
+
+    public static void main(String[] args) throws Exception {
+        final AsynchronousServerSocketChannel listener =
+                AsynchronousServerSocketChannel.open().bind(new InetSocketAddress(0));
+
+        InetAddress lh = InetAddress.getLocalHost();
+        int port = ((InetSocketAddress) (listener.getLocalAddress())).getPort();
+        final SocketAddress sa = new InetSocketAddress(lh, port);
+
+        // -- accept --
+
+        // initiate accept in a thread that dies before connection is established
+        Future<AsynchronousSocketChannel> r1 =
+                initiateAndDie(new Task<AsynchronousSocketChannel>() {
+            public Future<AsynchronousSocketChannel> run() {
+                return listener.accept();
+            }});
+
+        // establish and accept connection
+        SocketChannel peer = SocketChannel.open(sa);
+        final AsynchronousSocketChannel channel = r1.get();
+
+        // --- read --
+
+        // initiate read in a thread that dies befores bytes are available
+        final ByteBuffer dst = ByteBuffer.allocate(100);
+        Future<Integer> r2 = initiateAndDie(new Task<Integer>() {
+            public Future<Integer> run() {
+                return channel.read(dst);
+            }});
+
+        // send bytes
+        peer.write(ByteBuffer.wrap("hello".getBytes()));
+        int nread = r2.get();
+        if (nread <= 0)
+            throw new RuntimeException("Should have read at least one byte");
+
+        // -- write --
+
+        // initiate writes in threads that dies
+        boolean completedImmediately;
+        Future<Integer> r3;
+        do {
+            final ByteBuffer src = ByteBuffer.wrap(new byte[10000]);
+            r3 = initiateAndDie(new Task<Integer>() {
+                public Future<Integer> run() {
+                    return channel.write(src);
+                }});
+            try {
+                int nsent = r3.get(5, TimeUnit.SECONDS);
+                if (nsent <= 0)
+                    throw new RuntimeException("Should have wrote at least one byte");
+                completedImmediately = true;
+            } catch (TimeoutException x) {
+                completedImmediately = false;
+            }
+        } while (completedImmediately);
+
+        // drain connection
+        peer.configureBlocking(false);
+        ByteBuffer src = ByteBuffer.allocateDirect(10000);
+        do {
+            src.clear();
+            nread = peer.read(src);
+            if (nread == 0) {
+                Thread.sleep(100);
+                nread = peer.read(src);
+            }
+        } while (nread > 0);
+
+        // write should complete now
+        int nsent = r3.get();
+        if (nsent <= 0)
+            throw new RuntimeException("Should have wrote at least one byte");
+    }
+
+    static interface Task<T> {
+        Future<T> run();
+    }
+
+    static <T> Future<T> initiateAndDie(final Task<T> task) {
+        final AtomicReference<Future<T>> result = new AtomicReference<Future<T>>();
+        Runnable r = new Runnable() {
+            public void run() {
+                result.set(task.run());
+            }
+        };
+        Thread t = new Thread(r);
+        t.start();
+        while (t.isAlive()) {
+            try {
+                t.join();
+            } catch (InterruptedException x) {
+            }
+        }
+        return result.get();
+    }
+}
diff --git a/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java b/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java
index d3426ba08c0..bb77552fcb0 100644
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 6834246
+ * @bug 6834246 6842687
  * @summary Stress test connections through the loopback interface
  */
 
@@ -99,7 +99,7 @@ public class StressLoopback {
         void start() {
             sentBuffer.position(0);
             sentBuffer.limit(sentBuffer.capacity());
-            channel.write(sentBuffer, null, new CompletionHandler<Integer,Void> () {
+            channel.write(sentBuffer, (Void)null, new CompletionHandler<Integer,Void> () {
                 public void completed(Integer nwrote, Void att) {
                     bytesSent += nwrote;
                     if (finished) {
@@ -107,15 +107,13 @@ public class StressLoopback {
                     } else {
                         sentBuffer.position(0);
                         sentBuffer.limit(sentBuffer.capacity());
-                        channel.write(sentBuffer, null, this);
+                        channel.write(sentBuffer, (Void)null, this);
                     }
                 }
                 public void failed(Throwable exc, Void att) {
                     exc.printStackTrace();
                     closeUnchecked(channel);
                 }
-                public void cancelled(Void att) {
-                }
             });
         }
 
@@ -142,22 +140,20 @@ public class StressLoopback {
         }
 
         void start() {
-            channel.read(readBuffer, null, new CompletionHandler<Integer,Void> () {
+            channel.read(readBuffer, (Void)null, new CompletionHandler<Integer,Void> () {
                 public void completed(Integer nread, Void att) {
                     if (nread < 0) {
                         closeUnchecked(channel);
                     } else {
                         bytesRead += nread;
                         readBuffer.clear();
-                        channel.read(readBuffer, null, this);
+                        channel.read(readBuffer, (Void)null, this);
                     }
                 }
                 public void failed(Throwable exc, Void att) {
                     exc.printStackTrace();
                     closeUnchecked(channel);
                 }
-                public void cancelled(Void att) {
-                }
             });
         }
 
diff --git a/jdk/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java b/jdk/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java
index 6928bcded3e..86b9752ba0c 100644
--- a/jdk/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java
+++ b/jdk/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java
@@ -25,6 +25,7 @@
  * @bug 4527345
  * @summary Unit test for DatagramChannel's multicast support
  * @build BasicMulticastTests NetworkConfiguration
+ * @run main BasicMulticastTests
  */
 
 import java.nio.ByteBuffer;
diff --git a/jdk/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java b/jdk/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java
index 11e3b0be068..bb1b7037571 100644
--- a/jdk/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java
+++ b/jdk/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java
@@ -25,6 +25,7 @@
  * @bug 4527345
  * @summary Unit test for DatagramChannel's multicast support
  * @build MulticastSendReceiveTests NetworkConfiguration
+ * @run main MulticastSendReceiveTests
  */
 
 import java.nio.ByteBuffer;
diff --git a/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java b/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java
index c7ed16a9204..055ff55e8f1 100644
--- a/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java
+++ b/jdk/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 6543863
+ * @bug 6543863 6842687
  * @summary Try to cause a deadlock between (Asynchronous)FileChannel.close
  *   and FileLock.release
  */
@@ -56,7 +56,7 @@ public class ReleaseOnCloseDeadlock {
         AsynchronousFileChannel ch = AsynchronousFileChannel.open(file, READ, WRITE);
         for (int i=0; i<LOCK_COUNT; i++) {
             try {
-                locks[i] = ch.lock(i, 1, true, null, null).get();
+                locks[i] = ch.lock(i, 1, true).get();
             } catch (InterruptedException x) {
                 throw new RuntimeException(x);
             } catch (ExecutionException x) {
diff --git a/jdk/test/java/nio/channels/SocketChannel/Shutdown.java b/jdk/test/java/nio/channels/SocketChannel/Shutdown.java
index 16bd7a011ad..c2e579304f0 100644
--- a/jdk/test/java/nio/channels/SocketChannel/Shutdown.java
+++ b/jdk/test/java/nio/channels/SocketChannel/Shutdown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2002-2009 Sun Microsystems, Inc.  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
@@ -22,26 +22,65 @@
  */
 
 /* @test
- * @bug 4618960
- * @summary Test isInputShutdown
- * @library ..
+ * @bug 4618960 4516760
+ * @summary Test shutdownXXX and isInputShutdown
  */
 
+import java.io.IOException;
 import java.net.*;
-import java.nio.*;
+import java.nio.ByteBuffer;
 import java.nio.channels.*;
 
 public class Shutdown {
 
-    public static void main(String args[]) throws Exception {
-        InetSocketAddress sa = new InetSocketAddress(
-                                InetAddress.getByName(TestUtil.HOST), 23);
-        SocketChannel sc = SocketChannel.open(sa);
-        boolean before = sc.socket().isInputShutdown();
-        sc.socket().shutdownInput();
-        boolean after = sc.socket().isInputShutdown();
-        sc.close();
-        if (before || !after)
-            throw new Exception("Test failed");
+    /**
+     * Accept a connection, and close it immediately causing a hard reset.
+     */
+    static void acceptAndReset(ServerSocketChannel ssc) throws IOException {
+        SocketChannel peer = ssc.accept();
+        try {
+            peer.setOption(StandardSocketOption.SO_LINGER, 0);
+            peer.configureBlocking(false);
+            peer.write(ByteBuffer.wrap(new byte[128*1024]));
+        } finally {
+            peer.close();
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        ServerSocketChannel ssc = ServerSocketChannel.open()
+            .bind(new InetSocketAddress(0));
+        try {
+            InetAddress lh = InetAddress.getLocalHost();
+            int port = ((InetSocketAddress)(ssc.getLocalAddress())).getPort();
+            SocketAddress remote = new InetSocketAddress(lh, port);
+
+            // Test SocketChannel shutdownXXX
+            SocketChannel sc;
+            sc = SocketChannel.open(remote);
+            try {
+                acceptAndReset(ssc);
+                sc.shutdownInput();
+                sc.shutdownOutput();
+            } finally {
+                sc.close();
+            }
+
+            // Test Socket adapter shutdownXXX and isShutdownInput
+            sc = SocketChannel.open(remote);
+            try {
+                acceptAndReset(ssc);
+                boolean before = sc.socket().isInputShutdown();
+                sc.socket().shutdownInput();
+                boolean after = sc.socket().isInputShutdown();
+                if (before || !after)
+                    throw new RuntimeException("Before and after test failed");
+                sc.socket().shutdownOutput();
+            } finally {
+                sc.close();
+            }
+        } finally {
+            ssc.close();
+        }
     }
 }
diff --git a/jdk/test/java/nio/file/FileStore/Basic.java b/jdk/test/java/nio/file/FileStore/Basic.java
index 604795db435..85e6b992a57 100644
--- a/jdk/test/java/nio/file/FileStore/Basic.java
+++ b/jdk/test/java/nio/file/FileStore/Basic.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4313887
+ * @bug 4313887 6873621
  * @summary Unit test for java.nio.file.FileStore
  * @library ..
  */
@@ -67,6 +67,15 @@ public class Basic {
          * Test: File and FileStore attributes
          */
         assertTrue(store1.supportsFileAttributeView("basic"));
+        assertTrue(store1.supportsFileAttributeView(BasicFileAttributeView.class));
+        assertTrue(store1.supportsFileAttributeView("posix") ==
+            store1.supportsFileAttributeView(PosixFileAttributeView.class));
+        assertTrue(store1.supportsFileAttributeView("dos") ==
+            store1.supportsFileAttributeView(DosFileAttributeView.class));
+        assertTrue(store1.supportsFileAttributeView("acl") ==
+            store1.supportsFileAttributeView(AclFileAttributeView.class));
+        assertTrue(store1.supportsFileAttributeView("user") ==
+            store1.supportsFileAttributeView(UserDefinedFileAttributeView.class));
 
         /**
          * Test: Enumerate all FileStores
diff --git a/jdk/test/java/nio/file/Files/ContentType.java b/jdk/test/java/nio/file/Files/ContentType.java
index 8a2267ebd4e..fdbb9014ef6 100644
--- a/jdk/test/java/nio/file/Files/ContentType.java
+++ b/jdk/test/java/nio/file/Files/ContentType.java
@@ -26,6 +26,7 @@
  * @summary Unit test for probeContentType method
  * @library ..
  * @build ContentType SimpleFileTypeDetector
+ * @run main ContentType
  */
 
 import java.nio.file.*;
diff --git a/jdk/test/java/nio/file/Files/Misc.java b/jdk/test/java/nio/file/Files/Misc.java
index cd7e17a4bb8..a262274c436 100644
--- a/jdk/test/java/nio/file/Files/Misc.java
+++ b/jdk/test/java/nio/file/Files/Misc.java
@@ -22,13 +22,14 @@
  */
 
 /* @test
- * @bug 4313887 6838333
+ * @bug 4313887 6838333 6865748
  * @summary Unit test for java.nio.file.Files for miscellenous cases not
  *   covered by other tests
  * @library ..
  */
 
 import java.nio.file.*;
+import java.nio.file.attribute.Attributes;
 import java.io.IOException;
 import java.util.*;
 
@@ -113,5 +114,29 @@ public class Misc {
             npeExpected();
         } catch (NullPointerException e) {
         }
+
+        SimpleFileVisitor<Path> visitor = new SimpleFileVisitor<Path>() { };
+        boolean ranTheGauntlet = false;
+        try { visitor.preVisitDirectory(null);
+        } catch (NullPointerException x0) {
+        try { visitor.preVisitDirectoryFailed(null, new IOException());
+        } catch (NullPointerException x1) {
+        try { visitor.preVisitDirectoryFailed(dir, null);
+        } catch (NullPointerException x2) {
+        try { visitor.visitFile(null, Attributes.readBasicFileAttributes(Paths.get(".")));
+        } catch (NullPointerException x3) {
+        try {  visitor.visitFile(dir, null);
+        } catch (NullPointerException x4) {
+        try { visitor.visitFileFailed(null, new IOException());
+        } catch (NullPointerException x5) {
+        try { visitor.visitFileFailed(dir, null);
+        } catch (NullPointerException x6) {
+        try { visitor.postVisitDirectory(null, new IOException());
+        } catch (NullPointerException x7) {
+            // if we get here then all visit* methods threw NPE as expected
+            ranTheGauntlet = true;
+        }}}}}}}}
+        if (!ranTheGauntlet)
+            throw new RuntimeException("A visit method did not throw NPE");
     }
 }
diff --git a/jdk/test/java/nio/file/Path/CheckPermissions.java b/jdk/test/java/nio/file/Path/CheckPermissions.java
new file mode 100644
index 00000000000..a8aef0f91f2
--- /dev/null
+++ b/jdk/test/java/nio/file/Path/CheckPermissions.java
@@ -0,0 +1,695 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6866804
+ * @summary Unit test for java.nio.file.Path
+ * @library ..
+ */
+
+import java.nio.ByteBuffer;
+import java.nio.file.*;
+import java.nio.file.attribute.*;
+import java.nio.channels.SeekableByteChannel;
+import java.security.Permission;
+import java.io.*;
+import java.util.*;
+
+/**
+ * Checks each method that accesses the file system does the right permission
+ * check when there is a security manager set.
+ */
+
+public class CheckPermissions {
+
+    static class Checks {
+        private List<Permission> permissionsChecked = new ArrayList<Permission>();
+        private Set<String>  propertiesChecked = new HashSet<String>();
+        private List<String> readsChecked   = new ArrayList<String>();
+        private List<String> writesChecked  = new ArrayList<String>();
+        private List<String> deletesChecked = new ArrayList<String>();
+        private List<String> execsChecked   = new ArrayList<String>();
+
+        List<Permission> permissionsChecked()  { return permissionsChecked; }
+        Set<String> propertiesChecked()        { return propertiesChecked; }
+        List<String> readsChecked()            { return readsChecked; }
+        List<String> writesChecked()           { return writesChecked; }
+        List<String> deletesChecked()          { return deletesChecked; }
+        List<String> execsChecked()            { return execsChecked; }
+    }
+
+    static ThreadLocal<Checks> myChecks =
+        new ThreadLocal<Checks>() {
+            @Override protected Checks initialValue() {
+                return null;
+            }
+        };
+
+    static void prepare() {
+        myChecks.set(new Checks());
+    }
+
+    static void assertCheckPermission(Class<? extends Permission> type,
+                                      String name)
+    {
+        for (Permission perm: myChecks.get().permissionsChecked()) {
+            if (type.isInstance(perm) && perm.getName().equals(name))
+                return;
+        }
+        throw new RuntimeException(type.getName() + "\"" + name + "\") not checked");
+    }
+
+    static void assertCheckPropertyAccess(String key) {
+        if (!myChecks.get().propertiesChecked().contains(key))
+            throw new RuntimeException("Property " + key + " not checked");
+    }
+
+    static void assertChecked(Path file, List<String> list) {
+        String s = file.toString();
+        for (String f: list) {
+            if (f.endsWith(s))
+                return;
+        }
+        throw new RuntimeException("Access not checked");
+    }
+
+    static void assertCheckRead(Path file) {
+        assertChecked(file, myChecks.get().readsChecked());
+    }
+
+    static void assertCheckWrite(Path file) {
+        assertChecked(file, myChecks.get().writesChecked());
+    }
+
+    static void assertCheckDelete(Path file) {
+        assertChecked(file, myChecks.get().deletesChecked());
+    }
+
+    static void assertCheckExec(Path file) {
+        assertChecked(file, myChecks.get().execsChecked());
+    }
+
+    static class LoggingSecurityManager extends SecurityManager {
+        static void install() {
+            System.setSecurityManager(new LoggingSecurityManager());
+        }
+
+        @Override
+        public void checkPermission(Permission perm) {
+            Checks checks = myChecks.get();
+            if (checks != null)
+                checks.permissionsChecked().add(perm);
+        }
+
+        @Override
+        public void checkPropertyAccess(String key) {
+            Checks checks = myChecks.get();
+            if (checks != null)
+                checks.propertiesChecked().add(key);
+        }
+
+        @Override
+        public void checkRead(String file) {
+            Checks checks = myChecks.get();
+            if (checks != null)
+                checks.readsChecked().add(file);
+        }
+
+        @Override
+        public void checkWrite(String file) {
+            Checks checks = myChecks.get();
+            if (checks != null)
+                checks.writesChecked().add(file);
+        }
+
+        @Override
+        public void checkDelete(String file) {
+            Checks checks = myChecks.get();
+            if (checks != null)
+                checks.deletesChecked().add(file);
+        }
+
+        @Override
+        public void checkExec(String file) {
+            Checks checks = myChecks.get();
+            if (checks != null)
+                checks.execsChecked().add(file);
+        }
+    }
+
+    static void testBasicFileAttributeView(BasicFileAttributeView view, Path file)
+        throws IOException
+    {
+        prepare();
+        view.readAttributes();
+        assertCheckRead(file);
+
+        prepare();
+        FileTime now = FileTime.fromMillis(System.currentTimeMillis());
+        view.setTimes(null, now, now);
+        assertCheckWrite(file);
+    }
+
+    static void testPosixFileAttributeView(PosixFileAttributeView view, Path file)
+        throws IOException
+    {
+        prepare();
+        PosixFileAttributes attrs = view.readAttributes();
+        assertCheckRead(file);
+        assertCheckPermission(RuntimePermission.class, "accessUserInformation");
+
+        prepare();
+        view.setPermissions(attrs.permissions());
+        assertCheckWrite(file);
+        assertCheckPermission(RuntimePermission.class, "accessUserInformation");
+
+        prepare();
+        view.setOwner(attrs.owner());
+        assertCheckWrite(file);
+        assertCheckPermission(RuntimePermission.class, "accessUserInformation");
+
+        prepare();
+        view.setOwner(attrs.owner());
+        assertCheckWrite(file);
+        assertCheckPermission(RuntimePermission.class, "accessUserInformation");
+    }
+
+    public static void main(String[] args) throws IOException {
+        Path dir = Paths.get(System.getProperty("test.src", "."));
+        Path file = dir.resolve("file1234").createFile();
+        try {
+            LoggingSecurityManager.install();
+
+            // -- checkAccess --
+
+            prepare();
+            file.checkAccess();
+            assertCheckRead(file);
+
+            prepare();
+            file.checkAccess(AccessMode.READ);
+            assertCheckRead(file);
+
+            prepare();
+            file.checkAccess(AccessMode.WRITE);
+            assertCheckWrite(file);
+
+            prepare();
+            try {
+                file.checkAccess(AccessMode.EXECUTE);
+            } catch (AccessDeniedException x) { }
+            assertCheckExec(file);
+
+            prepare();
+            try {
+                file.checkAccess(AccessMode.READ, AccessMode.WRITE, AccessMode.EXECUTE);
+            } catch (AccessDeniedException x) { }
+            assertCheckRead(file);
+            assertCheckWrite(file);
+            assertCheckExec(file);
+
+            // -- copyTo --
+
+            Path target = dir.resolve("target1234");
+            prepare();
+            file.copyTo(target);
+            try {
+                assertCheckRead(file);
+                assertCheckWrite(target);
+            } finally {
+                target.delete();
+            }
+
+            if (TestUtil.supportsLinks(dir)) {
+                Path link = dir.resolve("link1234").createSymbolicLink(file);
+                try {
+                    prepare();
+                    link.copyTo(target, LinkOption.NOFOLLOW_LINKS);
+                    try {
+                        assertCheckRead(link);
+                        assertCheckWrite(target);
+                        assertCheckPermission(LinkPermission.class, "symbolic");
+                    } finally {
+                        target.delete();
+                    }
+                } finally {
+                    link.delete();
+                }
+            }
+
+            // -- createDirectory --
+
+            Path subdir = dir.resolve("subdir1234");
+            prepare();
+            subdir.createDirectory();
+            try {
+                assertCheckWrite(subdir);
+            } finally {
+                subdir.delete();
+            }
+
+            // -- createFile --
+
+            Path fileToCreate = dir.resolve("file7890");
+            prepare();
+            try {
+                fileToCreate.createFile();
+                assertCheckWrite(fileToCreate);
+            } finally {
+                fileToCreate.delete();
+            }
+
+            // -- createSymbolicLink --
+
+            if (TestUtil.supportsLinks(dir)) {
+                prepare();
+                Path link = dir.resolve("link1234").createSymbolicLink(file);
+                try {
+                    assertCheckWrite(link);
+                    assertCheckPermission(LinkPermission.class, "symbolic");
+                } finally {
+                    link.delete();
+                }
+            }
+
+            // -- delete/deleteIfExists --
+
+            Path fileToDelete = dir.resolve("file7890");
+
+            fileToDelete.createFile();
+            prepare();
+            fileToDelete.delete();
+            assertCheckDelete(fileToDelete);
+
+            fileToDelete.createFile();
+            prepare();
+            fileToDelete.deleteIfExists();
+            assertCheckDelete(fileToDelete);
+
+            // -- exists/notExists --
+
+            prepare();
+            file.exists();
+            assertCheckRead(file);
+
+            prepare();
+            file.notExists();
+            assertCheckRead(file);
+
+            // -- getFileStore --
+
+            prepare();
+            file.getFileStore();
+            assertCheckRead(file);
+            assertCheckPermission(RuntimePermission.class, "getFileStoreAttributes");
+
+            // -- isSameFile --
+
+            prepare();
+            file.isSameFile(dir);
+            assertCheckRead(file);
+            assertCheckRead(dir);
+
+            // -- moveTo --
+
+            Path target2 = dir.resolve("target1234");
+            prepare();
+            file.moveTo(target2);
+            try {
+                assertCheckWrite(file);
+                assertCheckWrite(target2);
+            } finally {
+                // restore file
+                target2.moveTo(file);
+            }
+
+            // -- newByteChannel --
+
+            SeekableByteChannel sbc;
+
+            prepare();
+            sbc = file.newByteChannel();
+            try {
+                assertCheckRead(file);
+            } finally {
+                sbc.close();
+            }
+            prepare();
+            sbc = file.newByteChannel(StandardOpenOption.WRITE);
+            try {
+                assertCheckWrite(file);
+            } finally {
+                sbc.close();
+            }
+            prepare();
+            sbc = file.newByteChannel(StandardOpenOption.READ, StandardOpenOption.WRITE);
+            try {
+                assertCheckRead(file);
+                assertCheckWrite(file);
+            } finally {
+                sbc.close();
+            }
+
+            prepare();
+            sbc = file.newByteChannel(StandardOpenOption.DELETE_ON_CLOSE);
+            try {
+                assertCheckRead(file);
+                assertCheckDelete(file);
+            } finally {
+                sbc.close();
+            }
+            file.createFile(); // restore file
+
+
+            // -- newInputStream/newOutptuStream --
+
+            prepare();
+            InputStream in = file.newInputStream();
+            try {
+                assertCheckRead(file);
+            } finally {
+                in.close();
+            }
+            prepare();
+            OutputStream out = file.newOutputStream();
+            try {
+                assertCheckWrite(file);
+            } finally {
+                out.close();
+            }
+
+            // -- newDirectoryStream --
+
+            prepare();
+            DirectoryStream<Path> stream = dir.newDirectoryStream();
+            try {
+                assertCheckRead(dir);
+
+                if (stream instanceof SecureDirectoryStream<?>) {
+                    Path entry;
+                    SecureDirectoryStream<Path> sds =
+                        (SecureDirectoryStream<Path>)stream;
+
+                    // newByteChannel
+                    entry = file.getName();
+                    prepare();
+                    sbc = sds.newByteChannel(entry, EnumSet.of(StandardOpenOption.READ));
+                    try {
+                        assertCheckRead(file);
+                    } finally {
+                        sbc.close();
+                    }
+                    prepare();
+                    sbc = sds.newByteChannel(entry, EnumSet.of(StandardOpenOption.WRITE));
+                    try {
+                        assertCheckWrite(file);
+                    } finally {
+                        sbc.close();
+                    }
+
+                    // deleteFile
+                    entry = file.getName();
+                    prepare();
+                    sds.deleteFile(entry);
+                    assertCheckDelete(file);
+                    dir.resolve(entry).createFile();  // restore file
+
+                    // deleteDirectory
+                    entry = Paths.get("subdir1234");
+                    dir.resolve(entry).createDirectory();
+                    prepare();
+                    sds.deleteDirectory(entry);
+                    assertCheckDelete(dir.resolve(entry));
+
+                    // move
+                    entry = Paths.get("tempname1234");
+                    prepare();
+                    sds.move(file.getName(), sds, entry);
+                    assertCheckWrite(file);
+                    assertCheckWrite(dir.resolve(entry));
+                    sds.move(entry, sds, file.getName());  // restore file
+
+                    // newDirectoryStream
+                    entry = Paths.get("subdir1234");
+                    dir.resolve(entry).createDirectory();
+                    try {
+                        prepare();
+                        sds.newDirectoryStream(entry).close();
+                        assertCheckRead(dir.resolve(entry));
+                    } finally {
+                        dir.resolve(entry).delete();
+                    }
+
+                    // getFileAttributeView to access attributes of directory
+                    testBasicFileAttributeView(sds
+                        .getFileAttributeView(BasicFileAttributeView.class), dir);
+                    testPosixFileAttributeView(sds
+                        .getFileAttributeView(PosixFileAttributeView.class), dir);
+
+                    // getFileAttributeView to access attributes of entry
+                    entry = file.getName();
+                    testBasicFileAttributeView(sds
+                        .getFileAttributeView(entry, BasicFileAttributeView.class), file);
+                    testPosixFileAttributeView(sds
+                        .getFileAttributeView(entry, PosixFileAttributeView.class), file);
+
+                } else {
+                    System.out.println("SecureDirectoryStream not tested");
+                }
+
+            } finally {
+                stream.close();
+            }
+
+            // -- toAbsolutePath --
+
+            prepare();
+            file.getName().toAbsolutePath();
+            assertCheckPropertyAccess("user.dir");
+
+            // -- toRealPath --
+
+            prepare();
+            file.toRealPath(true);
+            assertCheckRead(file);
+
+            prepare();
+            file.toRealPath(false);
+            assertCheckRead(file);
+
+            prepare();
+            Paths.get(".").toRealPath(true);
+            assertCheckPropertyAccess("user.dir");
+
+            prepare();
+            Paths.get(".").toRealPath(false);
+            assertCheckPropertyAccess("user.dir");
+
+            // -- register --
+
+            WatchService watcher = FileSystems.getDefault().newWatchService();
+            try {
+                prepare();
+                dir.register(watcher, StandardWatchEventKind.ENTRY_DELETE);
+                assertCheckRead(dir);
+            } finally {
+                watcher.close();
+            }
+
+            // -- getAttribute/setAttribute/readAttributes --
+
+            prepare();
+            file.getAttribute("size");
+            assertCheckRead(file);
+
+            prepare();
+            file.setAttribute("lastModifiedTime",
+                FileTime.fromMillis(System.currentTimeMillis()));
+            assertCheckWrite(file);
+
+            prepare();
+            file.readAttributes("*");
+            assertCheckRead(file);
+
+            // -- BasicFileAttributeView --
+            testBasicFileAttributeView(file
+                .getFileAttributeView(BasicFileAttributeView.class), file);
+
+            // -- PosixFileAttributeView --
+
+            {
+                PosixFileAttributeView view =
+                    file.getFileAttributeView(PosixFileAttributeView.class);
+                if (view != null &&
+                    file.getFileStore().supportsFileAttributeView(PosixFileAttributeView.class))
+                {
+                    testPosixFileAttributeView(view, file);
+                } else {
+                    System.out.println("PosixFileAttributeView not tested");
+                }
+            }
+
+            // -- DosFileAttributeView --
+
+            {
+                DosFileAttributeView view =
+                    file.getFileAttributeView(DosFileAttributeView.class);
+                if (view != null &&
+                    file.getFileStore().supportsFileAttributeView(DosFileAttributeView.class))
+                {
+                    prepare();
+                    view.readAttributes();
+                    assertCheckRead(file);
+
+                    prepare();
+                    view.setArchive(false);
+                    assertCheckWrite(file);
+
+                    prepare();
+                    view.setHidden(false);
+                    assertCheckWrite(file);
+
+                    prepare();
+                    view.setReadOnly(false);
+                    assertCheckWrite(file);
+
+                    prepare();
+                    view.setSystem(false);
+                    assertCheckWrite(file);
+                } else {
+                    System.out.println("DosFileAttributeView not tested");
+                }
+            }
+
+            // -- FileOwnerAttributeView --
+
+            {
+                FileOwnerAttributeView view =
+                    file.getFileAttributeView(FileOwnerAttributeView.class);
+                if (view != null &&
+                    file.getFileStore().supportsFileAttributeView(FileOwnerAttributeView.class))
+                {
+                    prepare();
+                    UserPrincipal owner = view.getOwner();
+                    assertCheckRead(file);
+                    assertCheckPermission(RuntimePermission.class, "accessUserInformation");
+
+                    prepare();
+                    view.setOwner(owner);
+                    assertCheckWrite(file);
+                    assertCheckPermission(RuntimePermission.class, "accessUserInformation");
+
+                } else {
+                    System.out.println("FileOwnerAttributeView not tested");
+                }
+            }
+
+            // -- UserDefinedFileAttributeView --
+
+            {
+                UserDefinedFileAttributeView view =
+                    file.getFileAttributeView(UserDefinedFileAttributeView.class);
+                if (view != null &&
+                    file.getFileStore().supportsFileAttributeView(UserDefinedFileAttributeView.class))
+                {
+                    prepare();
+                    view.write("test", ByteBuffer.wrap(new byte[100]));
+                    assertCheckWrite(file);
+                    assertCheckPermission(RuntimePermission.class,
+                                               "accessUserDefinedAttributes");
+
+                    prepare();
+                    view.read("test", ByteBuffer.allocate(100));
+                    assertCheckRead(file);
+                    assertCheckPermission(RuntimePermission.class,
+                                               "accessUserDefinedAttributes");
+
+                    prepare();
+                    view.size("test");
+                    assertCheckRead(file);
+                    assertCheckPermission(RuntimePermission.class,
+                                               "accessUserDefinedAttributes");
+
+                    prepare();
+                    view.list();
+                    assertCheckRead(file);
+                    assertCheckPermission(RuntimePermission.class,
+                                               "accessUserDefinedAttributes");
+
+                    prepare();
+                    view.delete("test");
+                    assertCheckWrite(file);
+                    assertCheckPermission(RuntimePermission.class,
+                                               "accessUserDefinedAttributes");
+                } else {
+                    System.out.println("UserDefinedFileAttributeView not tested");
+                }
+            }
+
+            // -- AclFileAttributeView --
+            {
+                AclFileAttributeView view =
+                    file.getFileAttributeView(AclFileAttributeView.class);
+                if (view != null &&
+                    file.getFileStore().supportsFileAttributeView(AclFileAttributeView.class))
+                {
+                    prepare();
+                    List<AclEntry> acl = view.getAcl();
+                    assertCheckRead(file);
+                    assertCheckPermission(RuntimePermission.class, "accessUserInformation");
+                    prepare();
+                    view.setAcl(acl);
+                    assertCheckWrite(file);
+                    assertCheckPermission(RuntimePermission.class, "accessUserInformation");
+                } else {
+                    System.out.println("AclFileAttributeView not tested");
+                }
+            }
+
+            // -- UserPrincipalLookupService
+
+            UserPrincipalLookupService lookupService =
+                FileSystems.getDefault().getUserPrincipalLookupService();
+            UserPrincipal owner = Attributes.getOwner(file);
+
+            prepare();
+            lookupService.lookupPrincipalByName(owner.getName());
+            assertCheckPermission(RuntimePermission.class,
+                                       "lookupUserInformation");
+
+            try {
+                UserPrincipal group = Attributes.readPosixFileAttributes(file).group();
+                prepare();
+                lookupService.lookupPrincipalByGroupName(group.getName());
+                assertCheckPermission(RuntimePermission.class,
+                                           "lookupUserInformation");
+            } catch (UnsupportedOperationException ignore) {
+                System.out.println("lookupPrincipalByGroupName not tested");
+            }
+
+
+        } finally {
+            file.deleteIfExists();
+        }
+    }
+}
diff --git a/jdk/test/java/nio/file/Path/Links.java b/jdk/test/java/nio/file/Path/Links.java
index a6f85beb7cd..8ffd89fb691 100644
--- a/jdk/test/java/nio/file/Path/Links.java
+++ b/jdk/test/java/nio/file/Path/Links.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4313887 6838333
+ * @bug 4313887 6838333 6863864
  * @summary Unit test for java.nio.file.Path createSymbolicLink,
  *     readSymbolicLink, and createLink methods
  * @library ..
@@ -31,7 +31,6 @@
 import java.nio.file.*;
 import java.nio.file.attribute.*;
 import java.io.*;
-import java.util.*;
 
 public class Links {
 
@@ -47,7 +46,7 @@ public class Links {
      * Exercise createSymbolicLink and readLink methods
      */
     static void testSymLinks(Path dir) throws IOException {
-        Path link = dir.resolve("link");
+        final Path link = dir.resolve("link");
 
         // Check if sym links are supported
         try {
@@ -76,6 +75,63 @@ public class Links {
                 link.delete();
             }
         }
+
+        // Test links to directory
+        Path mydir = dir.resolve("mydir");
+        Path myfile = mydir.resolve("myfile");
+        try {
+            mydir.createDirectory();
+            myfile.createFile();
+
+            // link -> "mydir"
+            link.createSymbolicLink(mydir.getName());
+            assertTrue(link.readSymbolicLink().equals(mydir.getName()));
+
+            // Test access to directory via link
+            DirectoryStream<Path> stream = link.newDirectoryStream();
+            try {
+                boolean found = false;
+                for (Path entry: stream) {
+                    if (entry.getName().equals(myfile.getName())) {
+                        found = true;
+                        break;
+                    }
+                }
+                assertTrue(found);
+            } finally {
+                stream.close();
+            }
+
+            // Test link2 -> link -> mydir
+            final Path link2 = dir.resolve("link2");
+            Path target2 = link.getName();
+            link2.createSymbolicLink(target2);
+            try {
+                assertTrue(link2.readSymbolicLink().equals(target2));
+                link2.newDirectoryStream().close();
+            } finally {
+                link2.delete();
+            }
+
+            // Remove mydir and re-create link2 before re-creating mydir
+            // (This is a useful test on Windows to ensure that creating a
+            // sym link to a directory sym link creates the right type of link).
+            myfile.delete();
+            mydir.delete();
+            link2.createSymbolicLink(target2);
+            try {
+                assertTrue(link2.readSymbolicLink().equals(target2));
+                mydir.createDirectory();
+                link2.newDirectoryStream().close();
+            } finally {
+                link2.delete();
+            }
+
+        } finally {
+            myfile.deleteIfExists();
+            mydir.deleteIfExists();
+            link.deleteIfExists();
+        }
     }
 
     /**
diff --git a/jdk/test/java/nio/file/Path/Misc.java b/jdk/test/java/nio/file/Path/Misc.java
index 066cf6bedf9..9e5452c8988 100644
--- a/jdk/test/java/nio/file/Path/Misc.java
+++ b/jdk/test/java/nio/file/Path/Misc.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4313887 6838333
+ * @bug 4313887 6838333 6867101
  * @summary Unit test for java.nio.file.Path for miscellenous methods not
  *   covered by other tests
  * @library ..
@@ -106,6 +106,28 @@ public class Misc {
         dir.checkAccess(AccessMode.WRITE);
         dir.checkAccess(AccessMode.READ, AccessMode.WRITE);
 
+        /**
+         * Test: Check access to all files in all root directories.
+         * (A useful test on Windows for special files such as pagefile.sys)
+         */
+        for (Path root: FileSystems.getDefault().getRootDirectories()) {
+            DirectoryStream<Path> stream;
+            try {
+                stream = root.newDirectoryStream();
+            } catch (IOException x) {
+                continue; // skip root directories that aren't accessible
+            }
+            try {
+                for (Path entry: stream) {
+                    try {
+                        entry.checkAccess();
+                    } catch (AccessDeniedException ignore) { }
+                }
+            } finally {
+                stream.close();
+            }
+        }
+
         /**
          * Test: File does not exist
          */
diff --git a/jdk/test/java/nio/file/PathMatcher/Basic.java b/jdk/test/java/nio/file/PathMatcher/Basic.java
index 16efcf099d0..3050eb30ae7 100644
--- a/jdk/test/java/nio/file/PathMatcher/Basic.java
+++ b/jdk/test/java/nio/file/PathMatcher/Basic.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4313887
+ * @bug 4313887 6866397
  * @summary Unit test for java.nio.file.PathMatcher
  */
 
@@ -68,6 +68,20 @@ public class Basic {
         }
     }
 
+    static void assertRegExMatch(String path, String pattern) {
+        System.out.format("Test regex pattern: %s", pattern);
+        Path file = Paths.get(path);
+        boolean matched =  file.getFileSystem()
+                               .getPathMatcher("regex:" + pattern).matches(file);
+        if (matched) {
+            System.out.println(" OKAY");
+        } else {
+            System.out.println(" ==> UNEXPECTED RESULT!");
+            failures++;
+        }
+    }
+
+
     public static void main(String[] args) {
         // basic
         assertMatch("foo.html", "foo.html");
@@ -140,21 +154,13 @@ public class Basic {
             assertMatch("one*two", "one\\*two");
         }
 
-
-
         // regex syntax
-        {
-            String pattern = ".*\\.html";
-            System.out.format("Test regex pattern: %s", pattern);
-            Path file = Paths.get("foo.html");
-            boolean matched =  file.getFileSystem()
-                .getPathMatcher("regex:" + pattern).matches(file);
-            if (matched) {
-                System.out.println(" OKAY");
-            } else {
-                System.out.println(" ==> UNEXPECTED RESULT!");
-                failures++;
-            }
+        assertRegExMatch("foo.html", ".*\\.html");
+
+        if (System.getProperty("os.name").startsWith("Windows")) {
+            assertRegExMatch("foo012", "foo\\d+");
+            assertRegExMatch("fo o", "fo\\so");
+            assertRegExMatch("foo", "\\w+");
         }
 
         // unknown syntax
diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh b/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
index 02ab6fcfd50..a1c1d80d696 100644
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
@@ -54,6 +54,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  CYGWIN* )
+    PATHSEP=";"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
@@ -81,7 +85,7 @@ ${TESTJAVA}${FILESEP}bin${FILESEP}javac \
 
 # run the test
 ${TESTJAVA}${FILESEP}bin${FILESEP}java \
-	-classpath ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar \
+	-classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \
 	ClassLoaderDeadlock
 
 exit $?
diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
index 4ed9b785e5f..e631389f023 100644
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
@@ -42,6 +42,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  CYGWIN* )
+    PATHSEP=";"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
@@ -54,5 +58,5 @@ esac
 
 JAVA="${TESTJAVA}${FILESEP}bin${FILESEP}java"
 
-${JAVA} -cp ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar Deadlock
+${JAVA} -cp "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" Deadlock
 
diff --git a/jdk/test/java/security/Security/signedfirst/Dyn.sh b/jdk/test/java/security/Security/signedfirst/Dyn.sh
index b64a6b6621b..b897d5900a9 100644
--- a/jdk/test/java/security/Security/signedfirst/Dyn.sh
+++ b/jdk/test/java/security/Security/signedfirst/Dyn.sh
@@ -54,6 +54,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  CYGWIN* )
+    PATHSEP=";"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
@@ -76,7 +80,7 @@ ${TESTJAVA}${FILESEP}bin${FILESEP}javac \
 
 # run the test
 ${TESTJAVA}${FILESEP}bin${FILESEP}java \
-	-classpath ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar \
+	-classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
 	DynSignedProvFirst
 
 exit $?
diff --git a/jdk/test/java/security/Security/signedfirst/Static.sh b/jdk/test/java/security/Security/signedfirst/Static.sh
index cec9df72279..519766f9d60 100644
--- a/jdk/test/java/security/Security/signedfirst/Static.sh
+++ b/jdk/test/java/security/Security/signedfirst/Static.sh
@@ -54,6 +54,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  CYGWIN* )
+    PATHSEP=";"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
@@ -70,14 +74,14 @@ rm StaticSignedProvFirst.class
 
 # compile the test program
 ${TESTJAVA}${FILESEP}bin${FILESEP}javac \
-	-classpath ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar \
+	-classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
 	-d ${TESTCLASSES}${FILESEP} \
 	${TESTSRC}${FILESEP}StaticSignedProvFirst.java
 
 # run the test
 cd ${TESTSRC}${FILESEP}
 ${TESTJAVA}${FILESEP}bin${FILESEP}java \
-	-classpath ${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar \
+	-classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
 	-Djava.security.properties=file:${TESTSRC}${FILESEP}Static.props \
 	StaticSignedProvFirst
 
diff --git a/jdk/test/java/util/Collection/BiggernYours.java b/jdk/test/java/util/Collection/BiggernYours.java
index de3a417ecde..a9cb59c007d 100644
--- a/jdk/test/java/util/Collection/BiggernYours.java
+++ b/jdk/test/java/util/Collection/BiggernYours.java
@@ -178,6 +178,11 @@ public class BiggernYours {
             new ConcurrentLinkedQueue() {
                 public int size() {return randomize(super.size());}});
 
+//         testCollections(
+//             new LinkedTransferQueue(),
+//             new LinkedTransferQueue() {
+//                 public int size() {return randomize(super.size());}});
+
         testCollections(
             new LinkedBlockingQueue(),
             new LinkedBlockingQueue() {
diff --git a/jdk/test/java/util/Collection/IteratorAtEnd.java b/jdk/test/java/util/Collection/IteratorAtEnd.java
index 985a006d878..ff8ae97c563 100644
--- a/jdk/test/java/util/Collection/IteratorAtEnd.java
+++ b/jdk/test/java/util/Collection/IteratorAtEnd.java
@@ -49,6 +49,7 @@ public class IteratorAtEnd {
         testCollection(new LinkedBlockingQueue());
         testCollection(new ArrayBlockingQueue(100));
         testCollection(new ConcurrentLinkedQueue());
+//         testCollection(new LinkedTransferQueue());
 
         testMap(new HashMap());
         testMap(new Hashtable());
diff --git a/jdk/test/java/util/Collection/MOAT.java b/jdk/test/java/util/Collection/MOAT.java
index f9d30f56217..0b4fc6a3f2c 100644
--- a/jdk/test/java/util/Collection/MOAT.java
+++ b/jdk/test/java/util/Collection/MOAT.java
@@ -76,6 +76,7 @@ public class MOAT {
         testCollection(new LinkedBlockingQueue<Integer>(20));
         testCollection(new LinkedBlockingDeque<Integer>(20));
         testCollection(new ConcurrentLinkedQueue<Integer>());
+//         testCollection(new LinkedTransferQueue<Integer>());
         testCollection(new ConcurrentSkipListSet<Integer>());
         testCollection(Arrays.asList(new Integer(42)));
         testCollection(Arrays.asList(1,2,3));
@@ -161,6 +162,7 @@ public class MOAT {
         equal(c.toString(),"[]");
         equal(c.toArray().length, 0);
         equal(c.toArray(new Object[0]).length, 0);
+        check(c.toArray(new Object[]{42})[0] == null);
 
         Object[] a = new Object[1]; a[0] = Boolean.TRUE;
         equal(c.toArray(a), a);
@@ -426,6 +428,36 @@ public class MOAT {
         q.poll();
         equal(q.size(), 4);
         checkFunctionalInvariants(q);
+        if ((q instanceof LinkedBlockingQueue) ||
+            (q instanceof LinkedBlockingDeque) ||
+            (q instanceof ConcurrentLinkedQueue)) {
+            testQueueIteratorRemove(q);
+        }
+    }
+
+    private static void testQueueIteratorRemove(Queue<Integer> q) {
+        System.err.printf("testQueueIteratorRemove %s%n",
+                          q.getClass().getSimpleName());
+        q.clear();
+        for (int i = 0; i < 5; i++)
+            q.add(i);
+        Iterator<Integer> it = q.iterator();
+        check(it.hasNext());
+        for (int i = 3; i >= 0; i--)
+            q.remove(i);
+        equal(it.next(), 0);
+        equal(it.next(), 4);
+
+        q.clear();
+        for (int i = 0; i < 5; i++)
+            q.add(i);
+        it = q.iterator();
+        equal(it.next(), 0);
+        check(it.hasNext());
+        for (int i = 1; i < 4; i++)
+            q.remove(i);
+        equal(it.next(), 1);
+        equal(it.next(), 4);
     }
 
     private static void testList(final List<Integer> l) {
@@ -451,6 +483,11 @@ public class MOAT {
     }
 
     private static void testCollection(Collection<Integer> c) {
+        try { testCollection1(c); }
+        catch (Throwable t) { unexpected(t); }
+    }
+
+    private static void testCollection1(Collection<Integer> c) {
 
         System.out.println("\n==> " + c.getClass().getName());
 
diff --git a/jdk/test/java/util/Collections/RacingCollections.java b/jdk/test/java/util/Collections/RacingCollections.java
index 22f88675cd6..32e41cf8b14 100644
--- a/jdk/test/java/util/Collections/RacingCollections.java
+++ b/jdk/test/java/util/Collections/RacingCollections.java
@@ -234,6 +234,7 @@ public class RacingCollections {
         List<Queue<Integer>> list =
             new ArrayList<Queue<Integer>>(newConcurrentDeques());
         list.add(new LinkedBlockingQueue<Integer>(10));
+//         list.add(new LinkedTransferQueue<Integer>());
         return list;
     }
 
diff --git a/jdk/test/java/util/Formatter/Basic-X.java b/jdk/test/java/util/Formatter/Basic-X.java
index 4677062cc14..2469417d256 100644
--- a/jdk/test/java/util/Formatter/Basic-X.java
+++ b/jdk/test/java/util/Formatter/Basic-X.java
@@ -486,6 +486,10 @@ public class Basic$Type$ extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/Basic.java b/jdk/test/java/util/Formatter/Basic.java
index 3a957b2f4fa..e973b186842 100644
--- a/jdk/test/java/util/Formatter/Basic.java
+++ b/jdk/test/java/util/Formatter/Basic.java
@@ -25,7 +25,7 @@
  * @summary Unit test for formatter
  * @bug 4906370 4962433 4973103 4989961 5005818 5031150 4970931 4989491 5002937
  *      5005104 5007745 5061412 5055180 5066788 5088703 6317248 6318369 6320122
- *      6344623 6369500 6534606 6282094 6286592 6476425
+ *      6344623 6369500 6534606 6282094 6286592 6476425 5063507
  *
  * @run shell/timeout=240 Basic.sh
  */
diff --git a/jdk/test/java/util/Formatter/BasicBigDecimal.java b/jdk/test/java/util/Formatter/BasicBigDecimal.java
index da96391384c..7f49988ee9d 100644
--- a/jdk/test/java/util/Formatter/BasicBigDecimal.java
+++ b/jdk/test/java/util/Formatter/BasicBigDecimal.java
@@ -486,6 +486,10 @@ public class BasicBigDecimal extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicBigInteger.java b/jdk/test/java/util/Formatter/BasicBigInteger.java
index 4bba5a0fbe4..c7b3bc56002 100644
--- a/jdk/test/java/util/Formatter/BasicBigInteger.java
+++ b/jdk/test/java/util/Formatter/BasicBigInteger.java
@@ -486,6 +486,10 @@ public class BasicBigInteger extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicBoolean.java b/jdk/test/java/util/Formatter/BasicBoolean.java
index ea60e388652..d626fdaba1d 100644
--- a/jdk/test/java/util/Formatter/BasicBoolean.java
+++ b/jdk/test/java/util/Formatter/BasicBoolean.java
@@ -486,6 +486,10 @@ public class BasicBoolean extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicBooleanObject.java b/jdk/test/java/util/Formatter/BasicBooleanObject.java
index b4fbabb76b8..b0a3ab3694d 100644
--- a/jdk/test/java/util/Formatter/BasicBooleanObject.java
+++ b/jdk/test/java/util/Formatter/BasicBooleanObject.java
@@ -486,6 +486,10 @@ public class BasicBooleanObject extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicByte.java b/jdk/test/java/util/Formatter/BasicByte.java
index deaf37957e5..8c630445459 100644
--- a/jdk/test/java/util/Formatter/BasicByte.java
+++ b/jdk/test/java/util/Formatter/BasicByte.java
@@ -486,6 +486,10 @@ public class BasicByte extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicByteObject.java b/jdk/test/java/util/Formatter/BasicByteObject.java
index 06eb68ebd27..b2563784ee8 100644
--- a/jdk/test/java/util/Formatter/BasicByteObject.java
+++ b/jdk/test/java/util/Formatter/BasicByteObject.java
@@ -486,6 +486,10 @@ public class BasicByteObject extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicChar.java b/jdk/test/java/util/Formatter/BasicChar.java
index 5ada7b166e7..cec8b76f58d 100644
--- a/jdk/test/java/util/Formatter/BasicChar.java
+++ b/jdk/test/java/util/Formatter/BasicChar.java
@@ -486,6 +486,10 @@ public class BasicChar extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicCharObject.java b/jdk/test/java/util/Formatter/BasicCharObject.java
index 1e7d05d543f..4d1845977e3 100644
--- a/jdk/test/java/util/Formatter/BasicCharObject.java
+++ b/jdk/test/java/util/Formatter/BasicCharObject.java
@@ -486,6 +486,10 @@ public class BasicCharObject extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicDateTime.java b/jdk/test/java/util/Formatter/BasicDateTime.java
index fd42da06f70..b30709d5465 100644
--- a/jdk/test/java/util/Formatter/BasicDateTime.java
+++ b/jdk/test/java/util/Formatter/BasicDateTime.java
@@ -486,6 +486,10 @@ public class BasicDateTime extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicDouble.java b/jdk/test/java/util/Formatter/BasicDouble.java
index d985b46b1a5..5d5021717ec 100644
--- a/jdk/test/java/util/Formatter/BasicDouble.java
+++ b/jdk/test/java/util/Formatter/BasicDouble.java
@@ -486,6 +486,10 @@ public class BasicDouble extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicDoubleObject.java b/jdk/test/java/util/Formatter/BasicDoubleObject.java
index 70dfd2929e5..1bbd67f18e9 100644
--- a/jdk/test/java/util/Formatter/BasicDoubleObject.java
+++ b/jdk/test/java/util/Formatter/BasicDoubleObject.java
@@ -486,6 +486,10 @@ public class BasicDoubleObject extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicFloat.java b/jdk/test/java/util/Formatter/BasicFloat.java
index 122b44f1e75..c7592107261 100644
--- a/jdk/test/java/util/Formatter/BasicFloat.java
+++ b/jdk/test/java/util/Formatter/BasicFloat.java
@@ -486,6 +486,10 @@ public class BasicFloat extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicFloatObject.java b/jdk/test/java/util/Formatter/BasicFloatObject.java
index 64c874cf2d5..c64bbb0f9d6 100644
--- a/jdk/test/java/util/Formatter/BasicFloatObject.java
+++ b/jdk/test/java/util/Formatter/BasicFloatObject.java
@@ -486,6 +486,10 @@ public class BasicFloatObject extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicInt.java b/jdk/test/java/util/Formatter/BasicInt.java
index 4010d2250e0..5e42b45f76d 100644
--- a/jdk/test/java/util/Formatter/BasicInt.java
+++ b/jdk/test/java/util/Formatter/BasicInt.java
@@ -486,6 +486,10 @@ public class BasicInt extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicIntObject.java b/jdk/test/java/util/Formatter/BasicIntObject.java
index fe41ea2964b..a9728b5bbf0 100644
--- a/jdk/test/java/util/Formatter/BasicIntObject.java
+++ b/jdk/test/java/util/Formatter/BasicIntObject.java
@@ -486,6 +486,10 @@ public class BasicIntObject extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicLong.java b/jdk/test/java/util/Formatter/BasicLong.java
index fe232f1978e..41a74163050 100644
--- a/jdk/test/java/util/Formatter/BasicLong.java
+++ b/jdk/test/java/util/Formatter/BasicLong.java
@@ -486,6 +486,10 @@ public class BasicLong extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicLongObject.java b/jdk/test/java/util/Formatter/BasicLongObject.java
index c99e0ba3c2a..c41c711ec7c 100644
--- a/jdk/test/java/util/Formatter/BasicLongObject.java
+++ b/jdk/test/java/util/Formatter/BasicLongObject.java
@@ -486,6 +486,10 @@ public class BasicLongObject extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicShort.java b/jdk/test/java/util/Formatter/BasicShort.java
index 39079e4ad1e..e2e4e4c44f8 100644
--- a/jdk/test/java/util/Formatter/BasicShort.java
+++ b/jdk/test/java/util/Formatter/BasicShort.java
@@ -486,6 +486,10 @@ public class BasicShort extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/Formatter/BasicShortObject.java b/jdk/test/java/util/Formatter/BasicShortObject.java
index e2dcc230174..48b33d18d85 100644
--- a/jdk/test/java/util/Formatter/BasicShortObject.java
+++ b/jdk/test/java/util/Formatter/BasicShortObject.java
@@ -486,6 +486,10 @@ public class BasicShortObject extends Basic {
         //---------------------------------------------------------------------
         tryCatch("%-s", MissingFormatWidthException.class);
         tryCatch("%--s", DuplicateFormatFlagsException.class);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, 0.5f);
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, "hello");
+        tryCatch("%#s", FormatFlagsConversionMismatchException.class, null);
 
         //---------------------------------------------------------------------
         // %h
diff --git a/jdk/test/java/util/PriorityQueue/RemoveContains.java b/jdk/test/java/util/PriorityQueue/RemoveContains.java
index e82e28d4b70..85c9d214c7f 100644
--- a/jdk/test/java/util/PriorityQueue/RemoveContains.java
+++ b/jdk/test/java/util/PriorityQueue/RemoveContains.java
@@ -69,6 +69,7 @@ public class RemoveContains {
         test(new ArrayBlockingQueue<String>(10));
         test(new LinkedBlockingQueue<String>(10));
         test(new LinkedBlockingDeque<String>(10));
+//         test(new LinkedTransferQueue<String>());
         test(new ArrayDeque<String>(10));
 
         System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
diff --git a/jdk/test/java/util/TimSort/ArrayBuilder.java b/jdk/test/java/util/TimSort/ArrayBuilder.java
new file mode 100644
index 00000000000..25194f6ca57
--- /dev/null
+++ b/jdk/test/java/util/TimSort/ArrayBuilder.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2009 Google Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.util.Random;
+import java.math.BigInteger;
+
+public enum ArrayBuilder {
+
+    // These seven are from  Tim's paper (listsort.txt)
+
+    RANDOM_INT {
+        public Object[] build(int len) {
+            Integer[] result = new Integer[len];
+            for (int i = 0; i < len; i++)
+                result[i] = rnd.nextInt();
+            return result;
+        }
+    },
+
+    DESCENDING_INT {
+        public Object[] build(int len) {
+            Integer[] result = new Integer[len];
+            for (int i = 0; i < len; i++)
+                result[i] = len - i;
+            return result;
+        }
+    },
+
+    ASCENDING_INT {
+        public Object[] build(int len) {
+            Integer[] result = new Integer[len];
+            for (int i = 0; i < len; i++)
+                result[i] = i;
+            return result;
+        }
+    },
+
+    ASCENDING_3_RND_EXCH_INT {
+        public Object[] build(int len) {
+            Integer[] result = new Integer[len];
+            for (int i = 0; i < len; i++)
+                result[i] = i;
+            for (int i = 0; i < 3; i++)
+                swap(result, rnd.nextInt(result.length),
+                             rnd.nextInt(result.length));
+            return result;
+        }
+    },
+
+    ASCENDING_10_RND_AT_END_INT {
+        public Object[] build(int len) {
+            Integer[] result = new Integer[len];
+            int endStart = len - 10;
+            for (int i = 0; i < endStart; i++)
+                result[i] = i;
+            for (int i = endStart; i < len; i++)
+                result[i] = rnd.nextInt(endStart + 10);
+            return result;
+        }
+    },
+
+    ALL_EQUAL_INT {
+        public Object[] build(int len) {
+            Integer[] result = new Integer[len];
+            for (int i = 0; i < len; i++)
+                result[i] = 666;
+            return result;
+        }
+    },
+
+    DUPS_GALORE_INT {
+        public Object[] build(int len) {
+            Integer[] result = new Integer[len];
+            for (int i = 0; i < len; i++)
+                result[i] = rnd.nextInt(4);
+            return result;
+        }
+    },
+
+    RANDOM_WITH_DUPS_INT {
+        public Object[] build(int len) {
+            Integer[] result = new Integer[len];
+            for (int i = 0; i < len; i++)
+                result[i] = rnd.nextInt(len);
+            return result;
+        }
+    },
+
+    PSEUDO_ASCENDING_STRING {
+        public String[] build(int len) {
+            String[] result = new String[len];
+            for (int i = 0; i < len; i++)
+                result[i] = Integer.toString(i);
+            return result;
+        }
+    },
+
+    RANDOM_BIGINT {
+        public BigInteger[] build(int len) {
+            BigInteger[] result = new BigInteger[len];
+            for (int i = 0; i < len; i++)
+                result[i] = HUGE.add(BigInteger.valueOf(rnd.nextInt(len)));
+            return result;
+        }
+    };
+
+    public abstract Object[] build(int len);
+
+    public void resetRandom() {
+        rnd = new Random(666);
+    }
+
+    private static Random rnd = new Random(666);
+
+    private static void swap(Object[] a, int i, int j) {
+        Object t = a[i];
+        a[i] = a[j];
+        a[j] = t;
+    }
+
+    private static BigInteger HUGE = BigInteger.ONE.shiftLeft(100);
+}
diff --git a/jdk/test/java/util/TimSort/README b/jdk/test/java/util/TimSort/README
new file mode 100644
index 00000000000..7add0be0a50
--- /dev/null
+++ b/jdk/test/java/util/TimSort/README
@@ -0,0 +1,4 @@
+This directory contains benchmark programs used to compare the
+performance of the TimSort algorithm against the historic 1997
+implementation of Arrays.sort.  Any future benchmarking will require
+minor modifications.
diff --git a/jdk/test/java/util/TimSort/SortPerf.java b/jdk/test/java/util/TimSort/SortPerf.java
new file mode 100644
index 00000000000..89b41bb7527
--- /dev/null
+++ b/jdk/test/java/util/TimSort/SortPerf.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2009 Google Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.util.Arrays;
+
+public class SortPerf {
+    private static final int NUM_SETS = 5;
+    private static final int[] lengths = { 10, 100, 1000, 10000, 1000000 };
+
+    // Returns the number of repetitions as a function of the list length
+    private static int reps(int n) {
+        return (int) (12000000 / (n * Math.log10(n)));
+    }
+
+    public static void main(String[] args) {
+        Sorter.warmup();
+
+        System.out.print("Strategy,Length");
+        for (Sorter sorter : Sorter.values())
+            System.out.print("," + sorter);
+        System.out.println();
+
+        for (ArrayBuilder ab : ArrayBuilder.values()) {
+            for (int n : lengths) {
+                System.out.printf("%s,%d", ab, n);
+                int reps = reps(n);
+                Object[] proto = ab.build(n);
+                for (Sorter sorter : Sorter.values()) {
+                    double minTime = Double.POSITIVE_INFINITY;
+                    for (int set = 0; set < NUM_SETS; set++) {
+                        long startTime = System.nanoTime();
+                        for (int k = 0; k < reps; k++) {
+                            Object[] a = proto.clone();
+                            sorter.sort(a);
+                        }
+                        long endTime = System.nanoTime();
+                        double time = (endTime - startTime) / (1000000. * reps);
+                        minTime = Math.min(minTime, time);
+                    }
+                    System.out.printf(",%5f", minTime);
+                }
+                System.out.println();
+            }
+        }
+    }
+}
diff --git a/jdk/test/java/util/TimSort/Sorter.java b/jdk/test/java/util/TimSort/Sorter.java
new file mode 100644
index 00000000000..4867996490f
--- /dev/null
+++ b/jdk/test/java/util/TimSort/Sorter.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009 Google Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.util.*;
+
+public enum Sorter {
+    TIMSORT {
+        public void sort(Object[] array) {
+            ComparableTimSort.sort(array);
+        }
+    },
+    MERGESORT {
+        public void sort(Object[] array) {
+            Arrays.sort(array);
+        }
+    };
+
+    public abstract void sort(Object[] array);
+
+    public static void warmup() {
+        System.out.println("start warm up");
+        Integer[] gold = new Integer[10000];
+        Random random = new java.util.Random();
+        for (int i=0; i < gold.length; i++)
+            gold[i] = random.nextInt();
+
+        for (int i=0; i < 10000; i++) {
+            for (Sorter s : values()) {
+                Integer[] test= gold.clone();
+                s.sort(test);
+            }
+        }
+        System.out.println("  end warm up");
+    }
+}
diff --git a/jdk/test/java/util/TimeZone/ListTimeZones.java b/jdk/test/java/util/TimeZone/ListTimeZones.java
new file mode 100644
index 00000000000..88e0e866ce2
--- /dev/null
+++ b/jdk/test/java/util/TimeZone/ListTimeZones.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6851214
+ * @summary Allow 24:00 as a valid end/start DST time stamp
+ * @run main ListTimeZones
+ */
+
+import java.util.*;
+
+public class ListTimeZones{
+  public static void main(String[] args){
+    Date date = new Date();
+    String TimeZoneIds[] = TimeZone.getAvailableIDs();
+    for(int i = 0; i < TimeZoneIds.length; i++){
+      TimeZone tz = TimeZone.getTimeZone(TimeZoneIds[i]);
+      Calendar calendar = new GregorianCalendar(tz);
+      String calString = calendar.toString();
+    }
+  }
+}
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
index 42388add7ae..210f43c0d9d 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
@@ -75,10 +75,12 @@ public class CancelledProducerConsumerLoops {
    }
 
     static void oneRun(BlockingQueue<Integer> q, int npairs, int iters) throws Exception {
+        if (print)
+            System.out.printf("%-18s", q.getClass().getSimpleName());
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         CyclicBarrier barrier = new CyclicBarrier(npairs * 2 + 1, timer);
-        Future[] prods = new Future[npairs];
-        Future[] cons = new Future[npairs];
+        Future<?>[] prods = new Future<?>[npairs];
+        Future<?>[] cons  = new Future<?>[npairs];
 
         for (int i = 0; i < npairs; ++i) {
             prods[i] = pool.submit(new Producer(q, barrier, iters));
@@ -119,21 +121,13 @@ public class CancelledProducerConsumerLoops {
 
     static void oneTest(int pairs, int iters) throws Exception {
 
-        if (print)
-            System.out.print("ArrayBlockingQueue      ");
         oneRun(new ArrayBlockingQueue<Integer>(CAPACITY), pairs, iters);
-
-        if (print)
-            System.out.print("LinkedBlockingQueue     ");
         oneRun(new LinkedBlockingQueue<Integer>(CAPACITY), pairs, iters);
-
-        if (print)
-            System.out.print("SynchronousQueue        ");
+        oneRun(new LinkedBlockingDeque<Integer>(CAPACITY), pairs, iters);
+//         oneRun(new LinkedTransferQueue<Integer>(), pairs, iters);
         oneRun(new SynchronousQueue<Integer>(), pairs, iters / 8);
 
         /* PriorityBlockingQueue is unbounded
-        if (print)
-            System.out.print("PriorityBlockingQueue   ");
         oneRun(new PriorityBlockingQueue<Integer>(iters / 2 * pairs), pairs, iters / 4);
         */
     }
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java b/jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java
index 696b0960fc0..55589bb7391 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/Interrupt.java
@@ -66,7 +66,8 @@ public class Interrupt {
     static void testQueue(final BlockingQueue<Object> q) {
         try {
             final BlockingDeque<Object> deq =
-                q instanceof BlockingDeque ? (BlockingDeque<Object>) q : null;
+                (q instanceof BlockingDeque<?>) ?
+                (BlockingDeque<Object>) q : null;
             q.clear();
             List<Fun> fs = new ArrayList<Fun>();
             fs.add(new Fun() { void f() throws Throwable
@@ -107,7 +108,10 @@ public class Interrupt {
                         { deq.offerLast(1, 7, SECONDS); }});
             }
             checkInterrupted(fs);
-        } catch (Throwable t) { unexpected(t); }
+        } catch (Throwable t) {
+          System.out.printf("Failed: %s%n", q.getClass().getSimpleName());
+          unexpected(t);
+        }
     }
 
     private static void realMain(final String[] args) throws Throwable {
diff --git a/jdk/test/java/util/concurrent/LinkedBlockingQueue/LastElement.java b/jdk/test/java/util/concurrent/BlockingQueue/LastElement.java
similarity index 67%
rename from jdk/test/java/util/concurrent/LinkedBlockingQueue/LastElement.java
rename to jdk/test/java/util/concurrent/BlockingQueue/LastElement.java
index 58918ee9972..a4c27872f34 100644
--- a/jdk/test/java/util/concurrent/LinkedBlockingQueue/LastElement.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/LastElement.java
@@ -32,44 +32,18 @@ import java.util.*;
 import java.util.concurrent.*;
 
 public class LastElement {
-    static volatile int passed = 0, failed = 0;
-
-    static void fail(String msg) {
-        failed++;
-        new Exception(msg).printStackTrace();
-    }
-
-    static void pass() {
-        passed++;
-    }
-
-    static void unexpected(Throwable t) {
-        failed++;
-        t.printStackTrace();
-    }
-
-    static void check(boolean condition, String msg) {
-        if (condition)
-            passed++;
-        else
-            fail(msg);
-    }
-
-    static void check(boolean condition) {
-        check(condition, "Assertion failure");
-    }
-
-    public static void main(String[] args) throws Throwable {
+    void test(String[] args) throws Throwable {
         testQueue(new LinkedBlockingQueue<Integer>());
-        // Uncomment when LinkedBlockingDeque is integrated
-        //testQueue(new LinkedBlockingDeque<Integer>());
-        testQueue(new ArrayBlockingQueue<Integer>(10));
+        testQueue(new LinkedBlockingDeque<Integer>());
+        testQueue(new ArrayBlockingQueue<Integer>(10, true));
+        testQueue(new ArrayBlockingQueue<Integer>(10, false));
+//         testQueue(new LinkedTransferQueue<Integer>());
 
         System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
         if (failed > 0) throw new Exception("Some tests failed");
     }
 
-    private static void testQueue(BlockingQueue<Integer> q) throws Throwable {
+    void testQueue(BlockingQueue<Integer> q) throws Throwable {
         Integer one = 1;
         Integer two = 2;
         Integer three = 3;
@@ -102,4 +76,21 @@ public class LastElement {
         catch (Throwable t) {unexpected(t);}
         check(q.isEmpty() && q.size() == 0);
     }
+
+    //--------------------- Infrastructure ---------------------------
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        new LastElement().instanceMain(args);}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
 }
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java
index 53fc050d784..0e0fd82430e 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java
@@ -77,6 +77,7 @@ public class MultipleProducersSingleConsumerLoops {
         print = true;
 
         for (int i = 1; i <= maxProducers; i += (i+1) >>> 1) {
+            System.out.println("----------------------------------------");
             System.out.println("Producers:" + i);
             oneTest(i, iters);
             Thread.sleep(100);
@@ -87,29 +88,20 @@ public class MultipleProducersSingleConsumerLoops {
    }
 
     static void oneTest(int producers, int iters) throws Exception {
-        if (print)
-            System.out.print("ArrayBlockingQueue      ");
         oneRun(new ArrayBlockingQueue<Integer>(CAPACITY), producers, iters);
-
-        if (print)
-            System.out.print("LinkedBlockingQueue     ");
         oneRun(new LinkedBlockingQueue<Integer>(CAPACITY), producers, iters);
+        oneRun(new LinkedBlockingDeque<Integer>(CAPACITY), producers, iters);
+//         oneRun(new LinkedTransferQueue<Integer>(), producers, iters);
 
         // Don't run PBQ since can legitimately run out of memory
         //        if (print)
         //            System.out.print("PriorityBlockingQueue   ");
         //        oneRun(new PriorityBlockingQueue<Integer>(), producers, iters);
 
-        if (print)
-            System.out.print("SynchronousQueue        ");
         oneRun(new SynchronousQueue<Integer>(), producers, iters);
-
         if (print)
-            System.out.print("SynchronousQueue(fair)  ");
+            System.out.println("fair implementations:");
         oneRun(new SynchronousQueue<Integer>(true), producers, iters);
-
-        if (print)
-            System.out.print("ArrayBlockingQueue(fair)");
         oneRun(new ArrayBlockingQueue<Integer>(CAPACITY, true), producers, iters);
     }
 
@@ -174,6 +166,8 @@ public class MultipleProducersSingleConsumerLoops {
     }
 
     static void oneRun(BlockingQueue<Integer> q, int nproducers, int iters) throws Exception {
+        if (print)
+            System.out.printf("%-18s", q.getClass().getSimpleName());
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         CyclicBarrier barrier = new CyclicBarrier(nproducers + 2, timer);
         for (int i = 0; i < nproducers; ++i) {
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java
new file mode 100644
index 00000000000..1721b916dce
--- /dev/null
+++ b/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java
@@ -0,0 +1,184 @@
+/*
+ * 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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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/licenses/publicdomain
+ */
+
+/*
+ * @test
+ * @bug 6805775 6815766
+ * @run main OfferDrainToLoops 300
+ * @summary Test concurrent offer vs. drainTo
+ */
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+@SuppressWarnings({"unchecked", "rawtypes", "deprecation"})
+public class OfferDrainToLoops {
+    final long testDurationMillisDefault = 10L * 1000L;
+    final long testDurationMillis;
+
+    OfferDrainToLoops(String[] args) {
+        testDurationMillis = (args.length > 0) ?
+            Long.valueOf(args[0]) : testDurationMillisDefault;
+    }
+
+    void checkNotContainsNull(Iterable it) {
+        for (Object x : it)
+            check(x != null);
+    }
+
+    void test(String[] args) throws Throwable {
+        test(new LinkedBlockingQueue());
+        test(new LinkedBlockingQueue(2000));
+        test(new LinkedBlockingDeque());
+        test(new LinkedBlockingDeque(2000));
+        test(new ArrayBlockingQueue(2000));
+//         test(new LinkedTransferQueue());
+    }
+
+    Random getRandom() {
+        return new Random();
+        // return ThreadLocalRandom.current();
+    }
+
+    void test(final BlockingQueue q) throws Throwable {
+        System.out.println(q.getClass().getSimpleName());
+        final long testDurationNanos = testDurationMillis * 1000L * 1000L;
+        final long quittingTimeNanos = System.nanoTime() + testDurationNanos;
+        final long timeoutMillis = 10L * 1000L;
+
+        /** Poor man's bounded buffer. */
+        final AtomicLong approximateCount = new AtomicLong(0L);
+
+        abstract class CheckedThread extends Thread {
+            CheckedThread(String name) {
+                super(name);
+                setDaemon(true);
+                start();
+            }
+            /** Polls for quitting time. */
+            protected boolean quittingTime() {
+                return System.nanoTime() - quittingTimeNanos > 0;
+            }
+            /** Polls occasionally for quitting time. */
+            protected boolean quittingTime(long i) {
+                return (i % 1024) == 0 && quittingTime();
+            }
+            abstract protected void realRun();
+            public void run() {
+                try { realRun(); } catch (Throwable t) { unexpected(t); }
+            }
+        }
+
+        Thread offerer = new CheckedThread("offerer") {
+            protected void realRun() {
+                long c = 0;
+                for (long i = 0; ! quittingTime(i); i++) {
+                    if (q.offer(c)) {
+                        if ((++c % 1024) == 0) {
+                            approximateCount.getAndAdd(1024);
+                            while (approximateCount.get() > 10000)
+                                Thread.yield();
+                        }
+                    } else {
+                        Thread.yield();
+                    }}}};
+
+        Thread drainer = new CheckedThread("drainer") {
+            protected void realRun() {
+                final Random rnd = getRandom();
+                while (! quittingTime()) {
+                    List list = new ArrayList();
+                    int n = rnd.nextBoolean() ?
+                        q.drainTo(list) :
+                        q.drainTo(list, 100);
+                    approximateCount.getAndAdd(-n);
+                    equal(list.size(), n);
+                    for (int j = 0; j < n - 1; j++)
+                        equal((Long) list.get(j) + 1L, list.get(j + 1));
+                    Thread.yield();
+                }
+                q.clear();
+                approximateCount.set(0); // Releases waiting offerer thread
+            }};
+
+        Thread scanner = new CheckedThread("scanner") {
+            protected void realRun() {
+                final Random rnd = getRandom();
+                while (! quittingTime()) {
+                    switch (rnd.nextInt(3)) {
+                    case 0: checkNotContainsNull(q); break;
+                    case 1: q.size(); break;
+                    case 2:
+                        Long[] a = (Long[]) q.toArray(new Long[0]);
+                        int n = a.length;
+                        for (int j = 0; j < n - 1; j++) {
+                            check(a[j] < a[j+1]);
+                            check(a[j] != null);
+                        }
+                        break;
+                    }
+                    Thread.yield();
+                }}};
+
+        for (Thread thread : new Thread[] { offerer, drainer, scanner }) {
+            thread.join(timeoutMillis + testDurationMillis);
+            if (thread.isAlive()) {
+                System.err.printf("Hung thread: %s%n", thread.getName());
+                failed++;
+                for (StackTraceElement e : thread.getStackTrace())
+                    System.err.println(e);
+                // Kludge alert
+                thread.stop();
+                thread.join(timeoutMillis);
+            }
+        }
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        new OfferDrainToLoops(args).instanceMain(args);}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+}
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/PollMemoryLeak.java b/jdk/test/java/util/concurrent/BlockingQueue/PollMemoryLeak.java
index be507061cda..9e47162c6c2 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/PollMemoryLeak.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/PollMemoryLeak.java
@@ -46,6 +46,7 @@ public class PollMemoryLeak {
     public static void main(String[] args) throws InterruptedException {
         final BlockingQueue[] qs = {
             new LinkedBlockingQueue(10),
+//             new LinkedTransferQueue(),
             new ArrayBlockingQueue(10),
             new SynchronousQueue(),
             new SynchronousQueue(true),
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
index 78869149a75..b40c49f3688 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
@@ -77,7 +77,8 @@ public class ProducerConsumerLoops {
         print = true;
 
         for (int i = 1; i <= maxPairs; i += (i+1) >>> 1) {
-            System.out.println("Pairs:" + i);
+            System.out.println("----------------------------------------");
+            System.out.println("Pairs: " + i);
             oneTest(i, iters);
             Thread.sleep(100);
         }
@@ -87,28 +88,17 @@ public class ProducerConsumerLoops {
    }
 
     static void oneTest(int pairs, int iters) throws Exception {
-        if (print)
-            System.out.print("ArrayBlockingQueue      ");
         oneRun(new ArrayBlockingQueue<Integer>(CAPACITY), pairs, iters);
-
-        if (print)
-            System.out.print("LinkedBlockingQueue     ");
         oneRun(new LinkedBlockingQueue<Integer>(CAPACITY), pairs, iters);
-
-        if (print)
-            System.out.print("PriorityBlockingQueue   ");
+        oneRun(new LinkedBlockingDeque<Integer>(CAPACITY), pairs, iters);
+//         oneRun(new LinkedTransferQueue<Integer>(), pairs, iters);
         oneRun(new PriorityBlockingQueue<Integer>(), pairs, iters);
-
-        if (print)
-            System.out.print("SynchronousQueue        ");
         oneRun(new SynchronousQueue<Integer>(), pairs, iters);
 
         if (print)
-            System.out.print("SynchronousQueue(fair)  ");
-        oneRun(new SynchronousQueue<Integer>(true), pairs, iters);
+            System.out.println("fair implementations:");
 
-        if (print)
-            System.out.print("ArrayBlockingQueue(fair)");
+        oneRun(new SynchronousQueue<Integer>(true), pairs, iters);
         oneRun(new ArrayBlockingQueue<Integer>(CAPACITY, true), pairs, iters);
     }
 
@@ -174,6 +164,8 @@ public class ProducerConsumerLoops {
     }
 
     static void oneRun(BlockingQueue<Integer> q, int npairs, int iters) throws Exception {
+        if (print)
+            System.out.printf("%-18s", q.getClass().getSimpleName());
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         CyclicBarrier barrier = new CyclicBarrier(npairs * 2 + 1, timer);
         for (int i = 0; i < npairs; ++i) {
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java
index b0fffbf5cf8..8c718b97602 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java
@@ -63,7 +63,8 @@ public class SingleProducerMultipleConsumerLoops {
         print = true;
 
         for (int i = 1; i <= maxConsumers; i += (i+1) >>> 1) {
-            System.out.println("Consumers:" + i);
+            System.out.println("----------------------------------------");
+            System.out.println("Consumers: " + i);
             oneTest(i, iters);
             Thread.sleep(100);
         }
@@ -73,28 +74,15 @@ public class SingleProducerMultipleConsumerLoops {
    }
 
     static void oneTest(int consumers, int iters) throws Exception {
-        if (print)
-            System.out.print("ArrayBlockingQueue      ");
         oneRun(new ArrayBlockingQueue<Integer>(CAPACITY), consumers, iters);
-
-        if (print)
-            System.out.print("LinkedBlockingQueue     ");
         oneRun(new LinkedBlockingQueue<Integer>(CAPACITY), consumers, iters);
-
-        if (print)
-            System.out.print("PriorityBlockingQueue   ");
+        oneRun(new LinkedBlockingDeque<Integer>(CAPACITY), consumers, iters);
+//         oneRun(new LinkedTransferQueue<Integer>(), consumers, iters);
         oneRun(new PriorityBlockingQueue<Integer>(), consumers, iters);
-
-        if (print)
-            System.out.print("SynchronousQueue        ");
         oneRun(new SynchronousQueue<Integer>(), consumers, iters);
-
         if (print)
-            System.out.print("SynchronousQueue(fair)  ");
+            System.out.println("fair implementations:");
         oneRun(new SynchronousQueue<Integer>(true), consumers, iters);
-
-        if (print)
-            System.out.print("ArrayBlockingQueue(fair)");
         oneRun(new ArrayBlockingQueue<Integer>(CAPACITY, true), consumers, iters);
     }
 
@@ -163,6 +151,8 @@ public class SingleProducerMultipleConsumerLoops {
     }
 
     static void oneRun(BlockingQueue<Integer> q, int nconsumers, int iters) throws Exception {
+        if (print)
+            System.out.printf("%-18s", q.getClass().getSimpleName());
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         CyclicBarrier barrier = new CyclicBarrier(nconsumers + 2, timer);
         pool.execute(new Producer(q, barrier, iters * nconsumers));
diff --git a/jdk/test/java/util/concurrent/ConcurrentLinkedQueue/ConcurrentQueueLoops.java b/jdk/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java
similarity index 60%
rename from jdk/test/java/util/concurrent/ConcurrentLinkedQueue/ConcurrentQueueLoops.java
rename to jdk/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java
index b0c4b68e10e..9586d3d4a53 100644
--- a/jdk/test/java/util/concurrent/ConcurrentLinkedQueue/ConcurrentQueueLoops.java
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java
@@ -33,9 +33,8 @@
 
 /*
  * @test
- * @bug 4486658
- * @compile -source 1.5 ConcurrentQueueLoops.java
- * @run main/timeout=230 ConcurrentQueueLoops
+ * @bug 4486658 6785442
+ * @run main ConcurrentQueueLoops 8 123456
  * @summary Checks that a set of threads can repeatedly get and modify items
  */
 
@@ -44,34 +43,65 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 public class ConcurrentQueueLoops {
-    static final ExecutorService pool = Executors.newCachedThreadPool();
-    static AtomicInteger totalItems;
-    static boolean print = false;
+    ExecutorService pool;
+    AtomicInteger totalItems;
+    boolean print;
 
-    public static void main(String[] args) throws Exception {
-        int maxStages = 8;
-        int items = 100000;
+    // Suitable for benchmarking.  Overriden by args[0] for testing.
+    int maxStages = 20;
 
+    // Suitable for benchmarking.  Overriden by args[1] for testing.
+    int items = 1024 * 1024;
+
+    Collection<Queue<Integer>> concurrentQueues() {
+        List<Queue<Integer>> queues = new ArrayList<Queue<Integer>>();
+        queues.add(new ConcurrentLinkedQueue<Integer>());
+        queues.add(new ArrayBlockingQueue<Integer>(items, false));
+        //queues.add(new ArrayBlockingQueue<Integer>(count, true));
+        queues.add(new LinkedBlockingQueue<Integer>());
+        queues.add(new LinkedBlockingDeque<Integer>());
+//         queues.add(new LinkedTransferQueue<Integer>());
+
+        // Following additional implementations are available from:
+        // http://gee.cs.oswego.edu/dl/concurrency-interest/index.html
+        // queues.add(new SynchronizedLinkedListQueue<Integer>());
+
+        // Avoid "first fast, second slow" benchmark effect.
+        Collections.shuffle(queues);
+        return queues;
+    }
+
+    void test(String[] args) throws Throwable {
         if (args.length > 0)
             maxStages = Integer.parseInt(args[0]);
+        if (args.length > 1)
+            items = Integer.parseInt(args[1]);
+
+        for (Queue<Integer> queue : concurrentQueues())
+            test(queue);
+    }
+
+    void test(final Queue<Integer> q) throws Throwable {
+        System.out.println(q.getClass().getSimpleName());
+        pool = Executors.newCachedThreadPool();
+        print = false;
 
         print = false;
         System.out.println("Warmup...");
-        oneRun(1, items);
-        Thread.sleep(100);
-        oneRun(1, items);
+        oneRun(1, items, q);
+        //Thread.sleep(100);
+        oneRun(3, items, q);
         Thread.sleep(100);
         print = true;
 
         for (int i = 1; i <= maxStages; i += (i+1) >>> 1) {
-            oneRun(i, items);
+            oneRun(i, items, q);
         }
         pool.shutdown();
-        if (! pool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS))
-            throw new Error();
+        check(pool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS));
    }
 
-    static class Stage implements Callable<Integer> {
+    class Stage implements Callable<Integer> {
         final Queue<Integer> queue;
         final CyclicBarrier barrier;
         int items;
@@ -110,15 +140,11 @@ public class ConcurrentQueueLoops {
                 }
                 return new Integer(l);
             }
-            catch (Exception ie) {
-                ie.printStackTrace();
-                throw new Error("Call loop failed");
-            }
+            catch (Throwable t) { unexpected(t); return null; }
         }
     }
 
-    static void oneRun(int n, int items) throws Exception {
-        Queue<Integer> q = new ConcurrentLinkedQueue<Integer>();
+    void oneRun(int n, int items, final Queue<Integer> q) throws Exception {
         LoopHelpers.BarrierTimer timer = new LoopHelpers.BarrierTimer();
         CyclicBarrier barrier = new CyclicBarrier(n + 1, timer);
         totalItems = new AtomicInteger(n * items);
@@ -141,6 +167,22 @@ public class ConcurrentQueueLoops {
             System.out.println(LoopHelpers.rightJustify(time / (items * n)) + " ns per item");
         if (total == 0) // avoid overoptimization
             System.out.println("useless result: " + total);
-
     }
+
+    //--------------------- Infrastructure ---------------------------
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        new ConcurrentQueueLoops().instanceMain(args);}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
 }
diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/GCRetention.java b/jdk/test/java/util/concurrent/ConcurrentQueues/GCRetention.java
new file mode 100644
index 00000000000..c2ade907e9e
--- /dev/null
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/GCRetention.java
@@ -0,0 +1,156 @@
+/*
+ * 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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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/licenses/publicdomain
+ */
+/*
+ * @test
+ * @bug 6785442
+ * @summary Benchmark that tries to GC-tenure head, followed by
+ * many add/remove operations.
+ * @run main GCRetention 12345
+ */
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+// import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.LinkedList;
+import java.util.PriorityQueue;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.Map;
+
+public class GCRetention {
+    // Suitable for benchmarking.  Overriden by args[0] for testing.
+    int count = 1024 * 1024;
+
+    final Map<String,String> results = new ConcurrentHashMap<String,String>();
+
+    Collection<Queue<Boolean>> queues() {
+        List<Queue<Boolean>> queues = new ArrayList<Queue<Boolean>>();
+        queues.add(new ConcurrentLinkedQueue<Boolean>());
+        queues.add(new ArrayBlockingQueue<Boolean>(count, false));
+        queues.add(new ArrayBlockingQueue<Boolean>(count, true));
+        queues.add(new LinkedBlockingQueue<Boolean>());
+        queues.add(new LinkedBlockingDeque<Boolean>());
+        queues.add(new PriorityBlockingQueue<Boolean>());
+        queues.add(new PriorityQueue<Boolean>());
+        queues.add(new LinkedList<Boolean>());
+//         queues.add(new LinkedTransferQueue<Boolean>());
+
+        // Following additional implementations are available from:
+        // http://gee.cs.oswego.edu/dl/concurrency-interest/index.html
+        // queues.add(new SynchronizedLinkedListQueue<Boolean>());
+
+        // Avoid "first fast, second slow" benchmark effect.
+        Collections.shuffle(queues);
+        return queues;
+    }
+
+    void prettyPrintResults() {
+        List<String> classNames = new ArrayList<String>(results.keySet());
+        Collections.sort(classNames);
+        int maxClassNameLength = 0;
+        int maxNanosLength = 0;
+        for (String name : classNames) {
+            if (maxClassNameLength < name.length())
+                maxClassNameLength = name.length();
+            if (maxNanosLength < results.get(name).length())
+                maxNanosLength = results.get(name).length();
+        }
+        String format = String.format("%%%ds %%%ds nanos/item%%n",
+                                      maxClassNameLength, maxNanosLength);
+        for (String name : classNames)
+            System.out.printf(format, name, results.get(name));
+    }
+
+    void test(String[] args) {
+        if (args.length > 0)
+            count = Integer.valueOf(args[0]);
+        // Warmup
+        for (Queue<Boolean> queue : queues())
+            test(queue);
+        results.clear();
+        for (Queue<Boolean> queue : queues())
+            test(queue);
+
+        prettyPrintResults();
+    }
+
+    void test(Queue<Boolean> q) {
+        long t0 = System.nanoTime();
+        for (int i = 0; i < count; i++)
+            check(q.add(Boolean.TRUE));
+        System.gc();
+        System.gc();
+        Boolean x;
+        while ((x = q.poll()) != null)
+            equal(x, Boolean.TRUE);
+        check(q.isEmpty());
+
+        for (int i = 0; i < 10 * count; i++) {
+            for (int k = 0; k < 3; k++)
+                check(q.add(Boolean.TRUE));
+            for (int k = 0; k < 3; k++)
+                if (q.poll() != Boolean.TRUE)
+                    fail();
+        }
+        check(q.isEmpty());
+
+        String className = q.getClass().getSimpleName();
+        long elapsed = System.nanoTime() - t0;
+        int nanos = (int) ((double) elapsed / (10 * 3 * count));
+        results.put(className, String.valueOf(nanos));
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        new GCRetention().instanceMain(args);}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+}
diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java b/jdk/test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java
new file mode 100644
index 00000000000..c767fa422ab
--- /dev/null
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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/licenses/publicdomain
+ */
+
+import java.util.*;
+import java.util.concurrent.*;
+
+/*
+ * @test
+ * @bug 6805775 6815766
+ * @summary Check weak consistency of concurrent queue iterators
+ */
+
+@SuppressWarnings({"unchecked", "rawtypes"})
+public class IteratorWeakConsistency {
+
+    void test(String[] args) throws Throwable {
+        test(new LinkedBlockingQueue());
+        test(new LinkedBlockingQueue(20));
+        test(new LinkedBlockingDeque());
+        test(new LinkedBlockingDeque(20));
+        test(new ConcurrentLinkedQueue());
+//         test(new LinkedTransferQueue());
+        // Other concurrent queues (e.g. ArrayBlockingQueue) do not
+        // currently have weakly consistent iterators.
+        // test(new ArrayBlockingQueue(20));
+    }
+
+    void test(Queue q) throws Throwable {
+        // TODO: make this more general
+        for (int i = 0; i < 10; i++)
+            q.add(i);
+        Iterator it = q.iterator();
+        q.poll();
+        q.poll();
+        q.poll();
+        q.remove(7);
+        List list = new ArrayList();
+        while (it.hasNext())
+            list.add(it.next());
+        equal(list, Arrays.asList(0, 3, 4, 5, 6, 8, 9));
+        check(! list.contains(null));
+        System.out.printf("%s: %s%n",
+                          q.getClass().getSimpleName(),
+                          list);
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    static Class<?> thisClass = new Object(){}.getClass().getEnclosingClass();
+    public static void main(String[] args) throws Throwable {
+        new IteratorWeakConsistency().instanceMain(args);}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+}
diff --git a/jdk/test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java b/jdk/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java
similarity index 100%
rename from jdk/test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java
rename to jdk/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java
diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java b/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java
new file mode 100644
index 00000000000..6051483f6c3
--- /dev/null
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2005-2008 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6316155 6595669 6871697 6868712
+ * @summary Test concurrent offer vs. remove
+ * @run main OfferRemoveLoops 300
+ * @author Martin Buchholz
+ */
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+@SuppressWarnings({"unchecked", "rawtypes", "deprecation"})
+public class OfferRemoveLoops {
+    final long testDurationMillisDefault = 10L * 1000L;
+    final long testDurationMillis;
+
+    OfferRemoveLoops(String[] args) {
+        testDurationMillis = (args.length > 0) ?
+            Long.valueOf(args[0]) : testDurationMillisDefault;
+    }
+
+    void checkNotContainsNull(Iterable it) {
+        for (Object x : it)
+            check(x != null);
+    }
+
+    void test(String[] args) throws Throwable {
+        testQueue(new LinkedBlockingQueue(10));
+        testQueue(new LinkedBlockingQueue());
+        testQueue(new LinkedBlockingDeque(10));
+        testQueue(new LinkedBlockingDeque());
+        testQueue(new ArrayBlockingQueue(10));
+        testQueue(new PriorityBlockingQueue(10));
+        testQueue(new ConcurrentLinkedQueue());
+//         testQueue(new LinkedTransferQueue());
+    }
+
+    Random getRandom() {
+        return new Random();
+        // return ThreadLocalRandom.current();
+    }
+
+    void testQueue(final Queue q) throws Throwable {
+        System.out.println(q.getClass().getSimpleName());
+        final long testDurationNanos = testDurationMillis * 1000L * 1000L;
+        final long quittingTimeNanos = System.nanoTime() + testDurationNanos;
+        final long timeoutMillis = 10L * 1000L;
+        final int maxChunkSize = 1042;
+        final int maxQueueSize = 10 * maxChunkSize;
+
+        /** Poor man's bounded buffer. */
+        final AtomicLong approximateCount = new AtomicLong(0L);
+
+        abstract class CheckedThread extends Thread {
+            CheckedThread(String name) {
+                super(name);
+                setDaemon(true);
+                start();
+            }
+            /** Polls for quitting time. */
+            protected boolean quittingTime() {
+                return System.nanoTime() - quittingTimeNanos > 0;
+            }
+            /** Polls occasionally for quitting time. */
+            protected boolean quittingTime(long i) {
+                return (i % 1024) == 0 && quittingTime();
+            }
+            abstract protected void realRun();
+            public void run() {
+                try { realRun(); } catch (Throwable t) { unexpected(t); }
+            }
+        }
+
+        Thread offerer = new CheckedThread("offerer") {
+            protected void realRun() {
+                final long chunkSize = getRandom().nextInt(maxChunkSize) + 2;
+                long c = 0;
+                for (long i = 0; ! quittingTime(i); i++) {
+                    if (q.offer(Long.valueOf(c))) {
+                        if ((++c % chunkSize) == 0) {
+                            approximateCount.getAndAdd(chunkSize);
+                            while (approximateCount.get() > maxQueueSize)
+                                Thread.yield();
+                        }
+                    } else {
+                        Thread.yield();
+                    }}}};
+
+        Thread remover = new CheckedThread("remover") {
+            protected void realRun() {
+                final long chunkSize = getRandom().nextInt(maxChunkSize) + 2;
+                long c = 0;
+                for (long i = 0; ! quittingTime(i); i++) {
+                    if (q.remove(Long.valueOf(c))) {
+                        if ((++c % chunkSize) == 0) {
+                            approximateCount.getAndAdd(-chunkSize);
+                        }
+                    } else {
+                        Thread.yield();
+                    }
+                }
+                q.clear();
+                approximateCount.set(0); // Releases waiting offerer thread
+            }};
+
+        Thread scanner = new CheckedThread("scanner") {
+            protected void realRun() {
+                final Random rnd = getRandom();
+                while (! quittingTime()) {
+                    switch (rnd.nextInt(3)) {
+                    case 0: checkNotContainsNull(q); break;
+                    case 1: q.size(); break;
+                    case 2: checkNotContainsNull
+                            (Arrays.asList(q.toArray(new Long[0])));
+                        break;
+                    }
+                    Thread.yield();
+                }}};
+
+        for (Thread thread : new Thread[] { offerer, remover, scanner }) {
+            thread.join(timeoutMillis + testDurationMillis);
+            if (thread.isAlive()) {
+                System.err.printf("Hung thread: %s%n", thread.getName());
+                failed++;
+                for (StackTraceElement e : thread.getStackTrace())
+                    System.err.println(e);
+                // Kludge alert
+                thread.stop();
+                thread.join(timeoutMillis);
+            }
+        }
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        new OfferRemoveLoops(args).instanceMain(args);}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+}
diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java b/jdk/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java
new file mode 100644
index 00000000000..2019c658b7c
--- /dev/null
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java
@@ -0,0 +1,221 @@
+/*
+ * 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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.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/licenses/publicdomain
+ */
+
+/*
+ * @test
+ * @bug 6785442
+ * @summary Checks race between poll and remove(Object), while
+ * occasionally moonlighting as a microbenchmark.
+ * @run main RemovePollRace 12345
+ */
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+// import java.util.concurrent.LinkedTransferQueue;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.Map;
+
+public class RemovePollRace {
+    // Suitable for benchmarking.  Overriden by args[0] for testing.
+    int count = 1024 * 1024;
+
+    final Map<String,String> results = new ConcurrentHashMap<String,String>();
+
+    Collection<Queue<Boolean>> concurrentQueues() {
+        List<Queue<Boolean>> queues = new ArrayList<Queue<Boolean>>();
+        queues.add(new ConcurrentLinkedQueue<Boolean>());
+        queues.add(new ArrayBlockingQueue<Boolean>(count, false));
+        queues.add(new ArrayBlockingQueue<Boolean>(count, true));
+        queues.add(new LinkedBlockingQueue<Boolean>());
+        queues.add(new LinkedBlockingDeque<Boolean>());
+//         queues.add(new LinkedTransferQueue<Boolean>());
+
+        // Following additional implementations are available from:
+        // http://gee.cs.oswego.edu/dl/concurrency-interest/index.html
+        // queues.add(new SynchronizedLinkedListQueue<Boolean>());
+
+        // Avoid "first fast, second slow" benchmark effect.
+        Collections.shuffle(queues);
+        return queues;
+    }
+
+    void prettyPrintResults() {
+        List<String> classNames = new ArrayList<String>(results.keySet());
+        Collections.sort(classNames);
+        int maxClassNameLength = 0;
+        int maxNanosLength = 0;
+        for (String name : classNames) {
+            if (maxClassNameLength < name.length())
+                maxClassNameLength = name.length();
+            if (maxNanosLength < results.get(name).length())
+                maxNanosLength = results.get(name).length();
+        }
+        String format = String.format("%%%ds %%%ds nanos/item%%n",
+                                      maxClassNameLength, maxNanosLength);
+        for (String name : classNames)
+            System.out.printf(format, name, results.get(name));
+    }
+
+    void test(String[] args) throws Throwable {
+        if (args.length > 0)
+            count = Integer.valueOf(args[0]);
+        // Warmup
+        for (Queue<Boolean> queue : concurrentQueues())
+            test(queue);
+        results.clear();
+        for (Queue<Boolean> queue : concurrentQueues())
+            test(queue);
+
+        prettyPrintResults();
+    }
+
+    void await(CountDownLatch latch) {
+        try { latch.await(); }
+        catch (InterruptedException e) { unexpected(e); }
+    }
+
+    void test(final Queue<Boolean> q) throws Throwable {
+        long t0 = System.nanoTime();
+        final int SPINS = 5;
+        final AtomicLong removes = new AtomicLong(0);
+        final AtomicLong polls = new AtomicLong(0);
+        final int adderCount =
+            Math.max(1, Runtime.getRuntime().availableProcessors() / 4);
+        final int removerCount =
+            Math.max(1, Runtime.getRuntime().availableProcessors() / 4);
+        final int pollerCount = removerCount;
+        final int threadCount = adderCount + removerCount + pollerCount;
+        final CountDownLatch startingGate = new CountDownLatch(1);
+        final CountDownLatch addersDone = new CountDownLatch(adderCount);
+        final Runnable remover = new Runnable() {
+            public void run() {
+                await(startingGate);
+                int spins = 0;
+                for (;;) {
+                    boolean quittingTime = (addersDone.getCount() == 0);
+                    if (q.remove(Boolean.TRUE))
+                        removes.getAndIncrement();
+                    else if (quittingTime)
+                        break;
+                    else if (++spins > SPINS) {
+                        Thread.yield();
+                        spins = 0;
+                    }}}};
+        final Runnable poller = new Runnable() {
+            public void run() {
+                await(startingGate);
+                int spins = 0;
+                for (;;) {
+                    boolean quittingTime = (addersDone.getCount() == 0);
+                    if (q.poll() == Boolean.TRUE)
+                        polls.getAndIncrement();
+                    else if (quittingTime)
+                        break;
+                    else if (++spins > SPINS) {
+                        Thread.yield();
+                        spins = 0;
+                    }}}};
+        final Runnable adder = new Runnable() {
+            public void run() {
+                await(startingGate);
+                for (int i = 0; i < count; i++) {
+                    for (;;) {
+                        try { q.add(Boolean.TRUE); break; }
+                        catch (IllegalStateException e) { Thread.yield(); }
+                    }
+                }
+                addersDone.countDown();
+            }};
+
+        final List<Thread> adders   = new ArrayList<Thread>();
+        final List<Thread> removers = new ArrayList<Thread>();
+        final List<Thread> pollers  = new ArrayList<Thread>();
+        for (int i = 0; i < adderCount; i++)
+            adders.add(checkedThread(adder));
+        for (int i = 0; i < removerCount; i++)
+            removers.add(checkedThread(remover));
+        for (int i = 0; i < pollerCount; i++)
+            pollers.add(checkedThread(poller));
+
+        final List<Thread> allThreads = new ArrayList<Thread>();
+        allThreads.addAll(removers);
+        allThreads.addAll(pollers);
+        allThreads.addAll(adders);
+
+        for (Thread t : allThreads)
+            t.start();
+        startingGate.countDown();
+        for (Thread t : allThreads)
+            t.join();
+
+        String className = q.getClass().getSimpleName();
+        long elapsed = System.nanoTime() - t0;
+        int nanos = (int) ((double) elapsed / (adderCount * count));
+        results.put(className, String.valueOf(nanos));
+        if (removes.get() + polls.get() != adderCount * count) {
+            String msg = String.format
+                ("class=%s removes=%s polls=%d count=%d",
+                 className, removes.get(), polls.get(), count);
+            fail(msg);
+        }
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    volatile int passed = 0, failed = 0;
+    void pass() {passed++;}
+    void fail() {failed++; Thread.dumpStack();}
+    void fail(String msg) {System.err.println(msg); fail();}
+    void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    void check(boolean cond) {if (cond) pass(); else fail();}
+    void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        new RemovePollRace().instanceMain(args);}
+    public void instanceMain(String[] args) throws Throwable {
+        try {test(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+    Thread checkedThread(final Runnable r) {
+        return new Thread() {public void run() {
+            try {r.run();} catch (Throwable t) {unexpected(t);}}};}
+}
diff --git a/jdk/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java b/jdk/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java
deleted file mode 100644
index e66dfb7042d..00000000000
--- a/jdk/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2005-2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
- * @bug 6316155 6595669
- * @summary Test concurrent offer vs. remove
- * @author Martin Buchholz
- */
-
-import java.util.concurrent.*;
-
-public class OfferRemoveLoops {
-    private static void realMain(String[] args) throws Throwable {
-        testQueue(new LinkedBlockingQueue<String>(10));
-        testQueue(new LinkedBlockingQueue<String>());
-        testQueue(new LinkedBlockingDeque<String>(10));
-        testQueue(new LinkedBlockingDeque<String>());
-        testQueue(new ArrayBlockingQueue<String>(10));
-        testQueue(new PriorityBlockingQueue<String>(10));
-    }
-
-    private abstract static class ControlledThread extends Thread {
-        abstract protected void realRun();
-        public void run() {
-            try { realRun(); } catch (Throwable t) { unexpected(t); }
-        }
-    }
-
-    private static void testQueue(final BlockingQueue<String> q) throws Throwable {
-        System.out.println(q.getClass());
-        final int count = 10000;
-        final long quittingTime = System.nanoTime() + 1L * 1000L * 1000L * 1000L;
-        Thread t1 = new ControlledThread() {
-                protected void realRun() {
-                    for (int i = 0, j = 0; i < count; i++)
-                        while (! q.remove(String.valueOf(i))
-                               && System.nanoTime() - quittingTime < 0)
-                            Thread.yield();}};
-        Thread t2 = new ControlledThread() {
-                protected void realRun() {
-                    for (int i = 0, j = 0; i < count; i++)
-                        while (! q.offer(String.valueOf(i))
-                               && System.nanoTime() - quittingTime < 0)
-                            Thread.yield();}};
-        t1.setDaemon(true); t2.setDaemon(true);
-        t1.start(); t2.start();
-        t1.join(10000); t2.join(10000);
-        check(! t1.isAlive());
-        check(! t2.isAlive());
-    }
-
-    //--------------------- Infrastructure ---------------------------
-    static volatile int passed = 0, failed = 0;
-    static void pass() { passed++; }
-    static void fail() { failed++; Thread.dumpStack(); }
-    static void unexpected(Throwable t) { failed++; t.printStackTrace(); }
-    static void check(boolean cond) { if (cond) pass(); else fail(); }
-    static void equal(Object x, Object y) {
-        if (x == null ? y == null : x.equals(y)) pass();
-        else {System.out.println(x + " not equal to " + y); fail(); }}
-
-    public static void main(String[] args) throws Throwable {
-        try { realMain(args); } catch (Throwable t) { unexpected(t); }
-
-        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
-        if (failed > 0) throw new Exception("Some tests failed");
-    }
-}
diff --git a/jdk/test/java/util/prefs/CommentsInXml.java b/jdk/test/java/util/prefs/CommentsInXml.java
new file mode 100644
index 00000000000..b65cfa29e7d
--- /dev/null
+++ b/jdk/test/java/util/prefs/CommentsInXml.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4619564
+ * @summary XMl Comments in Preferences File lead to ClassCastException
+ * @author kladko
+ */
+
+import java.io.*;
+import java.util.prefs.*;
+
+public class CommentsInXml {
+
+    public static void main(String[] argv) throws Exception {
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+        bos.write(new String(
+            "<!DOCTYPE preferences SYSTEM                          " +
+            "\"http://java.sun.com/dtd/preferences.dtd\">          " +
+            "<preferences EXTERNAL_XML_VERSION=\"1.0\">            " +
+            "  <root type=\"user\">                                " +
+            "    <map>                                             " +
+            "    </map>                                            " +
+            "    <node name=\"hlrAgent\"> <!-- HLR Agent -->       " +
+            "      <map>                                           " +
+            "        <entry key=\"agentName\" value=\"HLRAgent\" />" +
+            "      </map>                                          " +
+            "    </node>                                           " +
+            "  </root>                                             " +
+            "</preferences>                                        "
+        ).getBytes());
+
+        Preferences ur = Preferences.userRoot();
+        ur.importPreferences(new ByteArrayInputStream(bos.toByteArray()));
+        ur.node("hlrAgent").removeNode(); // clean
+    }
+}
diff --git a/jdk/test/java/util/prefs/ConflictInFlush.java b/jdk/test/java/util/prefs/ConflictInFlush.java
new file mode 100644
index 00000000000..598b909d345
--- /dev/null
+++ b/jdk/test/java/util/prefs/ConflictInFlush.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 4703132
+ * @summary flush() throws an IllegalStateException on a removed node
+ * @author Sucheta Dambalkar
+ */
+
+import java.util.prefs.*;
+
+public final class ConflictInFlush{
+
+    public static void main(String args[]) {
+        Preferences root = Preferences.userRoot();
+        try {
+            Preferences node = root.node("1/2/3");
+            node.flush();
+            System.out.println("Node "+node+" has been created");
+            System.out.println("Removing node "+node);
+            node.removeNode();
+            node.flush();
+        }catch (BackingStoreException bse){
+            bse.printStackTrace();
+        }
+
+    }
+}
diff --git a/jdk/test/java/util/prefs/ExportNode.java b/jdk/test/java/util/prefs/ExportNode.java
new file mode 100644
index 00000000000..5ab802efb59
--- /dev/null
+++ b/jdk/test/java/util/prefs/ExportNode.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/*
+ * @test
+ * @bug 4387136 4947349
+ * @summary Due to a bug in XMLSupport.putPreferencesInXml(...),
+ *          node's keys would not get exported.
+ * @author Konstantin Kladko
+ */
+import java.util.prefs.*;
+import java.io.*;
+
+public class ExportNode {
+    public static void main(String[] args) throws
+                                            BackingStoreException, IOException {
+            Preferences N1 = Preferences.userRoot().node("ExportNodeTest1");
+            N1.put("ExportNodeTestName1","ExportNodeTestValue1");
+            Preferences N2 = N1.node("ExportNodeTest2");
+            N2.put("ExportNodeTestName2","ExportNodeTestValue2");
+            ByteArrayOutputStream exportStream = new ByteArrayOutputStream();
+            N2.exportNode(exportStream);
+
+            // Removal of preference node should always succeed on Solaris/Linux
+            // by successfully acquiring the appropriate file lock (4947349)
+            N1.removeNode();
+
+            if (((exportStream.toString()).lastIndexOf("ExportNodeTestName2")== -1) ||
+               ((exportStream.toString()).lastIndexOf("ExportNodeTestName1")!= -1)) {
+            }
+   }
+}
diff --git a/jdk/test/java/util/prefs/ExportSubtree.java b/jdk/test/java/util/prefs/ExportSubtree.java
new file mode 100644
index 00000000000..c3d4cd7e936
--- /dev/null
+++ b/jdk/test/java/util/prefs/ExportSubtree.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/* @test
+   @bug 6203576 4700020
+   @summary checks if the output of exportSubtree() is identical to
+            the output from previous release.
+ */
+
+import java.io.*;
+import java.util.prefs.*;
+
+public class ExportSubtree {
+   public static void main(String[] args) throws Exception {
+      try
+      {
+          //File f = new File(System.getProperty("test.src", "."), "TestPrefs.xml");
+          ByteArrayInputStream bais = new ByteArrayInputStream(importPrefs.getBytes("utf-8"));
+          Preferences.importPreferences(bais);
+          ByteArrayOutputStream baos = new ByteArrayOutputStream();
+          Preferences.userRoot().node("testExportSubtree").exportSubtree(baos);
+          Preferences.userRoot().node("testExportSubtree").removeNode();
+          if (!expectedResult.equals(baos.toString())) {
+              //System.out.print(baos.toString());
+              //System.out.print(expectedResult);
+              throw new IOException("exportSubtree does not output expected result");
+          }
+      }
+      catch( Exception e ) {
+         e.printStackTrace();
+      }
+   }
+
+   static String ls = System.getProperty("line.separator");
+   static String importPrefs =
+       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+        + "<!DOCTYPE preferences SYSTEM \"http://java.sun.com/dtd/preferences.dtd\">"
+        + "<preferences EXTERNAL_XML_VERSION=\"1.0\">"
+        + "  <root type=\"user\">"
+        + "    <map>"
+        + "      <entry key=\"key1\" value=\"value1\"/>"
+        + "    </map>"
+        + "    <node name=\"testExportSubtree\">"
+        + "      <map>"
+        + "        <entry key=\"key2\" value=\"value2\"/>"
+        + "      </map>"
+        + "      <node name=\"test\">"
+        + "        <map>"
+        + "          <entry key=\"key3\" value=\"value3\"/>"
+        + "        </map>"
+        + "      </node>"
+        + "    </node>"
+        + "  </root>"
+        + "</preferences>";
+
+   static String expectedResult =
+       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+        + ls    +  "<!DOCTYPE preferences SYSTEM \"http://java.sun.com/dtd/preferences.dtd\">"
+        + ls    +  "<preferences EXTERNAL_XML_VERSION=\"1.0\">"
+        + ls    +  "  <root type=\"user\">"
+        + ls    +  "    <map/>"
+        + ls    +  "    <node name=\"testExportSubtree\">"
+        + ls    +  "      <map>"
+        + ls    +  "        <entry key=\"key2\" value=\"value2\"/>"
+        + ls    +  "      </map>"
+        + ls    +  "      <node name=\"test\">"
+        + ls    +  "        <map>"
+        + ls    +  "          <entry key=\"key3\" value=\"value3\"/>"
+        + ls    +  "        </map>"
+        + ls    +  "      </node>"
+        + ls    +  "    </node>"
+        + ls    +  "  </root>"
+        + ls    +  "</preferences>"     + ls;
+}
diff --git a/jdk/test/java/util/prefs/PrefsSpi.java b/jdk/test/java/util/prefs/PrefsSpi.java
new file mode 100644
index 00000000000..2009ae2d512
--- /dev/null
+++ b/jdk/test/java/util/prefs/PrefsSpi.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+import java.util.prefs.Preferences;
+
+/*
+ * main class used by regtest PrefsSpi.sh
+ */
+public class PrefsSpi {
+
+    public static void main (String[] args) throws Exception {
+        if (args.length != 1)
+            throw new Exception("Usage: java PrefsSpi REGEXP");
+
+        String className = Preferences.userRoot().getClass().getName();
+        System.out.printf("className=%s%n", className);
+
+        if (! className.matches(args[0]))
+            throw new Exception("Preferences class name \"" + className
+                                + "\" does not match regular expression \""
+                                + args[0] + "\".");
+    }
+}
diff --git a/jdk/test/java/util/prefs/PrefsSpi.sh b/jdk/test/java/util/prefs/PrefsSpi.sh
new file mode 100644
index 00000000000..3d8e28b7afd
--- /dev/null
+++ b/jdk/test/java/util/prefs/PrefsSpi.sh
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.
+#
+# 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# @test
+# @bug 4991526 6514993
+# @summary Unit test for Preferences jar providers
+#
+# @build PrefsSpi
+# @run shell PrefsSpi.sh
+# @author Martin Buchholz
+
+# Command-line usage: sh PrefsSpi.sh /path/to/build
+
+if [ -z "$TESTJAVA" ]; then
+    if [ $# -lt 1 ]; then exit 1; fi
+    TESTJAVA="$1"; shift
+    TESTSRC="`pwd`"
+    TESTCLASSES="`pwd`"
+fi
+
+ java="$TESTJAVA/bin/java"
+javac="$TESTJAVA/bin/javac"
+  jar="$TESTJAVA/bin/jar"
+
+Die() { printf "%s\n" "$*"; exit 1; }
+
+Sys() {
+    printf "%s\n" "$*"; "$@"; rc="$?";
+    test "$rc" -eq 0 || Die "Command \"$*\" failed with exitValue $rc";
+}
+
+cat > StubPreferences.java <<'EOF'
+import java.util.prefs.*;
+
+public class StubPreferences extends AbstractPreferences {
+    public StubPreferences() { super(null, ""); }
+    public String              getSpi(String x)           { return null; }
+    public void                putSpi(String x, String y) { }
+    public void                removeSpi(String x)        { }
+    public AbstractPreferences childSpi(String x)         { return null; }
+    public void                removeNodeSpi()            { }
+    public String[]            keysSpi()                  { return null; }
+    public String[]            childrenNamesSpi()         { return null; }
+    public void                syncSpi()                  { }
+    public void                flushSpi()                 { }
+}
+EOF
+
+cat > StubPreferencesFactory.java <<'EOF'
+import java.util.prefs.*;
+
+public class StubPreferencesFactory implements PreferencesFactory {
+    public Preferences userRoot()   { return new StubPreferences(); }
+    public Preferences systemRoot() { return new StubPreferences(); }
+}
+EOF
+
+Sys rm -rf jarDir extDir
+Sys mkdir -p jarDir/META-INF/services extDir
+echo "StubPreferencesFactory" \
+  > "jarDir/META-INF/services/java.util.prefs.PreferencesFactory"
+Sys "$javac" -d jarDir StubPreferencesFactory.java StubPreferences.java
+
+(cd jarDir && "$jar" "cf" "../extDir/PrefsSpi.jar" ".")
+
+case "`uname`" in Windows*|CYGWIN* ) CPS=';';; *) CPS=':';; esac
+
+Sys "$java" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
+    -Djava.util.prefs.PreferencesFactory=StubPreferencesFactory \
+    PrefsSpi "StubPreferences"
+Sys "$java" "-cp" "$TESTCLASSES" \
+    PrefsSpi "java.util.prefs.*"
+Sys "$java" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
+    PrefsSpi "StubPreferences"
+Sys "$java" "-cp" "$TESTCLASSES" "-Djava.ext.dirs=extDir" \
+    PrefsSpi "StubPreferences"
+
+rm -rf jarDir extDir
diff --git a/jdk/test/java/util/prefs/RemoveReadOnlyNode.java b/jdk/test/java/util/prefs/RemoveReadOnlyNode.java
new file mode 100644
index 00000000000..82409dfc637
--- /dev/null
+++ b/jdk/test/java/util/prefs/RemoveReadOnlyNode.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/* @test
+   @bug 6178148
+   @summary check if wrong exception gets thrown if one of the child
+            nodes is readonly on underlying filesystem when node is
+            being removed.
+ */
+
+import java.io.*;
+import java.util.prefs.*;
+
+public class RemoveReadOnlyNode {
+    public static void main(String[] args) throws Exception {
+        String osName = System.getProperty("os.name");
+        if (osName.startsWith("Windows"))
+            return;
+        Preferences root = Preferences.userRoot();
+        Preferences node1 = root.node("node1");
+        Preferences node1A = node1.node("node1A");
+        Preferences node1B = node1.node("node1B");
+        node1B.put("mykey", "myvalue");
+        node1.flush();
+        String node1BDirName = System.getProperty("user.home")
+            + "/.java/.userPrefs"
+            + "/node1/node1B";
+        File node1BDir = new File(node1BDirName);
+        node1BDir.setReadOnly();
+        try {
+            node1.removeNode();
+        }
+        catch (BackingStoreException ex) {
+            //expected exception
+        } finally {
+            Runtime.getRuntime().exec("chmod 755 " + node1BDirName).waitFor();
+            try {
+                node1.removeNode();
+            } catch (Exception e) {}
+        }
+    }
+}
diff --git a/jdk/test/java/util/prefs/RemoveUnregedListener.java b/jdk/test/java/util/prefs/RemoveUnregedListener.java
new file mode 100644
index 00000000000..d48e42b4cb7
--- /dev/null
+++ b/jdk/test/java/util/prefs/RemoveUnregedListener.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/* @test
+ * @bug 4705094
+ * @summary Checks if correct exception gets thrown when removing an
+ *          unregistered NodeChangeListener .
+ */
+
+import java.util.prefs.*;
+import java.util.*;
+
+public class RemoveUnregedListener {
+    public static void main(String[] args) throws Exception {
+        Preferences userRoot = null;
+        Preferences N1 = null;
+        NodeChangeListenerTestAdd ncl = new NodeChangeListenerTestAdd();
+        NodeChangeListenerTestAdd ncl2 = new NodeChangeListenerTestAdd();
+        NodeChangeListenerTestAdd ncl3 = new NodeChangeListenerTestAdd();
+        try {
+            userRoot = Preferences.userRoot();
+            N1 = userRoot.node("N1");
+            userRoot.flush();
+
+            //add ncl nc2
+            N1.addNodeChangeListener(ncl);
+            N1.addNodeChangeListener(ncl2);
+            N1.removeNodeChangeListener(ncl3);
+            throw new RuntimeException();
+        } catch (IllegalArgumentException iae) {
+            System.out.println("Test Passed!");
+        } catch (Exception e) {
+            System.out.println("Test Failed");
+            throw e;
+        }
+    }
+
+}
+class NodeChangeListenerTestAdd implements NodeChangeListener {
+    public void childAdded(NodeChangeEvent evt) {}
+    public void childRemoved(NodeChangeEvent evt) {}
+}
diff --git a/jdk/test/java/util/prefs/SerializeExceptions.java b/jdk/test/java/util/prefs/SerializeExceptions.java
new file mode 100644
index 00000000000..04e4ae3e7dd
--- /dev/null
+++ b/jdk/test/java/util/prefs/SerializeExceptions.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/*
+ * @test
+ * @bug     4811356
+ * @summary Prefs exceptions were unintentionally not serializable
+ * @author  Josh Bloch
+ */
+
+import java.util.prefs.*;
+import java.io.*;
+
+public class SerializeExceptions {
+    public static void main(String args[]) throws Exception {
+        test(new BackingStoreException("Hi"));
+        test(new InvalidPreferencesFormatException("Mom!"));
+    }
+
+    static void test(Object o) throws IOException {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ObjectOutputStream out = new ObjectOutputStream(bos);
+        out.writeObject(o);
+        out.flush();
+        out.close();
+    }
+}
diff --git a/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh b/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
index b433dedb221..6eef3944d9f 100644
--- a/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
+++ b/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
@@ -56,6 +56,11 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     NULL=NUL
     PS=";"
@@ -69,7 +74,7 @@ esac
 
 ${TESTJAVA}${FS}bin${FS}javac \
     -d . \
-    -classpath ${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar \
+    -classpath "${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar" \
     ${TESTSRC}${FS}FailOverTest.java
 
 if [ $? -ne 0 ]; then
@@ -77,7 +82,7 @@ if [ $? -ne 0 ]; then
 fi
 
 ${TESTJAVA}${FS}bin${FS}java \
-    -classpath ${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar${PS}. \
+    -classpath "${TESTSRC}${FS}P1.jar${PS}${TESTSRC}${FS}P2.jar${PS}." \
     FailOverTest
 result=$?
 
diff --git a/jdk/test/javax/security/auth/Subject/doAs/Test.sh b/jdk/test/javax/security/auth/Subject/doAs/Test.sh
index 9844c994968..61c4d7cd6cf 100644
--- a/jdk/test/javax/security/auth/Subject/doAs/Test.sh
+++ b/jdk/test/javax/security/auth/Subject/doAs/Test.sh
@@ -43,6 +43,11 @@ case "$OS" in
     FS="/"
     RM="/bin/rm -f"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    RM="rm"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java b/jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java
new file mode 100644
index 00000000000..bad995f9da2
--- /dev/null
+++ b/jdk/test/javax/swing/JFileChooser/6484091/bug6484091.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6484091
+ * @summary FileSystemView leaks directory info
+ * @author Pavel Porvatov
+   @run main bug6484091
+ */
+
+import javax.swing.filechooser.FileSystemView;
+import java.io.File;
+import java.security.AccessControlException;
+
+public class bug6484091 {
+    public static void main(String[] args) {
+        File dir = FileSystemView.getFileSystemView().getDefaultDirectory();
+
+        printDirContent(dir);
+
+        System.setSecurityManager(new SecurityManager());
+
+        // The next test cases use 'dir' obtained without SecurityManager
+
+        try {
+            printDirContent(dir);
+
+            throw new RuntimeException("Dir content was derived bypass SecurityManager");
+        } catch (AccessControlException e) {
+            // It's a successful situation
+        }
+    }
+
+    private static void printDirContent(File dir) {
+        System.out.println("Files in " + dir.getAbsolutePath() + ":");
+
+        for (File file : dir.listFiles()) {
+            System.out.println(file.getName());
+        }
+    }
+}
diff --git a/jdk/test/javax/swing/JInternalFrame/Test6325652.java b/jdk/test/javax/swing/JInternalFrame/Test6325652.java
new file mode 100644
index 00000000000..d9fea4487cb
--- /dev/null
+++ b/jdk/test/javax/swing/JInternalFrame/Test6325652.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6325652
+ * @summary Tests keyboard shortcuts
+ * @author Sergey Malenkov
+ * @library ..
+ */
+
+import java.awt.AWTException;
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.beans.PropertyVetoException;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JTextArea;
+
+public class Test6325652 {
+
+    private static final int WIDTH = 300;
+    private static final int HEIGHT = 300;
+
+    public static void main(String[] args) throws Throwable {
+        SwingTest.start(Test6325652.class);
+    }
+
+    private static Robot robot;
+    private JInternalFrame internal;
+
+    public Test6325652(JFrame frame) {
+        JDesktopPane desktop = new JDesktopPane();
+        desktop.add(create(0));
+        desktop.add(this.internal = create(1));
+        frame.add(desktop);
+    }
+
+    public void select() throws PropertyVetoException {
+        this.internal.setSelected(true);
+    }
+
+    public static void stepFirst() throws AWTException {
+        robot = new Robot(); // initialize shared static field first time
+        click(KeyEvent.VK_CONTROL, KeyEvent.VK_F9); // iconify internal frame
+    }
+
+    public void stepFirstValidate() {
+        if (!this.internal.isIcon()) {
+            throw new Error("frame should be an icon");
+        }
+    }
+
+    public static void stepSecond() {
+        click(KeyEvent.VK_CONTROL, KeyEvent.VK_F6); // navigate to the icon
+        click(KeyEvent.VK_CONTROL, KeyEvent.VK_F5); // restore the icon
+    }
+
+    public void stepSecondValidate() {
+        if (this.internal.isIcon()) {
+            throw new Error("frame should not be an icon");
+        }
+    }
+
+    private static void click(int... keys) {
+        for (int key : keys) {
+            robot.keyPress(key);
+        }
+        for (int key : keys) {
+            robot.keyRelease(key);
+        }
+    }
+
+    private static JInternalFrame create(int index) {
+        String text = "test" + index; // NON-NLS: frame identification
+        index = index * 3 + 1;
+
+        JInternalFrame internal = new JInternalFrame(text, true, true, true, true);
+        internal.getContentPane().add(new JTextArea(text));
+        internal.setBounds(10 * index, 10 * index, WIDTH, HEIGHT);
+        internal.setVisible(true);
+        return internal;
+    }
+}
diff --git a/jdk/test/javax/swing/JInternalFrame/Test6505027.java b/jdk/test/javax/swing/JInternalFrame/Test6505027.java
new file mode 100644
index 00000000000..42923ec5e0c
--- /dev/null
+++ b/jdk/test/javax/swing/JInternalFrame/Test6505027.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6505027
+ * @summary Tests focus problem inside internal frame
+ * @author Sergey Malenkov
+ * @library ..
+ */
+
+import java.awt.AWTException;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.KeyboardFocusManager;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
+
+public class Test6505027 {
+
+    private static final boolean INTERNAL = true;
+    private static final boolean TERMINATE = true;
+
+    private static final int WIDTH = 450;
+    private static final int HEIGHT = 200;
+    private static final int OFFSET = 10;
+
+    private static final String[] COLUMNS = { "Size", "Shape" }; // NON-NLS: column names
+    private static final String[] ITEMS = { "a", "b", "c", "d" }; // NON-NLS: combobox content
+    private static final String KEY = "terminateEditOnFocusLost"; // NON-NLS: property name
+
+    public static void main(String[] args) throws Throwable {
+        SwingTest.start(Test6505027.class);
+    }
+
+    private final JTable table = new JTable(new DefaultTableModel(COLUMNS, 2));
+
+    public Test6505027(JFrame main) {
+        Container container = main;
+        if (INTERNAL) {
+            JInternalFrame frame = new JInternalFrame();
+            frame.setBounds(OFFSET, OFFSET, WIDTH, HEIGHT);
+            frame.setVisible(true);
+
+            JDesktopPane desktop = new JDesktopPane();
+            desktop.add(frame, new Integer(1));
+
+            container.add(desktop);
+            container = frame;
+        }
+        if (TERMINATE) {
+            this.table.putClientProperty(KEY, Boolean.TRUE);
+        }
+        TableColumn column = this.table.getColumn(COLUMNS[1]);
+        column.setCellEditor(new DefaultCellEditor(new JComboBox(ITEMS)));
+
+        container.add(BorderLayout.NORTH, new JTextField());
+        container.add(BorderLayout.CENTER, new JScrollPane(this.table));
+    }
+
+    public void press() throws AWTException {
+        Point point = this.table.getCellRect(1, 1, false).getLocation();
+        SwingUtilities.convertPointToScreen(point, this.table);
+
+        Robot robot = new Robot();
+        robot.mouseMove(point.x + 1, point.y + 1);
+        robot.mousePress(InputEvent.BUTTON1_MASK);
+    }
+
+    public static void validate() {
+        Component component = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+        if (!component.getClass().equals(JComboBox.class)) {
+            throw new Error("unexpected focus owner: " + component);
+        }
+    }
+}
diff --git a/jdk/test/javax/swing/JInternalFrame/Test6802868.java b/jdk/test/javax/swing/JInternalFrame/Test6802868.java
new file mode 100644
index 00000000000..9f8eb9bb2e7
--- /dev/null
+++ b/jdk/test/javax/swing/JInternalFrame/Test6802868.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6802868
+ * @summary JInternalFrame is not maximized when maximized parent frame
+ * @author Alexander Potochkin
+ * @library ..
+ */
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.beans.PropertyVetoException;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+
+public class Test6802868 {
+
+    public static void main(String[] args) throws Throwable {
+        SwingTest.start(Test6802868.class);
+    }
+
+    private final JFrame frame;
+    private final JInternalFrame internal;
+    private Dimension size;
+    private Point location;
+
+    public Test6802868(JFrame frame) {
+        JDesktopPane desktop = new JDesktopPane();
+
+        this.frame = frame;
+        this.frame.add(desktop);
+
+        this.internal = new JInternalFrame(getClass().getName(), true, true, true, true);
+        this.internal.setVisible(true);
+
+        desktop.add(this.internal);
+    }
+
+    public void firstAction() throws PropertyVetoException {
+        this.internal.setMaximum(true);
+    }
+
+    public void firstTest() {
+        this.size = this.internal.getSize();
+        resizeFrame();
+    }
+
+    public void firstValidation() {
+        if (this.internal.getSize().equals(this.size)) {
+            throw new Error("InternalFrame hasn't changed its size");
+        }
+    }
+
+    public void secondAction() throws PropertyVetoException {
+        this.internal.setIcon(true);
+    }
+
+    public void secondTest() {
+        this.location = this.internal.getDesktopIcon().getLocation();
+        resizeFrame();
+    }
+
+    public void secondValidation() {
+        if (this.internal.getDesktopIcon().getLocation().equals(this.location)) {
+            throw new Error("JDesktopIcon hasn't moved");
+        }
+    }
+
+    private void resizeFrame() {
+        Dimension size = this.frame.getSize();
+        size.width += 10;
+        size.height += 10;
+        this.frame.setSize(size);
+    }
+}
diff --git a/jdk/test/javax/swing/JLayer/6824395/bug6824395.java b/jdk/test/javax/swing/JLayer/6824395/bug6824395.java
new file mode 100644
index 00000000000..28858c98bf0
--- /dev/null
+++ b/jdk/test/javax/swing/JLayer/6824395/bug6824395.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+ /*
+ * @test
+ * @summary Checks that JLayer inside JViewport works is correctly laid out
+ * @author Alexander Potochkin
+ * @run main bug6824395
+ */
+
+
+import sun.awt.SunToolkit;
+
+import javax.swing.*;
+import javax.swing.plaf.LayerUI;
+import java.awt.*;
+
+public class bug6824395 {
+
+    static JScrollPane scrollPane;
+
+    public static void main(String[] args) throws Exception {
+        SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit();
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                JFrame frame = new JFrame("testing");
+                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+                JEditorPane editorPane = new JEditorPane();
+                String str = "hello\n";
+                for(int i = 0; i<5; i++) {
+                    str += str;
+                }
+
+                editorPane.setText(str);
+
+                JLayer<JEditorPane> editorPaneLayer = new JLayer<JEditorPane>(editorPane);
+                LayerUI<JComponent> layerUI = new LayerUI<JComponent>();
+                editorPaneLayer.setUI(layerUI);
+
+                scrollPane = new JScrollPane(editorPaneLayer);
+
+                scrollPane.setPreferredSize(new Dimension(200, 250));
+                frame.add(scrollPane);
+
+                frame.setSize(200, 200);
+                frame.pack();
+                frame.setVisible(true);
+            }
+        });
+        toolkit.realSync();
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                if (scrollPane.getViewportBorderBounds().width != scrollPane.getViewport().getView().getWidth()) {
+                    throw new RuntimeException("Wrong component's width!");
+                }
+            }
+        });
+    }
+}
diff --git a/jdk/test/javax/swing/JLayer/6872503/bug6872503.java b/jdk/test/javax/swing/JLayer/6872503/bug6872503.java
new file mode 100644
index 00000000000..875ba4fd2d6
--- /dev/null
+++ b/jdk/test/javax/swing/JLayer/6872503/bug6872503.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6872503
+ * @summary Checks that JLayer correctly works with its AWTEventListener
+ * @author Alexander Potochkin
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.AWTEventListener;
+import java.awt.event.AWTEventListenerProxy;
+
+public class bug6872503 {
+
+    static JLayer<Component> l1;
+    static JLayer<Component> l2;
+
+    private static void createGui() {
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+        int length = toolkit.getAWTEventListeners().length;
+
+        l1 = new JLayer<Component>();
+        l1.setLayerEventMask(AWTEvent.MOUSE_EVENT_MASK | AWTEvent.FOCUS_EVENT_MASK);
+
+        l2 = new JLayer<Component>();
+        l2.setLayerEventMask(AWTEvent.MOUSE_EVENT_MASK | AWTEvent.KEY_EVENT_MASK);
+
+        if (isLayerEventControllerAdded()) {
+            throw new RuntimeException("Unexpected AWTEventListener was added");
+        }
+
+        JFrame frame = new JFrame();
+        frame.setLayout(new FlowLayout());
+        frame.add(l1);
+        frame.add(l2);
+
+        if (isLayerEventControllerAdded()) {
+            throw new RuntimeException("Unexpected AWTEventListener was added");
+        }
+
+        frame.pack();
+
+        if (!isLayerEventControllerAdded()) {
+            throw new RuntimeException("AWTEventListener was not added");
+        }
+
+        if (!layerEventControllerMaskEquals(l1.getLayerEventMask() | l2.getLayerEventMask())) {
+             throw new RuntimeException("Wrong mask for AWTEventListener");
+        }
+
+        frame.dispose();
+
+        if (isLayerEventControllerAdded()) {
+            throw new RuntimeException("Unexpected AWTEventListener was added");
+        }
+    }
+
+    static boolean isLayerEventControllerAdded() {
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+        AWTEventListener layerEventController = null;
+        for (AWTEventListener listener : toolkit.getAWTEventListeners()) {
+            if (listener instanceof AWTEventListenerProxy) {
+                listener = ((AWTEventListenerProxy)listener).getListener();
+
+            }
+            if ("LayerEventController".equals(listener.getClass().getSimpleName())) {
+                if (layerEventController != null) {
+                    throw new RuntimeException("Duplicated LayerEventController");
+                }
+                layerEventController = listener;
+            }
+        }
+        boolean ret = layerEventController != null;
+        if (ret) {
+            System.out.println("LayerEventController found");
+        } else {
+            System.out.println("No LayerEventController");
+        }
+        return ret;
+    }
+
+    static boolean layerEventControllerMaskEquals(long mask) {
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+        AWTEventListener layerEventController = null;
+        for (AWTEventListener listener : toolkit.getAWTEventListeners(mask)) {
+            if (listener instanceof AWTEventListenerProxy) {
+                listener = ((AWTEventListenerProxy)listener).getListener();
+
+            }
+            if ("LayerEventController".equals(listener.getClass().getSimpleName())) {
+                if (layerEventController != null) {
+                    throw new RuntimeException("Duplicated LayerEventController");
+                }
+                layerEventController = listener;
+            }
+        }
+        boolean ret = layerEventController != null;
+        if (ret) {
+            System.out.println("LayerEventController with the correct mask found");
+        } else {
+            System.out.println("No LayerEventController with the correct mask");
+        }
+        return ret;
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                bug6872503.createGui();
+            }
+        });
+    }
+}
diff --git a/jdk/test/javax/swing/JLayer/6875153/bug6875153.java b/jdk/test/javax/swing/JLayer/6875153/bug6875153.java
new file mode 100644
index 00000000000..8e416acc339
--- /dev/null
+++ b/jdk/test/javax/swing/JLayer/6875153/bug6875153.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6875153
+ * @summary JLayer.isOptimizedDrawingEnabled() throws NPE for null glass pane set
+ * @author Alexander Potochkin
+ */
+
+import javax.swing.*;
+
+public class bug6875153 {
+
+    private static void createGui() {
+        JLayer layer = new JLayer();
+        layer.setGlassPane(null);
+        layer.isOptimizedDrawingEnabled();
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                bug6875153.createGui();
+            }
+        });
+    }
+}
diff --git a/jdk/test/javax/swing/JLayer/SerializationTest/SerializationTest.java b/jdk/test/javax/swing/JLayer/SerializationTest/SerializationTest.java
new file mode 100644
index 00000000000..cb6ec60846c
--- /dev/null
+++ b/jdk/test/javax/swing/JLayer/SerializationTest/SerializationTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @summary Makes sure that JLayer is synchronizable
+ * @author Alexander Potochkin
+ * @run main SerializationTest
+ */
+
+import javax.swing.*;
+import javax.swing.plaf.LayerUI;
+import java.io.ByteArrayInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ByteArrayOutputStream;
+
+public class SerializationTest {
+
+    public static void main(String[] args) throws Exception {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        ObjectOutputStream outputStream = new ObjectOutputStream(byteArrayOutputStream);
+
+        JLayer<JButton> layer = new JLayer<JButton>(new JButton("Hello"));
+
+        layer.setUI(new TestLayerUI<JButton>());
+
+        outputStream.writeObject(layer);
+        outputStream.flush();
+
+        ByteArrayInputStream byteArrayInputStream =
+                        new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+        ObjectInputStream inputStream = new ObjectInputStream(byteArrayInputStream);
+
+        JLayer newLayer = (JLayer) inputStream.readObject();
+
+        if (newLayer.getLayout() == null) {
+            throw new RuntimeException("JLayer's layout is null");
+        }
+        if (newLayer.getGlassPane() == null) {
+            throw new RuntimeException("JLayer's glassPane is null");
+        }
+        if (newLayer.getUI().getClass() != layer.getUI().getClass()) {
+            throw new RuntimeException("Different UIs");
+        }
+        if (newLayer.getView().getClass() != layer.getView().getClass()) {
+            throw new RuntimeException("Different Views");
+        }
+    }
+
+    static class TestLayerUI<V extends JComponent> extends LayerUI<V> {
+        public String toString() {
+            return "TestLayerUI";
+        }
+    }
+}
diff --git a/jdk/test/javax/swing/JScrollPane/Test6526631.java b/jdk/test/javax/swing/JScrollPane/Test6526631.java
new file mode 100644
index 00000000000..61a39c6371e
--- /dev/null
+++ b/jdk/test/javax/swing/JScrollPane/Test6526631.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6526631
+ * @summary Resizes right-oriented scroll pane
+ * @author Sergey Malenkov
+ * @library ..
+ */
+
+import java.awt.ComponentOrientation;
+import java.awt.Dimension;
+import javax.swing.JFrame;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JViewport;
+
+public class Test6526631 {
+
+    private static final int COLS = 90;
+    private static final int ROWS = 50;
+    private static final int OFFSET = 10;
+
+    public static void main(String[] args) throws Throwable {
+        SwingTest.start(Test6526631.class);
+    }
+
+    private final JScrollPane pane;
+    private final JFrame frame;
+
+    public Test6526631(JFrame frame) {
+        this.pane = new JScrollPane(new JTextArea(ROWS, COLS));
+        this.pane.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
+        this.frame = frame;
+        this.frame.add(this.pane);
+    }
+
+    private void update(int offset) {
+        Dimension size = this.frame.getSize();
+        size.width += offset;
+        this.frame.setSize(size);
+    }
+
+    public void validateFirst() {
+        validateThird();
+        update(OFFSET);
+    }
+
+    public void validateSecond() {
+        validateThird();
+        update(-OFFSET);
+    }
+
+    public void validateThird() {
+        JViewport viewport = this.pane.getViewport();
+        JScrollBar scroller = this.pane.getHorizontalScrollBar();
+        if (!scroller.getComponentOrientation().equals(ComponentOrientation.RIGHT_TO_LEFT)) {
+            throw new Error("unexpected component orientation");
+        }
+        int value = scroller.getValue();
+        if (value != 0) {
+            throw new Error("unexpected scroll value");
+        }
+        int extent = viewport.getExtentSize().width;
+        if (extent != scroller.getVisibleAmount()) {
+            throw new Error("unexpected visible amount");
+        }
+        int size = viewport.getViewSize().width;
+        if (size != scroller.getMaximum()) {
+            throw new Error("unexpected maximum");
+        }
+        int pos = size - extent - value;
+        if (pos != viewport.getViewPosition().x) {
+            throw new Error("unexpected position");
+        }
+    }
+}
diff --git a/jdk/test/javax/swing/JSlider/6579827/bug6579827.java b/jdk/test/javax/swing/JSlider/6579827/bug6579827.java
new file mode 100644
index 00000000000..78fdb7af0c2
--- /dev/null
+++ b/jdk/test/javax/swing/JSlider/6579827/bug6579827.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ * @bug 6579827
+ * @summary vista : JSlider on JColorchooser is not properly render or can't be seen completely
+ * @author Pavel Porvatov
+   @run main bug6579827
+ */
+
+import sun.awt.OSInfo;
+
+import javax.swing.*;
+import java.awt.*;
+
+public class bug6579827 {
+    public static void main(String[] args) throws Exception {
+        if (OSInfo.getOSType() != OSInfo.OSType.WINDOWS ||
+                OSInfo.getWindowsVersion() != OSInfo.WINDOWS_VISTA) {
+            System.out.println("This test is only for Windows Vista. Skipped.");
+
+            return;
+        }
+
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                try {
+                    UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+                } catch (Exception e) {
+                    e.printStackTrace();
+
+                    throw new RuntimeException(e);
+                }
+
+                JSlider slider = new JSlider(JSlider.VERTICAL, 0, 100, 0);
+
+                Dimension prefferdSize = slider.getPreferredSize();
+
+                slider.setPaintTrack(false);
+                slider.putClientProperty("Slider.paintThumbArrowShape", Boolean.TRUE);
+
+                if (prefferdSize.equals(slider.getPreferredSize())) {
+                    throw new RuntimeException();
+                }
+            }
+        });
+    }
+}
diff --git a/jdk/test/javax/swing/JTextArea/Test6593649.java b/jdk/test/javax/swing/JTextArea/Test6593649.java
new file mode 100644
index 00000000000..8de478b3825
--- /dev/null
+++ b/jdk/test/javax/swing/JTextArea/Test6593649.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @bug 6593649
+   @summary Word wrap does not work in JTextArea: long lines are not wrapped
+   @author Lillian Angel
+   @run main Test6593649
+*/
+
+import javax.swing.*;
+import java.awt.*;
+
+public class Test6593649 extends JFrame {
+  static JTextArea txt;
+  static JPanel innerPanel;
+
+  public Test6593649(Dimension d)
+  {
+    super("Word Wrap Testcase");
+
+    setSize(d);
+
+    final Container contentPane = getContentPane();
+
+    innerPanel = new JPanel();
+    innerPanel.setLayout(new BoxLayout(innerPanel, BoxLayout.LINE_AXIS));
+
+    txt = new JTextArea("This is a long line that should wrap, but doesn't...");
+    txt.setLineWrap(true);
+    txt.setWrapStyleWord(true);
+
+    innerPanel.add(txt);
+
+    contentPane.add(innerPanel, BorderLayout.SOUTH);
+  }
+
+  public static void main(String[] args) throws InterruptedException
+  {
+    int size = 100;
+    Dimension d;
+    Test6593649 cp;
+    Dimension txtSize;
+    Dimension innerSize;
+    Dimension cpSize;
+
+    while (size <= 600)
+    {
+      d = new Dimension(size, size);
+      cp = new Test6593649(d);
+      cp.setVisible(true);
+
+      txtSize = txt.getPreferredSize();
+      innerSize = innerPanel.getPreferredSize();
+      cpSize = cp.getSize();
+
+      if (!(txtSize.getWidth() == innerPanel.getWidth() && txtSize.getHeight() == innerPanel.getHeight() &&
+           txtSize.getWidth() <= cpSize.getWidth() && txtSize.getHeight() <= cpSize.getHeight()))
+      {
+        throw new RuntimeException("Test failed: Text area size does not properly match panel and frame sizes");
+      }
+
+      Thread.sleep(2000);
+
+      cp.hide();
+      size += 50;
+    }
+  }
+}
diff --git a/jdk/test/javax/swing/SwingTest.java b/jdk/test/javax/swing/SwingTest.java
new file mode 100644
index 00000000000..006808880eb
--- /dev/null
+++ b/jdk/test/javax/swing/SwingTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import sun.awt.SunToolkit;
+import java.awt.Toolkit;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+/**
+ * SwingTest is a utility class for writing regression tests
+ * that require interacting with the UI.
+ * It uses reflection to invoke all public methods without parameters.
+ * All static methods are starting on the current thread.
+ * Other methods including constructor are starting on the EDT.
+ * Between each method invocation all pending events are processed.
+ * The methods are sorted by name and invoked in that order.
+ * Failure of the test is signaled by any method throwing an exception.
+ * If no methods throw an exception the test is assumed to have passed.
+ *
+ * @author Sergey A. Malenkov
+ */
+final class SwingTest implements Runnable {
+
+    private static final int WIDTH = 640;
+    private static final int HEIGHT = 480;
+
+    public static void start(Class<?> type) throws Throwable {
+        new SwingTest(type).start();
+    }
+
+    private final Class<?> type;
+    private final Iterator<Method> methods;
+
+    private JFrame frame;
+    private Object object;
+    private Method method;
+    private Throwable error;
+
+    private SwingTest(Class<?> type) {
+        Set<Method> methods = new TreeSet<Method>(new Comparator<Method>() {
+            public int compare(Method first, Method second) {
+                return first.getName().compareTo(second.getName());
+            }
+        });
+        for (Method method : type.getMethods()) {
+            if (method.getDeclaringClass().equals(type)) {
+                if (method.getReturnType().equals(void.class)) {
+                    if (0 == method.getParameterTypes().length) {
+                        methods.add(method);
+                    }
+                }
+            }
+        }
+        this.type = type;
+        this.methods = methods.iterator();
+    }
+
+    public void run() {
+        try {
+            if (this.object == null) {
+                System.out.println(this.type);
+                this.frame = new JFrame(this.type.getSimpleName());
+                this.frame.setSize(WIDTH, HEIGHT);
+                this.frame.setLocationRelativeTo(null);
+                this.object = this.type.getConstructor(this.frame.getClass()).newInstance(this.frame);
+                this.frame.setVisible(true);
+            }
+            else if (this.method != null) {
+                System.out.println(this.method);
+                this.method.invoke(this.object);
+            }
+            else {
+                System.out.println((this.error == null) ? "PASSED" : "FAILED"); // NON-NLS: debug
+                this.frame.dispose();
+                this.frame = null;
+            }
+        }
+        catch (NoSuchMethodException exception) {
+            this.error = exception;
+        }
+        catch (SecurityException exception) {
+            this.error = exception;
+        }
+        catch (IllegalAccessException exception) {
+            this.error = exception;
+        }
+        catch (IllegalArgumentException exception) {
+            this.error = exception;
+        }
+        catch (InstantiationException exception) {
+            this.error = exception;
+        }
+        catch (InvocationTargetException exception) {
+            this.error = exception.getTargetException();
+        }
+        System.out.flush();
+        this.method = this.methods.hasNext() && (this.error == null)
+                ? this.methods.next()
+                : null;
+    }
+
+    private void start() throws Throwable {
+        do {
+            if ((this.method != null) && Modifier.isStatic(this.method.getModifiers())) {
+                run(); // invoke static method on the current thread
+            }
+            else {
+                SwingUtilities.invokeLater(this); // invoke on the event dispatch thread
+            }
+            Toolkit tk = Toolkit.getDefaultToolkit();
+            if (tk instanceof SunToolkit) {
+                SunToolkit stk = (SunToolkit) tk;
+                stk.realSync(); // wait until done
+            }
+        }
+        while (this.frame != null);
+        if (this.error != null) {
+            throw this.error;
+        }
+    }
+}
diff --git a/jdk/test/javax/swing/SwingUtilities/6797139/bug6797139.java b/jdk/test/javax/swing/SwingUtilities/6797139/bug6797139.java
new file mode 100644
index 00000000000..acd9e1299e3
--- /dev/null
+++ b/jdk/test/javax/swing/SwingUtilities/6797139/bug6797139.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ *
+ * @bug 6797139
+ * @author Alexander Potochkin
+ * @summary tests that JButton's text is not incorrectly truncated
+ */
+import javax.swing.*;
+import javax.swing.plaf.basic.BasicButtonUI;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+public class bug6797139 {
+
+    private static void createGui() {
+        JButton b = new JButton("Probably");
+        b.setUI(new BasicButtonUI() {
+            protected void paintText(Graphics g, AbstractButton b, Rectangle textRect, String text) {
+                super.paintText(g, b, textRect, text);
+                if (text.endsWith("...")) {
+                    throw new RuntimeException("Text is truncated!");
+                }
+            }
+        });
+        b.setSize(b.getPreferredSize());
+        BufferedImage image = new BufferedImage(b.getWidth(), b.getHeight(),
+                BufferedImage.TYPE_INT_ARGB);
+        Graphics g = image.getGraphics();
+        b.paint(g);
+        g.dispose();
+    }
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                createGui();
+            }
+        });
+    }
+}
diff --git a/jdk/test/javax/swing/plaf/synth/Test6660049.java b/jdk/test/javax/swing/plaf/synth/Test6660049.java
new file mode 100644
index 00000000000..466453a8a60
--- /dev/null
+++ b/jdk/test/javax/swing/plaf/synth/Test6660049.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6660049 6849518
+ * @summary Tests the Region initialization
+ * @author Sergey Malenkov
+ */
+
+import sun.awt.SunToolkit;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.synth.Region;
+import javax.swing.plaf.synth.SynthLookAndFeel;
+
+public class Test6660049 implements Runnable {
+    public static void main(String[] args) {
+        SwingUtilities.invokeLater(new Test6660049(
+                javax.swing.JButton.class,
+                javax.swing.JCheckBox.class,
+                javax.swing.JCheckBoxMenuItem.class,
+                javax.swing.JColorChooser.class,
+                javax.swing.JComboBox.class,
+                javax.swing.JDesktopPane.class,
+                javax.swing.JEditorPane.class,
+                javax.swing.JFileChooser.class,
+                javax.swing.JFormattedTextField.class,
+                javax.swing.JInternalFrame.class,
+                javax.swing.JLabel.class,
+                javax.swing.JList.class,
+                javax.swing.JMenu.class,
+                javax.swing.JMenuBar.class,
+                javax.swing.JMenuItem.class,
+                javax.swing.JOptionPane.class,
+                javax.swing.JPanel.class,
+                javax.swing.JPasswordField.class,
+                javax.swing.JPopupMenu.class,
+                javax.swing.JProgressBar.class,
+                javax.swing.JRadioButton.class,
+                javax.swing.JRadioButtonMenuItem.class,
+                javax.swing.JRootPane.class,
+                javax.swing.JScrollBar.class,
+                javax.swing.JScrollPane.class,
+                javax.swing.JSeparator.class,
+                javax.swing.JSlider.class,
+                javax.swing.JSpinner.class,
+                javax.swing.JSplitPane.class,
+                javax.swing.JTabbedPane.class,
+                javax.swing.JTable.class,
+                javax.swing.JTextArea.class,
+                javax.swing.JTextField.class,
+                javax.swing.JTextPane.class,
+                javax.swing.JToggleButton.class,
+                javax.swing.JToolBar.class,
+                javax.swing.JToolTip.class,
+                javax.swing.JTree.class,
+                javax.swing.JViewport.class,
+                javax.swing.table.JTableHeader.class));
+    }
+
+    private final Class<? extends JComponent>[] types;
+    private final Region region;
+
+    private Test6660049(Class<? extends JComponent>... types) {
+        this.types = types;
+        run();
+
+        this.region = new Region("Button", "ButtonUI", true) {
+            @Override
+            public String getName() {
+                throw new Error("6660049: exploit is available");
+            }
+        };
+    }
+
+    public void run() {
+        if (this.region != null) {
+            SunToolkit.createNewAppContext();
+        }
+        for (Class<? extends JComponent> type : this.types) {
+            Region region = getRegion(type);
+            if (region == null) {
+                throw new Error("6849518: region is not initialized");
+            }
+        }
+        getRegion(JButton.class).getName();
+    }
+
+    private static Region getRegion(Class<? extends JComponent> type) {
+        try {
+            return SynthLookAndFeel.getRegion(type.newInstance());
+        }
+        catch (IllegalAccessException exception) {
+            throw new Error("unexpected exception", exception);
+        }
+        catch (InstantiationException exception) {
+            throw new Error("unexpected exception", exception);
+        }
+    }
+}
diff --git a/jdk/test/javax/swing/text/GlyphView/6539700/bug6539700.java b/jdk/test/javax/swing/text/GlyphView/6539700/bug6539700.java
new file mode 100644
index 00000000000..8d83f2e22d4
--- /dev/null
+++ b/jdk/test/javax/swing/text/GlyphView/6539700/bug6539700.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6539700
+ * @summary test that the long space-less lines are correctly soft-wrapped
+ * @author Sergey Groznyh
+ * @run main bug6539700
+ */
+
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.text.ParagraphView;
+import javax.swing.text.View;
+
+public class bug6539700 {
+    static JFrame f;
+    static JEditorPane ep;
+    static String text = "AAAAAAAA<b>AAAAAA</b>AAAAAAAA<b>AAAAAAAAA</b>" +
+                         "AA<b>AAA</b>AAAAAAAAA";
+    static int size = 100;
+    static Class rowClass = null;
+
+    static void createContentPane() {
+        ep = new JEditorPane();
+        ep.setContentType("text/html");
+        ep.setEditable(false);
+        ep.setText(text);
+        f = new JFrame();
+        f.setSize(size, 2 * size);
+        f.add(ep);
+        f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        f.setVisible(true);
+    }
+
+    static void checkRows(View v, boolean last) {
+        int width = (int) v.getPreferredSpan(View.X_AXIS);
+
+        if (v.getClass() == rowClass) {
+            // Row width shouldn't exceed the container width
+            if (width > size) {
+                throw new RuntimeException("too long row: " + width);
+            }
+
+            // Row shouldn't be too short (except for the last one)
+            if (!last) {
+                if (width < size * 2 / 3) {
+                    throw new RuntimeException("too short row: " + width);
+                }
+            }
+        }
+
+        int n = v.getViewCount();
+        if (n > 0) {
+            for (int i = 0; i < n; i++) {
+                View c = v.getView(i);
+                checkRows(c, i == n - 1);
+            }
+        }
+    }
+
+    public static void main(String[] argv) {
+        try {
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    createContentPane();
+                }
+            });
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+
+        Class[] pvchildren = ParagraphView.class.getDeclaredClasses();
+        for (Class c : pvchildren) {
+            if (c.getName().equals("javax.swing.text.ParagraphView$Row")) {
+                rowClass = c;
+                break;
+            }
+        }
+        if (rowClass == null) {
+            throw new RuntimeException("can't find ParagraphView.Row class");
+        }
+
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                checkRows(ep.getUI().getRootView(ep), true);
+            }
+        });
+
+        System.out.println("OK");
+    }
+}
diff --git a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
index ea4fd610e1e..13881966d32 100644
--- a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
+++ b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -23,9 +23,7 @@
 
 /**
  * @test
- * @bug 4635230
- * @bug 6283345
- * @bug 6303830
+ * @bug 4635230 6283345 6303830 6824440
  * @summary Basic unit tests for generating XML Signatures with JSR 105
  * @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java
  *     X509KeySelector.java GenerationTests.java
@@ -248,8 +246,14 @@ public class GenerationTests {
         System.out.println("* Generating signature-enveloping-hmac-sha1-40.xml");
         SignatureMethod hmacSha1 = fac.newSignatureMethod
             (SignatureMethod.HMAC_SHA1, new HMACParameterSpec(40));
-        test_create_signature_enveloping(sha1, hmacSha1, null,
-            getSecretKey("secret".getBytes("ASCII")), sks, false);
+        try {
+            test_create_signature_enveloping(sha1, hmacSha1, null,
+                getSecretKey("secret".getBytes("ASCII")), sks, false);
+        } catch (Exception e) {
+            if (!(e instanceof XMLSignatureException)) {
+                throw e;
+            }
+        }
         System.out.println();
     }
 
diff --git a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java b/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
index 0934de7e921..0604af9bbc5 100644
--- a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
+++ b/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2005-2009 Sun Microsystems, Inc.  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
@@ -23,9 +23,7 @@
 
 /**
  * @test
- * @bug 4635230
- * @bug 6365103
- * @bug 6366054
+ * @bug 4635230 6365103 6366054 6824440
  * @summary Basic unit tests for validating XML Signatures with JSR 105
  * @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java
  *     X509KeySelector.java ValidationTests.java
@@ -42,6 +40,7 @@ import javax.xml.crypto.URIDereferencer;
 import javax.xml.crypto.URIReference;
 import javax.xml.crypto.URIReferenceException;
 import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dsig.XMLSignatureException;
 import javax.xml.crypto.dsig.XMLSignatureFactory;
 
 /**
@@ -68,7 +67,6 @@ public class ValidationTests {
         "signature-enveloping-dsa.xml",
         "signature-enveloping-rsa.xml",
         "signature-enveloping-hmac-sha1.xml",
-        "signature-enveloping-hmac-sha1-40.xml",
         "signature-external-dsa.xml",
         "signature-external-b64-dsa.xml",
         "signature-retrievalmethod-rawx509crt.xml",
@@ -106,7 +104,6 @@ public class ValidationTests {
         KVKS,
         KVKS,
         SKKS,
-        SKKS,
         KVKS,
         KVKS,
         CKS,
@@ -146,6 +143,36 @@ public class ValidationTests {
             atLeastOneFailed = true;
         }
 
+        System.out.println("Validating signature-enveloping-hmac-sha1-40.xml");
+        try {
+            test_signature("signature-enveloping-hmac-sha1-40.xml", SKKS, false);
+            System.out.println("FAILED");
+            atLeastOneFailed = true;
+        } catch (XMLSignatureException xse) {
+            System.out.println(xse.getMessage());
+            System.out.println("PASSED");
+        }
+
+        System.out.println("Validating signature-enveloping-hmac-sha1-trunclen-0-attack.xml");
+        try {
+            test_signature("signature-enveloping-hmac-sha1-trunclen-0-attack.xml", SKKS, false);
+            System.out.println("FAILED");
+            atLeastOneFailed = true;
+        } catch (XMLSignatureException xse) {
+            System.out.println(xse.getMessage());
+            System.out.println("PASSED");
+        }
+
+        System.out.println("Validating signature-enveloping-hmac-sha1-trunclen-8-attack.xml");
+        try {
+            test_signature("signature-enveloping-hmac-sha1-trunclen-8-attack.xml", SKKS, false);
+            System.out.println("FAILED");
+            atLeastOneFailed = true;
+        } catch (XMLSignatureException xse) {
+            System.out.println(xse.getMessage());
+            System.out.println("PASSED");
+        }
+
         if (atLeastOneFailed) {
             throw new Exception
                 ("At least one signature did not validate as expected");
diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml b/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml
new file mode 100644
index 00000000000..5008dae5193
--- /dev/null
+++ b/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+  <SignedInfo>
+    <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1">
+      <HMACOutputLength>0</HMACOutputLength>
+    </SignatureMethod>
+    <Reference URI="#object">
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+      <DigestValue>nz4GS0NbH2SrWlD/4fX313CoTzc=</DigestValue>
+    </Reference>
+  </SignedInfo>
+  <SignatureValue>
+  </SignatureValue>
+  <Object Id="object">some other text</Object>
+</Signature>
diff --git a/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml b/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml
new file mode 100644
index 00000000000..dfe0a0df9a5
--- /dev/null
+++ b/jdk/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+  <SignedInfo>
+    <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+    <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#hmac-sha1">
+      <HMACOutputLength>8</HMACOutputLength>
+    </SignatureMethod>
+    <Reference URI="#object">
+      <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+      <DigestValue>nz4GS0NbH2SrWlD/4fX313CoTzc=</DigestValue>
+    </Reference>
+  </SignedInfo>
+  <SignatureValue>
+    Qw==
+  </SignatureValue>
+  <Object Id="object">some other text</Object>
+</Signature>
diff --git a/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh b/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
index 357a586b443..288dedf15fa 100644
--- a/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
+++ b/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
@@ -56,6 +56,12 @@ case "$OS" in
     FS="/"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    TMP=/tmp
+    ;;
   Windows_95 | Windows_98 | Windows_NT )
     NULL=NUL
     PS=";"
diff --git a/jdk/test/sun/net/www/MarkResetTest.sh b/jdk/test/sun/net/www/MarkResetTest.sh
index 61e73344b0a..bf0b0ceb3c1 100644
--- a/jdk/test/sun/net/www/MarkResetTest.sh
+++ b/jdk/test/sun/net/www/MarkResetTest.sh
@@ -32,6 +32,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh
index 615d1e5a293..06d10520ebb 100644
--- a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh
+++ b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh
@@ -32,6 +32,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh b/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
index b72b168c208..677a13cc69a 100644
--- a/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
+++ b/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
@@ -32,6 +32,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/sun/net/www/protocol/jar/B5105410.sh b/jdk/test/sun/net/www/protocol/jar/B5105410.sh
index 3250ecba807..7b1d33ea4fb 100644
--- a/jdk/test/sun/net/www/protocol/jar/B5105410.sh
+++ b/jdk/test/sun/net/www/protocol/jar/B5105410.sh
@@ -39,6 +39,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh b/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
index 7db91d98862..351614dde3d 100644
--- a/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
+++ b/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
@@ -28,23 +28,54 @@
 # @summary various resource and classloading bugs related to jar files
 #set -x
 DEST=`pwd`
+
+OS=`uname -s`
+case "$OS" in
+  SunOS )
+    PS=":"
+    FS="/"
+    ;;
+  Linux )
+    PS=":"
+    FS="/"
+    ;;
+  Windows* )
+    PS=";"
+    FS="\\"
+    ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    #
+    # javac does not like /cygdrive produced by `pwd`.
+    #
+    DEST=`cygpath -d ${DEST}`
+    ;;
+  * )
+    echo "Unrecognized system!"
+    exit 1;
+    ;;
+esac
+
 #
 # build jar1 
 #
-mkdir ${DEST}/jar1
-cd ${TESTSRC}/etc/jar1 
-cp -r . ${DEST}/jar1
-${TESTJAVA}/bin/javac -d ${DEST}/jar1 ${TESTSRC}/src/jar1/LoadResourceBundle.java
-${TESTJAVA}/bin/javac -d ${DEST}/jar1 ${TESTSRC}/src/jar1/GetResource.java
-cd ${DEST}/jar1
-${TESTJAVA}/bin/jar cfM jar1.jar jar1 res1.txt
+mkdir -p ${DEST}${FS}jar1
+cd ${TESTSRC}${FS}etc${FS}jar1 
+cp -r . ${DEST}${FS}jar1
+${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \
+    ${TESTSRC}${FS}src${FS}jar1${FS}LoadResourceBundle.java
+${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \
+    ${TESTSRC}${FS}src${FS}jar1${FS}GetResource.java
+cd ${DEST}${FS}jar1
+${TESTJAVA}${FS}bin${FS}jar cfM jar1.jar jar1 res1.txt
 mv jar1.jar ..
 #
 # build the test sources and run them
 #
-${TESTJAVA}/bin/javac -d ${DEST} ${TESTSRC}/src/test/*.java
+${TESTJAVA}${FS}bin${FS}javac -d ${DEST} ${TESTSRC}${FS}src${FS}test${FS}*.java
 cd ${DEST}
-${TESTJAVA}/bin/java RunAllTests
+${TESTJAVA}${FS}bin${FS}java RunAllTests
 result=$?
 if [ "$result" -ne "0" ]; then
     exit 1
diff --git a/jdk/test/sun/nio/cs/FindCanEncodeBugs.java b/jdk/test/sun/nio/cs/FindCanEncodeBugs.java
index 7331934d5da..2fc6218995d 100644
--- a/jdk/test/sun/nio/cs/FindCanEncodeBugs.java
+++ b/jdk/test/sun/nio/cs/FindCanEncodeBugs.java
@@ -22,7 +22,7 @@
  */
 
 /* @test
-   @bug 5066863 5066867 5066874 5066879 5066884 5066887 5065777
+   @bug 5066863 5066867 5066874 5066879 5066884 5066887 5065777 6730652
    @summary canEncode() false iff encode() throws CharacterCodingException
    @run main/timeout=1200 FindCanEncodeBugs
    @author Martin Buchholz
@@ -52,9 +52,7 @@ public class FindCanEncodeBugs {
             String csn = e.getKey();
             Charset cs = e.getValue();
 
-            if (! cs.canEncode() ||
-                csn.matches("x-COMPOUND_TEXT")   ||
-                csn.matches("x-ISO-2022-CN-CNS"))  // ISO2022_CN_CNS supports less
+            if (! cs.canEncode() || csn.matches("x-COMPOUND_TEXT"))
                 continue;
 
             //System.out.println(csn);
diff --git a/jdk/test/sun/security/ec/TestEC.java b/jdk/test/sun/security/ec/TestEC.java
new file mode 100644
index 00000000000..12694a03c64
--- /dev/null
+++ b/jdk/test/sun/security/ec/TestEC.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * @test
+ * @bug 6840752
+ * @summary  Provide out-of-the-box support for ECC algorithms
+ * @library ../pkcs11
+ * @library ../pkcs11/ec
+ * @run main TestEC
+ */
+
+import java.security.Provider;
+
+/*
+ * Leverage the collection of EC tests used by PKCS11
+ *
+ * NOTE: the following files were copied here from the PKCS11 EC Test area
+ *       and must be kept in sync with the originals:
+ *
+ *           ../pkcs11/ec/p12passwords.txt
+ *           ../pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12
+ *           ../pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12
+ */
+
+public class TestEC {
+
+    public static void main(String[] args) throws Exception {
+        Provider p = new sun.security.ec.SunEC();
+        System.out.println("Running tests with " + p.getName() +
+            " provider...\n");
+
+        long start = System.currentTimeMillis();
+        new TestECDH().main(p);
+        new TestECDSA().main(p);
+        new TestCurves().main(p);
+        new TestKeyFactory().main(p);
+        new TestECGenSpec().main(p);
+        new ReadPKCS12().main(p);
+        //new ReadCertificates().main(p);
+        long stop = System.currentTimeMillis();
+
+        System.out.println("\nCompleted tests with " + p.getName() +
+            " provider (" + (stop - start) + " ms).");
+    }
+}
diff --git a/jdk/test/sun/security/ec/p12passwords.txt b/jdk/test/sun/security/ec/p12passwords.txt
new file mode 100644
index 00000000000..62f620cbdba
--- /dev/null
+++ b/jdk/test/sun/security/ec/p12passwords.txt
@@ -0,0 +1,18 @@
+# MS_ECC_Samples.zip
+256-ecc.pfx ecc
+256_2-ecc.pfx ecc
+384-ecc.pfx ecc
+521-ecc.pfx ecc
+# MS_Client_certs.zip
+eccclicert256.pfx 1
+eccclicert384.pfx 1
+eccclicert521.pfx 1
+# NSS_ECC_PKCS12.zip
+ECCp160.p12 ecc
+ECCp192.p12 ecc
+ECCp224.p12 ecc
+ECCp256.p12 ecc
+ECCp384.p12 ecc
+ECCp521.p12 ecc
+# All other files
+* password
diff --git a/jdk/test/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12 b/jdk/test/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12
new file mode 100644
index 00000000000..1a23788103d
Binary files /dev/null and b/jdk/test/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12 differ
diff --git a/jdk/test/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12 b/jdk/test/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12
new file mode 100644
index 00000000000..ed4d861e4ca
Binary files /dev/null and b/jdk/test/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12 differ
diff --git a/jdk/test/sun/security/krb5/ConfPlusProp.java b/jdk/test/sun/security/krb5/ConfPlusProp.java
index b1ea2ca5e75..ac9ec81c277 100644
--- a/jdk/test/sun/security/krb5/ConfPlusProp.java
+++ b/jdk/test/sun/security/krb5/ConfPlusProp.java
@@ -23,31 +23,56 @@
 /*
  * @test
  * @bug 6857795
+ * @bug 6858589
  * @summary krb5.conf ignored if system properties on realm and kdc are provided
  */
 
 import sun.security.krb5.Config;
-import sun.security.krb5.KrbException;
 
 public class ConfPlusProp {
+    Config config;
     public static void main(String[] args) throws Exception {
-        System.setProperty("java.security.krb5.realm", "R2");
-        System.setProperty("java.security.krb5.kdc", "k2");
+        new ConfPlusProp().run();
+    }
+
+    void refresh() throws Exception {
+        Config.refresh();
+        config = Config.getInstance();
+    }
+
+    void checkDefaultRealm(String r) throws Exception {
+        try {
+            if (!config.getDefaultRealm().equals(r)) {
+                throw new AssertionError("Default realm error");
+            }
+        } catch (Exception e) {
+            if (r != null) throw e;
+        }
+    }
+
+    void check(String r, String k) throws Exception {
+        try {
+            if (!config.getKDCList(r).equals(k)) {
+                throw new AssertionError(r + " kdc not " + k);
+            }
+        } catch (Exception e) {
+            if (k != null) throw e;
+        }
+    }
+
+    void run() throws Exception {
+
+        // No prop, only conf
 
         // Point to a file with existing default_realm
         System.setProperty("java.security.krb5.conf",
                 System.getProperty("test.src", ".") +"/confplusprop.conf");
-        Config config = Config.getInstance();
+        refresh();
 
-        if (!config.getDefaultRealm().equals("R2")) {
-            throw new Exception("Default realm error");
-        }
-        if (!config.getKDCList("R1").equals("k1")) {
-            throw new Exception("R1 kdc error");
-        }
-        if (!config.getKDCList("R2").equals("k2")) {
-            throw new Exception("R2 kdc error");
-        }
+        checkDefaultRealm("R1");
+        check("R1", "k1");
+        check("R2", "old");
+        check("R3", null);
         if (!config.getDefault("forwardable", "libdefaults").equals("well")) {
             throw new Exception("Extra config error");
         }
@@ -55,38 +80,66 @@ public class ConfPlusProp {
         // Point to a file with no libdefaults
         System.setProperty("java.security.krb5.conf",
                 System.getProperty("test.src", ".") +"/confplusprop2.conf");
-        Config.refresh();
+        refresh();
 
-        config = Config.getInstance();
+        checkDefaultRealm(null);
+        check("R1", "k12");
+        check("R2", "old");
+        check("R3", null);
 
-        if (!config.getDefaultRealm().equals("R2")) {
-            throw new Exception("Default realm error again");
+        int version = System.getProperty("java.version").charAt(2) - '0';
+        System.out.println("JDK version is " + version);
+
+        // Zero-config is supported since 1.7
+        if (version >= 7) {
+            // Point to a non-existing file
+            System.setProperty("java.security.krb5.conf", "i-am-not-a file");
+            refresh();
+
+            checkDefaultRealm(null);
+            check("R1", null);
+            check("R2", null);
+            check("R3", null);
+            if (config.getDefault("forwardable", "libdefaults") != null) {
+                throw new Exception("Extra config error");
+            }
         }
-        if (!config.getKDCList("R1").equals("k12")) {
-            throw new Exception("R1 kdc error");
-        }
-        if (!config.getKDCList("R2").equals("k2")) {
-            throw new Exception("R2 kdc error");
+
+        // Add prop
+        System.setProperty("java.security.krb5.realm", "R2");
+        System.setProperty("java.security.krb5.kdc", "k2");
+
+        // Point to a file with existing default_realm
+        System.setProperty("java.security.krb5.conf",
+                System.getProperty("test.src", ".") +"/confplusprop.conf");
+        refresh();
+
+        checkDefaultRealm("R2");
+        check("R1", "k1");
+        check("R2", "k2");
+        check("R3", "k2");
+        if (!config.getDefault("forwardable", "libdefaults").equals("well")) {
+            throw new Exception("Extra config error");
         }
 
+        // Point to a file with no libdefaults
+        System.setProperty("java.security.krb5.conf",
+                System.getProperty("test.src", ".") +"/confplusprop2.conf");
+        refresh();
+
+        checkDefaultRealm("R2");
+        check("R1", "k12");
+        check("R2", "k2");
+        check("R3", "k2");
+
         // Point to a non-existing file
         System.setProperty("java.security.krb5.conf", "i-am-not-a file");
-        Config.refresh();
+        refresh();
 
-        config = Config.getInstance();
-
-        if (!config.getDefaultRealm().equals("R2")) {
-            throw new Exception("Default realm error");
-        }
-        try {
-            config.getKDCList("R1");
-            throw new Exception("R1 is nowhere");
-        } catch (KrbException ke) {
-            // OK
-        }
-        if (!config.getKDCList("R2").equals("k2")) {
-            throw new Exception("R2 kdc error");
-        }
+        checkDefaultRealm("R2");
+        check("R1", "k2");
+        check("R2", "k2");
+        check("R3", "k2");
         if (config.getDefault("forwardable", "libdefaults") != null) {
             throw new Exception("Extra config error");
         }
diff --git a/jdk/test/sun/security/krb5/auto/Context.java b/jdk/test/sun/security/krb5/auto/Context.java
index 2439aa24037..140623f8310 100644
--- a/jdk/test/sun/security/krb5/auto/Context.java
+++ b/jdk/test/sun/security/krb5/auto/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2008-2009 Sun Microsystems, Inc.  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
@@ -22,6 +22,7 @@
  */
 
 import com.sun.security.auth.module.Krb5LoginModule;
+import java.security.Key;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.Arrays;
@@ -38,6 +39,9 @@ import org.ietf.jgss.GSSManager;
 import org.ietf.jgss.GSSName;
 import org.ietf.jgss.MessageProp;
 import org.ietf.jgss.Oid;
+import com.sun.security.jgss.ExtendedGSSContext;
+import com.sun.security.jgss.InquireType;
+import com.sun.security.jgss.AuthorizationDataEntry;
 
 /**
  * Context of a JGSS subject, encapsulating Subject and GSSContext.
@@ -276,6 +280,34 @@ public class Context {
                 }
             }
         }
+        if (x != null && x instanceof ExtendedGSSContext) {
+            if (x.isEstablished()) {
+                ExtendedGSSContext ex = (ExtendedGSSContext)x;
+                Key k = (Key)ex.inquireSecContext(
+                        InquireType.KRB5_GET_SESSION_KEY);
+                if (k == null) {
+                    throw new Exception("Session key cannot be null");
+                }
+                System.out.println("Session key is: " + k);
+                boolean[] flags = (boolean[])ex.inquireSecContext(
+                        InquireType.KRB5_GET_TKT_FLAGS);
+                if (flags == null) {
+                    throw new Exception("Ticket flags cannot be null");
+                }
+                System.out.println("Ticket flags is: " + Arrays.toString(flags));
+                String authTime = (String)ex.inquireSecContext(
+                        InquireType.KRB5_GET_AUTHTIME);
+                if (authTime == null) {
+                    throw new Exception("Auth time cannot be null");
+                }
+                System.out.println("AuthTime is: " + authTime);
+                if (!x.isInitiator()) {
+                    AuthorizationDataEntry[] ad = (AuthorizationDataEntry[])ex.inquireSecContext(
+                            InquireType.KRB5_GET_AUTHZ_DATA);
+                    System.out.println("AuthzData is: " + Arrays.toString(ad));
+                }
+            }
+        }
     }
 
     /**
diff --git a/jdk/test/sun/security/krb5/auto/basic.sh b/jdk/test/sun/security/krb5/auto/basic.sh
index f2592ee2dc1..b7694331571 100644
--- a/jdk/test/sun/security/krb5/auto/basic.sh
+++ b/jdk/test/sun/security/krb5/auto/basic.sh
@@ -43,6 +43,10 @@ case "$OS" in
     FS="\\"
     SEP=";"
     ;;
+  CYGWIN* )
+    FS="/"
+    SEP=";"
+    ;;
   * )
     FS="/"
     SEP=":"
diff --git a/jdk/test/sun/security/krb5/ktab/HighestKvno.java b/jdk/test/sun/security/krb5/ktab/HighestKvno.java
new file mode 100644
index 00000000000..3f315f81d92
--- /dev/null
+++ b/jdk/test/sun/security/krb5/ktab/HighestKvno.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/*
+ * @test
+ * @bug 6867665
+ * @bug 6875033
+ * @summary Problem with keytabs with multiple kvno's (key versions)
+ */
+
+import sun.security.krb5.internal.ktab.*;
+import sun.security.krb5.*;
+import java.io.File;
+import java.io.FileOutputStream;
+
+public class HighestKvno {
+
+    public static void main(String[] args) throws Exception {
+        // kt is a keytab including these entries:
+        //
+        // me@MAD.LOCAL: Type: 3, KVNO: 4
+        // me@MAD.LOCAL: Type: 23, KVNO: 4
+        // me@MAD.LOCAL: Type: 16, KVNO: 4
+        // me@MAD.LOCAL: Type: 1, KVNO: 5
+        // me@MAD.LOCAL: Type: 17, KVNO: 5
+        // me@MAD.LOCAL: Type: 18, KVNO: 5
+        // me@MAD.LOCAL: Type: 1, KVNO: 3
+        // me@MAD.LOCAL: Type: 17, KVNO: 3
+        // me@MAD.LOCAL: Type: 18, KVNO: 3
+        // he@MAD.LOCAL: Type: 1, KVNO: 1
+        // he@MAD.LOCAL: Type: 17, KVNO: 1
+        // he@MAD.LOCAL: Type: 18, KVNO: 1
+        //
+        // This file is created with these steps:
+        // 1. Modify JRE's Ktab.java so that adding new entries
+        //    does not remove the old one.
+        // 2. Run the modified Ktab to create 4 sets of keys
+        // 3. Manually hex edit the KVNO as above
+
+        byte[] kt = {
+            (byte)0x05, (byte)0x02, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x26, (byte)0x00, (byte)0x01,
+            (byte)0x00, (byte)0x09, (byte)0x4D, (byte)0x41,
+            (byte)0x44, (byte)0x2E, (byte)0x4C, (byte)0x4F,
+            (byte)0x43, (byte)0x41, (byte)0x4C, (byte)0x00,
+            (byte)0x02, (byte)0x6D, (byte)0x65, (byte)0x00,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x4A,
+            (byte)0x79, (byte)0x45, (byte)0xCD, (byte)0x04,
+            (byte)0x00, (byte)0x03, (byte)0x00, (byte)0x08,
+            (byte)0xE6, (byte)0xB0, (byte)0x07, (byte)0xA8,
+            (byte)0x5B, (byte)0xF8, (byte)0x73, (byte)0xAD,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x2E,
+            (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x09,
+            (byte)0x4D, (byte)0x41, (byte)0x44, (byte)0x2E,
+            (byte)0x4C, (byte)0x4F, (byte)0x43, (byte)0x41,
+            (byte)0x4C, (byte)0x00, (byte)0x02, (byte)0x6D,
+            (byte)0x65, (byte)0x00, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x4A, (byte)0x79, (byte)0x45,
+            (byte)0xCD, (byte)0x04, (byte)0x00, (byte)0x17,
+            (byte)0x00, (byte)0x10, (byte)0x50, (byte)0x92,
+            (byte)0x01, (byte)0x6B, (byte)0xCF, (byte)0x5A,
+            (byte)0x2A, (byte)0x7A, (byte)0x4F, (byte)0xE8,
+            (byte)0x39, (byte)0xD9, (byte)0x90, (byte)0xB5,
+            (byte)0x9C, (byte)0xEB, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x36, (byte)0x00, (byte)0x01,
+            (byte)0x00, (byte)0x09, (byte)0x4D, (byte)0x41,
+            (byte)0x44, (byte)0x2E, (byte)0x4C, (byte)0x4F,
+            (byte)0x43, (byte)0x41, (byte)0x4C, (byte)0x00,
+            (byte)0x02, (byte)0x6D, (byte)0x65, (byte)0x00,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x4A,
+            (byte)0x79, (byte)0x45, (byte)0xCD, (byte)0x04,
+            (byte)0x00, (byte)0x10, (byte)0x00, (byte)0x18,
+            (byte)0xDF, (byte)0xDF, (byte)0x62, (byte)0x86,
+            (byte)0x37, (byte)0xCE, (byte)0x29, (byte)0xBA,
+            (byte)0xBC, (byte)0x23, (byte)0x15, (byte)0xDC,
+            (byte)0x86, (byte)0x7C, (byte)0xB6, (byte)0x89,
+            (byte)0x25, (byte)0x25, (byte)0xCD, (byte)0x4A,
+            (byte)0x9B, (byte)0xCE, (byte)0xF4, (byte)0xAE,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x26,
+            (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x09,
+            (byte)0x4D, (byte)0x41, (byte)0x44, (byte)0x2E,
+            (byte)0x4C, (byte)0x4F, (byte)0x43, (byte)0x41,
+            (byte)0x4C, (byte)0x00, (byte)0x02, (byte)0x6D,
+            (byte)0x65, (byte)0x00, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x4A, (byte)0x79, (byte)0x4B,
+            (byte)0x5E, (byte)0x05, (byte)0x00, (byte)0x01,
+            (byte)0x00, (byte)0x08, (byte)0xE6, (byte)0xB0,
+            (byte)0x07, (byte)0xA8, (byte)0x5B, (byte)0xF8,
+            (byte)0x73, (byte)0xAD, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x2E, (byte)0x00, (byte)0x01,
+            (byte)0x00, (byte)0x09, (byte)0x4D, (byte)0x41,
+            (byte)0x44, (byte)0x2E, (byte)0x4C, (byte)0x4F,
+            (byte)0x43, (byte)0x41, (byte)0x4C, (byte)0x00,
+            (byte)0x02, (byte)0x6D, (byte)0x65, (byte)0x00,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x4A,
+            (byte)0x79, (byte)0x4B, (byte)0x5E, (byte)0x05,
+            (byte)0x00, (byte)0x11, (byte)0x00, (byte)0x10,
+            (byte)0xEA, (byte)0xF5, (byte)0xA8, (byte)0x36,
+            (byte)0xA5, (byte)0x3E, (byte)0x5F, (byte)0x5C,
+            (byte)0x26, (byte)0xE9, (byte)0xDD, (byte)0x8B,
+            (byte)0x8C, (byte)0xE8, (byte)0x92, (byte)0x9C,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x3E,
+            (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x09,
+            (byte)0x4D, (byte)0x41, (byte)0x44, (byte)0x2E,
+            (byte)0x4C, (byte)0x4F, (byte)0x43, (byte)0x41,
+            (byte)0x4C, (byte)0x00, (byte)0x02, (byte)0x6D,
+            (byte)0x65, (byte)0x00, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x4A, (byte)0x79, (byte)0x4B,
+            (byte)0x5E, (byte)0x05, (byte)0x00, (byte)0x12,
+            (byte)0x00, (byte)0x20, (byte)0x68, (byte)0xBE,
+            (byte)0xD4, (byte)0x17, (byte)0x3A, (byte)0x06,
+            (byte)0xE0, (byte)0x0C, (byte)0x62, (byte)0x11,
+            (byte)0xB7, (byte)0x53, (byte)0x1B, (byte)0x3E,
+            (byte)0xB2, (byte)0x6B, (byte)0x0D, (byte)0x48,
+            (byte)0xD8, (byte)0x52, (byte)0x5A, (byte)0x4C,
+            (byte)0xBE, (byte)0x24, (byte)0xBB, (byte)0x3D,
+            (byte)0xC1, (byte)0x74, (byte)0x69, (byte)0xDA,
+            (byte)0x34, (byte)0x98, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x26, (byte)0x00, (byte)0x01,
+            (byte)0x00, (byte)0x09, (byte)0x4D, (byte)0x41,
+            (byte)0x44, (byte)0x2E, (byte)0x4C, (byte)0x4F,
+            (byte)0x43, (byte)0x41, (byte)0x4C, (byte)0x00,
+            (byte)0x02, (byte)0x6D, (byte)0x65, (byte)0x00,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x4A,
+            (byte)0x79, (byte)0x51, (byte)0x27, (byte)0x03,
+            (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x08,
+            (byte)0xE6, (byte)0xB0, (byte)0x07, (byte)0xA8,
+            (byte)0x5B, (byte)0xF8, (byte)0x73, (byte)0xAD,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x2E,
+            (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x09,
+            (byte)0x4D, (byte)0x41, (byte)0x44, (byte)0x2E,
+            (byte)0x4C, (byte)0x4F, (byte)0x43, (byte)0x41,
+            (byte)0x4C, (byte)0x00, (byte)0x02, (byte)0x6D,
+            (byte)0x65, (byte)0x00, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x4A, (byte)0x79, (byte)0x51,
+            (byte)0x27, (byte)0x03, (byte)0x00, (byte)0x11,
+            (byte)0x00, (byte)0x10, (byte)0xEA, (byte)0xF5,
+            (byte)0xA8, (byte)0x36, (byte)0xA5, (byte)0x3E,
+            (byte)0x5F, (byte)0x5C, (byte)0x26, (byte)0xE9,
+            (byte)0xDD, (byte)0x8B, (byte)0x8C, (byte)0xE8,
+            (byte)0x92, (byte)0x9C, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x3E, (byte)0x00, (byte)0x01,
+            (byte)0x00, (byte)0x09, (byte)0x4D, (byte)0x41,
+            (byte)0x44, (byte)0x2E, (byte)0x4C, (byte)0x4F,
+            (byte)0x43, (byte)0x41, (byte)0x4C, (byte)0x00,
+            (byte)0x02, (byte)0x6D, (byte)0x65, (byte)0x00,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x4A,
+            (byte)0x79, (byte)0x51, (byte)0x27, (byte)0x03,
+            (byte)0x00, (byte)0x12, (byte)0x00, (byte)0x20,
+            (byte)0x68, (byte)0xBE, (byte)0xD4, (byte)0x17,
+            (byte)0x3A, (byte)0x06, (byte)0xE0, (byte)0x0C,
+            (byte)0x62, (byte)0x11, (byte)0xB7, (byte)0x53,
+            (byte)0x1B, (byte)0x3E, (byte)0xB2, (byte)0x6B,
+            (byte)0x0D, (byte)0x48, (byte)0xD8, (byte)0x52,
+            (byte)0x5A, (byte)0x4C, (byte)0xBE, (byte)0x24,
+            (byte)0xBB, (byte)0x3D, (byte)0xC1, (byte)0x74,
+            (byte)0x69, (byte)0xDA, (byte)0x34, (byte)0x98,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x26,
+            (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x09,
+            (byte)0x4D, (byte)0x41, (byte)0x44, (byte)0x2E,
+            (byte)0x4C, (byte)0x4F, (byte)0x43, (byte)0x41,
+            (byte)0x4C, (byte)0x00, (byte)0x02, (byte)0x68,
+            (byte)0x65, (byte)0x00, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x4A, (byte)0x79, (byte)0x54,
+            (byte)0xC7, (byte)0x01, (byte)0x00, (byte)0x01,
+            (byte)0x00, (byte)0x08, (byte)0x85, (byte)0x5B,
+            (byte)0xE3, (byte)0x13, (byte)0x3E, (byte)0xF8,
+            (byte)0x76, (byte)0xEC, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x2E, (byte)0x00, (byte)0x01,
+            (byte)0x00, (byte)0x09, (byte)0x4D, (byte)0x41,
+            (byte)0x44, (byte)0x2E, (byte)0x4C, (byte)0x4F,
+            (byte)0x43, (byte)0x41, (byte)0x4C, (byte)0x00,
+            (byte)0x02, (byte)0x68, (byte)0x65, (byte)0x00,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x4A,
+            (byte)0x79, (byte)0x54, (byte)0xC7, (byte)0x01,
+            (byte)0x00, (byte)0x11, (byte)0x00, (byte)0x10,
+            (byte)0xEC, (byte)0xCC, (byte)0x16, (byte)0xCD,
+            (byte)0xE8, (byte)0x51, (byte)0x46, (byte)0x4C,
+            (byte)0x1B, (byte)0x57, (byte)0xAE, (byte)0x19,
+            (byte)0xC3, (byte)0xD2, (byte)0x55, (byte)0x1B,
+            (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x3E,
+            (byte)0x00, (byte)0x01, (byte)0x00, (byte)0x09,
+            (byte)0x4D, (byte)0x41, (byte)0x44, (byte)0x2E,
+            (byte)0x4C, (byte)0x4F, (byte)0x43, (byte)0x41,
+            (byte)0x4C, (byte)0x00, (byte)0x02, (byte)0x68,
+            (byte)0x65, (byte)0x00, (byte)0x00, (byte)0x00,
+            (byte)0x00, (byte)0x4A, (byte)0x79, (byte)0x54,
+            (byte)0xC7, (byte)0x01, (byte)0x00, (byte)0x12,
+            (byte)0x00, (byte)0x20, (byte)0xAE, (byte)0xBA,
+            (byte)0xCB, (byte)0xF5, (byte)0xA8, (byte)0x09,
+            (byte)0xC1, (byte)0xB0, (byte)0x2C, (byte)0x2A,
+            (byte)0x3D, (byte)0x96, (byte)0x2C, (byte)0x2D,
+            (byte)0xF5, (byte)0xFE, (byte)0x65, (byte)0xEC,
+            (byte)0x75, (byte)0x72, (byte)0x5B, (byte)0x46,
+            (byte)0x84, (byte)0xD7, (byte)0x49, (byte)0x3E,
+            (byte)0xF2, (byte)0x27, (byte)0x32, (byte)0x69,
+            (byte)0x75, (byte)0x9B,
+        };
+        System.setProperty("java.security.krb5.conf",
+                new File(System.getProperty("test.src"),
+                    "../krb5.conf").getAbsolutePath());
+        FileOutputStream fout = new FileOutputStream("kt");
+        fout.write(kt);
+        fout.close();
+        KeyTab ktab = KeyTab.getInstance("kt");
+        PrincipalName pn = new PrincipalName("me@MAD.LOCAL");
+        EncryptionKey[] keys = ktab.readServiceKeys(pn);
+        if (keys[0].getKeyVersionNumber() != 5) {
+            throw new Exception("Highest not first");
+        }
+        if (ktab.readServiceKey(pn).getKeyVersionNumber() != 5) {
+            throw new Exception("Highest not chosen");
+        }
+        new File("kt").delete();
+    }
+}
diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
index 4711e7e3cd3..8974fe62d45 100644
--- a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
+++ b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
@@ -68,6 +68,20 @@ case "$OS" in
     CP="cp"
     CHMOD="chmod"
     ;;
+  CYGWIN* )
+    FS="/"
+    PS=";"
+    CP="cp"
+    CHMOD="chmod"
+    #
+    # javac does not like /cygdrive produced by `pwd`
+    #
+    TESTSRC=`cygpath -d ${TESTSRC}`
+    ;;
+  * )
+    echo "Unrecognized system!"
+    exit 1;
+    ;;
 esac
 
 # compile test
diff --git a/jdk/test/sun/security/pkcs11/Provider/Login.sh b/jdk/test/sun/security/pkcs11/Provider/Login.sh
index a41720b63de..6b285adb82d 100644
--- a/jdk/test/sun/security/pkcs11/Provider/Login.sh
+++ b/jdk/test/sun/security/pkcs11/Provider/Login.sh
@@ -69,6 +69,20 @@ case "$OS" in
     CP="cp"
     CHMOD="chmod"
     ;;
+  CYGWIN* )
+    FS="/"
+    PS=";"
+    CP="cp"
+    CHMOD="chmod"
+    #
+    # javac does not like /cygdrive produced by `pwd`
+    #
+    TESTSRC=`cygpath -d ${TESTSRC}`
+    ;;
+  * )
+    echo "Unrecognized system!"
+    exit 1;
+    ;;
 esac
 
 # first make cert/key DBs writable
diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh b/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
index cb4325b464b..9cb9d04de95 100644
--- a/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
+++ b/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
@@ -55,6 +55,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
index 9ebf5ee3f64..1f49a952fb3 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
@@ -43,10 +43,17 @@ fi
 OS=`uname -s`
 case "$OS" in
     SunOS | Linux )
+        FILESEP="/"
 	PATHSEP=":"
 	;;
 
+    CYGWIN* )
+        FILESEP="/"
+	PATHSEP=";"
+	;;
+
     Windows* )
+        FILESEP="\\"
 	PATHSEP=";"
 	;;
 esac
@@ -56,11 +63,13 @@ set -ex
 #
 # Compile the tests, package into their respective jars
 #
-${TESTJAVA}/bin/javac -d . \
-    ${TESTSRC}/NotifyHandshakeTest.java \
-    ${TESTSRC}/NotifyHandshakeTestHeyYou.java
-${TESTJAVA}/bin/jar -cvf com.jar com/NotifyHandshakeTest*.class
-${TESTJAVA}/bin/jar -cvf edu.jar edu/NotifyHandshakeTestHeyYou.class
+${TESTJAVA}${FILESEP}bin${FILESEP}javac -d . \
+    ${TESTSRC}${FILESEP}NotifyHandshakeTest.java \
+    ${TESTSRC}${FILESEP}NotifyHandshakeTestHeyYou.java
+${TESTJAVA}${FILESEP}bin${FILESEP}jar -cvf com.jar \
+    com${FILESEP}NotifyHandshakeTest*.class
+${TESTJAVA}${FILESEP}bin${FILESEP}jar -cvf edu.jar \
+    edu${FILESEP}NotifyHandshakeTestHeyYou.class
 
 #
 # Don't want the original class files to be used, because
@@ -73,11 +82,11 @@ rm -rf com edu
 # This is the only thing we really care about as far as
 # test status goes.
 #
-${TESTJAVA}/bin/java \
+${TESTJAVA}${FILESEP}bin${FILESEP}java \
     -Dtest.src=${TESTSRC} \
     -classpath "com.jar${PATHSEP}edu.jar" \
     -Djava.security.manager \
-    -Djava.security.policy=${TESTSRC}/NotifyHandshakeTest.policy \
+    -Djava.security.policy=${TESTSRC}${FILESEP}NotifyHandshakeTest.policy \
     com.NotifyHandshakeTest
 retval=$?
 
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
index 3e66175cf66..de5f0318e8b 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
@@ -36,6 +36,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
@@ -46,6 +50,7 @@ case "$OS" in
     ;;
 esac
 
-${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java ${TESTSRC}${FS}ProxyTunnelServer.java ${TESTSRC}${FS}PostThruProxy.java
+${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java \
+    ${TESTSRC}${FS}ProxyTunnelServer.java ${TESTSRC}${FS}PostThruProxy.java
 ${TESTJAVA}${FS}bin${FS}java PostThruProxy ${HOSTNAME} ${TESTSRC}
 exit
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
index 2a40eb790ce..e9e20336222 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
@@ -36,6 +36,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";"
+    FS="/"
+    ;;
   Windows* )
     PS=";"
     FS="\\"
@@ -46,6 +50,8 @@ case "$OS" in
     ;;
 esac
 
-${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java ${TESTSRC}${FS}ProxyTunnelServer.java ${TESTSRC}${FS}PostThruProxyWithAuth.java
+${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}OriginServer.java \
+    ${TESTSRC}${FS}ProxyTunnelServer.java \
+    ${TESTSRC}${FS}PostThruProxyWithAuth.java
 ${TESTJAVA}${FS}bin${FS}java PostThruProxyWithAuth ${HOSTNAME} ${TESTSRC}
 exit
diff --git a/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh b/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
index 5501116b9c9..3dda55f30c2 100644
--- a/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
+++ b/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
@@ -53,6 +53,13 @@ case "$OS" in
     CP="${FS}bin${FS}cp -f"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    CP="cp -f"
+    TMP=/tmp
+    ;;
   Windows_* )
     NULL=NUL
     PS=";"
diff --git a/jdk/test/sun/security/tools/jarsigner/PercentSign.sh b/jdk/test/sun/security/tools/jarsigner/PercentSign.sh
index a07011f0a2a..3a9f315d015 100644
--- a/jdk/test/sun/security/tools/jarsigner/PercentSign.sh
+++ b/jdk/test/sun/security/tools/jarsigner/PercentSign.sh
@@ -53,6 +53,13 @@ case "$OS" in
     CP="${FS}bin${FS}cp -f"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    CP="cp -f"
+    TMP=/tmp
+    ;;
   Windows_* )
     NULL=NUL
     PS=";"
diff --git a/jdk/test/sun/security/tools/jarsigner/nameclash.sh b/jdk/test/sun/security/tools/jarsigner/nameclash.sh
new file mode 100644
index 00000000000..bbb6ce7980d
--- /dev/null
+++ b/jdk/test/sun/security/tools/jarsigner/nameclash.sh
@@ -0,0 +1,66 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.
+#
+# 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# @test
+# @bug 6876328
+# @summary different names for the same digest algorithms breaks jarsigner
+#
+
+if [ "${TESTJAVA}" = "" ] ; then
+  JAVAC_CMD=`which javac`
+  TESTJAVA=`dirname $JAVAC_CMD`/..
+fi
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+  Windows_* )
+    FS="\\"
+    ;;
+  * )
+    FS="/"
+    ;;
+esac
+
+KS=nc.jks
+JFILE=nc.jar
+
+KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS"
+JAR=$TESTJAVA${FS}bin${FS}jar
+JARSIGNER=$TESTJAVA${FS}bin${FS}jarsigner
+
+rm $KS $JFILE
+
+$KT -alias a -dname CN=a -keyalg rsa -genkey -validity 300
+$KT -alias b -dname CN=b -keyalg rsa -genkey -validity 300
+
+echo A > A
+$JAR cvf $JFILE A
+
+$JARSIGNER -keystore $KS -storepass changeit $JFILE a -digestalg SHA1 || exit 1
+$JARSIGNER -keystore $KS -storepass changeit $JFILE b -digestalg SHA-1 || exit 2
+
+$JARSIGNER -keystore $KS -verify -debug -strict $JFILE || exit 3
+
+exit 0
+
diff --git a/jdk/test/sun/security/tools/jarsigner/newsize7.sh b/jdk/test/sun/security/tools/jarsigner/newsize7.sh
new file mode 100644
index 00000000000..0d719799ecf
--- /dev/null
+++ b/jdk/test/sun/security/tools/jarsigner/newsize7.sh
@@ -0,0 +1,73 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.
+#
+# 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# @test
+# @bug 6561126
+# @summary keytool should use larger default keysize for keypairs
+#
+# @run shell newsize7.sh
+
+# set a few environment variables so that the shell-script can run stand-alone
+# in the source directory
+if [ "${TESTSRC}" = "" ] ; then
+   TESTSRC="."
+fi
+
+if [ "${TESTJAVA}" = "" ] ; then
+  JAVA_CMD=`which java`
+  TESTJAVA=`dirname $JAVA_CMD`/..
+fi
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+  Windows_* )
+    FS="\\"
+    ;;
+  * )
+    FS="/"
+    ;;
+esac
+
+KSFILE=ns7.jks
+
+KT="${TESTJAVA}${FS}bin${FS}keytool -keystore ns7.jks -storepass changeit -keypass changeit"
+JAR="${TESTJAVA}${FS}bin${FS}jar"
+JS="${TESTJAVA}${FS}bin${FS}jarsigner -keystore ns7.jks -storepass changeit"
+
+rm ns7.*
+
+$KT -genkeypair -alias me -dname CN=Me
+
+touch ns7.txt
+$JAR cvf ns7.jar ns7.txt
+
+$JS ns7.jar me
+$JAR xvf ns7.jar
+
+grep SHA-256 META-INF/MANIFEST.MF || exit 1
+grep SHA-256 META-INF/ME.SF || exit 2
+
+#rm -rf META-INF
+
+exit 0
diff --git a/jdk/test/sun/security/tools/jarsigner/oldsig.sh b/jdk/test/sun/security/tools/jarsigner/oldsig.sh
index 14668810446..d7420dc4f3e 100644
--- a/jdk/test/sun/security/tools/jarsigner/oldsig.sh
+++ b/jdk/test/sun/security/tools/jarsigner/oldsig.sh
@@ -49,6 +49,13 @@ case "$OS" in
     CP="${FS}bin${FS}cp -f"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    CP="cp -f"
+    TMP=/tmp
+    ;;
   Windows_* )
     NULL=NUL
     PS=";"
diff --git a/jdk/test/sun/security/tools/jarsigner/samename.sh b/jdk/test/sun/security/tools/jarsigner/samename.sh
new file mode 100644
index 00000000000..7949088a7b9
--- /dev/null
+++ b/jdk/test/sun/security/tools/jarsigner/samename.sh
@@ -0,0 +1,61 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.
+#
+# 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# @test
+# @bug 6866479
+# @summary libzip.so caused JVM to crash when running jarsigner
+#
+
+if [ "${TESTJAVA}" = "" ] ; then
+  JAVAC_CMD=`which javac`
+  TESTJAVA=`dirname $JAVAC_CMD`/..
+fi
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+  Windows_* | CYGWIN* )
+    SIGNEDJAR=EM.jar
+    FS="\\"
+    ;;
+  * )
+    SIGNEDJAR=em.jar
+    FS="/"
+    ;;
+esac
+
+KS=samename.jks
+JFILE=em.jar
+
+KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS"
+JAR=$TESTJAVA${FS}bin${FS}jar
+JARSIGNER=$TESTJAVA${FS}bin${FS}jarsigner
+
+rm $KS $JFILE $SIGNEDJAR
+echo A > A
+$JAR cvf $JFILE A
+
+$KT -alias a -dname CN=a -keyalg rsa -genkey -validity 300
+
+$JARSIGNER -keystore $KS -storepass changeit -signedjar $SIGNEDJAR $JFILE a
+
diff --git a/jdk/test/sun/security/tools/keytool/AltProviderPath.sh b/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
index 7deb733c095..8f253a76c9b 100644
--- a/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
+++ b/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
@@ -52,6 +52,12 @@ case "$OS" in
     FS="/"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    TMP=/tmp
+    ;;
   Windows_* )
     NULL=NUL
     PS=";"
@@ -66,14 +72,21 @@ esac
 
 # the test code
 #genkey
-${TESTJAVA}${FS}bin${FS}keytool -genkey -v -alias dummyTestCA -keyalg "RSA" -keysize 1024 -sigalg "ShA1WithRSA" -dname "cn=Dummy Test CA, ou=JSN, o=JavaSoft, c=US" -validity 3650 -keypass storepass -keystore keystoreCA.dks -storepass storepass -storetype "dks" -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
+${TESTJAVA}${FS}bin${FS}keytool -genkey -v -alias dummyTestCA \
+    -keyalg "RSA" -keysize 1024 -sigalg "ShA1WithRSA" \
+    -dname "cn=Dummy Test CA, ou=JSN, o=JavaSoft, c=US" -validity 3650 \
+    -keypass storepass -keystore keystoreCA.dks -storepass storepass \
+    -storetype "dks" -provider "org.test.dummy.DummyProvider" \
+    -providerPath ${TESTCLASSES}
 
 if [ $? -ne 0 ]; then 
     exit 1
 fi
 
 #Change keystore password
-${TESTJAVA}${FS}bin${FS}keytool -storepasswd -new storepass2 -keystore keystoreCA.dks -storetype "dks" -storepass storepass -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
+${TESTJAVA}${FS}bin${FS}keytool -storepasswd -new storepass2 \
+    -keystore keystoreCA.dks -storetype "dks" -storepass storepass \
+    -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
 
 if [ $? -ne 0 ]; then 
     exit 1
@@ -81,21 +94,29 @@ fi
 
 
 #Change keystore key password
-${TESTJAVA}${FS}bin${FS}keytool -keypasswd -alias "dummyTestCA" -keypass storepass -new keypass -keystore keystoreCA.dks -storetype "dks" -storepass storepass2 -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
+${TESTJAVA}${FS}bin${FS}keytool -keypasswd -alias "dummyTestCA" \
+    -keypass storepass -new keypass -keystore keystoreCA.dks \
+    -storetype "dks" -storepass storepass2 \
+    -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
 
 if [ $? -ne 0 ]; then 
     exit 1
 fi
 
 #Export certificate
-${TESTJAVA}${FS}bin${FS}keytool -v -export -rfc -alias "dummyTestCA" -file "dummyTestCA.der" -keystore keystoreCA.dks -storetype "dks" -storepass storepass2 -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
+${TESTJAVA}${FS}bin${FS}keytool -v -export -rfc -alias "dummyTestCA" \
+    -file "dummyTestCA.der" -keystore keystoreCA.dks -storetype "dks" \
+    -storepass storepass2 -provider "org.test.dummy.DummyProvider" \
+    -providerPath ${TESTCLASSES}
 
 if [ $? -ne 0 ]; then 
     exit 1
 fi
 
 #list keystore
-${TESTJAVA}${FS}bin${FS}keytool -v -list -keystore keystoreCA.dks -storetype "dks" -storepass storepass2 -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
+${TESTJAVA}${FS}bin${FS}keytool -v -list -keystore keystoreCA.dks \
+    -storetype "dks" -storepass storepass2 \
+    -provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
 
 if [ $? -ne 0 ]; then 
     exit 1
diff --git a/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh b/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
index c5bbca9786c..4934fc7b6ce 100644
--- a/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
+++ b/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
@@ -55,6 +55,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  CYGWIN* )
+    PATHSEP=";"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
diff --git a/jdk/test/sun/security/tools/keytool/NewSize7.java b/jdk/test/sun/security/tools/keytool/NewSize7.java
new file mode 100644
index 00000000000..6235aaee9cb
--- /dev/null
+++ b/jdk/test/sun/security/tools/keytool/NewSize7.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6561126
+ * @summary keytool should use larger default keysize for keypairs
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.RSAPublicKey;
+import sun.security.tools.KeyTool;
+
+public class NewSize7 {
+    public static void main(String[] args) throws Exception {
+        String FILE = "newsize7-ks";
+        new File(FILE).delete();
+        KeyTool.main(("-debug -genkeypair -keystore " + FILE +
+                " -alias a -dname cn=c -storepass changeit" +
+                " -keypass changeit -keyalg rsa").split(" "));
+        KeyStore ks = KeyStore.getInstance("JKS");
+        ks.load(new FileInputStream(FILE), null);
+        new File(FILE).delete();
+        RSAPublicKey r = (RSAPublicKey)ks.getCertificate("a").getPublicKey();
+        if (r.getModulus().bitLength() != 2048) {
+            throw new Exception("Bad keysize");
+        }
+        X509Certificate x = (X509Certificate)ks.getCertificate("a");
+        if (!x.getSigAlgName().equals("SHA256withRSA")) {
+            throw new Exception("Bad sigalg");
+        }
+    }
+}
diff --git a/jdk/test/sun/security/tools/keytool/NoExtNPE.sh b/jdk/test/sun/security/tools/keytool/NoExtNPE.sh
index 3e929b5354f..80cc3c85aea 100644
--- a/jdk/test/sun/security/tools/keytool/NoExtNPE.sh
+++ b/jdk/test/sun/security/tools/keytool/NoExtNPE.sh
@@ -48,6 +48,9 @@ case "$OS" in
   Linux )
     FILESEP="/"
     ;;
+  CYGWIN* )
+    FILESEP="/"
+    ;;
   Windows* )
     FILESEP="\\"
     ;;
diff --git a/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh b/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
index 96a1885db9f..787e37e04a5 100644
--- a/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
+++ b/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
@@ -51,6 +51,12 @@ case "$OS" in
     FS="/"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    TMP=/tmp
+    ;;
   Windows_* )
     NULL=NUL
     PS=";"
diff --git a/jdk/test/sun/security/tools/keytool/StandardAlgName.sh b/jdk/test/sun/security/tools/keytool/StandardAlgName.sh
index 77e9a98ef93..82e9e208e10 100644
--- a/jdk/test/sun/security/tools/keytool/StandardAlgName.sh
+++ b/jdk/test/sun/security/tools/keytool/StandardAlgName.sh
@@ -52,6 +52,12 @@ case "$OS" in
     FS="/"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    TMP=/tmp
+    ;;
   Windows_* )
     NULL=NUL
     PS=";"
diff --git a/jdk/test/sun/security/tools/keytool/emptysubject.sh b/jdk/test/sun/security/tools/keytool/emptysubject.sh
new file mode 100644
index 00000000000..ffe681c42aa
--- /dev/null
+++ b/jdk/test/sun/security/tools/keytool/emptysubject.sh
@@ -0,0 +1,68 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  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.
+#
+# 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+
+# @test
+# @bug 6847026
+# @summary keytool should be able to generate certreq and cert without subject name
+#
+# @run shell emptysubject.sh
+#
+
+if [ "${TESTJAVA}" = "" ] ; then
+  JAVAC_CMD=`which javac`
+  TESTJAVA=`dirname $JAVAC_CMD`/..
+fi
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+  Windows_* )
+    FS="\\"
+    ;;
+  * )
+    FS="/"
+    ;;
+esac
+
+KS=emptysubject.jks
+KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS"
+
+rm $KS
+
+$KT -alias ca -dname CN=CA -genkeypair
+$KT -alias me -dname CN=Me -genkeypair
+
+# When -dname is recognized, SAN must be specfied, otherwise, -printcert fails.
+$KT -alias me -certreq -dname "" | \
+        $KT -alias ca -gencert | $KT -printcert && exit 1
+$KT -alias me -certreq | \
+        $KT -alias ca -gencert -dname "" | $KT -printcert && exit 2
+$KT -alias me -certreq -dname "" | \
+        $KT -alias ca -gencert -ext san:c=email:me@me.com | \
+        $KT -printcert || exit 3
+$KT -alias me -certreq | \
+        $KT -alias ca -gencert -dname "" -ext san:c=email:me@me.com | \
+        $KT -printcert || exit 4
+
+exit 0
+
diff --git a/jdk/test/sun/security/tools/keytool/i18n.sh b/jdk/test/sun/security/tools/keytool/i18n.sh
index 2d37ae97664..33abf76f62e 100644
--- a/jdk/test/sun/security/tools/keytool/i18n.sh
+++ b/jdk/test/sun/security/tools/keytool/i18n.sh
@@ -52,6 +52,12 @@ case "$OS" in
     FS="/"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    PS=";"
+    FS="/"
+    TMP=/tmp
+    ;;
   Windows* )
     NULL=NUL
     PS=";"
diff --git a/jdk/test/sun/security/tools/keytool/printssl.sh b/jdk/test/sun/security/tools/keytool/printssl.sh
index 9fc19cd9b20..73bd21cb83b 100644
--- a/jdk/test/sun/security/tools/keytool/printssl.sh
+++ b/jdk/test/sun/security/tools/keytool/printssl.sh
@@ -40,6 +40,9 @@ case "$OS" in
   SunOS | Linux )
     FS="/"
     ;;
+  CYGWIN* )
+    FS="/"
+    ;;
   Windows_* )
     FS="\\"
     ;;
diff --git a/jdk/test/sun/security/tools/keytool/resource.sh b/jdk/test/sun/security/tools/keytool/resource.sh
index ab8e9520555..1fc515217ae 100644
--- a/jdk/test/sun/security/tools/keytool/resource.sh
+++ b/jdk/test/sun/security/tools/keytool/resource.sh
@@ -48,6 +48,11 @@ case "$OS" in
     FS="/"
     TMP=/tmp
     ;;
+  CYGWIN* )
+    NULL=/dev/null
+    FS="/"
+    TMP=/tmp
+    ;;
   Windows_* )
     NULL=NUL
     FS="\\"
diff --git a/jdk/test/sun/security/tools/keytool/standard.sh b/jdk/test/sun/security/tools/keytool/standard.sh
index fe4a0a81312..4328c681454 100644
--- a/jdk/test/sun/security/tools/keytool/standard.sh
+++ b/jdk/test/sun/security/tools/keytool/standard.sh
@@ -24,6 +24,7 @@
 # @test
 # @summary (almost) all keytool behaviors
 # @author Weijun Wang
+# @run shell/timeout=600 standard.sh
 #
 # This test is always excecuted.
 #
@@ -43,11 +44,15 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
+  SunOS | Linux | CYGWIN* )
+    FS="/"
+    ;;
   Windows_* )
     FS="\\"
     ;;
   * )
-    FS="/"
+    echo "Unrecognized system!"
+    exit 1;
     ;;
 esac
 
diff --git a/jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java b/jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java
new file mode 100644
index 00000000000..a1b81118a57
--- /dev/null
+++ b/jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6871847
+ * @summary AlgorithmId.get("SHA256withECDSA") not available
+ */
+
+import sun.security.x509.*;
+
+public class SHA256withECDSA {
+    public static void main(String[] args) throws Exception {
+        AlgorithmId.get("SHA224withECDSA");
+        AlgorithmId.get("SHA256withECDSA");
+        AlgorithmId.get("SHA384withECDSA");
+        AlgorithmId.get("SHA512withECDSA");
+    }
+}
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 23d21f876dc..04fb0c3631b 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -41,3 +41,8 @@ dbdeb4a7581b2a8699644b91cae6793cb01953f7 jdk7-b53
 d8f23a81d46f47a4186f1044dd9e44841bbeab84 jdk7-b64
 7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65
 634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66
+14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67
+95c1212b07e33b1b8c689b1d279d82ffd5a56e43 jdk7-b68
+ce9bcdcb7859bb7ef10afd078ad59ba7847f208d jdk7-b69
+97d06f3e87873e310aa2f3fbca58fc8872d86b9f jdk7-b70
+33c8c38e1757006c17d80499fb3347102501fae5 jdk7-b71
diff --git a/langtools/THIRD_PARTY_README b/langtools/THIRD_PARTY_README
index 9f4d7e5087a..4d3163cbce7 100644
--- a/langtools/THIRD_PARTY_README
+++ b/langtools/THIRD_PARTY_README
@@ -32,7 +32,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --- end of LICENSE file ---
 %% This notice is provided with respect to ASM, which may be included with this software: 
-Copyright (c) 2000-2005 INRIA, France Telecom
+Copyright (c) 2000-2007 INRIA, France Telecom
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/langtools/make/build.properties b/langtools/make/build.properties
index 52df7e9acd0..ffe6fc0ce85 100644
--- a/langtools/make/build.properties
+++ b/langtools/make/build.properties
@@ -26,10 +26,10 @@
 # This is the JDK used to build and run the bootstrap version of javac.
 # The bootstrap javac is used to compile both boostrap versions of the
 # other tools, and product versions of all the tools.
-# Override this path as needed, either on the command line or in 
+# Override this path as needed, either on the command line or in
 # one of the standard user build.properties files (see build.xml)
 
-# boot.java.home = /opt/jdk/1.5.0 
+# boot.java.home = /opt/jdk/1.6.0
 boot.java = ${boot.java.home}/bin/java
 boot.javac = ${boot.java.home}/bin/javac
 boot.javac.source = 6
@@ -37,10 +37,10 @@ boot.javac.target = 6
 
 # This is the JDK used to run the product version of the tools,
 # for example, for testing. If you're building a complete JDK, specify that.
-# Override this path as needed, either on the command line or in 
+# Override this path as needed, either on the command line or in
 # one of the standard user build.properties files (see build.xml)
 
-# target.java.home = /opt/jdk/1.6.0
+# target.java.home = /opt/jdk/1.7.0
 target.java = ${target.java.home}/bin/java
 
 # Version info -- override as needed
@@ -60,29 +60,29 @@ full.version = ${release}-${build.number}
 bootstrap.full.version = ${bootstrap.release}-${build.number}
 
 # options for the <javac> tasks used to compile the tools
-javac.source = 5
-javac.target = 5
+javac.source = 7
+javac.target = 7
 javac.debug = true
 javac.debuglevel = source,lines
 javac.no.jdk.warnings = -XDignore.symbol.file=true
 # set the following to -version to verify the versions of javac being used
-javac.version.opt = 
+javac.version.opt =
 # in time, there should be no exceptions to -Xlint:all
-javac.lint.opts = -Xlint:all -Werror
+javac.lint.opts = -Xlint:all,-deprecation -Werror
 
 # options for the <javadoc> task for javac
 javadoc.jls3.url=http://java.sun.com/docs/books/jls/
-javadoc.jls3.cite=&lt;a href=&quot;${javadoc.jls3.url}&quot;&gt;The Java Language Specification, Third Edition&lt;/a&gt;    
+javadoc.jls3.cite=&lt;a href=&quot;${javadoc.jls3.url}&quot;&gt;The Java Language Specification, Third Edition&lt;/a&gt;
 javadoc.jls3.option=-tag "jls3:a:See &lt;cite&gt;${javadoc.jls3.cite}&lt;/cite&gt;:"
 
 # jtreg, used to run the JDK regression tests
-# Override this path as needed, either on the command line or in 
+# Override this path as needed, either on the command line or in
 # one of the standard user build.properties files (see build.xml)
 
 # jtreg.home = /opt/jtreg/3.2.2_02
 
 # findbugs
-# Override this path as needed, either on the command line or in 
+# Override this path as needed, either on the command line or in
 # one of the standard user build.properties files (see build.xml)
 
 # findbugs.home = /opt/findbugs/1.2.1
@@ -94,46 +94,61 @@ javadoc.jls3.option=-tag "jls3:a:See &lt;cite&gt;${javadoc.jls3.cite}&lt;/cite&g
 # parameter of Ant filesets. In particular, note the trailing '/'.
 
 javac.includes = \
-	javax/annotation/processing/ \
-	javax/lang/model/ \
-	javax/tools/ \
-	com/sun/source/ com/sun/tools/javac/
+        javax/annotation/processing/ \
+        javax/lang/model/ \
+        javax/tools/ \
+        com/sun/source/ com/sun/tools/javac/
 
 javac.tests = \
-	tools/javac
-    
+        tools/javac
+
+#
+
 javadoc.includes = \
-	com/sun/javadoc/ \
-	com/sun/tools/javadoc/
+        com/sun/javadoc/ \
+        com/sun/tools/javadoc/
 
 javadoc.tests = \
-	tools/javadoc/ 
-    
+        tools/javadoc/
+
+#
+
 doclets.includes = \
-	com/sun/tools/doclets/
+        com/sun/tools/doclets/
 
 doclets.tests = \
-	com/sun/javadoc/
+        com/sun/javadoc/
+
+#
 
 javah.includes = \
-	com/sun/tools/javah/
+        com/sun/tools/javah/
 
 javah.tests = \
-	tools/javah/
+        tools/javah/
+
+#
 
 javap.includes = \
-	com/sun/tools/classfile/ \
-	com/sun/tools/javap/ \
-	sun/tools/javap/
+        com/sun/tools/classfile/ \
+        com/sun/tools/javap/ \
+        sun/tools/javap/
 
 javap.tests = \
-	tools/javap/
+        tools/javap/
+
+#
 
 apt.includes = \
-	com/sun/mirror/ \
-	com/sun/tools/apt/
+        com/sun/mirror/ \
+        com/sun/tools/apt/
 
 apt.tests = \
-	tools/apt/
-    
+        tools/apt/
 
+#
+
+# The following value is used by the main jtreg target.
+# An empty value means all tests
+# Override as desired to run a specific set of tests
+jtreg.tests =
diff --git a/langtools/make/build.xml b/langtools/make/build.xml
index 020eaf1d04e..30d63801cf1 100644
--- a/langtools/make/build.xml
+++ b/langtools/make/build.xml
@@ -31,7 +31,7 @@
  -->
 
 <project name="langtools" default="build" basedir="..">
-    
+
     <!-- Force full debuginfo for javac if the debug.classfiles
     property is set.  This must be BEFORE the include of
     build.properties because it sets javac.debuglevel.  -->
@@ -49,8 +49,8 @@
 
     <!-- Use this location for customizations common to all OpenJDK workspaces -->
     <property file="${user.home}/.openjdk/build.properties"/>
-    
-    <!-- Convenient shorthands for standard locations within the workspace. -->    
+
+    <!-- Convenient shorthands for standard locations within the workspace. -->
     <property name="build.dir" location="build"/>
     <property name="build.bootstrap.dir" location="${build.dir}/bootstrap"/>
     <property name="build.coverage.dir" location="${build.dir}/coverage"/>
@@ -75,15 +75,25 @@
          The best file to check for across Solaris/Linux/Windows/MacOS is one of the
          executables; regrettably, that is OS-specific. -->
     <condition property="java.marker" value="bin/java">
-	<os family="unix"/>
+        <os family="unix"/>
     </condition>
     <condition property="java.marker" value="bin/java.exe">
-	<os family="windows"/>
+        <os family="windows"/>
     </condition>
-    
+
     <!-- Standard property values, if not overriden by earlier settings. -->
-    <property file="${make.dir}/build.properties"/> 
-    
+    <property file="${make.dir}/build.properties"/>
+
+    <!-- launcher.java is used in the launcher scripts provided to run
+        the tools' jar files.  If it has not already been set, then
+        default it to use ${target.java.home}, if available, otherwise
+        quietly default to simply use "java". -->
+    <condition property="launcher.java"
+        value="${target.java.home}/bin/java" else="java">
+        <isset property="target.java.home"/>
+    </condition>
+
+
     <!-- Standard target to build deliverables for JDK build. -->
 
     <target name="build" depends="build-bootstrap-tools,build-all-classes">
@@ -97,13 +107,13 @@
         <jar file="${dist.lib.dir}/classes.jar" basedir="${build.classes.dir}"/>
         <zip file="${dist.lib.dir}/src.zip" basedir="${src.classes.dir}"/>
     </target>
-    
+
     <target name="build-bootstrap-tools" depends="build-bootstrap-javac,build-bootstrap-javadoc,build-bootstrap-doclets,build-bootstrap-javah"/>
-    
+
     <target name="build-all-tools" depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap,build-apt"/>
-    
+
     <target name="build-all-classes" depends="build-classes-javac,build-classes-javadoc,build-classes-doclets,build-classes-javah,build-classes-javap,build-classes-apt"/>
-  
+
     <!-- clean -->
 
     <target name="clean" description="Delete all generated files">
@@ -112,13 +122,11 @@
     </target>
 
     <!-- Additional targets for running tools on the build -->
-    
-    <!-- An alternative for the following would be to do a single jtreg run for all tests.
-         However, that would currently be slower, since we would have to run all the tests
-         with samevm="false", since not all test directories currently support samevm="true". -->
 
-    <target name="jtreg" depends="jtreg-javac,jtreg-javadoc,jtreg-doclets,jtreg-javah,jtreg-javap,jtreg-apt"/>
-    
+    <target name="jtreg" depends="build-all-tools,-def-jtreg">
+        <jtreg-tool name="all" tests="${jtreg.tests}"/>
+    </target>
+
     <target name="findbugs" depends="-def-findbugs,build-all-tools">
         <property name="findbugs.reportLevel" value="medium"/>
         <mkdir dir="${dist.findbugs.dir}"/>
@@ -160,52 +168,52 @@
         <delete file="${build.coverage.dir}/cobertura.ser"/>
         <cobertura-instrument todir="${build.coverage.dir}/classes"
             datafile="${build.coverage.dir}/cobertura.ser">
-            <fileset dir="${build.classes.dir}" 
+            <fileset dir="${build.classes.dir}"
                includes="**/*.class" excludes="**/resources/*.class"/>
         </cobertura-instrument>
-    </target>  
+    </target>
 
     <target name="coverage-report" depends="-def-cobertura">
         <mkdir dir="${dist.coverage.dir}"/>
-        <cobertura-report 
+        <cobertura-report
             srcdir="${src.classes.dir}"
             destdir="${dist.coverage.dir}"
             datafile="${build.coverage.dir}/cobertura.ser"/>
-        <cobertura-report 
-            format="xml" 
-            srcdir="${src.classes.dir}" 
+        <cobertura-report
+            format="xml"
+            srcdir="${src.classes.dir}"
             destdir="${dist.coverage.dir}"
             datafile="${build.coverage.dir}/cobertura.ser"/>
     </target>
-    
+
     <!-- javac targets -->
 
     <target name="build-bootstrap-javac" depends="-def-build-bootstrap-tool">
         <build-bootstrap-tool name="javac" includes="${javac.includes}"/>
     </target>
-    
+
     <target name="build-classes-javac" depends="build-bootstrap-javac">
         <build-classes name="javac" includes="${javac.includes}"/>
     </target>
-    
+
     <target name="build-javac" depends="build-bootstrap-javac">
         <build-tool name="javac" includes="${javac.includes}"/>
     </target>
-    
+
     <target name="javadoc-javac" depends="build-javac,-def-javadoc-tool">
         <javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls3.option}"/>
     </target>
-    
+
     <target name="jtreg-javac" depends="build-javac,-def-jtreg">
-        <jtreg-tool name="javac" samevm="true" tests="${javac.tests}"/>
+        <jtreg-tool name="javac" tests="${javac.tests}"/>
     </target>
-    
+
     <target name="findbugs-javac" depends="build-javac,-def-findbugs">
         <findbugs-tool name="javac"/>
     </target>
-    
+
     <target name="javac" depends="build-javac,jtreg-javac,findbugs-javac"/>
-    
+
     <!-- javadoc targets -->
 
     <target name="build-bootstrap-javadoc" depends="build-bootstrap-javac">
@@ -213,31 +221,31 @@
                               includes="${javadoc.includes}"
                               jarclasspath="javac.jar doclets.jar"/>
     </target>
-    
+
     <target name="build-classes-javadoc" depends="build-classes-javac">
         <build-classes name="javadoc" includes="${javadoc.includes}"/>
     </target>
-    
+
     <target name="build-javadoc" depends="build-javac">
         <build-tool name="javadoc"
                     includes="${javadoc.includes}"
                     jarclasspath="javac.jar doclets.jar"/>
     </target>
-    
+
     <target name="javadoc-javadoc" depends="build-javadoc,-def-javadoc-tool">
         <javadoc-tool name="javadoc" includes="${javadoc.includes}"/>
     </target>
-    
+
     <target name="jtreg-javadoc" depends="build-javadoc,-def-jtreg">
-        <jtreg-tool name="javadoc" samevm="false" tests="${javadoc.tests}"/>
+        <jtreg-tool name="javadoc" tests="${javadoc.tests}"/>
     </target>
-    
+
     <target name="findbugs-javadoc" depends="build-javadoc,-def-findbugs">
         <findbugs-tool name="javadoc"/>
     </target>
-    
+
     <target name="javadoc" depends="build-javadoc,jtreg-javadoc,findbugs-javadoc"/>
-    
+
     <!-- doclets targets -->
 
     <target name="build-bootstrap-doclets" depends="build-bootstrap-javadoc,-def-build-bootstrap-jar">
@@ -246,11 +254,11 @@
                               jarmainclass="com.sun.tools.javadoc.Main"
                               jarclasspath="javadoc.jar"/>
     </target>
-    
+
     <target name="build-classes-doclets" depends="build-classes-javadoc">
         <build-classes name="doclets" includes="${doclets.includes}"/>
     </target>
-    
+
     <target name="build-doclets" depends="build-javadoc">
         <!-- just jar, no bin for doclets -->
         <build-jar name="doclets"
@@ -259,17 +267,17 @@
     </target>
 
     <!-- (no javadoc for doclets) -->
-    
+
     <target name="jtreg-doclets" depends="build-doclets,-def-jtreg">
-        <jtreg-tool name="doclets" samevm="false" tests="${doclets.tests}"/>
+        <jtreg-tool name="doclets" tests="${doclets.tests}"/>
     </target>
-    
+
     <target name="findbugs-doclets" depends="build-doclets,-def-findbugs">
         <findbugs-tool name="doclets"/>
     </target>
-    
+
     <target name="doclets" depends="build-doclets,jtreg-doclets,findbugs-doclets"/>
-    
+
     <!-- javah targets -->
 
     <target name="build-bootstrap-javah" depends="build-bootstrap-javadoc">
@@ -277,29 +285,29 @@
                               includes="${javah.includes}"
                               jarclasspath="javadoc.jar doclets.jar javac.jar"/>
     </target>
-    
+
     <target name="build-javah" depends="build-javadoc">
         <build-tool name="javah"
                     includes="${javah.includes}"
                     jarclasspath="javadoc.jar doclets.jar javac.jar"/>
     </target>
-    
+
     <target name="build-classes-javah" depends="build-classes-javadoc">
         <build-classes name="javah" includes="${javah.includes}"/>
     </target>
-    
+
     <!-- (no javadoc for javah) -->
 
     <target name="jtreg-javah" depends="build-javah,-def-jtreg">
-        <jtreg-tool name="javah" samevm="true" tests="${javah.tests}"/>
+        <jtreg-tool name="javah" tests="${javah.tests}"/>
     </target>
-    
+
     <target name="findbugs-javah" depends="build-javah,-def-findbugs">
         <findbugs-tool name="javah"/>
     </target>
-    
+
     <target name="javah" depends="build-javah,jtreg-javah,findbugs-javah"/>
-    
+
     <!-- javap targets -->
 
     <target name="build-bootstrap-javap" depends="-def-build-bootstrap-tool">
@@ -307,85 +315,85 @@
                               includes="${javap.includes}"
                               jarmainclass="sun.tools.javap.Main"/>
     </target>
-    
+
     <target name="build-classes-javap" depends="build-classes-javac">
         <build-classes name="javap" includes="${javap.includes}"/>
     </target>
-    
+
     <target name="build-javap" depends="build-javac">
         <build-tool name="javap"
                     includes="${javap.includes}"
                     jarmainclass="com.sun.tools.javap.Main"
                     jarclasspath="javac.jar"/>
     </target>
-    
+
     <!-- (no javadoc for javap) -->
 
     <target name="jtreg-javap" depends="build-javap,-def-jtreg">
-        <jtreg-tool name="javap" samevm="true" tests="${javap.tests}"/>
+        <jtreg-tool name="javap" tests="${javap.tests}"/>
     </target>
-    
+
     <target name="findbugs-javap" depends="build-javap,-def-findbugs">
         <findbugs-tool name="javap"/>
     </target>
-    
+
     <target name="javap" depends="build-javap,jtreg-javap,findbugs-javap"/>
-    
+
     <!-- apt targets -->
-    
+
     <target name="build-bootstrap-apt" depends="build-bootstrap-javac">
         <build-bootstrap-tool name="apt"
                               includes="${apt.includes}"
                               jarclasspath="javac.jar"/>
     </target>
-    
+
     <target name="build-apt" depends="build-javac">
         <build-tool name="apt"
                     includes="${apt.includes}"
                     jarclasspath="javac.jar"/>
     </target>
-    
+
     <target name="build-classes-apt" depends="build-classes-javac">
         <build-classes name="apt" includes="${apt.includes}"/>
     </target>
-    
+
     <target name="javadoc-apt" depends="build-apt,-def-javadoc-tool">
         <javadoc-tool name="apt" includes="${apt.includes}"/>
     </target>
-    
-    
+
+
     <target name="jtreg-apt" depends="build-apt,-def-jtreg">
-        <jtreg-tool name="apt" samevm="true" tests="${apt.tests}"/>
+        <jtreg-tool name="apt" tests="${apt.tests}"/>
     </target>
-    
+
     <target name="findbugs-apt" depends="build-apt,-def-findbugs">
         <findbugs-tool name="apt"/>
     </target>
-    
+
     <target name="apt" depends="build-apt,jtreg-apt,findbugs-apt"/>
 
     <!-- Check targets -->
-    
+
     <target name="-check-boot.java.home" depends="-def-check">
         <check name="bootstrap java" property="boot.java.home" marker="${java.marker}"/>
     </target>
-    
+
     <target name="-check-target.java.home" depends="-def-check">
         <check name="target java" property="target.java.home" marker="${java.marker}"/>
     </target>
-    
+
     <target name="-check-cobertura.home" depends="-def-check">
         <check name="cobertura" property="cobertura.home" marker="cobertura.jar"/>
     </target>
-    
+
     <target name="-check-findbugs.home" depends="-def-check">
         <check name="findbugs" property="findbugs.home" marker="lib/findbugs.jar"/>
     </target>
-    
+
     <target name="-check-jtreg.home" depends="-def-check">
         <check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/>
     </target>
-    
+
     <!-- Ant macro and preset defs -->
 
     <target name="-def-build-tool" depends="-def-build-jar">
@@ -397,8 +405,8 @@
             <attribute name="classes.dir" default="${build.classes.dir}"/>
             <attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
             <attribute name="lib.dir" default="${dist.lib.dir}"/>
-            <attribute name="java" default="java"/>
-            <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
+            <attribute name="java" default="${launcher.java}"/>
+            <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/>
             <attribute name="javac.java.home" default="${boot.java.home}"/>
             <attribute name="javac.source" default="${javac.source}"/>
             <attribute name="javac.target" default="${javac.target}"/>
@@ -425,8 +433,8 @@
                 <mkdir dir="@{bin.dir}"/>
                 <copy file="${src.bin.dir}/launcher.sh-template" tofile="@{bin.dir}/@{name}">
                     <filterset begintoken="#" endtoken="#">
-                        <filter token="PROGRAM" value="@{name}"/> 
-                        <filter token="TARGET_JAVA" value="@{java}"/> 
+                        <filter token="PROGRAM" value="@{name}"/>
+                        <filter token="TARGET_JAVA" value="@{java}"/>
                     </filterset>
                 </copy>
                 <chmod file="@{bin.dir}/@{name}" perm="ugo+rx"/>
@@ -442,7 +450,7 @@
             <attribute name="classes.dir" default="${build.classes.dir}"/>
             <attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
             <attribute name="lib.dir" default="${dist.lib.dir}"/>
-            <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
+            <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/>
             <attribute name="javac.java.home" default="${boot.java.home}"/>
             <attribute name="javac.source" default="${javac.source}"/>
             <attribute name="javac.target" default="${javac.target}"/>
@@ -467,7 +475,7 @@
                 <jar destfile="@{lib.dir}/@{name}.jar"
                      basedir="@{classes.dir}"
                      includes="@{includes}">
-                    <manifest>    
+                    <manifest>
                         <attribute name="Main-Class" value="@{jarmainclass}"/>
                         <attribute name="Class-Path" value="@{jarclasspath}"/>
                     </manifest>
@@ -530,7 +538,7 @@
                        includeAntRuntime="no"
                        source="@{javac.source}"
                        target="@{javac.target}"
-                       debug="${javac.debug}" 
+                       debug="${javac.debug}"
                        debuglevel="${javac.debuglevel}">
                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
                     <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
@@ -539,7 +547,7 @@
                     <compilerarg line="${javac.lint.opts}"/>
                 </javac>
                 <copy todir="@{classes.dir}">
-                    <fileset dir="${src.classes.dir}"> 
+                    <fileset dir="${src.classes.dir}">
                         <include name="@{includes}"/>
                         <exclude name="**/*.java"/>
                         <exclude name="**/*.properties"/>
@@ -550,7 +558,7 @@
             </sequential>
         </macrodef>
     </target>
-    
+
     <target name="-def-build-bootstrap-tool" depends="-check-boot.java.home,-def-build-tool">
         <presetdef name="build-bootstrap-tool">
             <build-tool
@@ -566,7 +574,7 @@
                 full.version="${bootstrap.full.version}"/>
         </presetdef>
     </target>
-    
+
     <target name="-def-build-bootstrap-jar" depends="-def-build-jar">
         <presetdef name="build-bootstrap-jar">
             <build-jar
@@ -580,19 +588,21 @@
                 full.version="${bootstrap.full.version}"/>
         </presetdef>
     </target>
-    
+
     <target name="-def-pcompile">
         <mkdir dir="${build.toolclasses.dir}"/>
         <javac fork="true"
+               source="${boot.javac.source}"
+               target="${boot.javac.target}"
                executable="${boot.java.home}/bin/javac"
                srcdir="${make.tools.dir}/CompileProperties"
                destdir="${build.toolclasses.dir}/"
                classpath="${ant.home}/lib/ant.jar"/>
         <taskdef name="pcompile"
-                 classname="CompilePropertiesTask" 
+                 classname="CompilePropertiesTask"
                  classpath="${build.toolclasses.dir}/"/>
     </target>
-    
+
     <target name="-def-javadoc-tool" depends="-check-target.java.home">
         <macrodef name="javadoc-tool">
             <attribute name="name"/>
@@ -604,14 +614,14 @@
                 <!-- Note: even with this default value, includes
          from src.classes.dir get javadoc'd; see packageset below -->
                 <property name="javadoc.packagenames" value="none"/> <!-- default, can be overridden per user or per project -->
-                <javadoc 
+                <javadoc
                     executable="${target.java.home}/bin/javadoc"
-                    destdir="${build.javadoc.dir}/@{name}" 
+                    destdir="${build.javadoc.dir}/@{name}"
                     source="@{source}"
-                    windowtitle="UNOFFICIAL" 
-                    failonerror="true" 
+                    windowtitle="UNOFFICIAL"
+                    failonerror="true"
                     use="true"
-                    author="false" 
+                    author="false"
                     version="false"
                     packagenames="${javadoc.packagenames}" >
                     <header><![CDATA[<strong>Unofficial Javadoc</strong> generated from developer sources for preview purposes only]]></header>
@@ -640,8 +650,8 @@
             </sequential>
         </macrodef>
     </target>
-    
-    <target name="-def-jtreg" unless="jtreg.defined" depends="-check-jtreg.home">
+
+    <target name="-def-jtreg" unless="jtreg.defined" depends="-check-jtreg.home,-check-target.java.home">
         <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant">
             <classpath>
                 <pathelement location="${jtreg.home}/lib/jtreg.jar"/>
@@ -652,7 +662,7 @@
             <attribute name="name"/>
             <attribute name="tests"/>
             <attribute name="jdk" default="${target.java.home}"/>
-            <attribute name="samevm" default="false"/>
+            <attribute name="samevm" default="true"/>
             <attribute name="verbose" default="summary"/>
             <attribute name="options" default=""/>
             <attribute name="keywords" default="-keywords:!ignore"/>
@@ -660,9 +670,9 @@
             <sequential>
                 <property name="coverage.options" value=""/>    <!-- default -->
                 <property name="coverage.classpath" value=""/>    <!-- default -->
-                <jtreg 
+                <jtreg
                     dir="${test.dir}"
-                    workDir="${build.jtreg.dir}/@{name}/work" 
+                    workDir="${build.jtreg.dir}/@{name}/work"
                     reportDir="${build.jtreg.dir}/@{name}/report"
                     jdk="@{jdk}"
                     samevm="@{samevm}" verbose="@{verbose}"
@@ -673,7 +683,7 @@
                     <arg line="@{options}"/>
                     <arg line="@{tests}"/>
                 </jtreg>
-                <!-- the next two properties are for convenience, when only 
+                <!-- the next two properties are for convenience, when only
                      a single instance of jtreg will be invoked. -->
                 <condition property="jtreg.passed">
                     <equals arg1="${jtreg.@{name}.result}" arg2="0"/>
@@ -691,9 +701,9 @@
                 <include name="lib/**/*.jar"/>
             </fileset>
         </path>
-	<taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
+        <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
     </target>
-    
+
     <target name="-def-findbugs" unless="findbugs.defined" depends="-check-findbugs.home">
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
             <classpath>
@@ -706,7 +716,7 @@
             <attribute name="outputFile" default=""/>
             <attribute name="reportLevel" default="high"/>
             <sequential>
-                <findbugs 
+                <findbugs
                     home="${findbugs.home}"
                     output="@{output}"
                     outputFile="@{outputFile}"
@@ -727,7 +737,7 @@
         </macrodef>
         <property name="findbugs.defined" value="true"/>
     </target>
-    
+
     <target name="-def-check">
         <macrodef name="check">
             <attribute name="name"/>
@@ -753,7 +763,7 @@
     </target>
 
     <!-- standard JDK target -->
-    <target name="sanity" 
+    <target name="sanity"
         description="display settings of congiguration values">
         <echo level="info">ant.home = ${ant.home}</echo>
         <echo level="info">boot.java.home = ${boot.java.home}</echo>
@@ -769,15 +779,15 @@
 
     <target name="post-sanity" depends="-def-jtreg,sanity,build"
         description="perform basic validation after a standard build">
-        <jtreg 
+        <jtreg
             dir="make/test"
-            workDir="${build.jtreg.dir}/post-sanity/work" 
+            workDir="${build.jtreg.dir}/post-sanity/work"
             reportDir="${build.jtreg.dir}/post-sanity/report"
             jdk="${target.java.home}"
             verbose="summary"
             failonerror="false" resultproperty="jtreg.post-sanity.result">
         </jtreg>
-        
+
     </target>
 </project>
 
diff --git a/langtools/src/share/bin/launcher.sh-template b/langtools/src/share/bin/launcher.sh-template
index 3813678395a..c62af2e9b94 100644
--- a/langtools/src/share/bin/launcher.sh-template
+++ b/langtools/src/share/bin/launcher.sh-template
@@ -45,7 +45,7 @@ if [ "$LANGTOOLS_USE_BOOTCLASSPATH" != "no" ]; then
 fi
 
 # tools currently assumes that assertions are enabled in the launcher
-ea=-ea:com.sun.tools
+ea=-ea:com.sun.tools...
 
 # Any parameters starting with -J are passed to the JVM.
 # All other parameters become parameters of #PROGRAM#.
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java
index 591793d8e0a..5175fd2fcaa 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java
@@ -50,11 +50,17 @@ import java.util.Collection;
  * annotations of those types.  It may freely examine any other program
  * elements in the course of its processing.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.annotation.processing.Processor}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationProcessor {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java
index bdd8277da88..0cd7db8770d 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java
@@ -48,11 +48,17 @@ import com.sun.mirror.util.*;
  * provides a simple way to select just the items of interest
  * when a method returns a collection of declarations.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.annotation.processing.ProcessingEnvironment}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationProcessorEnvironment {
 
     /**
@@ -87,7 +93,6 @@ public interface AnnotationProcessorEnvironment {
     Filer getFiler();
 
 
-
     /**
      * Returns the declarations of the types specified when the
      * annotation processing tool was invoked.
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java
index a2169b1117c..b2b700635b6 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java
@@ -42,11 +42,17 @@ import com.sun.mirror.declaration.AnnotationTypeDeclaration;
  * must provide a public no-argument constructor to be used by tools to
  * instantiate the factory.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.annotation.processing.Processor}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationProcessorFactory {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java
index 89b1e82a168..3c040e6be22 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java
@@ -28,8 +28,15 @@ package com.sun.mirror.apt;
 /**
  * Superinterface for all annotation processor event listeners.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  This interface has no
+ * direct analog in the standardized API because the different round
+ * model renders it unnecessary.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationProcessorListener extends java.util.EventListener {}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java
index c3e8f9496e2..19885c315fa 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java
@@ -31,10 +31,16 @@ import java.util.*;
 /**
  * Utilities to create specialized annotation processors.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  There is no direct analog
+ * of the functionality of this class in the standardized API.
+ *
  * @since 1.5
  * @author Joseph D. Darcy
  * @author Scott Seligman
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public class AnnotationProcessors {
     static class NoOpAP implements AnnotationProcessor {
         NoOpAP() {}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/Filer.java b/langtools/src/share/classes/com/sun/mirror/apt/Filer.java
index 4053a0e0dc6..e85bcda6d3b 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/Filer.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/Filer.java
@@ -51,11 +51,17 @@ import java.io.*;
  * be deleted.  Any subsequent attempt to create the same file during
  * a run will fail.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.annotation.processing.Filer}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface Filer {
 
     /**
@@ -140,7 +146,13 @@ public interface Filer {
 
     /**
      * Locations (subtrees within the file system) where new files are created.
+     *
+     * @deprecated All components of this API have been superseded by
+     * the standardized annotation processing API.  The replacement
+     * for the functionality of this enum is {@link
+     * javax.tools.StandardLocation}.
      */
+    @Deprecated
     enum Location {
         /** The location of new source files. */
         SOURCE_TREE,
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/Messager.java b/langtools/src/share/classes/com/sun/mirror/apt/Messager.java
index 37ab26ae2f2..e25e352436c 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/Messager.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/Messager.java
@@ -25,20 +25,24 @@
 
 package com.sun.mirror.apt;
 
-
 import com.sun.mirror.util.SourcePosition;
 
-
 /**
  * A <tt>Messager</tt> provides the way for
  * an annotation processor to report error messages, warnings, and
  * other notices.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.annotation.processing.Messager}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface Messager {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java b/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java
index a163b9d3f1a..aa94151a0ab 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java
@@ -32,10 +32,17 @@ package com.sun.mirror.apt;
  * cannot meaningfully be serialized because all of the annotation
  * processing tool's internal state would potentially be needed.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  This class has no direct
+ * analog in the standardized API because the different round model
+ * renders it unnecessary.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public abstract class RoundCompleteEvent extends java.util.EventObject {
     private RoundState rs;
 
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java b/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java
index ae460d8f4c9..caefe36b1df 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java
@@ -28,10 +28,17 @@ package com.sun.mirror.apt;
 /**
  * Listener for the completion of a round of annotation processing.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  This interface has no
+ * direct analog in the standardized API because the different round
+ * model renders it unnecessary.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface RoundCompleteListener extends AnnotationProcessorListener {
     /**
      * Invoked after all processors for a round have run to completion.
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/RoundState.java b/langtools/src/share/classes/com/sun/mirror/apt/RoundState.java
index 956899d8574..b39bae2a174 100644
--- a/langtools/src/share/classes/com/sun/mirror/apt/RoundState.java
+++ b/langtools/src/share/classes/com/sun/mirror/apt/RoundState.java
@@ -28,10 +28,17 @@ package com.sun.mirror.apt;
 /**
  * Represents the status of a completed round of annotation processing.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.annotation.processing.RoundEnvironment}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface RoundState {
     /**
      * Returns <tt>true</tt> if this was the last round of annotation
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/package-info.java b/langtools/src/share/classes/com/sun/mirror/apt/package-info.java
new file mode 100644
index 00000000000..b98d789189e
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/mirror/apt/package-info.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * Classes used to communicate information between {@linkplain
+ * com.sun.mirror.apt.AnnotationProcessor annotation processors} and
+ * an annotation processing tool.
+ *
+ * <p>The {@code apt} tool and its associated API have been superseded
+ * by the standardized annotation processing API.  The replacement for
+ * the functionality in this package is {@link
+ * javax.annotation.processing}.
+ *
+ * @since 1.5
+ */
+package com.sun.mirror.apt;
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/package.html b/langtools/src/share/classes/com/sun/mirror/apt/package.html
deleted file mode 100644
index 8330decfd8b..00000000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/package.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-Copyright 2004 Sun Microsystems, Inc.  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.  Sun designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
--->
-
-</head>
-<body bgcolor="white">
-
-Classes used to communicate information between
-{@linkplain com.sun.mirror.apt.AnnotationProcessor annotation processors}
-and an annotation processing tool.
-
-<p>Note that the <code>apt</code> tool and its associated APIs may be
-changed or superseded in future j2se releases.
-
-@since 1.5
-</body>
-</html>
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java
index 03b65de8600..f05e7c62cf2 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java
@@ -38,11 +38,17 @@ import com.sun.mirror.util.SourcePosition;
  * ("<tt>==</tt>").  There is no guarantee that any particular
  * annotation will always be represented by the same object.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.AnnotationMirror}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationMirror {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java
index ed7c14e94cb..dda20902bf5 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java
@@ -32,11 +32,17 @@ import java.util.Collection;
 /**
  * Represents the declaration of an annotation type.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.TypeElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationTypeDeclaration extends InterfaceDeclaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java
index 1864e36b845..2eae91e4335 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java
@@ -29,11 +29,17 @@ package com.sun.mirror.declaration;
 /**
  * Represents an element of an annotation type.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.ExecutableElement}.
+ *
  * @author Joe Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationTypeElementDeclaration extends MethodDeclaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java
index b4f9593262f..a71ae6d5de8 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java
@@ -30,11 +30,17 @@ import com.sun.mirror.util.SourcePosition;
 /**
  * Represents a value of an annotation type element.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.AnnotationValue}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationValue {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java
index 8d86c528314..08168036d7a 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java
@@ -46,13 +46,19 @@ import com.sun.mirror.type.ClassType;
  * provides a simple way to select just the items of interest
  * when a method returns a collection of declarations.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.TypeElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  *
  * @see ClassType
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface ClassDeclaration extends TypeDeclaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java
index 11391f8f8a3..240f45d8165 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java
@@ -29,10 +29,16 @@ package com.sun.mirror.declaration;
 /**
  * Represents a constructor of a class or interface.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.ExecutableElement}.
+ *
  * @author Joe Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface ConstructorDeclaration extends ExecutableDeclaration {
 }
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/Declaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/Declaration.java
index 1cffc6427d7..8c9e8d652dd 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/Declaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/Declaration.java
@@ -44,6 +44,11 @@ import com.sun.mirror.util.*;
  * method.  There is no guarantee that any particular declaration will
  * always be represented by the same object.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.Element}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  *
@@ -51,7 +56,8 @@ import com.sun.mirror.util.*;
  * @see TypeMirror
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface Declaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java
index 60f45b5e460..58db4fa437e 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java
@@ -29,11 +29,17 @@ package com.sun.mirror.declaration;
 /**
  * Represents an enum constant declaration.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.VariableElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface EnumConstantDeclaration extends FieldDeclaration {
     /**
      * {@inheritDoc}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java
index c1026830a1d..96fa36b5944 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java
@@ -32,11 +32,17 @@ import java.util.Collection;
 /**
  * Represents the declaration of an enum type.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.TypeElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface EnumDeclaration extends ClassDeclaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java
index e3b1b3d15ed..1a5d26c78f4 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java
@@ -34,11 +34,17 @@ import com.sun.mirror.type.ReferenceType;
 /**
  * Represents a method or constructor of a class or interface.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.ExecutableElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface ExecutableDeclaration extends MemberDeclaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java
index 656dd89eab5..eb45a08e326 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java
@@ -32,11 +32,17 @@ import com.sun.mirror.type.TypeMirror;
 /**
  * Represents a field of a type declaration.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.VariableElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface FieldDeclaration extends MemberDeclaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java
index 253371acb25..2f69d6d3e68 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java
@@ -40,12 +40,18 @@ import com.sun.mirror.type.InterfaceType;
  * represents an interface <i>type</i>.
  * See {@link TypeDeclaration} for more on this distinction.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.TypeElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  *
  * @see InterfaceType
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface InterfaceDeclaration extends TypeDeclaration {
 }
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java
index 8d5feda5524..ec8f1aa6284 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java
@@ -31,11 +31,17 @@ package com.sun.mirror.declaration;
  * type.  This includes fields, constructors, methods, and (since they
  * may be nested) declared types themselves.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.Element}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface MemberDeclaration extends Declaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java
index d2abeff5c30..d2fc63b7a31 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java
@@ -36,11 +36,17 @@ import com.sun.mirror.type.VoidType;
  * {@linkplain AnnotationTypeElementDeclaration annotation type element}
  * is a kind of method.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.ExecutableElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface MethodDeclaration extends ExecutableDeclaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/Modifier.java b/langtools/src/share/classes/com/sun/mirror/declaration/Modifier.java
index ccd63b4032b..a00563bcbd8 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/Modifier.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/Modifier.java
@@ -35,11 +35,16 @@ package com.sun.mirror.declaration;
  * then it is customary, though not required, that they appear in the same
  * order as the constants listed in the detail section below.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this enum is {@link javax.lang.model.element.Modifier}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public enum Modifier {
 
     // See JLS2 sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1.
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java
index 40c09c8611f..88af259e0d2 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java
@@ -37,11 +37,17 @@ import java.util.Collection;
  * provides a simple way to select just the items of interest
  * when a method returns a collection of declarations.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.PackageElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface PackageDeclaration extends Declaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java
index 28cc7f82b6d..23f9fa82406 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java
@@ -32,11 +32,17 @@ import com.sun.mirror.type.TypeMirror;
 /**
  * Represents a formal parameter of a method or constructor.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.VariableElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface ParameterDeclaration extends Declaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java
index b3d1db54746..5b722db67e6 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java
@@ -54,13 +54,19 @@ import com.sun.mirror.type.*;
  * provides a simple way to select just the items of interest
  * when a method returns a collection of declarations.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.element.TypeElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  *
  * @see DeclaredType
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface TypeDeclaration extends MemberDeclaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java
index 458b39f4312..33f65f90ea2 100644
--- a/langtools/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java
@@ -36,11 +36,17 @@ import com.sun.mirror.type.*;
  * or constructor declaration.
  * A type parameter declares a {@link TypeVariable}.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.TypeParameterElement}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface TypeParameterDeclaration extends Declaration {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/package-info.java b/langtools/src/share/classes/com/sun/mirror/declaration/package-info.java
new file mode 100644
index 00000000000..362b1e78a6b
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/mirror/declaration/package-info.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * Interfaces used to model program element declarations.  A
+ * declaration is represented by the appropriate subinterface of
+ * {@link com.sun.mirror.declaration.Declaration}, and an annotation
+ * is represented as an {@link
+ * com.sun.mirror.declaration.AnnotationMirror}.
+ *
+ * <p>The {@code apt} tool and its associated API have been superseded
+ * by the standardized annotation processing API.  The replacement for
+ * the functionality in this package is {@link
+ * javax.lang.model.element}.
+ *
+ * @since 1.5
+ */
+package com.sun.mirror.declaration;
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/package.html b/langtools/src/share/classes/com/sun/mirror/declaration/package.html
deleted file mode 100644
index 1920d4dbc7b..00000000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/package.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-Copyright 2004 Sun Microsystems, Inc.  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.  Sun designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
--->
-
-</head>
-<body bgcolor="white">
-
-Interfaces used to model program element declarations.
-A declaration is represented by the appropriate subinterface of
-{@link com.sun.mirror.declaration.Declaration},
-and an annotation is represented as an
-{@link com.sun.mirror.declaration.AnnotationMirror}.
-
-<p>Note that the <code>apt</code> tool and its associated APIs may be
-changed or superseded in future j2se releases.
-
-@since 1.5
-</body>
-</html>
diff --git a/langtools/src/share/classes/com/sun/mirror/type/AnnotationType.java b/langtools/src/share/classes/com/sun/mirror/type/AnnotationType.java
index 22db4ca7aca..3d8eca4221c 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/AnnotationType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/AnnotationType.java
@@ -32,11 +32,17 @@ import com.sun.mirror.declaration.AnnotationTypeDeclaration;
 /**
  * Represents an annotation type.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.type.DeclaredType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface AnnotationType extends InterfaceType {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/ArrayType.java b/langtools/src/share/classes/com/sun/mirror/type/ArrayType.java
index 4de386ea7b0..56fdfb7d869 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/ArrayType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/ArrayType.java
@@ -31,11 +31,17 @@ package com.sun.mirror.type;
  * A multidimensional array type is represented as an array type
  * whose component type is also an array type.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.type.ArrayType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface ArrayType extends ReferenceType {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/ClassType.java b/langtools/src/share/classes/com/sun/mirror/type/ClassType.java
index 051fd590dda..fbfc86757fd 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/ClassType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/ClassType.java
@@ -38,11 +38,17 @@ import com.sun.mirror.declaration.*;
  * of a class, a <tt>ClassType</tt> represents a class <i>type</i>.
  * See {@link TypeDeclaration} for more on this distinction.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.type.DeclaredType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface ClassType extends DeclaredType {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/DeclaredType.java b/langtools/src/share/classes/com/sun/mirror/type/DeclaredType.java
index d473b61a9b8..59aaf7e194e 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/DeclaredType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/DeclaredType.java
@@ -48,11 +48,17 @@ import com.sun.mirror.declaration.TypeDeclaration;
  * Other method invocations on such an unknown type will not, in general,
  * return meaningful results.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.type.DeclaredType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface DeclaredType extends ReferenceType {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/EnumType.java b/langtools/src/share/classes/com/sun/mirror/type/EnumType.java
index 90113a9d53b..758cdddca9f 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/EnumType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/EnumType.java
@@ -32,11 +32,17 @@ import com.sun.mirror.declaration.EnumDeclaration;
 /**
  * Represents an enum type.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.type.DeclaredType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface EnumType extends ClassType {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/InterfaceType.java b/langtools/src/share/classes/com/sun/mirror/type/InterfaceType.java
index 8b9068d3f6a..48ec1a23f12 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/InterfaceType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/InterfaceType.java
@@ -39,11 +39,17 @@ import com.sun.mirror.declaration.*;
  * represents an interface <i>type</i>.
  * See {@link TypeDeclaration} for more on this distinction.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.type.DeclaredType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface InterfaceType extends DeclaredType {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/MirroredTypeException.java b/langtools/src/share/classes/com/sun/mirror/type/MirroredTypeException.java
index a0048d9e729..93b22bacc9d 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/MirroredTypeException.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/MirroredTypeException.java
@@ -35,9 +35,16 @@ import com.sun.mirror.declaration.Declaration;
  * Thrown when an application attempts to access the {@link Class} object
  * corresponding to a {@link TypeMirror}.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this exception is {@link
+ * javax.lang.model.type.MirroredTypeException}.
+ *
  * @see MirroredTypesException
  * @see Declaration#getAnnotation(Class)
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public class MirroredTypeException extends RuntimeException {
 
     private static final long serialVersionUID = 1;
diff --git a/langtools/src/share/classes/com/sun/mirror/type/MirroredTypesException.java b/langtools/src/share/classes/com/sun/mirror/type/MirroredTypesException.java
index 8d44ec14e96..f4647e52ffc 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/MirroredTypesException.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/MirroredTypesException.java
@@ -38,9 +38,16 @@ import com.sun.mirror.declaration.Declaration;
  * Thrown when an application attempts to access a sequence of {@link Class}
  * objects each corresponding to a {@link TypeMirror}.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this exception is {@link
+ * javax.lang.model.type.MirroredTypesException}.
+ *
  * @see MirroredTypeException
  * @see Declaration#getAnnotation(Class)
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public class MirroredTypesException extends RuntimeException {
 
     private static final long serialVersionUID = 1;
diff --git a/langtools/src/share/classes/com/sun/mirror/type/PrimitiveType.java b/langtools/src/share/classes/com/sun/mirror/type/PrimitiveType.java
index d9ec2f30fab..aee889e409e 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/PrimitiveType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/PrimitiveType.java
@@ -31,11 +31,17 @@ package com.sun.mirror.type;
  * <tt>boolean</tt>, <tt>byte</tt>, <tt>short</tt>, <tt>int</tt>,
  * <tt>long</tt>, <tt>char</tt>, <tt>float</tt>, and <tt>double</tt>.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.type.PrimitiveType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface PrimitiveType extends TypeMirror {
 
     /**
@@ -47,7 +53,13 @@ public interface PrimitiveType extends TypeMirror {
 
     /**
      * An enumeration of the different kinds of primitive types.
+     *
+     * @deprecated All components of this API have been superseded by
+     * the standardized annotation processing API.  The replacement
+     * for the functionality of this enum is {@link
+     * javax.lang.model.type.TypeKind}.
      */
+    @Deprecated
     enum Kind {
         /** The primitive type <tt>boolean</tt> */      BOOLEAN,
         /** The primitive type <tt>byte</tt> */         BYTE,
diff --git a/langtools/src/share/classes/com/sun/mirror/type/ReferenceType.java b/langtools/src/share/classes/com/sun/mirror/type/ReferenceType.java
index 862eb87caec..c8df04911d2 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/ReferenceType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/ReferenceType.java
@@ -30,10 +30,16 @@ package com.sun.mirror.type;
  * Represents a reference type.
  * These include class and interface types, array types, and type variables.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.type.ReferenceType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface ReferenceType extends TypeMirror {
 }
diff --git a/langtools/src/share/classes/com/sun/mirror/type/TypeMirror.java b/langtools/src/share/classes/com/sun/mirror/type/TypeMirror.java
index 6b3033935b8..9816f00e4d6 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/TypeMirror.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/TypeMirror.java
@@ -43,6 +43,11 @@ import com.sun.mirror.util.TypeVisitor;
  * There is no guarantee that any particular type will
  * always be represented by the same object.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.type.TypeMirror}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  *
@@ -50,7 +55,8 @@ import com.sun.mirror.util.TypeVisitor;
  * @see Types
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface TypeMirror {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/TypeVariable.java b/langtools/src/share/classes/com/sun/mirror/type/TypeVariable.java
index 0c5c097b0f5..8626a2d4332 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/TypeVariable.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/TypeVariable.java
@@ -35,11 +35,17 @@ import com.sun.mirror.declaration.*;
  * {@linkplain TypeParameterDeclaration type parameter} of a
  * type, method, or constructor.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.type.TypeVariable}.
+ *
  * @author Joe Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface TypeVariable extends ReferenceType {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/VoidType.java b/langtools/src/share/classes/com/sun/mirror/type/VoidType.java
index b913e7fdb25..9db96fac7c4 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/VoidType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/VoidType.java
@@ -35,9 +35,15 @@ import com.sun.mirror.declaration.MethodDeclaration;
  * @author Joseph D. Darcy
  * @author Scott Seligman
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is included in {@link
+ * javax.lang.model.type.NoType}.
+ *
  * @see MethodDeclaration#getReturnType()
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface VoidType extends TypeMirror {
 }
diff --git a/langtools/src/share/classes/com/sun/mirror/type/WildcardType.java b/langtools/src/share/classes/com/sun/mirror/type/WildcardType.java
index fc0fa48f767..6cf2141c453 100644
--- a/langtools/src/share/classes/com/sun/mirror/type/WildcardType.java
+++ b/langtools/src/share/classes/com/sun/mirror/type/WildcardType.java
@@ -41,11 +41,17 @@ import java.util.Collection;
  * <tt>extends</tt> clause, its lower bound explicitly set by a
  * <tt>super</tt> clause, or neither (but not both).
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.type.WildcardType}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface WildcardType extends TypeMirror {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/type/package-info.java b/langtools/src/share/classes/com/sun/mirror/type/package-info.java
new file mode 100644
index 00000000000..d45a71dd0a8
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/mirror/type/package-info.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * Interfaces used to model types.  A type is represented by the
+ * appropriate subinterface of {@link com.sun.mirror.type.TypeMirror}.
+ *
+ * <p>The {@code apt} tool and its associated API have been
+ * superseded by the standardized annotation processing API.  The
+ * replacement for the functionality in this package is {@link
+ * javax.lang.model.type}.
+ *
+ * @since 1.5
+ */
+package com.sun.mirror.type;
diff --git a/langtools/src/share/classes/com/sun/mirror/type/package.html b/langtools/src/share/classes/com/sun/mirror/type/package.html
deleted file mode 100644
index cb83900545d..00000000000
--- a/langtools/src/share/classes/com/sun/mirror/type/package.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-Copyright 2004 Sun Microsystems, Inc.  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.  Sun designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
--->
-
-</head>
-<body bgcolor="white">
-
-Interfaces used to model types.
-A type is represented by the appropriate subinterface of
-{@link com.sun.mirror.type.TypeMirror}.
-
-<p>Note that the <code>apt</code> tool and its associated APIs may be
-changed or superseded in future j2se releases.
-
-@since 1.5
-</body>
-</html>
diff --git a/langtools/src/share/classes/com/sun/mirror/util/DeclarationFilter.java b/langtools/src/share/classes/com/sun/mirror/util/DeclarationFilter.java
index 83936dd4e2c..3a64927a3f7 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/DeclarationFilter.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/DeclarationFilter.java
@@ -69,11 +69,17 @@ import static com.sun.mirror.declaration.Modifier.*;
  *                  };
  *     result = nameFilter.filter(decls);               </pre></blockquote>
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this class is {@link
+ * javax.lang.model.util.ElementFilter}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public class DeclarationFilter {
 
     // Predefined filters for convenience.
diff --git a/langtools/src/share/classes/com/sun/mirror/util/DeclarationScanner.java b/langtools/src/share/classes/com/sun/mirror/util/DeclarationScanner.java
index 6dbb275a538..269a5b58f4d 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/DeclarationScanner.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/DeclarationScanner.java
@@ -39,11 +39,17 @@ import com.sun.mirror.declaration.*;
  * are scanned; the postprocessing visitor is called after the
  * contained declarations are scanned.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this class is {@link
+ * javax.lang.model.util.ElementScanner6}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 class DeclarationScanner implements DeclarationVisitor {
     protected DeclarationVisitor pre;
     protected DeclarationVisitor post;
diff --git a/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java b/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java
index 4b3806efefe..56401d4f23c 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java
@@ -37,11 +37,17 @@ import com.sun.mirror.declaration.*;
  * <tt>visit<i>Xxx</i></tt> method applicable to that declaration is
  * invoked.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.ElementVisitor}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface DeclarationVisitor {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java b/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java
index 9188be76ae1..f8e0171d7b0 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java
@@ -28,10 +28,17 @@ package com.sun.mirror.util;
 /**
  * Utilities to create specialized <tt>DeclarationVisitor</tt> instances.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  There is no direct
+ * replacement for the functionality of this class in the standardized
+ * API due to that API's different visitor structure.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 public class DeclarationVisitors {
     private DeclarationVisitors(){} // do not instantiate.
 
diff --git a/langtools/src/share/classes/com/sun/mirror/util/Declarations.java b/langtools/src/share/classes/com/sun/mirror/util/Declarations.java
index fe87fa5a9fa..ec8c9eb6a7c 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/Declarations.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/Declarations.java
@@ -32,11 +32,17 @@ import com.sun.mirror.declaration.*;
 /**
  * Utility methods for operating on declarations.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.util.Elements}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface Declarations {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java b/langtools/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java
index 7b0ed87e894..6be5d834ae0 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java
@@ -37,11 +37,17 @@ import com.sun.mirror.declaration.*;
  * methods that correspond to the kinds of declarations on which it
  * will operate.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this class is {@link
+ * javax.lang.model.util.SimpleElementVisitor6}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public class SimpleDeclarationVisitor implements DeclarationVisitor {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java b/langtools/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java
index eaa37b3dbef..2bea63de137 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java
@@ -37,11 +37,17 @@ import com.sun.mirror.type.*;
  * methods that correspond to the kinds of types on which it will
  * operate.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this class is {@link
+ * javax.lang.model.util.SimpleTypeVisitor6}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public class SimpleTypeVisitor implements TypeVisitor {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java b/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java
index 3b6e62bec12..62b7209dde4 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java
@@ -42,10 +42,17 @@ import java.util.TreeSet;
  * are scanned; the postprocessing visitor is called after the
  * contained declarations are scanned.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this class is {@link
+ * javax.lang.model.util.SimpleElementVisitor6}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
+@Deprecated
+@SuppressWarnings("deprecation")
 class SourceOrderDeclScanner extends DeclarationScanner {
     static class SourceOrderComparator implements java.util.Comparator<Declaration> {
         SourceOrderComparator(){}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/SourcePosition.java b/langtools/src/share/classes/com/sun/mirror/util/SourcePosition.java
index f300d3c19ab..766cae4f645 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/SourcePosition.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/SourcePosition.java
@@ -32,11 +32,20 @@ import java.io.File;
 /**
  * Represents a position in a source file.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  There is no direct
+ * replacement for the functionality of this interface since the
+ * standardized {@link javax.annotation.processing.Messager Messager}
+ * API implicitly takes a source position argument via any element,
+ * annotation mirror, or annotation value passed along with the
+ * message.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface SourcePosition {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/util/TypeVisitor.java b/langtools/src/share/classes/com/sun/mirror/util/TypeVisitor.java
index 4df15f551d6..4216617d4f3 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/TypeVisitor.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/TypeVisitor.java
@@ -38,11 +38,17 @@ import com.sun.mirror.type.*;
  * the most specific <tt>visit<i>Xxx</i></tt> method applicable to
  * that type is invoked.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.element.TypeVisitor}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface TypeVisitor {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/util/Types.java b/langtools/src/share/classes/com/sun/mirror/util/Types.java
index 8bb2512105f..4324f59b035 100644
--- a/langtools/src/share/classes/com/sun/mirror/util/Types.java
+++ b/langtools/src/share/classes/com/sun/mirror/util/Types.java
@@ -35,11 +35,17 @@ import com.sun.mirror.type.*;
 /**
  * Utility methods for operating on types.
  *
+ * @deprecated All components of this API have been superseded by the
+ * standardized annotation processing API.  The replacement for the
+ * functionality of this interface is {@link
+ * javax.lang.model.util.Types}.
+ *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @since 1.5
  */
-
+@Deprecated
+@SuppressWarnings("deprecation")
 public interface Types {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/mirror/util/package-info.java b/langtools/src/share/classes/com/sun/mirror/util/package-info.java
new file mode 100644
index 00000000000..9a74f19a7d1
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/mirror/util/package-info.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/**
+ * Utilities to assist in the processing of {@linkplain
+ * com.sun.mirror.declaration declarations} and {@linkplain
+ * com.sun.mirror.type types}.
+ *
+ * <p>The {@code apt} tool and its associated API have been superseded
+ * by the standardized annotation processing API.  The replacement for
+ * the functionality in this package is {@link javax.lang.model.util}.
+ *
+ * @since 1.5
+ */
+package com.sun.mirror.util;
diff --git a/langtools/src/share/classes/com/sun/mirror/util/package.html b/langtools/src/share/classes/com/sun/mirror/util/package.html
deleted file mode 100644
index ef3e71d8dea..00000000000
--- a/langtools/src/share/classes/com/sun/mirror/util/package.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-Copyright 2004 Sun Microsystems, Inc.  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.  Sun designates this
-particular file as subject to the "Classpath" exception as provided
-by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-CA 95054 USA or visit www.sun.com if you need additional information or
-have any questions.
--->
-
-</head>
-<body bgcolor="white">
-
-Utilities to assist in the processing of {@linkplain
-com.sun.mirror.declaration declarations} and {@linkplain
-com.sun.mirror.type types}.
-
-<p>Note that the <code>apt</code> tool and its associated APIs may be
-changed or superseded in future j2se releases.
-
-@since 1.5
-</body>
-</html>
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
index 68d5a458a66..fcdf29d461a 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
@@ -65,6 +65,7 @@ import static com.sun.tools.apt.mirror.declaration.DeclarationMaker.isJavaIdenti
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
  */
+@SuppressWarnings("deprecation")
 public class Apt extends ListBuffer<Env<AttrContext>> {
     java.util.Set<String> genSourceFileNames = new java.util.LinkedHashSet<String>();
     public java.util.Set<String> getSourceFileNames() {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java b/langtools/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java
index edc71a269f2..2753d734f89 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java
@@ -29,6 +29,7 @@ import java.util.*;
 import com.sun.mirror.apt.*;
 import com.sun.mirror.declaration.AnnotationTypeDeclaration;
 
+@SuppressWarnings("deprecation")
 public class BootstrapAPF implements AnnotationProcessorFactory {
 
     static final Collection<String> supportedOptions =
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/PrintAP.java b/langtools/src/share/classes/com/sun/tools/apt/comp/PrintAP.java
index 59f9e7bdd80..a2715b2ff85 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/PrintAP.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/comp/PrintAP.java
@@ -36,6 +36,7 @@ import com.sun.mirror.util.*;
 /**
  * Class used to implement "-print" option.
  */
+@SuppressWarnings("deprecation")
 public class PrintAP implements AnnotationProcessor {
 
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java b/langtools/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java
index 219cd8acb09..cc6aada5508 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java
@@ -50,6 +50,7 @@ import com.sun.tools.javac.parser.DocCommentScanner;
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
  */
+@SuppressWarnings("deprecation")
 public class JavaCompiler extends com.sun.tools.javac.main.JavaCompiler {
     /** The context key for the compiler. */
     protected static final Context.Key<JavaCompiler> compilerKey =
diff --git a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java b/langtools/src/share/classes/com/sun/tools/apt/main/Main.java
index 7783652979d..d8e9aac768e 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/main/Main.java
@@ -64,6 +64,7 @@ import com.sun.mirror.apt.AnnotationProcessorFactory;
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
  */
+@SuppressWarnings("deprecation")
 public class Main {
 
     /** For testing: enter any options you want to be set implicitly
@@ -780,7 +781,6 @@ public class Main {
         // prefixed to command line arguments.
         processArgs(forcedOpts);
 
-
         /*
          * A run of apt only gets passed the most recently generated
          * files; the initial run of apt gets passed the files from
@@ -792,6 +792,11 @@ public class Main {
             // assign args the result of parse to capture results of
             // '@file' expansion
             origFilenames = processArgs((args=CommandLine.parse(args)));
+
+            if (options.get("suppress-tool-api-removal-message") == null) {
+                Bark.printLines(out, getLocalizedString("misc.Deprecation"));
+            }
+
             if (origFilenames == null) {
                 return EXIT_CMDERR;
             } else if (origFilenames.size() == 0) {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java
index f5e5b1a8ffd..4279a970da4 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java
@@ -39,7 +39,7 @@ import com.sun.tools.javac.util.Names;
 /**
  * The environment for a run of apt.
  */
-
+@SuppressWarnings("deprecation")
 public class AptEnv {
 
     public Names names;                 // javac's name table
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java
index 974d464a330..0e3730332e0 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java
@@ -47,6 +47,7 @@ import static com.sun.mirror.util.DeclarationVisitors.*;
 /*
  * Annotation Processor Environment implementation.
  */
+@SuppressWarnings("deprecation")
 public class AnnotationProcessorEnvironmentImpl implements AnnotationProcessorEnvironment {
 
     Collection<TypeDeclaration> spectypedecls;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java
index fb01d6b33d5..983eea0f7ca 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java
@@ -45,7 +45,7 @@ import static com.sun.mirror.apt.Filer.Location.*;
 /**
  * Implementation of Filer.
  */
-
+@SuppressWarnings("deprecation")
 public class FilerImpl implements Filer {
     /*
      * The Filer class must maintain a number of constraints.  First,
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java
index 12808476d51..903793f0c5f 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java
@@ -38,7 +38,7 @@ import com.sun.tools.apt.util.Bark;
 /**
  * Implementation of Messager.
  */
-
+@SuppressWarnings("deprecation")
 public class MessagerImpl implements Messager {
     private final Bark bark;
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java
index 4a4988af516..7046b1a7c5c 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java
@@ -29,6 +29,7 @@ import com.sun.mirror.apt.AnnotationProcessorEnvironment;
 import com.sun.mirror.apt.RoundCompleteEvent;
 import com.sun.mirror.apt.RoundState;
 
+@SuppressWarnings("deprecation")
 public class RoundCompleteEventImpl extends RoundCompleteEvent {
     private static final long serialVersionUID = 7067621446720784300L;
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java
index 28edfde00a3..70dbc271ef1 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java
@@ -28,6 +28,7 @@ package com.sun.tools.apt.mirror.apt;
 import com.sun.mirror.apt.RoundState;
 import java.util.Map;
 
+@SuppressWarnings("deprecation")
 public class RoundStateImpl implements RoundState {
     private final boolean finalRound;
     private final boolean errorRaised;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java
index acde7c6cdd7..226908a8d61 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java
@@ -42,7 +42,7 @@ import com.sun.tools.javac.util.Pair;
 /**
  * Implementation of AnnotationMirror
  */
-
+@SuppressWarnings("deprecation")
 public class AnnotationMirrorImpl implements AnnotationMirror {
 
     protected final AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java
index 40eb0d68e12..e1b5ba80918 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java
@@ -49,7 +49,7 @@ import com.sun.tools.javac.util.Pair;
  * <p> The "dynamic proxy return form" of an attribute element value is
  * the form used by sun.reflect.annotation.AnnotationInvocationHandler.
  */
-
+@SuppressWarnings("deprecation")
 class AnnotationProxyMaker {
 
     private final AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java
index 59a9e6f834f..494522a6bef 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java
@@ -37,7 +37,7 @@ import com.sun.tools.javac.code.Symbol.*;
 /**
  * Implementation of AnnotationTypeDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class AnnotationTypeDeclarationImpl extends InterfaceDeclarationImpl
                                            implements AnnotationTypeDeclaration
 {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java
index c6086385aa8..d63ddc37006 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java
@@ -35,7 +35,7 @@ import com.sun.tools.javac.code.Symbol.MethodSymbol;
 /**
  * Implementation of AnnotationTypeElementDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class AnnotationTypeElementDeclarationImpl extends MethodDeclarationImpl
                                   implements AnnotationTypeElementDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java
index a217393c375..b99bb8a2db6 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java
@@ -40,7 +40,7 @@ import com.sun.tools.javac.code.TypeTags;
 /**
  * Implementation of AnnotationValue
  */
-
+@SuppressWarnings("deprecation")
 public class AnnotationValueImpl implements AnnotationValue {
 
     protected final AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java
index 600be2906b7..1359d16ea12 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java
@@ -42,7 +42,7 @@ import com.sun.tools.javac.code.Symbol.*;
 /**
  * Implementation of ClassDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class ClassDeclarationImpl extends TypeDeclarationImpl
                                   implements ClassDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java
index ba2afd8b47e..63ed3cfa325 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java
@@ -39,6 +39,7 @@ import static com.sun.tools.javac.code.TypeTags.*;
 /**
  * Utility class for operating on constant expressions.
  */
+@SuppressWarnings("deprecation")
 class Constants {
 
     /**
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java
index 936dfd8145e..3943100bf0f 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java
@@ -39,7 +39,7 @@ import com.sun.tools.javac.code.Symbol.MethodSymbol;
 /**
  * Implementation of ConstructorDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class ConstructorDeclarationImpl extends ExecutableDeclarationImpl
                                         implements ConstructorDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java
index bb2b097aba8..e441424073b 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java
@@ -52,7 +52,7 @@ import static com.sun.tools.javac.code.Kinds.*;
 /**
  * Implementation of Declaration
  */
-
+@SuppressWarnings("deprecation")
 public abstract class DeclarationImpl implements Declaration {
 
     protected final AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java
index 09eeee29ab2..cd90a964ba9 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java
@@ -40,7 +40,7 @@ import com.sun.tools.javac.main.JavaCompiler;
 /**
  * Utilities for constructing and caching declarations.
  */
-
+@SuppressWarnings("deprecation")
 public class DeclarationMaker {
 
     private AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java
index 7d4ae315bf3..17191cc8b9f 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java
@@ -35,7 +35,7 @@ import com.sun.tools.javac.code.Symbol.VarSymbol;
 /**
  * Implementation of EnumConstantDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class EnumConstantDeclarationImpl extends FieldDeclarationImpl
                                          implements EnumConstantDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java
index 2a498d24a77..ed882d43d35 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java
@@ -37,7 +37,7 @@ import com.sun.tools.javac.code.Symbol.*;
 /**
  * Implementation of EnumDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class EnumDeclarationImpl extends ClassDeclarationImpl
                                  implements EnumDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java
index b5d758fef51..ae4d92fc80f 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java
@@ -39,7 +39,7 @@ import com.sun.tools.javac.code.Symbol.*;
 /**
  * Implementation of ExecutableDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public abstract class ExecutableDeclarationImpl extends MemberDeclarationImpl
                                              implements ExecutableDeclaration {
     public MethodSymbol sym;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java
index 2ab22fdea4f..14eaefe3024 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java
@@ -40,7 +40,7 @@ import com.sun.tools.javac.code.TypeTags;
 /**
  * Implementation of FieldDeclaration
  */
-
+@SuppressWarnings("deprecation")
 class FieldDeclarationImpl extends MemberDeclarationImpl
                                   implements FieldDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java
index 866c66d9dc8..ee251c30f35 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java
@@ -35,7 +35,7 @@ import com.sun.tools.javac.code.Symbol.*;
 /**
  * Implementation of InterfaceDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class InterfaceDeclarationImpl extends TypeDeclarationImpl
                                       implements InterfaceDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java
index e47d706332e..3da4b4313c7 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java
@@ -40,7 +40,7 @@ import com.sun.tools.javac.code.Type;
 /**
  * Implementation of MemberDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public abstract class MemberDeclarationImpl extends DeclarationImpl
                                             implements MemberDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java
index fff004122b7..29c16b2116e 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java
@@ -36,7 +36,7 @@ import com.sun.tools.javac.code.Symbol.MethodSymbol;
 /**
  * Implementation of MethodDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class MethodDeclarationImpl extends ExecutableDeclarationImpl
                                    implements MethodDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java
index 2edbeb4314b..1f11b1d5729 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java
@@ -39,7 +39,7 @@ import com.sun.tools.javac.code.Symbol.*;
 /**
  * Implementation of PackageDeclaration.
  */
-
+@SuppressWarnings("deprecation")
 public class PackageDeclarationImpl extends DeclarationImpl
                                     implements PackageDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java
index 9016b8073fd..66890da2b63 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java
@@ -39,7 +39,7 @@ import com.sun.tools.javac.code.Symbol.VarSymbol;
 /**
  * Implementation of ParameterDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class ParameterDeclarationImpl extends DeclarationImpl
                                       implements ParameterDeclaration
 {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java
index d67d6f21e10..7deeb7cf112 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java
@@ -40,7 +40,7 @@ import com.sun.tools.javac.util.Name;
 /**
  * Implementation of TypeDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class TypeDeclarationImpl extends MemberDeclarationImpl
                                  implements TypeDeclaration {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java
index b169f47509f..765a11e7487 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java
@@ -40,7 +40,7 @@ import com.sun.tools.javac.code.Symbol.*;
 /**
  * Implementation of TypeParameterDeclaration
  */
-
+@SuppressWarnings("deprecation")
 public class TypeParameterDeclarationImpl extends DeclarationImpl
                                           implements TypeParameterDeclaration
 {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java
index e39a30dabeb..495bc138b01 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java
@@ -36,7 +36,7 @@ import com.sun.tools.javac.code.Type;
 /**
  * Implementation of AnnotationType
  */
-
+@SuppressWarnings("deprecation")
 public class AnnotationTypeImpl extends InterfaceTypeImpl
                                 implements AnnotationType {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java
index 8c1458be77f..5d62c01445c 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java
@@ -35,7 +35,7 @@ import com.sun.tools.javac.code.Type;
 /**
  * Implementation of ArrayType
  */
-
+@SuppressWarnings("deprecation")
 public class ArrayTypeImpl extends TypeMirrorImpl implements ArrayType {
 
     protected Type.ArrayType type;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java
index a4b9fd230b3..dd824191499 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java
@@ -36,7 +36,7 @@ import com.sun.tools.javac.code.Type;
 /**
  * Implementation of ClassType
  */
-
+@SuppressWarnings("deprecation")
 public class ClassTypeImpl extends DeclaredTypeImpl implements ClassType {
 
     ClassTypeImpl(AptEnv env, Type.ClassType type) {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java
index 81683248c4a..b5a815dc864 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java
@@ -38,7 +38,7 @@ import com.sun.tools.javac.code.Symbol.ClassSymbol;
 /**
  * Implementation of DeclaredType
  */
-
+@SuppressWarnings("deprecation")
 abstract class DeclaredTypeImpl extends TypeMirrorImpl
                                 implements DeclaredType {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java
index 883a3ec1ec8..c2d634678e1 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java
@@ -36,7 +36,7 @@ import com.sun.tools.javac.code.Type;
 /**
  * Implementation of EnumType
  */
-
+@SuppressWarnings("deprecation")
 public class EnumTypeImpl extends ClassTypeImpl implements EnumType {
 
     EnumTypeImpl(AptEnv env, Type.ClassType type) {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java
index 3e056deeef8..167ea9b50d2 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java
@@ -36,7 +36,7 @@ import com.sun.tools.javac.code.Type;
 /**
  * Implementation of InterfaceType
  */
-
+@SuppressWarnings("deprecation")
 public class InterfaceTypeImpl extends DeclaredTypeImpl
                                implements InterfaceType {
 
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java
index e176d5b487e..bf186620a11 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java
@@ -38,7 +38,7 @@ import static com.sun.mirror.type.PrimitiveType.Kind.*;
 /**
  * Implementation of PrimitiveType.
  */
-
+@SuppressWarnings("deprecation")
 class PrimitiveTypeImpl extends TypeMirrorImpl implements PrimitiveType {
 
     private final Kind kind;    // the kind of primitive
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java
index 70d322b5371..d9829784100 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java
@@ -41,7 +41,7 @@ import static com.sun.tools.javac.code.TypeTags.*;
 /**
  * Utilities for constructing type objects.
  */
-
+@SuppressWarnings("deprecation")
 public class TypeMaker {
 
     private final AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java
index 964cd8abdea..2fa704a053c 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java
@@ -35,7 +35,7 @@ import com.sun.tools.javac.code.*;
 /**
  * Implementation of TypeMirror
  */
-
+@SuppressWarnings("deprecation")
 public abstract class TypeMirrorImpl implements TypeMirror {
 
     protected final AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java
index 9e65c82f8e8..43119bd7d94 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java
@@ -40,7 +40,7 @@ import com.sun.tools.javac.code.Type;
 /**
  * Implementation of TypeVariable
  */
-
+@SuppressWarnings("deprecation")
 public class TypeVariableImpl extends TypeMirrorImpl implements TypeVariable {
 
     protected Type.TypeVar type;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java
index 7f9a7bc2989..41e9ca1dbca 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java
@@ -34,7 +34,7 @@ import com.sun.tools.apt.mirror.AptEnv;
 /**
  * Implementation of VoidType.
  */
-
+@SuppressWarnings("deprecation")
 class VoidTypeImpl extends TypeMirrorImpl implements VoidType {
 
     VoidTypeImpl(AptEnv env) {
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java
index 9bda06f994d..6221e8ce7a7 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java
@@ -41,7 +41,7 @@ import com.sun.tools.javac.code.Symbol.*;
 /**
  * Implementation of WildcardType
  */
-
+@SuppressWarnings("deprecation")
 public class WildcardTypeImpl extends TypeMirrorImpl implements WildcardType {
 
     protected Type.WildcardType type;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java
index f6008e0618d..106c7136d70 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java
@@ -42,7 +42,7 @@ import static com.sun.tools.javac.code.Kinds.*;
 /**
  * Implementation of Declarations utility methods for annotation processors
  */
-
+@SuppressWarnings("deprecation")
 public class DeclarationsImpl implements Declarations {
 
     private final AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java
index d76d0eb3968..7da66d6faa7 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java
@@ -36,7 +36,7 @@ import com.sun.tools.javac.util.Position;
 /**
  * Implementation of SourcePosition
  */
-
+@SuppressWarnings("deprecation")
 public class SourcePositionImpl implements SourcePosition {
 
     private JavaFileObject sourcefile;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java
index 8ada36ded5f..237bd58bf30 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java
@@ -44,7 +44,7 @@ import com.sun.tools.javac.util.ListBuffer;
 /**
  * Implementation of Types utility methods for annotation processors
  */
-
+@SuppressWarnings("deprecation")
 public class TypesImpl implements Types {
 
     private final AptEnv env;
diff --git a/langtools/src/share/classes/com/sun/tools/apt/resources/apt.properties b/langtools/src/share/classes/com/sun/tools/apt/resources/apt.properties
index 80446a08931..97605c32fa2 100644
--- a/langtools/src/share/classes/com/sun/tools/apt/resources/apt.properties
+++ b/langtools/src/share/classes/com/sun/tools/apt/resources/apt.properties
@@ -111,6 +111,14 @@ apt.err.Messager=\
 ## miscellaneous strings
 ##
 
+apt.misc.Deprecation=\
+    \nwarning:\u0020The apt tool and its associated API are planned to be\n\
+    removed in the next major JDK release.  These features have been\n\
+    superseded by javac and the standardized annotation processing API,\n\
+    javax.annotation.processing and javax.lang.model.  Users are\n\
+    recommended to migrate to the annotation processing features of\n\
+    javac; see the javac man page for more information.\n
+
 apt.misc.Problem=\
     Problem encountered during annotation processing; \nsee stacktrace below for more information.
 
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java b/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
index 2cfc363d995..a8b51bf9546 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/AccessFlags.java
@@ -76,6 +76,10 @@ public class AccessFlags {
         return (flags & mask) != 0;
     }
 
+    public int byteLength() {
+        return 2;
+    }
+
     private static final int[] classModifiers = {
         ACC_PUBLIC, ACC_FINAL, ACC_ABSTRACT, ACC_MODULE
     };
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
index ccb50b58675..326de77a7c9 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Attribute.java
@@ -166,6 +166,10 @@ public abstract class Attribute {
 
     public abstract <R,D> R accept(Attribute.Visitor<R,D> visitor, D data);
 
+    public int byteLength() {
+        return 6 + attribute_length;
+    }
+
     public final int attribute_name_index;
     public final int attribute_length;
 
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java b/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java
index d3ea27f7337..6f61a1d6e75 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Attributes.java
@@ -95,6 +95,13 @@ public class Attributes implements Iterable<Attribute> {
         return attrs.length;
     }
 
+    public int byteLength() {
+        int length = 2;
+        for (Attribute a: attrs)
+            length += a.byteLength();
+        return length;
+    }
+
     public final Attribute[] attrs;
     public final Map<String, Attribute> map;
 }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
index 8a668660cc5..1ecfd82e575 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java
@@ -58,7 +58,7 @@ public class CharacterRangeTable_attribute  extends Attribute {
     }
 
     public CharacterRangeTable_attribute(int name_index, Entry[] character_range_table) {
-        super(name_index, character_range_table.length * Entry.length());
+        super(name_index, 2 + character_range_table.length * Entry.length());
         this.character_range_table = character_range_table;
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java b/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
index 4be151d31f6..8efe7ebe912 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassFile.java
@@ -139,6 +139,38 @@ public class ClassFile {
         return access_flags.is(ACC_INTERFACE);
     }
 
+    public int byteLength() {
+        return  4 +     // magic
+                2 +     // minor
+                2 +     // major
+                constant_pool.byteLength() +
+                2 +     // access flags
+                2 +     // this_class
+                2 +     // super_class
+                byteLength(interfaces) +
+                byteLength(fields) +
+                byteLength(methods) +
+                attributes.byteLength();
+    }
+
+    private int byteLength(int[] indices) {
+        return 2 + 2 * indices.length;
+    }
+
+    private int byteLength(Field[] fields) {
+        int length = 2;
+        for (Field f: fields)
+            length += f.byteLength();
+        return length;
+    }
+
+    private int byteLength(Method[] methods) {
+        int length = 2;
+        for (Method m: methods)
+            length += m.byteLength();
+        return length;
+    }
+
     public final int magic;
     public final int minor_version;
     public final int major_version;
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
index 96ae0cfa452..8f8a6edab5e 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ClassWriter.java
@@ -435,7 +435,7 @@ public class ClassWriter {
         }
 
         public Void visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, ClassOutputStream out) {
-            out.writeByte(attr.local_variable_table.length);
+            out.writeShort(attr.local_variable_table.length);
             for (LocalVariableTypeTable_attribute.Entry e: attr.local_variable_table)
                 writeLocalVariableTypeTableEntry(e, out);
             return null;
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java b/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
index 2f1dc357e64..ba53f2d2a24 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ConstantPool.java
@@ -25,7 +25,9 @@
 
 package com.sun.tools.classfile;
 
+import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.Iterator;
 
 /**
@@ -179,6 +181,16 @@ public class ConstantPool {
         return pool.length;
     }
 
+    public int byteLength() {
+        int length = 2;
+        for (int i = 1; i < size(); ) {
+            CPInfo cpInfo = pool[i];
+            length += cpInfo.byteLength();
+            i += cpInfo.size();
+        }
+        return length;
+    }
+
     public CPInfo get(int index) throws InvalidIndex {
         if (index <= 0 || index >= pool.length)
             throw new InvalidIndex(index);
@@ -291,6 +303,8 @@ public class ConstantPool {
             return 1;
         }
 
+        public abstract int byteLength();
+
         public abstract <R,D> R accept(Visitor<R,D> visitor, D data);
 
         protected final ConstantPool cp;
@@ -315,6 +329,10 @@ public class ConstantPool {
             return tag;
         }
 
+        public int byteLength() {
+            return 5;
+        }
+
         public CONSTANT_Class_info getClassInfo() throws ConstantPoolException {
             return cp.getClassInfo(class_index);
         }
@@ -347,6 +365,10 @@ public class ConstantPool {
             return CONSTANT_Class;
         }
 
+        public int  byteLength() {
+            return 3;
+        }
+
         public String getName() throws ConstantPoolException {
             return cp.getUTF8Value(name_index);
         }
@@ -390,6 +412,10 @@ public class ConstantPool {
             return CONSTANT_Double;
         }
 
+        public int  byteLength() {
+            return 9;
+        }
+
         @Override
         public int size() {
             return 2;
@@ -439,6 +465,10 @@ public class ConstantPool {
             return CONSTANT_Float;
         }
 
+        public int byteLength() {
+            return 5;
+        }
+
         @Override
         public String toString() {
             return "CONSTANT_Float_info[value: " + value + "]";
@@ -464,6 +494,10 @@ public class ConstantPool {
             return CONSTANT_Integer;
         }
 
+        public int byteLength() {
+            return 5;
+        }
+
         @Override
         public String toString() {
             return "CONSTANT_Integer_info[value: " + value + "]";
@@ -513,6 +547,10 @@ public class ConstantPool {
             return 2;
         }
 
+        public int byteLength() {
+            return 9;
+        }
+
         @Override
         public String toString() {
             return "CONSTANT_Long_info[value: " + value + "]";
@@ -561,6 +599,10 @@ public class ConstantPool {
             return CONSTANT_NameAndType;
         }
 
+        public int byteLength() {
+            return 5;
+        }
+
         public String getName() throws ConstantPoolException {
             return cp.getUTF8Value(name_index);
         }
@@ -597,6 +639,10 @@ public class ConstantPool {
             return CONSTANT_String;
         }
 
+        public int byteLength() {
+            return 3;
+        }
+
         public String getString() throws ConstantPoolException {
             return cp.getUTF8Value(string_index);
         }
@@ -626,6 +672,20 @@ public class ConstantPool {
             return CONSTANT_Utf8;
         }
 
+        public int byteLength() {
+            class SizeOutputStream extends OutputStream {
+                @Override
+                public void write(int b) throws IOException {
+                    size++;
+                }
+                int size;
+            }
+            SizeOutputStream sizeOut = new SizeOutputStream();
+            DataOutputStream out = new DataOutputStream(sizeOut);
+            try { out.writeUTF(value); } catch (IOException ignore) { }
+            return 1 + sizeOut.size;
+        }
+
         @Override
         public String toString() {
             if (value.length() < 32 && isPrintableAscii(value))
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java b/langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
index 252754884a2..bb7b017dfc2 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
@@ -260,9 +260,6 @@ public class ExtendedAnnotation {
         // For generic/array types.
         public List<Integer> location = new ArrayList<Integer>();
 
-        // Tree position.
-        public int pos = -1;
-
         // For typecasts, type tests, new (and locals, as start_pc).
         public int offset = -1;
 
@@ -357,6 +354,7 @@ public class ExtendedAnnotation {
                 sb.append(type_index);
                 break;
             case CLASS_LITERAL:
+            case CLASS_LITERAL_GENERIC_OR_ARRAY:
                 sb.append(", offset = ");
                 sb.append(offset);
                 break;
@@ -390,9 +388,6 @@ public class ExtendedAnnotation {
                 sb.append(")");
             }
 
-            sb.append(", pos = ");
-            sb.append(pos);
-
             sb.append(']');
             return sb.toString();
         }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Field.java b/langtools/src/share/classes/com/sun/tools/classfile/Field.java
index a98f73fda3a..87ecea98cdb 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Field.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Field.java
@@ -50,6 +50,10 @@ public class Field {
         this.attributes = attributes;
     }
 
+    public int byteLength() {
+        return 6 + attributes.byteLength();
+    }
+
     public String getName(ConstantPool constant_pool) throws ConstantPoolException {
         return constant_pool.getUTF8Value(name_index);
     }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
index 999e89ac507..a26d9c7f86d 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java
@@ -50,7 +50,7 @@ public class LineNumberTable_attribute extends Attribute {
     }
 
     public LineNumberTable_attribute(int name_index, Entry[] line_number_table) {
-        super(name_index, line_number_table.length * Entry.length());
+        super(name_index, 2 + line_number_table.length * Entry.length());
         this.line_number_table_length = line_number_table.length;
         this.line_number_table = line_number_table;
     }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
index 0975132c373..c33edfbfd5f 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java
@@ -50,7 +50,7 @@ public class LocalVariableTable_attribute extends Attribute {
     }
 
     public LocalVariableTable_attribute(int name_index, Entry[] local_variable_table) {
-        super(name_index, local_variable_table.length * Entry.length());
+        super(name_index, 2 + local_variable_table.length * Entry.length());
         this.local_variable_table_length = local_variable_table.length;
         this.local_variable_table = local_variable_table;
     }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
index 0cf4588411a..d98d5b5c02f 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java
@@ -50,7 +50,7 @@ public class LocalVariableTypeTable_attribute extends Attribute {
     }
 
     public LocalVariableTypeTable_attribute(int name_index, Entry[] local_variable_table) {
-        super(name_index, local_variable_table.length * Entry.length());
+        super(name_index, 2 + local_variable_table.length * Entry.length());
         this.local_variable_table_length = local_variable_table.length;
         this.local_variable_table = local_variable_table;
     }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/Method.java b/langtools/src/share/classes/com/sun/tools/classfile/Method.java
index 4018bdc2588..4ad92d586a7 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/Method.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/Method.java
@@ -50,6 +50,10 @@ public class Method {
         this.attributes = attributes;
     }
 
+    public int byteLength() {
+        return 6 + attributes.byteLength();
+    }
+
     public String getName(ConstantPool constant_pool) throws ConstantPoolException {
         return constant_pool.getUTF8Value(name_index);
     }
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ModuleExportTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/ModuleExportTable_attribute.java
index 5bb0679f117..74cc3b395c6 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ModuleExportTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ModuleExportTable_attribute.java
@@ -50,7 +50,7 @@ public class ModuleExportTable_attribute extends Attribute {
     }
 
     public ModuleExportTable_attribute(int name_index, int[] export_type_table) {
-        super(name_index, 2 * export_type_table.length);
+        super(name_index, 2 + 2 * export_type_table.length);
         this.export_type_table = export_type_table;
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/classfile/ModuleMemberTable_attribute.java b/langtools/src/share/classes/com/sun/tools/classfile/ModuleMemberTable_attribute.java
index eb679cc9ed4..c5eaf78eff5 100644
--- a/langtools/src/share/classes/com/sun/tools/classfile/ModuleMemberTable_attribute.java
+++ b/langtools/src/share/classes/com/sun/tools/classfile/ModuleMemberTable_attribute.java
@@ -49,7 +49,7 @@ public class ModuleMemberTable_attribute extends Attribute {
     }
 
     public ModuleMemberTable_attribute(int name_index, int[] package_member_table) {
-        super(name_index, 2 * package_member_table.length);
+        super(name_index, 2 + 2 * package_member_table.length);
         this.package_member_table = package_member_table;
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
index fa1f6181782..a88acc9b314 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 
 <!--
- Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ Copyright 2003-2009 Sun Microsystems, Inc.  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
@@ -44,7 +44,7 @@
         <PackageTags/>
         <PackageFooter/>
     </PackageDoc>
-    
+
     <AnnotationTypeDoc>
         <AnnotationTypeHeader/>
         <DeprecationInfo/>
@@ -52,7 +52,7 @@
         <AnnotationTypeDescription/>
         <AnnotationTypeTagInfo/>
         <MemberSummary>
-        	<AnnotationTypeRequiredMemberSummary/>
+                <AnnotationTypeRequiredMemberSummary/>
             <AnnotationTypeOptionalMemberSummary/>
         </MemberSummary>
         <AnnotationTypeRequiredMemberDetails>
@@ -77,16 +77,16 @@
                 <MemberFooter/>
             </AnnotationTypeOptionalMember>
             <Footer/>
-        </AnnotationTypeOptionalMemberDetails>        
+        </AnnotationTypeOptionalMemberDetails>
         <AnnotationTypeFooter/>
     </AnnotationTypeDoc>
-    
+
     <ClassDoc>
         <ClassHeader/>
         <ClassTree/>
         <TypeParamInfo/>
         <SuperInterfacesInfo/>
-        <ImplementedInterfacesInfo/>        
+        <ImplementedInterfacesInfo/>
         <SubClassInfo/>
         <SubInterfacesInfo/>
         <InterfaceUsageInfo/>
@@ -100,7 +100,7 @@
             <NestedClassesInheritedSummary/>
             <EnumConstantsSummary/>
             <FieldsSummary/>
-            <FieldsInheritedSummary/>  
+            <FieldsInheritedSummary/>
             <ConstructorsSummary/>
             <MethodsSummary/>
             <MethodsInheritedSummary/>
@@ -155,7 +155,7 @@
         </MethodDetails>
         <ClassFooter/>
     </ClassDoc>
-    
+
     <ConstantSummary>
         <Header/>
         <Contents/>
@@ -166,12 +166,12 @@
                     <ClassHeader/>
                     <ConstantMembers/>
                     <ClassFooter/>
-                </ClassConstantSummary>     
+                </ClassConstantSummary>
             </PackageConstantSummary>
-        </ConstantSummaries>    
+        </ConstantSummaries>
         <Footer/>
     </ConstantSummary>
-    
+
     <SerializedForm>
         <Header/>
         <SerializedFormSummaries>
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
index 576a1687f89..aaa25d81c42 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java
@@ -32,6 +32,11 @@ import com.sun.tools.javac.api.DiagnosticFormatter.*;
 /**
  * Provides simple functionalities for javac diagnostic formatting.
  * @param <D> type of diagnostic handled by this formatter
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public interface DiagnosticFormatter<D extends Diagnostic<?>> {
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java b/langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java
index e2a381f9f29..c942a63f945 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/Formattable.java
@@ -31,6 +31,11 @@ import java.util.Locale;
  * This interface must be implemented by any javac class that has non-trivial
  * formatting needs (e.g. where toString() does not apply because of localization).
  *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
  * @author Maurizio Cimadamore
  */
 public interface Formattable {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/Messages.java b/langtools/src/share/classes/com/sun/tools/javac/api/Messages.java
index ad76d6ce794..290d316ab38 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/Messages.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/Messages.java
@@ -32,6 +32,11 @@ import java.util.MissingResourceException;
  * This interface defines the minimum requirements in order to provide support
  * for localized formatted strings.
  *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ *
  * @author Maurizio Cimadamore
  */
 public interface Messages {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java b/langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java
index e190f5d645b..89932ff5202 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/BoundKind.java
@@ -25,7 +25,13 @@
 
 package com.sun.tools.javac.code;
 
-
+/**
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
 public enum BoundKind {
     EXTENDS("? extends "),
     SUPER("? super "),
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java b/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java
index 8025e61b966..cec6e70a99d 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Lint.java
@@ -193,10 +193,20 @@ public class Lint
         /**
          * Warn about unchecked operations on raw types.
          */
-        RAW("rawtypes");
+        RAW("rawtypes"),
+
+        /**
+         * Warn about Sun proprietary API that may be removed in a future release.
+         */
+        SUNAPI("sunapi", true);
 
         LintCategory(String option) {
+            this(option, false);
+        }
+
+        LintCategory(String option, boolean hidden) {
             this.option = option;
+            this.hidden = hidden;
             map.put(option, this);
         }
 
@@ -205,6 +215,7 @@ public class Lint
         }
 
         public final String option;
+        public final boolean hidden;
     };
 
     /**
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
index 2447ac585dc..baa490954b3 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Printer.java
@@ -40,6 +40,11 @@ import static com.sun.tools.javac.code.Flags.*;
 /**
  * A combined type/symbol visitor for generating non-trivial localized string
  * representation of types and symbols.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public abstract class Printer implements Type.Visitor<String, Locale>, Symbol.Visitor<String, Locale> {
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
index 4fb23660835..15d8735393c 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Source.java
@@ -122,6 +122,9 @@ public enum Source {
     public boolean allowGenerics() {
         return compareTo(JDK1_5) >= 0;
     }
+    public boolean allowDiamond() {
+        return compareTo(JDK1_7) >= 0;
+    }
     public boolean allowEnums() {
         return compareTo(JDK1_5) >= 0;
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
index da1567aa5bb..ab1f995a089 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -1197,21 +1197,9 @@ public abstract class Symbol implements Element {
          *  as possible implementations.
          */
         public MethodSymbol implementation(TypeSymbol origin, Types types, boolean checkResult) {
-            for (Type t = origin.type; t.tag == CLASS || t.tag == TYPEVAR; t = types.supertype(t)) {
-                while (t.tag == TYPEVAR)
-                    t = t.getUpperBound();
-                TypeSymbol c = t.tsym;
-                for (Scope.Entry e = c.members().lookup(name);
-                     e.scope != null;
-                     e = e.next()) {
-                    if (e.sym.kind == MTH) {
-                        MethodSymbol m = (MethodSymbol) e.sym;
-                        if (m.overrides(this, origin, types, checkResult) &&
-                            (m.flags() & SYNTHETIC) == 0)
-                            return m;
-                    }
-                }
-            }
+            MethodSymbol res = types.implementation(this, origin, types, checkResult);
+            if (res != null)
+                return res;
             // if origin is derived from a raw type, we might have missed
             // an implementation because we do not know enough about instantiations.
             // in this case continue with the supertype as origin.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
index 0b2316c6615..8d708bcfe44 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
@@ -193,7 +193,7 @@ public class Symtab {
 
     public void initType(Type type, String name, String bname) {
         initType(type, name);
-        boxedName[type.tag] = names.fromString("java.lang." + bname);
+            boxedName[type.tag] = names.fromString("java.lang." + bname);
     }
 
     /** The class symbol that owns all predefined symbols.
@@ -467,6 +467,7 @@ public class Symtab {
         synthesizeMHTypeIfMissing(invokeDynamicType);
         synthesizeBoxTypeIfMissing(doubleType);
         synthesizeBoxTypeIfMissing(floatType);
+        synthesizeBoxTypeIfMissing(voidType);
 
         // Enter a synthetic class that is used to mark Sun
         // proprietary classes in ct.sym.  This class does not have a
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
index 402a36e065e..02057b48f9d 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Type.java
@@ -1068,7 +1068,7 @@ public class Type implements PrimitiveType {
 
         /**
          * Replaces this ForAll's typevars with a set of concrete Java types
-         * and returns the instantiated generic type. Subclasses might override
+         * and returns the instantiated generic type. Subclasses should override
          * in order to check that the list of types is a valid instantiation
          * of the ForAll's typevars.
          *
@@ -1081,6 +1081,42 @@ public class Type implements PrimitiveType {
             return types.subst(qtype, tvars, actuals);
         }
 
+        /**
+         * Kind of type-constraint derived during type inference
+         */
+        public enum ConstraintKind {
+            /**
+             * upper bound constraint (a type variable must be instantiated
+             * with a type T, where T is a subtype of all the types specified by
+             * its EXTENDS constraints).
+             */
+            EXTENDS,
+            /**
+             * lower bound constraint (a type variable must be instantiated
+             * with a type T, where T is a supertype of all the types specified by
+             * its SUPER constraints).
+             */
+            SUPER,
+            /**
+             * equality constraint (a type variable must be instantiated to the type
+             * specified by its EQUAL constraint.
+             */
+            EQUAL;
+        }
+
+        /**
+         * Get the type-constraints of a given kind for a given type-variable of
+         * this ForAll type. Subclasses should override in order to return more
+         * accurate sets of constraints.
+         *
+         * @param tv the type-variable for which the constraint is to be retrieved
+         * @param ck the constraint kind to be retrieved
+         * @return the list of types specified by the selected constraint
+         */
+        public List<Type> getConstraints(TypeVar tv, ConstraintKind ck) {
+            return List.nil();
+        }
+
         public Type map(Mapping f) {
             return f.apply(qtype);
         }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
index 9a6e5725c74..4835c35aef5 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java
@@ -25,10 +25,9 @@
 
 package com.sun.tools.javac.code;
 
+import java.lang.ref.SoftReference;
 import java.util.*;
 
-import com.sun.tools.javac.api.Messages;
-
 import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.List;
 
@@ -1248,14 +1247,18 @@ public class Types {
 
             @Override
             public Boolean visitClassType(ClassType t, Void ignored) {
-                if (!t.isParameterized())
-                    return true;
+                if (t.isCompound())
+                    return false;
+                else {
+                    if (!t.isParameterized())
+                        return true;
 
-                for (Type param : t.allparams()) {
-                    if (!param.isUnbound())
-                        return false;
+                    for (Type param : t.allparams()) {
+                        if (!param.isUnbound())
+                            return false;
+                    }
+                    return true;
                 }
-                return true;
             }
 
             @Override
@@ -1442,7 +1445,7 @@ public class Types {
         return (sym.flags() & STATIC) != 0
             ? sym.type
             : memberType.visit(t, sym);
-    }
+        }
     // where
         private SimpleVisitor<Type,Symbol> memberType = new SimpleVisitor<Type,Symbol>() {
 
@@ -1552,7 +1555,7 @@ public class Types {
             return t; /* fast special case */
         else
             return erasure.visit(t, recurse);
-    }
+        }
     // where
         private SimpleVisitor<Type, Boolean> erasure = new SimpleVisitor<Type, Boolean>() {
             public Type visitType(Type t, Boolean recurse) {
@@ -1946,6 +1949,45 @@ public class Types {
             hasSameArgs(t, erasure(s)) || hasSameArgs(erasure(t), s);
     }
 
+    private WeakHashMap<MethodSymbol, SoftReference<Map<TypeSymbol, MethodSymbol>>> implCache_check =
+            new WeakHashMap<MethodSymbol, SoftReference<Map<TypeSymbol, MethodSymbol>>>();
+
+    private WeakHashMap<MethodSymbol, SoftReference<Map<TypeSymbol, MethodSymbol>>> implCache_nocheck =
+            new WeakHashMap<MethodSymbol, SoftReference<Map<TypeSymbol, MethodSymbol>>>();
+
+    public MethodSymbol implementation(MethodSymbol ms, TypeSymbol origin, Types types, boolean checkResult) {
+        Map<MethodSymbol, SoftReference<Map<TypeSymbol, MethodSymbol>>> implCache = checkResult ?
+            implCache_check : implCache_nocheck;
+        SoftReference<Map<TypeSymbol, MethodSymbol>> ref_cache = implCache.get(ms);
+        Map<TypeSymbol, MethodSymbol> cache = ref_cache != null ? ref_cache.get() : null;
+        if (cache == null) {
+            cache = new HashMap<TypeSymbol, MethodSymbol>();
+            implCache.put(ms, new SoftReference<Map<TypeSymbol, MethodSymbol>>(cache));
+        }
+        MethodSymbol impl = cache.get(origin);
+        if (impl == null) {
+            for (Type t = origin.type; t.tag == CLASS || t.tag == TYPEVAR; t = types.supertype(t)) {
+                while (t.tag == TYPEVAR)
+                    t = t.getUpperBound();
+                TypeSymbol c = t.tsym;
+                for (Scope.Entry e = c.members().lookup(ms.name);
+                     e.scope != null;
+                     e = e.next()) {
+                    if (e.sym.kind == Kinds.MTH) {
+                        MethodSymbol m = (MethodSymbol) e.sym;
+                        if (m.overrides(ms, origin, types, checkResult) &&
+                            (m.flags() & SYNTHETIC) == 0) {
+                            impl = m;
+                            cache.put(origin, m);
+                            return impl;
+                        }
+                    }
+                }
+            }
+        }
+        return impl;
+    }
+
     /**
      * Does t have the same arguments as s?  It is assumed that both
      * types are (possibly polymorphic) method types.  Monomorphic
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
index 8fe3b067577..f344c720127 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -119,6 +119,7 @@ public class Attr extends JCTree.Visitor {
                  options.get("-relax") != null);
         useBeforeDeclarationWarning = options.get("useBeforeDeclarationWarning") != null;
         allowInvokedynamic = options.get("invokedynamic") != null;
+        enableSunApiLintControl = options.get("enableSunApiLintControl") != null;
     }
 
     /** Switch: relax some constraints for retrofit mode.
@@ -160,6 +161,12 @@ public class Attr extends JCTree.Visitor {
      */
     boolean useBeforeDeclarationWarning;
 
+    /**
+     * Switch: allow lint infrastructure to control Sun proprietary
+     * API warnings.
+     */
+    boolean enableSunApiLintControl;
+
     /** Check kind and type of given tree against protokind and prototype.
      *  If check succeeds, store type in tree and return it.
      *  If check fails, store errType in tree and return it.
@@ -188,6 +195,21 @@ public class Attr extends JCTree.Visitor {
         return owntype;
     }
 
+    Type checkReturn(JCTree tree, Type owntype, int ownkind, int pkind, Type pt) {
+        if (owntype.tag != ERROR && pt.tag != METHOD && pt.tag != FORALL) {
+            if ((ownkind & ~pkind) == 0) {
+                owntype = chk.checkReturnType(tree.pos(), owntype, pt);
+            } else {
+                log.error(tree.pos(), "unexpected.type",
+                          kindNames(pkind),
+                          kindName(ownkind));
+                owntype = types.createErrorType(owntype);
+            }
+        }
+        tree.type = owntype;
+        return owntype;
+    }
+
     /** Is given blank final variable assignable, i.e. in a scope where it
      *  may be assigned to even though it is final?
      *  @param v      The blank final variable.
@@ -406,7 +428,14 @@ public class Attr extends JCTree.Visitor {
     /** Derived visitor method: attribute a type tree.
      */
     Type attribType(JCTree tree, Env<AttrContext> env) {
-        Type result = attribTree(tree, env, TYP, Type.noType);
+        Type result = attribType(tree, env, Type.noType);
+        return result;
+    }
+
+    /** Derived visitor method: attribute a type tree.
+     */
+    Type attribType(JCTree tree, Env<AttrContext> env, Type pt) {
+        Type result = attribTree(tree, env, TYP, pt);
         return result;
     }
 
@@ -1239,7 +1268,10 @@ public class Attr extends JCTree.Visitor {
                 }
 
                 if (site.tag == CLASS) {
-                    if (site.getEnclosingType().tag == CLASS) {
+                    Type encl = site.getEnclosingType();
+                    while (encl != null && encl.tag == TYPEVAR)
+                        encl = encl.getUpperBound();
+                    if (encl.tag == CLASS) {
                         // we are calling a nested class
 
                         if (tree.meth.getTag() == JCTree.SELECT) {
@@ -1251,7 +1283,7 @@ public class Attr extends JCTree.Visitor {
                             // to the outer instance type of the class.
                             chk.checkRefType(qualifier.pos(),
                                              attribExpr(qualifier, localEnv,
-                                                        site.getEnclosingType()));
+                                                        encl));
                         } else if (methName == names._super) {
                             // qualifier omitted; check for existence
                             // of an appropriate implicit qualifier.
@@ -1347,7 +1379,7 @@ public class Attr extends JCTree.Visitor {
 
             // Check that value of resulting type is admissible in the
             // current context.  Also, capture the return type
-            result = check(tree, capture(restype), VAL, pkind, pt);
+            result = checkReturn(tree, capture(restype), VAL, pkind, pt);
         }
         chk.validate(tree.typeargs, localEnv);
     }
@@ -1422,9 +1454,9 @@ public class Attr extends JCTree.Visitor {
 
         // Attribute clazz expression and store
         // symbol + type back into the attributed tree.
-        Type clazztype = chk.checkClassType(
-            tree.clazz.pos(), attribType(clazz, env), true);
+        Type clazztype = attribType(clazz, env);
         chk.validate(clazz, localEnv);
+        clazztype = chk.checkNewClassType(clazz.pos(), clazztype, true, pt);
         if (tree.encl != null) {
             // We have to work in this case to store
             // symbol + type back into the attributed tree.
@@ -1529,7 +1561,9 @@ public class Attr extends JCTree.Visitor {
                 //       ...
                 //     }
                 if (Resolve.isStatic(env)) cdef.mods.flags |= STATIC;
-
+                clazz = TreeInfo.isDiamond(tree) ?
+                    make.Type(clazztype)
+                    : clazz;
                 if (clazztype.tsym.isInterface()) {
                     cdef.implementing = List.of(clazz);
                 } else {
@@ -1554,13 +1588,18 @@ public class Attr extends JCTree.Visitor {
                     typeargtypes, true, tree.varargsElement != null);
                 assert sym.kind < AMBIGUOUS || tree.constructor.type.isErroneous();
                 tree.constructor = sym;
-                tree.constructorType = checkMethod(clazztype,
-                                            tree.constructor,
-                                            localEnv,
-                                            tree.args,
-                                            argtypes,
-                                            typeargtypes,
-                                            localEnv.info.varArgs);
+                if (tree.constructor.kind > ERRONEOUS) {
+                    tree.constructorType =  syms.errType;
+                }
+                else {
+                    tree.constructorType = checkMethod(clazztype,
+                            tree.constructor,
+                            localEnv,
+                            tree.args,
+                            argtypes,
+                            typeargtypes,
+                            localEnv.info.varArgs);
+                }
             }
 
             if (tree.constructor != null && tree.constructor.kind == MTH)
@@ -2037,7 +2076,7 @@ public class Attr extends JCTree.Visitor {
                 Symbol sym = (site.getUpperBound() != null)
                     ? selectSym(tree, capture(site.getUpperBound()), env, pt, pkind)
                     : null;
-                if (sym == null || isType(sym)) {
+                if (sym == null) {
                     log.error(pos, "type.var.cant.be.deref");
                     return syms.errSymbol;
                 } else {
@@ -2207,8 +2246,12 @@ public class Attr extends JCTree.Visitor {
                 sym.outermostClass() != env.info.scope.owner.outermostClass())
                 chk.warnDeprecated(tree.pos(), sym);
 
-            if ((sym.flags() & PROPRIETARY) != 0)
-                log.strictWarning(tree.pos(), "sun.proprietary", sym);
+            if ((sym.flags() & PROPRIETARY) != 0) {
+                if (enableSunApiLintControl)
+                  chk.warnSunApi(tree.pos(), "sun.proprietary", sym);
+                else
+                  log.strictWarning(tree.pos(), "sun.proprietary", sym);
+            }
 
             // Test (3): if symbol is a variable, check that its type and
             // kind are compatible with the prototype and protokind.
@@ -2503,7 +2546,7 @@ public class Attr extends JCTree.Visitor {
         if (clazztype.tag == CLASS) {
             List<Type> formals = clazztype.tsym.type.getTypeArguments();
 
-            if (actuals.length() == formals.length()) {
+            if (actuals.length() == formals.length() || actuals.isEmpty()) {
                 List<Type> a = actuals;
                 List<Type> f = formals;
                 while (a.nonEmpty()) {
@@ -2529,7 +2572,18 @@ public class Attr extends JCTree.Visitor {
                         clazzOuter = site;
                     }
                 }
-                owntype = new ClassType(clazzOuter, actuals, clazztype.tsym);
+                if (actuals.nonEmpty()) {
+                    owntype = new ClassType(clazzOuter, actuals, clazztype.tsym);
+                }
+                else if (TreeInfo.isDiamond(tree)) {
+                    //a type apply with no explicit type arguments - diamond operator
+                    //the result type is a forall F where F's tvars are the type-variables
+                    //that will be inferred when F is checked against the expected type
+                    List<Type> ftvars = clazztype.tsym.type.getTypeArguments();
+                    List<Type> new_tvars = types.newInstances(ftvars);
+                    clazztype = new ClassType(clazzOuter, new_tvars, clazztype.tsym);
+                    owntype = new ForAll(new_tvars, clazztype);
+                }
             } else {
                 if (formals.length() != 0) {
                     log.error(tree.pos(), "wrong.number.type.args",
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
index d46a5070c04..09cddea4e94 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -60,11 +60,10 @@ public class Check {
     private final Log log;
     private final Symtab syms;
     private final Infer infer;
-    private final Target target;
-    private final Source source;
     private final Types types;
     private final JCDiagnostic.Factory diags;
     private final boolean skipAnnotations;
+    private boolean warnOnSyntheticConflicts;
     private final TreeInfo treeinfo;
 
     // The set of lint options currently in effect. It is initialized
@@ -89,25 +88,31 @@ public class Check {
         this.types = Types.instance(context);
         diags = JCDiagnostic.Factory.instance(context);
         Options options = Options.instance(context);
-        target = Target.instance(context);
-        source = Source.instance(context);
         lint = Lint.instance(context);
         treeinfo = TreeInfo.instance(context);
 
         Source source = Source.instance(context);
         allowGenerics = source.allowGenerics();
         allowAnnotations = source.allowAnnotations();
+        allowCovariantReturns = source.allowCovariantReturns();
         complexInference = options.get("-complexinference") != null;
         skipAnnotations = options.get("skipAnnotations") != null;
+        warnOnSyntheticConflicts = options.get("warnOnSyntheticConflicts") != null;
+
+        Target target = Target.instance(context);
+        syntheticNameChar = target.syntheticNameChar();
 
         boolean verboseDeprecated = lint.isEnabled(LintCategory.DEPRECATION);
         boolean verboseUnchecked = lint.isEnabled(LintCategory.UNCHECKED);
+        boolean verboseSunApi = lint.isEnabled(LintCategory.SUNAPI);
         boolean enforceMandatoryWarnings = source.enforceMandatoryWarnings();
 
         deprecationHandler = new MandatoryWarningHandler(log, verboseDeprecated,
                 enforceMandatoryWarnings, "deprecated");
         uncheckedHandler = new MandatoryWarningHandler(log, verboseUnchecked,
                 enforceMandatoryWarnings, "unchecked");
+        sunApiHandler = new MandatoryWarningHandler(log, verboseSunApi,
+                enforceMandatoryWarnings, "sunapi");
     }
 
     /** Switch: generics enabled?
@@ -118,10 +123,18 @@ public class Check {
      */
     boolean allowAnnotations;
 
+    /** Switch: covariant returns enabled?
+     */
+    boolean allowCovariantReturns;
+
     /** Switch: -complexinference option set?
      */
     boolean complexInference;
 
+    /** Character for synthetic names
+     */
+    char syntheticNameChar;
+
     /** A table mapping flat names of all compiled classes in this run to their
      *  symbols; maintained from outside.
      */
@@ -135,6 +148,9 @@ public class Check {
      */
     private MandatoryWarningHandler uncheckedHandler;
 
+    /** A handler for messages about using Sun proprietary API.
+     */
+    private MandatoryWarningHandler sunApiHandler;
 
 /* *************************************************************************
  * Errors and Warnings
@@ -164,12 +180,22 @@ public class Check {
             uncheckedHandler.report(pos, msg, args);
     }
 
+    /** Warn about using Sun proprietary API.
+     *  @param pos        Position to be used for error reporting.
+     *  @param msg        A string describing the problem.
+     */
+    public void warnSunApi(DiagnosticPosition pos, String msg, Object... args) {
+        if (!lint.isSuppressed(LintCategory.SUNAPI))
+            sunApiHandler.report(pos, msg, args);
+    }
+
     /**
      * Report any deferred diagnostics.
      */
     public void reportDeferredDiagnostics() {
         deprecationHandler.reportDeferredDiagnostic();
         uncheckedHandler.reportDeferredDiagnostic();
+        sunApiHandler.reportDeferredDiagnostic();
     }
 
 
@@ -325,7 +351,7 @@ public class Check {
         for (int i=1; ; i++) {
             Name flatname = names.
                 fromString("" + c.owner.enclClass().flatname +
-                           target.syntheticNameChar() + i +
+                           syntheticNameChar + i +
                            c.name);
             if (compiled.get(flatname) == null) return flatname;
         }
@@ -344,8 +370,6 @@ public class Check {
     Type checkType(DiagnosticPosition pos, Type found, Type req) {
         if (req.tag == ERROR)
             return req;
-        if (found.tag == FORALL)
-            return instantiatePoly(pos, (ForAll)found, req, convertWarner(pos, found, req));
         if (req.tag == NONE)
             return found;
         if (types.isAssignable(found, req, convertWarner(pos, found, req)))
@@ -363,11 +387,38 @@ public class Check {
         return typeError(pos, diags.fragment("incompatible.types"), found, req);
     }
 
+    Type checkReturnType(DiagnosticPosition pos, Type found, Type req) {
+        if (found.tag == FORALL) {
+            try {
+                return instantiatePoly(pos, (ForAll) found, req, convertWarner(pos, found, req));
+            } catch (Infer.NoInstanceException ex) {
+                if (ex.isAmbiguous) {
+                    JCDiagnostic d = ex.getDiagnostic();
+                    log.error(pos,
+                            "undetermined.type" + (d != null ? ".1" : ""),
+                            found, d);
+                    return types.createErrorType(req);
+                } else {
+                    JCDiagnostic d = ex.getDiagnostic();
+                    return typeError(pos,
+                            diags.fragment("incompatible.types" + (d != null ? ".1" : ""), d),
+                            found, req);
+                }
+            } catch (Infer.InvalidInstanceException ex) {
+                JCDiagnostic d = ex.getDiagnostic();
+                log.error(pos, "invalid.inferred.types", ((ForAll)found).tvars, d);
+                return types.createErrorType(req);
+            }
+        } else {
+            return checkType(pos, found, req);
+        }
+    }
+
     /** Instantiate polymorphic type to some prototype, unless
      *  prototype is `anyPoly' in which case polymorphic type
      *  is returned unchanged.
      */
-    Type instantiatePoly(DiagnosticPosition pos, ForAll t, Type pt, Warner warn) {
+    Type instantiatePoly(DiagnosticPosition pos, ForAll t, Type pt, Warner warn) throws Infer.NoInstanceException {
         if (pt == Infer.anyPoly && complexInference) {
             return t;
         } else if (pt == Infer.anyPoly || pt.tag == NONE) {
@@ -376,28 +427,9 @@ public class Check {
         } else if (pt.tag == ERROR) {
             return pt;
         } else {
-            try {
-                return infer.instantiateExpr(t, pt, warn);
-            } catch (Infer.NoInstanceException ex) {
-                if (ex.isAmbiguous) {
-                    JCDiagnostic d = ex.getDiagnostic();
-                    log.error(pos,
-                              "undetermined.type" + (d!=null ? ".1" : ""),
-                              t, d);
-                    return types.createErrorType(pt);
-                } else {
-                    JCDiagnostic d = ex.getDiagnostic();
-                    return typeError(pos,
-                                     diags.fragment("incompatible.types" + (d!=null ? ".1" : ""), d),
-                                     t, pt);
-                }
-            } catch (Infer.InvalidInstanceException ex) {
-                JCDiagnostic d = ex.getDiagnostic();
-                log.error(pos, "invalid.inferred.types", t.tvars, d);
-                return types.createErrorType(pt);
-            }
+            return infer.instantiateExpr(t, pt, warn);
         }
-    }
+     }
 
     /** Check that a given type can be cast to a given target type.
      *  Return the result of the cast.
@@ -512,7 +544,7 @@ public class Check {
             while (args.nonEmpty()) {
                 if (args.head.tag == WILDCARD)
                     return typeTagError(pos,
-                                        log.getLocalizedString("type.req.exact"),
+                                        Log.getLocalizedString("type.req.exact"),
                                         args.head);
                 args = args.tail;
             }
@@ -520,6 +552,29 @@ public class Check {
         return t;
     }
 
+    /** Check that type is a valid type for a new expression. If the type contains
+     * some uninferred type variables, instantiate them exploiting the expected
+     * type.
+     *
+     *  @param pos           Position to be used for error reporting.
+     *  @param t             The type to be checked.
+     *  @param noBounds    True if type bounds are illegal here.
+     *  @param pt          Expected type (used with diamond operator)
+     */
+    Type checkNewClassType(DiagnosticPosition pos, Type t, boolean noBounds, Type pt) {
+        if (t.tag == FORALL) {
+            try {
+                t = instantiatePoly(pos, (ForAll)t, pt, Warner.noWarnings);
+            }
+            catch (Infer.NoInstanceException ex) {
+                JCDiagnostic d = ex.getDiagnostic();
+                log.error(pos, "cant.apply.diamond", t.getTypeArguments(), d);
+                return types.createErrorType(pt);
+            }
+        }
+        return checkClassType(pos, t, noBounds);
+    }
+
     /** Check that type is a reifiable class, interface or array type.
      *  @param pos           Position to be used for error reporting.
      *  @param t             The type to be checked.
@@ -747,8 +802,10 @@ public class Check {
                 this.specialized = false;
             };
 
+            @Override
             public void visitTree(JCTree tree) { /* no-op */ }
 
+            @Override
             public void visitVarDef(JCVariableDecl tree) {
                 if ((tree.mods.flags & ENUM) != 0) {
                     if (tree.init instanceof JCNewClass &&
@@ -820,10 +877,12 @@ public class Check {
      */
     class Validator extends JCTree.Visitor {
 
+        @Override
         public void visitTypeArray(JCArrayTypeTree tree) {
             validate(tree.elemtype, env);
         }
 
+        @Override
         public void visitTypeApply(JCTypeApply tree) {
             if (tree.type.tag == CLASS) {
                 List<Type> formals = tree.type.tsym.type.allparams();
@@ -872,7 +931,8 @@ public class Check {
                 }
 
                 checkCapture(tree);
-
+            }
+            if (tree.type.tag == CLASS || tree.type.tag == FORALL) {
                 // Check that this type is either fully parameterized, or
                 // not parameterized at all.
                 if (tree.type.getEnclosingType().isRaw())
@@ -882,6 +942,7 @@ public class Check {
             }
         }
 
+        @Override
         public void visitTypeParameter(JCTypeParameter tree) {
             validate(tree.bounds, env);
             checkClassBounds(tree.pos(), tree.type);
@@ -893,6 +954,7 @@ public class Check {
                 validate(tree.inner, env);
         }
 
+        @Override
         public void visitSelect(JCFieldAccess tree) {
             if (tree.type.tag == CLASS) {
                 visitSelectInternal(tree);
@@ -916,12 +978,14 @@ public class Check {
             }
         }
 
+        @Override
         public void visitAnnotatedType(JCAnnotatedType tree) {
             tree.underlyingType.accept(this);
         }
 
         /** Default visitor method: do nothing.
          */
+        @Override
         public void visitTree(JCTree tree) {
         }
 
@@ -1041,7 +1105,7 @@ public class Check {
      *  @param thrown     The list of thrown exceptions.
      *  @param handled    The list of handled exceptions.
      */
-    List<Type> unHandled(List<Type> thrown, List<Type> handled) {
+    List<Type> unhandled(List<Type> thrown, List<Type> handled) {
         List<Type> unhandled = List.nil();
         for (List<Type> l = thrown; l.nonEmpty(); l = l.tail)
             if (!isHandled(l.head, handled)) unhandled = unhandled.prepend(l.head);
@@ -1193,34 +1257,41 @@ public class Check {
         boolean resultTypesOK =
             types.returnTypeSubstitutable(mt, ot, otres, overrideWarner);
         if (!resultTypesOK) {
-            if (!source.allowCovariantReturns() &&
+            if (!allowCovariantReturns &&
                 m.owner != origin &&
                 m.owner.isSubClass(other.owner, types)) {
                 // allow limited interoperability with covariant returns
             } else {
-                typeError(TreeInfo.diagnosticPositionFor(m, tree),
-                          diags.fragment("override.incompatible.ret",
-                                         cannotOverride(m, other)),
+                log.error(TreeInfo.diagnosticPositionFor(m, tree),
+                          "override.incompatible.ret",
+                          cannotOverride(m, other),
                           mtres, otres);
                 return;
             }
         } else if (overrideWarner.warned) {
             warnUnchecked(TreeInfo.diagnosticPositionFor(m, tree),
-                          "prob.found.req",
-                          diags.fragment("override.unchecked.ret",
-                                              uncheckedOverrides(m, other)),
-                          mtres, otres);
+                    "override.unchecked.ret",
+                    uncheckedOverrides(m, other),
+                    mtres, otres);
         }
 
         // Error if overriding method throws an exception not reported
         // by overridden method.
         List<Type> otthrown = types.subst(ot.getThrownTypes(), otvars, mtvars);
-        List<Type> unhandled = unHandled(mt.getThrownTypes(), otthrown);
-        if (unhandled.nonEmpty()) {
+        List<Type> unhandledErased = unhandled(mt.getThrownTypes(), types.erasure(otthrown));
+        List<Type> unhandledUnerased = unhandled(mt.getThrownTypes(), otthrown);
+        if (unhandledErased.nonEmpty()) {
             log.error(TreeInfo.diagnosticPositionFor(m, tree),
                       "override.meth.doesnt.throw",
                       cannotOverride(m, other),
-                      unhandled.head);
+                      unhandledUnerased.head);
+            return;
+        }
+        else if (unhandledUnerased.nonEmpty()) {
+            warnUnchecked(TreeInfo.diagnosticPositionFor(m, tree),
+                          "override.unchecked.thrown",
+                         cannotOverride(m, other),
+                         unhandledUnerased.head);
             return;
         }
 
@@ -1709,6 +1780,35 @@ public class Check {
         checkCompatibleConcretes(pos, c);
     }
 
+    void checkConflicts(DiagnosticPosition pos, Symbol sym, TypeSymbol c) {
+        for (Type ct = c.type; ct != Type.noType ; ct = types.supertype(ct)) {
+            for (Scope.Entry e = ct.tsym.members().lookup(sym.name); e.scope == ct.tsym.members(); e = e.next()) {
+                // VM allows methods and variables with differing types
+                if (sym.kind == e.sym.kind &&
+                    types.isSameType(types.erasure(sym.type), types.erasure(e.sym.type)) &&
+                    sym != e.sym &&
+                    (sym.flags() & Flags.SYNTHETIC) != (e.sym.flags() & Flags.SYNTHETIC) &&
+                    (sym.flags() & BRIDGE) == 0 && (e.sym.flags() & BRIDGE) == 0) {
+                    syntheticError(pos, (e.sym.flags() & SYNTHETIC) == 0 ? e.sym : sym);
+                    return;
+                }
+            }
+        }
+    }
+
+    /** Report a conflict between a user symbol and a synthetic symbol.
+     */
+    private void syntheticError(DiagnosticPosition pos, Symbol sym) {
+        if (!sym.type.isErroneous()) {
+            if (warnOnSyntheticConflicts) {
+                log.warning(pos, "synthetic.name.conflict", sym, sym.location());
+            }
+            else {
+                log.error(pos, "synthetic.name.conflict", sym, sym.location());
+            }
+        }
+    }
+
     /** Check that class c does not implement directly or indirectly
      *  the same parameterized interface with two different argument lists.
      *  @param pos          Position to be used for error reporting.
@@ -2265,6 +2365,7 @@ public class Check {
             this.expected = expected;
         }
 
+        @Override
         public void warnUnchecked() {
             boolean warned = this.warned;
             super.warnUnchecked();
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
index 0a4f9cd25ff..840a97de5ce 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -29,6 +29,7 @@ import com.sun.tools.javac.util.*;
 import com.sun.tools.javac.util.List;
 import com.sun.tools.javac.code.*;
 import com.sun.tools.javac.code.Type.*;
+import com.sun.tools.javac.code.Type.ForAll.ConstraintKind;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.util.JCDiagnostic;
 
@@ -50,6 +51,7 @@ public class Infer {
 
     Symtab syms;
     Types types;
+    Check chk;
     Resolve rs;
     JCDiagnostic.Factory diags;
 
@@ -65,6 +67,7 @@ public class Infer {
         syms = Symtab.instance(context);
         types = Types.instance(context);
         rs = Resolve.instance(context);
+        chk = Check.instance(context);
         diags = JCDiagnostic.Factory.instance(context);
         ambiguousNoInstanceException =
             new NoInstanceException(true, diags);
@@ -250,14 +253,19 @@ public class Infer {
                                 Warner warn) throws InferenceException {
         List<Type> undetvars = Type.map(that.tvars, fromTypeVarFun);
         for (List<Type> l = undetvars; l.nonEmpty(); l = l.tail) {
-            UndetVar v = (UndetVar) l.head;
+            UndetVar uv = (UndetVar) l.head;
+            TypeVar tv = (TypeVar)uv.qtype;
             ListBuffer<Type> hibounds = new ListBuffer<Type>();
-            for (List<Type> l1 = types.getBounds((TypeVar) v.qtype); l1.nonEmpty(); l1 = l1.tail) {
-                if (!l1.head.containsSome(that.tvars)) {
-                    hibounds.append(l1.head);
+            for (Type t : that.getConstraints(tv, ConstraintKind.EXTENDS).prependList(types.getBounds(tv))) {
+                if (!t.containsSome(that.tvars) && t.tag != BOT) {
+                    hibounds.append(t);
                 }
             }
-            v.hibounds = hibounds.toList();
+            List<Type> inst = that.getConstraints(tv, ConstraintKind.EQUAL);
+            if (inst.nonEmpty() && inst.head.tag != BOT) {
+                uv.inst = inst.head;
+            }
+            uv.hibounds = hibounds.toList();
         }
         Type qtype1 = types.subst(that.qtype, that.tvars, undetvars);
         if (!types.isSubtype(qtype1, to)) {
@@ -273,7 +281,7 @@ public class Infer {
         List<Type> targs = Type.map(undetvars, getInstFun);
         targs = types.subst(targs, that.tvars, targs);
         checkWithinBounds(that.tvars, targs, warn);
-        return that.inst(targs, types);
+        return chk.checkType(warn.pos(), that.inst(targs, types), to);
     }
 
     /** Instantiate method type `mt' by finding instantiations of
@@ -349,6 +357,9 @@ public class Infer {
         /** Type variables instantiated to bottom */
         ListBuffer<Type> restvars = new ListBuffer<Type>();
 
+        /** Undet vars instantiated to bottom */
+        final ListBuffer<Type> restundet = new ListBuffer<Type>();
+
         /** Instantiated types or TypeVars if under-constrained */
         ListBuffer<Type> insttypes = new ListBuffer<Type>();
 
@@ -359,6 +370,7 @@ public class Infer {
             UndetVar uv = (UndetVar)t;
             if (uv.inst.tag == BOT) {
                 restvars.append(uv.qtype);
+                restundet.append(uv);
                 insttypes.append(uv.qtype);
                 undettypes.append(uv);
                 uv.inst = null;
@@ -378,18 +390,33 @@ public class Infer {
             final List<Type> all_tvars = tvars; //this is the wrong tvars
             final MethodType mt2 = new MethodType(mt.argtypes, null, mt.thrown, syms.methodClass);
             mt2.restype = new ForAll(restvars.toList(), mt.restype) {
+                @Override
+                public List<Type> getConstraints(TypeVar tv, ConstraintKind ck) {
+                    for (Type t : restundet.toList()) {
+                        UndetVar uv = (UndetVar)t;
+                        if (uv.qtype == tv) {
+                            switch (ck) {
+                                case EXTENDS: return uv.hibounds;
+                                case SUPER: return uv.lobounds;
+                                case EQUAL: return uv.inst != null ? List.of(uv.inst) : List.<Type>nil();
+                            }
+                        }
+                    }
+                    return List.nil();
+                }
+
                 @Override
                 public Type inst(List<Type> inferred, Types types) throws NoInstanceException {
                     List<Type> formals = types.subst(mt2.argtypes, tvars, inferred);
-                   if (!rs.argumentsAcceptable(capturedArgs, formals,
+                    if (!rs.argumentsAcceptable(capturedArgs, formals,
                            allowBoxing, useVarargs, warn)) {
                       // inferred method is not applicable
                       throw invalidInstanceException.setMessage("inferred.do.not.conform.to.params", formals, argtypes);
-                   }
-                   // check that inferred bounds conform to their bounds
-                   checkWithinBounds(all_tvars,
+                    }
+                    // check that inferred bounds conform to their bounds
+                    checkWithinBounds(all_tvars,
                            types.subst(inferredTypes, tvars, inferred), warn);
-                   return super.inst(inferred, types);
+                    return super.inst(inferred, types);
             }};
             return mt2;
         }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
index 03fb500b10f..ad6b049d707 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -596,35 +596,57 @@ public class Lower extends TreeTranslator {
  * Symbol manipulation utilities
  *************************************************************************/
 
-    /** Report a conflict between a user symbol and a synthetic symbol.
-     */
-    private void duplicateError(DiagnosticPosition pos, Symbol sym) {
-        if (!sym.type.isErroneous()) {
-            log.error(pos, "synthetic.name.conflict", sym, sym.location());
-        }
-    }
-
     /** Enter a synthetic symbol in a given scope, but complain if there was already one there.
      *  @param pos           Position for error reporting.
      *  @param sym           The symbol.
      *  @param s             The scope.
      */
     private void enterSynthetic(DiagnosticPosition pos, Symbol sym, Scope s) {
-        if (sym.name != names.error && sym.name != names.empty) {
-            for (Scope.Entry e = s.lookup(sym.name); e.scope == s; e = e.next()) {
-                if (sym != e.sym && sym.kind == e.sym.kind) {
-                    // VM allows methods and variables with differing types
-                    if ((sym.kind & (MTH|VAR)) != 0 &&
-                        !types.erasure(sym.type).equals(types.erasure(e.sym.type)))
-                        continue;
-                    duplicateError(pos, e.sym);
-                    break;
-                }
-            }
-        }
         s.enter(sym);
     }
 
+    /** Check whether synthetic symbols generated during lowering conflict
+     *  with user-defined symbols.
+     *
+     *  @param translatedTrees lowered class trees
+     */
+    void checkConflicts(List<JCTree> translatedTrees) {
+        for (JCTree t : translatedTrees) {
+            t.accept(conflictsChecker);
+        }
+    }
+
+    JCTree.Visitor conflictsChecker = new TreeScanner() {
+
+        TypeSymbol currentClass;
+
+        @Override
+        public void visitMethodDef(JCMethodDecl that) {
+            chk.checkConflicts(that.pos(), that.sym, currentClass);
+            super.visitMethodDef(that);
+        }
+
+        @Override
+        public void visitVarDef(JCVariableDecl that) {
+            if (that.sym.owner.kind == TYP) {
+                chk.checkConflicts(that.pos(), that.sym, currentClass);
+            }
+            super.visitVarDef(that);
+        }
+
+        @Override
+        public void visitClassDef(JCClassDecl that) {
+            TypeSymbol prevCurrentClass = currentClass;
+            currentClass = that.sym;
+            try {
+                super.visitClassDef(that);
+            }
+            finally {
+                currentClass = prevCurrentClass;
+            }
+        }
+    };
+
     /** Look up a synthetic name in a given scope.
      *  @param scope        The scope.
      *  @param name         The name.
@@ -3192,6 +3214,7 @@ public class Lower extends TreeTranslator {
                 makeAccessible(l.head);
             for (EnumMapping map : enumSwitchMap.values())
                 map.translate();
+            checkConflicts(this.translated.toList());
             translated = this.translated;
         } finally {
             // note that recursive invocations of this method fail hard
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
index 5c0245a0a98..39dd35902a5 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
@@ -1040,15 +1040,6 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
                     JavaFileObject prev = log.useSource(env.toplevel.sourcefile);
                     try {
                         enterTypeAnnotations(annotations);
-
-                        // enrich type parameter symbols... easier for annotation processors
-                        if (tree instanceof JCTypeParameter) {
-                            JCTypeParameter typeparam = (JCTypeParameter)tree;
-                            ListBuffer<Attribute.Compound> buf = ListBuffer.lb();
-                            for (JCTypeAnnotation anno : annotations)
-                                buf.add(anno.attribute_field);
-                            typeparam.type.tsym.attributes_field = buf.toList();
-                        }
                     } finally {
                         log.useSource(prev);
                     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
index bb62298119c..808fd9959ef 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -251,7 +251,8 @@ public class Resolve {
             return true;
         else {
             Symbol s2 = ((MethodSymbol)sym).implementation(site.tsym, types, true);
-            return (s2 == null || s2 == sym);
+            return (s2 == null || s2 == sym ||
+                    !types.isSubSignature(types.memberType(site, s2), types.memberType(site, sym)));
         }
     }
     //where
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
index 18dcceb56df..f2d976ae9bb 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -631,7 +631,7 @@ public class TransTypes extends TreeTranslator {
     }
 
     public void visitAssignop(JCAssignOp tree) {
-        tree.lhs = translate(tree.lhs, tree.operator.type.getParameterTypes().head);
+        tree.lhs = translate(tree.lhs, null);
         tree.rhs = translate(tree.rhs, tree.operator.type.getParameterTypes().tail.head);
         tree.type = erasure(tree.type);
         result = tree;
@@ -817,6 +817,23 @@ public class TransTypes extends TreeTranslator {
             pop();
         }
 
+        private boolean inClass = false;
+
+        @Override
+        public void visitClassDef(JCClassDecl tree) {
+           if (!inClass) {
+               // Do not recurse into nested and inner classes since
+               // TransTypes.visitClassDef makes an invocation for each class
+               // separately.
+               inClass = true;
+               try {
+                   super.visitClassDef(tree);
+               } finally {
+                   inClass = false;
+               }
+           }
+        }
+
         private TypeAnnotationPosition resolveFrame(JCTree tree, JCTree frame,
                 List<JCTree> path, TypeAnnotationPosition p) {
             switch (frame.getKind()) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java b/langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java
index e66ae933efe..48ff18e08aa 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java
@@ -29,6 +29,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.charset.CharsetDecoder;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.NestingKind;
@@ -36,6 +38,12 @@ import javax.tools.JavaFileObject;
 
 import static javax.tools.JavaFileObject.Kind.*;
 
+/**
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+*/
 public abstract class BaseFileObject implements JavaFileObject {
     protected BaseFileObject(JavacFileManager fileManager) {
         this.fileManager = fileManager;
@@ -87,7 +95,26 @@ public abstract class BaseFileObject implements JavaFileObject {
         return (lastDot == -1 ? fileName : fileName.substring(0, lastDot));
     }
 
+    protected static URI createJarUri(File jarFile, String entryName) {
+        URI jarURI = jarFile.toURI().normalize();
+        String separator = entryName.startsWith("/") ? "!" : "!/";
+        try {
+            // The jar URI convention appears to be not to re-encode the jarURI
+            return new URI("jar:" + jarURI + separator + entryName);
+        } catch (URISyntaxException e) {
+            throw new CannotCreateUriError(jarURI + separator + entryName, e);
+        }
+    }
+
+    /** Used when URLSyntaxException is thrown unexpectedly during
+     *  implementations of (Base)FileObject.toURI(). */
+    protected static class CannotCreateUriError extends Error {
+        private static final long serialVersionUID = 9101708840997613546L;
+        public CannotCreateUriError(String value, Throwable cause) {
+            super(value, cause);
+        }
+    }
+
     /** The file manager that created this JavaFileObject. */
     protected final JavacFileManager fileManager;
-
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java b/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
index 9cd55db589a..cdd091471b9 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
@@ -34,7 +34,12 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Caching implementation of FSInfo
+ * Caching implementation of FSInfo.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class CacheFSInfo extends FSInfo {
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java b/langtools/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java
new file mode 100644
index 00000000000..a88a32cb097
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.tools.javac.file;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.jar.JarFile;
+
+/**
+ * A URLClassLoader that also implements Closeable.
+ * Reflection is used to access internal data structures in the URLClassLoader,
+ * since no public API exists for this purpose. Therefore this code is somewhat
+ * fragile. Caveat emptor.
+ * @throws Error if the internal data structures are not as expected.
+ *
+ *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
+ *  you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+class CloseableURLClassLoader
+        extends URLClassLoader implements Closeable {
+    CloseableURLClassLoader(URL[] urls, ClassLoader parent) throws Error {
+        super(urls, parent);
+        try {
+            getLoaders(); //proactive check that URLClassLoader is as expected
+        } catch (Throwable t) {
+            throw new Error("cannot create CloseableURLClassLoader", t);
+        }
+    }
+
+    /**
+     * Close any jar files that may have been opened by the class loader.
+     * Reflection is used to access the jar files in the URLClassLoader's
+     * internal data structures.
+     * @throws java.io.IOException if the jar files cannot be found for any
+     * reson, or if closing the jar file itself causes an IOException.
+     */
+    public void close() throws IOException {
+        try {
+            for (Object l: getLoaders()) {
+                if (l.getClass().getName().equals("sun.misc.URLClassPath$JarLoader")) {
+                    Field jarField = l.getClass().getDeclaredField("jar");
+                    JarFile jar = (JarFile) getField(l, jarField);
+                    //System.err.println("CloseableURLClassLoader: closing " + jar);
+                    jar.close();
+                }
+            }
+        } catch (Throwable t) {
+            IOException e = new IOException("cannot close class loader");
+            e.initCause(t);
+            throw e;
+        }
+    }
+
+    private ArrayList<?> getLoaders()
+            throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException
+    {
+        Field ucpField = URLClassLoader.class.getDeclaredField("ucp");
+        Object urlClassPath = getField(this, ucpField);
+        if (urlClassPath == null)
+            throw new AssertionError("urlClassPath not set in URLClassLoader");
+        Field loadersField = urlClassPath.getClass().getDeclaredField("loaders");
+        return (ArrayList<?>) getField(urlClassPath, loadersField);
+    }
+
+    private Object getField(Object o, Field f)
+            throws IllegalArgumentException, IllegalAccessException {
+        boolean prev = f.isAccessible();
+        try {
+            f.setAccessible(true);
+            return f.get(o);
+        } finally {
+            f.setAccessible(prev);
+        }
+    }
+
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java b/langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java
index 840757a5c0d..cfe0dae5066 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/FSInfo.java
@@ -16,6 +16,11 @@ import com.sun.tools.javac.util.Context;
 /**
  * Get meta-info about files. Default direct (non-caching) implementation.
  * @see CacheFSInfo
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class FSInfo {
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
index d8ccc0211fd..e719161faba 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
@@ -26,6 +26,7 @@
 package com.sun.tools.javac.file;
 
 import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -33,8 +34,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.lang.ref.SoftReference;
+import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.ByteBuffer;
@@ -82,6 +85,11 @@ import static com.sun.tools.javac.main.OptionName.*;
 /**
  * This class provides access to the source, class and other files
  * used by the compiler and related tools.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class JavacFileManager implements StandardJavaFileManager {
 
@@ -126,6 +134,7 @@ public class JavacFileManager implements StandardJavaFileManager {
 
     protected boolean mmappedIO;
     protected boolean ignoreSymbolFile;
+    protected String classLoaderClass;
 
     /**
      * User provided charset (through javax.tools).
@@ -175,6 +184,7 @@ public class JavacFileManager implements StandardJavaFileManager {
 
         mmappedIO = options.get("mmappedIO") != null;
         ignoreSymbolFile = options.get("ignore.symbol.file") != null;
+        classLoaderClass = options.get("procloader");
     }
 
     public JavaFileObject getFileForInput(String name) {
@@ -428,6 +438,7 @@ public class JavacFileManager implements StandardJavaFileManager {
             return Collections.emptySet();
         }
 
+        @Override
         public String toString() {
             return "MissingArchive[" + zipFileName + "]";
         }
@@ -645,10 +656,10 @@ public class JavacFileManager implements StandardJavaFileManager {
     private final ByteBufferCache byteBufferCache;
 
     CharsetDecoder getDecoder(String encodingName, boolean ignoreEncodingErrors) {
-        Charset charset = (this.charset == null)
+        Charset cs = (this.charset == null)
             ? Charset.forName(encodingName)
             : this.charset;
-        CharsetDecoder decoder = charset.newDecoder();
+        CharsetDecoder decoder = cs.newDecoder();
 
         CodingErrorAction action;
         if (ignoreEncodingErrors)
@@ -742,8 +753,40 @@ public class JavacFileManager implements StandardJavaFileManager {
                 throw new AssertionError(e);
             }
         }
-        return new URLClassLoader(lb.toArray(new URL[lb.size()]),
-            getClass().getClassLoader());
+
+        URL[] urls = lb.toArray(new URL[lb.size()]);
+        ClassLoader thisClassLoader = getClass().getClassLoader();
+
+        // Bug: 6558476
+        // Ideally, ClassLoader should be Closeable, but before JDK7 it is not.
+        // On older versions, try the following, to get a closeable classloader.
+
+        // 1: Allow client to specify the class to use via hidden option
+        if (classLoaderClass != null) {
+            try {
+                Class<? extends ClassLoader> loader =
+                        Class.forName(classLoaderClass).asSubclass(ClassLoader.class);
+                Class<?>[] constrArgTypes = { URL[].class, ClassLoader.class };
+                Constructor<? extends ClassLoader> constr = loader.getConstructor(constrArgTypes);
+                return constr.newInstance(new Object[] { urls, thisClassLoader });
+            } catch (Throwable t) {
+                // ignore errors loading user-provided class loader, fall through
+            }
+        }
+
+        // 2: If URLClassLoader implements Closeable, use that.
+        if (Closeable.class.isAssignableFrom(URLClassLoader.class))
+            return new URLClassLoader(urls, thisClassLoader);
+
+        // 3: Try using private reflection-based CloseableURLClassLoader
+        try {
+            return new CloseableURLClassLoader(urls, thisClassLoader);
+        } catch (Throwable t) {
+            // ignore errors loading workaround class loader, fall through
+        }
+
+        // 4: If all else fails, use plain old standard URLClassLoader
+        return new URLClassLoader(urls, thisClassLoader);
     }
 
     public Iterable<JavaFileObject> list(Location location,
@@ -851,7 +894,7 @@ public class JavacFileManager implements StandardJavaFileManager {
         nullCheck(location);
         // validatePackageName(packageName);
         nullCheck(packageName);
-        if (!isRelativeUri(URI.create(relativeName))) // FIXME 6419701
+        if (!isRelativeUri(relativeName))
             throw new IllegalArgumentException("Invalid relative name: " + relativeName);
         RelativeFile name = packageName.length() == 0
             ? new RelativeFile(relativeName)
@@ -905,7 +948,7 @@ public class JavacFileManager implements StandardJavaFileManager {
         nullCheck(location);
         // validatePackageName(packageName);
         nullCheck(packageName);
-        if (!isRelativeUri(URI.create(relativeName))) // FIXME 6419701
+        if (!isRelativeUri(relativeName))
             throw new IllegalArgumentException("relativeName is invalid");
         RelativeFile name = packageName.length() == 0
             ? new RelativeFile(relativeName)
@@ -1044,6 +1087,15 @@ public class JavacFileManager implements StandardJavaFileManager {
         return first != '.' && first != '/';
     }
 
+    // Convenience method
+    protected static boolean isRelativeUri(String u) {
+        try {
+            return isRelativeUri(new URI(u));
+        } catch (URISyntaxException e) {
+            return false;
+        }
+    }
+
     /**
      * Converts a relative file name to a relative URI.  This is
      * different from File.toURI as this method does not canonicalize
@@ -1058,7 +1110,7 @@ public class JavacFileManager implements StandardJavaFileManager {
     public static String getRelativeName(File file) {
         if (!file.isAbsolute()) {
             String result = file.getPath().replace(File.separatorChar, '/');
-            if (JavacFileManager.isRelativeUri(URI.create(result))) // FIXME 6419701
+            if (isRelativeUri(result))
                 return result;
         }
         throw new IllegalArgumentException("Invalid relative path: " + file);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java b/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java
index c604134cab1..0e5746331ef 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java
@@ -34,7 +34,6 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.CharsetDecoder;
@@ -42,6 +41,11 @@ import javax.tools.JavaFileObject;
 
 /**
  * A subclass of JavaFileObject representing regular files.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 class RegularFileObject extends BaseFileObject {
 
@@ -68,6 +72,7 @@ class RegularFileObject extends BaseFileObject {
         return new FileInputStream(f);
     }
 
+    @Override
     protected CharsetDecoder getDecoder(boolean ignoreEncodingErrors) {
         return fileManager.getDecoder(fileManager.getEncodingName(), ignoreEncodingErrors);
     }
@@ -142,6 +147,7 @@ class RegularFileObject extends BaseFileObject {
     }
 
     @Deprecated
+    @Override
     public String getPath() {
         return f.getPath();
     }
@@ -196,11 +202,6 @@ class RegularFileObject extends BaseFileObject {
     }
 
     public URI toUri() {
-        try {
-            String path = f.getAbsolutePath().replace(File.separatorChar, '/');
-            return new URI("file://" + path).normalize();
-        } catch (URISyntaxException ex) {
-            return f.toURI();
-        }
+        return f.toURI().normalize();
     }
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java b/langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java
index 92cc8862193..d661f447423 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/RelativePath.java
@@ -34,6 +34,11 @@ import javax.tools.JavaFileObject;
  * Used to represent a platform-neutral path within a platform-specific
  * container, such as a directory or zip file.
  * Internally, the file separator is always '/'.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public abstract class RelativePath implements Comparable<RelativePath> {
     /**
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java b/langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java
index 89c9a236706..4fe2c698674 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java
@@ -35,6 +35,12 @@ import com.sun.tools.javac.file.RelativePath.RelativeDirectory;
 import com.sun.tools.javac.file.RelativePath.RelativeFile;
 import com.sun.tools.javac.util.List;
 
+/**
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+*/
 public class SymbolArchive extends ZipArchive {
 
     final File origFile;
@@ -67,12 +73,14 @@ public class SymbolArchive extends ZipArchive {
         map.put(dirname, list);
     }
 
+    @Override
     public JavaFileObject getFileObject(RelativeDirectory subdirectory, String file) {
         RelativeDirectory prefix_subdir = new RelativeDirectory(prefix, subdirectory.path);
         ZipEntry ze = new RelativeFile(prefix_subdir, file).getZipEntry(zdir);
         return new SymbolFileObject(this, file, ze);
     }
 
+    @Override
     public String toString() {
         return "SymbolArchive[" + zdir.getName() + "]";
     }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java b/langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java
index 9af25f7788b..ff50fc35b99 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipArchive.java
@@ -48,6 +48,12 @@ import com.sun.tools.javac.file.RelativePath.RelativeDirectory;
 import com.sun.tools.javac.file.RelativePath.RelativeFile;
 import com.sun.tools.javac.util.List;
 
+/**
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
 public class ZipArchive implements Archive {
 
     public ZipArchive(JavacFileManager fm, ZipFile zdir) throws IOException {
@@ -116,6 +122,7 @@ public class ZipArchive implements Archive {
         zdir.close();
     }
 
+    @Override
     public String toString() {
         return "ZipArchive[" + zdir.getName() + "]";
     }
@@ -148,6 +155,7 @@ public class ZipArchive implements Archive {
             throw new UnsupportedOperationException();
         }
 
+        @Override
         protected CharsetDecoder getDecoder(boolean ignoreEncodingErrors) {
             return fileManager.getDecoder(fileManager.getEncodingName(), ignoreEncodingErrors);
         }
@@ -171,6 +179,7 @@ public class ZipArchive implements Archive {
         }
 
         @Deprecated
+        @Override
         public String getPath() {
             return zarch.zdir.getName() + "(" + entry + ")";
         }
@@ -229,9 +238,8 @@ public class ZipArchive implements Archive {
         }
 
         public URI toUri() {
-            String zipName = new File(getZipName()).toURI().normalize().getPath();
-            String entryName = getZipEntryName();
-            return URI.create("jar:" + zipName + "!" + entryName);
+            File zipFile = new File(getZipName());
+            return createJarUri(zipFile, entry.getName());
         }
 
         @Override
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
index 8a7f6508c4f..f39359992a1 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
@@ -67,6 +67,11 @@ import com.sun.tools.javac.file.RelativePath.RelativeFile;
  * If nonBatchMode option is specified (-XDnonBatchMode) the compiler will use timestamp
  * checking to reindex the zip files if it is needed. In batch mode the timestamps are not checked
  * and the compiler uses the cached indexes.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class ZipFileIndex {
     private static final String MIN_CHAR = String.valueOf(Character.MIN_VALUE);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
index 4ed00d119e4..9034bb268eb 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
@@ -44,6 +44,12 @@ import com.sun.tools.javac.file.RelativePath.RelativeDirectory;
 import com.sun.tools.javac.file.RelativePath.RelativeFile;
 import com.sun.tools.javac.util.List;
 
+/**
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
+ */
 public class ZipFileIndexArchive implements Archive {
 
     private final ZipFileIndex zfIndex;
@@ -66,7 +72,7 @@ public class ZipFileIndexArchive implements Archive {
     public JavaFileObject getFileObject(RelativeDirectory subdirectory, String file) {
         RelativeFile fullZipFileName = new RelativeFile(subdirectory, file);
         ZipFileIndex.Entry entry = zfIndex.getZipIndexEntry(fullZipFileName);
-        JavaFileObject ret = new ZipFileIndexFileObject(fileManager, zfIndex, entry, zfIndex.getZipFile().getPath());
+        JavaFileObject ret = new ZipFileIndexFileObject(fileManager, zfIndex, entry, zfIndex.getZipFile());
         return ret;
     }
 
@@ -78,6 +84,7 @@ public class ZipFileIndexArchive implements Archive {
         zfIndex.close();
     }
 
+    @Override
     public String toString() {
         return "ZipFileIndexArchive[" + zfIndex + "]";
     }
@@ -105,10 +112,10 @@ public class ZipFileIndexArchive implements Archive {
 
         /** The name of the zip file where this entry resides.
          */
-        String zipName;
+        File zipName;
 
 
-        ZipFileIndexFileObject(JavacFileManager fileManager, ZipFileIndex zfIndex, ZipFileIndex.Entry entry, String zipFileName) {
+        ZipFileIndexFileObject(JavacFileManager fileManager, ZipFileIndex zfIndex, ZipFileIndex.Entry entry, File zipFileName) {
             super(fileManager);
             this.name = entry.getFileName();
             this.zfIndex = zfIndex;
@@ -124,6 +131,7 @@ public class ZipFileIndexArchive implements Archive {
             return inputStream;
         }
 
+        @Override
         protected CharsetDecoder getDecoder(boolean ignoreEncodingErrors) {
             return fileManager.getDecoder(fileManager.getEncodingName(), ignoreEncodingErrors);
         }
@@ -151,6 +159,7 @@ public class ZipFileIndexArchive implements Archive {
 
         /** @deprecated see bug 6410637 */
         @Deprecated
+        @Override
         public String getPath() {
             return zipName + "(" + entry.getName() + ")";
         }
@@ -177,7 +186,7 @@ public class ZipFileIndexArchive implements Archive {
         }
 
         public String getZipName() {
-            return zipName;
+            return zipName.getPath();
         }
 
         public String getZipEntryName() {
@@ -185,9 +194,10 @@ public class ZipFileIndexArchive implements Archive {
         }
 
         public URI toUri() {
-            String zipName = new File(getZipName()).toURI().normalize().getPath();
-            String entryName = getZipEntryName();
-            return URI.create("jar:" + zipName + "!" + entryName);
+            if (zfIndex.symbolFilePrefix != null)
+                return createJarUri(zipName, zfIndex.symbolFilePrefix.path + entry.getName());
+            else
+                return createJarUri(zipName, entry.getName());
         }
 
         private byte[] read() throws IOException {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 3ae7e0700d1..80ecc8a77fb 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -27,6 +27,7 @@ package com.sun.tools.javac.jvm;
 
 import java.io.*;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.CharBuffer;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -2614,7 +2615,11 @@ public class ClassReader implements Completer {
         }
 
         public URI toUri() {
-            return URI.create(name.toString());
+            try {
+                return new URI(null, name.toString(), null);
+            } catch (URISyntaxException e) {
+                throw new CannotCreateUriError(name.toString(), e);
+            }
         }
 
         @Override
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 2de2c537e46..d9f55c23ea9 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -813,6 +813,9 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
         } catch (Abort ex) {
             if (devVerbose)
                 ex.printStackTrace();
+        } finally {
+            if (procEnvImpl != null)
+                procEnvImpl.close();
         }
     }
 
@@ -936,7 +939,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
     /**
      * Object to handle annotation processing.
      */
-    JavacProcessingEnvironment procEnvImpl = null;
+    private JavacProcessingEnvironment procEnvImpl = null;
 
     /**
      * Check if we should process annotations.
@@ -947,7 +950,8 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
      * @param processors user provided annotation processors to bypass
      * discovery, {@code null} means that no processors were provided
      */
-    public void initProcessAnnotations(Iterable<? extends Processor> processors) {
+    public void initProcessAnnotations(Iterable<? extends Processor> processors)
+                throws IOException {
         // Process annotations if processing is not disabled and there
         // is at least one Processor available.
         Options options = Options.instance(context);
@@ -974,7 +978,8 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
     }
 
     // TODO: called by JavacTaskImpl
-    public JavaCompiler processAnnotations(List<JCCompilationUnit> roots) throws IOException {
+    public JavaCompiler processAnnotations(List<JCCompilationUnit> roots)
+            throws IOException {
         return processAnnotations(roots, List.<String>nil());
     }
 
@@ -1061,10 +1066,14 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
                         return this;
                 }
             }
-            JavaCompiler c = procEnvImpl.doProcessing(context, roots, classSymbols, pckSymbols);
-            if (c != this)
-                annotationProcessingOccurred = c.annotationProcessingOccurred = true;
-            return c;
+            try {
+                JavaCompiler c = procEnvImpl.doProcessing(context, roots, classSymbols, pckSymbols);
+                if (c != this)
+                    annotationProcessingOccurred = c.annotationProcessingOccurred = true;
+                return c;
+            } finally {
+                procEnvImpl.close();
+            }
         } catch (CompletionFailure ex) {
             log.error("cant.access", ex.sym, ex.getDetailValue());
             return this;
@@ -1207,6 +1216,9 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
         return stopIfError(CompileState.FLOW, results);
     }
 
+    HashMap<Env<AttrContext>, Queue<Pair<Env<AttrContext>, JCClassDecl>>> desugaredEnvs =
+            new HashMap<Env<AttrContext>, Queue<Pair<Env<AttrContext>, JCClassDecl>>>();
+
     /**
      * Prepare attributed parse trees, in conjunction with their attribution contexts,
      * for source or code generation. If the file was not listed on the command line,
@@ -1222,10 +1234,17 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
             return;
         }
 
+        if (compileStates.isDone(env, CompileState.LOWER)) {
+            results.addAll(desugaredEnvs.get(env));
+            return;
+        }
+
         /**
-         * As erasure (TransTypes) destroys information needed in flow analysis,
-         * including information in supertypes, we need to ensure that supertypes
-         * are processed through attribute and flow before subtypes are translated.
+         * Ensure that superclasses of C are desugared before C itself. This is
+         * required for two reasons: (i) as erasure (TransTypes) destroys
+         * information needed in flow analysis and (ii) as some checks carried
+         * out during lowering require that all synthetic fields/methods have
+         * already been added to C and its superclasses.
          */
         class ScanNested extends TreeScanner {
             Set<Env<AttrContext>> dependencies = new LinkedHashSet<Env<AttrContext>>();
@@ -1246,8 +1265,8 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
         ScanNested scanner = new ScanNested();
         scanner.scan(env.tree);
         for (Env<AttrContext> dep: scanner.dependencies) {
-            if (!compileStates.isDone(dep, CompileState.FLOW))
-                flow(attribute(dep));
+        if (!compileStates.isDone(dep, CompileState.FLOW))
+            desugaredEnvs.put(dep, desugar(flow(attribute(dep))));
         }
 
         //We need to check for error another time as more classes might
@@ -1298,6 +1317,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
                 return;
 
             env.tree = transTypes.translateTopLevelClass(env.tree, localMake);
+            compileStates.put(env, CompileState.TRANSTYPES);
 
             if (shouldStop(CompileState.LOWER))
                 return;
@@ -1315,6 +1335,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
 
             //translate out inner classes
             List<JCTree> cdefs = lower.translateTopLevelClass(env, env.tree, localMake);
+            compileStates.put(env, CompileState.LOWER);
 
             if (shouldStop(CompileState.LOWER))
                 return;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/JavacOption.java b/langtools/src/share/classes/com/sun/tools/javac/main/JavacOption.java
index 189d3c555d2..2b8a915cf01 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavacOption.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavacOption.java
@@ -25,11 +25,11 @@
 
 package com.sun.tools.javac.main;
 
+import java.io.PrintWriter;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Options;
-import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.Collection;
 
 /**
  * TODO: describe com.sun.tools.javac.main.JavacOption
@@ -106,9 +106,10 @@ public interface JavacOption {
          */
         ChoiceKind choiceKind;
 
-        /** The choices for this option, if any.
+        /** The choices for this option, if any, and whether or not the choices
+         *  are hidden
          */
-        Collection<String> choices;
+        Map<String,Boolean> choices;
 
         Option(OptionName name, String argsNameKey, String descrKey) {
             this.name = name;
@@ -123,10 +124,18 @@ public interface JavacOption {
         }
 
         Option(OptionName name, String descrKey, ChoiceKind choiceKind, String... choices) {
-            this(name, descrKey, choiceKind, Arrays.asList(choices));
+            this(name, descrKey, choiceKind, createChoices(choices));
         }
 
-        Option(OptionName name, String descrKey, ChoiceKind choiceKind, Collection<String> choices) {
+        private static Map<String,Boolean> createChoices(String... choices) {
+            Map<String,Boolean> map = new LinkedHashMap<String,Boolean>();
+            for (String c: choices)
+                map.put(c, true);
+            return map;
+        }
+
+        Option(OptionName name, String descrKey, ChoiceKind choiceKind,
+                Map<String,Boolean> choices) {
             this(name, null, descrKey);
             if (choiceKind == null || choices == null)
                 throw new NullPointerException();
@@ -153,10 +162,10 @@ public interface JavacOption {
             if (choices != null) {
                 String arg = option.substring(name.optionName.length());
                 if (choiceKind == ChoiceKind.ONEOF)
-                    return choices.contains(arg);
+                    return choices.keySet().contains(arg);
                 else {
                     for (String a: arg.split(",+")) {
-                        if (!choices.contains(a))
+                        if (!choices.keySet().contains(a))
                             return false;
                     }
                 }
@@ -181,10 +190,12 @@ public interface JavacOption {
             if (argsNameKey == null) {
                 if (choices != null) {
                     String sep = "{";
-                    for (String c: choices) {
-                        sb.append(sep);
-                        sb.append(c);
-                        sep = ",";
+                    for (Map.Entry<String,Boolean> e: choices.entrySet()) {
+                        if (!e.getValue()) {
+                            sb.append(sep);
+                            sb.append(e.getKey());
+                            sep = ",";
+                        }
                     }
                     sb.append("}");
                 }
@@ -209,8 +220,8 @@ public interface JavacOption {
                 if (choices != null) {
                     if (choiceKind == ChoiceKind.ONEOF) {
                         // some clients like to see just one of option+choice set
-                        for (String c: choices)
-                            options.remove(option + c);
+                        for (String s: choices.keySet())
+                            options.remove(option + s);
                         String opt = option + arg;
                         options.put(opt, opt);
                         // some clients like to see option (without trailing ":")
@@ -256,7 +267,7 @@ public interface JavacOption {
         XOption(OptionName name, String descrKey, ChoiceKind kind, String... choices) {
             super(name, descrKey, kind, choices);
         }
-        XOption(OptionName name, String descrKey, ChoiceKind kind, Collection<String> choices) {
+        XOption(OptionName name, String descrKey, ChoiceKind kind, Map<String,Boolean> choices) {
             super(name, descrKey, kind, choices);
         }
         @Override
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java b/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
index 8e0eb888f31..885767f68c0 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
@@ -38,9 +38,9 @@ import com.sun.tools.javac.processing.JavacProcessingEnvironment;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
-import java.util.Collection;
 import java.util.EnumSet;
-import java.util.LinkedHashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Set;
 import javax.lang.model.SourceVersion;
 
@@ -598,14 +598,14 @@ public class RecognizedOptions {
     };
     }
 
-    private static Collection<String> getXLintChoices() {
-        Collection<String> choices = new LinkedHashSet<String>();
-        choices.add("all");
+    private static Map<String,Boolean> getXLintChoices() {
+        Map<String,Boolean> choices = new LinkedHashMap<String,Boolean>();
+        choices.put("all", false);
         for (Lint.LintCategory c : Lint.LintCategory.values())
-            choices.add(c.option);
+            choices.put(c.option, c.hidden);
         for (Lint.LintCategory c : Lint.LintCategory.values())
-            choices.add("-" + c.option);
-        choices.add("none");
+            choices.put("-" + c.option, c.hidden);
+        choices.put("none", false);
         return choices;
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
index f43b7d4930c..ce20bff0c64 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -131,6 +131,7 @@ public class JavacParser implements Parser {
         this.allowForeach = source.allowForeach();
         this.allowStaticImport = source.allowStaticImport();
         this.allowAnnotations = source.allowAnnotations();
+        this.allowDiamond = source.allowDiamond();
         this.allowTypeAnnotations = source.allowTypeAnnotations();
         this.keepDocComments = keepDocComments;
         if (keepDocComments)
@@ -148,6 +149,10 @@ public class JavacParser implements Parser {
      */
     boolean allowGenerics;
 
+    /** Switch: Should diamond operator be recognized?
+     */
+    boolean allowDiamond;
+
     /** Switch: Should varargs be recognized?
      */
     boolean allowVarargs;
@@ -194,6 +199,7 @@ public class JavacParser implements Parser {
     static final int TYPE = 2;
     static final int NOPARAMS = 4;
     static final int TYPEARG = 8;
+    static final int DIAMOND = 16;
 
     /** The current mode.
      */
@@ -1326,6 +1332,11 @@ public class JavacParser implements Parser {
         ListBuffer<JCExpression> args = lb();
         if (S.token() == LT) {
             S.nextToken();
+            if (S.token() == GT && (mode & DIAMOND) != 0) {
+                checkDiamond();
+                S.nextToken();
+                return List.nil();
+            }
             args.append(((mode & EXPR) == 0) ? typeArgument() : parseType());
             while (S.token() == COMMA) {
                 S.nextToken();
@@ -1497,7 +1508,7 @@ public class JavacParser implements Parser {
             t = F.AnnotatedType(newAnnotations, t);
 
         int oldmode = mode;
-        mode = TYPE;
+        mode = TYPE | DIAMOND;
         if (S.token() == LT) {
             checkGenerics();
             t = typeArguments(t);
@@ -1547,8 +1558,11 @@ public class JavacParser implements Parser {
     JCExpression innerCreator(int newpos, List<JCExpression> typeArgs, JCExpression encl) {
         JCExpression t = toP(F.at(S.pos()).Ident(ident()));
         if (S.token() == LT) {
+            int oldmode = mode;
+            mode |= DIAMOND;
             checkGenerics();
             t = typeArguments(t);
+            mode = oldmode;
         }
         return classCreatorRest(newpos, encl, typeArgs, t);
     }
@@ -3099,6 +3113,12 @@ public class JavacParser implements Parser {
         }
     }
 
+    void checkDiamond() {
+        if (!allowDiamond) {
+            log.error(S.pos(), "diamond.not.supported.in.source", source.name);
+            allowDiamond = true;
+        }
+    }
     void checkGenerics() {
         if (!allowGenerics) {
             log.error(S.pos(), "generics.not.supported.in.source", source.name);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java b/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
index 861f3e5d3ca..70588366e46 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java
@@ -34,6 +34,11 @@ import com.sun.tools.javac.util.Options;
 
 /**
  * A factory for creating parsers.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class ParserFactory {
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index dd21d41a14f..cb5ca870947 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -136,6 +136,8 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
      */
     Source source;
 
+    private ClassLoader processorClassLoader;
+
     /**
      * JavacMessages object used for localization
      */
@@ -203,7 +205,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
             JavaFileManager fileManager = context.get(JavaFileManager.class);
             try {
                 // If processorpath is not explicitly set, use the classpath.
-                ClassLoader processorCL = fileManager.hasLocation(ANNOTATION_PROCESSOR_PATH)
+                processorClassLoader = fileManager.hasLocation(ANNOTATION_PROCESSOR_PATH)
                     ? fileManager.getClassLoader(ANNOTATION_PROCESSOR_PATH)
                     : fileManager.getClassLoader(CLASS_PATH);
 
@@ -213,9 +215,9 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
                  * provider mechanism to create the processor iterator.
                  */
                 if (processorNames != null) {
-                    processorIterator = new NameProcessIterator(processorNames, processorCL, log);
+                    processorIterator = new NameProcessIterator(processorNames, processorClassLoader, log);
                 } else {
-                    processorIterator = new ServiceIterator(processorCL, log);
+                    processorIterator = new ServiceIterator(processorClassLoader, log);
                 }
             } catch (SecurityException e) {
                 /*
@@ -285,11 +287,12 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
         // The to-be-wrapped iterator.
         private Iterator<?> iterator;
         private Log log;
+        private Class<?> loaderClass;
+        private boolean jusl;
+        private Object loader;
 
         ServiceIterator(ClassLoader classLoader, Log log) {
-            Class<?> loaderClass;
             String loadMethodName;
-            boolean jusl;
 
             this.log = log;
             try {
@@ -322,6 +325,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
                 // For java.util.ServiceLoader, we have to call another
                 // method to get the iterator.
                 if (jusl) {
+                    loader = result; // Store ServiceLoader to call reload later
                     Method m = loaderClass.getMethod("iterator");
                     result = m.invoke(result); // serviceLoader.iterator();
                 }
@@ -363,6 +367,18 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
         public void remove() {
             throw new UnsupportedOperationException();
         }
+
+        public void close() {
+            if (jusl) {
+                try {
+                    // Call java.util.ServiceLoader.reload
+                    Method reloadMethod = loaderClass.getMethod("reload");
+                    reloadMethod.invoke(loader);
+                } catch(Exception e) {
+                    ; // Ignore problems during a call to reload.
+                }
+            }
+        }
     }
 
 
@@ -550,7 +566,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
      * been discoverd so far as well as the means to discover more, if
      * necessary.  A single iterator should be used per round of
      * annotation processing.  The iterator first visits already
-     * discovered processors then fails over to the service provided
+     * discovered processors then fails over to the service provider
      * mechanism if additional queries are made.
      */
     class DiscoveredProcessors implements Iterable<ProcessorState> {
@@ -622,6 +638,16 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
             this.processorIterator = processorIterator;
             this.procStateList = new ArrayList<ProcessorState>();
         }
+
+        /**
+         * Free jar files, etc. if using a service loader.
+         */
+        public void close() {
+            if (processorIterator != null &&
+                processorIterator instanceof ServiceIterator) {
+                ((ServiceIterator) processorIterator).close();
+            }
+        }
     }
 
     private void discoverAndRunProcs(Context context,
@@ -908,7 +934,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
         * second to last round; errorRaised() gives the error status
         * of the last round.
         */
-       errorStatus = errorStatus || messager.errorRaised();
+        errorStatus = errorStatus || messager.errorRaised();
 
 
         // Free resources
@@ -1019,9 +1045,13 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
     /**
      * Free resources related to annotation processing.
      */
-    public void close() {
+    public void close() throws IOException {
         filer.close();
+        if (discoveredProcs != null) // Make calling close idempotent
+            discoveredProcs.close();
         discoveredProcs = null;
+        if (processorClassLoader != null && processorClassLoader instanceof Closeable)
+            ((Closeable) processorClassLoader).close();
     }
 
     private List<ClassSymbol> getTopLevelClasses(List<? extends JCCompilationUnit> units) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java b/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
index c80613360d5..963f26020d3 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java
@@ -48,7 +48,8 @@ import java.util.*;
  * deletion without notice.</b>
  */
 @SupportedAnnotationTypes("*")
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
+// TODO: Change to version 7 based visitors when available
+@SupportedSourceVersion(SourceVersion.RELEASE_7)
 public class PrintingProcessor extends AbstractProcessor {
     PrintWriter writer;
 
@@ -374,6 +375,7 @@ public class PrintingProcessor extends AbstractProcessor {
                 for(TypeParameterElement tpe: typeParams) {
                     if (!first)
                         writer.print(", ");
+                    printAnnotationsInline(tpe);
                     writer.print(tpe.toString());
                     first = false;
                 }
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
index 3365ae06635..03993f64f4d 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -431,6 +431,8 @@ compiler.err.static.imp.only.classes.and.interfaces=\
     static import only from classes and interfaces
 compiler.err.synthetic.name.conflict=\
     the symbol {0} conflicts with a compiler-synthesized symbol in {1}
+compiler.warn.synthetic.name.conflict=\
+    the symbol {0} conflicts with a compiler-synthesized symbol in {1}
 
 compiler.err.throws.not.allowed.in.intf.annotation=\
     throws clause not allowed in @interface members
@@ -562,12 +564,6 @@ compiler.note.deprecated.filename.additional=\
 compiler.note.deprecated.plural.additional=\
     Some input files additionally use or override a deprecated API.
 
-# Notes related to annotation processing
-
-# Print a client-generated note; assumed to be localized, no translation required
-compiler.note.proc.messager=\
-    {0}
-
 compiler.note.unchecked.filename=\
     {0} uses unchecked or unsafe operations.
 compiler.note.unchecked.plural=\
@@ -582,6 +578,25 @@ compiler.note.unchecked.filename.additional=\
 compiler.note.unchecked.plural.additional=\
     Some input files additionally use unchecked or unsafe operations.
 
+compiler.note.sunapi.filename=\
+    {0} uses Sun proprietary API that may be removed in a future release.
+compiler.note.sunapi.plural=\
+    Some input files use Sun proprietary API that may be removed in a future release.
+# The following string may appear after one of the above sunapi messages.
+compiler.note.sunapi.recompile=\
+    Recompile with -Xlint:sunapi for details.
+
+compiler.note.sunapi.filename.additional=\
+    {0} uses additional Sun proprietary API that may be removed in a future release.
+compiler.note.sunapi.plural.additional=\
+    Some input files additionally use Sun proprietary API that may be removed in a future release.
+
+# Notes related to annotation processing
+
+# Print a client-generated note; assumed to be localized, no translation required
+compiler.note.proc.messager=\
+    {0}
+
 #####
 
 compiler.misc.count.error=\
@@ -761,7 +776,7 @@ compiler.warn.unchecked.meth.invocation.applied=\
     found: {3}
 
 compiler.warn.unchecked.generic.array.creation=\
-    [unchecked] unchecked generic array creation of type {0} for varargs parameter
+    [unchecked] unchecked generic array creation for varargs parameter of type {0}
 
 compiler.warn.missing.deprecated.annotation=\
     [dep-ann] deprecated item is not annotated with @Deprecated
@@ -1003,7 +1018,7 @@ compiler.misc.inferred.do.not.conform.to.bounds=\
     inferred: {0}\n\
     bound(s): {1}
 compiler.misc.inferred.do.not.conform.to.params=\
-    actual arguments do not conforms to inferred formal arguments\n\
+    actual arguments do not conform to inferred formal arguments\n\
     required: {0}\n\
     found: {1}
 
@@ -1058,6 +1073,10 @@ compiler.err.cant.resolve.location.args.params=\
     symbol:   {0} <{2}>{1}({3})\n\
     location: {4} {5}
 
+compiler.err.cant.apply.diamond=\
+    diamond operator cannot infer types for {0};\n\
+    reason: {1}
+
 ## The following are all possible string for "kindname".
 ## They should be called whatever the JLS calls them after it been translated
 ## to the appropriate language.
@@ -1091,23 +1110,33 @@ compiler.misc.no.args=\
     no arguments
 
 compiler.err.override.static=\
-    {0}; overriding method is static
+    {0}\n\
+    overriding method is static
 compiler.err.override.meth=\
-    {0}; overridden method is {1}
+    {0}\n\
+    overridden method is {1}
 
 compiler.err.override.meth.doesnt.throw=\
-    {0}; overridden method does not throw {1}
+    {0}\n\
+    overridden method does not throw {1}
 
 # In the following string {1} is a space separated list of Java Keywords, as
 # they would have been declared in the source code
 compiler.err.override.weaker.access=\
-    {0}; attempting to assign weaker access privileges; was {1}
+    {0}\n\
+    attempting to assign weaker access privileges; was {1}
 
-compiler.misc.override.incompatible.ret=\
-    {0}; attempting to use incompatible return type
+compiler.err.override.incompatible.ret=\
+    {0}\n\
+    return type {1} is not compatible with {2}
 
-compiler.misc.override.unchecked.ret=\
-    {0}; return type requires unchecked conversion
+compiler.warn.override.unchecked.ret=\
+    [unchecked] {0}\n\
+    return type requires unchecked conversion from {1} to {2}
+
+compiler.warn.override.unchecked.thrown=\
+    [unchecked] {0}\n\
+    overridden method does not throw {1}
 
 ## The following are all possible strings for the first argument ({0}) of the
 ## above strings.
@@ -1180,6 +1209,10 @@ compiler.err.enums.not.supported.in.source=\
     enums are not supported in -source {0}\n\
 (use -source 5 or higher to enable enums)
 
+compiler.err.diamond.not.supported.in.source=\
+    diamond operator is not supported in -source {0}\n\
+(use -source 7 or higher to enable diamond operator)
+
 ########################################
 # Diagnostics for where clause implementation
 # used by the RichDiagnosticFormatter.
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 7a81797fef3..fead12535a3 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -204,6 +204,15 @@ public class TreeInfo {
         return (JCMethodInvocation)exec.expr;
     }
 
+    /** Return true if a tree represents a diamond new expr. */
+    public static boolean isDiamond(JCTree tree) {
+        switch(tree.getTag()) {
+            case JCTree.TYPEAPPLY: return ((JCTypeApply)tree).getTypeArguments().isEmpty();
+            case JCTree.NEWCLASS: return isDiamond(((JCNewClass)tree).clazz);
+            default: return false;
+        }
+    }
+
     /** Return true if a tree represents the null literal. */
     public static boolean isNull(JCTree tree) {
         if (tree.getTag() != JCTree.LITERAL)
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
index d8578ec711d..db7b273e277 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
@@ -57,6 +57,10 @@ import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticType.*;
  *  <li> Provides the formatting logic for rendering the arguments of a JCDiagnostic object.
  * <ul>
  *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public abstract class AbstractDiagnosticFormatter implements DiagnosticFormatter<JCDiagnostic> {
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
index 77063af34a2..a4442dbff53 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java
@@ -57,6 +57,11 @@ import static com.sun.tools.javac.util.LayoutCharacters.*;
  * <li>%m: the text or the diagnostic, including any appropriate arguments
  * <li>%_: space delimiter, useful for formatting purposes
  * </ul>
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class BasicDiagnosticFormatter extends AbstractDiagnosticFormatter {
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
index aca7fd105e0..f989e38365e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java
@@ -37,6 +37,11 @@ import com.sun.tools.javac.api.DiagnosticFormatter.PositionKind;
 /**
  * A delegated diagnostic formatter delegates all formatting
  * actions to an underlying formatter (aka the delegated formatter).
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class ForwardingDiagnosticFormatter<D extends Diagnostic<?>, F extends DiagnosticFormatter<D>>
         implements DiagnosticFormatter<D> {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java
index d405de58224..7fd1e2fc1b5 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Log.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Log.java
@@ -78,6 +78,10 @@ public class Log extends AbstractLog {
      */
     public boolean emitWarnings;
 
+    /** Switch: suppress note messages.
+     */
+    public boolean suppressNotes;
+
     /** Print stack trace on errors?
      */
     public boolean dumpOnError;
@@ -121,6 +125,7 @@ public class Log extends AbstractLog {
         this.dumpOnError = options.get("-doe") != null;
         this.promptOnError = options.get("-prompt") != null;
         this.emitWarnings = options.get("-Xlint:none") == null;
+        this.suppressNotes = options.get("suppressNotes") != null;
         this.MaxErrors = getIntOption(options, "-Xmaxerrs", 100);
         this.MaxWarnings = getIntOption(options, "-Xmaxwarns", 100);
 
@@ -324,7 +329,7 @@ public class Log extends AbstractLog {
             // Print out notes only when we are permitted to report warnings
             // Notes are only generated at the end of a compilation, so should be small
             // in number.
-            if (emitWarnings || diagnostic.isMandatory()) {
+            if ((emitWarnings || diagnostic.isMandatory()) && !suppressNotes) {
                 writeDiagnostic(diagnostic);
             }
             break;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
index 13674e2e7d2..f9e5126ea21 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java
@@ -39,6 +39,11 @@ import static com.sun.tools.javac.api.DiagnosticFormatter.PositionKind.*;
  * The raw formatter will format a diagnostic according to one of two format patterns, depending on whether
  * or not the source name and position are set. This formatter provides a standardized, localize-independent
  * implementation of a diagnostic formatter; as such, this formatter is best suited for testing purposes.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public final class RawDiagnosticFormatter extends AbstractDiagnosticFormatter {
 
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java b/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
index 6d8538bf654..2275ba935b4 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java
@@ -58,6 +58,11 @@ import static com.sun.tools.javac.util.RichDiagnosticFormatter.RichConfiguration
  * formatted and (iii) type-variable disambiguation - when the diagnostic refers
  * to two different type-variables with the same name, their representation is
  * disambiguated by appending an index to the type variable name.
+ *
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class RichDiagnosticFormatter extends
         ForwardingDiagnosticFormatter<JCDiagnostic, AbstractDiagnosticFormatter> {
@@ -203,6 +208,32 @@ public class RichDiagnosticFormatter extends
         }
         return clauses.reverse();
     }
+
+    private int indexOf(Type type, WhereClauseKind kind) {
+        int index = 1;
+        for (Type t : whereClauses.get(kind).keySet()) {
+            if (t.tsym == type.tsym) {
+                return index;
+            }
+            if (kind != WhereClauseKind.TYPEVAR ||
+                    t.toString().equals(type.toString())) {
+                index++;
+            }
+        }
+        return -1;
+    }
+
+    private boolean unique(TypeVar typevar) {
+        int found = 0;
+        for (Type t : whereClauses.get(WhereClauseKind.TYPEVAR).keySet()) {
+            if (t.toString().equals(typevar.toString())) {
+                found++;
+            }
+        }
+        if (found < 1)
+            throw new AssertionError("Missing type variable in where clause " + typevar);
+        return found == 1;
+    }
     //where
     /**
      * This enum defines all posssible kinds of where clauses that can be
@@ -361,33 +392,6 @@ public class RichDiagnosticFormatter extends
             }
         }
 
-        private int indexOf(Type type, WhereClauseKind kind) {
-            int index = 0;
-            boolean found = false;
-            for (Type t : whereClauses.get(kind).keySet()) {
-                if (t == type) {
-                    found = true;
-                    break;
-                }
-                index++;
-            }
-            if (!found)
-                throw new AssertionError("Missing symbol in where clause " + type);
-            return index + 1;
-        }
-
-        private boolean unique(TypeVar typevar) {
-            int found = 0;
-            for (Type t : whereClauses.get(WhereClauseKind.TYPEVAR).keySet()) {
-                if (t.toString().equals(typevar.toString())) {
-                    found++;
-                }
-            }
-            if (found < 1)
-                throw new AssertionError("Missing type variable in where clause " + typevar);
-            return found == 1;
-        }
-
         @Override
         protected String printMethodArgs(List<Type> args, boolean varArgs, Locale locale) {
             return super.printMethodArgs(args, varArgs, locale);
@@ -487,7 +491,7 @@ public class RichDiagnosticFormatter extends
 
         @Override
         public Void visitCapturedType(CapturedType t, Void ignored) {
-            if (!whereClauses.get(WhereClauseKind.CAPTURED).containsKey(t)) {
+            if (indexOf(t, WhereClauseKind.CAPTURED) == -1) {
                 String suffix = t.lower == syms.botType ? ".1" : "";
                 JCDiagnostic d = diags.fragment("where.captured"+ suffix, t, t.bound, t.lower, t.wildcard);
                 whereClauses.get(WhereClauseKind.CAPTURED).put(t, d);
@@ -501,7 +505,7 @@ public class RichDiagnosticFormatter extends
         @Override
         public Void visitClassType(ClassType t, Void ignored) {
             if (t.isCompound()) {
-                if (!whereClauses.get(WhereClauseKind.INTERSECTION).containsKey(t)) {
+                if (indexOf(t, WhereClauseKind.INTERSECTION) == -1) {
                     Type supertype = types.supertype(t);
                     List<Type> interfaces = types.interfaces(t);
                     JCDiagnostic d = diags.fragment("where.intersection", t, interfaces.prepend(supertype));
@@ -519,11 +523,17 @@ public class RichDiagnosticFormatter extends
 
         @Override
         public Void visitTypeVar(TypeVar t, Void ignored) {
-            if (!whereClauses.get(WhereClauseKind.TYPEVAR).containsKey(t)) {
+            if (indexOf(t, WhereClauseKind.TYPEVAR) == -1) {
+                //access the bound type and skip error types
                 Type bound = t.bound;
                 while ((bound instanceof ErrorType))
                     bound = ((ErrorType)bound).getOriginalType();
-                List<Type> bounds  = types.getBounds(t);
+                //retrieve the bound list - if the type variable
+                //has not been attributed the bound is not set
+                List<Type> bounds = bound != null ?
+                    types.getBounds(t) :
+                    List.<Type>nil();
+
                 nameSimplifier.addUsage(t.tsym);
 
                 boolean boundErroneous = bounds.head == null ||
@@ -569,7 +579,8 @@ public class RichDiagnosticFormatter extends
         @Override
         public Void visitMethodSymbol(MethodSymbol s, Void ignored) {
             visit(s.owner, null);
-            typePreprocessor.visit(s.type);
+            if (s.type != null)
+                typePreprocessor.visit(s.type);
             return null;
         }
     };
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java b/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java
index 4d739417382..ea9054c3ff0 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Warner.java
@@ -31,10 +31,10 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
  * An interface to support optional warnings, needed for support of
  * unchecked conversions and unchecked casts.
  *
- * <p>Nothing described in this source file is part of any supported
- * API.  If you write code that depends on this, you do so at your own
- * risk.  This code and its internal interfaces are subject to change
- * or deletion without notice.
+ * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * If you write code that depends on this, you do so at your own risk.
+ * This code and its internal interfaces are subject to change or
+ * deletion without notice.</b>
  */
 public class Warner {
     public static final Warner noWarnings = new Warner();
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
index 6e5e9ba0229..5a494be0352 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
@@ -297,7 +297,7 @@ public class ClassDocImpl extends ProgramElementDocImpl implements ClassDoc {
                         po instanceof SourcePositionImpl) {
                     URI uri = ((SourcePositionImpl) po).filename.toUri();
                     if ("file".equals(uri.getScheme())) {
-                        File f = new File(uri.getPath());
+                        File f = new File(uri);
                         File dir = f.getParentFile();
                         if (dir != null) {
                             File pf = new File(dir, "package.html");
diff --git a/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java b/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java
index 1424255df5a..029026c47f5 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/AnnotationWriter.java
@@ -32,6 +32,10 @@ import com.sun.tools.classfile.Annotation.Array_element_value;
 import com.sun.tools.classfile.Annotation.Class_element_value;
 import com.sun.tools.classfile.Annotation.Enum_element_value;
 import com.sun.tools.classfile.Annotation.Primitive_element_value;
+import com.sun.tools.classfile.ConstantPool;
+import com.sun.tools.classfile.ConstantPoolException;
+import com.sun.tools.classfile.Descriptor;
+import com.sun.tools.classfile.Descriptor.InvalidDescriptor;
 
 /**
  *  A writer for writing annotations as text.
@@ -51,71 +55,243 @@ public class AnnotationWriter extends BasicWriter {
 
     protected AnnotationWriter(Context context) {
         super(context);
+        classWriter = ClassWriter.instance(context);
+        constantWriter = ConstantWriter.instance(context);
     }
 
     public void write(Annotation annot) {
-        print("#" + annot.type_index + "(");
+        write(annot, false);
+    }
+
+    public void write(Annotation annot, boolean resolveIndices) {
+        writeDescriptor(annot.type_index, resolveIndices);
+        boolean showParens = annot.num_element_value_pairs > 0 || !resolveIndices;
+        if (showParens)
+            print("(");
         for (int i = 0; i < annot.num_element_value_pairs; i++) {
             if (i > 0)
                 print(",");
-            write(annot.element_value_pairs[i]);
+            write(annot.element_value_pairs[i], resolveIndices);
         }
-        print(")");
+        if (showParens)
+            print(")");
     }
 
     public void write(ExtendedAnnotation annot) {
-        write(annot.annotation);
-        print('@');
-        print(annot.position.toString());
+        write(annot, true, false);
+    }
+
+    public void write(ExtendedAnnotation annot, boolean showOffsets, boolean resolveIndices) {
+        write(annot.annotation, resolveIndices);
+        print(": ");
+        write(annot.position, showOffsets);
+    }
+
+    public void write(ExtendedAnnotation.Position pos, boolean showOffsets) {
+        print(pos.type);
+
+        switch (pos.type) {
+        // type case
+        case TYPECAST:
+        case TYPECAST_GENERIC_OR_ARRAY:
+        // object creation
+        case INSTANCEOF:
+        case INSTANCEOF_GENERIC_OR_ARRAY:
+        // new expression
+        case NEW:
+        case NEW_GENERIC_OR_ARRAY:
+        case NEW_TYPE_ARGUMENT:
+        case NEW_TYPE_ARGUMENT_GENERIC_OR_ARRAY:
+            if (showOffsets) {
+                print(", offset=");
+                print(pos.offset);
+            }
+            break;
+         // local variable
+        case LOCAL_VARIABLE:
+        case LOCAL_VARIABLE_GENERIC_OR_ARRAY:
+            print(", {");
+            for (int i = 0; i < pos.lvarOffset.length; ++i) {
+                if (i != 0) print("; ");
+                if (showOffsets) {
+                    print(", start_pc=");
+                    print(pos.lvarOffset[i]);
+                }
+                print(", length=");
+                print(pos.lvarLength[i]);
+                print(", index=");
+                print(pos.lvarIndex[i]);
+            }
+            print("}");
+            break;
+         // method receiver
+        case METHOD_RECEIVER:
+            // Do nothing
+            break;
+        // type parameters
+        case CLASS_TYPE_PARAMETER:
+        case METHOD_TYPE_PARAMETER:
+            print(", param_index=");
+            print(pos.parameter_index);
+            break;
+        // type parameters bound
+        case CLASS_TYPE_PARAMETER_BOUND:
+        case CLASS_TYPE_PARAMETER_BOUND_GENERIC_OR_ARRAY:
+        case METHOD_TYPE_PARAMETER_BOUND:
+        case METHOD_TYPE_PARAMETER_BOUND_GENERIC_OR_ARRAY:
+            print(", param_index=");
+            print(pos.parameter_index);
+            print(", bound_index=");
+            print(pos.bound_index);
+            break;
+         // wildcard
+        case WILDCARD_BOUND:
+        case WILDCARD_BOUND_GENERIC_OR_ARRAY:
+            print(", wild_card=");
+            print(pos.wildcard_position);
+            break;
+         // Class extends and implements clauses
+        case CLASS_EXTENDS:
+        case CLASS_EXTENDS_GENERIC_OR_ARRAY:
+            print(", type_index=");
+            print(pos.type_index);
+            break;
+        // throws
+        case THROWS:
+            print(", type_index=");
+            print(pos.type_index);
+            break;
+        case CLASS_LITERAL:
+            if (showOffsets) {
+                print(", offset=");
+                print(pos.offset);
+            }
+            break;
+        // method parameter: not specified
+        case METHOD_PARAMETER_GENERIC_OR_ARRAY:
+            print(", param_index=");
+            print(pos.parameter_index);
+            break;
+        // method type argument: wasn't specified
+        case METHOD_TYPE_ARGUMENT:
+        case METHOD_TYPE_ARGUMENT_GENERIC_OR_ARRAY:
+            if (showOffsets) {
+                print(", offset=");
+                print(pos.offset);
+            }
+            print(", type_index=");
+            print(pos.type_index);
+            break;
+        // We don't need to worry abut these
+        case METHOD_RETURN_GENERIC_OR_ARRAY:
+        case FIELD_GENERIC_OR_ARRAY:
+            break;
+        case UNKNOWN:
+            break;
+        default:
+            throw new AssertionError("unknown type: " + pos.type);
+        }
+
+        // Append location data for generics/arrays.
+        if (pos.type.hasLocation()) {
+            print(", location=");
+            print(pos.location);
+        }
     }
 
     public void write(Annotation.element_value_pair pair) {
-        print("#" + pair.element_name_index + ":");
-        write(pair.value);
+        write(pair, false);
+    }
+
+    public void write(Annotation.element_value_pair pair, boolean resolveIndices) {
+        writeIndex(pair.element_name_index, resolveIndices);
+        print("=");
+        write(pair.value, resolveIndices);
     }
 
     public void write(Annotation.element_value value) {
-        ev_writer.write(value);
+        write(value, false);
+    }
+
+    public void write(Annotation.element_value value, boolean resolveIndices) {
+        ev_writer.write(value, resolveIndices);
+    }
+
+    private void writeDescriptor(int index, boolean resolveIndices) {
+        if (resolveIndices) {
+            try {
+                ConstantPool constant_pool = classWriter.getClassFile().constant_pool;
+                Descriptor d = new Descriptor(index);
+                print(d.getFieldType(constant_pool));
+                return;
+            } catch (ConstantPoolException ignore) {
+            } catch (InvalidDescriptor ignore) {
+            }
+        }
+
+        print("#" + index);
+    }
+
+    private void writeIndex(int index, boolean resolveIndices) {
+        if (resolveIndices) {
+            print(constantWriter.stringValue(index));
+        } else
+            print("#" + index);
     }
 
     element_value_Writer ev_writer = new element_value_Writer();
 
-    class element_value_Writer implements Annotation.element_value.Visitor<Void,Void> {
-        public void write(Annotation.element_value value) {
-            value.accept(this, null);
+    class element_value_Writer implements Annotation.element_value.Visitor<Void,Boolean> {
+        public void write(Annotation.element_value value, boolean resolveIndices) {
+            value.accept(this, resolveIndices);
         }
 
-        public Void visitPrimitive(Primitive_element_value ev, Void p) {
-            print(((char) ev.tag) + "#" + ev.const_value_index);
+        public Void visitPrimitive(Primitive_element_value ev, Boolean resolveIndices) {
+            if (resolveIndices)
+                writeIndex(ev.const_value_index, resolveIndices);
+            else
+                print(((char) ev.tag) + "#" + ev.const_value_index);
             return null;
         }
 
-        public Void visitEnum(Enum_element_value ev, Void p) {
-            print(((char) ev.tag) + "#" + ev.type_name_index + ".#" + ev.const_name_index);
+        public Void visitEnum(Enum_element_value ev, Boolean resolveIndices) {
+            if (resolveIndices) {
+                writeIndex(ev.type_name_index, resolveIndices);
+                print(".");
+                writeIndex(ev.const_name_index, resolveIndices);
+            } else
+                print(((char) ev.tag) + "#" + ev.type_name_index + ".#" + ev.const_name_index);
             return null;
         }
 
-        public Void visitClass(Class_element_value ev, Void p) {
-            print(((char) ev.tag) + "#" + ev.class_info_index);
+        public Void visitClass(Class_element_value ev, Boolean resolveIndices) {
+            if (resolveIndices) {
+                writeIndex(ev.class_info_index, resolveIndices);
+                print(".class");
+            } else
+                print(((char) ev.tag) + "#" + ev.class_info_index);
             return null;
         }
 
-        public Void visitAnnotation(Annotation_element_value ev, Void p) {
+        public Void visitAnnotation(Annotation_element_value ev, Boolean resolveIndices) {
             print((char) ev.tag);
-            AnnotationWriter.this.write(ev.annotation_value);
+            AnnotationWriter.this.write(ev.annotation_value, resolveIndices);
             return null;
         }
 
-        public Void visitArray(Array_element_value ev, Void p) {
+        public Void visitArray(Array_element_value ev, Boolean resolveIndices) {
             print("[");
             for (int i = 0; i < ev.num_values; i++) {
                 if (i > 0)
                     print(",");
-                write(ev.values[i]);
+                write(ev.values[i], resolveIndices);
             }
             print("]");
             return null;
         }
 
     }
+
+    private ClassWriter classWriter;
+    private ConstantWriter constantWriter;
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java b/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
index ba190beea24..42567342b31 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/AttributeWriter.java
@@ -41,7 +41,6 @@ import com.sun.tools.classfile.DefaultAttribute;
 import com.sun.tools.classfile.Deprecated_attribute;
 import com.sun.tools.classfile.EnclosingMethod_attribute;
 import com.sun.tools.classfile.Exceptions_attribute;
-import com.sun.tools.classfile.Field;
 import com.sun.tools.classfile.InnerClasses_attribute;
 import com.sun.tools.classfile.LineNumberTable_attribute;
 import com.sun.tools.classfile.LocalVariableTable_attribute;
@@ -149,22 +148,26 @@ public class AttributeWriter extends BasicWriter
     }
 
     public Void visitAnnotationDefault(AnnotationDefault_attribute attr, Void ignore) {
-        println("  AnnotationDefault: ");
-        print("    default_value: ");
+        println("AnnotationDefault:");
+        indent(+1);
+        print("default_value: ");
         annotationWriter.write(attr.default_value);
+        indent(-1);
         return null;
     }
 
     public Void visitCharacterRangeTable(CharacterRangeTable_attribute attr, Void ignore) {
-        print("  CharacterRangeTable: ");
+        println("CharacterRangeTable:");
+        indent(+1);
         for (int i = 0; i < attr.character_range_table.length; i++) {
             CharacterRangeTable_attribute.Entry e = attr.character_range_table[i];
             print("    " + e.start_pc + ", " +
                     e.end_pc + ", " +
                     Integer.toHexString(e.character_range_start) + ", " +
                     Integer.toHexString(e.character_range_end) + ", " +
-                    Integer.toHexString(e.flags) +
-                    "\t// ");
+                    Integer.toHexString(e.flags));
+            tab();
+            print("// ");
             print(e.start_pc + ", " +
                     e.end_pc + ", " +
                     (e.character_range_start >> 10) + ":" + (e.character_range_start & 0x3ff) + ", " +
@@ -187,16 +190,13 @@ public class AttributeWriter extends BasicWriter
                 print(", branch-true");
             if ((e.flags & CharacterRangeTable_attribute.CRT_BRANCH_FALSE) != 0)
                 print(", branch-false");
-
-
-
         }
+        indent(-1);
         return null;
     }
 
     public Void visitCode(Code_attribute attr, Void ignore) {
         codeWriter.write(attr, constant_pool);
-        println();
         return null;
     }
 
@@ -207,25 +207,23 @@ public class AttributeWriter extends BasicWriter
 
     public Void visitConstantValue(ConstantValue_attribute attr, Void ignore) {
         if (options.compat) // BUG 6622216 javap names some attributes incorrectly
-            print("  Constant value: ");
+            print("Constant value: ");
         else
-            print("  ConstantValue: ");
+            print("ConstantValue: ");
         constantWriter.write(attr.constantvalue_index);
-        if (!options.compat) // BUG 6622232 javap gets whitespace confused
-            println();
+        println();
         return null;
     }
 
     public Void visitDeprecated(Deprecated_attribute attr, Void ignore) {
-        if (!(options.compat && owner instanceof Field)) // BUG 6622232 javap gets whitespace confused
-            print("  ");
         println("Deprecated: true");
         return null;
     }
 
     public Void visitEnclosingMethod(EnclosingMethod_attribute attr, Void ignore) {
-        print("  EnclosingMethod: #" + attr.class_index + ".#" + attr.method_index
-                + "\t// " + getJavaClassName(attr));
+        print("EnclosingMethod: #" + attr.class_index + ".#" + attr.method_index);
+        tab();
+        print("// " + getJavaClassName(attr));
         if (attr.method_index != 0)
             print("." + getMethodName(attr));
         println();
@@ -249,15 +247,16 @@ public class AttributeWriter extends BasicWriter
     }
 
     public Void visitExceptions(Exceptions_attribute attr, Void ignore) {
-        println("  Exceptions: ");
-        print("   throws ");
+        println("Exceptions:");
+        indent(+1);
+        print("throws ");
         for (int i = 0; i < attr.number_of_exceptions; i++) {
             if (i > 0)
                 print(", ");
             print(getJavaException(attr, i));
         }
-        if (!options.compat) // BUG 6622232 javap gets whitespace confused
-            println();
+        println();
+        indent(-1);
         return null;
     }
 
@@ -290,8 +289,7 @@ public class AttributeWriter extends BasicWriter
                     writeInnerClassHeader();
                     first = false;
                 }
-                if (!options.compat) // BUG 6622232: javap gets whitespace confused
-                    print("   ");
+                print("   ");
                 for (String name: access_flags.getInnerClassModifiers())
                     print(name + " ");
                 if (info.inner_name_index!=0) {
@@ -313,6 +311,8 @@ public class AttributeWriter extends BasicWriter
                 println();
             }
         }
+        if (!first)
+            indent(-1);
         return null;
     }
 
@@ -325,26 +325,28 @@ public class AttributeWriter extends BasicWriter
     }
 
     private void writeInnerClassHeader() {
-        print("  ");
         if (options.compat) // BUG 6622216: javap names some attributes incorrectly
             print("InnerClass");
         else
             print("InnerClasses");
-        println(": ");
+        println(":");
+        indent(+1);
     }
 
     public Void visitLineNumberTable(LineNumberTable_attribute attr, Void ignore) {
-        println("  LineNumberTable: ");
+        println("LineNumberTable:");
+        indent(+1);
         for (LineNumberTable_attribute.Entry entry: attr.line_number_table) {
-            println("   line " + entry.line_number + ": " + entry.start_pc);
+            println("line " + entry.line_number + ": " + entry.start_pc);
         }
+        indent(-1);
         return null;
     }
 
     public Void visitLocalVariableTable(LocalVariableTable_attribute attr, Void ignore) {
-        println("  LocalVariableTable: ");
-        println("   Start  Length  Slot  Name   Signature");
-
+        println("LocalVariableTable:");
+        indent(+1);
+        println("Start  Length  Slot  Name   Signature");
         for (LocalVariableTable_attribute.Entry entry : attr.local_variable_table) {
             Formatter formatter = new Formatter();
             println(formatter.format("%8d %7d %5d %5s   %s",
@@ -352,25 +354,28 @@ public class AttributeWriter extends BasicWriter
                     constantWriter.stringValue(entry.name_index),
                     constantWriter.stringValue(entry.descriptor_index)));
         }
+        indent(-1);
         return null;
     }
 
     public Void visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, Void ignore) {
-        println("  LocalVariableTypeTable: ");
-        println("   Start  Length  Slot  Name   Signature");
-
+        println("LocalVariableTypeTable:");
+        indent(+1);
+        println("Start  Length  Slot  Name   Signature");
         for (LocalVariableTypeTable_attribute.Entry entry : attr.local_variable_table) {
-            Formatter formatter = new Formatter();
-            println(formatter.format("%8d %7d %5d %5s   %s",
+            println(String.format("%5d %7d %5d %5s   %s",
                     entry.start_pc, entry.length, entry.index,
                     constantWriter.stringValue(entry.name_index),
                     constantWriter.stringValue(entry.signature_index)));
         }
+        indent(-1);
         return null;
     }
 
     public Void visitModule(Module_attribute attr, Void ignore) {
-        println("  Module: #" + attr.module_name + "\t// " + getModuleName(attr));
+        print("Module: #" + attr.module_name);
+        tab();
+        println("// " + getModuleName(attr));
         return null;
     }
 
@@ -383,11 +388,15 @@ public class AttributeWriter extends BasicWriter
     }
 
     public Void visitModuleExportTable(ModuleExportTable_attribute attr, Void ignore) {
-        println("  ModuleExportTable:");
-        println("    Types: (" + attr.export_type_table.length + ")");
+        println("ModuleExportTable:");
+        indent(+1);
+        println("Types: (" + attr.export_type_table.length + ")");
         for (int i = 0; i < attr.export_type_table.length; i++) {
-            println("      #" + attr.export_type_table[i] + "\t// " + getExportTypeName(attr, i));
+            print("#" + attr.export_type_table[i]);
+            tab();
+            println("// " + getExportTypeName(attr, i));
         }
+        indent(-1);
         return null;
     }
 
@@ -400,11 +409,15 @@ public class AttributeWriter extends BasicWriter
     }
 
     public Void visitModuleMemberTable(ModuleMemberTable_attribute attr, Void ignore) {
-        println("  ModuleMemberTable:");
-        println("    Packages: (" + attr.package_member_table.length + ")");
+        println("ModuleMemberTable:");
+        indent(+1);
+        println("Packages: (" + attr.package_member_table.length + ")");
         for (int i = 0; i < attr.package_member_table.length; i++) {
-            println("      #" + attr.package_member_table[i] + "\t// " + getPackageMemberName(attr, i));
+            print("#" + attr.package_member_table[i]);
+            tab();
+            println("// " + getPackageMemberName(attr, i));
         }
+        indent(-1);
         return null;
     }
 
@@ -417,73 +430,91 @@ public class AttributeWriter extends BasicWriter
     }
 
     public Void visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, Void ignore) {
-        println("  RuntimeVisibleAnnotations: ");
+        println("RuntimeVisibleAnnotations:");
+        indent(+1);
         for (int i = 0; i < attr.annotations.length; i++) {
-            print("    " + i + ": ");
+            print(i + ": ");
             annotationWriter.write(attr.annotations[i]);
             println();
         }
+        indent(-1);
         return null;
     }
 
     public Void visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, Void ignore) {
-        println("  RuntimeInvisibleAnnotations: ");
+        println("RuntimeInvisibleAnnotations:");
+        indent(+1);
         for (int i = 0; i < attr.annotations.length; i++) {
-            print("    " + i + ": ");
+            print(i + ": ");
             annotationWriter.write(attr.annotations[i]);
             println();
         }
+        indent(-1);
         return null;
     }
 
     public Void visitRuntimeVisibleTypeAnnotations(RuntimeVisibleTypeAnnotations_attribute attr, Void ignore) {
-        println("  RuntimeVisibleTypeAnnotations: ");
+        println("RuntimeVisibleTypeAnnotations:");
+        indent(+1);
         for (int i = 0; i < attr.annotations.length; i++) {
-            print("    " + i + ": ");
+            print(i + ": ");
             annotationWriter.write(attr.annotations[i]);
             println();
         }
+        indent(-1);
         return null;
     }
 
     public Void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisibleTypeAnnotations_attribute attr, Void ignore) {
-        println("  RuntimeInvisibleTypeAnnotations: ");
+        println("RuntimeInvisibleTypeAnnotations:");
+        indent(+1);
         for (int i = 0; i < attr.annotations.length; i++) {
-            print("    " + i + ": ");
+            print(i + ": ");
             annotationWriter.write(attr.annotations[i]);
             println();
         }
+        indent(-1);
         return null;
     }
 
     public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, Void ignore) {
-        println("  RuntimeVisibleParameterAnnotations: ");
+        println("RuntimeVisibleParameterAnnotations:");
+        indent(+1);
         for (int param = 0; param < attr.parameter_annotations.length; param++) {
-            println("    parameter " + param + ": ");
+            println("parameter " + param + ": ");
+            indent(+1);
             for (int i = 0; i < attr.parameter_annotations[param].length; i++) {
-                print("    " + i + ": ");
+                print(i + ": ");
                 annotationWriter.write(attr.parameter_annotations[param][i]);
                 println();
             }
+            indent(-1);
         }
+        indent(-1);
         return null;
     }
 
     public Void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, Void ignore) {
-        println("  RuntimeInvisibleParameterAnnotations: ");
+        println("RuntimeInvisibleParameterAnnotations:");
+        indent(+1);
         for (int param = 0; param < attr.parameter_annotations.length; param++) {
-            println("    " + param + ": ");
+            println(param + ": ");
+            indent(+1);
             for (int i = 0; i < attr.parameter_annotations[param].length; i++) {
-                print("    " + i + ": ");
+                print(i + ": ");
                 annotationWriter.write(attr.parameter_annotations[param][i]);
                 println();
             }
+            indent(-1);
         }
+        indent(-1);
         return null;
     }
 
     public Void visitSignature(Signature_attribute attr, Void ignore) {
-        println("  Signature: #" + attr.signature_index + "\t// " + getSignature(attr));
+        print("Signature: #" + attr.signature_index);
+        tab();
+        println("// " + getSignature(attr));
         return null;
     }
 
@@ -496,12 +527,12 @@ public class AttributeWriter extends BasicWriter
     }
 
     public Void visitSourceDebugExtension(SourceDebugExtension_attribute attr, Void ignore) {
-        println("  SourceDebugExtension: " + attr.getValue());
+        println("SourceDebugExtension: " + attr.getValue());
         return null;
     }
 
     public Void visitSourceFile(SourceFile_attribute attr, Void ignore) {
-        println("  SourceFile: \"" + getSourceFile(attr) + "\"");
+        println("SourceFile: \"" + getSourceFile(attr) + "\"");
         return null;
     }
 
@@ -519,24 +550,26 @@ public class AttributeWriter extends BasicWriter
     }
 
     public Void visitStackMap(StackMap_attribute attr, Void ignore) {
-        println("  StackMap: number_of_entries = " + attr.number_of_entries);
-
+        println("StackMap: number_of_entries = " + attr.number_of_entries);
+        indent(+1);
         StackMapTableWriter w = new StackMapTableWriter();
         for (StackMapTable_attribute.stack_map_frame entry : attr.entries) {
             w.write(entry);
         }
         println();
+        indent(-1);
         return null;
     }
 
     public Void visitStackMapTable(StackMapTable_attribute attr, Void ignore) {
-        println("  StackMapTable: number_of_entries = " + attr.number_of_entries);
-
+        println("StackMapTable: number_of_entries = " + attr.number_of_entries);
+        indent(+1);
         StackMapTableWriter w = new StackMapTableWriter();
         for (StackMapTable_attribute.stack_map_frame entry : attr.entries) {
             w.write(entry);
         }
         println();
+        indent(-1);
         return null;
     }
 
@@ -555,29 +588,37 @@ public class AttributeWriter extends BasicWriter
         public Void visit_same_locals_1_stack_item_frame(StackMapTable_attribute.same_locals_1_stack_item_frame frame, Void p) {
             printHeader(frame);
             println(" /* same_locals_1_stack_item */");
+            indent(+1);
             printMap("stack", frame.stack);
+            indent(-1);
             return null;
         }
 
         public Void visit_same_locals_1_stack_item_frame_extended(StackMapTable_attribute.same_locals_1_stack_item_frame_extended frame, Void p) {
             printHeader(frame);
             println(" /* same_locals_1_stack_item_frame_extended */");
-            println("     offset_delta = " + frame.offset_delta);
+            indent(+1);
+            println("offset_delta = " + frame.offset_delta);
             printMap("stack", frame.stack);
+            indent(-1);
             return null;
         }
 
         public Void visit_chop_frame(StackMapTable_attribute.chop_frame frame, Void p) {
             printHeader(frame);
             println(" /* chop */");
-            println("     offset_delta = " + frame.offset_delta);
+            indent(+1);
+            println("offset_delta = " + frame.offset_delta);
+            indent(-1);
             return null;
         }
 
         public Void visit_same_frame_extended(StackMapTable_attribute.same_frame_extended frame, Void p) {
             printHeader(frame);
             println(" /* same_frame_extended */");
-            println("     offset_delta = " + frame.offset_delta);
+            indent(+1);
+            println("offset_delta = " + frame.offset_delta);
+            indent(-1);
             return null;
         }
 
@@ -592,13 +633,16 @@ public class AttributeWriter extends BasicWriter
         public Void visit_full_frame(StackMapTable_attribute.full_frame frame, Void p) {
             printHeader(frame);
             if (frame instanceof StackMap_attribute.stack_map_frame) {
-                println("     offset = " + frame.offset_delta);
+                indent(+1);
+                println(" offset = " + frame.offset_delta);
             } else {
                 println(" /* full_frame */");
-                println("     offset_delta = " + frame.offset_delta);
+                indent(+1);
+                println("offset_delta = " + frame.offset_delta);
             }
             printMap("locals", frame.locals);
             printMap("stack", frame.stack);
+            indent(-1);
             return null;
         }
 
@@ -607,7 +651,7 @@ public class AttributeWriter extends BasicWriter
         }
 
         void printMap(String name, StackMapTable_attribute.verification_type_info[] map) {
-            print("     " + name + " = [");
+            print(name + " = [");
             for (int i = 0; i < map.length; i++) {
                 StackMapTable_attribute.verification_type_info info = map[i];
                 int tag = info.tag;
diff --git a/langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java b/langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java
index 0f80004bacd..dc971dc68da 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/BasicWriter.java
@@ -71,6 +71,18 @@ public class BasicWriter {
         lineWriter.println();
     }
 
+    protected void indent(int delta) {
+        lineWriter.indent(delta);
+    }
+
+    protected void tab() {
+        lineWriter.tab();
+    }
+
+    protected void setPendingNewline(boolean b) {
+        lineWriter.pendingNewline = b;
+    }
+
     protected String report(AttributeException e) {
         out.println("Error: " + e.getMessage()); // i18n?
         return "???";
@@ -122,19 +134,30 @@ public class BasicWriter {
 
         protected LineWriter(Context context) {
             context.put(LineWriter.class, this);
+            Options options = Options.instance(context);
+            indentWidth = options.indentWidth;
+            tabColumn = options.tabColumn;
             out = context.get(PrintWriter.class);
             buffer = new StringBuilder();
         }
 
         protected void print(String s) {
+            if (pendingNewline) {
+                println();
+                pendingNewline = false;
+            }
             if (s == null)
                 s = "null";
             for (int i = 0; i < s.length(); i++) {
                 char c = s.charAt(i);
-                if (c == '\n') {
-                    println();
-                } else {
-                    buffer.append(c);
+                switch (c) {
+                    case '\n':
+                        println();
+                        break;
+                    default:
+                        if (buffer.length() == 0)
+                            indent();
+                        buffer.append(c);
                 }
             }
 
@@ -145,8 +168,31 @@ public class BasicWriter {
             buffer.setLength(0);
         }
 
+        protected void indent(int delta) {
+            indentCount += delta;
+        }
+
+        protected void tab() {
+            if (buffer.length() == 0)
+                indent();
+            space(indentCount * indentWidth + tabColumn - buffer.length());
+        }
+
+        private void indent() {
+            space(indentCount * indentWidth);
+        }
+
+        private void space(int n) {
+            for (int i = 0; i < n; i++)
+                buffer.append(' ');
+        }
+
         private PrintWriter out;
         private StringBuilder buffer;
+        private int indentCount;
+        private int indentWidth;
+        private int tabColumn;
+        private boolean pendingNewline;
     }
 }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
index 4500c365c37..9d657ee4d55 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
@@ -120,6 +120,7 @@ public class ClassWriter extends BasicWriter {
                 else
                     println("Classfile " + uri);
             }
+            indent(+1);
             if (lastModified != -1) {
                 Date lm = new Date(lastModified);
                 DateFormat df = DateFormat.getDateInstance();
@@ -144,6 +145,10 @@ public class ClassWriter extends BasicWriter {
             println("Compiled from \"" + getSourceFile((SourceFile_attribute) sfa) + "\"");
         }
 
+        if ((options.sysInfo || options.verbose) && !options.compat) {
+            indent(-1);
+        }
+
         String name = getJavaName(classFile);
         AccessFlags flags = cf.access_flags;
 
@@ -186,23 +191,24 @@ public class ClassWriter extends BasicWriter {
 
         if (options.verbose) {
             println();
+            indent(+1);
             attrWriter.write(cf, cf.attributes, constant_pool);
-            println("  minor version: " + cf.minor_version);
-            println("  major version: " + cf.major_version);
+            println("minor version: " + cf.minor_version);
+            println("major version: " + cf.major_version);
             if (!options.compat)
-              writeList("  flags: ", flags.getClassFlags(), NEWLINE);
+              writeList("flags: ", flags.getClassFlags(), NEWLINE);
+            indent(-1);
             constantWriter.writeConstantPool();
-            println();
         } else {
-            if (!options.compat)
-                print(" ");
+            print(" ");
         }
 
         println("{");
+        indent(+1);
         writeFields();
         writeMethods();
+        indent(-1);
         println("}");
-        println();
     }
 
     protected void writeFields() {
@@ -215,14 +221,6 @@ public class ClassWriter extends BasicWriter {
         if (!options.checkAccess(f.access_flags))
             return;
 
-        if (!(options.showLineAndLocalVariableTables
-                || options.showDisassembled
-                || options.verbose
-                || options.showInternalSignatures
-                || options.showAllAttrs)) {
-            print("    ");
-        }
-
         AccessFlags flags = f.access_flags;
         writeModifiers(flags.getFieldModifiers());
         Signature_attribute sigAttr = getSignature(f.attributes);
@@ -251,11 +249,13 @@ public class ClassWriter extends BasicWriter {
         print(";");
         println();
 
+        indent(+1);
+
         if (options.showInternalSignatures)
-            println("  Signature: " + getValue(f.descriptor));
+            println("Signature: " + getValue(f.descriptor));
 
         if (options.verbose && !options.compat)
-            writeList("  flags: ", flags.getFieldFlags(), NEWLINE);
+            writeList("flags: ", flags.getFieldFlags(), NEWLINE);
 
         if (options.showAllAttrs) {
             for (Attribute attr: f.attributes)
@@ -263,6 +263,8 @@ public class ClassWriter extends BasicWriter {
             println();
         }
 
+        indent(-1);
+
         if (options.showDisassembled || options.showLineAndLocalVariableTables)
             println();
     }
@@ -270,6 +272,7 @@ public class ClassWriter extends BasicWriter {
     protected void writeMethods() {
         for (Method m: classFile.methods)
             writeMethod(m);
+        setPendingNewline(false);
     }
 
     protected void writeMethod(Method m) {
@@ -278,14 +281,6 @@ public class ClassWriter extends BasicWriter {
 
         method = m;
 
-        if (!(options.showLineAndLocalVariableTables
-                || options.showDisassembled
-                || options.verbose
-                || options.showInternalSignatures
-                || options.showAllAttrs)) {
-            print("    ");
-        }
-
         AccessFlags flags = m.access_flags;
 
         Descriptor d;
@@ -333,16 +328,6 @@ public class ClassWriter extends BasicWriter {
         if (e_attr != null) { // if there are generic exceptions, there must be erased exceptions
             if (e_attr instanceof Exceptions_attribute) {
                 Exceptions_attribute exceptions = (Exceptions_attribute) e_attr;
-                if (options.compat) { // Bug XXXXXXX whitespace
-                    if (!(options.showLineAndLocalVariableTables
-                            || options.showDisassembled
-                            || options.verbose
-                            || options.showInternalSignatures
-                            || options.showAllAttrs)) {
-                        print("    ");
-                    }
-                    print("  ");
-                }
                 print(" throws ");
                 if (methodExceptions != null) { // use generic list if available
                     writeList("", methodExceptions, "");
@@ -358,14 +343,17 @@ public class ClassWriter extends BasicWriter {
             }
         }
 
-        print(";");
-        println();
+        println(";");
 
-        if (options.showInternalSignatures)
-            println("  Signature: " + getValue(m.descriptor));
+        indent(+1);
 
-        if (options.verbose && !options.compat)
-            writeList("  flags: ", flags.getMethodFlags(), NEWLINE);
+        if (options.showInternalSignatures) {
+            println("Signature: " + getValue(m.descriptor));
+        }
+
+        if (options.verbose && !options.compat) {
+            writeList("flags: ", flags.getMethodFlags(), NEWLINE);
+        }
 
         Code_attribute code = null;
         Attribute c_attr = m.attributes.get(Attribute.Code);
@@ -378,33 +366,35 @@ public class ClassWriter extends BasicWriter {
 
         if (options.showDisassembled && !options.showAllAttrs) {
             if (code != null) {
-                println("  Code:");
+                println("Code:");
                 codeWriter.writeInstrs(code);
                 codeWriter.writeExceptionTable(code);
             }
-            println();
         }
 
         if (options.showLineAndLocalVariableTables) {
-            if (code != null)
+            if (code != null) {
                 attrWriter.write(code, code.attributes.get(Attribute.LineNumberTable), constant_pool);
-            println();
-            if (code != null)
                 attrWriter.write(code, code.attributes.get(Attribute.LocalVariableTable), constant_pool);
-            println();
-            println();
+            }
         }
 
         if (options.showAllAttrs) {
             Attribute[] attrs = m.attributes.attrs;
             for (Attribute attr: attrs)
                 attrWriter.write(m, attr, constant_pool);
-
-//            // the following condition is to mimic old javap
-//            if (!(attrs.length > 0 &&
-//                    attrs[attrs.length - 1] instanceof Exceptions_attribute))
-            println();
         }
+
+        indent(-1);
+
+        // set pendingNewline to write a newline before the next method (if any)
+        // if a separator is desired
+        setPendingNewline(
+                options.showDisassembled ||
+                options.showAllAttrs ||
+                options.showInternalSignatures ||
+                options.showLineAndLocalVariableTables ||
+                options.verbose);
     }
 
     void writeModifiers(Collection<String> items) {
diff --git a/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java b/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java
index 631e1685acc..06a508bba91 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/CodeWriter.java
@@ -64,15 +64,18 @@ class CodeWriter extends BasicWriter {
         stackMapWriter = StackMapWriter.instance(context);
         localVariableTableWriter = LocalVariableTableWriter.instance(context);
         localVariableTypeTableWriter = LocalVariableTypeTableWriter.instance(context);
+        typeAnnotationWriter = TypeAnnotationWriter.instance(context);
         options = Options.instance(context);
     }
 
     void write(Code_attribute attr, ConstantPool constant_pool) {
-        println("  Code:");
+        println("Code:");
+        indent(+1);
         writeVerboseHeader(attr, constant_pool);
         writeInstrs(attr);
         writeExceptionTable(attr);
         attrWriter.write(attr, attr.attributes, constant_pool);
+        indent(-1);
     }
 
     public void writeVerboseHeader(Code_attribute attr, ConstantPool constant_pool) {
@@ -89,9 +92,9 @@ class CodeWriter extends BasicWriter {
             argCount = report(e);
         }
 
-        println("   Stack=" + attr.max_stack +
-                ", Locals=" + attr.max_locals +
-                ", Args_size=" + argCount);
+        println("stack=" + attr.max_stack +
+                ", locals=" + attr.max_locals +
+                ", args_size=" + argCount);
 
     }
 
@@ -114,8 +117,7 @@ class CodeWriter extends BasicWriter {
     }
 
     public void writeInstr(Instruction instr) {
-        print("   " + instr.getPC() + ":\t");
-        print(instr.getMnemonic());
+        print(String.format("%4d: %-13s ", instr.getPC(), instr.getMnemonic()));
         instr.accept(instructionPrinter, null);
         println();
     }
@@ -133,54 +135,62 @@ class CodeWriter extends BasicWriter {
         }
 
         public Void visitBranch(Instruction instr, int offset, Void p) {
-            print("\t" + (instr.getPC() + offset));
+            print((instr.getPC() + offset));
             return null;
         }
 
         public Void visitConstantPoolRef(Instruction instr, int index, Void p) {
-            print("\t#" + index + "; //");
+            print("#" + index);
+            tab();
+            print("// ");
             printConstant(index);
             return null;
         }
 
         public Void visitConstantPoolRefAndValue(Instruction instr, int index, int value, Void p) {
-            print("\t#" + index + ",  " + value + "; //");
+            print("#" + index + ",  " + value);
+            tab();
+            print("// ");
             printConstant(index);
             return null;
         }
 
         public Void visitLocal(Instruction instr, int index, Void p) {
-            print("\t" + index);
+            print(index);
             return null;
         }
 
         public Void visitLocalAndValue(Instruction instr, int index, int value, Void p) {
-            print("\t" + index + ", " + value);
+            print(index + ", " + value);
             return null;
         }
 
         public Void visitLookupSwitch(Instruction instr, int default_, int npairs, int[] matches, int[] offsets) {
             int pc = instr.getPC();
-            print("{ //" + npairs);
+            print("{ // " + npairs);
+            indent(+1);
             for (int i = 0; i < npairs; i++) {
-                print("\n\t\t" + matches[i] + ": " + (pc + offsets[i]) + ";");
+                print("\n" + matches[i] + ": " + (pc + offsets[i]));
             }
-            print("\n\t\tdefault: " + (pc + default_) + " }");
+            print("\ndefault: " + (pc + default_) + " }");
+            indent(-1);
             return null;
         }
 
         public Void visitTableSwitch(Instruction instr, int default_, int low, int high, int[] offsets) {
             int pc = instr.getPC();
             print("{ //" + low + " to " + high);
+            indent(+1);
             for (int i = 0; i < offsets.length; i++) {
-                print("\n\t\t" + (low + i) + ": " + (pc + offsets[i]) + ";");
+                print("\n" + (low + i) + ": " + (pc + offsets[i]));
             }
-            print("\n\t\tdefault: " + (pc + default_) + " }");
+            print("\ndefault: " + (pc + default_) + " }");
+            indent(-1);
             return null;
         }
 
         public Void visitValue(Instruction instr, int value, Void p) {
-            print("\t" + value);
+            print(value);
             return null;
         }
 
@@ -192,13 +202,13 @@ class CodeWriter extends BasicWriter {
 
     public void writeExceptionTable(Code_attribute attr) {
         if (attr.exception_table_langth > 0) {
-            println("  Exception table:");
-            println("   from   to  target type");
+            println("Exception table:");
+            indent(+1);
+            println(" from    to  target type");
             for (int i = 0; i < attr.exception_table.length; i++) {
                 Code_attribute.Exception_data handler = attr.exception_table[i];
-                printFixedWidthInt(handler.start_pc, 6);
-                printFixedWidthInt(handler.end_pc, 6);
-                printFixedWidthInt(handler.handler_pc, 6);
+                print(String.format(" %5d %5d %5d",
+                        handler.start_pc, handler.end_pc, handler.handler_pc));
                 print("   ");
                 int catch_type = handler.catch_type;
                 if (catch_type == 0) {
@@ -206,9 +216,9 @@ class CodeWriter extends BasicWriter {
                 } else {
                     print("Class ");
                     println(constantWriter.stringValue(catch_type));
-                    println("");
                 }
             }
+            indent(-1);
         }
 
     }
@@ -217,13 +227,6 @@ class CodeWriter extends BasicWriter {
         constantWriter.write(index);
     }
 
-    private void printFixedWidthInt(int n, int width) {
-        String s = String.valueOf(n);
-        for (int i = s.length(); i < width; i++)
-            print(" ");
-        print(s);
-    }
-
     private List<InstructionDetailWriter> getDetailWriters(Code_attribute attr) {
         List<InstructionDetailWriter> detailWriters =
                 new ArrayList<InstructionDetailWriter>();
@@ -253,6 +256,11 @@ class CodeWriter extends BasicWriter {
             detailWriters.add(tryBlockWriter);
         }
 
+        if (options.details.contains(InstructionDetailWriter.Kind.TYPE_ANNOS)) {
+            typeAnnotationWriter.reset(attr);
+            detailWriters.add(typeAnnotationWriter);
+        }
+
         return detailWriters;
     }
 
@@ -261,6 +269,7 @@ class CodeWriter extends BasicWriter {
     private ConstantWriter constantWriter;
     private LocalVariableTableWriter localVariableTableWriter;
     private LocalVariableTypeTableWriter localVariableTypeTableWriter;
+    private TypeAnnotationWriter typeAnnotationWriter;
     private SourceWriter sourceWriter;
     private StackMapWriter stackMapWriter;
     private TryBlockWriter tryBlockWriter;
diff --git a/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java b/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java
index c84cc57a0d4..0a07853f886 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/ConstantWriter.java
@@ -62,73 +62,88 @@ public class ConstantWriter extends BasicWriter {
     protected void writeConstantPool(ConstantPool constant_pool) {
         ConstantPool.Visitor<Integer, Void> v = new ConstantPool.Visitor<Integer,Void>() {
             public Integer visitClass(CONSTANT_Class_info info, Void p) {
-                println("#" + info.name_index + ";\t//  " + stringValue(info));
+                print("#" + info.name_index);
+                tab();
+                println("//  " + stringValue(info));
                 return 1;
             }
 
             public Integer visitDouble(CONSTANT_Double_info info, Void p) {
-                println(stringValue(info) + ";");
+                println(stringValue(info));
                 return 2;
             }
 
             public Integer visitFieldref(CONSTANT_Fieldref_info info, Void p) {
-                println("#" + info.class_index + ".#" + info.name_and_type_index + ";\t//  " + stringValue(info));
+                print("#" + info.class_index + ".#" + info.name_and_type_index);
+                tab();
+                println("//  " + stringValue(info));
                 return 1;
             }
 
             public Integer visitFloat(CONSTANT_Float_info info, Void p) {
-                println(stringValue(info) + ";");
+                println(stringValue(info));
                 return 1;
             }
 
             public Integer visitInteger(CONSTANT_Integer_info info, Void p) {
-                println(stringValue(info) + ";");
+                println(stringValue(info));
                 return 1;
             }
 
             public Integer visitInterfaceMethodref(CONSTANT_InterfaceMethodref_info info, Void p) {
-                println("#" + info.class_index + ".#" + info.name_and_type_index + ";\t//  " + stringValue(info));
+                print("#" + info.class_index + ".#" + info.name_and_type_index);
+                tab();
+                println("//  " + stringValue(info));
                 return 1;
             }
 
             public Integer visitLong(CONSTANT_Long_info info, Void p) {
-                println(stringValue(info) + ";");
+                println(stringValue(info));
                 return 2;
             }
 
             public Integer visitNameAndType(CONSTANT_NameAndType_info info, Void p) {
-                String tab = (options.compat ? "" : "\t"); // BUG 6622232 javap gets whitespace confused
-                println("#" + info.name_index + ":#" + info.type_index + ";" + tab + "//  " + stringValue(info));
+                print("#" + info.name_index + ":#" + info.type_index);
+                tab();
+                println("//  " + stringValue(info));
                 return 1;
             }
 
             public Integer visitMethodref(CONSTANT_Methodref_info info, Void p) {
-                println("#" + info.class_index + ".#" + info.name_and_type_index + ";\t//  " + stringValue(info));
+                print("#" + info.class_index + ".#" + info.name_and_type_index);
+                tab();
+                println("//  " + stringValue(info));
                 return 1;
             }
 
             public Integer visitString(CONSTANT_String_info info, Void p) {
-                println("#" + info.string_index + ";\t//  " + stringValue(info));
+                print("#" + info.string_index);
+                tab();
+                println("//  " + stringValue(info));
                 return 1;
             }
 
             public Integer visitUtf8(CONSTANT_Utf8_info info, Void p) {
-                println(stringValue(info) + ";");
+                println(stringValue(info));
                 return 1;
             }
 
         };
-        println("  Constant pool:");
+        println("Constant pool:");
+        indent(+1);
+        int width = String.valueOf(constant_pool.size()).length() + 1;
         int cpx = 1;
         while (cpx < constant_pool.size()) {
+            print(String.format("%" + width + "s", ("#" + cpx)));
             try {
                 CPInfo cpInfo = constant_pool.get(cpx);
-                print("const #" + cpx + " = " + tagName(cpInfo.getTag()) + "\t");
+                print(String.format(" = %-18s ", cpTagName(cpInfo)));
                 cpx += cpInfo.accept(v, null);
             } catch (ConstantPool.InvalidIndex ex) {
-                print("const #" + cpx); // should not happen
+                // should not happen
             }
         }
+        indent(-1);
     }
 
     protected void write(int cpx) {
@@ -163,10 +178,15 @@ public class ConstantWriter extends BasicWriter {
         print(tagName(tag) + " " + stringValue(cpInfo));
     }
 
+    String cpTagName(CPInfo cpInfo) {
+        String n = cpInfo.getClass().getSimpleName();
+        return n.replace("CONSTANT_", "").replace("_info", "");
+    }
+
     String tagName(int tag) {
         switch (tag) {
             case CONSTANT_Utf8:
-                return "Asciz";
+                return "Utf8";
             case CONSTANT_Integer:
                 return "int";
             case CONSTANT_Float:
@@ -188,7 +208,7 @@ public class ConstantWriter extends BasicWriter {
             case CONSTANT_NameAndType:
                 return "NameAndType";
             default:
-                return "unknown tag";
+                return "(unknown tag)";
         }
     }
 
diff --git a/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java b/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
index 81b31755865..02492b1ee6e 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
@@ -42,7 +42,8 @@ public abstract class InstructionDetailWriter extends BasicWriter {
         LOCAL_VAR_TYPES("localVariableTypes"),
         SOURCE("source"),
         STACKMAPS("stackMaps"),
-        TRY_BLOCKS("tryBlocks");
+        TRY_BLOCKS("tryBlocks"),
+        TYPE_ANNOS("typeAnnotations");
         Kind(String option) {
             this.option = option;
         }
diff --git a/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java b/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java
index 2a9e87e0476..80625b9570b 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/JavapFileManager.java
@@ -41,12 +41,13 @@ import com.sun.tools.javac.util.Context;
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
-class JavapFileManager extends JavacFileManager {
+public class JavapFileManager extends JavacFileManager {
     private JavapFileManager(Context context, Charset charset) {
         super(context, true, charset);
+        setIgnoreSymbolFile(true);
     }
 
-    static JavapFileManager create(final DiagnosticListener<? super JavaFileObject> dl, PrintWriter log, Options options) {
+    public static JavapFileManager create(final DiagnosticListener<? super JavaFileObject> dl, PrintWriter log) {
         Context javac_context = new Context();
 
         if (dl != null)
diff --git a/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java b/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java
index 77e88b79ab3..f80e6f93538 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/JavapTask.java
@@ -32,8 +32,10 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.io.Reader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.net.URI;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -49,6 +51,8 @@ import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.NestingKind;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileManager;
@@ -57,6 +61,9 @@ import javax.tools.StandardJavaFileManager;
 import javax.tools.StandardLocation;
 
 import com.sun.tools.classfile.*;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
 
 /**
  *  "Main" class for javap, normally accessed from the command line
@@ -235,12 +242,6 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
             }
         },
 
-        new Option(false, "-XDignore.symbol.file") {
-            void process(JavapTask task, String opt, String arg) {
-                task.options.ignoreSymbolFile = true;
-            }
-        },
-
         new Option(false, "-XDdetails") {
             void process(JavapTask task, String opt, String arg) {
                 task.options.details = EnumSet.allOf(InstructionDetailWriter.Kind.class);
@@ -295,6 +296,44 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
             void process(JavapTask task, String opt, String arg) {
                 task.options.showConstants = true;
             }
+        },
+
+        new Option(false, "-XDinner") {
+            void process(JavapTask task, String opt, String arg) {
+                task.options.showInnerClasses = true;
+            }
+        },
+
+        new Option(false, "-XDindent:") {
+            @Override
+            boolean matches(String opt) {
+                int sep = opt.indexOf(":");
+                return sep != -1 && super.matches(opt.substring(0, sep + 1));
+            }
+
+            void process(JavapTask task, String opt, String arg) throws BadArgs {
+                int sep = opt.indexOf(":");
+                try {
+                    task.options.indentWidth = Integer.valueOf(opt.substring(sep + 1));
+                } catch (NumberFormatException e) {
+                }
+            }
+        },
+
+        new Option(false, "-XDtab:") {
+            @Override
+            boolean matches(String opt) {
+                int sep = opt.indexOf(":");
+                return sep != -1 && super.matches(opt.substring(0, sep + 1));
+            }
+
+            void process(JavapTask task, String opt, String arg) throws BadArgs {
+                int sep = opt.indexOf(":");
+                try {
+                    task.options.tabColumn = Integer.valueOf(opt.substring(sep + 1));
+                } catch (NumberFormatException e) {
+                }
+            }
         }
 
     };
@@ -322,17 +361,17 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
             Iterable<String> classes) {
         this(out, fileManager, diagnosticListener);
 
-        try {
-            handleOptions(options, false);
-        } catch (BadArgs e) {
-            throw new IllegalArgumentException(e.getMessage());
-        }
-
         this.classes = new ArrayList<String>();
         for (String classname: classes) {
             classname.getClass(); // null-check
             this.classes.add(classname);
         }
+
+        try {
+            handleOptions(options, false);
+        } catch (BadArgs e) {
+            throw new IllegalArgumentException(e.getMessage());
+        }
     }
 
     public void setLocale(Locale locale) {
@@ -378,10 +417,18 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
         final PrintWriter pw = getPrintWriterForWriter(w);
         return new DiagnosticListener<JavaFileObject> () {
             public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
-                if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+                switch (diagnostic.getKind()) {
+                    case ERROR:
                         pw.print(getMessage("err.prefix"));
-                    pw.print(" ");
+                        break;
+                    case WARNING:
+                        pw.print(getMessage("warn.prefix"));
+                        break;
+                    case NOTE:
+                        pw.print(getMessage("note.prefix"));
+                        break;
                 }
+                pw.print(" ");
                 pw.println(diagnostic.getMessage(null));
             }
         };
@@ -408,10 +455,21 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
                     return EXIT_CMDERR;
             }
 
-            boolean ok = run();
-            return ok ? EXIT_OK : EXIT_ERROR;
+            try {
+                boolean ok = run();
+                return ok ? EXIT_OK : EXIT_ERROR;
+            } finally {
+                if (defaultFileManager != null) {
+                    try {
+                        defaultFileManager.close();
+                        defaultFileManager = null;
+                    } catch (IOException e) {
+                        throw new InternalError(e);
+                    }
+                }
+            }
         } catch (BadArgs e) {
-            diagnosticListener.report(createDiagnostic(e.key, e.args));
+            reportError(e.key, e.args);
             if (e.showUsage) {
                 log.println(getMessage("main.usage.summary", progname));
             }
@@ -425,7 +483,7 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
                 e_args[0] = e.getCause();
                 System.arraycopy(e.args, 0, e_args, 1, e.args.length);
             }
-            diagnosticListener.report(createDiagnostic("err.internal.error", e_args));
+            reportError("err.internal.error", e_args);
             return EXIT_ABNORMAL;
         } finally {
             log.flush();
@@ -477,9 +535,6 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
             throw new BadArgs("err.incompatible.options", sb);
         }
 
-        if (options.ignoreSymbolFile && fileManager instanceof JavapFileManager)
-            ((JavapFileManager) fileManager).setIgnoreSymbolFile(true);
-
         if ((classes == null || classes.size() == 0) &&
                 !(noArgs || options.help || options.version || options.fullVersion)) {
             throw new BadArgs("err.no.classes.specified");
@@ -530,64 +585,37 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
         SourceWriter sourceWriter = SourceWriter.instance(context);
         sourceWriter.setFileManager(fileManager);
 
+        attributeFactory.setCompat(options.compat);
+        attributeFactory.setJSR277(options.jsr277);
+
         boolean ok = true;
 
         for (String className: classes) {
             JavaFileObject fo;
             try {
-                if (className.endsWith(".class")) {
-                    if (fileManager instanceof StandardJavaFileManager) {
-                        StandardJavaFileManager sfm = (StandardJavaFileManager) fileManager;
-                        fo = sfm.getJavaFileObjects(className).iterator().next();
-                    } else {
-                       diagnosticListener.report(createDiagnostic("err.not.standard.file.manager", className));
-                       ok = false;
-                       continue;
-                    }
-                } else {
-                    fo = getClassFileObject(className);
-                    if (fo == null) {
-                        // see if it is an inner class, by replacing dots to $, starting from the right
-                        String cn = className;
-                        int lastDot;
-                        while (fo == null && (lastDot = cn.lastIndexOf(".")) != -1) {
-                            cn = cn.substring(0, lastDot) + "$" + cn.substring(lastDot + 1);
-                            fo = getClassFileObject(cn);
-                        }
-                    }
-                    if (fo == null) {
-                       diagnosticListener.report(createDiagnostic("err.class.not.found", className));
-                       ok = false;
-                       continue;
-                    }
-                }
-                attributeFactory.setCompat(options.compat);
-                attributeFactory.setJSR277(options.jsr277);
-
-                write(read(fo));
-
+                writeClass(classWriter, className);
             } catch (ConstantPoolException e) {
-                diagnosticListener.report(createDiagnostic("err.bad.constant.pool", className, e.getLocalizedMessage()));
+                reportError("err.bad.constant.pool", className, e.getLocalizedMessage());
                 ok = false;
             } catch (EOFException e) {
-                diagnosticListener.report(createDiagnostic("err.end.of.file", className));
+                reportError("err.end.of.file", className);
                 ok = false;
             } catch (FileNotFoundException e) {
-                diagnosticListener.report(createDiagnostic("err.file.not.found", e.getLocalizedMessage()));
+                reportError("err.file.not.found", e.getLocalizedMessage());
                 ok = false;
             } catch (IOException e) {
                 //e.printStackTrace();
                 Object msg = e.getLocalizedMessage();
                 if (msg == null)
                     msg = e;
-                diagnosticListener.report(createDiagnostic("err.ioerror", className, msg));
+                reportError("err.ioerror", className, msg);
                 ok = false;
             } catch (Throwable t) {
                 StringWriter sw = new StringWriter();
                 PrintWriter pw = new PrintWriter(sw);
                 t.printStackTrace(pw);
                 pw.close();
-                diagnosticListener.report(createDiagnostic("err.crash", t.toString(), sw.toString()));
+                reportError("err.crash", t.toString(), sw.toString());
                 ok = false;
             }
         }
@@ -595,6 +623,152 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
         return ok;
     }
 
+    protected boolean writeClass(ClassWriter classWriter, String className)
+            throws IOException, ConstantPoolException {
+        JavaFileObject fo = open(className);
+        if (fo == null) {
+            reportError("err.class.not.found", className);
+            return false;
+        }
+
+        ClassFileInfo cfInfo = read(fo);
+        if (!className.endsWith(".class")) {
+            String cfName = cfInfo.cf.getName();
+            if (!cfName.replaceAll("[/$]", ".").equals(className.replaceAll("[/$]", ".")))
+                reportWarning("warn.unexpected.class", className, cfName.replace('/', '.'));
+        }
+        write(cfInfo);
+
+        if (options.showInnerClasses) {
+            ClassFile cf = cfInfo.cf;
+            Attribute a = cf.getAttribute(Attribute.InnerClasses);
+            if (a instanceof InnerClasses_attribute) {
+                InnerClasses_attribute inners = (InnerClasses_attribute) a;
+                try {
+                    boolean ok = true;
+                    for (int i = 0; i < inners.classes.length; i++) {
+                        int outerIndex = inners.classes[i].outer_class_info_index;
+                        ConstantPool.CONSTANT_Class_info outerClassInfo = cf.constant_pool.getClassInfo(outerIndex);
+                        String outerClassName = outerClassInfo.getName();
+                        if (outerClassName.equals(cf.getName())) {
+                            int innerIndex = inners.classes[i].inner_class_info_index;
+                            ConstantPool.CONSTANT_Class_info innerClassInfo = cf.constant_pool.getClassInfo(innerIndex);
+                            String innerClassName = innerClassInfo.getName();
+                            classWriter.println("// inner class " + innerClassName.replaceAll("[/$]", "."));
+                            classWriter.println();
+                            ok = ok & writeClass(classWriter, innerClassName);
+                        }
+                    }
+                    return ok;
+                } catch (ConstantPoolException e) {
+                    reportError("err.bad.innerclasses.attribute", className);
+                    return false;
+                }
+            } else if (a != null) {
+                reportError("err.bad.innerclasses.attribute", className);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected JavaFileObject open(String className) throws IOException {
+        // for compatibility, first see if it is a class name
+        JavaFileObject fo = getClassFileObject(className);
+        if (fo != null)
+            return fo;
+
+        // see if it is an inner class, by replacing dots to $, starting from the right
+        String cn = className;
+        int lastDot;
+        while ((lastDot = cn.lastIndexOf(".")) != -1) {
+            cn = cn.substring(0, lastDot) + "$" + cn.substring(lastDot + 1);
+            fo = getClassFileObject(cn);
+            if (fo != null)
+                return fo;
+        }
+
+        if (!className.endsWith(".class"))
+            return null;
+
+        if (fileManager instanceof StandardJavaFileManager) {
+            StandardJavaFileManager sfm = (StandardJavaFileManager) fileManager;
+            fo = sfm.getJavaFileObjects(className).iterator().next();
+            if (fo != null && fo.getLastModified() != 0) {
+                return fo;
+            }
+        }
+
+        // see if it is a URL, and if so, wrap it in just enough of a JavaFileObject
+        // to suit javap's needs
+        if (className.matches("^[A-Za-z]+:.*")) {
+            try {
+                final URI uri = new URI(className);
+                final URL url = uri.toURL();
+                final URLConnection conn = url.openConnection();
+                return new JavaFileObject() {
+                    public Kind getKind() {
+                        return JavaFileObject.Kind.CLASS;
+                    }
+
+                    public boolean isNameCompatible(String simpleName, Kind kind) {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public NestingKind getNestingKind() {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public Modifier getAccessLevel() {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public URI toUri() {
+                        return uri;
+                    }
+
+                    public String getName() {
+                        return url.toString();
+                    }
+
+                    public InputStream openInputStream() throws IOException {
+                        return conn.getInputStream();
+                    }
+
+                    public OutputStream openOutputStream() throws IOException {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public Reader openReader(boolean ignoreEncodingErrors) throws IOException {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public Writer openWriter() throws IOException {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public long getLastModified() {
+                        return conn.getLastModified();
+                    }
+
+                    public boolean delete() {
+                        throw new UnsupportedOperationException();
+                    }
+
+                };
+            } catch (URISyntaxException ignore) {
+            } catch (IOException ignore) {
+            }
+        }
+
+        return null;
+    }
+
     public static class ClassFileInfo {
         ClassFileInfo(JavaFileObject fo, ClassFile cf, byte[] digest, int size) {
             this.fo = fo;
@@ -693,7 +867,9 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
     }
 
     private JavaFileManager getDefaultFileManager(final DiagnosticListener<? super JavaFileObject> dl, PrintWriter log) {
-        return JavapFileManager.create(dl, log, options);
+        if (defaultFileManager == null)
+            defaultFileManager = JavapFileManager.create(dl, log);
+        return defaultFileManager;
     }
 
     private JavaFileObject getClassFileObject(String className) throws IOException {
@@ -747,10 +923,23 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
         }
     }
 
-    private Diagnostic<JavaFileObject> createDiagnostic(final String key, final Object... args) {
+    private void reportError(String key, Object... args) {
+        diagnosticListener.report(createDiagnostic(Diagnostic.Kind.ERROR, key, args));
+    }
+
+    private void reportNote(String key, Object... args) {
+        diagnosticListener.report(createDiagnostic(Diagnostic.Kind.NOTE, key, args));
+    }
+
+    private void reportWarning(String key, Object... args) {
+        diagnosticListener.report(createDiagnostic(Diagnostic.Kind.WARNING, key, args));
+    }
+
+    private Diagnostic<JavaFileObject> createDiagnostic(
+            final Diagnostic.Kind kind, final String key, final Object... args) {
         return new Diagnostic<JavaFileObject>() {
             public Kind getKind() {
-                return Diagnostic.Kind.ERROR;
+                return kind;
             }
 
             public JavaFileObject getSource() {
@@ -785,6 +974,11 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
                 return JavapTask.this.getMessage(locale, key, args);
             }
 
+            @Override
+            public String toString() {
+                return getClass().getName() + "[key=" + key + ",args=" + Arrays.asList(args) + "]";
+            }
+
         };
 
     }
@@ -823,6 +1017,7 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
 
     protected Context context;
     JavaFileManager fileManager;
+    JavaFileManager defaultFileManager;
     PrintWriter log;
     DiagnosticListener<? super JavaFileObject> diagnosticListener;
     List<String> classes;
diff --git a/langtools/src/share/classes/com/sun/tools/javap/Options.java b/langtools/src/share/classes/com/sun/tools/javap/Options.java
index ee70afa8a50..0ff78a7edd2 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/Options.java
+++ b/langtools/src/share/classes/com/sun/tools/javap/Options.java
@@ -85,8 +85,10 @@ public class Options {
     public boolean showAllAttrs;
     public boolean showConstants;
     public boolean sysInfo;
+    public boolean showInnerClasses;
+    public int indentWidth = 2;   // #spaces per indentWidth level
+    public int tabColumn = 40;    // column number for comments
 
     public boolean compat;             // bug-for-bug compatibility mode with old javap
     public boolean jsr277;
-    public boolean ignoreSymbolFile;   // file manager should ignore ct.sym
 }
diff --git a/langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java b/langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
new file mode 100644
index 00000000000..3e7aef8bf35
--- /dev/null
+++ b/langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.tools.javap;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.Code_attribute;
+import com.sun.tools.classfile.ExtendedAnnotation;
+import com.sun.tools.classfile.ExtendedAnnotation.Position;
+import com.sun.tools.classfile.Instruction;
+import com.sun.tools.classfile.Method;
+import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
+import com.sun.tools.classfile.RuntimeTypeAnnotations_attribute;
+import com.sun.tools.classfile.RuntimeVisibleTypeAnnotations_attribute;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Annotate instructions with details about type annotations.
+ *
+ *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
+ *  you write code that depends on this, you do so at your own risk.
+ *  This code and its internal interfaces are subject to change or
+ *  deletion without notice.</b>
+ */
+public class TypeAnnotationWriter extends InstructionDetailWriter {
+    public enum NoteKind { VISIBLE, INVISIBLE };
+    public static class Note {
+        Note(NoteKind kind, ExtendedAnnotation anno) {
+            this.kind = kind;
+            this.anno = anno;
+        }
+        public final NoteKind kind;
+        public final ExtendedAnnotation anno;
+    }
+
+    static TypeAnnotationWriter instance(Context context) {
+        TypeAnnotationWriter instance = context.get(TypeAnnotationWriter.class);
+        if (instance == null)
+            instance = new TypeAnnotationWriter(context);
+        return instance;
+    }
+
+    protected TypeAnnotationWriter(Context context) {
+        super(context);
+        context.put(TypeAnnotationWriter.class, this);
+        annotationWriter = AnnotationWriter.instance(context);
+        classWriter = ClassWriter.instance(context);
+    }
+
+    public void reset(Code_attribute attr) {
+        Method m = classWriter.getMethod();
+        pcMap = new HashMap<Integer, List<Note>>();
+        check(NoteKind.VISIBLE, (RuntimeVisibleTypeAnnotations_attribute) m.attributes.get(Attribute.RuntimeVisibleTypeAnnotations));
+        check(NoteKind.INVISIBLE, (RuntimeInvisibleTypeAnnotations_attribute) m.attributes.get(Attribute.RuntimeInvisibleTypeAnnotations));
+    }
+
+    private void check(NoteKind kind, RuntimeTypeAnnotations_attribute attr) {
+        if (attr == null)
+            return;
+
+        for (ExtendedAnnotation anno: attr.annotations) {
+            Position p = anno.position;
+            Note note = null;
+            if (p.offset != -1)
+                addNote(p.offset, note = new Note(kind, anno));
+            if (p.lvarOffset != null) {
+                for (int i = 0; i < p.lvarOffset.length; i++) {
+                    if (note == null)
+                        note = new Note(kind, anno);
+                    addNote(p.lvarOffset[i], note);
+                }
+            }
+        }
+    }
+
+    private void addNote(int pc, Note note) {
+        List<Note> list = pcMap.get(pc);
+        if (list == null)
+            pcMap.put(pc, list = new ArrayList<Note>());
+        list.add(note);
+    }
+
+    @Override
+    void writeDetails(Instruction instr) {
+        String indent = space(2); // get from Options?
+        int pc = instr.getPC();
+        List<Note> notes = pcMap.get(pc);
+        if (notes != null) {
+            for (Note n: notes) {
+                print(indent);
+                print("@");
+                annotationWriter.write(n.anno, false, true);
+                print(", ");
+                println(n.kind.toString().toLowerCase());
+            }
+        }
+    }
+
+    private AnnotationWriter annotationWriter;
+    private ClassWriter classWriter;
+    private Map<Integer, List<Note>> pcMap;
+}
diff --git a/langtools/src/share/classes/com/sun/tools/javap/resources/javap.properties b/langtools/src/share/classes/com/sun/tools/javap/resources/javap.properties
index 06d00b7f3dc..4a13d601970 100644
--- a/langtools/src/share/classes/com/sun/tools/javap/resources/javap.properties
+++ b/langtools/src/share/classes/com/sun/tools/javap/resources/javap.properties
@@ -18,12 +18,22 @@ err.unknown.option=unknown option: {0}
 err.verify.not.supported=-verify not supported
 err.no.SourceFile.attribute=no SourceFile attribute
 err.source.file.not.found=source file not found
+err.bad.innerclasses.attribute=bad InnerClasses attribute for {0}
 warn.Xold.not.supported=-Xold is no longer available
 
 main.usage.summary=\
 Usage: {0} <options> <classes>\n\
 use -help for a list of possible options
 
+warn.prefix=Warning:
+warn.unexpected.class=Binary file {0} contains {1}
+
+note.prefix=Note:
+
+main.usage.summary=\
+Usage: {0} <options> <classes>\n\
+use -help for a list of possible options
+
 main.usage=\
 Usage: {0} <options> <classes>\n\
 where possible options include:
diff --git a/langtools/src/share/classes/javax/tools/JavaCompiler.java b/langtools/src/share/classes/javax/tools/JavaCompiler.java
index 6e8c1a69e7f..e360e0167b0 100644
--- a/langtools/src/share/classes/javax/tools/JavaCompiler.java
+++ b/langtools/src/share/classes/javax/tools/JavaCompiler.java
@@ -228,6 +228,12 @@ public interface JavaCompiler extends Tool, OptionChecker {
      * <p>If a file manager is provided, it must be able to handle all
      * locations defined in {@link StandardLocation}.
      *
+     * <p>Note that annotation processing can process both the
+     * compilation units of source code to be compiled, passed with
+     * the {@code compilationUnits} parameter, as well as class
+     * files, whose names are passed with the {@code classes}
+     * parameter.
+     *
      * @param out a Writer for additional output from the compiler;
      * use {@code System.err} if {@code null}
      * @param fileManager a file manager; if {@code null} use the
@@ -236,8 +242,8 @@ public interface JavaCompiler extends Tool, OptionChecker {
      * null} use the compiler's default method for reporting
      * diagnostics
      * @param options compiler options, {@code null} means no options
-     * @param classes class names (for annotation processing), {@code
-     * null} means no class names
+     * @param classes names of classes to be processed by annotation
+     * processing, {@code null} means no class names
      * @param compilationUnits the compilation units to compile, {@code
      * null} means no compilation units
      * @return an object representing the compilation
diff --git a/langtools/test/Makefile b/langtools/test/Makefile
index d09f2f4debc..427694966fb 100644
--- a/langtools/test/Makefile
+++ b/langtools/test/Makefile
@@ -44,7 +44,6 @@ TEST_ROOT := $(shell pwd)
 # Default bundle of all test results (passed or not)
 JPRT_ARCHIVE_BUNDLE=$(TEST_ROOT)/JPRT_ARCHIVE_BUNDLE.zip
 
-# Default home for JTREG
 ifeq ($(PLATFORM), windows)
   SLASH_JAVA = J:
 else
@@ -52,8 +51,12 @@ else
 endif
 
 # Default JTREG to run
-JT_HOME = $(SLASH_JAVA)/svc/jct-tools3.2.2_02
-JTREG = $(JT_HOME)/$(JT_PLATFORM)/bin/jtreg
+ifdef JPRT_JTREG_HOME
+  JTREG_HOME = $(JPRT_JTREG_HOME)
+else
+  JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+endif
+JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg
 
 # Default JDK for JTREG
 ifdef JPRT_JAVA_HOME
@@ -63,7 +66,12 @@ else
 endif
 
 # Default JDK to test
-TESTJAVA = $(SLASH_JAVA)/re/jdk/1.7.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
+ifdef JPRT_IMPORT_PRODUCT_HOME
+  TESTJAVA = $(JPRT_IMPORT_PRODUCT_HOME)
+else
+  TESTJAVA = $(SLASH_JAVA)/re/jdk/1.7.0/promoted/latest/binaries/$(PLATFORM)-$(ARCH)
+endif
+
 TESTBOOTCLASSPATH = $(PRODUCT_HOME)/dist/lib/classes.jar
 
 # The test directories to run
@@ -73,41 +81,40 @@ TESTDIRS = $(DEFAULT_TESTDIRS)
 # Root of all test results
 TEST_OUTPUT_DIR = $(TEST_ROOT)/o_$(PLATFORM)-$(ARCH)
 
-# Export this setting and pass it in.
-JAVA_TOOL_OPTIONS = -Djava.awt.headless=true
-export JAVA_TOOL_OPTIONS
-
 # Default make rule
-all javac javadoc javah javap apt: clean check jtreg-tests $(JPRT_ARCHIVE_BUNDLE)
+all apt javac javadoc javah javap: clean check jtreg-tests $(JPRT_ARCHIVE_BUNDLE)
 	@echo "Testing completed successfully"
 
 # for use with JPRT -testrule
 all:		TESTDIRS = .
-javac fastjavac: TESTDIRS = tools/javac
+apt:		TESTDIRS = tools/apt
+javac: 		TESTDIRS = tools/javac
 javadoc:	TESTDIRS = tools/javadoc com/sun/javadoc
 javah:		TESTDIRS = tools/javah
 javap:		TESTDIRS = tools/javap
-apt:		TESTDIRS = tools/apt
-
-fastjavac:	SAMEVM = -samevm
 
 # Check to make sure these directories exist
 check: $(JT_HOME) $(PRODUCT_HOME) $(JTREG)
 
 # Run the tests
 jtreg-tests: FRC
-	ls /opt/jprt /opt/jprt/jdk*
 	@echo "Using export JAVA_TOOL_OPTIONS=$(JAVA_TOOL_OPTIONS)"
 	@rm -f -r $(TEST_OUTPUT_DIR)/JTwork $(TEST_OUTPUT_DIR)/JTreport
 	@mkdir -p $(TEST_OUTPUT_DIR)
-	JT_JAVA=$(JT_JAVA) $(JTREG) -k:\!ignore -a -v:fail,error $(SAMEVM) \
+	JT_JAVA=$(JT_JAVA) $(JTREG) \
+	  -a -samevm -k:\!ignore -v:fail,error,nopass \
           -r:$(TEST_OUTPUT_DIR)/JTreport \
           -w:$(TEST_OUTPUT_DIR)/JTwork \
           -jdk:$(TESTJAVA) \
 	  -Xbootclasspath/p:$(TESTBOOTCLASSPATH) \
-          $(JAVA_TOOL_OPTIONS:%=-vmoption:%) \
           $(JAVA_ARGS:%=-vmoption:%) \
-          $(TESTDIRS)
+          $(TESTDIRS) \
+	|| ( status=$$? ; \
+		echo ; echo "Summary of test failures" ; \
+		cat $(TEST_OUTPUT_DIR)/JTreport/text/summary.txt | \
+			grep -v 'Not run' | grep -v 'Passed' ; \
+		echo ; \
+		exit $$status )
 
 # Bundle up the results
 $(JPRT_ARCHIVE_BUNDLE): FRC
diff --git a/langtools/test/com/sun/javadoc/lib/JavadocTester.java b/langtools/test/com/sun/javadoc/lib/JavadocTester.java
index 1e71046ebc4..c4f31f37b99 100644
--- a/langtools/test/com/sun/javadoc/lib/JavadocTester.java
+++ b/langtools/test/com/sun/javadoc/lib/JavadocTester.java
@@ -123,6 +123,14 @@ public abstract class JavadocTester {
      */
     private static int javadocRunNum = 0;
 
+    /**
+     * Whether or not to match newlines exactly.
+     * Set this value to false if the match strings
+     * contain text from javadoc comments containing
+     * non-platform newlines.
+     */
+    protected boolean exactNewlineMatch = true;
+
     /**
      * Construct a JavadocTester.
      */
@@ -419,15 +427,22 @@ public abstract class JavadocTester {
     /**
      * Search for the string in the given file and return true
      * if the string was found.
+     * If exactNewlineMatch is false, newlines will be normalized
+     * before the comparison.
      *
      * @param fileString    the contents of the file to search through
      * @param stringToFind  the string to search for
      * @return              true if the string was found
      */
     private boolean findString(String fileString, String stringToFind) {
-        return fileString.indexOf(stringToFind) >= 0;
+        if (exactNewlineMatch) {
+            return fileString.indexOf(stringToFind) >= 0;
+        } else {
+            return fileString.replace(NL, "\n").indexOf(stringToFind.replace(NL, "\n")) >= 0;
+        }
     }
 
+
     /**
      * Return the standard output.
      * @return the standard output
diff --git a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
index 94122cd1f58..f2f0ae043e1 100644
--- a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
+++ b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
@@ -32,6 +32,9 @@
  * @run main TestCRLineSeparator
  */
 
+import java.io.*;
+import java.util.*;
+
 public class TestCRLineSeparator extends JavadocTester {
 
     //Test information.
@@ -39,7 +42,7 @@ public class TestCRLineSeparator extends JavadocTester {
 
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", BUG_ID, "-sourcepath", ".", "pkg"
     };
 
     //Input for string search tests.
@@ -53,7 +56,8 @@ public class TestCRLineSeparator extends JavadocTester {
      * The entry point of the test.
      * @param args the array of command line arguments.
      */
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
+        initFiles(new File(SRC_DIR), new File("."), "pkg");
         TestCRLineSeparator tester = new TestCRLineSeparator();
         run(tester, ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
@@ -72,4 +76,36 @@ public class TestCRLineSeparator extends JavadocTester {
     public String getBugName() {
         return getClass().getName();
     }
+
+    // recursively copy files from fromDir to toDir, replacing newlines
+    // with \r
+    static void initFiles(File fromDir, File toDir, String f) throws IOException {
+        File from_f = new File(fromDir, f);
+        File to_f = new File(toDir, f);
+        if (from_f.isDirectory()) {
+            to_f.mkdirs();
+            for (String child: from_f.list()) {
+                initFiles(from_f, to_f, child);
+            }
+        } else {
+            List<String> lines = new ArrayList<String>();
+            BufferedReader in = new BufferedReader(new FileReader(from_f));
+            try {
+                String line;
+                while ((line = in.readLine()) != null)
+                    lines.add(line);
+            } finally {
+                in.close();
+            }
+            BufferedWriter out = new BufferedWriter(new FileWriter(to_f));
+            try {
+                for (String line: lines) {
+                    out.write(line);
+                    out.write("\r");
+                }
+            } finally {
+                out.close();
+            }
+        }
+    }
 }
diff --git a/langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java b/langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java
index fb833e7c176..e54d38787a7 100644
--- a/langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java
+++ b/langtools/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java
@@ -21,4 +21,11 @@
  * have any questions.
  */
 
-package pkg;

/**
 * Line 1
 * Line 2
 */
public class MyClass {}
+package pkg;
+
+/**
+ * Line 1
+ * Line 2
+ */
+public class MyClass {}
+
diff --git a/langtools/test/com/sun/javadoc/testHref/package-list b/langtools/test/com/sun/javadoc/testHref/package-list
index 7fd0dd341f6..46af8ccb0d0 100644
--- a/langtools/test/com/sun/javadoc/testHref/package-list
+++ b/langtools/test/com/sun/javadoc/testHref/package-list
@@ -1 +1 @@
-java.lang
+java.lang
diff --git a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
index 652de517cb5..a516477e60a 100644
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
+++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
@@ -351,6 +351,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
      */
     public static void main(String[] args) {
         TestHtmlDefinitionListTag tester = new TestHtmlDefinitionListTag();
+        tester.exactNewlineMatch = false;
         run(tester, ARGS1, TEST_ALL, NEGATED_TEST);
         run(tester, ARGS1, TEST_CMNT_DEPR, NEGATED_TEST);
         run(tester, ARGS2, TEST_ALL, NEGATED_TEST);
diff --git a/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html b/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html
index 7079f01cd7a..a03aa66b101 100644
--- a/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html
+++ b/langtools/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html
@@ -1,6 +1,6 @@
-<html>
-<body>
-{@link java.awt.Color#getAlpha()
-getAlpha}
-</body>
-</html>
+<html>
+<body>
+{@link java.awt.Color#getAlpha()
+getAlpha}
+</body>
+</html>
diff --git a/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java b/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
index d2ee69a435f..6b1c2e62262 100644
--- a/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
+++ b/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
@@ -52,7 +52,7 @@ public class TestNoPackagesFile extends JavadocTester {
         TestNoPackagesFile tester = new TestNoPackagesFile();
         run(tester, ARGS, NO_TEST, NO_TEST);
         if ((new java.io.File(BUG_ID + FS + "packages.html")).exists()) {
-            throw new Error("Test Fails: packages file should not be " +
                "generated anymore.");
+            throw new Error("Test Fails: packages file should not be " +                "generated anymore.");
         } else {
             System.out.println("Test passes:  packages.html not found.");
         }
diff --git a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java b/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
index 48859b65d81..38cd053934a 100644
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
@@ -46,7 +46,7 @@ public class TestMultiInheritence extends JavadocTester {
     //Method foo() is inherited from BOTH I2 and I3
     private static final String[][] TEST = {
        {BUG_ID + FS + "pkg3" + FS + "I1.html",
-        "Methods inherited from interface pkg3." +
        "<A HREF=\"../pkg3/I2.html\" title=\"interface in pkg3\">I2</A>"},
+        "Methods inherited from interface pkg3." +        "<A HREF=\"../pkg3/I2.html\" title=\"interface in pkg3\">I2</A>"},
         {BUG_ID + FS + "pkg3" + FS +"I1.html",
         "Methods inherited from interface pkg3." +
         "<A HREF=\"../pkg3/I3.html\" title=\"interface in pkg3\">I3</A>"},
diff --git a/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html b/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html
index 4bda85c3d91..42d6dffee0b 100644
--- a/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html
+++ b/langtools/test/com/sun/javadoc/testRelativeLinks/pkg/package.html
@@ -1,6 +1,7 @@
-<html>
-	<body>
-		Here is a relative link in a package: 
-       <a href="relative-package-link.html">relative package link</a>.
-	</body>
-</html>
\ No newline at end of file
+<html>
+	<body>
+		Here is a relative link in a package: 
+       <a href="relative-package-link.html">relative package link</a>.
+	</body>
+</html>
+
diff --git a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
index 4c5d39bba1e..525535e6b73 100644
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
+++ b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
@@ -128,6 +128,7 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
      */
     public static void main(String[] args) {
         TestSerializedFormDeprecationInfo tester = new TestSerializedFormDeprecationInfo();
+        tester.exactNewlineMatch = false;
         run(tester, ARGS1, TEST_CMNT_DEPR, TEST_NOCMNT);
         run(tester, ARGS2, TEST_NOCMNT, TEST_CMNT_DEPR);
         run(tester, ARGS3, TEST_NODEPR, TEST_NOCMNT_NODEPR);
diff --git a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
index 9ea11e844c7..99b07368eb4 100644
--- a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
+++ b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
@@ -55,7 +55,7 @@ public class TestTaglets extends JavadocTester {
 
     //Input for string search tests.
     private static final String[][] TEST_4654308 = new String[][] {
-        {"4654308" + FS + "C.html", "<B>Foo:</B><DD>my only method is " +
            "<A HREF=\"C.html#method()\"><CODE>here</CODE></A>"}
+        {"4654308" + FS + "C.html", "<B>Foo:</B><DD>my only method is " +            "<A HREF=\"C.html#method()\"><CODE>here</CODE></A>"}
     };
     private static final String[][] NEGATED_TEST_4654308 = NO_TEST;
 
diff --git a/langtools/test/com/sun/javadoc/testWarnings/pkg/package.html b/langtools/test/com/sun/javadoc/testWarnings/pkg/package.html
index 015223b4830..6fe786d606a 100644
--- a/langtools/test/com/sun/javadoc/testWarnings/pkg/package.html
+++ b/langtools/test/com/sun/javadoc/testWarnings/pkg/package.html
@@ -1,3 +1,4 @@
-<HTML>
-   Testing.
-<HTML>
\ No newline at end of file
+<HTML>
+   Testing.
+<HTML>
+
diff --git a/langtools/test/tools/apt/Basics/apt.sh b/langtools/test/tools/apt/Basics/apt.sh
index a040241ec33..b247170c4bb 100644
--- a/langtools/test/tools/apt/Basics/apt.sh
+++ b/langtools/test/tools/apt/Basics/apt.sh
@@ -33,17 +33,16 @@
 
 OS=`uname -s`;
 case "${OS}" in
-        Windows* | CYGWIN* )
-                SEP=";"
+        CYGWIN* )
+                DIFFOPTS="--strip-trailing-cr"
         ;;
 
 	* )
-	SEP=":"
 	;;
 esac
 
 # Construct path to apt executable
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS}"
+APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -XDsuppress-tool-api-removal-message "
 
 printf "%s\n" "-classpath ${TESTCLASSES}"                    > options
 printf "%s\n" "-factorypath ./nullap.jar"                   >> options
@@ -58,6 +57,7 @@ printf "%s\n" "-nocompile"                                  >> options1
 printf "%s\n" "-XListAnnotationTypes"                       >> options1
 printf "%s\n" "-XclassesAsDecls"                            >> options1
 
+
 # Construct path to javac executable
 JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "
 JAR="${TESTJAVA}/bin/jar "
@@ -93,7 +93,7 @@ for i in ${ANNOTATION_FILES}
 do
 	printf "%s\n" "Testing annotations on source file ${i}"
 	${APT} @options ${i} 2> result.txt
-	diff ${TESTSRC}/golden.txt result.txt
+	diff ${DIFFOPTS} ${TESTSRC}/golden.txt result.txt
 
 	RESULT=$?
 	case "$RESULT" in
@@ -108,7 +108,7 @@ do
 	CLASS=`basename ${i} .java`
 	printf "%s\n" "Testing annotations on class file ${CLASS}"
 	${APT} @options1 ${CLASS} 2> result2.txt
-	diff ${TESTSRC}/golden.txt result2.txt
+	diff ${DIFFOPTS} ${TESTSRC}/golden.txt result2.txt
 
 	RESULT=$?
 	case "$RESULT" in
diff --git a/langtools/test/tools/apt/Basics/print.sh b/langtools/test/tools/apt/Basics/print.sh
index 81d91acb5a5..6949d93263b 100644
--- a/langtools/test/tools/apt/Basics/print.sh
+++ b/langtools/test/tools/apt/Basics/print.sh
@@ -32,12 +32,11 @@
 
 OS=`uname -s`;
 case "${OS}" in
-        Windows* | CYGWIN* )
-                SEP=";"
+        CYGWIN* )
+                DIFFOPTS="--strip-trailing-cr"
         ;;
 
 	* )
-	SEP=":"
 	;;
 esac
 
@@ -88,7 +87,7 @@ done
 # check for mutliple methods and no static initializer
 
 ${APT} -XclassesAsDecls -cp ${TESTCLASSES} -print Aggregate > aggregate.txt
-diff aggregate.txt ${TESTSRC}/goldenAggregate.txt
+diff ${DIFFOPTS} aggregate.txt ${TESTSRC}/goldenAggregate.txt
 
 RESULT=$?
 case "$RESULT" in
diff --git a/langtools/test/tools/apt/Compile/compile.sh b/langtools/test/tools/apt/Compile/compile.sh
index 8e42ea3b180..b200150d055 100644
--- a/langtools/test/tools/apt/Compile/compile.sh
+++ b/langtools/test/tools/apt/Compile/compile.sh
@@ -57,7 +57,12 @@ TestFile() {
 
 OS=`uname -s`;
 case "${OS}" in
-        Windows* | CYGWIN* )
+        Windows* )
+                SEP=";"
+        ;;
+
+        CYGWIN* )
+		DIFFOPTS="--strip-trailing-cr"
                 SEP=";"
         ;;
 
@@ -67,7 +72,7 @@ case "${OS}" in
 esac
 
 
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} "
+APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -XDsuppress-tool-api-removal-message "
 JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} "
 JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} "
 
@@ -150,7 +155,7 @@ ${APT} @options2 2> output
 
 TestNoFile "HelloWorld.class"
 
-diff output ${TESTSRC}/golden.txt
+diff ${DIFFOPTS} output ${TESTSRC}/golden.txt
 
 RESULT=$?
 case "$RESULT" in
@@ -180,7 +185,7 @@ printf "%s\n" "-cp ${TESTCLASSES}"          >> options3
 printf "%s\n" "HelloAnnotation.java"        >> options3
 ${APT} @options3 2> output
 
-diff output ${TESTSRC}/goldenWarn.txt
+diff ${DIFFOPTS} output ${TESTSRC}/goldenWarn.txt
 
 RESULT=$?
 case "$RESULT" in
@@ -485,7 +490,7 @@ printf "%s\n" "-d ./class"             >> options8
 printf "%s\n" "${TESTSRC}/Dummy1.java" >> options8
 ${APT} @options8 > multiRoundOutput 2> multiRoundError
 
-diff multiRoundOutput  ${TESTSRC}/goldenFactory.txt
+diff ${DIFFOPTS} multiRoundOutput  ${TESTSRC}/goldenFactory.txt
 
 RESULT=$?
 case "$RESULT" in
diff --git a/langtools/test/tools/javac/4846262/Test.sh b/langtools/test/tools/javac/4846262/Test.sh
index 954d53f602a..606a4104e35 100644
--- a/langtools/test/tools/javac/4846262/Test.sh
+++ b/langtools/test/tools/javac/4846262/Test.sh
@@ -45,13 +45,13 @@ fi
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    FS="/"
+    DIFFOPTS="--strip-trailing-cr"
+    ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
     ;;
   * )
@@ -68,7 +68,7 @@ rm -f Test.java Test.out
 
 "${TESTJAVA}${FS}bin${FS}native2ascii" ${TESTTOOLVMOPTS} -encoding IBM1047 Test.tmp Test.out
 
-diff -c "${TESTSRC}${FS}Test.out" Test.out
+diff ${DIFFOPTS} -c "${TESTSRC}${FS}Test.out" Test.out
 result=$?
 
 if [ $result -eq o ]
diff --git a/langtools/test/tools/javac/6302184/T6302184.sh b/langtools/test/tools/javac/6302184/T6302184.sh
index 37f00fea44b..311f3ee518a 100644
--- a/langtools/test/tools/javac/6302184/T6302184.sh
+++ b/langtools/test/tools/javac/6302184/T6302184.sh
@@ -42,13 +42,13 @@ fi
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    FS="/"
+    DIFFOPTS="--strip-trailing-cr"
+    ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
     ;;
   * )
@@ -57,8 +57,8 @@ case "$OS" in
     ;;
 esac
 
-"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1 > ${NULL}
-diff -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
+"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d ${TC} -cp ${TC} -encoding iso-8859-1 -XD-printsource ${TS}${FS}T6302184.java 2>&1
+diff ${DIFFOPTS} -c ${TC}${FS}T6302184.java ${TS}${FS}T6302184.out
 result=$?
 
 
diff --git a/langtools/test/tools/javac/6390045/T6390045a.java b/langtools/test/tools/javac/6390045/T6390045a.java
new file mode 100644
index 00000000000..15fb1454da2
--- /dev/null
+++ b/langtools/test/tools/javac/6390045/T6390045a.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6390045
+ * @summary Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5
+ *
+ * @author mcimadamore
+ * @compile -XDfailcomplete=java.lang.Void T6390045a.java
+ */
+
+class T6390045a {
+    boolean b;
+    short s;
+    Object o;
+    Object p = b ? o : s;
+}
diff --git a/langtools/test/tools/javac/6390045/T6390045b.java b/langtools/test/tools/javac/6390045/T6390045b.java
new file mode 100644
index 00000000000..00f45ec071b
--- /dev/null
+++ b/langtools/test/tools/javac/6390045/T6390045b.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6390045
+ * @summary Unexpected error "cannot access java.lang.Void" with '-target cldc1.0' with -source >=1.5
+ *
+ * @author mcimadamore
+ * @compile -XDfailcomplete=java.lang.Void T6390045b.java
+ */
+
+class T6390045b {
+    short s;
+    Object o;
+    Object p = choose(o, s);
+    <T> T choose(T t1, T t2) { return t1; }
+}
diff --git a/langtools/test/tools/javac/6521805/T6521805a.java b/langtools/test/tools/javac/6521805/T6521805a.java
new file mode 100644
index 00000000000..d81fab6ddc5
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/T6521805a.java
@@ -0,0 +1,22 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6521805
+ * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
+ * @author mcimadamore
+ *
+ * @compile/fail/ref=T6521805a_1.out T6521805a.java -XDrawDiagnostics
+ * @compile/ref=T6521805a_2.out T6521805a.java -XDwarnOnSyntheticConflicts -XDrawDiagnostics
+ */
+
+class T6521805a {
+
+    static class Outer {
+        T6521805a this$0 = null;
+    }
+
+    public class Inner extends Outer {
+        public void foo() {
+            this$0 = new T6521805a();
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/6521805/T6521805a_1.out b/langtools/test/tools/javac/6521805/T6521805a_1.out
new file mode 100644
index 00000000000..3c069c0a793
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/T6521805a_1.out
@@ -0,0 +1,2 @@
+T6521805a.java:17:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
+1 error
diff --git a/langtools/test/tools/javac/6521805/T6521805a_2.out b/langtools/test/tools/javac/6521805/T6521805a_2.out
new file mode 100644
index 00000000000..98d97813f36
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/T6521805a_2.out
@@ -0,0 +1,2 @@
+T6521805a.java:17:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
+1 warning
diff --git a/langtools/test/tools/javac/6521805/T6521805b.java b/langtools/test/tools/javac/6521805/T6521805b.java
new file mode 100644
index 00000000000..ff9c60712c4
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/T6521805b.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6521805
+ * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
+ * @author mcimadamore
+ *
+ * @compile T6521805b.java
+ */
+
+class T6521805b {
+
+    static class Outer {
+        String this$0 = null;
+    }
+
+    public class Inner extends Outer {
+        public void foo() {
+            this$0 = "Hello!";
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/6521805/T6521805c.java b/langtools/test/tools/javac/6521805/T6521805c.java
new file mode 100644
index 00000000000..2da6d4d59ce
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/T6521805c.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6521805
+ * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
+ * @author mcimadamore
+ *
+ * @compile T6521805c.java
+ */
+
+class T6521805c {
+
+    static class Outer {
+         T6521805c this$0() { return null;}
+    }
+
+    public class Inner extends Outer {
+        public void foo() {
+            this$0();
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/6521805/T6521805d.java b/langtools/test/tools/javac/6521805/T6521805d.java
new file mode 100644
index 00000000000..2cdce03c123
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/T6521805d.java
@@ -0,0 +1,27 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6521805
+ * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
+ * @author mcimadamore
+ *
+ * @compile/fail/ref=T6521805d.out T6521805d.java -XDrawDiagnostics
+ */
+
+class T6521805 {
+
+    static class Inner extends T6521805.Outer {
+
+        Inner(T6521805 t) {
+            t.super();
+        }
+
+        T6521805 this$0 = null;
+
+        public void foo() {
+            this$0 = new T6521805();
+        }
+    }
+
+    class Outer {}
+
+}
diff --git a/langtools/test/tools/javac/6521805/T6521805d.out b/langtools/test/tools/javac/6521805/T6521805d.out
new file mode 100644
index 00000000000..78ebfbfe961
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/T6521805d.out
@@ -0,0 +1,2 @@
+T6521805d.java:18:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
+1 error
diff --git a/langtools/test/tools/javac/innerClassFile/Driver.java b/langtools/test/tools/javac/6521805/T6521805e.java
similarity index 74%
rename from langtools/test/tools/javac/innerClassFile/Driver.java
rename to langtools/test/tools/javac/6521805/T6521805e.java
index 05c45dfb773..4af4649d8a3 100644
--- a/langtools/test/tools/javac/innerClassFile/Driver.java
+++ b/langtools/test/tools/javac/6521805/T6521805e.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  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
@@ -23,11 +23,10 @@
 
 /*
  * @test
- * @bug 4491755 4785453
- * @summary Prob w/static inner class with same name as a regular class
- * @author gafter
+ * @bug 6521805
+ * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
+ * @author mcimadamore
  *
- * @run shell Driver.sh
+ * @compile/fail/ref=T6521805e.out p/Outer.java p/Sub.java -XDrawDiagnostics
+ * @compile/fail/ref=T6521805e.out p/Sub.java p/Outer.java -XDrawDiagnostics
  */
-
-// this is not a real source file, just the tags to run this test.
diff --git a/langtools/test/tools/javac/6521805/T6521805e.out b/langtools/test/tools/javac/6521805/T6521805e.out
new file mode 100644
index 00000000000..04c71cd8821
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/T6521805e.out
@@ -0,0 +1,2 @@
+Sub.java:8:11: compiler.err.synthetic.name.conflict: this$0, p.Inner
+1 error
diff --git a/langtools/test/tools/javac/6521805/p/Outer.java b/langtools/test/tools/javac/6521805/p/Outer.java
new file mode 100644
index 00000000000..3dd1de56b78
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/p/Outer.java
@@ -0,0 +1,5 @@
+package p;
+
+class Outer {
+    class Super {}
+}
diff --git a/langtools/test/tools/javac/6521805/p/Sub.java b/langtools/test/tools/javac/6521805/p/Sub.java
new file mode 100644
index 00000000000..7a9f78896e3
--- /dev/null
+++ b/langtools/test/tools/javac/6521805/p/Sub.java
@@ -0,0 +1,13 @@
+package p;
+
+class Inner extends Outer.Super {
+    Inner(Outer t) {
+        t.super();
+    }
+
+    Outer this$0 = null;
+
+    public void foo() {
+        this$0 = new Outer();
+    }
+}
diff --git a/langtools/test/tools/javac/6589361/T6589361.java b/langtools/test/tools/javac/6589361/T6589361.java
index fe308937cda..8c9ed411952 100644
--- a/langtools/test/tools/javac/6589361/T6589361.java
+++ b/langtools/test/tools/javac/6589361/T6589361.java
@@ -23,8 +23,9 @@ public class T6589361 {
             set.add(JavaFileObject.Kind.CLASS);
             Iterable<JavaFileObject> files = fm.list(StandardLocation.PLATFORM_CLASS_PATH, "java.lang", set, false);
             for (JavaFileObject file : files) {
-
-                if (file.toString().contains("java" + File.separator + "lang" + File.separator + "Object.class")) {
+                // Note: Zip/Jar entry names use '/', not File.separator, but just to be sure,
+                // we normalize the filename as well.
+                if (file.toString().replace(File.separatorChar, '/').contains("java/lang/Object.class")) {
                     String str = fm.inferBinaryName(StandardLocation.CLASS_PATH, file);
                     if (!str.equals("java.lang.Object")) {
                         throw new AssertionError("Error in JavacFileManager.inferBinaryName method!");
@@ -40,7 +41,7 @@ public class T6589361 {
                 fm.close();
             }
         }
-        throw new AssertionError("Could not fing java/lang/Object.class while compiling");
+        throw new AssertionError("Could not find java/lang/Object.class while compiling");
     }
 
 }
diff --git a/langtools/test/tools/javac/6627362/T6627362.java b/langtools/test/tools/javac/6627362/T6627362.java
index a7da200ae37..aad4c3c0bc2 100644
--- a/langtools/test/tools/javac/6627362/T6627362.java
+++ b/langtools/test/tools/javac/6627362/T6627362.java
@@ -75,7 +75,7 @@ public class T6627362 {
 
         StringWriter sw = new StringWriter();
         javap(new PrintWriter(sw, true), jpArgs);
-        check(sw.toString(), "//Method java/lang/System.arraycopy:(Ljava/lang/Object;ILjava/lang/Object;II)V");
+        check(sw.toString(), "// Method java/lang/System.arraycopy:(Ljava/lang/Object;ILjava/lang/Object;II)V");
         callValues();
     }
 
@@ -86,26 +86,13 @@ public class T6627362 {
     }
 
     void javap(PrintWriter out, String... args) throws Exception {
-        // for now, we have to exec javap
-        File javaHome = new File(System.getProperty("java.home"));
-        if (javaHome.getName().equals("jre"))
-            javaHome = javaHome.getParentFile();
-        File javap = new File(new File(javaHome, "bin"), "javap");
-        String[] cmd = new String[args.length + 1];
-        cmd[0] = javap.getPath();
-        System.arraycopy(args, 0, cmd, 1, args.length);
-        Process p = new ProcessBuilder(cmd).redirectErrorStream(true).start();
-        p.getOutputStream().close();
-        BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-        String line;
-        while ((line = in.readLine()) != null)
-            out.println(line);
-        int rc = p.waitFor();
+        int rc = com.sun.tools.javap.Main.run(args, out);
         if (rc != 0)
             throw new Error("javap failed: " + Arrays.asList(args) + ": " + rc);
     }
 
     void check(String s, String require) {
+        System.out.println("Checking:\n" + s);
         if (s.indexOf(require) == -1) {
             System.err.println("Can't find " + require);
             errors++;
diff --git a/langtools/test/tools/javac/6717241/T6717241a.java b/langtools/test/tools/javac/6717241/T6717241a.java
index f0107747c46..81a4ad4f7ee 100644
--- a/langtools/test/tools/javac/6717241/T6717241a.java
+++ b/langtools/test/tools/javac/6717241/T6717241a.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6717241
  * @summary some diagnostic argument is prematurely converted into a String object
  * @author  Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/6717241/T6717241a.out b/langtools/test/tools/javac/6717241/T6717241a.out
index 20a193bd668..102e5704dfe 100644
--- a/langtools/test/tools/javac/6717241/T6717241a.out
+++ b/langtools/test/tools/javac/6717241/T6717241a.out
@@ -1,4 +1,4 @@
-T6717241a.java:36:21: compiler.err.cant.resolve: kindname.variable, v, , 
-T6717241a.java:38:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
-T6717241a.java:40:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
+T6717241a.java:13:21: compiler.err.cant.resolve: kindname.variable, v, , 
+T6717241a.java:15:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
+T6717241a.java:17:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
 3 errors
diff --git a/langtools/test/tools/javac/6717241/T6717241b.java b/langtools/test/tools/javac/6717241/T6717241b.java
index cc252b835ee..2851fef5361 100644
--- a/langtools/test/tools/javac/6717241/T6717241b.java
+++ b/langtools/test/tools/javac/6717241/T6717241b.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6717241
  * @summary some diagnostic argument is prematurely converted into a String object
  * @author  Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/6717241/T6717241b.out b/langtools/test/tools/javac/6717241/T6717241b.out
index d66ba55ccab..e37e9d6038a 100644
--- a/langtools/test/tools/javac/6717241/T6717241b.out
+++ b/langtools/test/tools/javac/6717241/T6717241b.out
@@ -1,4 +1,4 @@
-T6717241b.java:35:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
-T6717241b.java:37:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
-T6717241b.java:39:18: compiler.err.cant.resolve.location.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String, kindname.class, T6717241b
+T6717241b.java:12:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
+T6717241b.java:14:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
+T6717241b.java:16:18: compiler.err.cant.resolve.location.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String, kindname.class, T6717241b
 3 errors
diff --git a/langtools/test/tools/javac/6734819/T6734819a.out b/langtools/test/tools/javac/6734819/T6734819a.out
index 73437aee829..a3ccb07e67e 100644
--- a/langtools/test/tools/javac/6734819/T6734819a.out
+++ b/langtools/test/tools/javac/6734819/T6734819a.out
@@ -4,9 +4,9 @@
 [flow W]
 [attribute Z]
 [flow Z]
+[desugar Z]
+[desugar W]
 [desugar Y]
 [generate code Y]
-[desugar W]
 [generate code W]
-[desugar Z]
 [generate code Z]
diff --git a/langtools/test/tools/javac/6734819/T6734819b.out b/langtools/test/tools/javac/6734819/T6734819b.out
index 3d715333b52..0c9629006df 100644
--- a/langtools/test/tools/javac/6734819/T6734819b.out
+++ b/langtools/test/tools/javac/6734819/T6734819b.out
@@ -2,8 +2,8 @@
 [flow A]
 [attribute B]
 [flow B]
+[desugar B]
 [desugar A]
 [generate code A]
-[desugar B]
 [generate code B.C]
 [generate code B]
diff --git a/langtools/test/tools/javac/6734819/T6734819c.java b/langtools/test/tools/javac/6734819/T6734819c.java
index c6a990bd3ee..f78f5f0d39a 100644
--- a/langtools/test/tools/javac/6734819/T6734819c.java
+++ b/langtools/test/tools/javac/6734819/T6734819c.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6734819
  * @summary Javac performs flows analysis on already translated classes
  * @author Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/6734819/T6734819c.out b/langtools/test/tools/javac/6734819/T6734819c.out
index 92a10219774..1d4cff3212f 100644
--- a/langtools/test/tools/javac/6734819/T6734819c.out
+++ b/langtools/test/tools/javac/6734819/T6734819c.out
@@ -4,5 +4,5 @@
 [flow W]
 [attribute Z]
 [flow Z]
-T6734819c.java:38:11: compiler.err.unreachable.stmt
+T6734819c.java:15:11: compiler.err.unreachable.stmt
 1 error
diff --git a/langtools/test/tools/javac/6758789/T6758789a.java b/langtools/test/tools/javac/6758789/T6758789a.java
index f4607973afd..fdf9690b171 100644
--- a/langtools/test/tools/javac/6758789/T6758789a.java
+++ b/langtools/test/tools/javac/6758789/T6758789a.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6758789
  * @summary 6758789: Some method resolution diagnostic should be improved
  * @author Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/6758789/T6758789a.out b/langtools/test/tools/javac/6758789/T6758789a.out
index e85453992a9..1e1ec6c7b38 100644
--- a/langtools/test/tools/javac/6758789/T6758789a.out
+++ b/langtools/test/tools/javac/6758789/T6758789a.out
@@ -1,3 +1,3 @@
-T6758789a.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
-T6758789a.java:38:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
-2 errors
\ No newline at end of file
+T6758789a.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
+T6758789a.java:15:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
+2 errors
diff --git a/langtools/test/tools/javac/6758789/T6758789b.java b/langtools/test/tools/javac/6758789/T6758789b.java
index 731a1bad33a..5d9e22687fd 100644
--- a/langtools/test/tools/javac/6758789/T6758789b.java
+++ b/langtools/test/tools/javac/6758789/T6758789b.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6758789
  * @summary 6758789: Some method resolution diagnostic should be improved
  * @author Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/6758789/T6758789b.out b/langtools/test/tools/javac/6758789/T6758789b.out
index af29552ca25..45a828dbd49 100644
--- a/langtools/test/tools/javac/6758789/T6758789b.out
+++ b/langtools/test/tools/javac/6758789/T6758789b.out
@@ -1,5 +1,5 @@
-T6758789b.java:39:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
-T6758789b.java:39:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
+T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
+T6758789b.java:16:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
 - compiler.err.warnings.and.werror
 1 error
 2 warnings
diff --git a/langtools/test/tools/javac/6840059/T6840059.java b/langtools/test/tools/javac/6840059/T6840059.java
new file mode 100644
index 00000000000..b86482fe163
--- /dev/null
+++ b/langtools/test/tools/javac/6840059/T6840059.java
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840059
+ * @summary 6758789: Some method resolution diagnostic should be improved
+ * @author Maurizio Cimadamore
+ *
+ * @compile/fail/ref=T6840059.out -XDrawDiagnostics T6840059.java
+ */
+
+class T6840059 {
+
+    T6840059(Integer x) {}
+
+    void test() {
+        new T6840059(""){};
+    }
+}
diff --git a/langtools/test/tools/javac/6840059/T6840059.out b/langtools/test/tools/javac/6840059/T6840059.out
new file mode 100644
index 00000000000..d23d3e33838
--- /dev/null
+++ b/langtools/test/tools/javac/6840059/T6840059.out
@@ -0,0 +1,3 @@
+T6840059.java:15:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
+T6840059.java:15:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
+2 errors
diff --git a/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh b/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
index 6f474c8bf33..101fac98a34 100644
--- a/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
+++ b/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
@@ -56,14 +56,10 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
+  SunOS | Linux | CYGWIN* )
     FS="/"
     ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
     ;;
   * )
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a.java b/langtools/test/tools/javac/Diagnostics/6722234/T6722234a.java
index 3879d88c1de..28dbb584f89 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a.java
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234a.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_1.out b/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_1.out
index 5a229ffdaf5..72032584edf 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_1.out
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_1.out
@@ -1,2 +1,2 @@
-T6722234a.java:35:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
+T6722234a.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
 1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_2.out b/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_2.out
index 1f6201ef188..70155066aa1 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_2.out
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234a_2.out
@@ -1,3 +1,3 @@
-T6722234a.java:35:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
+T6722234a.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
 - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T6722234a),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, java.lang.Integer, kindname.method, <compiler.misc.type.var: T, 2>test(compiler.misc.type.var: T, 2))}
 1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b.java b/langtools/test/tools/javac/Diagnostics/6722234/T6722234b.java
index f06321187ac..1d9a24b124e 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b.java
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234b.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_1.out b/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_1.out
index 4e85fbbcdb7..cc41483011e 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_1.out
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_1.out
@@ -1,2 +1,2 @@
-T6722234b.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.type.captureof: 1, ? extends T6722234b>,List<compiler.misc.type.captureof: 2, ? extends T6722234b>, kindname.class, T6722234b, null
+T6722234b.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.type.captureof: 1, ? extends T6722234b>,List<compiler.misc.type.captureof: 2, ? extends T6722234b>, kindname.class, T6722234b, null
 1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_2.out b/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_2.out
index e782bd9595c..d9cc6dab61b 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_2.out
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234b_2.out
@@ -1,4 +1,4 @@
-T6722234b.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.captured.type: 1>,List<compiler.misc.captured.type: 2>, kindname.class, T6722234b, null
+T6722234b.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.captured.type: 1>,List<compiler.misc.captured.type: 2>, kindname.class, T6722234b, null
 - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, Object, kindname.method, <T>m(List<T>,List<T>))}
 - compiler.misc.where.description.captured.1: compiler.misc.captured.type: 1,compiler.misc.captured.type: 2,{(compiler.misc.where.captured.1: compiler.misc.captured.type: 1, T6722234b, compiler.misc.type.null, ? extends T6722234b),(compiler.misc.where.captured.1: compiler.misc.captured.type: 2, T6722234b, compiler.misc.type.null, ? extends T6722234b)}
 1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.java b/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.java
index 8fa2757f2df..9fa4aa0f1fc 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.java
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.out b/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.out
index 90d7e2180e7..b79e0d1d19e 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.out
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234c.out
@@ -1,2 +1,2 @@
-T6722234c.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
+T6722234c.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
 1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d.java b/langtools/test/tools/javac/Diagnostics/6722234/T6722234d.java
index 89537f8b34d..7f348f051f5 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d.java
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234d.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6722234
  * @summary javac diagnostics need better integration with the type-system
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_1.out b/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_1.out
index 75a97ced1e4..101f78bea8f 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_1.out
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_1.out
@@ -1,3 +1,3 @@
-T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
+T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
 - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, java.lang.Object,T6722234d.I1,T6722234d.I2)}
 1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_2.out b/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_2.out
index 55dfedff842..236c80fbc81 100644
--- a/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_2.out
+++ b/langtools/test/tools/javac/Diagnostics/6722234/T6722234d_2.out
@@ -1,3 +1,3 @@
-T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
+T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
 - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, Object,I1,I2)}
 1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6769027/tester.properties b/langtools/test/tools/javac/Diagnostics/6769027/tester.properties
index 666a52eb198..01818111874 100644
--- a/langtools/test/tools/javac/Diagnostics/6769027/tester.properties
+++ b/langtools/test/tools/javac/Diagnostics/6769027/tester.properties
@@ -3,11 +3,11 @@ compiler.err.single=\
 
 compiler.err.double=\
     This is a test error message.\n\
-	This is another line of the above error message {0}
+        This is another line of the above error message {0}
 
 compiler.misc.single=\
     This is a test subdiagnostic {0}
 
 compiler.misc.double=\
     This is a test subdiagnostic.\n\
-	This is another line of the above subdiagnostic {0}
+        This is another line of the above subdiagnostic {0}
diff --git a/langtools/test/tools/javac/Diagnostics/6799605/T6799605.java b/langtools/test/tools/javac/Diagnostics/6799605/T6799605.java
index a1eaa65b7f4..75b1e69bee5 100644
--- a/langtools/test/tools/javac/Diagnostics/6799605/T6799605.java
+++ b/langtools/test/tools/javac/Diagnostics/6799605/T6799605.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6799605
  * @summary Basic/Raw formatters should use type/symbol printer instead of toString()
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/Diagnostics/6799605/T6799605.out b/langtools/test/tools/javac/Diagnostics/6799605/T6799605.out
index ae287cc113e..f3933ef7461 100644
--- a/langtools/test/tools/javac/Diagnostics/6799605/T6799605.out
+++ b/langtools/test/tools/javac/Diagnostics/6799605/T6799605.out
@@ -1,4 +1,4 @@
-T6799605.java:40:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
-T6799605.java:41:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>, kindname.class, T6799605<X>
-T6799605.java:42:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>, kindname.class, T6799605<X>
+T6799605.java:17:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
+T6799605.java:18:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>, kindname.class, T6799605<X>
+T6799605.java:19:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>, kindname.class, T6799605<X>
 3 errors
diff --git a/langtools/test/tools/javac/Diagnostics/6860795/T6860795.java b/langtools/test/tools/javac/Diagnostics/6860795/T6860795.java
new file mode 100644
index 00000000000..28df5f0bdf7
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/6860795/T6860795.java
@@ -0,0 +1,11 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug     6860795
+ * @summary NullPointerException when compiling a negative java source
+ * @author  mcimadamore
+ * @compile/fail/ref=T6860795.out -XDrawDiagnostics  T6860795.java
+ */
+
+class Test {
+    void foo(float x, int x) {}
+}
diff --git a/langtools/test/tools/javac/Diagnostics/6860795/T6860795.out b/langtools/test/tools/javac/Diagnostics/6860795/T6860795.out
new file mode 100644
index 00000000000..c0ba0f19676
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/6860795/T6860795.out
@@ -0,0 +1,2 @@
+T6860795.java:10:27: compiler.err.already.defined: x, foo
+1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6862608/T6862608a.java b/langtools/test/tools/javac/Diagnostics/6862608/T6862608a.java
new file mode 100644
index 00000000000..2b0e5c6ca03
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/6862608/T6862608a.java
@@ -0,0 +1,21 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug     6862608
+ * @summary rich diagnostic sometimes contain wrong type variable numbering
+ * @author  mcimadamore
+ * @compile/fail/ref=T6862608a.out -XDrawDiagnostics -XDdiags=disambiguateTvars,where T6862608a.java
+ */
+
+
+import java.util.*;
+
+class T6862608a {
+
+    <T> Comparator<T> compound(Iterable<? extends Comparator<? super T>> it) {
+        return null;
+    }
+
+    public void test(List<Comparator<?>> x) {
+        Comparator<String> c3 = compound(x);
+    }
+}
diff --git a/langtools/test/tools/javac/Diagnostics/6862608/T6862608a.out b/langtools/test/tools/javac/Diagnostics/6862608/T6862608a.out
new file mode 100644
index 00000000000..41d11d2d5b5
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/6862608/T6862608a.out
@@ -0,0 +1,3 @@
+T6862608a.java:19:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
+- compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, java.lang.Object, kindname.method, <T>compound(java.lang.Iterable<? extends java.util.Comparator<? super T>>))}
+1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6862608/T6862608b.java b/langtools/test/tools/javac/Diagnostics/6862608/T6862608b.java
new file mode 100644
index 00000000000..09d93d194c0
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/6862608/T6862608b.java
@@ -0,0 +1,15 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug     6862608
+ * @summary rich diagnostic sometimes contain wrong type variable numbering
+ * @author  mcimadamore
+ * @compile/fail/ref=T6862608b.out -XDrawDiagnostics -XDdiags=disambiguateTvars,where T6862608b.java
+ */
+
+class T66862608b<T extends String, S> {
+   <S, T extends S> void foo(T t) {
+      test(t);
+   }
+
+   void test(T t) {}
+}
diff --git a/langtools/test/tools/javac/Diagnostics/6862608/T6862608b.out b/langtools/test/tools/javac/Diagnostics/6862608/T6862608b.out
new file mode 100644
index 00000000000..415700b77ea
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/6862608/T6862608b.out
@@ -0,0 +1,3 @@
+T6862608b.java:11:7: compiler.err.cant.apply.symbol: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, null
+- compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,compiler.misc.type.var: S, 1,compiler.misc.type.var: S, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T66862608b),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, compiler.misc.type.var: S, 1, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 1, java.lang.Object, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 2, java.lang.Object, kindname.class, T66862608b)}
+1 error
diff --git a/langtools/test/tools/javac/Diagnostics/6864382/T6864382.java b/langtools/test/tools/javac/Diagnostics/6864382/T6864382.java
new file mode 100644
index 00000000000..e9406bdc9f1
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/6864382/T6864382.java
@@ -0,0 +1,9 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug     6864382
+ * @summary NullPointerException when compiling a negative java source
+ * @author  mcimadamore
+ * @compile/fail/ref=T6864382.out -XDrawDiagnostics  T6864382.java
+ */
+
+class T6864382<T> extends T {}
diff --git a/langtools/test/tools/javac/Diagnostics/6864382/T6864382.out b/langtools/test/tools/javac/Diagnostics/6864382/T6864382.out
new file mode 100644
index 00000000000..3b4e736cf0a
--- /dev/null
+++ b/langtools/test/tools/javac/Diagnostics/6864382/T6864382.out
@@ -0,0 +1,2 @@
+T6864382.java:9:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
+1 error
diff --git a/langtools/test/tools/javac/ExtDirs/ExtDirs.sh b/langtools/test/tools/javac/ExtDirs/ExtDirs.sh
index 6a4c3b0ecd3..15ca47b9a33 100644
--- a/langtools/test/tools/javac/ExtDirs/ExtDirs.sh
+++ b/langtools/test/tools/javac/ExtDirs/ExtDirs.sh
@@ -55,12 +55,14 @@ echo "CLASSPATH=${CLASSPATH}"
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";" # native PS, not Cygwin PS
+    FS="/"
+    ;;
   Windows* )
-    NULL=NUL
     PS=";"
     FS="\\"
     ;;
diff --git a/langtools/test/tools/javac/MissingInclude.sh b/langtools/test/tools/javac/MissingInclude.sh
index 4569e5309ae..dcf0c5a25b8 100644
--- a/langtools/test/tools/javac/MissingInclude.sh
+++ b/langtools/test/tools/javac/MissingInclude.sh
@@ -47,14 +47,10 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
+  SunOS | Linux | CYGWIN* )
     FS="/"
     ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
     ;;
   * )
diff --git a/langtools/test/tools/javac/OverrideChecks/6199153/T6199153.java b/langtools/test/tools/javac/OverrideChecks/6199153/T6199153.java
new file mode 100644
index 00000000000..4a800d1f415
--- /dev/null
+++ b/langtools/test/tools/javac/OverrideChecks/6199153/T6199153.java
@@ -0,0 +1,21 @@
+/**
+ * @test /nodynamiccopyright/
+ * @bug 6199153
+ * @summary Generic throws and overriding
+ * @author  mcimadamore
+ * @compile/fail/ref=T6199153.out -Xlint -Werror -XDrawDiagnostics T6199153.java
+ */
+
+import java.io.IOException;
+
+class T6199153 {
+
+    static class A {
+        public <T extends IOException> void m() throws T {}
+    }
+
+    static class B extends A {
+        public void m() throws IOException {}
+    }
+}
+
diff --git a/langtools/test/tools/javac/OverrideChecks/6199153/T6199153.out b/langtools/test/tools/javac/OverrideChecks/6199153/T6199153.out
new file mode 100644
index 00000000000..9a9a4237424
--- /dev/null
+++ b/langtools/test/tools/javac/OverrideChecks/6199153/T6199153.out
@@ -0,0 +1,4 @@
+T6199153.java:18:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.java b/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.java
index a1808b81f94..837988d7594 100644
--- a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.java
+++ b/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6400189
  * @summary raw types and inference
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.out b/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.out
index 39938023fa3..985ea64674e 100644
--- a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.out
+++ b/langtools/test/tools/javac/OverrideChecks/6400189/T6400189a.out
@@ -1,4 +1,4 @@
-T6400189a.java:37:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
-T6400189a.java:37:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
+T6400189a.java:14:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
+T6400189a.java:14:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
 1 error
 1 warning
diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.java b/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.java
index c7a6993d565..afffb49d111 100644
--- a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.java
+++ b/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6400189
  * @summary raw types and inference
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.out b/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.out
index 8d7711a117e..1797ef9a9a0 100644
--- a/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.out
+++ b/langtools/test/tools/javac/OverrideChecks/6400189/T6400189b.out
@@ -1,4 +1,4 @@
-T6400189b.java:47:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
-T6400189b.java:47:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
+T6400189b.java:24:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
+T6400189b.java:24:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
 1 error
 1 warning
diff --git a/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh b/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
index 841419a629b..9210f0c0fde 100644
--- a/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
+++ b/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
@@ -53,12 +53,14 @@ echo "CLASSPATH=${CLASSPATH}"
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
     PS=":"
     FS="/"
     ;;
+  CYGWIN* ) 
+    PS=";" # native PS, not Cygwin PS
+    FS="/"
+    ;;
   Windows* )
-    NULL=NUL
     PS=";"
     FS="\\"
     ;;
diff --git a/langtools/test/tools/javac/T5090006/compiler.sh b/langtools/test/tools/javac/T5090006/compiler.sh
index 7ac92f531d0..a3aaf847454 100644
--- a/langtools/test/tools/javac/T5090006/compiler.sh
+++ b/langtools/test/tools/javac/T5090006/compiler.sh
@@ -47,14 +47,10 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
+  SunOS | Linux | CYGWIN* )
     FS="/"
     ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
     ;;
   * )
diff --git a/langtools/test/tools/javac/T6558476.java b/langtools/test/tools/javac/T6558476.java
new file mode 100644
index 00000000000..7286128dcb7
--- /dev/null
+++ b/langtools/test/tools/javac/T6558476.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @run main/othervm -Xmx512m -Xms512m  T6558476
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+import com.sun.tools.javac.Main;
+
+public class T6558476 {
+    private static File copyFileTo(File file, File directory) throws IOException {
+        File newFile = new File(directory, file.getName());
+        FileInputStream fis = null;
+        FileOutputStream fos = null;
+        try {
+            fis = new FileInputStream(file);
+            fos = new FileOutputStream(newFile);
+            byte buff[] = new byte[1024];
+            int val;
+            while ((val = fis.read(buff)) > 0)
+                fos.write(buff, 0, val);
+        } finally {
+            if (fis != null)
+                fis.close();
+            if (fos != null)
+                fos.close();
+        }
+        return newFile;
+    }
+
+    private static String generateJavaClass(String className) {
+        StringBuffer sb = new StringBuffer();
+        sb.append("import sun.net.spi.nameservice.dns.DNSNameService;\n");
+        sb.append("public class ");
+        sb.append(className);
+        sb.append(" {\n");
+        sb.append("  public void doStuff() {\n");
+        sb.append("    DNSNameService dns = null;\n");
+        sb.append("  }\n");
+        sb.append("}\n");
+        return sb.toString();
+    }
+
+    public static void main(String[] args) throws IOException {
+        File javaHomeDir = new File(System.getProperty("java.home"));
+        File tmpDir = new File(System.getProperty("java.io.tmpdir"));
+        File outputDir = new File(tmpDir, "outputDir" + new Random().nextInt(65536));
+        outputDir.mkdir();
+        outputDir.deleteOnExit();
+
+        File dnsjarfile = new File(javaHomeDir, "lib" + File.separator + "ext" + File.separator + "dnsns.jar");
+        File tmpJar = copyFileTo(dnsjarfile, outputDir);
+        String className = "TheJavaFile";
+        File javaFile = new File(outputDir, className + ".java");
+        javaFile.deleteOnExit();
+        FileOutputStream fos = new FileOutputStream(javaFile);
+        fos.write(generateJavaClass(className).getBytes());
+        fos.close();
+
+        int rc = Main.compile(new String[]{"-d", outputDir.getPath(),
+                    "-classpath",
+                    tmpJar.getPath(),
+                    javaFile.getAbsolutePath()});
+        if (rc != 0) {
+            throw new Error("Couldn't compile the file (exit code=" + rc + ")");
+        }
+
+        if (tmpJar.delete()) {
+            System.out.println("jar file successfully deleted");
+        } else {
+            throw new Error("Error deleting file \"" + tmpJar.getPath() + "\"");
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/T6873845.java b/langtools/test/tools/javac/T6873845.java
new file mode 100644
index 00000000000..ff84028326f
--- /dev/null
+++ b/langtools/test/tools/javac/T6873845.java
@@ -0,0 +1,84 @@
+import java.io.*;
+import java.util.*;
+
+import sun.misc.*;
+
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6873845
+ * @summary refine access to symbol file
+ */
+
+public class T6873845 {
+    public static void main(String... args) throws Exception {
+        new T6873845().run();
+    }
+
+    public void run() throws Exception {
+        String out = compile(Arrays.asList("-XDrawDiagnostics", "-X"));
+        if (out.contains("sunapi"))
+            throw new Exception("unexpected output for -X");
+
+        String warn1 = "T6873845.java:72:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
+        String warn2 = "T6873845.java:77:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
+        String note1 = "- compiler.note.sunapi.filename: T6873845.java" + newline;
+        String note2 = "- compiler.note.sunapi.recompile" + newline;
+
+        test(opts(),
+                warn1 + warn2 + "2 warnings" + newline);
+        test(opts("-XDenableSunApiLintControl"),
+                note1 + note2);
+        test(opts("-XDenableSunApiLintControl", "-XDsuppressNotes"),
+                "");
+        test(opts("-XDenableSunApiLintControl", "-Xlint:sunapi"),
+                warn1 + "1 warning" + newline);
+        test(opts("-XDenableSunApiLintControl", "-Xlint:all"),
+                warn1 + "1 warning" + newline);
+        test(opts("-XDenableSunApiLintControl", "-Xlint:all,-sunapi"),
+                note1 + note2);
+    }
+
+    List<String> opts(String... opts) {
+        return Arrays.asList(opts);
+    }
+
+    void test(List<String> opts, String expect) throws Exception {
+        List<String> args = new ArrayList<String>();
+        args.addAll(opts);
+        args.add("-d");
+        args.add(testClasses.getPath());
+        args.add(new File(testSrc, "T6873845.java").getPath());
+        compile(args); // to verify resource strings exist
+        args.add(0, "-XDrawDiagnostics");
+        String out = compile(args);
+        if (!out.equals(expect))
+            throw new Exception("unexpected output from compiler");
+    }
+
+    String compile(List<String> args) throws Exception{
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        System.out.println("compile: " + args);
+        int rc = com.sun.tools.javac.Main.compile(args.toArray(new String[args.size()]), pw);
+        pw.close();
+        String out = sw.toString();
+        System.out.println(out);
+        if (rc != 0)
+            throw new Exception("compilation failed unexpectedly");
+        return out;
+    }
+
+    void m1() {
+        Unsafe.getUnsafe();
+    }
+
+    @SuppressWarnings("sunapi")
+    void m2() {
+        Unsafe.getUnsafe();
+    }
+
+    private File testSrc = new File(System.getProperty("test.src", "."));
+    private File testClasses = new File(System.getProperty("test.classes", "."));
+    private String newline = System.getProperty("line.separator");
+}
+
diff --git a/langtools/test/tools/javac/T6873849.java b/langtools/test/tools/javac/T6873849.java
new file mode 100644
index 00000000000..67d0772e46e
--- /dev/null
+++ b/langtools/test/tools/javac/T6873849.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * @test
+ * @bug 6873849
+ * @summary suppress notes generated by javac
+ */
+
+public class T6873849 {
+    public static void main(String... args) throws Exception {
+        new T6873849().run();
+    }
+
+    public void run() throws Exception {
+        test(null, "- compiler.note.unchecked.filename: T6873849.java" + newline +
+                    "- compiler.note.unchecked.recompile" + newline);
+        test("-XDsuppressNotes", "");
+    }
+
+    void test(String opt, String expect) throws Exception {
+        List<String> args = new ArrayList<String>();
+        if (opt != null)
+            args.add(opt);
+        args.add("-d");
+        args.add(testClasses.getPath());
+        args.add("-XDrawDiagnostics");
+        args.add(new File(testSrc, "T6873849.java").getPath());
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        System.err.println("compile: " + args);
+        int rc = com.sun.tools.javac.Main.compile(args.toArray(new String[args.size()]), pw);
+        pw.close();
+        String out = sw.toString();
+        System.out.println(out);
+        if (rc != 0)
+            throw new Exception("compilation failed unexpectedly");
+        if (!out.equals(expect))
+            throw new Exception("unexpected output from compiler");
+    }
+
+    void m(List t) {
+        // force a note about unchecked usage
+        t.add(new Object());
+    }
+
+    private File testSrc = new File(System.getProperty("test.src", "."));
+    private File testClasses = new File(System.getProperty("test.classes", "."));
+    private String newline = System.getProperty("line.separator");
+}
diff --git a/langtools/test/tools/javac/api/6440333/T6440333.java b/langtools/test/tools/javac/api/6440333/T6440333.java
index 4dad92d9841..908c2efb644 100644
--- a/langtools/test/tools/javac/api/6440333/T6440333.java
+++ b/langtools/test/tools/javac/api/6440333/T6440333.java
@@ -33,6 +33,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import javax.tools.JavaFileObject;
 
 public class T6440333 extends ToolTester {
@@ -40,10 +41,10 @@ public class T6440333 extends ToolTester {
         File path = test_src.getCanonicalFile();
         File src = new File(new File(path, "."), "T6440333.java");
         JavaFileObject fo = fm.getJavaFileObjects(src).iterator().next();
-        String expect = src.getCanonicalFile().getPath().replace(File.separatorChar, '/');
+        URI expect = src.getCanonicalFile().toURI();
         System.err.println("Expect " + expect);
-        System.err.println("Got: " +  fo.toUri().getPath());
-        if (!expect.equals(fo.toUri().getPath())) {
+        System.err.println("Found  " + fo.toUri());
+        if (!expect.equals(fo.toUri())) {
             throw new AssertionError();
         }
     }
diff --git a/langtools/test/tools/javac/api/Sibling.java b/langtools/test/tools/javac/api/Sibling.java
index 5be940e83be..ca9d098fbb0 100644
--- a/langtools/test/tools/javac/api/Sibling.java
+++ b/langtools/test/tools/javac/api/Sibling.java
@@ -47,10 +47,9 @@ public class Sibling {
                                                             "foo.bar.baz.Test",
                                                             CLASS,
                                                             sibling);
-        String name =
-            new File("Test.class").getAbsolutePath().replace(File.separatorChar, '/');
-        if (!classFile.toUri().getPath().equals(name))
-            throw new AssertionError("Expected " + name + ", got " +
-                                     classFile.toUri().getPath());
+        File file = new File("Test.class").getAbsoluteFile();
+        if (!classFile.toUri().equals(file.toURI()))
+            throw new AssertionError("Expected " + file.toURI() + ", got " +
+                                     classFile.toUri());
     }
 }
diff --git a/langtools/test/tools/javac/api/T6483788.java b/langtools/test/tools/javac/api/T6483788.java
new file mode 100644
index 00000000000..b23038c8d01
--- /dev/null
+++ b/langtools/test/tools/javac/api/T6483788.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6483788
+ * @summary DefaultFileManager.ZipFileObject.toUri() fails to escape space characters
+ */
+
+import java.io.*;
+import java.net.*;
+import java.util.Collections;
+import java.util.jar.*;
+import java.util.zip.*;
+import javax.tools.*;
+
+public class T6483788 {
+    public static void main(String[] args) throws Exception {
+        new T6483788().run();
+    }
+
+    void run() throws Exception {
+        File jar = createJar();
+        JavaCompiler c = ToolProvider.getSystemJavaCompiler();
+        StandardJavaFileManager fm = c.getStandardFileManager(null, null, null);
+        fm.setLocation(StandardLocation.CLASS_PATH, Collections.singleton(jar));
+        JavaFileObject fo = fm.getJavaFileForInput(StandardLocation.CLASS_PATH, "dummy", JavaFileObject.Kind.CLASS);
+        System.err.println("file: " + fo);
+        URI uri = fo.toUri();
+        System.err.println("uri: " + uri);
+        if (uri.toString().contains(" "))
+            throw new Exception("unexpected space character found");
+    }
+
+    File createJar() throws IOException {
+        byte[] dummy_data = new byte[10];
+        File f = new File("a b.jar");
+        OutputStream out = new FileOutputStream(f);
+        try {
+            JarOutputStream jar = new JarOutputStream(out);
+            jar.putNextEntry(new ZipEntry("dummy.class"));
+            jar.write(dummy_data);
+            jar.close();
+        } finally {
+            out.close();
+        }
+        return f;
+    }
+}
+
diff --git a/langtools/test/tools/javac/api/T6501502.java b/langtools/test/tools/javac/api/T6501502.java
new file mode 100644
index 00000000000..436d50f14a5
--- /dev/null
+++ b/langtools/test/tools/javac/api/T6501502.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6501502 6877206 6483788
+ * @summary JSR 199: FileObject.toUri should return file:///c:/ or file:/c:/ not file://c:/
+ */
+
+import java.io.*;
+import java.net.URI;
+import javax.tools.*;
+
+public class T6501502 {
+    public static void main(String... args) throws Exception {
+        new T6501502().run();
+    }
+
+    // The spec for java.io.File includes the following:
+    //      For a given abstract pathname f it is guaranteed that
+    //          new File( f.toURI()).equals( f.getAbsoluteFile())
+    // For JavaFileObject we test as follows:
+    //      new File( CONVERT_TO_FILEOBJECT(f).toURI()).equals( f.getAbsoluteFile())
+    // to verify that we get reasonable URIs returned from toURI.
+    // To make this a general test, and not just a Windows test,
+    // we test a number of platform-independent paths.
+    void run() throws Exception {
+        JavaCompiler c = ToolProvider.getSystemJavaCompiler();
+        fm = c.getStandardFileManager(null, null, null);
+        System.err.println(System.getProperties());
+        File tmpDir = new File(System.getProperty("java.io.tmpdir"));
+        File testSrcDir = new File(System.getProperty("test.src"));
+        File testClassesDir = new File(System.getProperty("test.classes"));
+        test(new File("abc.tmp"));
+        test(new File(tmpDir, "bad.file"));
+        test(new File(testSrcDir, "T6501501.java"));
+        test(new File(testClassesDir, "T6501501.class"));
+        test(new File("a b"));
+    }
+
+    void test(File f) throws Exception {
+        System.err.println("test " + f);
+        FileObject fo = fm.getJavaFileObjects(f).iterator().next();
+        URI uri = fo.toUri();
+        System.err.println("FileObject uri: " + uri);
+        if (!new File(uri).equals(f.getAbsoluteFile()))
+            throw new Exception("unexpected URI returned");
+    }
+
+    StandardJavaFileManager fm;
+}
+
diff --git a/langtools/test/tools/javac/api/T6877206.java b/langtools/test/tools/javac/api/T6877206.java
new file mode 100644
index 00000000000..56dbf74a818
--- /dev/null
+++ b/langtools/test/tools/javac/api/T6877206.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6877206
+ * @summary JavaFileObject.toUri returns bogus URI (win)
+ */
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.util.jar.*;
+import java.util.zip.*;
+import javax.tools.*;
+
+import com.sun.tools.javac.file.JavacFileManager;
+import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Options;
+
+// Test URIs returned from JavacFileManager and its support classes.
+// For a variety of file objects, verify the validity of FileObject.toUri()
+// by verifying the URI exists and points to the same contents as the file
+// object itself
+
+public class T6877206 {
+    public static void main(String... args) throws Exception {
+        new T6877206().run();
+    }
+
+    Set<String> foundClasses = new TreeSet<String>();
+    Set<String> foundJars = new TreeSet<String>();
+
+    void run() throws Exception {
+        File rt_jar = findRtJar();
+
+        // names for entries to be created in directories and jar files
+        String[] entries = { "p/A.class", "p/resources/A-1.jpg" };
+
+        // test various combinations of directories and jar files, intended to
+        // cover all sources of URIs within JavacFileManager's support classes
+
+        test(createFileManager(), createDir("dir", entries), "p", entries.length);
+        test(createFileManager(), createDir("a b/dir", entries), "p", entries.length);
+
+        for (boolean useJavaUtilZip: new boolean[] { false, true }) {
+            test(createFileManager(useJavaUtilZip), createJar("jar", entries), "p", entries.length);
+            test(createFileManager(useJavaUtilZip), createJar("jar jar", entries), "p", entries.length);
+
+            for (boolean useSymbolFile: new boolean[] { false, true }) {
+                test(createFileManager(useJavaUtilZip, useSymbolFile), rt_jar, "java.lang.ref", -1);
+            }
+        }
+
+        // Verify that we hit all the impl classes we intended
+        checkCoverage("classes", foundClasses,
+                "RegularFileObject", "SymbolFileObject", "ZipFileIndexFileObject", "ZipFileObject");
+
+        // Verify that we hit the jar files we intended, specifically ct.sym as well as rt.jar
+        checkCoverage("jar files", foundJars,
+                "ct.sym", "jar", "jar jar", "rt.jar");
+    }
+
+    // use a new file manager for each test
+    void test(StandardJavaFileManager fm, File f, String pkg, int expect) throws Exception {
+        JarURLConnection c;
+        System.err.println("Test " + f);
+        try {
+            fm.setLocation(StandardLocation.CLASS_PATH, Collections.singleton(f));
+
+            int count = 0;
+            for (JavaFileObject fo: fm.list(StandardLocation.CLASS_PATH,
+                    pkg, EnumSet.allOf(JavaFileObject.Kind.class), true)) {
+                System.err.println("checking " + fo);
+                // record the file object class name for coverage checks later
+                foundClasses.add(fo.getClass().getSimpleName());
+                testFileObject(fo);
+                count++;
+            }
+
+            if (expect > 0 && count != expect)
+                throw new Exception("wrong number of entries found: "
+                        + count + ", expected " + expect);
+        } finally {
+            fm.close();
+        }
+    }
+
+    void testFileObject(JavaFileObject fo) throws Exception {
+        // test the validity of the result of toUri() by using URLConnection
+        // and comparing the results of reading from the connection with the
+        // result of reading from the file object directly.
+        URI uri = fo.toUri();
+        System.err.println("uri: " + uri);
+
+        URLConnection urlconn = uri.toURL().openConnection();
+        if (urlconn instanceof JarURLConnection) {
+            JarURLConnection jarconn = (JarURLConnection) urlconn;
+            File f = new File(jarconn.getJarFile().getName());
+            // record access to the jar file for coverage checks later
+            foundJars.add(f.getName());
+        }
+
+        try {
+            byte[] uriData = read(urlconn.getInputStream());
+            byte[] foData = read(fo.openInputStream());
+            if (!Arrays.equals(uriData, foData)) {
+                if (uriData.length != foData.length)
+                    throw new Exception("data size differs: uri data "
+                            + uriData.length + " bytes, fo data " + foData.length+ " bytes");
+                for (int i = 0; i < uriData.length; i++) {
+                    if (uriData[i] != foData[i])
+                    throw new Exception("unexpected data returned at offset " + i
+                            + ", uri data " + uriData[i] + ", fo data " + foData[i]);
+                }
+                throw new AssertionError("cannot find difference");
+            }
+        } finally {
+            // In principle, simply closing the result of urlconn.getInputStream()
+            // should have been sufficient. But the internal JarURLConnection
+            // does not close the JarFile in an expeditious manner, thus preventing
+            // jtreg from deleting the jar file before starting the next test.
+            // Therefore we force access to the JarURLConnection to close the
+            // JarFile when necessary.
+            if (urlconn instanceof JarURLConnection) {
+                JarURLConnection jarconn = (JarURLConnection) urlconn;
+                jarconn.getJarFile().close();
+            }
+        }
+    }
+
+    void checkCoverage(String label, Set<String> found, String... expect) throws Exception {
+        Set<String> e = new TreeSet<String>(Arrays.asList(expect));
+        if (!found.equals(e)) {
+            e.removeAll(found);
+            throw new Exception("expected " + label + " not used: " + e);
+        }
+    }
+
+    JavacFileManager createFileManager() {
+        return createFileManager(false, false);
+    }
+
+    JavacFileManager createFileManager(boolean useJavaUtilZip) {
+        return createFileManager(useJavaUtilZip, false);
+    }
+
+    JavacFileManager createFileManager(boolean useJavaUtilZip, boolean useSymbolFile) {
+        // javac should really not be using system properties like this
+        // -- it should really be using (hidden) options -- but until then
+        // take care to leave system properties as we find them, so as not
+        // to adversely affect other tests that might follow.
+        String prev = System.getProperty("useJavaUtilZip");
+        boolean resetProperties = false;
+        try {
+            if (useJavaUtilZip) {
+                System.setProperty("useJavaUtilZip", "true");
+                resetProperties = true;
+            } else if (System.getProperty("useJavaUtilZip") != null) {
+                System.getProperties().remove("useJavaUtilZip");
+                resetProperties = true;
+            }
+
+            Context c = new Context();
+            if (!useSymbolFile) {
+                Options options = Options.instance(c);
+                options.put("ignore.symbol.file", "true");
+            }
+
+            return new JavacFileManager(c, false, null);
+        } finally {
+            if (resetProperties) {
+                if (prev == null) {
+                    System.getProperties().remove("useJavaUtilZip");
+                } else {
+                    System.setProperty("useJavaUtilZip", prev);
+                }
+            }
+        }
+    }
+
+    File createDir(String name, String... entries) throws Exception {
+        File dir = new File(name);
+        if (!dir.mkdirs())
+            throw new Exception("cannot create directories " + dir);
+        for (String e: entries) {
+            writeFile(new File(dir, e), e);
+        }
+        return dir;
+    }
+
+    File createJar(String name, String... entries) throws IOException {
+        File jar = new File(name);
+        OutputStream out = new FileOutputStream(jar);
+        try {
+            JarOutputStream jos = new JarOutputStream(out);
+            for (String e: entries) {
+                jos.putNextEntry(new ZipEntry(e));
+                jos.write(e.getBytes());
+            }
+            jos.close();
+        } finally {
+            out.close();
+        }
+        return jar;
+    }
+
+    File findRtJar() throws Exception {
+        File java_home = new File(System.getProperty("java.home"));
+        if (java_home.getName().equals("jre"))
+            java_home = java_home.getParentFile();
+        File rt_jar = new File(new File(new File(java_home, "jre"), "lib"), "rt.jar");
+        if (!rt_jar.exists())
+            throw new Exception("can't find rt.jar");
+        return rt_jar;
+    }
+
+    byte[] read(InputStream in) throws IOException {
+        byte[] data = new byte[1024];
+        int offset = 0;
+        try {
+            int n;
+            while ((n = in.read(data, offset, data.length - offset)) != -1) {
+                offset += n;
+                if (offset == data.length)
+                    data = Arrays.copyOf(data, 2 * data.length);
+            }
+        } finally {
+            in.close();
+        }
+        return Arrays.copyOf(data, offset);
+    }
+
+    void writeFile(File f, String s) throws IOException {
+        f.getParentFile().mkdirs();
+        FileWriter out = new FileWriter(f);
+        try {
+            out.write(s);
+        } finally {
+            out.close();
+        }
+    }
+}
diff --git a/langtools/test/tools/javac/cast/6467183/T6467183a.java b/langtools/test/tools/javac/cast/6467183/T6467183a.java
index 04bc4634ce5..6999f49b8c2 100644
--- a/langtools/test/tools/javac/cast/6467183/T6467183a.java
+++ b/langtools/test/tools/javac/cast/6467183/T6467183a.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author mcimadamore
  * @bug     6467183
  * @summary
diff --git a/langtools/test/tools/javac/cast/6467183/T6467183a.out b/langtools/test/tools/javac/cast/6467183/T6467183a.out
index 5df842cc72a..972d54de989 100644
--- a/langtools/test/tools/javac/cast/6467183/T6467183a.out
+++ b/langtools/test/tools/javac/cast/6467183/T6467183a.out
@@ -1,6 +1,6 @@
-T6467183a.java:39:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
-T6467183a.java:47:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Number>
-T6467183a.java:51:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Integer>
+T6467183a.java:16:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
+T6467183a.java:24:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Number>
+T6467183a.java:28:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Integer>
 - compiler.err.warnings.and.werror
 1 error
 3 warnings
diff --git a/langtools/test/tools/javac/cast/6557182/T6557182.java b/langtools/test/tools/javac/cast/6557182/T6557182.java
index 56bbe702f5e..96d58d2620b 100644
--- a/langtools/test/tools/javac/cast/6557182/T6557182.java
+++ b/langtools/test/tools/javac/cast/6557182/T6557182.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author Maurizio Cimadamore
  * @bug     6557182
  * @summary  Unchecked warning *and* inconvertible types
diff --git a/langtools/test/tools/javac/cast/6557182/T6557182.out b/langtools/test/tools/javac/cast/6557182/T6557182.out
index 5f25497ace2..05c8b5571b0 100644
--- a/langtools/test/tools/javac/cast/6557182/T6557182.out
+++ b/langtools/test/tools/javac/cast/6557182/T6557182.out
@@ -1,4 +1,4 @@
-T6557182.java:35:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
-T6557182.java:39:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
+T6557182.java:12:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
+T6557182.java:16:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
 1 error
 1 warning
diff --git a/langtools/test/tools/javac/cast/6665356/T6665356.java b/langtools/test/tools/javac/cast/6665356/T6665356.java
index 92b93d2c5bf..0d1f29871c0 100644
--- a/langtools/test/tools/javac/cast/6665356/T6665356.java
+++ b/langtools/test/tools/javac/cast/6665356/T6665356.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008-2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author Maurizio Cimadamore
  * @bug     6665356
  * @summary Cast not allowed when both qualifying type and inner class are parameterized
@@ -77,4 +54,4 @@ class T6665356 {
     void cast11(Outer<Integer>.Inner<Long> p) {
         Object o = (Outer<Integer>.Inner<? super String>)p;
     }
-}
\ No newline at end of file
+}
diff --git a/langtools/test/tools/javac/cast/6665356/T6665356.out b/langtools/test/tools/javac/cast/6665356/T6665356.out
index 1db10c64ca4..2c4ca37d41a 100644
--- a/langtools/test/tools/javac/cast/6665356/T6665356.out
+++ b/langtools/test/tools/javac/cast/6665356/T6665356.out
@@ -1,8 +1,8 @@
-T6665356.java:54:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
-T6665356.java:58:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
-T6665356.java:62:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
-T6665356.java:66:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
-T6665356.java:70:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
-T6665356.java:74:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
-T6665356.java:78:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
-7 errors
\ No newline at end of file
+T6665356.java:31:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
+T6665356.java:35:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
+T6665356.java:39:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
+T6665356.java:43:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
+T6665356.java:47:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
+T6665356.java:51:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
+T6665356.java:55:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
+7 errors
diff --git a/langtools/test/tools/javac/cast/6795580/T6795580.java b/langtools/test/tools/javac/cast/6795580/T6795580.java
index 9539e32e0df..b8b6deb9af5 100644
--- a/langtools/test/tools/javac/cast/6795580/T6795580.java
+++ b/langtools/test/tools/javac/cast/6795580/T6795580.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author Maurizio Cimadamore
  * @bug     6795580
  * @summary parser confused by square brackets in qualified generic cast
@@ -77,4 +54,4 @@ class T6795580 {
     void cast11(Outer<Integer>.Inner<Long>[] p) {
         Object o = (Outer<Integer>.Inner<? super String>[])p;
     }
-}
\ No newline at end of file
+}
diff --git a/langtools/test/tools/javac/cast/6795580/T6795580.out b/langtools/test/tools/javac/cast/6795580/T6795580.out
index a5d70401650..a96517cb98b 100644
--- a/langtools/test/tools/javac/cast/6795580/T6795580.out
+++ b/langtools/test/tools/javac/cast/6795580/T6795580.out
@@ -1,8 +1,8 @@
-T6795580.java:54:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
-T6795580.java:58:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
-T6795580.java:62:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
-T6795580.java:66:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
-T6795580.java:70:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
-T6795580.java:74:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
-T6795580.java:78:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
+T6795580.java:31:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
+T6795580.java:35:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
+T6795580.java:39:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
+T6795580.java:43:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
+T6795580.java:47:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
+T6795580.java:51:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
+T6795580.java:55:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
 7 errors
diff --git a/langtools/test/tools/javac/code/ArrayClone.java b/langtools/test/tools/javac/code/ArrayClone.java
index ce1126bcf14..e0e5a57b2d5 100644
--- a/langtools/test/tools/javac/code/ArrayClone.java
+++ b/langtools/test/tools/javac/code/ArrayClone.java
@@ -47,8 +47,8 @@ public class ArrayClone {
         String out = sw.toString();
         System.out.println(out);
 
-        for (String line: out.split("\n")) {
-            String match = "[ \t]+[0-9]+:[ \t]+invokevirtual[ \t]+#[0-9]+; //Method \"\\[Ljava/lang/String;\".clone:\\(\\)Ljava/lang/Object;";
+        for (String line: out.split("(\\n|\\r\\n?)")) {
+            String match = "[ \t]+[0-9]+:[ \t]+invokevirtual[ \t]+#[0-9]+[ \t]+// Method \"\\[Ljava/lang/String;\".clone:\\(\\)Ljava/lang/Object;";
             if (line.matches(match))
                 return;
         }
diff --git a/langtools/test/tools/javac/constDebug/ConstDebug.sh b/langtools/test/tools/javac/constDebug/ConstDebug.sh
index f34d4921e8f..cc987b42ea2 100644
--- a/langtools/test/tools/javac/constDebug/ConstDebug.sh
+++ b/langtools/test/tools/javac/constDebug/ConstDebug.sh
@@ -48,12 +48,14 @@ echo "CLASSPATH=${CLASSPATH}"
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=";" # Platform PS, not Cygwin PS
+    FS="/"
+    ;;
   Windows* )
-    NULL=NUL
     PS=";"
     FS="\\"
     ;;
@@ -69,7 +71,7 @@ cp "${TESTSRC}${FS}$1.java" .
 "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -g -d . -classpath .${PS}${TESTSRC} $1.java 2> ${TMP1}
 result=$?
 if [ $result -ne 0 ]; then exit $result; fi
-if strings $1.class | grep clinit; then
+if "${TESTJAVA}${FS}bin${FS}javap" $1.class | grep clinit; then
   echo "Failed"
   exit 1;
 else
diff --git a/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh b/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh
index d64b5208a3d..48dbabb049c 100644
--- a/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh
+++ b/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh
@@ -49,13 +49,13 @@ echo
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    FS="/"
+    DIFFOPTS="--strip-trailing-cr"
+    ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
     ;;
   * )
@@ -98,7 +98,7 @@ fi
 
 # expected message
 cat "${TMP1}"
-diff -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}"
+diff ${DIFFOPTS} -c "${TESTSRC}${FS}NoJavaLang.out" "${TMP1}"
 result=$?
 rm "${TMP1}"
 
diff --git a/langtools/test/tools/javac/generics/5009937/T5009937.java b/langtools/test/tools/javac/generics/5009937/T5009937.java
index 0e3d33297d0..869de5b545d 100644
--- a/langtools/test/tools/javac/generics/5009937/T5009937.java
+++ b/langtools/test/tools/javac/generics/5009937/T5009937.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 5009937
  * @summary hiding versus generics versus binary compatibility
  * @author Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/generics/5009937/T5009937.out b/langtools/test/tools/javac/generics/5009937/T5009937.out
index 0362b2dff96..31982e9aa45 100644
--- a/langtools/test/tools/javac/generics/5009937/T5009937.out
+++ b/langtools/test/tools/javac/generics/5009937/T5009937.out
@@ -1,2 +1,2 @@
-T5009937.java:39:21: compiler.err.name.clash.same.erasure.no.override: m(T5009937<java.lang.Integer>), T5009937.B, m(T5009937<java.lang.String>), T5009937.A
+T5009937.java:16:21: compiler.err.name.clash.same.erasure.no.override: m(T5009937<java.lang.Integer>), T5009937.B, m(T5009937<java.lang.String>), T5009937.A
 1 error
diff --git a/langtools/test/tools/javac/generics/6182950/T6182950a.java b/langtools/test/tools/javac/generics/6182950/T6182950a.java
index 82fb49ec734..186b0f49bc8 100644
--- a/langtools/test/tools/javac/generics/6182950/T6182950a.java
+++ b/langtools/test/tools/javac/generics/6182950/T6182950a.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6182950
  * @summary methods clash algorithm should not depend on return type
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/generics/6182950/T6182950a.out b/langtools/test/tools/javac/generics/6182950/T6182950a.out
index 6c0f5cb2916..4be197ea0c7 100644
--- a/langtools/test/tools/javac/generics/6182950/T6182950a.out
+++ b/langtools/test/tools/javac/generics/6182950/T6182950a.out
@@ -1,2 +1,2 @@
-T6182950a.java:35:12: compiler.err.name.clash.same.erasure: m(java.util.List<java.lang.Integer>), m(java.util.List<java.lang.String>)
+T6182950a.java:12:12: compiler.err.name.clash.same.erasure: m(java.util.List<java.lang.Integer>), m(java.util.List<java.lang.String>)
 1 error
diff --git a/langtools/test/tools/javac/generics/6182950/T6182950b.java b/langtools/test/tools/javac/generics/6182950/T6182950b.java
index b3120dcc03f..3a6fddf2377 100644
--- a/langtools/test/tools/javac/generics/6182950/T6182950b.java
+++ b/langtools/test/tools/javac/generics/6182950/T6182950b.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6182950
  * @summary methods clash algorithm should not depend on return type
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/generics/6182950/T6182950b.out b/langtools/test/tools/javac/generics/6182950/T6182950b.out
index d9dcb48f1fa..6771ad3550b 100644
--- a/langtools/test/tools/javac/generics/6182950/T6182950b.out
+++ b/langtools/test/tools/javac/generics/6182950/T6182950b.out
@@ -1,2 +1,2 @@
-T6182950b.java:38:16: compiler.err.name.clash.same.erasure.no.override: m(java.util.List<java.lang.Integer>), T6182950b.B, m(java.util.List<java.lang.String>), T6182950b.A
+T6182950b.java:15:16: compiler.err.name.clash.same.erasure.no.override: m(java.util.List<java.lang.Integer>), T6182950b.B, m(java.util.List<java.lang.String>), T6182950b.A
 1 error
diff --git a/langtools/test/tools/javac/generics/6677785/T6677785.java b/langtools/test/tools/javac/generics/6677785/T6677785.java
index d744580cc50..676f8dd2d91 100644
--- a/langtools/test/tools/javac/generics/6677785/T6677785.java
+++ b/langtools/test/tools/javac/generics/6677785/T6677785.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6677785
  * @summary REGRESSION: StackOverFlowError with Cyclic Class level Type Parameters when used in constructors
  * @author Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/generics/6677785/T6677785.out b/langtools/test/tools/javac/generics/6677785/T6677785.out
index e9873573f2c..2d8feda3cf8 100644
--- a/langtools/test/tools/javac/generics/6677785/T6677785.out
+++ b/langtools/test/tools/javac/generics/6677785/T6677785.out
@@ -1,2 +1,2 @@
-T6677785.java:31:23: compiler.err.cyclic.inheritance: E
+T6677785.java:8:23: compiler.err.cyclic.inheritance: E
 1 error
diff --git a/langtools/test/tools/javac/generics/6711619/T6711619a.java b/langtools/test/tools/javac/generics/6711619/T6711619a.java
index 98749d10ceb..7a8dc4907ee 100644
--- a/langtools/test/tools/javac/generics/6711619/T6711619a.java
+++ b/langtools/test/tools/javac/generics/6711619/T6711619a.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6711619
  *
  * @summary javac doesn't allow access to protected members in intersection types
@@ -71,4 +48,4 @@ class T6711619a {
         ta = arg.w.a;
         tb = arg.w.b;
     }
-}
\ No newline at end of file
+}
diff --git a/langtools/test/tools/javac/generics/6711619/T6711619a.out b/langtools/test/tools/javac/generics/6711619/T6711619a.out
index 0dfa28ec74b..7b0a8ebadef 100644
--- a/langtools/test/tools/javac/generics/6711619/T6711619a.out
+++ b/langtools/test/tools/javac/generics/6711619/T6711619a.out
@@ -1,7 +1,7 @@
-T6711619a.java:63:14: compiler.err.cant.resolve.args: kindname.method, a, , 
-T6711619a.java:64:14: compiler.err.cant.resolve.args: kindname.method, b, , 
-T6711619a.java:69:19: compiler.err.report.access: a, private, T6711619a.A
-T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B
-T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A
-T6711619a.java:72:19: compiler.err.report.access: b, private, T6711619a.B
+T6711619a.java:40:14: compiler.err.cant.resolve.args: kindname.method, a, , 
+T6711619a.java:41:14: compiler.err.cant.resolve.args: kindname.method, b, , 
+T6711619a.java:46:19: compiler.err.report.access: a, private, T6711619a.A
+T6711619a.java:47:19: compiler.err.report.access: b, private, T6711619a.B
+T6711619a.java:48:19: compiler.err.report.access: a, private, T6711619a.A
+T6711619a.java:49:19: compiler.err.report.access: b, private, T6711619a.B
 6 errors
diff --git a/langtools/test/tools/javac/generics/6711619/T6711619b.java b/langtools/test/tools/javac/generics/6711619/T6711619b.java
index 16dd2ad1669..a044436394c 100644
--- a/langtools/test/tools/javac/generics/6711619/T6711619b.java
+++ b/langtools/test/tools/javac/generics/6711619/T6711619b.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6711619
  *
  * @summary javac doesn't allow access to protected members in intersection types
@@ -61,4 +38,4 @@ class T6711619b {
              return E.i;
          }
     }
-}
\ No newline at end of file
+}
diff --git a/langtools/test/tools/javac/generics/6711619/T6711619b.out b/langtools/test/tools/javac/generics/6711619/T6711619b.out
index f1b87f3b631..79c16c3c4af 100644
--- a/langtools/test/tools/javac/generics/6711619/T6711619b.out
+++ b/langtools/test/tools/javac/generics/6711619/T6711619b.out
@@ -1,5 +1,5 @@
-T6711619b.java:39:22: compiler.err.report.access: i, private, T6711619b.X1
-T6711619b.java:46:22: compiler.err.report.access: i, private, T6711619b.X2
-T6711619b.java:54:22: compiler.err.report.access: i, private, T6711619b.X3
-T6711619b.java:61:22: compiler.err.report.access: i, private, T6711619b.X4
+T6711619b.java:16:22: compiler.err.report.access: i, private, T6711619b.X1
+T6711619b.java:23:22: compiler.err.report.access: i, private, T6711619b.X2
+T6711619b.java:31:22: compiler.err.report.access: i, private, T6711619b.X3
+T6711619b.java:38:22: compiler.err.report.access: i, private, T6711619b.X4
 4 errors
diff --git a/langtools/test/tools/javac/generics/6723444/T6723444.java b/langtools/test/tools/javac/generics/6723444/T6723444.java
index 1edc6e593a4..4869c12cf14 100644
--- a/langtools/test/tools/javac/generics/6723444/T6723444.java
+++ b/langtools/test/tools/javac/generics/6723444/T6723444.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008-2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6723444
  *
  * @summary javac fails to substitute type variables into a constructor's throws clause
diff --git a/langtools/test/tools/javac/generics/6723444/T6723444.out b/langtools/test/tools/javac/generics/6723444/T6723444.out
index 3680a217237..add948568de 100644
--- a/langtools/test/tools/javac/generics/6723444/T6723444.out
+++ b/langtools/test/tools/javac/generics/6723444/T6723444.out
@@ -1,13 +1,13 @@
-T6723444.java:65:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
-T6723444.java:66:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
-T6723444.java:68:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:69:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:71:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:72:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:73:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:74:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:75:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:76:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:77:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-T6723444.java:78:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
-12 errors
\ No newline at end of file
+T6723444.java:42:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:43:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:45:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:46:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:48:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:49:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:50:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:51:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:52:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:53:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:54:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:55:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+12 errors
diff --git a/langtools/test/tools/javac/generics/T6869075.java b/langtools/test/tools/javac/generics/T6869075.java
new file mode 100644
index 00000000000..1b745acc8ff
--- /dev/null
+++ b/langtools/test/tools/javac/generics/T6869075.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6869075
+ * @summary regression: javac crashes when compiling compound string assignment with generics
+ * @author mcimadamore
+ */
+
+public class T6869075 {
+
+    static class Foo<X> {
+        X x;
+        Foo (X x) {
+            this.x = x;
+        }
+    }
+
+    static void test1(Foo<String> foo) {
+        String start = foo.x;
+        equals(foo.x += "foo", start + "foo");
+    }
+
+    static void test2(Foo<String> foo) {
+        String start = foo.x;
+        equals((foo.x += "foo"), (start + "foo"));
+    }
+
+    static void test3(Foo<String> foo) {
+        String start = foo.x;
+        equals(((foo.x += "foo")), ((start + "foo")));
+    }
+
+    public static void main(String[] args) {
+        test1(new Foo<String>("Hello!"));
+        test2(new Foo<String>("Hello!"));
+        test3(new Foo<String>("Hello!"));
+    }
+
+    static void equals(String found, String req) {
+        if (!found.equals(req)) {
+            throw new AssertionError("Error (expected: "+ req +
+                                     " - found: " + found + ")");
+        }
+    }
+}
\ No newline at end of file
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg01.java b/langtools/test/tools/javac/generics/diamond/neg/Neg01.java
new file mode 100644
index 00000000000..8b23e491391
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg01.java
@@ -0,0 +1,38 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile/fail/ref=Neg01.out Neg01.java -source 1.7 -XDrawDiagnostics
+ *
+ */
+
+class Neg01<X extends Number> {
+
+    Neg01(X x) {}
+
+    <Z> Neg01(X x, Z z) {}
+
+    void test() {
+        Neg01<String> n1 = new Neg01<>(""); //new Foo<Integer> created
+        Neg01<? extends String> n2 = new Neg01<>(""); //new Foo<Integer> created
+        Neg01<?> n3 = new Neg01<>(""); //new Foo<Object> created
+        Neg01<? super String> n4 = new Neg01<>(""); //new Foo<Object> created
+
+        Neg01<String> n5 = new Neg01<>(""){}; //new Foo<Integer> created
+        Neg01<? extends String> n6 = new Neg01<>(""){}; //new Foo<Integer> created
+        Neg01<?> n7 = new Neg01<>(""){}; //new Foo<Object> created
+        Neg01<? super String> n8 = new Neg01<>(""){}; //new Foo<Object> created
+
+        Neg01<String> n9 = new Neg01<>("", ""); //new Foo<Integer> created
+        Neg01<? extends String> n10 = new Neg01<>("", ""); //new Foo<Integer> created
+        Neg01<?> n11 = new Neg01<>("", ""); //new Foo<Object> created
+        Foo<? super String> n12 = new Neg01<>("", ""); //new Foo<Object> created
+
+        Neg01<String> n13 = new Neg01<>("", ""){}; //new Foo<Integer> created
+        Neg01<? extends String> n14 = new Neg01<>("", ""){}; //new Foo<Integer> created
+        Neg01<?> n15 = new Neg01<>("", ""){}; //new Foo<Object> created
+        Neg01<? super String> n16 = new Neg01<>("", ""){}; //new Foo<Object> created
+    }
+}
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg01.out b/langtools/test/tools/javac/generics/diamond/neg/Neg01.out
new file mode 100644
index 00000000000..f3beaa20181
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg01.out
@@ -0,0 +1,31 @@
+Neg01.java:18:15: compiler.err.not.within.bounds: java.lang.String
+Neg01.java:18:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
+Neg01.java:19:25: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg01.java:19:47: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg01.java:20:23: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String, kindname.class, Neg01<java.lang.Number>
+Neg01.java:21:23: compiler.err.not.within.bounds: ? super java.lang.String
+Neg01.java:21:45: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<? super java.lang.String>)
+Neg01.java:23:15: compiler.err.not.within.bounds: java.lang.String
+Neg01.java:23:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
+Neg01.java:24:25: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg01.java:24:47: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg01.java:25:23: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String, kindname.class, Neg01<java.lang.Number>
+Neg01.java:25:38: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , , kindname.class, Neg01<java.lang.Number>
+Neg01.java:26:23: compiler.err.not.within.bounds: ? super java.lang.String
+Neg01.java:26:45: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<? super java.lang.String>)
+Neg01.java:28:15: compiler.err.not.within.bounds: java.lang.String
+Neg01.java:28:37: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
+Neg01.java:29:25: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg01.java:29:48: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg01.java:30:24: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String,java.lang.String, kindname.class, Neg01<java.lang.Number>
+Neg01.java:31:9: compiler.err.cant.resolve.location: kindname.class, Foo, , , kindname.class, Neg01<X>
+Neg01.java:31:35: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String,java.lang.String, kindname.class, Neg01<java.lang.Number>
+Neg01.java:33:15: compiler.err.not.within.bounds: java.lang.String
+Neg01.java:33:38: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<java.lang.String>)
+Neg01.java:34:25: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg01.java:34:48: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg01.java:35:24: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , java.lang.String,java.lang.String, kindname.class, Neg01<java.lang.Number>
+Neg01.java:35:43: compiler.err.cant.resolve.location.args: kindname.constructor, Neg01, , , kindname.class, Neg01<java.lang.Number>
+Neg01.java:36:23: compiler.err.not.within.bounds: ? super java.lang.String
+Neg01.java:36:46: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg01<X>, Neg01<? super java.lang.String>)
+30 errors
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg02.java b/langtools/test/tools/javac/generics/diamond/neg/Neg02.java
new file mode 100644
index 00000000000..b732ce12164
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg02.java
@@ -0,0 +1,61 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile/fail/ref=Neg02.out Neg02.java -source 1.7 -XDrawDiagnostics
+ *
+ */
+
+class Neg02 {
+
+    static class Foo<X extends Number> {
+        Foo(X x) {}
+        <Z> Foo(X x, Z z) {}
+    }
+
+    void testSimple() {
+        Foo<String> f1 = new Foo<>(""); //new Foo<Integer> created
+        Foo<? extends String> f2 = new Foo<>(""); //new Foo<Integer> created
+        Foo<?> f3 = new Foo<>(""); //new Foo<Object> created
+        Foo<? super String> f4 = new Foo<>(""); //new Foo<Object> created
+
+        Foo<String> f5 = new Foo<>(""){}; //new Foo<Integer> created
+        Foo<? extends String> f6 = new Foo<>(""){}; //new Foo<Integer> created
+        Foo<?> f7 = new Foo<>(""){}; //new Foo<Object> created
+        Foo<? super String> f8 = new Foo<>(""){}; //new Foo<Object> created
+
+        Foo<String> f9 = new Foo<>("", ""); //new Foo<Integer> created
+        Foo<? extends String> f10 = new Foo<>("", ""); //new Foo<Integer> created
+        Foo<?> f11 = new Foo<>("", ""); //new Foo<Object> created
+        Foo<? super String> f12 = new Foo<>("", ""); //new Foo<Object> created
+
+        Foo<String> f13 = new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<? extends String> f14 = new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<?> f15 = new Foo<>("", ""){}; //new Foo<Object> created
+        Foo<? super String> f16 = new Foo<>("", ""){}; //new Foo<Object> created
+    }
+
+    void testQualified() {
+        Foo<String> f1 = new Neg02.Foo<>(""); //new Foo<Integer> created
+        Foo<? extends String> f2 = new Neg02.Foo<>(""); //new Foo<Integer> created
+        Foo<?> f3 = new Neg02.Foo<>(""); //new Foo<Object> created
+        Foo<? super String> f4 = new Neg02.Foo<>(""); //new Foo<Object> created
+
+        Foo<String> f5 = new Neg02.Foo<>(""){}; //new Foo<Integer> created
+        Foo<? extends String> f6 = new Neg02.Foo<>(""){}; //new Foo<Integer> created
+        Foo<?> f7 = new Neg02.Foo<>(""){}; //new Foo<Object> created
+        Foo<? super String> f8 = new Neg02.Foo<>(""){}; //new Foo<Object> created
+
+        Foo<String> f9 = new Neg02.Foo<>("", ""); //new Foo<Integer> created
+        Foo<? extends String> f10 = new Neg02.Foo<>("", ""); //new Foo<Integer> created
+        Foo<?> f11 = new Neg02.Foo<>("", ""); //new Foo<Object> created
+        Foo<? super String> f12 = new Neg02.Foo<>("", ""); //new Foo<Object> created
+
+        Foo<String> f13 = new Neg02.Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<? extends String> f14 = new Neg02.Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<?> f15 = new Neg02.Foo<>("", ""){}; //new Foo<Object> created
+        Foo<? super String> f16 = new Neg02.Foo<>("", ""){}; //new Foo<Object> created
+    }
+}
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg02.out b/langtools/test/tools/javac/generics/diamond/neg/Neg02.out
new file mode 100644
index 00000000000..9dc68ad86e0
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg02.out
@@ -0,0 +1,61 @@
+Neg02.java:19:13: compiler.err.not.within.bounds: java.lang.String
+Neg02.java:19:33: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
+Neg02.java:20:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg02.java:20:43: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg02.java:21:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:22:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg02.java:22:41: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
+Neg02.java:24:13: compiler.err.not.within.bounds: java.lang.String
+Neg02.java:24:33: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
+Neg02.java:25:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg02.java:25:43: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg02.java:26:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:26:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:27:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg02.java:27:41: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
+Neg02.java:29:13: compiler.err.not.within.bounds: java.lang.String
+Neg02.java:29:33: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
+Neg02.java:30:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg02.java:30:44: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg02.java:31:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:32:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg02.java:32:42: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
+Neg02.java:34:13: compiler.err.not.within.bounds: java.lang.String
+Neg02.java:34:34: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
+Neg02.java:35:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg02.java:35:44: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg02.java:36:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:36:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:37:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg02.java:37:42: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
+Neg02.java:41:13: compiler.err.not.within.bounds: java.lang.String
+Neg02.java:41:39: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
+Neg02.java:42:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg02.java:42:49: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg02.java:43:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:44:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg02.java:44:47: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
+Neg02.java:46:13: compiler.err.not.within.bounds: java.lang.String
+Neg02.java:46:39: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
+Neg02.java:47:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg02.java:47:49: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg02.java:48:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:48:40: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:49:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg02.java:49:47: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
+Neg02.java:51:13: compiler.err.not.within.bounds: java.lang.String
+Neg02.java:51:39: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
+Neg02.java:52:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg02.java:52:50: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg02.java:53:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:54:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg02.java:54:48: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
+Neg02.java:56:13: compiler.err.not.within.bounds: java.lang.String
+Neg02.java:56:40: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<java.lang.String>)
+Neg02.java:57:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg02.java:57:50: compiler.err.cant.apply.diamond: X, (compiler.misc.no.unique.maximal.instance.exists: X, java.lang.String,java.lang.Number)
+Neg02.java:58:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:58:45: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg02.Foo<java.lang.Number>
+Neg02.java:59:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg02.java:59:48: compiler.err.cant.apply.diamond: X, (compiler.misc.no.conforming.instance.exists: X, Neg02.Foo<X>, Neg02.Foo<? super java.lang.String>)
+60 errors
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg03.java b/langtools/test/tools/javac/generics/diamond/neg/Neg03.java
new file mode 100644
index 00000000000..0e594b80a04
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg03.java
@@ -0,0 +1,83 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile/fail/ref=Neg03.out Neg03.java -source 1.7 -XDrawDiagnostics
+ *
+ */
+
+class Neg03<U> {
+
+    class Foo<V extends Number> {
+        Foo(V x) {}
+        <Z> Foo(V x, Z z) {}
+    }
+
+    void testSimple() {
+        Foo<String> f1 = new Foo<>(""); //new Foo<Integer> created
+        Foo<? extends String> f2 = new Foo<>(""); //new Foo<Integer> created
+        Foo<?> f3 = new Foo<>(""); //new Foo<Object> created
+        Foo<? super String> f4 = new Foo<>(""); //new Foo<Object> created
+
+        Foo<String> f5 = new Foo<>(""){}; //new Foo<Integer> created
+        Foo<? extends String> f6 = new Foo<>(""){}; //new Foo<Integer> created
+        Foo<?> f7 = new Foo<>(""){}; //new Foo<Object> created
+        Foo<? super String> f8 = new Foo<>(""){}; //new Foo<Object> created
+
+        Foo<String> f9 = new Foo<>("", ""); //new Foo<Integer> created
+        Foo<? extends String> f10 = new Foo<>("", ""); //new Foo<Integer> created
+        Foo<?> f11 = new Foo<>("", ""); //new Foo<Object> created
+        Foo<? super String> f12 = new Foo<>("", ""); //new Foo<Object> created
+
+        Foo<String> f13 = new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<? extends String> f14 = new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<?> f15 = new Foo<>("", ""){}; //new Foo<Object> created
+        Foo<? super String> f16 = new Foo<>("", ""){}; //new Foo<Object> created
+    }
+
+    void testQualified_1() {
+        Foo<String> f1 = new Neg03<U>.Foo<>(""); //new Foo<Integer> created
+        Foo<? extends String> f2 = new Neg03<U>.Foo<>(""); //new Foo<Integer> created
+        Foo<?> f3 = new Neg03<U>.Foo<>(""); //new Foo<Object> created
+        Foo<? super String> f4 = new Neg03<U>.Foo<>(""); //new Foo<Object> created
+
+        Foo<String> f5 = new Neg03<U>.Foo<>(""){}; //new Foo<Integer> created
+        Foo<? extends String> f6 = new Neg03<U>.Foo<>(""){}; //new Foo<Integer> created
+        Foo<?> f7 = new Neg03<U>.Foo<>(""){}; //new Foo<Object> created
+        Foo<? super String> f8 = new Neg03<U>.Foo<>(""){}; //new Foo<Object> created
+
+        Foo<String> f9 = new Neg03<U>.Foo<>("", ""); //new Foo<Integer> created
+        Foo<? extends String> f10 = new Neg03<U>.Foo<>("", ""); //new Foo<Integer> created
+        Foo<?> f11 = new Neg03<U>.Foo<>("", ""); //new Foo<Object> created
+        Foo<? super String> f12 = new Neg03<U>.Foo<>("", ""); //new Foo<Object> created
+
+        Foo<String> f13 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<? extends String> f14 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<?> f15 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Object> created
+        Foo<? super String> f16 = new Neg03<U>.Foo<>("", ""){}; //new Foo<Object> created
+    }
+
+    void testQualified_2(Neg03<U> n) {
+        Foo<String> f1 = n.new Foo<>(""); //new Foo<Integer> created
+        Foo<? extends String> f2 = n.new Foo<>(""); //new Foo<Integer> created
+        Foo<?> f3 = n.new Foo<>(""); //new Foo<Integer> created
+        Foo<? super String> f4 = n.new Foo<>(""); //new Foo<Integer> created
+
+        Foo<String> f5 = n.new Foo<>(""){}; //new Foo<Integer> created
+        Foo<? extends String> f6 = n.new Foo<>(""){}; //new Foo<Integer> created
+        Foo<?> f7 = n.new Foo<>(""){}; //new Foo<Integer> created
+        Foo<? super String> f8 = n.new Foo<>(""){}; //new Foo<Integer> created
+
+        Foo<String> f9 = n.new Foo<>("", ""); //new Foo<Integer> created
+        Foo<? extends String> f10 = n.new Foo<>("", ""); //new Foo<Integer> created
+        Foo<?> f11 = n.new Foo<>("", ""); //new Foo<Integer> created
+        Foo<? super String> f12 = n.new Foo<>("", ""); //new Foo<Integer> created
+
+        Foo<String> f13 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<? extends String> f14 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<?> f15 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<? super String> f16 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+    }
+}
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg03.out b/langtools/test/tools/javac/generics/diamond/neg/Neg03.out
new file mode 100644
index 00000000000..bf30c712d1f
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg03.out
@@ -0,0 +1,91 @@
+Neg03.java:19:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:19:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:20:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:20:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:21:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:22:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:22:41: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:24:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:24:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:25:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:25:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:26:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:26:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:27:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:27:41: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:29:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:29:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:30:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:30:44: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:31:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:32:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:32:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:34:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:34:34: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:35:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:35:44: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:36:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:36:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:37:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:37:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:41:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:41:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:42:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:42:52: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:43:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:44:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:44:50: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:46:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:46:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:47:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:47:52: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:48:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:48:43: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:49:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:49:50: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:51:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:51:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:52:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:52:53: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:53:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:54:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:54:51: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:56:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:56:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:57:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:57:53: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:58:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:58:48: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:59:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:59:51: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:63:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:63:28: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:64:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:64:38: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:65:23: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:66:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:66:36: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:68:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:68:28: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:69:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:69:38: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:70:23: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:70:36: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:71:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:71:36: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:73:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:73:28: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:74:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:74:39: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:75:24: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:76:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:76:37: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+Neg03.java:78:13: compiler.err.not.within.bounds: java.lang.String
+Neg03.java:78:29: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<java.lang.String>)
+Neg03.java:79:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg03.java:79:39: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg03.java:80:24: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:80:41: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Neg03<U>.Foo<java.lang.Number>
+Neg03.java:81:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg03.java:81:37: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Neg03<U>.Foo<V>, Neg03<U>.Foo<? super java.lang.String>)
+90 errors
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg04.java b/langtools/test/tools/javac/generics/diamond/neg/Neg04.java
new file mode 100644
index 00000000000..d04d93059ce
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg04.java
@@ -0,0 +1,38 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile/fail/ref=Neg04.out Neg04.java -source 1.7 -XDrawDiagnostics
+ *
+ */
+
+class Neg04 {
+
+    void test() {
+        class Foo<V extends Number> {
+            Foo(V x) {}
+            <Z> Foo(V x, Z z) {}
+        }
+        Foo<String> n1 = new Foo<>(""); //new Foo<Integer> created
+        Foo<? extends String> n2 = new Foo<>(""); //new Foo<Integer> created
+        Foo<?> n3 = new Foo<>(""); //new Foo<Object> created
+        Foo<? super String> n4 = new Foo<>(""); //new Foo<Object> created
+
+        Foo<String> n5 = new Foo<>(""){}; //new Foo<Integer> created
+        Foo<? extends String> n6 = new Foo<>(""){}; //new Foo<Integer> created
+        Foo<?> n7 = new Foo<>(""){}; //new Foo<Object> created
+        Foo<? super String> n8 = new Foo<>(""){}; //new Foo<Object> created
+
+        Foo<String> n9 = new Foo<>("", ""); //new Foo<Integer> created
+        Foo<? extends String> n10 = new Foo<>("", ""); //new Foo<Integer> created
+        Foo<?> n11 = new Foo<>("", ""); //new Foo<Object> created
+        Foo<? super String> n12 = new Foo<>("", ""); //new Foo<Object> created
+
+        Foo<String> n13 = new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<? extends String> n14 = new Foo<>("", ""){}; //new Foo<Integer> created
+        Foo<?> n15 = new Foo<>("", ""){}; //new Foo<Object> created
+        Foo<? super String> n16 = new Foo<>("", ""){}; //new Foo<Object> created
+    }
+}
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg04.out b/langtools/test/tools/javac/generics/diamond/neg/Neg04.out
new file mode 100644
index 00000000000..f9a0cbf1c39
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg04.out
@@ -0,0 +1,31 @@
+Neg04.java:18:13: compiler.err.not.within.bounds: java.lang.String
+Neg04.java:18:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
+Neg04.java:19:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg04.java:19:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg04.java:20:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Foo<java.lang.Number>
+Neg04.java:21:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg04.java:21:41: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<? super java.lang.String>)
+Neg04.java:23:13: compiler.err.not.within.bounds: java.lang.String
+Neg04.java:23:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
+Neg04.java:24:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg04.java:24:43: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg04.java:25:21: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String, kindname.class, Foo<java.lang.Number>
+Neg04.java:25:34: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Foo<java.lang.Number>
+Neg04.java:26:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg04.java:26:41: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<? super java.lang.String>)
+Neg04.java:28:13: compiler.err.not.within.bounds: java.lang.String
+Neg04.java:28:33: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
+Neg04.java:29:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg04.java:29:44: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg04.java:30:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Foo<java.lang.Number>
+Neg04.java:31:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg04.java:31:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<? super java.lang.String>)
+Neg04.java:33:13: compiler.err.not.within.bounds: java.lang.String
+Neg04.java:33:34: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<java.lang.String>)
+Neg04.java:34:23: compiler.err.not.within.bounds: ? extends java.lang.String
+Neg04.java:34:44: compiler.err.cant.apply.diamond: V, (compiler.misc.no.unique.maximal.instance.exists: V, java.lang.String,java.lang.Number)
+Neg04.java:35:22: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , java.lang.String,java.lang.String, kindname.class, Foo<java.lang.Number>
+Neg04.java:35:39: compiler.err.cant.resolve.location.args: kindname.constructor, Foo, , , kindname.class, Foo<java.lang.Number>
+Neg04.java:36:21: compiler.err.not.within.bounds: ? super java.lang.String
+Neg04.java:36:42: compiler.err.cant.apply.diamond: V, (compiler.misc.no.conforming.instance.exists: V, Foo<V>, Foo<? super java.lang.String>)
+30 errors
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg05.java b/langtools/test/tools/javac/generics/diamond/neg/Neg05.java
new file mode 100644
index 00000000000..d287ec59aa1
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg05.java
@@ -0,0 +1,61 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile/fail/ref=Neg05.out Neg05.java -source 1.7 -XDrawDiagnostics
+ *
+ */
+
+class Neg05<U> {
+
+    class Foo<V> {
+        Foo(V x) {}
+        <Z> Foo(V x, Z z) {}
+    }
+
+    void testRare_1() {
+        Neg05<?>.Foo<String> f1 = new Neg05.Foo<>(""); //new Foo<Integer> created
+        Neg05<?>.Foo<? extends String> f2 = new Neg05.Foo<>(""); //new Foo<Integer> created
+        Neg05<?>.Foo<?> f3 = new Neg05.Foo<>(""); //new Foo<Object> created
+        Neg05<?>.Foo<? super String> f4 = new Neg05.Foo<>(""); //new Foo<Object> created
+
+        Neg05<?>.Foo<String> f5 = new Neg05.Foo<>(""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<? extends String> f6 = new Neg05.Foo<>(""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<?> f7 = new Neg05.Foo<>(""){}; //new Foo<Object> created
+        Neg05<?>.Foo<? super String> f8 = new Neg05.Foo<>(""){}; //new Foo<Object> created
+
+        Neg05<?>.Foo<String> f9 = new Neg05.Foo<>("", ""); //new Foo<Integer> created
+        Neg05<?>.Foo<? extends String> f10 = new Neg05.Foo<>("", ""); //new Foo<Integer> created
+        Neg05<?>.Foo<?> f11 = new Neg05.Foo<>("", ""); //new Foo<Object> created
+        Neg05<?>.Foo<? super String> f12 = new Neg05.Foo<>("", ""); //new Foo<Object> created
+
+        Neg05<?>.Foo<String> f13 = new Neg05.Foo<>("", ""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<? extends String> f14 = new Neg05.Foo<>("", ""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<?> f15 = new Neg05.Foo<>("", ""){}; //new Foo<Object> created
+        Neg05<?>.Foo<? super String> f16 = new Neg05.Foo<>("", ""){}; //new Foo<Object> created
+    }
+
+    void testRare_2(Neg05 n) {
+        Neg05<?>.Foo<String> f1 = n.new Foo<>(""); //new Foo<Integer> created
+        Neg05<?>.Foo<? extends String> f2 = n.new Foo<>(""); //new Foo<Integer> created
+        Neg05<?>.Foo<?> f3 = n.new Foo<>(""); //new Foo<Integer> created
+        Neg05<?>.Foo<? super String> f4 = n.new Foo<>(""); //new Foo<Integer> created
+
+        Neg05<?>.Foo<String> f5 = n.new Foo<>(""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<? extends String> f6 = n.new Foo<>(""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<?> f7 = n.new Foo<>(""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<? super String> f8 = n.new Foo<>(""){}; //new Foo<Integer> created
+
+        Neg05<?>.Foo<String> f9 = n.new Foo<>("", ""); //new Foo<Integer> created
+        Neg05<?>.Foo<? extends String> f10 = n.new Foo<>("", ""); //new Foo<Integer> created
+        Neg05<?>.Foo<?> f11 = n.new Foo<>("", ""); //new Foo<Integer> created
+        Neg05<?>.Foo<? super String> f12 = n.new Foo<>("", ""); //new Foo<Integer> created
+
+        Neg05<?>.Foo<String> f13 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<? extends String> f14 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<?> f15 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+        Neg05<?>.Foo<? super String> f16 = n.new Foo<>("", ""){}; //new Foo<Integer> created
+    }
+}
diff --git a/langtools/test/tools/javac/generics/diamond/neg/Neg05.out b/langtools/test/tools/javac/generics/diamond/neg/Neg05.out
new file mode 100644
index 00000000000..582e83baca4
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/neg/Neg05.out
@@ -0,0 +1,33 @@
+Neg05.java:19:48: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:20:58: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:21:43: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:22:56: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:24:48: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:25:58: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:26:43: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:27:56: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:29:48: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:30:59: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:31:44: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:32:57: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:34:49: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:35:59: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:36:44: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:37:57: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:41:37: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:42:47: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:43:32: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:44:45: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:46:37: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:47:47: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:48:32: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:49:45: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:51:37: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:52:48: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:53:33: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:54:46: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:56:38: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:57:48: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:58:33: compiler.err.improperly.formed.type.inner.raw.param
+Neg05.java:59:46: compiler.err.improperly.formed.type.inner.raw.param
+32 errors
diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos01.java b/langtools/test/tools/javac/generics/diamond/pos/Pos01.java
new file mode 100644
index 00000000000..6d3a6d46b3f
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/pos/Pos01.java
@@ -0,0 +1,44 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile Pos01.java -source 1.7
+ * @run main Pos01
+ *
+ */
+
+public class Pos01<X> {
+
+    Pos01(X x) {}
+
+    <Z> Pos01(X x, Z z) {}
+
+    void test() {
+        Pos01<Integer> p1 = new Pos01<>(1); //new Foo<Integer> created
+        Pos01<? extends Integer> p2 = new Pos01<>(1); //new Foo<Integer> created
+        Pos01<?> p3 = new Pos01<>(1); //new Foo<Object> created
+        Pos01<? super Integer> p4 = new Pos01<>(1); //new Foo<Object> created
+
+        Pos01<Integer> p5 = new Pos01<>(1){}; //new Foo<Integer> created
+        Pos01<? extends Integer> p6 = new Pos01<>(1){}; //new Foo<Integer> created
+        Pos01<?> p7 = new Pos01<>(1){}; //new Foo<Object> created
+        Pos01<? super Integer> p8 = new Pos01<>(1){}; //new Foo<Object> created
+
+        Pos01<Integer> p9 = new Pos01<>(1, ""); //new Foo<Integer> created
+        Pos01<? extends Integer> p10 = new Pos01<>(1, ""); //new Foo<Integer> created
+        Pos01<?> p11 = new Pos01<>(1, ""); //new Foo<Object> created
+        Pos01<? super Integer> p12 = new Pos01<>(1, ""); //new Foo<Object> created
+
+        Pos01<Integer> p13 = new Pos01<>(1, ""){}; //new Foo<Integer> created
+        Pos01<? extends Integer> p14= new Pos01<>(1, ""){}; //new Foo<Integer> created
+        Pos01<?> p15 = new Pos01<>(1, ""){}; //new Foo<Object> created
+        Pos01<? super Integer> p16 = new Pos01<>(1, ""){}; //new Foo<Object> created
+    }
+
+    public static void main(String[] args) {
+        Pos01<String> p1 = new Pos01<>("");
+        p1.test();
+    }
+}
diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos02.java b/langtools/test/tools/javac/generics/diamond/pos/Pos02.java
new file mode 100644
index 00000000000..4b2e34c5a05
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/pos/Pos02.java
@@ -0,0 +1,67 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile Pos02.java -source 1.7
+ * @run main Pos02
+ */
+
+public class Pos02 {
+
+    static class Foo<X> {
+        Foo(X x) {}
+        <Z> Foo(X x, Z z) {}
+    }
+
+    void testSimple() {
+        Foo<Integer> f1 = new Foo<>(1); //new Foo<Integer> created
+        Foo<? extends Integer> f2 = new Foo<>(1); //new Foo<Integer> created
+        Foo<?> f3 = new Foo<>(1); //new Foo<Object> created
+        Foo<? super Integer> f4 = new Foo<>(1); //new Foo<Object> created
+
+        Foo<Integer> f5 = new Foo<>(1){}; //new Foo<Integer> created
+        Foo<? extends Integer> f6 = new Foo<>(1){}; //new Foo<Integer> created
+        Foo<?> f7 = new Foo<>(1){}; //new Foo<Object> created
+        Foo<? super Integer> f8 = new Foo<>(1){}; //new Foo<Object> created
+
+        Foo<Integer> f9 = new Foo<>(1, ""); //new Foo<Integer> created
+        Foo<? extends Integer> f10 = new Foo<>(1, ""); //new Foo<Integer> created
+        Foo<?> f11 = new Foo<>(1, ""); //new Foo<Object> created
+        Foo<? super Integer> f12 = new Foo<>(1, ""); //new Foo<Object> created
+
+        Foo<Integer> f13 = new Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<? extends Integer> f14 = new Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<?> f15 = new Foo<>(1, ""){}; //new Foo<Object> created
+        Foo<? super Integer> f16 = new Foo<>(1, ""){}; //new Foo<Object> created
+    }
+
+    void testQualified() {
+        Foo<Integer> f1 = new Pos02.Foo<>(1); //new Foo<Integer> created
+        Foo<? extends Integer> f2 = new Pos02.Foo<>(1); //new Foo<Integer> created
+        Foo<?> f3 = new Pos02.Foo<>(1); //new Foo<Object> created
+        Foo<? super Integer> f4 = new Pos02.Foo<>(1); //new Foo<Object> created
+
+        Foo<Integer> f5 = new Pos02.Foo<>(1){}; //new Foo<Integer> created
+        Foo<? extends Integer> f6 = new Pos02.Foo<>(1){}; //new Foo<Integer> created
+        Foo<?> f7 = new Pos02.Foo<>(1){}; //new Foo<Object> created
+        Foo<? super Integer> f8 = new Pos02.Foo<>(1){}; //new Foo<Object> created
+
+        Foo<Integer> f9 = new Pos02.Foo<>(1, ""); //new Foo<Integer> created
+        Foo<? extends Integer> f10 = new Pos02.Foo<>(1, ""); //new Foo<Integer> created
+        Foo<?> f11 = new Pos02.Foo<>(1, ""); //new Foo<Object> created
+        Foo<? super Integer> f12 = new Pos02.Foo<>(1, ""); //new Foo<Object> created
+
+        Foo<Integer> f13 = new Pos02.Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<? extends Integer> f14 = new Pos02.Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<?> f15 = new Pos02.Foo<>(1, ""){}; //new Foo<Object> created
+        Foo<? super Integer> f16 = new Pos02.Foo<>(1, ""){}; //new Foo<Object> created
+    }
+
+    public static void main(String[] args) {
+        Pos02 p2 = new Pos02();
+        p2.testSimple();
+        p2.testQualified();
+    }
+}
diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos03.java b/langtools/test/tools/javac/generics/diamond/pos/Pos03.java
new file mode 100644
index 00000000000..0f8a32148c5
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/pos/Pos03.java
@@ -0,0 +1,91 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile Pos03.java -source 1.7
+ * @run main Pos03
+ *
+ */
+
+public class Pos03<U> {
+
+    class Foo<V> {
+        Foo(V x) {}
+        <Z> Foo(V x, Z z) {}
+    }
+
+    void testSimple() {
+        Foo<Integer> f1 = new Foo<>(1); //new Foo<Integer> created
+        Foo<? extends Integer> f2 = new Foo<>(1); //new Foo<Integer> created
+        Foo<?> f3 = new Foo<>(1); //new Foo<Object> created
+        Foo<? super Integer> f4 = new Foo<>(1); //new Foo<Object> created
+
+        Foo<Integer> f5 = new Foo<>(1){}; //new Foo<Integer> created
+        Foo<? extends Integer> f6 = new Foo<>(1){}; //new Foo<Integer> created
+        Foo<?> f7 = new Foo<>(1){}; //new Foo<Object> created
+        Foo<? super Integer> f8 = new Foo<>(1){}; //new Foo<Object> created
+
+        Foo<Integer> f9 = new Foo<>(1, ""); //new Foo<Integer> created
+        Foo<? extends Integer> f10 = new Foo<>(1, ""); //new Foo<Integer> created
+        Foo<?> f11 = new Foo<>(1, ""); //new Foo<Object> created
+        Foo<? super Integer> f12 = new Foo<>(1, ""); //new Foo<Object> created
+
+        Foo<Integer> f13 = new Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<? extends Integer> f14 = new Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<?> f15 = new Foo<>(1, ""){}; //new Foo<Object> created
+        Foo<? super Integer> f16 = new Foo<>(1, ""){}; //new Foo<Object> created
+    }
+
+    void testQualified_1() {
+        Foo<Integer> f1 = new Pos03<U>.Foo<>(1); //new Foo<Integer> created
+        Foo<? extends Integer> f2 = new Pos03<U>.Foo<>(1); //new Foo<Integer> created
+        Foo<?> f3 = new Pos03<U>.Foo<>(1); //new Foo<Object> created
+        Foo<? super Integer> f4 = new Pos03<U>.Foo<>(1); //new Foo<Object> created
+
+        Foo<Integer> f5 = new Pos03<U>.Foo<>(1){}; //new Foo<Integer> created
+        Foo<? extends Integer> f6 = new Pos03<U>.Foo<>(1){}; //new Foo<Integer> created
+        Foo<?> f7 = new Pos03<U>.Foo<>(1){}; //new Foo<Object> created
+        Foo<? super Integer> f8 = new Pos03<U>.Foo<>(1){}; //new Foo<Object> created
+
+        Foo<Integer> f9 = new Pos03<U>.Foo<>(1, ""); //new Foo<Integer> created
+        Foo<? extends Integer> f10 = new Pos03<U>.Foo<>(1, ""); //new Foo<Integer> created
+        Foo<?> f11 = new Pos03<U>.Foo<>(1, ""); //new Foo<Object> created
+        Foo<? super Integer> f12 = new Pos03<U>.Foo<>(1, ""); //new Foo<Object> created
+
+        Foo<Integer> f13 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<? extends Integer> f14 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<?> f15 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Object> created
+        Foo<? super Integer> f16 = new Pos03<U>.Foo<>(1, ""){}; //new Foo<Object> created
+    }
+
+    void testQualified_2(Pos03<U> p) {
+        Foo<Integer> f1 = p.new Foo<>(1); //new Foo<Integer> created
+        Foo<? extends Integer> f2 = p.new Foo<>(1); //new Foo<Integer> created
+        Foo<?> f3 = p.new Foo<>(1); //new Foo<Object> created
+        Foo<? super Integer> f4 = p.new Foo<>(1); //new Foo<Object> created
+
+        Foo<Integer> f5 = p.new Foo<>(1){}; //new Foo<Integer> created
+        Foo<? extends Integer> f6 = p.new Foo<>(1){}; //new Foo<Integer> created
+        Foo<?> f7 = p.new Foo<>(1){}; //new Foo<Object> created
+        Foo<? super Integer> f8 = p.new Foo<>(1){}; //new Foo<Object> created
+
+        Foo<Integer> f9 = p.new Foo<>(1, ""); //new Foo<Integer> created
+        Foo<? extends Integer> f10 = p.new Foo<>(1, ""); //new Foo<Integer> created
+        Foo<?> f11 = p.new Foo<>(1, ""); //new Foo<Object> created
+        Foo<? super Integer> f12 = p.new Foo<>(1, ""); //new Foo<Object> created
+
+        Foo<Integer> f13 = p.new Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<? extends Integer> f14 = p.new Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<?> f15 = p.new Foo<>(1, ""){}; //new Foo<Object> created
+        Foo<? super Integer> f16 = p.new Foo<>(1, ""){}; //new Foo<Object> created
+    }
+
+    public static void main(String[] args) {
+        Pos03<String> p3 = new Pos03<>();
+        p3.testSimple();
+        p3.testQualified_1();
+        p3.testQualified_2(p3);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/diamond/pos/Pos04.java b/langtools/test/tools/javac/generics/diamond/pos/Pos04.java
new file mode 100644
index 00000000000..fae82a53eb5
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/pos/Pos04.java
@@ -0,0 +1,44 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 6840638
+ *
+ * @summary  Project Coin: Improved Type Inference for Generic Instance Creation (aka 'diamond')
+ * @author mcimadamore
+ * @compile Pos04.java -source 1.7
+ * @run main Pos04
+ *
+ */
+
+public class Pos04<U> {
+
+    void test() {
+        class Foo<V> {
+            Foo(V x) {}
+            <Z> Foo(V x, Z z) {}
+        }
+        Foo<Integer> p1 = new Foo<>(1); //new Foo<Integer> created
+        Foo<? extends Integer> p2 = new Foo<>(1); //new Foo<Integer> created
+        Foo<?> p3 = new Foo<>(1); //new Foo<Object> created
+        Foo<? super Integer> p4 = new Foo<>(1); //new Foo<Object> created
+
+        Foo<Integer> p5 = new Foo<>(1){}; //new Foo<Integer> created
+        Foo<? extends Integer> p6 = new Foo<>(1){}; //new Foo<Integer> created
+        Foo<?> p7 = new Foo<>(1){}; //new Foo<Object> created
+        Foo<? super Integer> p8 = new Foo<>(1){}; //new Foo<Object> created
+
+        Foo<Integer> p9 = new Foo<>(1, ""); //new Foo<Integer> created
+        Foo<? extends Integer> p10 = new Foo<>(1, ""); //new Foo<Integer> created
+        Foo<?> p11 = new Foo<>(1, ""); //new Foo<Object> created
+        Foo<? super Integer> p12 = new Foo<>(1, ""); //new Foo<Object> created
+
+        Foo<Integer> p13 = new Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<? extends Integer> p14 = new Foo<>(1, ""){}; //new Foo<Integer> created
+        Foo<?> p15 = new Foo<>(1, ""){}; //new Foo<Object> created
+        Foo<? super Integer> p16 = new Foo<>(1, ""){}; //new Foo<Object> created
+    }
+
+    public static void main(String[] args) {
+        Pos04<String> p4 = new Pos04<>();
+        p4.test();
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6302954/T6476073.java b/langtools/test/tools/javac/generics/inference/6302954/T6476073.java
index 8a5534b750c..cd3adbed499 100644
--- a/langtools/test/tools/javac/generics/inference/6302954/T6476073.java
+++ b/langtools/test/tools/javac/generics/inference/6302954/T6476073.java
@@ -25,7 +25,6 @@
  * @test
  * @bug     6476073
  * @summary Capture using super wildcard of type variables doesn't work
- * @ignore awaiting for 6650759 (see bug report for a detailed evaluation)
  * @compile T6476073.java
  */
 
diff --git a/langtools/test/tools/javac/generics/inference/6315770/T6315770.java b/langtools/test/tools/javac/generics/inference/6315770/T6315770.java
index 2bee9a14a8f..d045ec44eac 100644
--- a/langtools/test/tools/javac/generics/inference/6315770/T6315770.java
+++ b/langtools/test/tools/javac/generics/inference/6315770/T6315770.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6315770
  * @summary javac inference allows creation of strange types: Integer & Runnable
  * @author Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/generics/inference/6315770/T6315770.out b/langtools/test/tools/javac/generics/inference/6315770/T6315770.out
index dd1fdb9e3d3..67967d0c8ee 100644
--- a/langtools/test/tools/javac/generics/inference/6315770/T6315770.out
+++ b/langtools/test/tools/javac/generics/inference/6315770/T6315770.out
@@ -1,3 +1,3 @@
-T6315770.java:39:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
-T6315770.java:40:40: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
+T6315770.java:16:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
+T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
 2 errors
diff --git a/langtools/test/tools/javac/generics/inference/6611449/T6611449.java b/langtools/test/tools/javac/generics/inference/6611449/T6611449.java
index 8ef523db2cf..9d6d9a70a65 100644
--- a/langtools/test/tools/javac/generics/inference/6611449/T6611449.java
+++ b/langtools/test/tools/javac/generics/inference/6611449/T6611449.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6611449
  * @summary Internal Error thrown during generic method/constructor invocation
  * @compile/fail/ref=T6611449.out -XDstdout -XDrawDiagnostics T6611449.java
diff --git a/langtools/test/tools/javac/generics/inference/6611449/T6611449.out b/langtools/test/tools/javac/generics/inference/6611449/T6611449.out
index 5fb0d39cd56..e5ff00a6d2b 100644
--- a/langtools/test/tools/javac/generics/inference/6611449/T6611449.out
+++ b/langtools/test/tools/javac/generics/inference/6611449/T6611449.out
@@ -1,5 +1,5 @@
-T6611449.java:41:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
-T6611449.java:42:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
-T6611449.java:43:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
-T6611449.java:44:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
+T6611449.java:18:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
+T6611449.java:19:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
+T6611449.java:20:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
+T6611449.java:21:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
 4 errors
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712a.java b/langtools/test/tools/javac/generics/inference/6638712/T6638712a.java
index 1ae7719e5d1..b6f70f486de 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712a.java
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712a.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out b/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out
index 4db2c404aa1..420b2f72c9f 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out
@@ -1,2 +1,2 @@
-T6638712a.java:39:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
+T6638712a.java:16:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
 1 error
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712b.java b/langtools/test/tools/javac/generics/inference/6638712/T6638712b.java
index 9c45f89cdb4..d64edfff338 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712b.java
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712b.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out b/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out
index 675ccaf1a0b..ed77740a425 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out
@@ -1,2 +1,2 @@
-T6638712b.java:37:21: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.bounds: T6638712b<java.lang.Integer>, T6638712b<java.lang.String>)
+T6638712b.java:14:21: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T, java.lang.String)), <T>T, java.lang.String
 1 error
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712c.java b/langtools/test/tools/javac/generics/inference/6638712/T6638712c.java
index 5ae48142ba9..012eae8b815 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712c.java
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712c.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712 6707034
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out b/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out
index 42096d8104e..8b0db849a79 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out
@@ -1,2 +1,2 @@
-T6638712c.java:39:9: compiler.err.cant.apply.symbol: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, null
+T6638712c.java:16:9: compiler.err.cant.apply.symbol: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, null
 1 error
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712d.java b/langtools/test/tools/javac/generics/inference/6638712/T6638712d.java
index 682b394fc20..33c999aeaa1 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712d.java
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712d.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712 6730468
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out b/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out
index 816dc24a1c2..c8c574044eb 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out
@@ -1,2 +1,2 @@
-T6638712d.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, null
+T6638712d.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, null
 1 error
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712e.java b/langtools/test/tools/javac/generics/inference/6638712/T6638712e.java
index 524d4b4c2b9..4f08dd1ccf2 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712e.java
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712e.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6638712 6795689
  * @author  mcimadamore
  * @summary Inference with wildcard types causes selection of inapplicable method
diff --git a/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out b/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out
index 6cc30602567..1ca268b830b 100644
--- a/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out
+++ b/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out
@@ -1,2 +1,2 @@
-T6638712e.java:40:27: compiler.err.invalid.inferred.types: X, (compiler.misc.inferred.do.not.conform.to.params: T6638712e.Foo<? super java.lang.Object,? extends java.lang.Boolean>, T6638712e.Foo<java.lang.Boolean,java.lang.Boolean>)
+T6638712e.java:17:27: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: X, T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>)), <X>T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>
 1 error
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759a.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759a.java
new file mode 100644
index 00000000000..9e65330940a
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759a.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @author  mcimadamore
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759a.java
+ */
+
+class T6650759a {
+
+    public static interface Interface<T> { }
+    public static class IntegerInterface implements Interface<Integer> { }
+
+    <I extends Interface<T>, T> T getGenericValue(I test) { return null; }
+
+    void testSet(Integer test) { }
+
+    void test() {
+        Integer test = getGenericValue(new IntegerInterface());
+        testSet(getGenericValue(new IntegerInterface()));
+    }
+}
\ No newline at end of file
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759b.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759b.java
new file mode 100644
index 00000000000..b9d53bbd5e6
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759b.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @author  mcimadamore
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759b.java
+ */
+
+public class T6650759b {
+
+    interface A<X extends A<X, Y>, Y extends B<X>> {}
+
+    static class B<X extends A<X, ?>> {}
+
+    interface C<X extends A<X, Y>, Y extends B<X>> {}
+
+    interface D<X extends A<X, Y>, Y extends B<X>> {}
+
+    static class E<X extends A<X, Y>, Y extends B<X>, W extends C<X, Y>> implements D<X, Y> {
+
+        static <X extends A<X, Y>, Y extends B<X>, W extends C<X, Y>> D<X, Y> of(W w) {
+            return null;
+        }
+    }
+
+    <X extends A<X, Y>, Y extends B<X>, W extends C<X, Y>, Z extends D<X, Y>> Z test(W w) {
+        return (Z) E.of(w);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759c.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759c.java
new file mode 100644
index 00000000000..e02918c6dc0
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759c.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759c.java
+ */
+
+import java.util.Collection;
+import java.util.Collections;
+
+public class T6650759c {
+
+  static interface A {}
+
+  static interface B<X extends A> {}
+
+  static interface C<X extends A, Y extends B<X>> {}
+
+  public static <T extends A, U extends B<T>> Collection<C<T,U>> get(U u) {
+    return null;
+  }
+
+  public <T extends A, U extends B<T>> Collection<C<T,U>> test(U u) {
+    return Collections.unmodifiableCollection(get(u));
+  }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759d.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759d.java
new file mode 100644
index 00000000000..73b65339b35
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759d.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759d.java
+ */
+
+public class T6650759d {
+
+    static abstract class A<X> {
+
+        static <T> A<T> m(Iterable<? extends T> elements) {
+            return null;
+        }
+    }
+
+    static abstract class B {}
+
+    static abstract class C<X extends B> {}
+
+    <U extends C<V>, V extends B> Iterable<V> get(U u) {
+        return null;
+    }
+
+    <U extends C<V>, V extends B> void m(U u) {
+        A<V> a = A.m(get(u));
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759e.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759e.java
new file mode 100644
index 00000000000..9fdc2b6d8ce
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759e.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759e.java
+ */
+
+import java.util.List;
+
+public class T6650759e {
+
+    static abstract class A<X extends B> {}
+
+    interface B<X extends A> extends D {}
+
+    static abstract class C<X extends D> {}
+
+    interface D {}
+
+    static abstract class E<X extends C<? extends B<?>>> {}
+
+    <U extends C<V>, V extends B<W>, W extends A<V>> W m1(E<U> e) {
+        return m2(e);
+    }
+
+    <U extends C<V>, V extends B<W>, W extends A<V>> W m2(E<U> e) {
+        return null;
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759f.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759f.java
new file mode 100644
index 00000000000..6393f81394a
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759f.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759f.java
+ */
+
+import java.util.Collections;
+
+public class T6650759f {
+
+    interface A<X extends A> {}
+
+    static abstract class B<X extends B> implements A<X> {}
+
+    static abstract class C<X extends D> extends B<X> {}
+
+    static class D extends C<D> {}
+
+    <X extends B, Y extends B<X>> Iterable<X> m(Y node) {
+        return null;
+    }
+
+    public void test(D d) {
+        Iterable<D> ops = (true) ? Collections.singletonList(d) : m(d);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759g.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759g.java
new file mode 100644
index 00000000000..a31fd10d08a
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759g.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759g.java
+ */
+
+public class T6650759g {
+
+    static abstract class A<X extends A<X>> {}
+
+    static abstract class B<X extends A<X>> {}
+
+    interface C<X, Y> {}
+
+    static abstract class D<X extends A<X>, Y extends B<X>> implements C<X, Y> {}
+
+    static class E extends A<E> {}
+
+    static class F extends B<E> {}
+
+    static void test(Iterable<E> data) {
+        m3(m2(data, m1(F.class)));
+    }
+
+    static <X extends A<X>, Y extends B<X>> D<X, Y> m1(Class<Y> c) {
+        return null;
+    }
+
+    static <U, V> Iterable<V> m2(Iterable<U> x1, C<? super U, ? extends V> x2) {
+        return null;
+    }
+
+    static void m3(Iterable<F> data) {
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759h.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759h.java
new file mode 100644
index 00000000000..a19cd369d5d
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759h.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759h.java
+ */
+class T6650759h<X, Y> {
+
+    <A> Object m(A a, T6650759h<?, ? super A> t) {
+        return null;
+    }
+
+    void test(T6650759h<?, Void> t) {
+        m(null, t);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759i.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759i.java
new file mode 100644
index 00000000000..d186d3d5625
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759i.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759i.java
+ */
+public class T6650759i {
+
+    static class A<X extends A, Y extends B> {}
+
+    static class B<X extends B> {}
+
+    static class C<X extends A<X, Y>, Y extends B<Y>> {}
+
+    static <U extends A<U, V>, V extends B<V>> Class<U> m1(U x) {
+        return null;
+    }
+
+    static <U extends A<U, V>, V extends B<V>> U m2(Class<U> c) {
+        return null;
+    }
+
+    static <W, U extends A<U, V>, V extends B<V>> W m3(Class<W> c1, C<U, V> c2) {
+        return null;
+    }
+
+    static <U extends A<U, V>, V extends B<V>> void test(U u, C<U, V> c) {
+        m2(m1(u));
+        U res = m3(m1(u), c);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759j.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759j.java
new file mode 100644
index 00000000000..1c78f8830e3
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759j.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759j.java
+ */
+
+public class T6650759j {
+
+    static abstract class A<X extends A<X>> {}
+
+    static abstract class B<X extends B<X, Y>, Y> extends A<X> {}
+
+    static abstract class C<X extends C<X, Y>, Y> extends B<X, Y> {}
+
+    interface D {}
+
+    static class E extends C<E, D> {}
+
+    static abstract class F<X extends F<X, Y>, Y extends A<Y>> extends A<X> {}
+
+    static class G extends F<G, E> {}
+
+    static <X extends F<X, Y>, Y extends A<Y>> X m(Iterable<X> it) {
+        return null;
+    }
+
+    static G test(Iterable<G> c) {
+        return m(c);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759k.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759k.java
new file mode 100644
index 00000000000..a2a323f254f
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759k.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759k.java
+ */
+
+public class T6650759k {
+
+    static class A<X extends A> {}
+
+    static class B<X extends B, Y extends A> {}
+
+    <U extends A<U>, V extends B<V, U>> Object m(Class<V> c) {
+        return null;
+    }
+
+    <U extends A<U>, V extends B<V, U>> void test(Class<V> c) {
+        m(c);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759l.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759l.java
new file mode 100644
index 00000000000..66d7bda9e5a
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759l.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile T6650759l.java
+ */
+
+public class T6650759l {
+
+    public static interface A<X> {}
+
+    public static class B implements A<Integer> {}
+
+    public static <X extends A<Y>, Y> Y m1(X x) {
+        return null;
+    }
+
+    public static void m2(Integer i) {}
+
+    public static void test(B b) {
+        m2(m1(b));
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759m.java b/langtools/test/tools/javac/generics/inference/6650759/T6650759m.java
new file mode 100644
index 00000000000..f123e32962b
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759m.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6650759
+ * @summary Inference of formal type parameter (unused in formal parameters) is not performed
+ * @compile/fail/ref=T6650759m.out T6650759m.java -XDrawDiagnostics
+ */
+
+import java.util.*;
+
+class T6650759m {
+    <Z> List<? super Z> m(List<? extends List<? super Z>> ls) {
+        return ls.get(0);
+    }
+
+    void test() {
+        ArrayList<ArrayList<Integer>> lli = new ArrayList<ArrayList<Integer>>();
+        ArrayList<Integer> li = new ArrayList<Integer>();
+        li.add(2);
+        lli.add(li);
+        List<? super String> ls = m(lli); //here
+        ls.add("crash");
+        Integer i = li.get(1);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out b/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out
new file mode 100644
index 00000000000..474d8db2e0f
--- /dev/null
+++ b/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out
@@ -0,0 +1,2 @@
+T6650759m.java:43:36: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.util.List<? super java.lang.Integer>, java.util.List<? super java.lang.String>
+1 error
diff --git a/langtools/test/tools/javac/generics/inference/6718364/T6718364.java b/langtools/test/tools/javac/generics/inference/6718364/T6718364.java
index 7f275ce76a7..6a19504c7af 100644
--- a/langtools/test/tools/javac/generics/inference/6718364/T6718364.java
+++ b/langtools/test/tools/javac/generics/inference/6718364/T6718364.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6718364
  * @summary inference fails when a generic method is invoked with raw arguments
  * @compile/ref=T6718364.out -XDstdout -XDrawDiagnostics -Xlint:unchecked T6718364.java
diff --git a/langtools/test/tools/javac/generics/inference/6718364/T6718364.out b/langtools/test/tools/javac/generics/inference/6718364/T6718364.out
index 1b5ed9ad241..d637c1fbbeb 100644
--- a/langtools/test/tools/javac/generics/inference/6718364/T6718364.out
+++ b/langtools/test/tools/javac/generics/inference/6718364/T6718364.out
@@ -1,3 +1,3 @@
-T6718364.java:36:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
-T6718364.java:36:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
-2 warnings
\ No newline at end of file
+T6718364.java:13:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
+T6718364.java:13:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
+2 warnings
diff --git a/langtools/test/tools/javac/generics/rare/6665356/T6665356.java b/langtools/test/tools/javac/generics/rare/6665356/T6665356.java
index cf757c362df..31c8d6027ab 100644
--- a/langtools/test/tools/javac/generics/rare/6665356/T6665356.java
+++ b/langtools/test/tools/javac/generics/rare/6665356/T6665356.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008-2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @author Maurizio Cimadamore
  * @bug     6665356
  * @summary Cast not allowed when both qualifying type and inner class are parameterized
@@ -50,4 +27,4 @@ class T6665356 {
         o = (Outer.Inner<?>)null;
         o = (Outer<?>.Inner<?>)null;
     }
-}
\ No newline at end of file
+}
diff --git a/langtools/test/tools/javac/generics/rare/6665356/T6665356.out b/langtools/test/tools/javac/generics/rare/6665356/T6665356.out
index de65356ccf1..62a62e63925 100644
--- a/langtools/test/tools/javac/generics/rare/6665356/T6665356.out
+++ b/langtools/test/tools/javac/generics/rare/6665356/T6665356.out
@@ -1,5 +1,5 @@
-T6665356.java:40:37: compiler.err.improperly.formed.type.param.missing
-T6665356.java:41:40: compiler.err.improperly.formed.type.inner.raw.param
-T6665356.java:49:23: compiler.err.improperly.formed.type.param.missing
-T6665356.java:50:25: compiler.err.improperly.formed.type.inner.raw.param
-4 errors
\ No newline at end of file
+T6665356.java:17:37: compiler.err.improperly.formed.type.param.missing
+T6665356.java:18:40: compiler.err.improperly.formed.type.inner.raw.param
+T6665356.java:26:23: compiler.err.improperly.formed.type.param.missing
+T6665356.java:27:25: compiler.err.improperly.formed.type.inner.raw.param
+4 errors
diff --git a/langtools/test/tools/javac/generics/rawOverride/T6846972.java b/langtools/test/tools/javac/generics/rawOverride/T6846972.java
new file mode 100644
index 00000000000..af39a2d7cd6
--- /dev/null
+++ b/langtools/test/tools/javac/generics/rawOverride/T6846972.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6846972
+ * @summary cannot access member of raw type when erasure change overriding into overloading
+ * @author mcimadamore
+ * @compile T6846972.java
+ */
+
+import java.util.EnumMap;
+
+public class T6846972 {
+
+    enum Suit {
+        CLUBS, DIAMONDS;
+    }
+
+    static Object [] array = {
+        Suit.CLUBS, "value1",
+        Suit.DIAMONDS, "value2"
+    };
+
+    static void test() {
+        EnumMap map = new EnumMap(Suit.class);
+        map.put(array[0], array[1]);
+    }
+}
diff --git a/langtools/test/tools/javac/generics/typevars/6569404/T6569404a.java b/langtools/test/tools/javac/generics/typevars/6569404/T6569404a.java
new file mode 100644
index 00000000000..d68b949407a
--- /dev/null
+++ b/langtools/test/tools/javac/generics/typevars/6569404/T6569404a.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6569404
+ * @summary Regression: Cannot instantiate an inner class of a type variable
+ * @author  mcimadamore
+ */
+
+public class T6569404a {
+
+    static class Outer {
+      public class Inner {}
+    }
+
+    static class Test<T extends Outer> {
+       public Test(T t) {
+          Outer.Inner inner = t.new Inner();
+       }
+    }
+
+    public static void main(String[] args) {
+       new Test<Outer>(new Outer());
+    }
+}
diff --git a/langtools/test/tools/javac/generics/typevars/6569404/T6569404b.java b/langtools/test/tools/javac/generics/typevars/6569404/T6569404b.java
new file mode 100644
index 00000000000..c4cd3eb0d66
--- /dev/null
+++ b/langtools/test/tools/javac/generics/typevars/6569404/T6569404b.java
@@ -0,0 +1,18 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug     6569404
+ * @summary Regression: Cannot instantiate an inner class of a type variable
+ * @author  mcimadamore
+ * @compile/fail/ref=T6569404b.out T6569404b.java -XDrawDiagnostics
+ */
+
+class T6569404b {
+
+    static class A<X> {}
+
+    static class B<T extends Outer> extends A<T.Inner> {}
+
+    static class Outer {
+        public class Inner {}
+    }
+}
diff --git a/langtools/test/tools/javac/generics/typevars/6569404/T6569404b.out b/langtools/test/tools/javac/generics/typevars/6569404/T6569404b.out
new file mode 100644
index 00000000000..431b9caa516
--- /dev/null
+++ b/langtools/test/tools/javac/generics/typevars/6569404/T6569404b.out
@@ -0,0 +1,2 @@
+T6569404b.java:13:48: compiler.err.type.var.cant.be.deref
+1 error
diff --git a/langtools/test/tools/javac/generics/typevars/6569404/T6569404c.java b/langtools/test/tools/javac/generics/typevars/6569404/T6569404c.java
new file mode 100644
index 00000000000..44bba4dd7e8
--- /dev/null
+++ b/langtools/test/tools/javac/generics/typevars/6569404/T6569404c.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6569404
+ * @summary Regression: Cannot instantiate an inner class of a type variable
+ * @author  mcimadamore
+ */
+
+public class T6569404c {
+    static class Outer {
+      class Inner {}
+    }
+
+    static class Test<X extends Outer>  {
+       class InnerTest extends X.Inner { InnerTest(Outer o) {o.super();} }
+    }
+
+    public static void main(String[] args) {
+       new Test<Outer>().new InnerTest(new Outer());
+    }
+}
diff --git a/langtools/test/tools/javac/generics/typevars/6680106/T6680106.java b/langtools/test/tools/javac/generics/typevars/6680106/T6680106.java
index 37bd7cad44f..0c7ab62a9a5 100644
--- a/langtools/test/tools/javac/generics/typevars/6680106/T6680106.java
+++ b/langtools/test/tools/javac/generics/typevars/6680106/T6680106.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6680106
  * @summary StackOverFlowError for Cyclic inheritance in TypeParameters with ArrayType Bounds
  * @author  Maurizio Cimadamore
diff --git a/langtools/test/tools/javac/generics/typevars/6680106/T6680106.out b/langtools/test/tools/javac/generics/typevars/6680106/T6680106.out
index f26d2a47c23..ae3b65907a1 100644
--- a/langtools/test/tools/javac/generics/typevars/6680106/T6680106.out
+++ b/langtools/test/tools/javac/generics/typevars/6680106/T6680106.out
@@ -1,13 +1,13 @@
-T6680106.java:34:25: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:35:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
-T6680106.java:35:40: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:36:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
-T6680106.java:36:40: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
-T6680106.java:36:55: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:37:30: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:38:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
-T6680106.java:38:50: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-T6680106.java:39:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
-T6680106.java:39:50: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
-T6680106.java:39:70: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
-12 errors
\ No newline at end of file
+T6680106.java:11:25: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:12:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
+T6680106.java:12:40: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:13:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
+T6680106.java:13:40: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
+T6680106.java:13:55: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:14:30: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:15:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
+T6680106.java:15:50: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+T6680106.java:16:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
+T6680106.java:16:50: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
+T6680106.java:16:70: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
+12 errors
diff --git a/langtools/test/tools/javac/generics/typevars/6804733/T6804733.java b/langtools/test/tools/javac/generics/typevars/6804733/T6804733.java
index 1e78e5ee2d0..cd4afcd0c94 100644
--- a/langtools/test/tools/javac/generics/typevars/6804733/T6804733.java
+++ b/langtools/test/tools/javac/generics/typevars/6804733/T6804733.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug     6804733
  * @summary javac generates spourious diagnostics for ill-formed type-variable bounds
  * @author  mcimadamore
diff --git a/langtools/test/tools/javac/generics/typevars/6804733/T6804733.out b/langtools/test/tools/javac/generics/typevars/6804733/T6804733.out
index c40724a71ea..60f7a2a1008 100644
--- a/langtools/test/tools/javac/generics/typevars/6804733/T6804733.out
+++ b/langtools/test/tools/javac/generics/typevars/6804733/T6804733.out
@@ -1,2 +1,2 @@
-T6804733.java:34:20: compiler.err.type.var.may.not.be.followed.by.other.bounds
+T6804733.java:11:20: compiler.err.type.var.may.not.be.followed.by.other.bounds
 1 error
diff --git a/langtools/test/tools/javac/innerClassFile/Driver.sh b/langtools/test/tools/javac/innerClassFile/Driver.sh
index f7449c7b350..8c45b66c4cf 100644
--- a/langtools/test/tools/javac/innerClassFile/Driver.sh
+++ b/langtools/test/tools/javac/innerClassFile/Driver.sh
@@ -23,6 +23,12 @@
 # have any questions.
 #
 
+# @test
+# @bug 4491755 4785453
+# @summary Prob w/static inner class with same name as a regular class
+# @author gafter
+#
+# @run shell Driver.sh
 
 if [ "${TESTSRC}" = "" ]
 then
@@ -47,14 +53,10 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
+  SunOS | Linux | CYGWIN* )
     FS="/"
     ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
     ;;
   * )
diff --git a/langtools/test/tools/javac/javazip/Test.sh b/langtools/test/tools/javac/javazip/Test.sh
index 556e656ed7e..21106c02474 100644
--- a/langtools/test/tools/javac/javazip/Test.sh
+++ b/langtools/test/tools/javac/javazip/Test.sh
@@ -42,14 +42,16 @@ fi
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
     FS="/"
+    SCR=`pwd`
+    ;;
+  CYGWIN* )
+    FS="/"
+    SCR=`pwd | cygpath -d`
     ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
+    SCR=`pwd`
     ;;
   * )
     echo "Unrecognized system!"
diff --git a/langtools/test/tools/javac/meth/InvokeMH_BAD68.java b/langtools/test/tools/javac/meth/InvokeMH_BAD68.java
deleted file mode 100644
index 5996ebbacc0..00000000000
--- a/langtools/test/tools/javac/meth/InvokeMH_BAD68.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * ##test
- * ##bug 6754038
- * ##summary Generate call sites for method handle
- * ##author jrose
- *
- * ##compile/fail -source 7 -target 7 InvokeMH_BAD68.java
- */
-
-/*
- * Standalone testing:
- * <code>
- * $ cd $MY_REPO_DIR/langtools
- * $ (cd make; make)
- * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/meth/InvokeMH_BAD68.java
- * $ javap -c -classpath dist meth.InvokeMH_BAD68
- * </code>
- */
-
-package meth;
-
-import java.dyn.MethodHandle;
-
-public class InvokeMH_BAD68 {
-    void test(MethodHandle mh_SiO,
-              MethodHandle mh_vS,
-              MethodHandle mh_vi,
-              MethodHandle mh_vv) {
-        Object o; String s; int i;  // for return type testing
-
-        // next five must have sig = (String,int)Object
-        mh_SiO.invoke("world", 123);
-        mh_SiO.invoke("mundus", 456);
-        Object k = "kosmos";
-        mh_SiO.invoke((String)k, 789);
-        o = mh_SiO.invoke((String)null, 000);
-        o = mh_SiO.<Object>invoke("arda", -123);
-
-        // sig = ()String
-        s = mh_vS.<String>invoke();
-
-        // sig = ()int
-        i = mh_vi.<int>invoke();
-        o = mh_vi.<int>invoke();
-    s = mh_vi.<int>invoke(); //BAD
-        mh_vi.<int>invoke();
-
-        // sig = ()void
-        //o = mh_vv.<void>invoke(); //BAD
-        mh_vv.<void>invoke();
-    }
-}
diff --git a/langtools/test/tools/javac/meth/InvokeMH_BAD72.java b/langtools/test/tools/javac/meth/InvokeMH_BAD72.java
deleted file mode 100644
index 826a7fe81c1..00000000000
--- a/langtools/test/tools/javac/meth/InvokeMH_BAD72.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * ##test
- * ##bug 6754038
- * ##summary Generate call sites for method handle
- * ##author jrose
- *
- * ##compile/fail -source 7 -target 7 InvokeMH_BAD72.java
- */
-
-/*
- * Standalone testing:
- * <code>
- * $ cd $MY_REPO_DIR/langtools
- * $ (cd make; make)
- * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/meth/InvokeMH_BAD72.java
- * $ javap -c -classpath dist meth.InvokeMH_BAD72
- * </code>
- */
-
-package meth;
-
-import java.dyn.MethodHandle;
-
-public class InvokeMH_BAD72 {
-    void test(MethodHandle mh_SiO,
-              MethodHandle mh_vS,
-              MethodHandle mh_vi,
-              MethodHandle mh_vv) {
-        Object o; String s; int i;  // for return type testing
-
-        // next five must have sig = (String,int)Object
-        mh_SiO.invoke("world", 123);
-        mh_SiO.invoke("mundus", 456);
-        Object k = "kosmos";
-        mh_SiO.invoke((String)k, 789);
-        o = mh_SiO.invoke((String)null, 000);
-        o = mh_SiO.<Object>invoke("arda", -123);
-
-        // sig = ()String
-        s = mh_vS.<String>invoke();
-
-        // sig = ()int
-        i = mh_vi.<int>invoke();
-        o = mh_vi.<int>invoke();
-        //s = mh_vi.<int>invoke(); //BAD
-        mh_vi.<int>invoke();
-
-        // sig = ()void
-    o = mh_vv.<void>invoke(); //BAD
-        mh_vv.<void>invoke();
-    }
-}
diff --git a/langtools/test/tools/javac/meth/MakeNegTests.sh b/langtools/test/tools/javac/meth/MakeNegTests.sh
index 587fa767830..5c694f97043 100644
--- a/langtools/test/tools/javac/meth/MakeNegTests.sh
+++ b/langtools/test/tools/javac/meth/MakeNegTests.sh
@@ -78,7 +78,7 @@ expand() {
 }
 
 getcasestem() {
-  echo "$1" | sed 's/\.java$//;s/_BAD[0-9]*$//;s/$/_BAD/'
+  echo `basename $1` | sed 's/\.java$//;s/_BAD[0-9]*$//;s/$/_BAD/'
 }
 
 testneg() {
diff --git a/langtools/test/tools/javac/newlines/Newlines.sh b/langtools/test/tools/javac/newlines/Newlines.sh
index 82e75d953a9..ccd7e31d73e 100644
--- a/langtools/test/tools/javac/newlines/Newlines.sh
+++ b/langtools/test/tools/javac/newlines/Newlines.sh
@@ -50,14 +50,10 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
-    NULL=/dev/null
-    PS=":"
+  SunOS | Linux | CYGWIN* )
     FS="/"
     ;;
   Windows* )
-    NULL=NUL
-    PS=";"
     FS="\\"
     ;;
   * )
diff --git a/langtools/test/tools/javac/policy/test2/byfile.AB.out b/langtools/test/tools/javac/policy/test2/byfile.AB.out
index fdc7d872350..6d152c873aa 100644
--- a/langtools/test/tools/javac/policy/test2/byfile.AB.out
+++ b/langtools/test/tools/javac/policy/test2/byfile.AB.out
@@ -2,6 +2,7 @@
 [flow A]
 [attribute B]
 [flow B]
+[desugar B]
 [desugar A]
 [generate code A.A1]
 [generate code A.A2]
@@ -10,6 +11,5 @@
 [generate code <anonymous A$A4$1>]
 [generate code A.A4]
 [generate code A]
-[desugar B]
 [generate code B.Inner]
 [generate code B]
diff --git a/langtools/test/tools/javac/policy/test2/bytodo.AB.out b/langtools/test/tools/javac/policy/test2/bytodo.AB.out
index fdc7d872350..6d152c873aa 100644
--- a/langtools/test/tools/javac/policy/test2/bytodo.AB.out
+++ b/langtools/test/tools/javac/policy/test2/bytodo.AB.out
@@ -2,6 +2,7 @@
 [flow A]
 [attribute B]
 [flow B]
+[desugar B]
 [desugar A]
 [generate code A.A1]
 [generate code A.A2]
@@ -10,6 +11,5 @@
 [generate code <anonymous A$A4$1>]
 [generate code A.A4]
 [generate code A]
-[desugar B]
 [generate code B.Inner]
 [generate code B]
diff --git a/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java b/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java
index 867c3c40b97..889a227d992 100644
--- a/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java
+++ b/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java
@@ -188,14 +188,18 @@ public class TestElementsAnnotatedWith extends AbstractProcessor {
             // Copy the bytes over
             System.out.println((new File(".")).getAbsolutePath());
             InputStream io = new BufferedInputStream(new FileInputStream(new File(".", "Foo.class")));
-            int datum = io.read();
-            while(datum != -1) {
-                os.write(datum);
-                datum = io.read();
+            try {
+                int datum = io.read();
+                while(datum != -1) {
+                    os.write(datum);
+                    datum = io.read();
+                }
+            } finally {
+                io.close();
             }
             os.close();
-        } catch (IOException io) {
-            throw new RuntimeException(io);
+        } catch (IOException ioe) {
+            throw new RuntimeException(ioe);
         }
 
 
diff --git a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java
index 6cb584a084b..f2e47d393ee 100644
--- a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java
+++ b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java
@@ -95,7 +95,7 @@ public class Main {
         javac = null;
         elements = null;
 
-        javac = (JavacTask)tool.getTask(null, null, null, null, null, null);
+        javac = (JavacTask)tool.getTask(null, fm, null, null, null, null);
         elements = javac.getElements();
 
         for (String name : packages) {
diff --git a/langtools/test/tools/javac/quid/MakeNegTests.sh b/langtools/test/tools/javac/quid/MakeNegTests.sh
index 16fc724ba62..884110533b5 100644
--- a/langtools/test/tools/javac/quid/MakeNegTests.sh
+++ b/langtools/test/tools/javac/quid/MakeNegTests.sh
@@ -77,7 +77,7 @@ expand() {
 }
 
 getcasestem() {
-  echo "$1" | sed 's/\.java$//;s/_BAD[0-9]*$//;s/$/_BAD/'
+  echo `basename $1` | sed 's/.*\///;s/\.java$//;s/_BAD[0-9]*$//;s/$/_BAD/'
 }
 
 testneg() {
diff --git a/langtools/test/tools/javac/quid/QuotedIdent.java b/langtools/test/tools/javac/quid/QuotedIdent.java
index 10e34dbc555..9b7c2c4128e 100644
--- a/langtools/test/tools/javac/quid/QuotedIdent.java
+++ b/langtools/test/tools/javac/quid/QuotedIdent.java
@@ -26,6 +26,9 @@
  * @bug 6746458
  * @summary Verify correct lexing of quoted identifiers.
  * @author jrose
+ * @ignore 6877225 test fails on Windows:
+ *      QuotedIdent.java:81: error while writing QuotedIdent.*86: PATH\QuotedIdent$*86.class
+ *      (The filename, directory name, or volume label syntax is incorrect)
  *
  * @library ..
  * @run main quid.QuotedIdent
diff --git a/langtools/test/tools/javac/quid/QuotedIdent2.java b/langtools/test/tools/javac/quid/QuotedIdent2.java
index 2df94cd927b..0697c241f64 100644
--- a/langtools/test/tools/javac/quid/QuotedIdent2.java
+++ b/langtools/test/tools/javac/quid/QuotedIdent2.java
@@ -26,6 +26,9 @@
  * @bug 6746458
  * @summary Verify correct separate compilation of classes with extended identifiers.
  * @author jrose
+ * @ignore 6877225 test fails on Windows:
+ *      QuotedIdent.java:81: error while writing QuotedIdent.*86: PATH\QuotedIdent$*86.class
+ *      (The filename, directory name, or volume label syntax is incorrect)
  *
  * @library ..
  * @run main quid.QuotedIdent2
diff --git a/langtools/test/tools/javac/quid/QuotedIdent_BAD61.java b/langtools/test/tools/javac/quid/QuotedIdent_BAD61.java
deleted file mode 100644
index 7957a0b2931..00000000000
--- a/langtools/test/tools/javac/quid/QuotedIdent_BAD61.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * ##test
- * ##bug 6746458
- * ##summary Verify correct lexing of quoted identifiers.
- * ##author jrose
- *
- * ##library ..
- * ##run main quid.QuotedIdent_BAD61
- */
-
-/*
- * Standalone testing:
- * <code>
- * $ cd $MY_REPO_DIR/langtools
- * $ (cd make; make)
- * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/quid/QuotedIdent_BAD61.java
- * $ java -version  # should print 1.6 or later
- * $ java -cp dist quid.QuotedIdent_BAD61
- * </code>
- */
-
-package quid;
-
-public class QuotedIdent_BAD61 {
-    static void check(int testid, String have, String expect)
-                throws RuntimeException {
-        if ((have == null && have != expect) ||
-                (have != null && !have.equals(expect))) {
-            String msg =
-                "TEST " + testid + ": HAVE \"" +
-                have + "\" EXPECT \"" + expect + "\"";
-            System.out.println("StringConversion: " + msg);
-            throw new RuntimeException(msg);
-        }
-    }
-
-    // negative tests:
-    static class #"" { } //BAD empty ident name
-    //static class #"<foo>" { } //BAD bad char in ident name
-    /*static class /*(//BAD ident name interrupted by newline) #"jump:
-    " { } /* uncomment previous line to attempt class w/ bad name */
-
-    static class #"int" extends Number {
-        final int #"int";
-        #"int"(int #"int") {
-            this.#"int" = #"int";
-        }
-        static #"int" valueOf(int #"int") {
-            return new #"int"(#"int");
-        }
-        public int intValue() { return #"int"; }
-        public long longValue() { return #"int"; }
-        public float floatValue() { return #"int"; }
-        public double doubleValue() { return #"int"; }
-        public String toString() { return String.valueOf(#"int"); }
-    }
-
-    class #"*86" {
-        String #"555-1212"() { return "[*86.555-1212]"; }
-    }
-    static#"*86"#"MAKE-*86"() {   // note close spacing
-        return new QuotedIdent_BAD61().new#"*86"();
-    }
-
-    static String bar() { return "[bar]"; }
-
-    public static void main(String[] args) throws Exception {
-        String s;
-
-        String #"sticky \' wicket" = "wicked ' stick";
-        s = #"sticky ' wicket";
-        check(11, s, "wicked \' stick");
-        check(12, #"s", s);
-        check(13, #"\163", s);
-
-        s = #"QuotedIdent_BAD61".bar();
-        check(21, s, "[bar]");
-
-        s = #"int".valueOf(123).toString();
-        check(22, s, "123");
-
-        s = #"MAKE-*86"().#"555-1212"();
-        check(23, s, "[*86.555-1212]");
-
-        class#"{{{inmost}}}" { }
-        s = new#"{{{inmost}}}"().getClass().getName();
-        if (!s.endsWith("{{{inmost}}}"))
-            check(24, s, "should end with \"{{{inmost}}}\"");
-
-        s = #"Yog-Shoggoth".#"(nameless ululation)";
-        check(25, s, "Tekeli-li!");
-
-        s = #"int".class.getName();
-        check(31, s, QuotedIdent_BAD61.class.getName()+"$int");
-
-        Class x86 = Class.forName(QuotedIdent_BAD61.class.getName()+"$*86");
-        if (x86 != #"*86".class)
-            check(32, "reflected "+x86, "static "+#"*86".class);
-
-        s = (String) x86.getDeclaredMethod("555-1212").invoke(#"MAKE-*86"());
-        check(31, s, "[*86.555-1212]");
-
-        System.out.println("OK");
-    }
-}
-
-interface #"Yog-Shoggoth" {
-    final String #"(nameless ululation)" = "Tekeli-li!";
-}
diff --git a/langtools/test/tools/javac/quid/QuotedIdent_BAD62.java b/langtools/test/tools/javac/quid/QuotedIdent_BAD62.java
deleted file mode 100644
index f298a6af695..00000000000
--- a/langtools/test/tools/javac/quid/QuotedIdent_BAD62.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * ##test
- * ##bug 6746458
- * ##summary Verify correct lexing of quoted identifiers.
- * ##author jrose
- *
- * ##library ..
- * ##run main quid.QuotedIdent_BAD62
- */
-
-/*
- * Standalone testing:
- * <code>
- * $ cd $MY_REPO_DIR/langtools
- * $ (cd make; make)
- * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/quid/QuotedIdent_BAD62.java
- * $ java -version  # should print 1.6 or later
- * $ java -cp dist quid.QuotedIdent_BAD62
- * </code>
- */
-
-package quid;
-
-public class QuotedIdent_BAD62 {
-    static void check(int testid, String have, String expect)
-                throws RuntimeException {
-        if ((have == null && have != expect) ||
-                (have != null && !have.equals(expect))) {
-            String msg =
-                "TEST " + testid + ": HAVE \"" +
-                have + "\" EXPECT \"" + expect + "\"";
-            System.out.println("StringConversion: " + msg);
-            throw new RuntimeException(msg);
-        }
-    }
-
-    // negative tests:
-    //static class #"" { } //BAD empty ident name
-    static class #"<foo>" { } //BAD bad char in ident name
-    /*static class /*(//BAD ident name interrupted by newline) #"jump:
-    " { } /* uncomment previous line to attempt class w/ bad name */
-
-    static class #"int" extends Number {
-        final int #"int";
-        #"int"(int #"int") {
-            this.#"int" = #"int";
-        }
-        static #"int" valueOf(int #"int") {
-            return new #"int"(#"int");
-        }
-        public int intValue() { return #"int"; }
-        public long longValue() { return #"int"; }
-        public float floatValue() { return #"int"; }
-        public double doubleValue() { return #"int"; }
-        public String toString() { return String.valueOf(#"int"); }
-    }
-
-    class #"*86" {
-        String #"555-1212"() { return "[*86.555-1212]"; }
-    }
-    static#"*86"#"MAKE-*86"() {   // note close spacing
-        return new QuotedIdent_BAD62().new#"*86"();
-    }
-
-    static String bar() { return "[bar]"; }
-
-    public static void main(String[] args) throws Exception {
-        String s;
-
-        String #"sticky \' wicket" = "wicked ' stick";
-        s = #"sticky ' wicket";
-        check(11, s, "wicked \' stick");
-        check(12, #"s", s);
-        check(13, #"\163", s);
-
-        s = #"QuotedIdent_BAD62".bar();
-        check(21, s, "[bar]");
-
-        s = #"int".valueOf(123).toString();
-        check(22, s, "123");
-
-        s = #"MAKE-*86"().#"555-1212"();
-        check(23, s, "[*86.555-1212]");
-
-        class#"{{{inmost}}}" { }
-        s = new#"{{{inmost}}}"().getClass().getName();
-        if (!s.endsWith("{{{inmost}}}"))
-            check(24, s, "should end with \"{{{inmost}}}\"");
-
-        s = #"Yog-Shoggoth".#"(nameless ululation)";
-        check(25, s, "Tekeli-li!");
-
-        s = #"int".class.getName();
-        check(31, s, QuotedIdent_BAD62.class.getName()+"$int");
-
-        Class x86 = Class.forName(QuotedIdent_BAD62.class.getName()+"$*86");
-        if (x86 != #"*86".class)
-            check(32, "reflected "+x86, "static "+#"*86".class);
-
-        s = (String) x86.getDeclaredMethod("555-1212").invoke(#"MAKE-*86"());
-        check(31, s, "[*86.555-1212]");
-
-        System.out.println("OK");
-    }
-}
-
-interface #"Yog-Shoggoth" {
-    final String #"(nameless ululation)" = "Tekeli-li!";
-}
diff --git a/langtools/test/tools/javac/quid/QuotedIdent_BAD63.java b/langtools/test/tools/javac/quid/QuotedIdent_BAD63.java
deleted file mode 100644
index 8b266c94d51..00000000000
--- a/langtools/test/tools/javac/quid/QuotedIdent_BAD63.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * ##test
- * ##bug 6746458
- * ##summary Verify correct lexing of quoted identifiers.
- * ##author jrose
- *
- * ##library ..
- * ##run main quid.QuotedIdent_BAD63
- */
-
-/*
- * Standalone testing:
- * <code>
- * $ cd $MY_REPO_DIR/langtools
- * $ (cd make; make)
- * $ ./dist/bootstrap/bin/javac -d dist test/tools/javac/quid/QuotedIdent_BAD63.java
- * $ java -version  # should print 1.6 or later
- * $ java -cp dist quid.QuotedIdent_BAD63
- * </code>
- */
-
-package quid;
-
-public class QuotedIdent_BAD63 {
-    static void check(int testid, String have, String expect)
-                throws RuntimeException {
-        if ((have == null && have != expect) ||
-                (have != null && !have.equals(expect))) {
-            String msg =
-                "TEST " + testid + ": HAVE \"" +
-                have + "\" EXPECT \"" + expect + "\"";
-            System.out.println("StringConversion: " + msg);
-            throw new RuntimeException(msg);
-        }
-    }
-
-    // negative tests:
-    //static class #"" { } //BAD empty ident name
-    //static class #"<foo>" { } //BAD bad char in ident name
-    static class /*(//BAD ident name interrupted by newline) #"jump:
-    " { } /* uncomment previous line to attempt class w/ bad name */
-
-    static class #"int" extends Number {
-        final int #"int";
-        #"int"(int #"int") {
-            this.#"int" = #"int";
-        }
-        static #"int" valueOf(int #"int") {
-            return new #"int"(#"int");
-        }
-        public int intValue() { return #"int"; }
-        public long longValue() { return #"int"; }
-        public float floatValue() { return #"int"; }
-        public double doubleValue() { return #"int"; }
-        public String toString() { return String.valueOf(#"int"); }
-    }
-
-    class #"*86" {
-        String #"555-1212"() { return "[*86.555-1212]"; }
-    }
-    static#"*86"#"MAKE-*86"() {   // note close spacing
-        return new QuotedIdent_BAD63().new#"*86"();
-    }
-
-    static String bar() { return "[bar]"; }
-
-    public static void main(String[] args) throws Exception {
-        String s;
-
-        String #"sticky \' wicket" = "wicked ' stick";
-        s = #"sticky ' wicket";
-        check(11, s, "wicked \' stick");
-        check(12, #"s", s);
-        check(13, #"\163", s);
-
-        s = #"QuotedIdent_BAD63".bar();
-        check(21, s, "[bar]");
-
-        s = #"int".valueOf(123).toString();
-        check(22, s, "123");
-
-        s = #"MAKE-*86"().#"555-1212"();
-        check(23, s, "[*86.555-1212]");
-
-        class#"{{{inmost}}}" { }
-        s = new#"{{{inmost}}}"().getClass().getName();
-        if (!s.endsWith("{{{inmost}}}"))
-            check(24, s, "should end with \"{{{inmost}}}\"");
-
-        s = #"Yog-Shoggoth".#"(nameless ululation)";
-        check(25, s, "Tekeli-li!");
-
-        s = #"int".class.getName();
-        check(31, s, QuotedIdent_BAD63.class.getName()+"$int");
-
-        Class x86 = Class.forName(QuotedIdent_BAD63.class.getName()+"$*86");
-        if (x86 != #"*86".class)
-            check(32, "reflected "+x86, "static "+#"*86".class);
-
-        s = (String) x86.getDeclaredMethod("555-1212").invoke(#"MAKE-*86"());
-        check(31, s, "[*86.555-1212]");
-
-        System.out.println("OK");
-    }
-}
-
-interface #"Yog-Shoggoth" {
-    final String #"(nameless ululation)" = "Tekeli-li!";
-}
diff --git a/langtools/test/tools/javac/stackmap/T4955930.sh b/langtools/test/tools/javac/stackmap/T4955930.sh
index c9e4e9131ea..ee298660972 100644
--- a/langtools/test/tools/javac/stackmap/T4955930.sh
+++ b/langtools/test/tools/javac/stackmap/T4955930.sh
@@ -41,7 +41,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | CYGWIN* )
     FS="/"
     ;;
   Windows_95 | Windows_98 | Windows_NT )
diff --git a/langtools/test/tools/javac/typeAnnotations/InnerClass.java b/langtools/test/tools/javac/typeAnnotations/InnerClass.java
index fd14cea782a..dba8202be90 100644
--- a/langtools/test/tools/javac/typeAnnotations/InnerClass.java
+++ b/langtools/test/tools/javac/typeAnnotations/InnerClass.java
@@ -30,9 +30,30 @@
  */
 
 class InnerClass {
+
+    InnerClass() {}
+    InnerClass(Object o) {}
+
     private void a() {
         new Object() {
             public <R> void method() { }
         };
     }
+
+    Object f1 = new InnerClass() {
+            <R> void method() { }
+        };
+
+    Object f2 = new InnerClass() {
+            <@A R> void method() { }
+        };
+
+    Object f3 = new InnerClass(null) {
+            <R> void method() { }
+        };
+
+    Object f4 = new InnerClass(null) {
+            <@A R> void method() { }
+        };
+    @interface A { }
 }
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java b/langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java
index eb9a6aa4741..d9d74acca60 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test that only java 7 allows type annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out b/langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out
index 3641d7ec2f6..521a5eb8005 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out
@@ -1,2 +1,2 @@
-AnnotationVersion.java:32:25: compiler.err.type.annotations.not.supported.in.source: 1.6
+AnnotationVersion.java:9:25: compiler.err.type.annotations.not.supported.in.source: 1.6
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.java b/langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.java
index 0f7f7294d72..8edb60807d4 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test incomplete array declaration
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.out b/langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.out
index 2ac71be077c..a03a09283ee 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/IncompleteArray.out
@@ -1,2 +1,2 @@
-IncompleteArray.java:32:13: compiler.err.illegal.start.of.type
+IncompleteArray.java:9:13: compiler.err.illegal.start.of.type
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java b/langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java
index 0d05ea960b1..b54df921ec4 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test incomplete vararg declaration
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out b/langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out
index a2a3dede27d..7cec6c9ee78 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out
@@ -1,2 +1,2 @@
-IncompleteVararg.java:33:19: compiler.err.illegal.start.of.type
+IncompleteVararg.java:10:19: compiler.err.illegal.start.of.type
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/IndexArray.java b/langtools/test/tools/javac/typeAnnotations/failures/IndexArray.java
index a28b33775cd..5cb324d0cdb 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/IndexArray.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/IndexArray.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test indexing of an array
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/IndexArray.out b/langtools/test/tools/javac/typeAnnotations/failures/IndexArray.out
index 2ed37c2c22e..762f38b15a8 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/IndexArray.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/IndexArray.out
@@ -1,2 +1,2 @@
-IndexArray.java:33:15: compiler.err.illegal.start.of.expr
+IndexArray.java:10:15: compiler.err.illegal.start.of.expr
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/LintCast.java b/langtools/test/tools/javac/typeAnnotations/failures/LintCast.java
index 6a6ac091202..4830de3ebf2 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/LintCast.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/LintCast.java
@@ -1,30 +1,7 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 import java.util.List;
 
 /*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test that compiler doesn't warn about annotated redundant casts
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/LintCast.out b/langtools/test/tools/javac/typeAnnotations/failures/LintCast.out
index d5518eaf272..67388ab2f4d 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/LintCast.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/LintCast.out
@@ -1,6 +1,6 @@
-LintCast.java:36:21: compiler.warn.redundant.cast: java.lang.String
-LintCast.java:42:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
-LintCast.java:48:20: compiler.warn.redundant.cast: int[]
-LintCast.java:60:24: compiler.warn.redundant.cast: java.lang.String
-LintCast.java:61:26: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:13:21: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:19:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
+LintCast.java:25:20: compiler.warn.redundant.cast: int[]
+LintCast.java:37:24: compiler.warn.redundant.cast: java.lang.String
+LintCast.java:38:26: compiler.warn.redundant.cast: java.lang.String
 5 warnings
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/Scopes.java b/langtools/test/tools/javac/typeAnnotations/failures/Scopes.java
index aea679848f3..71eda33a775 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/Scopes.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/Scopes.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check that A is accessible in the class type parameters
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/Scopes.out b/langtools/test/tools/javac/typeAnnotations/failures/Scopes.out
index 1d6a58918ad..3335f6ecff1 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/Scopes.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/Scopes.out
@@ -1,2 +1,2 @@
-Scopes.java:31:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , 
+Scopes.java:8:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , 
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/StaticFields.java b/langtools/test/tools/javac/typeAnnotations/failures/StaticFields.java
index 444df4b8ea8..8b96bf6c2f1 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/StaticFields.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/StaticFields.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary static field access isn't a valid location
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/StaticFields.out b/langtools/test/tools/javac/typeAnnotations/failures/StaticFields.out
index 3711d8e5d2e..3364c661fdb 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/StaticFields.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/StaticFields.out
@@ -1,2 +1,2 @@
-StaticFields.java:33:17: compiler.err.illegal.start.of.expr
+StaticFields.java:10:17: compiler.err.illegal.start.of.expr
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.java b/langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.java
index 8ce28e15919..045601c97a7 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary static methods don't have receivers
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.out b/langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.out
index c01765391e3..d3ec9a5538f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/StaticMethods.out
@@ -1,2 +1,2 @@
-StaticMethods.java:32:22: compiler.err.annotation.type.not.applicable
+StaticMethods.java:9:22: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java
index f79f12b039f..6f799a3bed9 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out
index 306de6a9e14..246db0dda0c 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:45: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:10:45: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java
index da536887c67..1b79248293e 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out
index c5d7d7f1d9a..f9ae0eda9de 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:34:26: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:11:26: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java
index 24fc0464dec..1f7477d3945 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out
index 7b051eb4316..20d6f4835dd 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:34:23: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:11:23: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java
index d0e77ff5c27..798df949c41 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out
index d727f8d758e..6b00f8c7904 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:23: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:23: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java
index 9d4776ec60b..03fa35acf4c 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out
index fd2f31425d3..dc869843a9f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:34: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:10:34: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java
index cdc51a1ab93..79cf843d62a 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out
index 37d17b5ef3c..5647c04430e 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:34:15: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:11:15: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java
index 376c06c4667..08a88db5e3e 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out
index d83d7cd8bfb..868ab979837 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:34:12: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:11:12: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java
index f4f85600060..dc73272adba 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out
index 08dc08ac0c0..74a7ef7340b 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:12: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:12: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java
index 44516b97a12..b6986ec15d3 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out
index e433ac250af..79609fbb2a0 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:39: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:10:39: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java
index f9bfbbef007..66cb0bd7fd9 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out
index 9b083925496..accba46be32 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:33:20: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:10:20: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java
index f1d45c1c4d0..d93fb8dff15 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out
index 10b9a626691..b74ad54ba94 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:33:17: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:10:17: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java
index c0bf43c6673..da47aeaa705 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out
index 34d7dacd195..637ff4acc0a 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:17: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:17: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java
index a227a8c9bda..bd43302b4fe 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out
index 681f9edd694..e82b535e398 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:51: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:10:51: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java
index 173e7ac1a7d..d8ad961afaa 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out
index e79241407e1..7b13962b5d0 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:34:32: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:11:32: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java
index 4005a881370..7071e9a0c24 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out
index a7c6f0dffa8..1d98d174319 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:34:29: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:11:29: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java
index 84d0d532a80..3817df58223 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out
index 40c1dbdf823..6865348250b 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:29: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:29: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java
index 8555cf47a2f..90ca759bd87 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out
index d2adcfc1e5a..659fff910f5 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:31:64: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:8:64: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java
index 79bb9319b15..7fdb5c992da 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out
index d011479fda8..3b97ec81f46 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:32:38: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:9:38: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java
index 1ace2f7387c..30a43321dc2 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out
index 088c937b692..d474f174346 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:32:33: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:9:33: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java
index f48b773bc7c..ac73a70035f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out
index e063fab6704..b6d727e835f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:31:40: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:8:40: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java
index 1b59ef3ed6b..6be2e07806a 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values in receiver
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out
index 75b0f7b0be0..94d59e5110f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:32:37: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:9:37: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java
index 4789aed9a2a..791497cd445 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations in receiver
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out
index fd2bb8f1c67..565aae06318 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:33:18: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:10:18: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java
index ee8aab6c301..8ffd9e244aa 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out
index 5eeababe579..c82f335cfa3 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:33:15: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:10:15: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java
index 4ed78c4a5fc..e4b8536ef65 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out
index dad15eaed60..f3f66d2e428 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:32:15: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:9:15: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java
index 6f5f6d68e12..70621e74940 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for Duplicate annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out
index 31dafaee3ff..0b3be7cc3fd 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:33:9: compiler.err.annotation.missing.default.value: A, field
+DuplicateAnnotationValue.java:10:9: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java
index 36e9b4fd246..ae541996fd4 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out
index e5376a42880..13b6046e94c 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:34:12: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:11:12: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java
index 88d2d75dddf..92f38ae479c 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out
index b5775924f6f..ad9861c2f6f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:34:9: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:11:9: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.java
index b4cc6d43b73..6b64f2d54c8 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out
index fae5977b629..f83f6dfa58a 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:33:9: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:10:9: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java
index fdb28186036..a923ec6f86e 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out
index b8b1b1d647c..a5d0e034e87 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:32:50: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:9:50: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java
index 223346fbca0..3877a001b47 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out
index 4859b2477eb..738591669fe 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:33:24: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:10:24: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java
index 9e74f32fed2..7affd108e72 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out
index a3c4e447d33..30841b78f0f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:33:19: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:10:19: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java
index 39e360ee74a..fe078ab98fe 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out
index 32465429a6f..749442f45b6 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:32:26: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:9:26: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java
index 8e3d80acc2e..2a9ebdab26f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out
index b0d32e1fbc3..b9f0dc72144 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:31:54: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:8:54: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java
index 631bd806fa7..1fb65c74f33 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out
index d3dc53e3418..6e7a1af2bd3 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:32:28: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:9:28: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java
index cbee4ed0619..c9d00c4f55c 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out
index b4c473704fe..87d42a278c4 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:32:23: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:9:23: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java
index 3e2749a7833..9d4cbef2e9a 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out
index 72682fc4473..acac021869b 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:31:30: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:8:30: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java
index a1578f15bfc..387976bbc74 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotation values for type parameter
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out
index b8b1b1d647c..a5d0e034e87 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out
@@ -1,2 +1,2 @@
-DuplicateAnnotationValue.java:32:50: compiler.err.duplicate.annotation.member.value: value, A
+DuplicateAnnotationValue.java:9:50: compiler.err.duplicate.annotation.member.value: value, A
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java
index b0f60e2f5e6..b6a2e47d87a 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for duplicate annotations
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out
index 4859b2477eb..738591669fe 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out
@@ -1,2 +1,2 @@
-DuplicateTypeAnnotation.java:33:24: compiler.err.duplicate.annotation
+DuplicateTypeAnnotation.java:10:24: compiler.err.duplicate.annotation
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java
index c925b618033..addb1e8dcff 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for invalid annotatins given the target
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.out b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.out
index a3c4e447d33..30841b78f0f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.out
@@ -1,2 +1,2 @@
-InvalidLocation.java:33:19: compiler.err.annotation.type.not.applicable
+InvalidLocation.java:10:19: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java
index 02c28d1ee9b..1178294799f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary check for missing annotation value
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out
index 32465429a6f..749442f45b6 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out
@@ -1,2 +1,2 @@
-MissingAnnotationValue.java:32:26: compiler.err.annotation.missing.default.value: A, field
+MissingAnnotationValue.java:9:26: compiler.err.annotation.missing.default.value: A, field
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.java b/langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.java
index 3b783f4ef08..284a9649a1b 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test invalid location of TypeUse
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.out b/langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.out
index 4976003f856..5114f23816f 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/Constructor.out
@@ -1,2 +1,2 @@
-Constructor.java:36:3: compiler.err.annotation.type.not.applicable
+Constructor.java:13:3: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java b/langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java
index 0f7f7294d72..8edb60807d4 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test incomplete array declaration
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out b/langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out
index 2ac71be077c..a03a09283ee 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out
@@ -1,2 +1,2 @@
-IncompleteArray.java:32:13: compiler.err.illegal.start.of.type
+IncompleteArray.java:9:13: compiler.err.illegal.start.of.type
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java b/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java
index fd8d3c5486b..457a7ef6730 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test invalid location of TypeUse
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out b/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out
index 57bc09d6aca..8c6dcaf8b39 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.out
@@ -1,3 +1,3 @@
-NotTypeParameter.java:36:3: compiler.err.annotation.type.not.applicable
-NotTypeParameter.java:35:18: compiler.err.annotation.type.not.applicable
+NotTypeParameter.java:13:3: compiler.err.annotation.type.not.applicable
+NotTypeParameter.java:12:18: compiler.err.annotation.type.not.applicable
 2 errors
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java b/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java
index 01e76202ef0..407c0b218dd 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test invalid location of TypeUse
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out b/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out
index d0f92f3be7b..9728d3589ec 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out
@@ -1,2 +1,2 @@
-NotTypeUse.java:36:3: compiler.err.annotation.type.not.applicable
+NotTypeUse.java:13:3: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java b/langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java
index 0c793491804..a16bf1917fe 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java
@@ -1,28 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-/*
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6843077
  * @summary test invalid location of TypeUse
  * @author Mahmood Ali
diff --git a/langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out b/langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out
index 044da8f96dd..b7569540158 100644
--- a/langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out
+++ b/langtools/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out
@@ -1,2 +1,2 @@
-VoidMethod.java:36:3: compiler.err.annotation.type.not.applicable
+VoidMethod.java:13:3: compiler.err.annotation.type.not.applicable
 1 error
diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh b/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh
index 678c818f596..79da2becc7b 100644
--- a/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh
+++ b/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh
@@ -75,6 +75,11 @@ case "$OS" in
     PS=";"
     FS="\\"
     ;;
+  CYGWIN* )
+    ENV=""
+    PS=";" # platform PS, not cygwin PS
+    FS="/"
+    ;;
   * )
     echo "Unrecognized system!"
     exit 1;
diff --git a/langtools/test/tools/javac/varargs/6806876/T6806876.java b/langtools/test/tools/javac/varargs/6806876/T6806876.java
new file mode 100644
index 00000000000..8e0bb721858
--- /dev/null
+++ b/langtools/test/tools/javac/varargs/6806876/T6806876.java
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug     6806876
+ * @author mcimadamore
+ * @summary  ClassCastException occurs in assignment expressions without any heap pollutions
+ * @compile/fail/ref=T6806876.out -Xlint:unchecked -Werror -XDrawDiagnostics T6806876.java
+ */
+
+class T6806876 {
+    void test(Integer i, Long l) {
+        Comparable<?>[] res = m(i, l);
+    }
+
+    <T> T[] m(T...a) {
+        return null;
+    }
+}
diff --git a/langtools/test/tools/javac/varargs/6806876/T6806876.out b/langtools/test/tools/javac/varargs/6806876/T6806876.out
new file mode 100644
index 00000000000..4ebb086821a
--- /dev/null
+++ b/langtools/test/tools/javac/varargs/6806876/T6806876.out
@@ -0,0 +1,4 @@
+T6806876.java:11:32: compiler.warn.unchecked.generic.array.creation: java.lang.Number&java.lang.Comparable<? extends java.lang.Number&java.lang.Comparable<?>>[]
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/langtools/test/tools/javac/warnings/6747671/T6747671.java b/langtools/test/tools/javac/warnings/6747671/T6747671.java
index e7597b5439e..4bb0855257a 100644
--- a/langtools/test/tools/javac/warnings/6747671/T6747671.java
+++ b/langtools/test/tools/javac/warnings/6747671/T6747671.java
@@ -1,28 +1,5 @@
-/*
- * Copyright 2008 Sun Microsystems, Inc.  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.
- *
- * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
 /**
- * @test
+ * @test /nodynamiccopyright/
  * @bug 6747671
  * @summary -Xlint:rawtypes
  * @compile/ref=T6747671.out -XDrawDiagnostics -Xlint:rawtypes T6747671.java
@@ -55,4 +32,4 @@ class T6747671<E> {
         A a2 = new A() {};//raw warning (2)
         a2.new Z() {};//raw warning
     }
-}
\ No newline at end of file
+}
diff --git a/langtools/test/tools/javac/warnings/6747671/T6747671.out b/langtools/test/tools/javac/warnings/6747671/T6747671.out
index 6e8c357821f..cc17bdb90ef 100644
--- a/langtools/test/tools/javac/warnings/6747671/T6747671.out
+++ b/langtools/test/tools/javac/warnings/6747671/T6747671.out
@@ -1,12 +1,12 @@
-T6747671.java:42:6: compiler.warn.raw.class.use: T6747671.A.X, T6747671<E>.A<X>.X
-T6747671.java:43:6: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
-T6747671.java:46:13: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
-T6747671.java:50:14: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
-T6747671.java:50:7: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
-T6747671.java:52:28: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
-T6747671.java:53:37: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
-T6747671.java:54:21: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
-T6747671.java:55:9: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
-T6747671.java:55:20: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
-T6747671.java:56:16: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
-11 warnings
\ No newline at end of file
+T6747671.java:19:6: compiler.warn.raw.class.use: T6747671.A.X, T6747671<E>.A<X>.X
+T6747671.java:20:6: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
+T6747671.java:23:13: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:27:14: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:27:7: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:29:28: compiler.warn.raw.class.use: T6747671.B, T6747671.B<X>
+T6747671.java:30:37: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
+T6747671.java:31:21: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
+T6747671.java:32:9: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
+T6747671.java:32:20: compiler.warn.raw.class.use: T6747671.A, T6747671<E>.A<X>
+T6747671.java:33:16: compiler.warn.raw.class.use: T6747671.A.Z, T6747671<E>.A<X>.Z<Y>
+11 warnings
diff --git a/langtools/test/tools/javah/6257087/foo.sh b/langtools/test/tools/javah/6257087/foo.sh
index f4355c94ed2..74d8ab46692 100644
--- a/langtools/test/tools/javah/6257087/foo.sh
+++ b/langtools/test/tools/javah/6257087/foo.sh
@@ -42,12 +42,15 @@ fi
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=":"
+    FS="/"
+    DIFFOPTS="--strip-trailing-cr"
+    ;;
   Windows* )
-    NULL=NUL
     PS=";"
     FS="\\"
     ;;
@@ -57,9 +60,9 @@ case "$OS" in
     ;;
 esac
 
-"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TC}" "${TS}${FS}foo.java" > ${NULL}
+"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d "${TC}" "${TS}${FS}foo.java" 
 "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} -classpath "${TC}" -d "${TC}" foo
-diff -c "${TS}${FS}foo_bar.h" "${TC}${FS}foo_bar.h"
+diff ${DIFFOPTS} -c "${TS}${FS}foo_bar.h" "${TC}${FS}foo_bar.h"
 result=$?
 
 if [ $result -eq 0 ]
diff --git a/langtools/test/tools/javah/ConstMacroTest.sh b/langtools/test/tools/javah/ConstMacroTest.sh
index eed3691ad5b..5c62c34178e 100644
--- a/langtools/test/tools/javah/ConstMacroTest.sh
+++ b/langtools/test/tools/javah/ConstMacroTest.sh
@@ -57,12 +57,16 @@ EXPECTED_JAVAH_OUT_FILE=SubClassConsts.out
 OS=`uname -s`
 case "$OS" in
   SunOS | Linux )
-    NULL=/dev/null
     PS=":"
     FS="/"
     ;;
+  CYGWIN* )
+    PS=":"
+    FS="/"
+    DIFFOPTS="--strip-trailing-cr"
+    EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win
+    ;;
   Windows* )
-    NULL=NUL
     PS=";"
     FS="\\"
     EXPECTED_JAVAH_OUT_FILE=SubClassConsts.win
@@ -85,7 +89,7 @@ cp "${TESTSRC}${FS}SubClassConsts.java" .
 
 "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts
 
-cmp  "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}"
+diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}"
 result=$?
 rm ${GENERATED_HEADER_FILE}
 
diff --git a/langtools/test/tools/javah/MissingParamClassTest.sh b/langtools/test/tools/javah/MissingParamClassTest.sh
index 33bdc151865..0725ddab0a4 100644
--- a/langtools/test/tools/javah/MissingParamClassTest.sh
+++ b/langtools/test/tools/javah/MissingParamClassTest.sh
@@ -58,13 +58,11 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
-    NULL=/dev/null
+  SunOS | Linux | CYGWIN* )
     PS=":"
     FS="/"
     ;;
   Windows* )
-    NULL=NUL
     PS=";"
     FS="\\"
     ;;
diff --git a/langtools/test/tools/javah/ReadOldClass.sh b/langtools/test/tools/javah/ReadOldClass.sh
index 82e3e163e53..b3937a6c8ac 100644
--- a/langtools/test/tools/javah/ReadOldClass.sh
+++ b/langtools/test/tools/javah/ReadOldClass.sh
@@ -43,13 +43,11 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
-    NULL=/dev/null
+  SunOS | Linux | CYGWIN* )
     PS=":"
     FS="/"
     ;;
   Windows* )
-    NULL=NUL
     PS=";"
     FS="\\"
     ;;
diff --git a/langtools/test/tools/javah/SubClassConsts.win b/langtools/test/tools/javah/SubClassConsts.win
index 67beec38354..4f8d56925a4 100644
--- a/langtools/test/tools/javah/SubClassConsts.win
+++ b/langtools/test/tools/javah/SubClassConsts.win
@@ -1,31 +1,31 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class SubClassConsts */
-
-#ifndef _Included_SubClassConsts
-#define _Included_SubClassConsts
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef SubClassConsts_serialVersionUID
-#define SubClassConsts_serialVersionUID 6733861379283244755i64
-#undef SubClassConsts_SUPER_INT_CONSTANT
-#define SubClassConsts_SUPER_INT_CONSTANT 3L
-#undef SubClassConsts_SUPER_FLOAT_CONSTANT
-#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f
-#undef SubClassConsts_SUPER_DOUBLE_CONSTANT
-#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2
-#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT
-#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L
-#undef SubClassConsts_SUB_INT_CONSTANT
-#define SubClassConsts_SUB_INT_CONSTANT 2L
-#undef SubClassConsts_SUB_DOUBLE_CONSTANT
-#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25
-#undef SubClassConsts_SUB_FLOAT_CONSTANT
-#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f
-#undef SubClassConsts_SUB_BOOLEAN_CONSTANT
-#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class SubClassConsts */
+
+#ifndef _Included_SubClassConsts
+#define _Included_SubClassConsts
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef SubClassConsts_serialVersionUID
+#define SubClassConsts_serialVersionUID 6733861379283244755i64
+#undef SubClassConsts_SUPER_INT_CONSTANT
+#define SubClassConsts_SUPER_INT_CONSTANT 3L
+#undef SubClassConsts_SUPER_FLOAT_CONSTANT
+#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f
+#undef SubClassConsts_SUPER_DOUBLE_CONSTANT
+#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2
+#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT
+#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L
+#undef SubClassConsts_SUB_INT_CONSTANT
+#define SubClassConsts_SUB_INT_CONSTANT 2L
+#undef SubClassConsts_SUB_DOUBLE_CONSTANT
+#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25
+#undef SubClassConsts_SUB_FLOAT_CONSTANT
+#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f
+#undef SubClassConsts_SUB_BOOLEAN_CONSTANT
+#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/langtools/test/tools/javap/4111861/T4111861.java b/langtools/test/tools/javap/4111861/T4111861.java
index b722d80b41a..6491ed9900d 100644
--- a/langtools/test/tools/javap/4111861/T4111861.java
+++ b/langtools/test/tools/javap/4111861/T4111861.java
@@ -89,7 +89,7 @@ public class T4111861 {
             String line;
             while ((line = in.readLine()) != null) {
                 if (line.indexOf("public static final") > 0) {
-                    sb.append(line);
+                    sb.append(line.trim());
                     sb.append('\n');
                 }
             }
diff --git a/langtools/test/tools/javap/T4777949.java b/langtools/test/tools/javap/T4777949.java
new file mode 100644
index 00000000000..612b1d23806
--- /dev/null
+++ b/langtools/test/tools/javap/T4777949.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.io.*;
+import java.util.*;
+import javax.tools.*;
+import com.sun.tools.javap.*;
+
+/*
+ * @test
+ * @bug 4777949
+ * @summary Warn javap usage on package with simple name
+ */
+public class T4777949 {
+    public static void main(String... args) throws Exception {
+        new T4777949().run();
+    }
+
+    void run() throws Exception {
+        File javaFile = writeTestFile();
+        File classFile = compileTestFile(javaFile);
+
+        test(".", "p.q.r.Test", false);
+        test("p", "q.r.Test", true);
+        test("p/q", "r.Test", true);
+        test("p/q/r", "Test", true);
+        test(".", "p.q.r.Test.Inner", false);
+        test(".", "p.q.r.Test$Inner", false);
+        test("p", "q.r.Test.Inner", true);
+        test("p", "q.r.Test$Inner", true);
+
+        if (errors > 0)
+            throw new Exception(errors + " errors found");
+    }
+
+    void test(String classPath, String className, boolean expectWarnings) {
+        List<Diagnostic<? extends JavaFileObject>> diags =
+            javap(Arrays.asList("-classpath", classPath), Arrays.asList(className));
+        boolean foundWarnings = false;
+        for (Diagnostic<? extends JavaFileObject> d: diags) {
+            if (d.getKind() == Diagnostic.Kind.WARNING)
+                foundWarnings = true;
+        }
+    }
+
+
+    File writeTestFile() throws IOException {
+        File f = new File("Test.java");
+        PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+        out.println("package p.q.r;");
+        out.println("class Test { class Inner { } }");
+        out.close();
+        return f;
+    }
+
+    File compileTestFile(File f) {
+        int rc = com.sun.tools.javac.Main.compile(new String[] { "-d", ".", f.getPath() });
+        if (rc != 0)
+            throw new Error("compilation failed. rc=" + rc);
+        String path = f.getPath();
+        return new File(path.substring(0, path.length() - 5) + ".class");
+    }
+
+    List<Diagnostic<? extends JavaFileObject>> javap(List<String> args, List<String> classes) {
+        DiagnosticCollector<JavaFileObject> dc = new DiagnosticCollector<JavaFileObject>();
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        JavaFileManager fm = JavapFileManager.create(dc, pw);
+        JavapTask t = new JavapTask(pw, fm, dc, args, classes);
+        boolean ok = t.run();
+
+        List<Diagnostic<? extends JavaFileObject>> diags = dc.getDiagnostics();
+
+        if (!ok)
+            error("javap failed unexpectedly");
+
+        System.err.println("args=" + args + " classes=" + classes + "\n"
+                           + diags + "\n"
+                           + sw);
+
+        return diags;
+    }
+
+    void error(String msg) {
+        System.err.println("error: " + msg);
+        errors++;
+    }
+
+    int errors;
+}
+
diff --git a/langtools/test/tools/javap/T4880672.java b/langtools/test/tools/javap/T4880672.java
new file mode 100644
index 00000000000..b58182eb63c
--- /dev/null
+++ b/langtools/test/tools/javap/T4880672.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/*
+ * @test
+ * @bug 4880672
+ * @summary javap does not output inner interfaces of an interface
+ */
+
+import java.io.*;
+import java.util.*;
+
+public class T4880672
+{
+    public static void main(String... args) {
+        new T4880672().run();
+    }
+
+    void run() {
+        verify("java.util.Map", "public interface java.util.Map$Entry");
+        verify("T4880672", "class T4880672$A$B extends java.lang.Object");
+        verify("C", ""); // must not give error if no InnerClasses attribute
+        if (errors > 0)
+            throw new Error(errors + " found.");
+    }
+
+    void verify(String className, String... expects) {
+        String output = javap(className);
+        for (String expect: expects) {
+            if (output.indexOf(expect)< 0)
+                error(expect + " not found");
+        }
+    }
+
+    void error(String msg) {
+        System.err.println(msg);
+        errors++;
+    }
+
+    int errors;
+
+    String javap(String className) {
+        String testClasses = System.getProperty("test.classes", ".");
+        StringWriter sw = new StringWriter();
+        PrintWriter out = new PrintWriter(sw);
+        String[] args = { "-XDinner", "-classpath", testClasses, className };
+        int rc = com.sun.tools.javap.Main.run(args, out);
+        out.close();
+        String output = sw.toString();
+        System.out.println("class " + className);
+        System.out.println(output);
+        if (rc != 0)
+            throw new Error("javap failed. rc=" + rc);
+        if (output.indexOf("Error:") != -1)
+            throw new Error("javap reported error.");
+        return output;
+    }
+
+    class A {
+        class B { }
+    }
+}
+
+class C { }
+
diff --git a/langtools/test/tools/javap/T4884240.java b/langtools/test/tools/javap/T4884240.java
index f2f36167760..91256aa82ee 100644
--- a/langtools/test/tools/javap/T4884240.java
+++ b/langtools/test/tools/javap/T4884240.java
@@ -46,9 +46,9 @@ public class T4884240 {
         pw.close();
         String[] lines = sw.toString().split("\n");
         if (lines.length < 3
-            || !lines[0].startsWith("Classfile")
-            || !lines[1].startsWith("Last modified")
-            || !lines[2].startsWith("MD5")) {
+            || !lines[0].trim().startsWith("Classfile")
+            || !lines[1].trim().startsWith("Last modified")
+            || !lines[2].trim().startsWith("MD5")) {
             System.out.println(sw);
             throw new Exception("unexpected output");
         }
diff --git a/langtools/test/tools/javap/T4975569.java b/langtools/test/tools/javap/T4975569.java
index 4b029c6c118..6d6db025534 100644
--- a/langtools/test/tools/javap/T4975569.java
+++ b/langtools/test/tools/javap/T4975569.java
@@ -40,10 +40,10 @@ public class T4975569
         verify("T4975569$Anno", "flags: ACC_INTERFACE, ACC_ABSTRACT, ACC_ANNOTATION");
         verify("T4975569$E",    "flags: ACC_FINAL, ACC_SUPER, ACC_ENUM");
         verify("T4975569$S",    "flags: ACC_BRIDGE, ACC_SYNTHETIC",
-                                "InnerClasses: \n   static");
+                                "InnerClasses:\n       static");
         verify("T4975569$V",    "void m(java.lang.String...)",
                                 "flags: ACC_VARARGS");
-        verify("T4975569$Prot", "InnerClasses: \n   protected");
+        verify("T4975569$Prot", "InnerClasses:\n       protected");
         //verify("T4975569$Priv", "InnerClasses");
         if (errors > 0)
             throw new Error(errors + " found.");
@@ -65,6 +65,7 @@ public class T4975569
     int errors;
 
     String javap(String className) {
+        String newline = System.getProperty("line.separator");
         String testClasses = System.getProperty("test.classes", ".");
         StringWriter sw = new StringWriter();
         PrintWriter out = new PrintWriter(sw);
@@ -73,7 +74,7 @@ public class T4975569
         if (rc != 0)
             throw new Error("javap failed. rc=" + rc);
         out.close();
-        String output = sw.toString();
+        String output = sw.toString().replaceAll(newline, "\n");
         System.out.println("class " + className);
         System.out.println(output);
         return output;
diff --git a/langtools/test/tools/javap/T6729471.java b/langtools/test/tools/javap/T6729471.java
new file mode 100644
index 00000000000..5e99fa52a05
--- /dev/null
+++ b/langtools/test/tools/javap/T6729471.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/*
+ * @test
+ * @bug 6729471
+ * @summary javap does not output inner interfaces of an interface
+ */
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+public class T6729471
+{
+    public static void main(String... args) {
+        new T6729471().run();
+    }
+
+    void run() {
+        // simple class
+        verify("java.util.Map",
+                "public abstract boolean containsKey(java.lang.Object)");
+
+        // inner class
+        verify("java.util.Map.Entry",
+                "public abstract K getKey()");
+
+        // file name
+        verify("../classes/tools/javap/T6729471.class",
+                "public static void main(java.lang.String...)");
+
+        // file url
+        verify("file:../classes/tools/javap/T6729471.class",
+                "public static void main(java.lang.String...)");
+
+        // jar url: rt.jar
+        File java_home = new File(System.getProperty("java.home"));
+        if (java_home.getName().equals("jre"))
+            java_home = java_home.getParentFile();
+        File rt_jar = new File(new File(new File(java_home, "jre"), "lib"), "rt.jar");
+        try {
+            verify("jar:" + rt_jar.toURL() + "!/java/util/Map.class",
+                "public abstract boolean containsKey(java.lang.Object)");
+        } catch (MalformedURLException e) {
+            error(e.toString());
+        }
+
+        // jar url: ct.sym, if it exists
+        File ct_sym = new File(new File(java_home, "lib"), "ct.sym");
+        if (ct_sym.exists()) {
+            try {
+                verify("jar:" + ct_sym.toURL() + "!/META-INF/sym/rt.jar/java/util/Map.class",
+                    "public abstract boolean containsKey(java.lang.Object)");
+            } catch (MalformedURLException e) {
+                error(e.toString());
+            }
+        } else
+            System.err.println("warning: ct.sym not found");
+
+        if (errors > 0)
+            throw new Error(errors + " found.");
+    }
+
+    void verify(String className, String... expects) {
+        String output = javap(className);
+        for (String expect: expects) {
+            if (output.indexOf(expect)< 0)
+                error(expect + " not found");
+        }
+    }
+
+    void error(String msg) {
+        System.err.println(msg);
+        errors++;
+    }
+
+    int errors;
+
+    String javap(String className) {
+        String testClasses = System.getProperty("test.classes", ".");
+        StringWriter sw = new StringWriter();
+        PrintWriter out = new PrintWriter(sw);
+        String[] args = { "-classpath", testClasses, className };
+        int rc = com.sun.tools.javap.Main.run(args, out);
+        out.close();
+        String output = sw.toString();
+        System.out.println("class " + className);
+        System.out.println(output);
+        if (rc != 0)
+            throw new Error("javap failed. rc=" + rc);
+        if (output.indexOf("Error:") != -1)
+            throw new Error("javap reported error.");
+        return output;
+    }
+}
+
diff --git a/langtools/test/tools/javap/T6863746.java b/langtools/test/tools/javap/T6863746.java
new file mode 100644
index 00000000000..cceaf0dc3be
--- /dev/null
+++ b/langtools/test/tools/javap/T6863746.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.io.*;
+
+/*
+ * @test
+ * @bug 6863746
+ * @summary javap should not scan ct.sym by default
+ */
+
+public class T6863746 {
+    public static void main(String... args) throws Exception{
+        new T6863746().run();
+    }
+
+    public void run() throws Exception {
+        String[] args = { "-c", "java.lang.Object" };
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        int rc = com.sun.tools.javap.Main.run(args, pw);
+        pw.close();
+        String out = sw.toString();
+        System.out.println(out);
+        String[] lines = out.split("\n");
+        // If ct.sym is being read, the output does not include
+        // Code attributes, so check for Code attributes as a
+        // way of detecting that ct.sym is not being used.
+        if (lines.length < 50 || out.indexOf("Code:") == -1)
+            throw new Exception("unexpected output from javap");
+    }
+}
diff --git a/langtools/test/tools/javap/T6866657.java b/langtools/test/tools/javap/T6866657.java
new file mode 100644
index 00000000000..5a4f7f5e391
--- /dev/null
+++ b/langtools/test/tools/javap/T6866657.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+
+/*
+ * @test
+ * @bug 6866657
+ * @summary add byteLength() method to primary classfile types
+ */
+
+import java.io.*;
+import java.util.*;
+import javax.tools.*;
+import com.sun.tools.javap.*;
+
+public class T6866657
+{
+    public static void main(String... args) {
+        new T6866657().run();
+    }
+
+    void run() {
+        verify("java.lang.Object");
+        verify("java.lang.String");
+        verify("java.util.List");
+        verify("java.util.ArrayList");
+        if (errors > 0)
+            throw new Error(errors + " found.");
+    }
+
+    void verify(String className) {
+        try {
+            PrintWriter log = new PrintWriter(System.out);
+            JavaFileManager fileManager = JavapFileManager.create(null, log);
+            JavaFileObject fo = fileManager.getJavaFileForInput(StandardLocation.PLATFORM_CLASS_PATH, className, JavaFileObject.Kind.CLASS);
+            if (fo == null) {
+                error("Can't find " + className);
+            } else {
+                JavapTask t = new JavapTask(log, fileManager, null);
+                t.handleOptions(new String[] { "-sysinfo", className });
+                JavapTask.ClassFileInfo cfInfo = t.read(fo);
+                expectEqual(cfInfo.cf.byteLength(), cfInfo.size);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            error("Exception: " + e);
+        }
+    }
+
+    void expectEqual(int found, int expected) {
+        if (found != expected)
+            error("bad value found: " + found + " expected: " + expected);
+    }
+
+    void error(String msg) {
+        System.err.println(msg);
+        errors++;
+    }
+
+    int errors;
+}
+
diff --git a/langtools/test/tools/javap/T6868539.java b/langtools/test/tools/javap/T6868539.java
new file mode 100644
index 00000000000..e6997e6080e
--- /dev/null
+++ b/langtools/test/tools/javap/T6868539.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6868539 6868548
+ * @summary javap should use current names for constant pool entries,
+ *              remove spurious ';' from constant pool entries
+ */
+
+import java.io.*;
+import java.util.*;
+
+public class T6868539
+
+{
+    public static void main(String... args) {
+        new T6868539().run();
+    }
+
+    void run() {
+        verify("T6868539", "Utf8 +java/lang/String");                                   // 1: Utf8
+                                                                                        // 2: currently unused
+        verify("T6868539", "Integer +123456");                                          // 3: Integer
+        verify("T6868539", "Float +123456.0f");                                         // 4: Float
+        verify("T6868539", "Long +123456l");                                            // 5: Long
+        verify("T6868539", "Double +123456.0d");                                        // 6: Double
+        verify("T6868539", "Class +#[0-9]+ +// + T6868539");                            // 7: Class
+        verify("T6868539", "String +#[0-9]+ +// + not found");                          // 8: String
+        verify("T6868539", "Fieldref +#[0-9]+\\.#[0-9]+ +// +T6868539.errors:I");       // 9: Fieldref
+        verify("T6868539", "Methodref +#[0-9]+\\.#[0-9]+ +// +T6868539.run:\\(\\)V");   // 10: Methodref
+        verify("T6868539", "InterfaceMethodref +#[0-9]+\\.#[0-9]+ +// +java/lang/Runnable\\.run:\\(\\)V");
+                                                                                        // 11: InterfaceMethodref
+        verify("T6868539", "NameAndType +#[0-9]+:#[0-9]+ +// +run:\\(\\)V");            // 12: NameAndType
+        if (errors > 0)
+            throw new Error(errors + " found.");
+    }
+
+    void verify(String className, String... expects) {
+        String output = javap(className);
+        for (String expect: expects) {
+            if (!output.matches("(?s).*" + expect + ".*"))
+                error(expect + " not found");
+        }
+    }
+
+    void error(String msg) {
+        System.err.println(msg);
+        errors++;
+    }
+
+    int errors;
+
+    String javap(String className) {
+        String testClasses = System.getProperty("test.classes", ".");
+        StringWriter sw = new StringWriter();
+        PrintWriter out = new PrintWriter(sw);
+        String[] args = { "-v", "-classpath", testClasses, className };
+        int rc = com.sun.tools.javap.Main.run(args, out);
+        if (rc != 0)
+            throw new Error("javap failed. rc=" + rc);
+        out.close();
+        String output = sw.toString();
+        System.out.println("class " + className);
+        System.out.println(output);
+        return output;
+    }
+
+    int i = 123456;
+    float f = 123456.f;
+    double d = 123456.;
+    long l = 123456L;
+
+    void m(Runnable r) { r.run(); }
+}
+
diff --git a/langtools/test/tools/javap/T6879371.java b/langtools/test/tools/javap/T6879371.java
new file mode 100644
index 00000000000..6368224720e
--- /dev/null
+++ b/langtools/test/tools/javap/T6879371.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6879371
+ * @summary javap does not close internal default file manager
+ */
+
+import java.io.*;
+import java.util.zip.*;
+
+public class T6879371 {
+    public static void main(String[] args) throws Exception {
+        new T6879371().run();
+    }
+
+    public void run() throws Exception {
+        // create a simple test class which we can put into
+        // a test zip file and know that it will be used by
+        // javap.
+        File classDir = new File("classes");
+        classDir.mkdir();
+
+        String className = "Test";
+        File javaFile = writeTestFile(className);
+        compileTestFile(classDir, javaFile);
+
+        test(classDir, className, false);
+        test(classDir, className, true);
+    }
+
+    void test(File classDir, String className, boolean useJavaUtilZip) throws Exception {
+        // javac should really not be using system properties like this
+        // -- it should really be using (hidden) options -- but until then
+        // take care to leave system properties as we find them, so as not
+        // to adversely affect other tests that might follow.
+        String prev = System.getProperty("useJavaUtilZip");
+        setProperty("useJavaUtilZip", (useJavaUtilZip ? "true" : null));
+        try {
+            File zipFile = zip(classDir, new File(classDir + ".zip"));
+            javap("-classpath", zipFile.getPath(), className);
+
+            if (!zipFile.delete())
+                throw new Exception("failed to delete " + zipFile);
+        } finally {
+            setProperty("useJavaUtilZip", prev);
+        }
+    }
+
+    File writeTestFile(String name) throws IOException {
+        File f = new File(name + ".java");
+        PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+        out.println("class " + name + " { }");
+        out.close();
+        return f;
+    }
+
+    void compileTestFile(File classDir, File file) {
+        int rc = com.sun.tools.javac.Main.compile(
+           new String[] { "-d", classDir.getPath(), file.getPath() });
+        if (rc != 0)
+            throw new Error("compilation failed. rc=" + rc);
+    }
+
+    File zip(File dir, File zipFile) throws IOException {
+        ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(zipFile));
+        for (File file: dir.listFiles()) {
+            if (file.isFile()) {
+                byte[] data = new byte[(int) file.length()];
+                DataInputStream in = new DataInputStream(new FileInputStream(file));
+                in.readFully(data);
+                in.close();
+                zipOut.putNextEntry(new ZipEntry(file.getName()));
+                zipOut.write(data, 0, data.length);
+                zipOut.closeEntry();
+            }
+        }
+        zipOut.close();
+        return zipFile;
+    }
+
+    String javap(String... args) {
+        StringWriter sw = new StringWriter();
+        PrintWriter out = new PrintWriter(sw);
+        int rc = com.sun.tools.javap.Main.run(args, out);
+        if (rc != 0)
+            throw new Error("javap failed. rc=" + rc);
+        out.close();
+        return sw.toString();
+    }
+
+    void setProperty(String key, String value) {
+        if (value != null)
+            System.setProperty(key, value);
+        else
+            System.getProperties().remove(key);
+    }
+}
diff --git a/langtools/test/tools/javap/pathsep.sh b/langtools/test/tools/javap/pathsep.sh
index 5f1f3fe42d6..469f44effc2 100644
--- a/langtools/test/tools/javap/pathsep.sh
+++ b/langtools/test/tools/javap/pathsep.sh
@@ -40,7 +40,7 @@ echo "TESTJAVA=${TESTJAVA}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | CYGWIN* )
     FS="/"
     ;;
   Windows* )
diff --git a/langtools/test/tools/javap/stackmap/T6271292.sh b/langtools/test/tools/javap/stackmap/T6271292.sh
index 2726b1acfc4..f6a66d379bd 100644
--- a/langtools/test/tools/javap/stackmap/T6271292.sh
+++ b/langtools/test/tools/javap/stackmap/T6271292.sh
@@ -53,7 +53,7 @@ printf 'CLASSPATH="%s"' "${CLASSPATH}" >&2 ; echo >&2
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  CYGWIN* | Windows* )
+  Windows* )
     FS="\\"
     ;;
   * )
@@ -75,7 +75,7 @@ grep "frame_type" "${JAVAPFILE}" > "${OUTFILE}"
 grep "offset_delta" "${JAVAPFILE}" >> "${OUTFILE}"
 grep "stack = " "${JAVAPFILE}" >> "${OUTFILE}"
 grep "locals = " "${JAVAPFILE}" >> "${OUTFILE}"
-diff "${OUTFILE}" "${TESTSRC}${FS}T6271292.out"
+diff -w "${OUTFILE}" "${TESTSRC}${FS}T6271292.out"
 result="$?"
 if [ "$result" -eq 0 ]
 then
diff --git a/langtools/test/tools/javap/typeAnnotations/ArrayClassLiterals.java b/langtools/test/tools/javap/typeAnnotations/ArrayClassLiterals.java
new file mode 100644
index 00000000000..f77480f3bb0
--- /dev/null
+++ b/langtools/test/tools/javap/typeAnnotations/ArrayClassLiterals.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.io.*;
+import com.sun.tools.classfile.*;
+
+/*
+ * @test ArrayClassLiterals
+ * @bug 6863814
+ * @summary test that class literals array doesn't crash javap
+ */
+
+public class ArrayClassLiterals {
+    public static void main(String[] args) throws Exception {
+        new ArrayClassLiterals().run();
+    }
+
+    public void run() throws Exception {
+        File javaFile = writeTestFile();
+        File classFile = compileTestFile(javaFile);
+
+        ClassFile cf = ClassFile.read(classFile);
+        test(cf);
+        for (Field f : cf.fields) {
+            test(cf, f);
+        }
+        for (Method m: cf.methods) {
+            test(cf, m);
+        }
+
+        countAnnotations();
+
+        if (errors > 0)
+            throw new Exception(errors + " errors found");
+        System.out.println("PASSED");
+    }
+
+    void test(ClassFile cf) {
+        test(cf, Attribute.RuntimeVisibleTypeAnnotations, true);
+        test(cf, Attribute.RuntimeInvisibleTypeAnnotations, false);
+    }
+
+    void test(ClassFile cf, Method m) {
+        test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+        test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+    }
+
+    void test(ClassFile cf, Field m) {
+        test(cf, m, Attribute.RuntimeVisibleTypeAnnotations, true);
+        test(cf, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
+    }
+
+    // test the result of Attributes.getIndex according to expectations
+    // encoded in the method's name
+    void test(ClassFile cf, String name, boolean visible) {
+        int index = cf.attributes.getIndex(cf.constant_pool, name);
+        if (index != -1) {
+            Attribute attr = cf.attributes.get(index);
+            assert attr instanceof RuntimeTypeAnnotations_attribute;
+            RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+            all += tAttr.annotations.length;
+            if (visible)
+                visibles += tAttr.annotations.length;
+            else
+                invisibles += tAttr.annotations.length;
+
+            for (ExtendedAnnotation anno : tAttr.annotations)
+                anno.position.toString();
+        }
+    }
+
+    // test the result of Attributes.getIndex according to expectations
+    // encoded in the method's name
+    void test(ClassFile cf, Method m, String name, boolean visible) {
+        int index = m.attributes.getIndex(cf.constant_pool, name);
+        if (index != -1) {
+            Attribute attr = m.attributes.get(index);
+            assert attr instanceof RuntimeTypeAnnotations_attribute;
+            RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+            all += tAttr.annotations.length;
+            if (visible)
+                visibles += tAttr.annotations.length;
+            else
+                invisibles += tAttr.annotations.length;
+
+            for (ExtendedAnnotation anno : tAttr.annotations)
+                anno.position.toString();
+        }
+    }
+
+    // test the result of Attributes.getIndex according to expectations
+    // encoded in the method's name
+    void test(ClassFile cf, Field m, String name, boolean visible) {
+        int index = m.attributes.getIndex(cf.constant_pool, name);
+        if (index != -1) {
+            Attribute attr = m.attributes.get(index);
+            assert attr instanceof RuntimeTypeAnnotations_attribute;
+            RuntimeTypeAnnotations_attribute tAttr = (RuntimeTypeAnnotations_attribute)attr;
+            all += tAttr.annotations.length;
+            if (visible)
+                visibles += tAttr.annotations.length;
+            else
+                invisibles += tAttr.annotations.length;
+
+            for (ExtendedAnnotation anno : tAttr.annotations)
+                anno.position.toString();
+        }
+    }
+
+    File writeTestFile() throws IOException {
+      File f = new File("Testa.java");
+        PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(f)));
+        out.println("import java.util.*;");
+        out.println("class Testa { ");
+        out.println("  @interface A { }");
+
+        out.println(" void test() {");
+        out.println("  Object a = @A String.class;");
+        out.println("  Object b = @A String @A [] @A [].class;");
+        out.println(" }");
+        out.println("}");
+
+        out.close();
+        return f;
+    }
+
+    File compileTestFile(File f) {
+      int rc = com.sun.tools.javac.Main.compile(new String[] { "-source", "1.7", "-g", f.getPath() });
+        if (rc != 0)
+            throw new Error("compilation failed. rc=" + rc);
+        String path = f.getPath();
+        return new File(path.substring(0, path.length() - 5) + ".class");
+    }
+
+    void countAnnotations() {
+        int expected_visibles = 0, expected_invisibles = 4;
+        int expected_all = expected_visibles + expected_invisibles;
+
+        if (expected_all != all) {
+            errors++;
+            System.err.println("expected " + expected_all
+                    + " annotations but found " + all);
+        }
+
+        if (expected_visibles != visibles) {
+            errors++;
+            System.err.println("expected " + expected_visibles
+                    + " visibles annotations but found " + visibles);
+        }
+
+        if (expected_invisibles != invisibles) {
+            errors++;
+            System.err.println("expected " + expected_invisibles
+                    + " invisibles annotations but found " + invisibles);
+        }
+
+    }
+
+    int errors;
+    int all;
+    int visibles;
+    int invisibles;
+}
diff --git a/langtools/test/tools/javap/typeAnnotations/T6855990.java b/langtools/test/tools/javap/typeAnnotations/T6855990.java
new file mode 100644
index 00000000000..f5baa3dc6f0
--- /dev/null
+++ b/langtools/test/tools/javap/typeAnnotations/T6855990.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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.
+ *
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+import java.io.*;
+
+/*
+ * @test
+ * @bug 6855990
+ * @summary InstructionDetailWriter should support new 308 annotations attribute
+ */
+
+public class T6855990 {
+    public static void main(String[] args) throws Exception {
+        new T6855990().run();
+    }
+
+    public void run() throws Exception {
+        @Simple String[] args = { "-c", "-XDdetails:typeAnnotations", "T6855990" };
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        int rc = com.sun.tools.javap.Main.run(args, pw);
+        pw.close();
+        String out = sw.toString();
+        System.out.println(out);
+        if (out.indexOf("@Simple: LOCAL_VARIABLE") == -1)
+            throw new Exception("expected output not found");
+    }
+}
+
+@interface Simple { }
+
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
index c35907c5ee2..45f80ecaf97 100644
--- a/make/Defs-internal.gmk
+++ b/make/Defs-internal.gmk
@@ -133,7 +133,11 @@ endif
 
 # Do we build the source and openjdk binary plug bundles?
 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
-BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
+ifeq ($(SKIP_BUNDLES_BUILD), true)
+  BUNDLE_RULES_AVAILABLE := false
+else 
+  BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
+endif
 
 # Current things we do NOT build for OPENJDK
 ifdef OPENJDK
diff --git a/make/README.pre-components b/make/README.pre-components
index 8d2eab571cb..cb79e68df27 100644
--- a/make/README.pre-components
+++ b/make/README.pre-components
@@ -18,7 +18,7 @@ The make/makefile rules are:
   ALT_LANGTOOLS_DIST    The dist area from a langtools build to use, if provided
   ALT_OUTPUTDIR         Parent dir of build and dist directories, if provided
   VARIANT               If DBG, debug build, if OPT, optimized build
-  TARGET_CLASS_VERSION  The classfile version number (currently 5)
+  TARGET_CLASS_VERSION  The classfile version number (currently 7)
   ANT_HOME              Home of ant to use, if provided
   QUIET                 If defined, be quiet
   VERBOSE               If defined, be verbose